Mercurial > hg > fxanalyse
diff FXAnalyse.h @ 36:fb6092340979
Minor fixes to UI
| author | Daniele Nicolodi <daniele.nicolodi@obspm.fr> |
|---|---|
| date | Wed, 03 Oct 2012 15:05:40 +0200 |
| parents | 1e4ecf64b485 |
| children | 2e1b3148d6e6 |
line wrap: on
line diff
--- a/FXAnalyse.h Wed Oct 03 14:27:24 2012 +0200 +++ b/FXAnalyse.h Wed Oct 03 15:05:40 2012 +0200 @@ -14,9 +14,7 @@ /* Panels and Controls: */ -#define CALC3 1 - -#define CALCN1 2 +#define CALCN1 1 #define CALCN1_N 2 /* control type: numeric, callback function: (none) */ #define CALCN1_ACCEPTN 3 /* control type: command, callback function: CB_OnAcceptN */ #define CALCN1_SLOPE 4 /* control type: numeric, callback function: (none) */ @@ -26,7 +24,7 @@ #define CALCN1_STOP 8 /* control type: command, callback function: CB_OnNStop */ #define CALCN1_START 9 /* control type: command, callback function: CB_OnStartNCalculus */ -#define CALCN2 3 +#define CALCN2 2 #define CALCN2_SLOPE 2 /* control type: numeric, callback function: (none) */ #define CALCN2_DELTAFREQ 3 /* control type: numeric, callback function: CB_OnDeltaFreq */ #define CALCN2_INTEGRATIONTIME 4 /* control type: numeric, callback function: CB_OnIntegrationTime */ @@ -36,7 +34,7 @@ #define CALCN2_ACCEPTN 8 /* control type: command, callback function: CB_OnAcceptN */ #define CALCN2_SLOPETIME 9 /* control type: numeric, callback function: CB_OnSlopeTime */ -#define CALCN3 4 +#define CALCN3 3 #define CALCN3_SLOPE 2 /* control type: numeric, callback function: (none) */ #define CALCN3_DELTAFREQ 3 /* control type: numeric, callback function: CB_OnDeltaFreq */ #define CALCN3_INTEGRATIONTIME 4 /* control type: numeric, callback function: CB_OnIntegrationTime */ @@ -46,7 +44,7 @@ #define CALCN3_ACCEPTN 8 /* control type: command, callback function: CB_OnAcceptN */ #define CALCN3_SLOPETIME 9 /* control type: numeric, callback function: CB_OnSlopeTime */ -#define ESTIMATEN3 5 +#define ESTIMATEN3 4 #define ESTIMATEN3_N 2 /* control type: numeric, callback function: (none) */ #define ESTIMATEN3_ESTIMATE 3 /* control type: command, callback function: CB_OnNEstimate */ #define ESTIMATEN3_FREP 4 /* control type: numeric, callback function: (none) */ @@ -54,7 +52,7 @@ #define ESTIMATEN3_CANCEL 6 /* control type: command, callback function: CB_OnNEstimateCancel */ #define ESTIMATEN3_WAVELENGTH 7 /* control type: numeric, callback function: (none) */ -#define PANEL 6 /* callback function: CB_OnEventMain */ +#define PANEL 5 /* callback function: CB_OnEventMain */ #define PANEL_QUITBUTTON 2 /* control type: command, callback function: QuitCallback */ #define PANEL_STARTBUTTON 3 /* control type: command, callback function: CB_OnStart */ #define PANEL_STOPBUTTON 4 /* control type: command, callback function: CB_OnStop */ @@ -93,90 +91,89 @@ #define PANEL_DDS4STEP 37 /* control type: ring, callback function: CB_ChangeDDSStep */ #define PANEL_DDS3STEP 38 /* control type: ring, callback function: CB_ChangeDDSStep */ #define PANEL_DDS2STEP 39 /* control type: ring, callback function: CB_ChangeDDSStep */ -#define PANEL_CURRENT_FREQUENCY 40 /* control type: numeric, callback function: (none) */ -#define PANEL_CENTERFREQUENCY 41 /* control type: numeric, callback function: (none) */ -#define PANEL_SLOPETOCANCEL 42 /* control type: numeric, callback function: CB_SetSlope */ -#define PANEL_MATH4 43 /* control type: numeric, callback function: (none) */ -#define PANEL_MATH5 44 /* control type: numeric, callback function: (none) */ -#define PANEL_MATH3 45 /* control type: numeric, callback function: (none) */ -#define PANEL_CHECKBOX_MATH5PLOT 46 /* control type: radioButton, callback function: CB_OnFreqPlot */ -#define PANEL_CHECKBOX_MATH4PLOT 47 /* control type: radioButton, callback function: CB_OnFreqPlot */ -#define PANEL_CHECKBOX_MATH4ALLAN 48 /* control type: radioButton, callback function: CB_OnAllanPlot */ -#define PANEL_DDS1STEP 49 /* control type: ring, callback function: CB_ChangeDDSStep */ -#define PANEL_TEXTMSG_15 50 /* control type: textMsg, callback function: (none) */ -#define PANEL_CHECKBOX_MATH5ALLAN 51 /* control type: radioButton, callback function: CB_OnAllanPlot */ -#define PANEL_CHECKBOX_MATH3PLOT 52 /* control type: radioButton, callback function: CB_OnFreqPlot */ -#define PANEL_CHECKBOX_MATH5SAVE 53 /* control type: radioButton, callback function: (none) */ -#define PANEL_CHECKBOX_MATH3SAVE_2 54 /* control type: radioButton, callback function: CB_OnSaveSr */ -#define PANEL_CHECKBOX_MATH3ALLAN 55 /* control type: radioButton, callback function: CB_OnAllanPlot */ -#define PANEL_MATHSTRING4 56 /* control type: string, callback function: CB_ChangeMath */ -#define PANEL_TEXTMSG_17 57 /* control type: textMsg, callback function: (none) */ -#define PANEL_MATH2 58 /* control type: numeric, callback function: (none) */ -#define PANEL_SPLITTER_15 59 /* control type: splitter, callback function: (none) */ -#define PANEL_SPLITTER_12 60 /* control type: splitter, callback function: (none) */ -#define PANEL_CHECKBOX_MATH2PLOT 61 /* control type: radioButton, callback function: CB_OnFreqPlot */ -#define PANEL_CHECKBOX_MATH3SAVE 62 /* control type: radioButton, callback function: CB_OnSaveHg */ -#define PANEL_CHECKBOX_MATH2SAVE 63 /* control type: radioButton, callback function: CB_OnSaveOpt */ -#define PANEL_CHECKBOX_MATH2ALLAN 64 /* control type: radioButton, callback function: CB_OnAllanPlot */ -#define PANEL_TEXTMSG_7 65 /* control type: textMsg, callback function: (none) */ -#define PANEL_MATHSTRING3 66 /* control type: string, callback function: CB_ChangeMath */ -#define PANEL_MATH1 67 /* control type: numeric, callback function: (none) */ -#define PANEL_SPLITTER_6 68 /* control type: splitter, callback function: (none) */ -#define PANEL_TEXTMSG_18 69 /* control type: textMsg, callback function: (none) */ -#define PANEL_TEXTMSG_6 70 /* control type: textMsg, callback function: (none) */ -#define PANEL_TEXTMSG_8 71 /* control type: textMsg, callback function: (none) */ -#define PANEL_TEXTMSG_19 72 /* control type: textMsg, callback function: (none) */ -#define PANEL_MATHSTRING1 73 /* control type: string, callback function: CB_ChangeMath */ -#define PANEL_TEXTMSG_9 74 /* control type: textMsg, callback function: (none) */ -#define PANEL_TEXTMSG_10 75 /* control type: textMsg, callback function: (none) */ -#define PANEL_MATHSTRING2 76 /* control type: string, callback function: CB_ChangeMath */ -#define PANEL_TEXTMSG_16 77 /* control type: textMsg, callback function: (none) */ -#define PANEL_SPLITTER_11 78 /* control type: splitter, callback function: (none) */ -#define PANEL_SPLITTER_16 79 /* control type: splitter, callback function: (none) */ -#define PANEL_SPLITTER_9 80 /* control type: splitter, callback function: (none) */ -#define PANEL_SPLITTER_3 81 /* control type: splitter, callback function: (none) */ -#define PANEL_MINUS10KDDS1 82 /* control type: command, callback function: CB_OnMinus10k */ -#define PANEL_MINUS10KDDS4 83 /* control type: command, callback function: CB_OnMinus10k */ -#define PANEL_MINUS10KDDS3 84 /* control type: command, callback function: CB_OnMinus10k */ -#define PANEL_MINUS10KDDS2 85 /* control type: command, callback function: CB_OnMinus10k */ -#define PANEL_PLUS10KDDS4 86 /* control type: command, callback function: CB_OnPlus10k */ -#define PANEL_PLUS10KDDS3 87 /* control type: command, callback function: CB_OnPlus10k */ -#define PANEL_PLUS10KDDS1 88 /* control type: command, callback function: CB_OnPlus10k */ -#define PANEL_PLUS10KDDS2 89 /* control type: command, callback function: CB_OnPlus10k */ -#define PANEL_TEXTMSG_11 90 /* control type: textMsg, callback function: (none) */ -#define PANEL_MATHSTRING5 91 /* control type: textBox, callback function: CB_ChangeMath */ -#define PANEL_SPLITTER_8 92 /* control type: splitter, callback function: (none) */ -#define PANEL_MJD 93 /* control type: numeric, callback function: (none) */ -#define PANEL_UTC 94 /* control type: numeric, callback function: (none) */ -#define PANEL_TIME 95 /* control type: string, callback function: (none) */ -#define PANEL_DATE 96 /* control type: string, callback function: (none) */ -#define PANEL_CHECKBOX_MATH3AUTOSAV 97 /* control type: radioButton, callback function: CB_OnAutoSaveSr */ -#define PANEL_CHECKBOX_MATH2AUTOSAV 98 /* control type: radioButton, callback function: CB_OnAutoSaveHg */ -#define PANEL_CHOOSESAVEFILE 99 /* control type: command, callback function: OnChooseSaveFile */ -#define PANEL_SPLITTER_14 100 /* control type: splitter, callback function: (none) */ -#define PANEL_SPLITTER_13 101 /* control type: splitter, callback function: (none) */ -#define PANEL_DDS4 102 /* control type: numeric, callback function: CB_ChangeDDSOut */ -#define PANEL_SPLITTER_2 103 /* control type: splitter, callback function: (none) */ -#define PANEL_DDS3 104 /* control type: numeric, callback function: CB_ChangeDDSOut */ -#define PANEL_N1CALCULUS 105 /* control type: command, callback function: CB_OnNCalculus */ -#define PANEL_FINDSIGN3 106 /* control type: command, callback function: CB_OnFindSign */ -#define PANEL_SIGN3 107 /* control type: numeric, callback function: (none) */ -#define PANEL_FINDSIGN2 108 /* control type: command, callback function: CB_OnFindSign */ -#define PANEL_SIGN2 109 /* control type: numeric, callback function: (none) */ -#define PANEL_FINDSIGN1 110 /* control type: command, callback function: CB_OnFindSign */ -#define PANEL_SIGN1 111 /* control type: numeric, callback function: (none) */ -#define PANEL_FIND10K3 112 /* control type: command, callback function: CB_OnFind275K */ -#define PANEL_FIND275K2 113 /* control type: command, callback function: CB_OnFind275K */ -#define PANEL_RESETSLOPE 114 /* control type: command, callback function: CB_OnResetSlope */ -#define PANEL_CHECKBOX_STOPIFAUTODE 115 /* control type: radioButton, callback function: CB_OnAutoStopSlopeCancellingIfDelock */ -#define PANEL_CHECKBOX_RECENTER 116 /* control type: radioButton, callback function: CB_OnReCentering */ -#define PANEL_CHECKBOX_KEEPSLOPE 117 /* control type: radioButton, callback function: CB_OnCROX */ -#define PANEL_CHECKBOX_KEEP 118 /* control type: radioButton, callback function: CB_OnCROX */ -#define PANEL_STARTCANCEL 119 /* control type: textButton, callback function: CB_OnStartSlopeCancelling */ -#define PANEL_LED1 120 /* control type: LED, callback function: (none) */ -#define PANEL_LED2 121 /* control type: LED, callback function: (none) */ -#define PANEL_SLOPE_REFERENCE 122 /* control type: ring, callback function: CB_OnSlopeReference */ -#define PANEL_ESTIMATE_N3 123 /* control type: command, callback function: CB_OnEstimateN */ +#define PANEL_CENTERFREQUENCY 40 /* control type: numeric, callback function: (none) */ +#define PANEL_SLOPETOCANCEL 41 /* control type: numeric, callback function: CB_SetSlope */ +#define PANEL_MATH4 42 /* control type: numeric, callback function: (none) */ +#define PANEL_MATH5 43 /* control type: numeric, callback function: (none) */ +#define PANEL_MATH3 44 /* control type: numeric, callback function: (none) */ +#define PANEL_CHECKBOX_MATH5PLOT 45 /* control type: radioButton, callback function: CB_OnFreqPlot */ +#define PANEL_CHECKBOX_MATH4PLOT 46 /* control type: radioButton, callback function: CB_OnFreqPlot */ +#define PANEL_CHECKBOX_MATH4ALLAN 47 /* control type: radioButton, callback function: CB_OnAllanPlot */ +#define PANEL_DDS1STEP 48 /* control type: ring, callback function: CB_ChangeDDSStep */ +#define PANEL_TEXTMSG_15 49 /* control type: textMsg, callback function: (none) */ +#define PANEL_CHECKBOX_MATH5ALLAN 50 /* control type: radioButton, callback function: CB_OnAllanPlot */ +#define PANEL_CHECKBOX_MATH3PLOT 51 /* control type: radioButton, callback function: CB_OnFreqPlot */ +#define PANEL_CHECKBOX_MATH5SAVE 52 /* control type: radioButton, callback function: (none) */ +#define PANEL_CHECKBOX_MATH3SAVE_2 53 /* control type: radioButton, callback function: CB_OnSaveSr */ +#define PANEL_CHECKBOX_MATH3ALLAN 54 /* control type: radioButton, callback function: CB_OnAllanPlot */ +#define PANEL_MATHSTRING4 55 /* control type: string, callback function: CB_ChangeMath */ +#define PANEL_TEXTMSG_17 56 /* control type: textMsg, callback function: (none) */ +#define PANEL_MATH2 57 /* control type: numeric, callback function: (none) */ +#define PANEL_SPLITTER_15 58 /* control type: splitter, callback function: (none) */ +#define PANEL_SPLITTER_12 59 /* control type: splitter, callback function: (none) */ +#define PANEL_CHECKBOX_MATH2PLOT 60 /* control type: radioButton, callback function: CB_OnFreqPlot */ +#define PANEL_CHECKBOX_MATH3SAVE 61 /* control type: radioButton, callback function: CB_OnSaveHg */ +#define PANEL_CHECKBOX_MATH2SAVE 62 /* control type: radioButton, callback function: CB_OnSaveOpt */ +#define PANEL_CHECKBOX_MATH2ALLAN 63 /* control type: radioButton, callback function: CB_OnAllanPlot */ +#define PANEL_TEXTMSG_7 64 /* control type: textMsg, callback function: (none) */ +#define PANEL_MATHSTRING3 65 /* control type: string, callback function: CB_ChangeMath */ +#define PANEL_MATH1 66 /* control type: numeric, callback function: (none) */ +#define PANEL_SPLITTER_6 67 /* control type: splitter, callback function: (none) */ +#define PANEL_TEXTMSG_18 68 /* control type: textMsg, callback function: (none) */ +#define PANEL_TEXTMSG_6 69 /* control type: textMsg, callback function: (none) */ +#define PANEL_TEXTMSG_8 70 /* control type: textMsg, callback function: (none) */ +#define PANEL_TEXTMSG_19 71 /* control type: textMsg, callback function: (none) */ +#define PANEL_MATHSTRING1 72 /* control type: string, callback function: CB_ChangeMath */ +#define PANEL_TEXTMSG_9 73 /* control type: textMsg, callback function: (none) */ +#define PANEL_TEXTMSG_10 74 /* control type: textMsg, callback function: (none) */ +#define PANEL_MATHSTRING2 75 /* control type: string, callback function: CB_ChangeMath */ +#define PANEL_TEXTMSG_16 76 /* control type: textMsg, callback function: (none) */ +#define PANEL_SPLITTER_11 77 /* control type: splitter, callback function: (none) */ +#define PANEL_SPLITTER_16 78 /* control type: splitter, callback function: (none) */ +#define PANEL_SPLITTER_9 79 /* control type: splitter, callback function: (none) */ +#define PANEL_SPLITTER_3 80 /* control type: splitter, callback function: (none) */ +#define PANEL_MINUS10KDDS1 81 /* control type: command, callback function: CB_OnMinus10k */ +#define PANEL_MINUS10KDDS4 82 /* control type: command, callback function: CB_OnMinus10k */ +#define PANEL_MINUS10KDDS3 83 /* control type: command, callback function: CB_OnMinus10k */ +#define PANEL_MINUS10KDDS2 84 /* control type: command, callback function: CB_OnMinus10k */ +#define PANEL_PLUS10KDDS4 85 /* control type: command, callback function: CB_OnPlus10k */ +#define PANEL_PLUS10KDDS3 86 /* control type: command, callback function: CB_OnPlus10k */ +#define PANEL_PLUS10KDDS1 87 /* control type: command, callback function: CB_OnPlus10k */ +#define PANEL_PLUS10KDDS2 88 /* control type: command, callback function: CB_OnPlus10k */ +#define PANEL_TEXTMSG_11 89 /* control type: textMsg, callback function: (none) */ +#define PANEL_MATHSTRING5 90 /* control type: textBox, callback function: CB_ChangeMath */ +#define PANEL_SPLITTER_8 91 /* control type: splitter, callback function: (none) */ +#define PANEL_MJD 92 /* control type: numeric, callback function: (none) */ +#define PANEL_UTC 93 /* control type: numeric, callback function: (none) */ +#define PANEL_TIME 94 /* control type: string, callback function: (none) */ +#define PANEL_DATE 95 /* control type: string, callback function: (none) */ +#define PANEL_CHECKBOX_MATH3AUTOSAV 96 /* control type: radioButton, callback function: CB_OnAutoSaveSr */ +#define PANEL_CHECKBOX_MATH2AUTOSAV 97 /* control type: radioButton, callback function: CB_OnAutoSaveHg */ +#define PANEL_CHOOSESAVEFILE 98 /* control type: command, callback function: OnChooseSaveFile */ +#define PANEL_SPLITTER_14 99 /* control type: splitter, callback function: (none) */ +#define PANEL_SPLITTER_13 100 /* control type: splitter, callback function: (none) */ +#define PANEL_DDS4 101 /* control type: numeric, callback function: CB_ChangeDDSOut */ +#define PANEL_SPLITTER_2 102 /* control type: splitter, callback function: (none) */ +#define PANEL_DDS3 103 /* control type: numeric, callback function: CB_ChangeDDSOut */ +#define PANEL_N1CALCULUS 104 /* control type: command, callback function: CB_OnNCalculus */ +#define PANEL_FINDSIGN3 105 /* control type: command, callback function: CB_OnFindSign */ +#define PANEL_SIGN3 106 /* control type: numeric, callback function: (none) */ +#define PANEL_FINDSIGN2 107 /* control type: command, callback function: CB_OnFindSign */ +#define PANEL_SIGN2 108 /* control type: numeric, callback function: (none) */ +#define PANEL_FINDSIGN1 109 /* control type: command, callback function: CB_OnFindSign */ +#define PANEL_SIGN1 110 /* control type: numeric, callback function: (none) */ +#define PANEL_FIND10K3 111 /* control type: command, callback function: CB_OnFind275K */ +#define PANEL_FIND275K2 112 /* control type: command, callback function: CB_OnFind275K */ +#define PANEL_RESETSLOPE 113 /* control type: command, callback function: CB_OnResetSlope */ +#define PANEL_CHECKBOX_STOPIFAUTODE 114 /* control type: radioButton, callback function: CB_OnAutoStopSlopeCancellingIfDelock */ +#define PANEL_CHECKBOX_RECENTER 115 /* control type: radioButton, callback function: CB_OnReCentering */ +#define PANEL_CHECKBOX_KEEPSLOPE 116 /* control type: radioButton, callback function: CB_OnCROX */ +#define PANEL_CHECKBOX_KEEP 117 /* control type: radioButton, callback function: CB_OnCROX */ +#define PANEL_STARTCANCEL 118 /* control type: textButton, callback function: CB_OnStartSlopeCancelling */ +#define PANEL_LED1 119 /* control type: LED, callback function: (none) */ +#define PANEL_LED2 120 /* control type: LED, callback function: (none) */ +#define PANEL_SLOPE_REFERENCE 121 /* control type: ring, callback function: CB_OnSlopeReference */ +#define PANEL_ESTIMATE_N3 122 /* control type: command, callback function: CB_OnEstimateN */ /* Menu Bars, Menus, and Menu Items: */