# HG changeset patch # User Daniele Nicolodi # Date 1342720900 -7200 # Node ID b7b3b5f1c5a61d719e0f01821a7a08249fc8dbac # Parent 381da7b34cd8dfb246b2472306a800180cb3df4b Remove unused widgets from N1 measurement panel. Harmonize widgets names diff -r 381da7b34cd8 -r b7b3b5f1c5a6 FXAnalyse.c --- a/FXAnalyse.c Thu Jul 19 19:42:48 2012 +0200 +++ b/FXAnalyse.c Thu Jul 19 20:01:40 2012 +0200 @@ -697,11 +697,11 @@ SetCtrlVal(MainPanel, PANEL_SIGN1, Signe1); SetCtrlVal(MainPanel, PANEL_SIGN2, Signe2); SetCtrlVal(MainPanel, PANEL_SIGN3, Signe3); - SetCtrlVal(CalcN1Panel, CALCN1_N_1, N_1) ; + SetCtrlVal(CalcN1Panel, CALCN1_N, N_1) ; SetCtrlVal(CalcN1Panel, CALCN1_SLOPE, Slope_1) ; - SetCtrlVal(CalcN2Panel, CALCN2_N_2, N_2) ; + SetCtrlVal(CalcN2Panel, CALCN2_N, N_2) ; SetCtrlVal(CalcN2Panel, CALCN2_SLOPE, Beatslope_2) ; - SetCtrlVal(CalcN3Panel, CALCN3_N_3, N_3) ; + SetCtrlVal(CalcN3Panel, CALCN3_N, N_3) ; SetCtrlVal(CalcN3Panel, CALCN3_SLOPE, Slope_3) ; SetCtrlVal(MainPanel, PANEL_SLOPETOCANCEL, SlopeMath2); /*SetCtrlVal(MainPanel, PANEL_SLOPECANCELONOFF, OnOffMessage); */ @@ -1279,7 +1279,7 @@ // compute N3 N_3 = 1000.0 * DeltakHz_3 / (Frepplus_3 - Frepminus_3); - SetCtrlVal(CalcN3Panel, CALCN3_N_3, N_3); + SetCtrlVal(CalcN3Panel, CALCN3_N, N_3); t1_3=0.0; t2_3=0.0; diff -r 381da7b34cd8 -r b7b3b5f1c5a6 FXAnalyse.h --- a/FXAnalyse.h Thu Jul 19 19:42:48 2012 +0200 +++ b/FXAnalyse.h Thu Jul 19 20:01:40 2012 +0200 @@ -17,45 +17,34 @@ #define CALC3 1 #define CALCN1 2 -#define CALCN1_TARGET_2 2 /* control type: numeric, callback function: (none) */ -#define CALCN1_COMMANDBUTTON_3 3 /* control type: command, callback function: (none) */ -#define CALCN1_COMMANDBUTTON_4 4 /* control type: command, callback function: (none) */ -#define CALCN1_NUMERIC_4 5 /* control type: numeric, callback function: (none) */ -#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_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) */ -#define CALCN1_TEXTMSG_8 13 /* control type: textMsg, callback function: (none) */ -#define CALCN1_DELTAFREQ 14 /* control type: numeric, callback function: CB_OnDeltaFreq */ -#define CALCN1_SLOPETIME 15 /* control type: numeric, callback function: CB_OnSlopeTime */ -#define CALCN1_INTEGRATIONTIME 16 /* control type: numeric, callback function: CB_OnIntegrationTime */ -#define CALCN1_COMMANDBUTTON_2 17 /* control type: command, callback function: CB_OnNStop */ -#define CALCN1_COMMANDBUTTON 18 /* control type: command, callback function: CB_OnStartNCalculus */ +#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) */ +#define CALCN1_DELTAFREQ 5 /* control type: numeric, callback function: CB_OnDeltaFreq */ +#define CALCN1_SLOPETIME 6 /* control type: numeric, callback function: CB_OnSlopeTime */ +#define CALCN1_INTEGRATIONTIME 7 /* control type: numeric, callback function: CB_OnIntegrationTime */ +#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_SLOPE 2 /* control type: numeric, callback function: (none) */ -#define CALCN2_TEXTMSG_8 3 /* control type: textMsg, callback function: (none) */ -#define CALCN2_DELTAFREQ 4 /* control type: numeric, callback function: CB_OnDeltaFreq */ -#define CALCN2_INTEGRATIONTIME 5 /* control type: numeric, callback function: CB_OnIntegrationTime */ -#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_ACCEPTN 9 /* control type: command, callback function: CB_OnAcceptN */ -#define CALCN2_SLOPETIME 10 /* control type: numeric, callback function: CB_OnSlopeTime */ +#define CALCN2_DELTAFREQ 3 /* control type: numeric, callback function: CB_OnDeltaFreq */ +#define CALCN2_INTEGRATIONTIME 4 /* control type: numeric, callback function: CB_OnIntegrationTime */ +#define CALCN2_N 5 /* control type: numeric, callback function: (none) */ +#define CALCN2_STOP 6 /* control type: command, callback function: CB_OnNStop */ +#define CALCN2_START 7 /* control type: command, callback function: CB_OnStartNCalculus */ +#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_SLOPE 2 /* control type: numeric, callback function: (none) */ -#define CALCN3_TEXTMSG_8 3 /* control type: textMsg, callback function: (none) */ -#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_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 CALCN3_DELTAFREQ 3 /* control type: numeric, callback function: CB_OnDeltaFreq */ +#define CALCN3_INTEGRATIONTIME 4 /* control type: numeric, callback function: CB_OnIntegrationTime */ +#define CALCN3_N 5 /* control type: numeric, callback function: (none) */ +#define CALCN3_STOP 6 /* control type: command, callback function: CB_OnNStop */ +#define CALCN3_START 7 /* control type: command, callback function: CB_OnStartNCalculus */ +#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_N 2 /* control type: numeric, callback function: (none) */ diff -r 381da7b34cd8 -r b7b3b5f1c5a6 FXAnalyse.uir Binary file FXAnalyse.uir has changed