Mercurial > hg > fxanalyse

comparison FXAnalyse.c @ 22:b7b3b5f1c5a6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove unused widgets from N1 measurement panel. Harmonize widgets names
author Daniele Nicolodi <daniele.nicolodi@obspm.fr>
date Thu, 19 Jul 2012 20:01:40 +0200
parents 3a7f088d4960
children 65e277fdf01f
comparison
equal deleted inserted replaced
21:381da7b34cd8 22:b7b3b5f1c5a6
695 SetCtrlVal(MainPanel, PANEL_FREQ3, Ch3) ; 695 SetCtrlVal(MainPanel, PANEL_FREQ3, Ch3) ;
696 SetCtrlVal(MainPanel, PANEL_FREQ4, Ch4) ; 696 SetCtrlVal(MainPanel, PANEL_FREQ4, Ch4) ;
697 SetCtrlVal(MainPanel, PANEL_SIGN1, Signe1); 697 SetCtrlVal(MainPanel, PANEL_SIGN1, Signe1);
698 SetCtrlVal(MainPanel, PANEL_SIGN2, Signe2); 698 SetCtrlVal(MainPanel, PANEL_SIGN2, Signe2);
699 SetCtrlVal(MainPanel, PANEL_SIGN3, Signe3); 699 SetCtrlVal(MainPanel, PANEL_SIGN3, Signe3);
700 SetCtrlVal(CalcN1Panel, CALCN1_N_1, N_1) ; 700 SetCtrlVal(CalcN1Panel, CALCN1_N, N_1) ;
701 SetCtrlVal(CalcN1Panel, CALCN1_SLOPE, Slope_1) ; 701 SetCtrlVal(CalcN1Panel, CALCN1_SLOPE, Slope_1) ;
702 SetCtrlVal(CalcN2Panel, CALCN2_N_2, N_2) ; 702 SetCtrlVal(CalcN2Panel, CALCN2_N, N_2) ;
703 SetCtrlVal(CalcN2Panel, CALCN2_SLOPE, Beatslope_2) ; 703 SetCtrlVal(CalcN2Panel, CALCN2_SLOPE, Beatslope_2) ;
704 SetCtrlVal(CalcN3Panel, CALCN3_N_3, N_3) ; 704 SetCtrlVal(CalcN3Panel, CALCN3_N, N_3) ;
705 SetCtrlVal(CalcN3Panel, CALCN3_SLOPE, Slope_3) ; 705 SetCtrlVal(CalcN3Panel, CALCN3_SLOPE, Slope_3) ;
706 SetCtrlVal(MainPanel, PANEL_SLOPETOCANCEL, SlopeMath2); 706 SetCtrlVal(MainPanel, PANEL_SLOPETOCANCEL, SlopeMath2);
707 /*SetCtrlVal(MainPanel, PANEL_SLOPECANCELONOFF, OnOffMessage); */ 707 /*SetCtrlVal(MainPanel, PANEL_SLOPECANCELONOFF, OnOffMessage); */
708 SetCtrlVal(MainPanel, PANEL_CENTERFREQUENCY, CenterFrequencyCh2); 708 SetCtrlVal(MainPanel, PANEL_CENTERFREQUENCY, CenterFrequencyCh2);
709 SetCtrlVal(MainPanel, PANEL_LED1, SlopeMeasuring); 709 SetCtrlVal(MainPanel, PANEL_LED1, SlopeMeasuring);
1277 // positive step measurement 1277 // positive step measurement
1278 Frepminus_3 = Frepminus_3 / n_3; 1278 Frepminus_3 = Frepminus_3 / n_3;
1279 1279
1280 // compute N3 1280 // compute N3
1281 N_3 = 1000.0 * DeltakHz_3 / (Frepplus_3 - Frepminus_3); 1281 N_3 = 1000.0 * DeltakHz_3 / (Frepplus_3 - Frepminus_3);
1282 SetCtrlVal(CalcN3Panel, CALCN3_N_3, N_3); 1282 SetCtrlVal(CalcN3Panel, CALCN3_N, N_3);
1283 1283
1284 t1_3=0.0; 1284 t1_3=0.0;
1285 t2_3=0.0; 1285 t2_3=0.0;
1286 t3_3=0.0; 1286 t3_3=0.0;
1287 n_3 = 0; 1287 n_3 = 0;