Mercurial > hg > fxanalyse
diff FXAnalyse.h @ 227:a2f99632a80c
Implement N estimate tacking into account measured beatnote frequency
| author | Daniele Nicolodi <daniele.nicolodi@obspm.fr> |
|---|---|
| date | Fri, 19 Sep 2014 19:04:47 +0200 |
| parents | fefe921a9784 |
| children | 52f882f39c16 |
line wrap: on
line diff
--- a/FXAnalyse.h Thu Sep 18 18:50:16 2014 +0200 +++ b/FXAnalyse.h Fri Sep 19 19:04:47 2014 +0200 @@ -25,11 +25,15 @@ #define ESTIMATEN 2 #define ESTIMATEN_N 2 /* control type: numeric, callback function: (none) */ -#define ESTIMATEN_ESTIMATE 3 /* control type: command, callback function: CB_OnNEstimate */ -#define ESTIMATEN_FREP 4 /* control type: numeric, callback function: (none) */ -#define ESTIMATEN_SET 5 /* control type: command, callback function: CB_OnNEstimateSet */ -#define ESTIMATEN_CANCEL 6 /* control type: command, callback function: CB_OnNEstimateCancel */ -#define ESTIMATEN_WAVELENGTH 7 /* control type: numeric, callback function: (none) */ +#define ESTIMATEN_FCOUNT 3 /* control type: numeric, callback function: (none) */ +#define ESTIMATEN_FDDS 4 /* control type: numeric, callback function: (none) */ +#define ESTIMATEN_FREP 5 /* control type: numeric, callback function: cb_onEstimateNChange */ +#define ESTIMATEN_CLOSE 6 /* control type: command, callback function: cb_onEstimateNClose */ +#define ESTIMATEN_SET 7 /* control type: command, callback function: cb_onEstimateNSet */ +#define ESTIMATEN_SIGN 8 /* control type: numeric, callback function: cb_onEstimateNChange */ +#define ESTIMATEN_FBEAT 9 /* control type: numeric, callback function: cb_onEstimateNChange */ +#define ESTIMATEN_FREQUENCY 10 /* control type: numeric, callback function: cb_onEstimateNFrequency */ +#define ESTIMATEN_WAVELENGTH 11 /* control type: numeric, callback function: cb_onEstimateNWaveleght */ #define LOGGING 3 /* callback function: CB_OnLoggingPanelEvent */ #define LOGGING_LOGGING 2 /* control type: textBox, callback function: (none) */ @@ -109,8 +113,8 @@ #define PANEL_CHECKBOX_KEEPSLOPE 73 /* control type: radioButton, callback function: CB_OnCROX */ #define PANEL_CHECKBOX_KEEP 74 /* control type: radioButton, callback function: CB_OnCROX */ #define PANEL_SLOPE_REFERENCE 75 /* control type: ring, callback function: CB_OnSlopeReference */ -#define PANEL_ESTIMATE_N2 76 /* control type: command, callback function: CB_OnEstimateN */ -#define PANEL_ESTIMATE_N3 77 /* control type: command, callback function: CB_OnEstimateN */ +#define PANEL_ESTIMATE_N2 76 /* control type: command, callback function: cb_onEstimateN */ +#define PANEL_ESTIMATE_N3 77 /* control type: command, callback function: cb_onEstimateN */ #define PANEL_INVERT_SLOPE_SIGN 78 /* control type: radioButton, callback function: CB_InvertSlopeSign */ #define PANEL_RECENTER 79 /* control type: LED, callback function: CB_RecenterEnable */ #define PANEL_MEASURE_SLOPE 80 /* control type: LED, callback function: CB_MeasureSlope */ @@ -171,15 +175,17 @@ int CVICALLBACK CB_OnAllanPlot(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); 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_OnEstimateN(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_onEstimateNChange(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); +int CVICALLBACK cb_onEstimateNClose(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); +int CVICALLBACK cb_onEstimateNFrequency(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); +int CVICALLBACK cb_onEstimateNSet(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); +int CVICALLBACK cb_onEstimateNWaveleght(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_OnFindSign(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_OnFreqPlot(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_OnLoggingPanelEvent(int panel, 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_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);