Mercurial > hg > fxanalyse
diff FXAnalyse.h @ 139:e04123ab79ef
Fix recenter
| author | Daniele Nicolodi <daniele.nicolodi@obspm.fr> |
|---|---|
| date | Wed, 22 Jan 2014 14:45:22 +0100 |
| parents | bd28161e5ac2 |
| children | fd085d61e4ca |
line wrap: on
line diff
--- a/FXAnalyse.h Wed Jan 22 14:45:07 2014 +0100 +++ b/FXAnalyse.h Wed Jan 22 14:45:22 2014 +0100 @@ -57,7 +57,7 @@ #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) */ -#define PANEL_RECENTER_INTERVAL 23 /* control type: numeric, callback function: CB_ChangeSlopeTime */ +#define PANEL_RECENTER_INTERVAL 23 /* control type: numeric, callback function: CB_RecenterInterval */ #define PANEL_SLOPETIME 24 /* control type: numeric, callback function: CB_ChangeSlopeTime */ #define PANEL_DEDRIFT_DDS_FREQ 25 /* control type: numeric, callback function: CB_DedriftDDSFreq */ #define PANEL_DDS1 26 /* control type: numeric, callback function: CB_ChangeDDSOut */ @@ -121,7 +121,7 @@ #define PANEL_SLOPE_REFERENCE 84 /* control type: ring, callback function: CB_OnSlopeReference */ #define PANEL_ESTIMATE_N3 85 /* control type: command, callback function: CB_OnEstimateN */ #define PANEL_INVERT_SLOPE_SIGN 86 /* control type: radioButton, callback function: CB_InvertSlopeSign */ -#define PANEL_RECENTER 87 /* control type: LED, callback function: CB_OnReCentering */ +#define PANEL_RECENTER 87 /* control type: LED, callback function: CB_RecenterEnable */ #define PANEL_MEASURE_SLOPE 88 /* control type: LED, callback function: CB_MeasureSlope */ #define PANEL_SLOPE_MEASURED 89 /* control type: numeric, callback function: (none) */ #define PANEL_RESET_DEDRIFT_DDS 90 /* control type: command, callback function: CB_ResetDedriftDDS */ @@ -148,9 +148,9 @@ #define PANEL_MATH3 111 /* control type: string, callback function: (none) */ #define PANEL_MATH2 112 /* control type: string, callback function: (none) */ #define PANEL_MATH1 113 /* control type: string, callback function: (none) */ -#define PANEL_CHECKBOX_3 114 /* control type: radioButton, callback function: (none) */ -#define PANEL_CHECKBOX_2 115 /* control type: radioButton, callback function: (none) */ -#define PANEL_CHECKBOX 116 /* control type: radioButton, callback function: (none) */ +#define PANEL_RECENTER_SR 114 /* control type: radioButton, callback function: CB_RecenterChannel */ +#define PANEL_RECENTER_HG 115 /* control type: radioButton, callback function: CB_RecenterChannel */ +#define PANEL_RECENTER_LO 116 /* control type: radioButton, callback function: CB_RecenterChannel */ /* Control Arrays: */ @@ -190,13 +190,15 @@ 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_OnReCentering(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_OnResetSlope(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_OnStart(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_OnStop(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_OnStopSlopeCancellingOnUnlocked(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); +int CVICALLBACK CB_RecenterChannel(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); +int CVICALLBACK CB_RecenterEnable(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); +int CVICALLBACK CB_RecenterInterval(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_ResetDedriftDDS(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_SetSlope(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_ShowLog(int panel, int control, int event, void *callbackData, int eventData1, int eventData2);