diff FXAnalyse.h @ 134:bd28161e5ac2

Major code cleanup
author Daniele Nicolodi <daniele.nicolodi@obspm.fr>
date Wed, 22 Jan 2014 12:29:28 +0100
parents 7540703b8473
children e04123ab79ef
line wrap: on
line diff
--- a/FXAnalyse.h	Wed Jan 22 12:10:17 2014 +0100
+++ b/FXAnalyse.h	Wed Jan 22 12:29:28 2014 +0100
@@ -43,17 +43,17 @@
 #define  PANEL_CH3                        6       /* control type: numeric, callback function: (none) */
 #define  PANEL_CH2                        7       /* control type: numeric, callback function: (none) */
 #define  PANEL_CH1                        8       /* control type: numeric, callback function: (none) */
-#define  PANEL_CHECKBOX_MATH1ALLAN        9       /* control type: radioButton, callback function: CB_OnAllanPlot */
-#define  PANEL_CHECKBOX_FREQ4ALLAN        10      /* control type: radioButton, callback function: CB_OnAllanPlot */
-#define  PANEL_CHECKBOX_FREQ3ALLAN        11      /* control type: radioButton, callback function: CB_OnAllanPlot */
-#define  PANEL_CHECKBOX_FREQ4PLOT         12      /* control type: radioButton, callback function: CB_OnFreqPlot */
-#define  PANEL_CHECKBOX_FREQ2ALLAN        13      /* control type: radioButton, callback function: CB_OnAllanPlot */
-#define  PANEL_CHECKBOX_FREQ3PLOT         14      /* control type: radioButton, callback function: CB_OnFreqPlot */
+#define  PANEL_ADEV_Math1                 9       /* control type: radioButton, callback function: CB_OnAllanPlot */
+#define  PANEL_ADEV_Ch4                   10      /* control type: radioButton, callback function: CB_OnAllanPlot */
+#define  PANEL_ADEV_Ch3                   11      /* control type: radioButton, callback function: CB_OnAllanPlot */
+#define  PANEL_PLOT_Ch4                   12      /* control type: radioButton, callback function: CB_OnFreqPlot */
+#define  PANEL_ADEV_Ch2                   13      /* control type: radioButton, callback function: CB_OnAllanPlot */
+#define  PANEL_PLOT_Ch3                   14      /* control type: radioButton, callback function: CB_OnFreqPlot */
 #define  PANEL_CHECKBOX_CORRFREQU         15      /* control type: radioButton, callback function: CB_OnCROX */
-#define  PANEL_CHECKBOX_FREQ1ALLAN        16      /* control type: radioButton, callback function: CB_OnAllanPlot */
-#define  PANEL_CHECKBOX_FREQ2PLOT         17      /* control type: radioButton, callback function: CB_OnFreqPlot */
-#define  PANEL_CHECKBOX_MATH1PLOT         18      /* control type: radioButton, callback function: CB_OnFreqPlot */
-#define  PANEL_CHECKBOX_FREQ1PLOT         19      /* control type: radioButton, callback function: CB_OnFreqPlot */
+#define  PANEL_ADEV_Ch1                   16      /* control type: radioButton, callback function: CB_OnAllanPlot */
+#define  PANEL_PLOT_Ch2                   17      /* control type: radioButton, callback function: CB_OnFreqPlot */
+#define  PANEL_PLOT_Math1                 18      /* control type: radioButton, callback function: CB_OnFreqPlot */
+#define  PANEL_PLOT_Ch1                   19      /* control type: radioButton, callback function: CB_OnFreqPlot */
 #define  PANEL_DDS2                       20      /* control type: numeric, callback function: CB_ChangeDDSOut */
 #define  PANEL_TEXTMSG                    21      /* control type: textMsg, callback function: (none) */
 #define  PANEL_TEXTMSG_2                  22      /* control type: textMsg, callback function: (none) */
@@ -72,22 +72,22 @@
 #define  PANEL_DDS2STEP                   35      /* control type: ring, callback function: CB_ChangeDDSStep */
 #define  PANEL_CENTERFREQUENCY            36      /* control type: numeric, callback function: (none) */
 #define  PANEL_SLOPE_APPLIED              37      /* control type: numeric, callback function: CB_SetSlope */
-#define  PANEL_CHECKBOX_MATH5PLOT         38      /* control type: radioButton, callback function: CB_OnFreqPlot */
-#define  PANEL_CHECKBOX_MATH4PLOT         39      /* control type: radioButton, callback function: CB_OnFreqPlot */
-#define  PANEL_CHECKBOX_MATH4ALLAN        40      /* control type: radioButton, callback function: CB_OnAllanPlot */
+#define  PANEL_PLOT_Math5                 38      /* control type: radioButton, callback function: CB_OnFreqPlot */
+#define  PANEL_PLOT_Math4                 39      /* control type: radioButton, callback function: CB_OnFreqPlot */
+#define  PANEL_ADEV_Math4                 40      /* control type: radioButton, callback function: CB_OnAllanPlot */
 #define  PANEL_DDS1STEP                   41      /* control type: ring, callback function: CB_ChangeDDSStep */
 #define  PANEL_TEXTMSG_15                 42      /* control type: textMsg, callback function: (none) */
-#define  PANEL_CHECKBOX_MATH5ALLAN        43      /* control type: radioButton, callback function: CB_OnAllanPlot */
-#define  PANEL_CHECKBOX_MATH3PLOT         44      /* control type: radioButton, callback function: CB_OnFreqPlot */
+#define  PANEL_ADEV_Math5                 43      /* control type: radioButton, callback function: CB_OnAllanPlot */
+#define  PANEL_PLOT_Math3                 44      /* control type: radioButton, callback function: CB_OnFreqPlot */
 #define  PANEL_CHECKBOX_MATH5SAVE         45      /* control type: radioButton, callback function: (none) */
 #define  PANEL_SR_LOGGER                  46      /* control type: radioButton, callback function: (none) */
 #define  PANEL_CHECKBOX_MATH4SAVE         47      /* control type: radioButton, callback function: (none) */
-#define  PANEL_CHECKBOX_MATH3ALLAN        48      /* control type: radioButton, callback function: CB_OnAllanPlot */
+#define  PANEL_ADEV_Math3                 48      /* control type: radioButton, callback function: CB_OnAllanPlot */
 #define  PANEL_MATHSTRING4                49      /* control type: string, callback function: CB_ChangeMath */
-#define  PANEL_CHECKBOX_MATH2PLOT         50      /* control type: radioButton, callback function: CB_OnFreqPlot */
+#define  PANEL_PLOT_Math2                 50      /* control type: radioButton, callback function: CB_OnFreqPlot */
 #define  PANEL_CHECKBOX_MATH3SAVE         51      /* control type: radioButton, callback function: (none) */
 #define  PANEL_CHECKBOX_MATH2SAVE         52      /* control type: radioButton, callback function: (none) */
-#define  PANEL_CHECKBOX_MATH2ALLAN        53      /* control type: radioButton, callback function: CB_OnAllanPlot */
+#define  PANEL_ADEV_Math2                 53      /* control type: radioButton, callback function: CB_OnAllanPlot */
 #define  PANEL_MATHSTRING3                54      /* control type: string, callback function: CB_ChangeMath */
 #define  PANEL_MATHSTRING1                55      /* control type: string, callback function: CB_ChangeMath */
 #define  PANEL_MATHSTRING2                56      /* control type: string, callback function: CB_ChangeMath */