Mercurial > hg > fxanalyse

diff FXAnalyse.h @ 56:6e73fb3d94fa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Simplyfy slope measurement code
author Daniele Nicolodi <daniele.nicolodi@obspm.fr>
date Wed, 17 Oct 2012 15:52:36 +0200
parents 70980f27e1a4
children cd7b5903f168
line wrap: on
line diff
--- a/FXAnalyse.h	Thu Oct 11 11:59:32 2012 +0200
+++ b/FXAnalyse.h	Wed Oct 17 15:52:36 2012 +0200
@@ -165,7 +165,7 @@
 #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_STOPIFAUTODE      114     /* control type: radioButton, callback function: CB_OnStopSlopeCancellingOnUnlocked */
 #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 */
@@ -193,7 +193,6 @@
 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);
-int  CVICALLBACK CB_OnAutoStopSlopeCancellingIfDelock(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_OnDeltaFreq(int panel, int control, int event, void *callbackData, int eventData1, int eventData2);
@@ -220,6 +219,7 @@
 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_OnTimer(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 OnChooseSaveFile(int panel, int control, int event, void *callbackData, int eventData1, int eventData2);