Mercurial > hg > fxanalyse
diff FXAnalyse.h @ 17:9cadd12e7722
Implement N3 measurement. Large code cleanup.
| author | Daniele Nicolodi <daniele.nicolodi@obspm.fr> |
|---|---|
| date | Wed, 18 Jul 2012 18:48:36 +0200 |
| parents | bd7501b65f56 |
| children | b7b3b5f1c5a6 |
line wrap: on
line diff
--- a/FXAnalyse.h Wed Jul 18 18:47:44 2012 +0200 +++ b/FXAnalyse.h Wed Jul 18 18:48:36 2012 +0200 @@ -24,7 +24,7 @@ #define CALCN1_NUMERIC_5 6 /* control type: numeric, callback function: (none) */ #define CALCN1_N_1 7 /* control type: numeric, callback function: (none) */ #define CALCN1_NUMERIC_6 8 /* control type: numeric, callback function: (none) */ -#define CALCN1_ACCEPTN1 9 /* control type: command, callback function: OnAcceptN */ +#define CALCN1_ACCEPTN 9 /* control type: command, callback function: CB_OnAcceptN */ #define CALCN1_CHECKBOX_2 10 /* control type: radioButton, callback function: (none) */ #define CALCN1_TEXTMSG_2 11 /* control type: textMsg, callback function: (none) */ #define CALCN1_SLOPE 12 /* control type: numeric, callback function: (none) */ @@ -43,7 +43,7 @@ #define CALCN2_N_2 6 /* control type: numeric, callback function: (none) */ #define CALCN2_STOP2 7 /* control type: command, callback function: CB_OnNStop */ #define CALCN2_COMMANDBUTTON 8 /* control type: command, callback function: CB_OnStartNCalculus */ -#define CALCN2_ACCEPTN1 9 /* control type: command, callback function: OnAcceptN */ +#define CALCN2_ACCEPTN 9 /* control type: command, callback function: CB_OnAcceptN */ #define CALCN2_SLOPETIME 10 /* control type: numeric, callback function: CB_OnSlopeTime */ #define CALCN3 4 @@ -52,11 +52,20 @@ #define CALCN3_DELTAFREQ 4 /* control type: numeric, callback function: CB_OnDeltaFreq */ #define CALCN3_INTEGRATIONTIME 5 /* control type: numeric, callback function: CB_OnIntegrationTime */ #define CALCN3_N_3 6 /* control type: numeric, callback function: (none) */ -#define CALCN3_COMMANDBUTTON_2 7 /* control type: command, callback function: CB_OnN3Stop */ -#define CALCN3_COMMANDBUTTON 8 /* control type: command, callback function: CB_OnStartN3Calculus */ -#define CALCN3_ACCEPTN1 9 /* control type: command, callback function: OnAcceptN */ +#define CALCN3_STOP2 7 /* control type: command, callback function: CB_OnNStop */ +#define CALCN3_COMMANDBUTTON 8 /* control type: command, callback function: CB_OnStartNCalculus */ +#define CALCN3_ACCEPTN 9 /* control type: command, callback function: CB_OnAcceptN */ +#define CALCN3_SLOPETIME 10 /* control type: numeric, callback function: CB_OnSlopeTime */ -#define PANEL 5 /* callback function: CB_OnEventMain */ +#define ESTIMATEN3 5 +#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) */ +#define ESTIMATEN3_SET 5 /* control type: command, callback function: CB_OnNEstimateSet */ +#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_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 */ @@ -87,107 +96,104 @@ #define PANEL_TEXTMSG_2 29 /* control type: textMsg, callback function: (none) */ #define PANEL_SLOPETIME 30 /* control type: numeric, callback function: CB_ChangeSlopeTime */ #define PANEL_DDS1 31 /* control type: numeric, callback function: CB_ChangeDDSOut */ -#define PANEL_SPLITTER_4 32 /* control type: splitter, callback function: (none) */ -#define PANEL_SPLITTER 33 /* control type: splitter, callback function: (none) */ -#define PANEL_CHANGENDIV 34 /* control type: numeric, callback function: CB_OnChangeNdiv */ -#define PANEL_DDSFREPOUT 35 /* control type: numeric, callback function: CB_ChangeDDSOut */ -#define PANEL_N3CHOICE 36 /* control type: numeric, callback function: CB_ChangeN */ -#define PANEL_N3CALCULUS 37 /* control type: command, callback function: CB_OnNCalculus */ -#define PANEL_N1CHOICE 38 /* control type: numeric, callback function: CB_ChangeN */ -#define PANEL_N2CHOICE 39 /* control type: numeric, callback function: CB_ChangeN */ -#define PANEL_N2CALCULUS 40 /* control type: command, callback function: CB_OnNCalculus */ -#define PANEL_TEXTMSG_14 41 /* control type: textMsg, callback function: (none) */ -#define PANEL_TEXTMSG_3 42 /* control type: textMsg, callback function: (none) */ -#define PANEL_TEXTMSG_4 43 /* control type: textMsg, callback function: (none) */ -#define PANEL_DDS4STEP 44 /* control type: ring, callback function: CB_ChangeDDSStep */ -#define PANEL_DDS3STEP 45 /* control type: ring, callback function: CB_ChangeDDSStep */ -#define PANEL_DDS2STEP 46 /* control type: ring, callback function: CB_ChangeDDSStep */ -#define PANEL_CENTERFREQUENCY 47 /* control type: numeric, callback function: (none) */ -#define PANEL_SLOPETOCANCEL 48 /* control type: numeric, callback function: (none) */ -#define PANEL_MATH4 49 /* control type: numeric, callback function: (none) */ -#define PANEL_MATH5 50 /* control type: numeric, callback function: (none) */ -#define PANEL_MATH3 51 /* control type: numeric, callback function: (none) */ -#define PANEL_CHECKBOX_MATH5PLOT 52 /* control type: radioButton, callback function: CB_OnFreqPlot */ -#define PANEL_CHECKBOX_MATH4PLOT 53 /* control type: radioButton, callback function: CB_OnFreqPlot */ -#define PANEL_CHECKBOX_MATH4ALLAN 54 /* control type: radioButton, callback function: CB_OnAllanPlot */ -#define PANEL_DDS1STEP 55 /* control type: ring, callback function: CB_ChangeDDSStep */ -#define PANEL_TEXTMSG_15 56 /* control type: textMsg, callback function: (none) */ -#define PANEL_CHECKBOX_MATH5ALLAN 57 /* control type: radioButton, callback function: CB_OnAllanPlot */ -#define PANEL_CHECKBOX_MATH3PLOT 58 /* control type: radioButton, callback function: CB_OnFreqPlot */ -#define PANEL_CHECKBOX_MATH5SAVE 59 /* control type: radioButton, callback function: (none) */ -#define PANEL_CHECKBOX_MATH3SAVE_2 60 /* control type: radioButton, callback function: CB_OnSaveSr */ -#define PANEL_CHECKBOX_MATH3ALLAN 61 /* control type: radioButton, callback function: CB_OnAllanPlot */ -#define PANEL_DDSFREPSTEP 62 /* control type: ring, callback function: CB_ChangeDDSStep */ -#define PANEL_DDSFREPAMP 63 /* control type: numeric, callback function: CB_ChangeDDSAmpli */ -#define PANEL_MATHSTRING4 64 /* control type: string, callback function: CB_ChangeMath */ -#define PANEL_TEXTMSG_17 65 /* control type: textMsg, callback function: (none) */ -#define PANEL_MATH2 66 /* control type: numeric, callback function: (none) */ -#define PANEL_SPLITTER_15 67 /* control type: splitter, callback function: (none) */ -#define PANEL_SPLITTER_12 68 /* control type: splitter, callback function: (none) */ -#define PANEL_CHECKBOX_MATH2PLOT 69 /* control type: radioButton, callback function: CB_OnFreqPlot */ -#define PANEL_CHECKBOX_MATH3SAVE 70 /* control type: radioButton, callback function: CB_OnSaveHg */ -#define PANEL_CHECKBOX_MATH2SAVE 71 /* control type: radioButton, callback function: CB_OnSaveOpt */ -#define PANEL_CHECKBOX_MATH2ALLAN 72 /* control type: radioButton, callback function: CB_OnAllanPlot */ -#define PANEL_TEXTMSG_7 73 /* control type: textMsg, callback function: (none) */ -#define PANEL_MATHSTRING3 74 /* control type: string, callback function: CB_ChangeMath */ -#define PANEL_MATH1 75 /* control type: numeric, callback function: (none) */ -#define PANEL_SPLITTER_6 76 /* control type: splitter, callback function: (none) */ -#define PANEL_TEXTMSG_18 77 /* control type: textMsg, callback function: (none) */ -#define PANEL_TEXTMSG_6 78 /* control type: textMsg, callback function: (none) */ -#define PANEL_TEXTMSG_8 79 /* control type: textMsg, callback function: (none) */ -#define PANEL_TEXTMSG_19 80 /* control type: textMsg, callback function: (none) */ -#define PANEL_MATHSTRING1 81 /* control type: string, callback function: CB_ChangeMath */ -#define PANEL_TEXTMSG_9 82 /* control type: textMsg, callback function: (none) */ -#define PANEL_TEXTMSG_10 83 /* control type: textMsg, callback function: (none) */ -#define PANEL_MATHSTRING2 84 /* control type: string, callback function: CB_ChangeMath */ -#define PANEL_SPLITTER_10 85 /* control type: splitter, callback function: (none) */ -#define PANEL_TEXTMSG_16 86 /* control type: textMsg, callback function: (none) */ -#define PANEL_SPLITTER_11 87 /* control type: splitter, callback function: (none) */ -#define PANEL_SPLITTER_9 88 /* control type: splitter, callback function: (none) */ -#define PANEL_SPLITTER_3 89 /* control type: splitter, callback function: (none) */ -#define PANEL_MINUS10KDDS1 90 /* control type: command, callback function: CB_OnMinus10k */ -#define PANEL_MINUS10KDDS4 91 /* control type: command, callback function: CB_OnMinus10k */ -#define PANEL_MINUS10KDDS3 92 /* control type: command, callback function: CB_OnMinus10k */ -#define PANEL_MINUS10KDDS2 93 /* control type: command, callback function: CB_OnMinus10k */ -#define PANEL_PLUS10KDDS4 94 /* control type: command, callback function: CB_OnPlus10k */ -#define PANEL_MINUS275K 95 /* control type: command, callback function: CB_OnMinus275k */ -#define PANEL_PLUS10KDDS3 96 /* control type: command, callback function: CB_OnPlus10k */ -#define PANEL_PLUS10KDDS1 97 /* control type: command, callback function: CB_OnPlus10k */ -#define PANEL_PLUS10KDDS2 98 /* control type: command, callback function: CB_OnPlus10k */ -#define PANEL_PLUS275K 99 /* control type: command, callback function: CB_OnPlus275k */ -#define PANEL_TEXTMSG_11 100 /* control type: textMsg, callback function: (none) */ -#define PANEL_MATHSTRING5 101 /* control type: textBox, callback function: CB_ChangeMath */ -#define PANEL_SPLITTER_8 102 /* control type: splitter, callback function: (none) */ -#define PANEL_MJD 103 /* control type: numeric, callback function: (none) */ -#define PANEL_UTC 104 /* control type: numeric, callback function: (none) */ -#define PANEL_TIME 105 /* control type: string, callback function: (none) */ -#define PANEL_DATE 106 /* control type: string, callback function: (none) */ -#define PANEL_CHECKBOX_MATH3AUTOSAV 107 /* control type: radioButton, callback function: CB_OnAutoSaveSr */ -#define PANEL_CHECKBOX_MATH2AUTOSAV 108 /* control type: radioButton, callback function: CB_OnAutoSaveHg */ -#define PANEL_CHOOSESAVEFILE 109 /* control type: command, callback function: OnChooseSaveFile */ -#define PANEL_SPLITTER_14 110 /* control type: splitter, callback function: (none) */ -#define PANEL_SPLITTER_13 111 /* control type: splitter, callback function: (none) */ -#define PANEL_DDS4 112 /* control type: numeric, callback function: CB_ChangeDDSOut */ -#define PANEL_SPLITTER_2 113 /* control type: splitter, callback function: (none) */ -#define PANEL_DDS3 114 /* control type: numeric, callback function: CB_ChangeDDSOut */ -#define PANEL_N1CALCULUS 115 /* control type: command, callback function: CB_OnNCalculus */ -#define PANEL_FINDSIGN3 116 /* control type: command, callback function: CB_OnFindSign */ -#define PANEL_SIGN3 117 /* control type: numeric, callback function: (none) */ -#define PANEL_FINDSIGN2 118 /* control type: command, callback function: CB_OnFindSign */ -#define PANEL_SIGN2 119 /* control type: numeric, callback function: (none) */ -#define PANEL_FINDSIGN1 120 /* control type: command, callback function: CB_OnFindSign */ -#define PANEL_SIGN1 121 /* control type: numeric, callback function: (none) */ -#define PANEL_FIND10K3 122 /* control type: command, callback function: CB_OnFind275K */ -#define PANEL_FIND275K2 123 /* control type: command, callback function: CB_OnFind275K */ -#define PANEL_RESETSLOPE 124 /* control type: command, callback function: CB_OnResetSlope */ -#define PANEL_CHECKBOX_STOPIFAUTODE 125 /* control type: radioButton, callback function: CB_OnAutoStopSlopeCancellingIfDelock */ -#define PANEL_CHECKBOX_RECENTER 126 /* control type: radioButton, callback function: CB_OnReCentering */ -#define PANEL_CHECKBOX_KEEPSLOPE 127 /* control type: radioButton, callback function: CB_OnCROX */ -#define PANEL_CHECKBOX_KEEP 128 /* control type: radioButton, callback function: CB_OnCROX */ -#define PANEL_STARTCANCEL 129 /* control type: textButton, callback function: CB_OnStartSlopeCancelling */ -#define PANEL_LED1 130 /* control type: LED, callback function: (none) */ -#define PANEL_LED2 131 /* control type: LED, callback function: (none) */ -#define PANEL_SLOPE_REFERENCE 132 /* control type: ring, callback function: SlopeReference_cb */ +#define PANEL_SPLITTER 32 /* control type: splitter, callback function: (none) */ +#define PANEL_CHANGENDIV 33 /* control type: numeric, callback function: CB_OnChangeNdiv */ +#define PANEL_DDSFREPOUT 34 /* control type: numeric, callback function: CB_ChangeDDSOut */ +#define PANEL_N3CHOICE 35 /* control type: numeric, callback function: CB_ChangeN */ +#define PANEL_N3CALCULUS 36 /* control type: command, callback function: CB_OnNCalculus */ +#define PANEL_N1CHOICE 37 /* control type: numeric, callback function: CB_ChangeN */ +#define PANEL_N2CHOICE 38 /* control type: numeric, callback function: CB_ChangeN */ +#define PANEL_N2CALCULUS 39 /* control type: command, callback function: CB_OnNCalculus */ +#define PANEL_DDS4STEP 40 /* control type: ring, callback function: CB_ChangeDDSStep */ +#define PANEL_DDS3STEP 41 /* control type: ring, callback function: CB_ChangeDDSStep */ +#define PANEL_DDS2STEP 42 /* control type: ring, callback function: CB_ChangeDDSStep */ +#define PANEL_CENTERFREQUENCY 43 /* control type: numeric, callback function: (none) */ +#define PANEL_SLOPETOCANCEL 44 /* control type: numeric, callback function: (none) */ +#define PANEL_MATH4 45 /* control type: numeric, callback function: (none) */ +#define PANEL_MATH5 46 /* control type: numeric, callback function: (none) */ +#define PANEL_MATH3 47 /* control type: numeric, callback function: (none) */ +#define PANEL_CHECKBOX_MATH5PLOT 48 /* control type: radioButton, callback function: CB_OnFreqPlot */ +#define PANEL_CHECKBOX_MATH4PLOT 49 /* control type: radioButton, callback function: CB_OnFreqPlot */ +#define PANEL_CHECKBOX_MATH4ALLAN 50 /* control type: radioButton, callback function: CB_OnAllanPlot */ +#define PANEL_DDS1STEP 51 /* control type: ring, callback function: CB_ChangeDDSStep */ +#define PANEL_TEXTMSG_15 52 /* control type: textMsg, callback function: (none) */ +#define PANEL_CHECKBOX_MATH5ALLAN 53 /* control type: radioButton, callback function: CB_OnAllanPlot */ +#define PANEL_CHECKBOX_MATH3PLOT 54 /* control type: radioButton, callback function: CB_OnFreqPlot */ +#define PANEL_CHECKBOX_MATH5SAVE 55 /* control type: radioButton, callback function: (none) */ +#define PANEL_CHECKBOX_MATH3SAVE_2 56 /* control type: radioButton, callback function: CB_OnSaveSr */ +#define PANEL_CHECKBOX_MATH3ALLAN 57 /* control type: radioButton, callback function: CB_OnAllanPlot */ +#define PANEL_DDSFREPSTEP 58 /* control type: ring, callback function: CB_ChangeDDSStep */ +#define PANEL_DDSFREPAMP 59 /* control type: numeric, callback function: CB_ChangeDDSAmpli */ +#define PANEL_MATHSTRING4 60 /* control type: string, callback function: CB_ChangeMath */ +#define PANEL_TEXTMSG_17 61 /* control type: textMsg, callback function: (none) */ +#define PANEL_MATH2 62 /* control type: numeric, callback function: (none) */ +#define PANEL_SPLITTER_15 63 /* control type: splitter, callback function: (none) */ +#define PANEL_SPLITTER_12 64 /* control type: splitter, callback function: (none) */ +#define PANEL_CHECKBOX_MATH2PLOT 65 /* control type: radioButton, callback function: CB_OnFreqPlot */ +#define PANEL_CHECKBOX_MATH3SAVE 66 /* control type: radioButton, callback function: CB_OnSaveHg */ +#define PANEL_CHECKBOX_MATH2SAVE 67 /* control type: radioButton, callback function: CB_OnSaveOpt */ +#define PANEL_CHECKBOX_MATH2ALLAN 68 /* control type: radioButton, callback function: CB_OnAllanPlot */ +#define PANEL_TEXTMSG_7 69 /* control type: textMsg, callback function: (none) */ +#define PANEL_MATHSTRING3 70 /* control type: string, callback function: CB_ChangeMath */ +#define PANEL_MATH1 71 /* control type: numeric, callback function: (none) */ +#define PANEL_SPLITTER_6 72 /* control type: splitter, callback function: (none) */ +#define PANEL_TEXTMSG_18 73 /* control type: textMsg, callback function: (none) */ +#define PANEL_TEXTMSG_6 74 /* control type: textMsg, callback function: (none) */ +#define PANEL_TEXTMSG_8 75 /* control type: textMsg, callback function: (none) */ +#define PANEL_TEXTMSG_19 76 /* control type: textMsg, callback function: (none) */ +#define PANEL_MATHSTRING1 77 /* control type: string, callback function: CB_ChangeMath */ +#define PANEL_TEXTMSG_9 78 /* control type: textMsg, callback function: (none) */ +#define PANEL_TEXTMSG_10 79 /* control type: textMsg, callback function: (none) */ +#define PANEL_MATHSTRING2 80 /* control type: string, callback function: CB_ChangeMath */ +#define PANEL_TEXTMSG_16 81 /* control type: textMsg, callback function: (none) */ +#define PANEL_SPLITTER_11 82 /* control type: splitter, callback function: (none) */ +#define PANEL_SPLITTER_16 83 /* control type: splitter, callback function: (none) */ +#define PANEL_SPLITTER_9 84 /* control type: splitter, callback function: (none) */ +#define PANEL_SPLITTER_3 85 /* control type: splitter, callback function: (none) */ +#define PANEL_MINUS10KDDS1 86 /* control type: command, callback function: CB_OnMinus10k */ +#define PANEL_MINUS10KDDS4 87 /* control type: command, callback function: CB_OnMinus10k */ +#define PANEL_MINUS10KDDS3 88 /* control type: command, callback function: CB_OnMinus10k */ +#define PANEL_MINUS10KDDS2 89 /* control type: command, callback function: CB_OnMinus10k */ +#define PANEL_PLUS10KDDS4 90 /* control type: command, callback function: CB_OnPlus10k */ +#define PANEL_MINUS275K 91 /* control type: command, callback function: CB_OnMinus275k */ +#define PANEL_PLUS10KDDS3 92 /* control type: command, callback function: CB_OnPlus10k */ +#define PANEL_PLUS10KDDS1 93 /* control type: command, callback function: CB_OnPlus10k */ +#define PANEL_PLUS10KDDS2 94 /* control type: command, callback function: CB_OnPlus10k */ +#define PANEL_PLUS275K 95 /* control type: command, callback function: CB_OnPlus275k */ +#define PANEL_TEXTMSG_11 96 /* control type: textMsg, callback function: (none) */ +#define PANEL_MATHSTRING5 97 /* control type: textBox, callback function: CB_ChangeMath */ +#define PANEL_SPLITTER_8 98 /* control type: splitter, callback function: (none) */ +#define PANEL_MJD 99 /* control type: numeric, callback function: (none) */ +#define PANEL_UTC 100 /* control type: numeric, callback function: (none) */ +#define PANEL_TIME 101 /* control type: string, callback function: (none) */ +#define PANEL_DATE 102 /* control type: string, callback function: (none) */ +#define PANEL_CHECKBOX_MATH3AUTOSAV 103 /* control type: radioButton, callback function: CB_OnAutoSaveSr */ +#define PANEL_CHECKBOX_MATH2AUTOSAV 104 /* control type: radioButton, callback function: CB_OnAutoSaveHg */ +#define PANEL_CHOOSESAVEFILE 105 /* control type: command, callback function: OnChooseSaveFile */ +#define PANEL_SPLITTER_14 106 /* control type: splitter, callback function: (none) */ +#define PANEL_SPLITTER_13 107 /* control type: splitter, callback function: (none) */ +#define PANEL_DDS4 108 /* control type: numeric, callback function: CB_ChangeDDSOut */ +#define PANEL_SPLITTER_2 109 /* control type: splitter, callback function: (none) */ +#define PANEL_DDS3 110 /* control type: numeric, callback function: CB_ChangeDDSOut */ +#define PANEL_N1CALCULUS 111 /* control type: command, callback function: CB_OnNCalculus */ +#define PANEL_FINDSIGN3 112 /* control type: command, callback function: CB_OnFindSign */ +#define PANEL_SIGN3 113 /* control type: numeric, callback function: (none) */ +#define PANEL_FINDSIGN2 114 /* control type: command, callback function: CB_OnFindSign */ +#define PANEL_SIGN2 115 /* control type: numeric, callback function: (none) */ +#define PANEL_FINDSIGN1 116 /* control type: command, callback function: CB_OnFindSign */ +#define PANEL_SIGN1 117 /* control type: numeric, callback function: (none) */ +#define PANEL_FIND10K3 118 /* control type: command, callback function: CB_OnFind275K */ +#define PANEL_FIND275K2 119 /* control type: command, callback function: CB_OnFind275K */ +#define PANEL_RESETSLOPE 120 /* control type: command, callback function: CB_OnResetSlope */ +#define PANEL_CHECKBOX_STOPIFAUTODE 121 /* control type: radioButton, callback function: CB_OnAutoStopSlopeCancellingIfDelock */ +#define PANEL_CHECKBOX_RECENTER 122 /* control type: radioButton, callback function: CB_OnReCentering */ +#define PANEL_CHECKBOX_KEEPSLOPE 123 /* control type: radioButton, callback function: CB_OnCROX */ +#define PANEL_CHECKBOX_KEEP 124 /* control type: radioButton, callback function: CB_OnCROX */ +#define PANEL_STARTCANCEL 125 /* control type: textButton, callback function: CB_OnStartSlopeCancelling */ +#define PANEL_LED1 126 /* control type: LED, callback function: (none) */ +#define PANEL_LED2 127 /* control type: LED, callback function: (none) */ +#define PANEL_SLOPE_REFERENCE 128 /* control type: ring, callback function: CB_OnSlopeReference */ +#define PANEL_ESTIMATE_N3 129 /* control type: command, callback function: CB_OnEstimateN */ /* Menu Bars, Menus, and Menu Items: */ @@ -203,6 +209,7 @@ int CVICALLBACK CB_ChangeMath(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_ChangeN(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_ChangeSlopeTime(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); +int CVICALLBACK CB_OnAcceptN(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_OnAllanPlot(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_OnAutoSaveHg(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_OnAutoSaveSr(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); @@ -210,6 +217,7 @@ int CVICALLBACK CB_OnChangeNdiv(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_OnCROX(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_OnDeltaFreq(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); +int CVICALLBACK CB_OnEstimateN(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_OnEventMain(int panel, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_OnFind275K(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_OnFindSign(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); @@ -217,8 +225,10 @@ int CVICALLBACK CB_OnIntegrationTime(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_OnMinus10k(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_OnMinus275k(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); -int CVICALLBACK CB_OnN3Stop(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_OnNCalculus(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); +int CVICALLBACK CB_OnNEstimate(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); +int CVICALLBACK CB_OnNEstimateCancel(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); +int CVICALLBACK CB_OnNEstimateSet(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_OnNStop(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_OnPlus10k(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_OnPlus275k(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); @@ -227,17 +237,15 @@ int CVICALLBACK CB_OnSaveHg(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_OnSaveOpt(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_OnSaveSr(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); +int CVICALLBACK CB_OnSlopeReference(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_OnSlopeTime(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_OnStart(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); -int CVICALLBACK CB_OnStartN3Calculus(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_OnStartNCalculus(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_OnStartSlopeCancelling(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_OnStop(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_OnTimer(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); -int CVICALLBACK OnAcceptN(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK OnChooseSaveFile(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK QuitCallback(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); -int CVICALLBACK SlopeReference_cb(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); #ifdef __cplusplus