# HG changeset patch # User Daniele Nicolodi # Date 1391436641 -3600 # Node ID f4633519a62847ebb9c4dabe3f370e9e8b01d85c # Parent 4ab8099a18e27cbb9e28ee3728c668e666b84edb Remove controls for removed functionality diff -r 4ab8099a18e2 -r f4633519a628 FXAnalyse.h --- a/FXAnalyse.h Mon Feb 03 12:30:39 2014 +0100 +++ b/FXAnalyse.h Mon Feb 03 15:10:41 2014 +0100 @@ -49,108 +49,106 @@ #define PANEL_PLOT_Ch4 12 /* control type: radioButton, callback function: CB_OnFreqPlot */ #define PANEL_ADEV_Ch2 13 /* control type: radioButton, callback function: CB_OnAllanPlot */ #define PANEL_PLOT_Ch3 14 /* control type: radioButton, callback function: CB_OnFreqPlot */ -#define PANEL_CHECKBOX_CORRFREQU 15 /* control type: radioButton, callback function: CB_OnCROX */ -#define PANEL_ADEV_Ch1 16 /* control type: radioButton, callback function: CB_OnAllanPlot */ -#define PANEL_PLOT_Ch2 17 /* control type: radioButton, callback function: CB_OnFreqPlot */ -#define PANEL_PLOT_Math1 18 /* control type: radioButton, callback function: CB_OnFreqPlot */ -#define PANEL_PLOT_Ch1 19 /* control type: radioButton, callback function: CB_OnFreqPlot */ -#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_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 */ -#define PANEL_CHANGENDIV 27 /* control type: numeric, callback function: CB_OnChangeNdiv */ -#define PANEL_N3CHOICE 28 /* control type: numeric, callback function: CB_ChangeN */ -#define PANEL_N3CALCULUS 29 /* control type: command, callback function: CB_OnNCalculus */ -#define PANEL_N1CHOICE 30 /* control type: numeric, callback function: CB_ChangeN */ -#define PANEL_N2CHOICE 31 /* control type: numeric, callback function: CB_ChangeN */ -#define PANEL_N2CALCULUS 32 /* control type: command, callback function: CB_OnNCalculus */ -#define PANEL_DDS4STEP 33 /* control type: ring, callback function: CB_ChangeDDSStep */ -#define PANEL_DDS3STEP 34 /* control type: ring, callback function: CB_ChangeDDSStep */ -#define PANEL_DDS2STEP 35 /* control type: ring, callback function: CB_ChangeDDSStep */ -#define PANEL_CENTERFREQUENCY 36 /* control type: numeric, callback function: (none) */ -#define PANEL_SLOPE_APPLIED 37 /* control type: numeric, callback function: CB_SetSlope */ -#define PANEL_PLOT_Math5 38 /* control type: radioButton, callback function: CB_OnFreqPlot */ -#define PANEL_PLOT_Math4 39 /* control type: radioButton, callback function: CB_OnFreqPlot */ -#define PANEL_ADEV_Math4 40 /* control type: radioButton, callback function: CB_OnAllanPlot */ -#define PANEL_DDS1STEP 41 /* control type: ring, callback function: CB_ChangeDDSStep */ -#define PANEL_TEXTMSG_15 42 /* control type: textMsg, callback function: (none) */ -#define PANEL_ADEV_Math5 43 /* control type: radioButton, callback function: CB_OnAllanPlot */ -#define PANEL_PLOT_Math3 44 /* control type: radioButton, callback function: CB_OnFreqPlot */ -#define PANEL_SAVE_EXTRA 45 /* control type: radioButton, callback function: (none) */ -#define PANEL_SR_LOGGER 46 /* control type: radioButton, callback function: CB_SrDatalogger */ -#define PANEL_SAVE_SR 47 /* control type: radioButton, callback function: CB_SaveData */ -#define PANEL_ADEV_Math3 48 /* control type: radioButton, callback function: CB_OnAllanPlot */ -#define PANEL_MATHSTRING4 49 /* control type: string, callback function: CB_ChangeMath */ -#define PANEL_PLOT_Math2 50 /* control type: radioButton, callback function: CB_OnFreqPlot */ -#define PANEL_SAVE_HG 51 /* control type: radioButton, callback function: CB_SaveData */ -#define PANEL_SAVE_LO 52 /* control type: radioButton, callback function: CB_SaveData */ -#define PANEL_ADEV_Math2 53 /* control type: radioButton, callback function: CB_OnAllanPlot */ -#define PANEL_MATHSTRING3 54 /* control type: string, callback function: CB_ChangeMath */ -#define PANEL_MATHSTRING1 55 /* control type: string, callback function: CB_ChangeMath */ -#define PANEL_MATHSTRING2 56 /* control type: string, callback function: CB_ChangeMath */ -#define PANEL_TEXTMSG_16 57 /* control type: textMsg, callback function: (none) */ -#define PANEL_MINUS10KDDS1 58 /* control type: command, callback function: CB_OnMinus10k */ -#define PANEL_MINUS10KDDS4 59 /* control type: command, callback function: CB_OnMinus10k */ -#define PANEL_MINUS10KDDS3 60 /* control type: command, callback function: CB_OnMinus10k */ -#define PANEL_MINUS10KDDS2 61 /* control type: command, callback function: CB_OnMinus10k */ -#define PANEL_PLUS10KDDS4 62 /* control type: command, callback function: CB_OnPlus10k */ -#define PANEL_PLUS10KDDS3 63 /* control type: command, callback function: CB_OnPlus10k */ -#define PANEL_PLUS10KDDS1 64 /* control type: command, callback function: CB_OnPlus10k */ -#define PANEL_PLUS10KDDS2 65 /* control type: command, callback function: CB_OnPlus10k */ -#define PANEL_MATHSTRING5 66 /* control type: textBox, callback function: CB_ChangeMath */ -#define PANEL_UTC 67 /* control type: numeric, callback function: (none) */ -#define PANEL_TIME 68 /* control type: string, callback function: (none) */ -#define PANEL_DDS4 69 /* control type: numeric, callback function: CB_ChangeDDSOut */ -#define PANEL_DDS3 70 /* control type: numeric, callback function: CB_ChangeDDSOut */ -#define PANEL_N1CALCULUS 71 /* control type: command, callback function: CB_OnNCalculus */ -#define PANEL_FINDSIGN3 72 /* control type: command, callback function: CB_OnFindSign */ -#define PANEL_SIGN3 73 /* control type: numeric, callback function: CB_Sign3 */ -#define PANEL_FINDSIGN2 74 /* control type: command, callback function: CB_OnFindSign */ -#define PANEL_SIGN2 75 /* control type: numeric, callback function: (none) */ -#define PANEL_FINDSIGN1 76 /* control type: command, callback function: CB_OnFindSign */ -#define PANEL_SIGN1 77 /* control type: numeric, callback function: (none) */ -#define PANEL_FIND10K3 78 /* control type: command, callback function: CB_OnFind275K */ -#define PANEL_FIND275K2 79 /* control type: command, callback function: CB_OnFind275K */ -#define PANEL_RESETSLOPE 80 /* control type: command, callback function: CB_OnResetSlope */ -#define PANEL_CHECKBOX_STOPIFAUTODE 81 /* control type: radioButton, callback function: CB_OnStopSlopeCancellingOnUnlocked */ -#define PANEL_CHECKBOX_KEEPSLOPE 82 /* control type: radioButton, callback function: CB_OnCROX */ -#define PANEL_CHECKBOX_KEEP 83 /* control type: radioButton, callback function: CB_OnCROX */ -#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_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 */ -#define PANEL_SAVE_RAW 91 /* control type: radioButton, callback function: CB_SaveData */ -#define PANEL_SHOWLOG 92 /* control type: radioButton, callback function: CB_ShowLog */ -#define PANEL_SLOPEX2 93 /* control type: radioButton, callback function: CB_SlopeX2 */ -#define PANEL_SAVE_DDS 94 /* control type: radioButton, callback function: CB_SaveData */ -#define PANEL_DECORATION_2 95 /* control type: deco, callback function: (none) */ -#define PANEL_DECORATION_8 96 /* control type: deco, callback function: (none) */ -#define PANEL_DECORATION 97 /* control type: deco, callback function: (none) */ -#define PANEL_DECORATION_3 98 /* control type: deco, callback function: (none) */ -#define PANEL_TEXTMSG_6 99 /* control type: textMsg, callback function: (none) */ -#define PANEL_TEXTMSG_22 100 /* control type: textMsg, callback function: (none) */ -#define PANEL_TEXTMSG_21 101 /* control type: textMsg, callback function: (none) */ -#define PANEL_TEXTMSG_7 102 /* control type: textMsg, callback function: (none) */ -#define PANEL_DECORATION_4 103 /* control type: deco, callback function: (none) */ -#define PANEL_DECORATION_7 104 /* control type: deco, callback function: (none) */ -#define PANEL_DECORATION_6 105 /* control type: deco, callback function: (none) */ -#define PANEL_DECORATION_5 106 /* control type: deco, callback function: (none) */ -#define PANEL_TEXTMSG_20 107 /* control type: textMsg, callback function: (none) */ -#define PANEL_TEXTMSG_19 108 /* control type: textMsg, callback function: (none) */ -#define PANEL_MATH4 109 /* control type: string, callback function: (none) */ -#define PANEL_MATH5 110 /* control type: string, callback function: (none) */ -#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_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 */ +#define PANEL_ADEV_Ch1 15 /* control type: radioButton, callback function: CB_OnAllanPlot */ +#define PANEL_PLOT_Ch2 16 /* control type: radioButton, callback function: CB_OnFreqPlot */ +#define PANEL_PLOT_Math1 17 /* control type: radioButton, callback function: CB_OnFreqPlot */ +#define PANEL_PLOT_Ch1 18 /* control type: radioButton, callback function: CB_OnFreqPlot */ +#define PANEL_DDS2 19 /* control type: numeric, callback function: CB_ChangeDDSOut */ +#define PANEL_TEXTMSG 20 /* control type: textMsg, callback function: (none) */ +#define PANEL_TEXTMSG_2 21 /* control type: textMsg, callback function: (none) */ +#define PANEL_RECENTER_INTERVAL 22 /* control type: numeric, callback function: CB_RecenterInterval */ +#define PANEL_SLOPETIME 23 /* control type: numeric, callback function: CB_ChangeSlopeTime */ +#define PANEL_DEDRIFT_DDS_FREQ 24 /* control type: numeric, callback function: CB_DedriftDDSFreq */ +#define PANEL_DDS1 25 /* control type: numeric, callback function: CB_ChangeDDSOut */ +#define PANEL_CHANGENDIV 26 /* control type: numeric, callback function: CB_OnChangeNdiv */ +#define PANEL_N3CHOICE 27 /* control type: numeric, callback function: CB_ChangeN */ +#define PANEL_N3CALCULUS 28 /* control type: command, callback function: CB_OnNCalculus */ +#define PANEL_N1CHOICE 29 /* control type: numeric, callback function: CB_ChangeN */ +#define PANEL_N2CHOICE 30 /* control type: numeric, callback function: CB_ChangeN */ +#define PANEL_N2CALCULUS 31 /* control type: command, callback function: CB_OnNCalculus */ +#define PANEL_DDS4STEP 32 /* control type: ring, callback function: CB_ChangeDDSStep */ +#define PANEL_DDS3STEP 33 /* control type: ring, callback function: CB_ChangeDDSStep */ +#define PANEL_DDS2STEP 34 /* control type: ring, callback function: CB_ChangeDDSStep */ +#define PANEL_SLOPE_APPLIED 35 /* control type: numeric, callback function: CB_SetSlope */ +#define PANEL_PLOT_Math5 36 /* control type: radioButton, callback function: CB_OnFreqPlot */ +#define PANEL_PLOT_Math4 37 /* control type: radioButton, callback function: CB_OnFreqPlot */ +#define PANEL_ADEV_Math4 38 /* control type: radioButton, callback function: CB_OnAllanPlot */ +#define PANEL_DDS1STEP 39 /* control type: ring, callback function: CB_ChangeDDSStep */ +#define PANEL_TEXTMSG_15 40 /* control type: textMsg, callback function: (none) */ +#define PANEL_ADEV_Math5 41 /* control type: radioButton, callback function: CB_OnAllanPlot */ +#define PANEL_PLOT_Math3 42 /* control type: radioButton, callback function: CB_OnFreqPlot */ +#define PANEL_SAVE_EXTRA 43 /* control type: radioButton, callback function: (none) */ +#define PANEL_SR_LOGGER 44 /* control type: radioButton, callback function: CB_SrDatalogger */ +#define PANEL_SAVE_SR 45 /* control type: radioButton, callback function: CB_SaveData */ +#define PANEL_ADEV_Math3 46 /* control type: radioButton, callback function: CB_OnAllanPlot */ +#define PANEL_MATHSTRING4 47 /* control type: string, callback function: CB_ChangeMath */ +#define PANEL_PLOT_Math2 48 /* control type: radioButton, callback function: CB_OnFreqPlot */ +#define PANEL_SAVE_HG 49 /* control type: radioButton, callback function: CB_SaveData */ +#define PANEL_SAVE_LO 50 /* control type: radioButton, callback function: CB_SaveData */ +#define PANEL_ADEV_Math2 51 /* control type: radioButton, callback function: CB_OnAllanPlot */ +#define PANEL_MATHSTRING3 52 /* control type: string, callback function: CB_ChangeMath */ +#define PANEL_MATHSTRING1 53 /* control type: string, callback function: CB_ChangeMath */ +#define PANEL_MATHSTRING2 54 /* control type: string, callback function: CB_ChangeMath */ +#define PANEL_TEXTMSG_16 55 /* control type: textMsg, callback function: (none) */ +#define PANEL_MINUS10KDDS1 56 /* control type: command, callback function: CB_OnMinus10k */ +#define PANEL_MINUS10KDDS4 57 /* control type: command, callback function: CB_OnMinus10k */ +#define PANEL_MINUS10KDDS3 58 /* control type: command, callback function: CB_OnMinus10k */ +#define PANEL_MINUS10KDDS2 59 /* control type: command, callback function: CB_OnMinus10k */ +#define PANEL_PLUS10KDDS4 60 /* control type: command, callback function: CB_OnPlus10k */ +#define PANEL_PLUS10KDDS3 61 /* control type: command, callback function: CB_OnPlus10k */ +#define PANEL_PLUS10KDDS1 62 /* control type: command, callback function: CB_OnPlus10k */ +#define PANEL_PLUS10KDDS2 63 /* control type: command, callback function: CB_OnPlus10k */ +#define PANEL_MATHSTRING5 64 /* control type: textBox, callback function: CB_ChangeMath */ +#define PANEL_UTC 65 /* control type: numeric, callback function: (none) */ +#define PANEL_TIME 66 /* control type: string, callback function: (none) */ +#define PANEL_DDS4 67 /* control type: numeric, callback function: CB_ChangeDDSOut */ +#define PANEL_DDS3 68 /* control type: numeric, callback function: CB_ChangeDDSOut */ +#define PANEL_N1CALCULUS 69 /* control type: command, callback function: CB_OnNCalculus */ +#define PANEL_FINDSIGN3 70 /* control type: command, callback function: CB_OnFindSign */ +#define PANEL_SIGN3 71 /* control type: numeric, callback function: CB_Sign3 */ +#define PANEL_FINDSIGN2 72 /* control type: command, callback function: CB_OnFindSign */ +#define PANEL_SIGN2 73 /* control type: numeric, callback function: (none) */ +#define PANEL_FINDSIGN1 74 /* control type: command, callback function: CB_OnFindSign */ +#define PANEL_SIGN1 75 /* control type: numeric, callback function: (none) */ +#define PANEL_FIND10K3 76 /* control type: command, callback function: CB_OnFind275K */ +#define PANEL_FIND275K2 77 /* control type: command, callback function: CB_OnFind275K */ +#define PANEL_RESETSLOPE 78 /* control type: command, callback function: CB_OnResetSlope */ +#define PANEL_CHECKBOX_STOPIFAUTODE 79 /* control type: radioButton, callback function: CB_OnStopSlopeCancellingOnUnlocked */ +#define PANEL_CHECKBOX_KEEPSLOPE 80 /* control type: radioButton, callback function: CB_OnCROX */ +#define PANEL_CHECKBOX_KEEP 81 /* control type: radioButton, callback function: CB_OnCROX */ +#define PANEL_SLOPE_REFERENCE 82 /* control type: ring, callback function: CB_OnSlopeReference */ +#define PANEL_ESTIMATE_N3 83 /* control type: command, callback function: CB_OnEstimateN */ +#define PANEL_INVERT_SLOPE_SIGN 84 /* control type: radioButton, callback function: CB_InvertSlopeSign */ +#define PANEL_RECENTER 85 /* control type: LED, callback function: CB_RecenterEnable */ +#define PANEL_MEASURE_SLOPE 86 /* control type: LED, callback function: CB_MeasureSlope */ +#define PANEL_SLOPE_MEASURED 87 /* control type: numeric, callback function: (none) */ +#define PANEL_RESET_DEDRIFT_DDS 88 /* control type: command, callback function: CB_ResetDedriftDDS */ +#define PANEL_SAVE_RAW 89 /* control type: radioButton, callback function: CB_SaveData */ +#define PANEL_SHOWLOG 90 /* control type: radioButton, callback function: CB_ShowLog */ +#define PANEL_SLOPEX2 91 /* control type: radioButton, callback function: CB_SlopeX2 */ +#define PANEL_SAVE_DDS 92 /* control type: radioButton, callback function: CB_SaveData */ +#define PANEL_DECORATION_2 93 /* control type: deco, callback function: (none) */ +#define PANEL_DECORATION_8 94 /* control type: deco, callback function: (none) */ +#define PANEL_DECORATION 95 /* control type: deco, callback function: (none) */ +#define PANEL_DECORATION_3 96 /* control type: deco, callback function: (none) */ +#define PANEL_TEXTMSG_6 97 /* control type: textMsg, callback function: (none) */ +#define PANEL_TEXTMSG_22 98 /* control type: textMsg, callback function: (none) */ +#define PANEL_TEXTMSG_21 99 /* control type: textMsg, callback function: (none) */ +#define PANEL_TEXTMSG_7 100 /* control type: textMsg, callback function: (none) */ +#define PANEL_DECORATION_4 101 /* control type: deco, callback function: (none) */ +#define PANEL_DECORATION_7 102 /* control type: deco, callback function: (none) */ +#define PANEL_DECORATION_6 103 /* control type: deco, callback function: (none) */ +#define PANEL_DECORATION_5 104 /* control type: deco, callback function: (none) */ +#define PANEL_TEXTMSG_20 105 /* control type: textMsg, callback function: (none) */ +#define PANEL_TEXTMSG_19 106 /* control type: textMsg, callback function: (none) */ +#define PANEL_MATH4 107 /* control type: string, callback function: (none) */ +#define PANEL_MATH5 108 /* control type: string, callback function: (none) */ +#define PANEL_MATH3 109 /* control type: string, callback function: (none) */ +#define PANEL_MATH2 110 /* control type: string, callback function: (none) */ +#define PANEL_MATH1 111 /* control type: string, callback function: (none) */ +#define PANEL_RECENTER_SR 112 /* control type: radioButton, callback function: CB_RecenterChannel */ +#define PANEL_RECENTER_HG 113 /* control type: radioButton, callback function: CB_RecenterChannel */ +#define PANEL_RECENTER_LO 114 /* control type: radioButton, callback function: CB_RecenterChannel */ /* Control Arrays: */ diff -r 4ab8099a18e2 -r f4633519a628 FXAnalyse.uir Binary file FXAnalyse.uir has changed