Revision 63:a8c1971d3d42, committed 2019-09-29

Comitter:

roryhand

Date:

Sun Sep 29 19:51:14 2019 +0000

Branch:

LargeFile_Tests

Parent:

61:212d2db45c56

Child:

64:6061ffe25985

Commit message:

WIP - Have now added various new elements to classPositionIndicators

Changed in this revision

--- a/NotchingDemo.cpp	Fri Sep 27 22:06:43 2019 +0000
+++ b/NotchingDemo.cpp	Sun Sep 29 19:51:14 2019 +0000
@@ -102,7 +102,10 @@
     int notch5_indicator, notch6_indicator, notch7_indicator, notch8_indicator;
     int notch1_start_pt, notch2_start_pt, notch3_start_pt, notch4_start_pt;
     int notch5_start_pt, notch6_start_pt, notch7_start_pt, notch8_start_pt;
-     
+    int N1N2_start_pt, N2N3_start_pt, N3N4_start_pt, N4N5_start_pt, N5N6_start_pt;
+    int N6N7_start_pt, N7N8_start_pt, N8N7_start_pt, N7N6_start_pt, N6N5_start_pt;
+    int N5N4_start_pt, N4N3_start_pt, N3N2_start_pt, N2N1_start_pt;
+    
     int notch_start_pts [9];
     int notch_position_indicators[9];
     int notch_transitions_start_pts[15];
@@ -143,7 +146,53 @@
         notch_position_indicators[6] = notch6_indicator;
         notch_position_indicators[7] = notch7_indicator;
         notch_position_indicators[8] = notch8_indicator;
-
+        
+        N1N2_start_pt = 44;
+        N2N3_start_pt = N1N2_start_pt + 73220;
+        N3N4_start_pt = N2N3_start_pt + 78164;
+        N4N5_start_pt = N3N4_start_pt + 59432;
+        N5N6_start_pt = N4N5_start_pt + 64984;
+        N6N7_start_pt = N5N6_start_pt + 59924;
+        N7N8_start_pt = N6N7_start_pt + 97874;
+        N8N7_start_pt = N7N8_start_pt + 63992;
+        N7N6_start_pt = N8N7_start_pt + 44506;
+        N6N5_start_pt = N7N6_start_pt + 55052;
+        N5N4_start_pt = N6N5_start_pt + 37038;
+        N4N3_start_pt = N5N4_start_pt + 49692;
+        N3N2_start_pt = N4N3_start_pt + 44100;
+        N2N1_start_pt = N3N2_start_pt + 58346;
+        
+        
+        notch_transitions_start_pts[1] = N1N2_start_pt;
+        notch_transitions_start_pts[2] = N2N3_start_pt;
+        notch_transitions_start_pts[3] = N3N4_start_pt;
+        notch_transitions_start_pts[4] = N4N5_start_pt;
+        notch_transitions_start_pts[5] = N5N6_start_pt;
+        notch_transitions_start_pts[6] = N6N7_start_pt;
+        notch_transitions_start_pts[7] = N7N8_start_pt;
+        notch_transitions_start_pts[8] = N8N7_start_pt;
+        notch_transitions_start_pts[9] = N7N6_start_pt;
+        notch_transitions_start_pts[10] = N6N5_start_pt;
+        notch_transitions_start_pts[11] = N5N4_start_pt;
+        notch_transitions_start_pts[12] = N4N3_start_pt;
+        notch_transitions_start_pts[13] = N3N2_start_pt;
+        notch_transitions_start_pts[14] = N2N1_start_pt;
+        
+        
+        notch_transitions_position_indicators[1] = N1N2_start_pt;
+        notch_transitions_position_indicators[2] = N2N3_start_pt;
+        notch_transitions_position_indicators[3] = N3N4_start_pt;
+        notch_transitions_position_indicators[4] = N4N5_start_pt;
+        notch_transitions_position_indicators[5] = N5N6_start_pt;
+        notch_transitions_position_indicators[6] = N6N7_start_pt;
+        notch_transitions_position_indicators[7] = N7N8_start_pt;
+        notch_transitions_position_indicators[8] = N8N7_start_pt;
+        notch_transitions_position_indicators[9] = N7N6_start_pt;
+        notch_transitions_position_indicators[10] = N6N5_start_pt;
+        notch_transitions_position_indicators[11] = N5N4_start_pt;
+        notch_transitions_position_indicators[12] = N4N3_start_pt;
+        notch_transitions_position_indicators[13] = N3N2_start_pt;
+        notch_transitions_position_indicators[14] = N2N1_start_pt;
     }
 };