Mercurial > hg > fxanalyse

comparison FXAnalyse.c @ 143:09a4548e1436

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove unused variables from math experessions initialization
author Daniele Nicolodi <daniele.nicolodi@obspm.fr>
date Wed, 22 Jan 2014 14:45:23 +0100
parents fd085d61e4ca
children be87c8e78266
comparison
equal deleted inserted replaced
142:fd085d61e4ca 143:09a4548e1436
437 { 437 {
438 muParserHandle_t parser = mupCreate(); 438 muParserHandle_t parser = mupCreate();
439 mupDefineOprtChars(parser, "abcdefghijklmnopqrstuvwxyzµ" 439 mupDefineOprtChars(parser, "abcdefghijklmnopqrstuvwxyzµ"
440 "ABCDEFGHIJKLMNOPQRSTUVWXYZ" 440 "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
441 "+-*^/?<>=#!$%&|~'_"); 441 "+-*^/?<>=#!$%&|~'_");
442 mupDefineVar(parser, "UTC", &utc);
443 mupDefineVar(parser, "Ch1", &Ch1); 442 mupDefineVar(parser, "Ch1", &Ch1);
444 mupDefineVar(parser, "Ch2", &Ch2); 443 mupDefineVar(parser, "Ch2", &Ch2);
445 mupDefineVar(parser, "Ch3", &Ch3); 444 mupDefineVar(parser, "Ch3", &Ch3);
446 mupDefineVar(parser, "Ch4", &Ch4); 445 mupDefineVar(parser, "Ch4", &Ch4);
447 mupDefineVar(parser, "DDS1", &(DDS4xAD9912.frequency[0])); 446 mupDefineVar(parser, "DDS1", &(DDS4xAD9912.frequency[0]));
449 mupDefineVar(parser, "DDS3", &(DDS4xAD9912.frequency[2])); 448 mupDefineVar(parser, "DDS3", &(DDS4xAD9912.frequency[2]));
450 mupDefineVar(parser, "DDS4", &(DDS4xAD9912.frequency[3])); 449 mupDefineVar(parser, "DDS4", &(DDS4xAD9912.frequency[3]));
451 mupDefineVar(parser, "N1", &N1); 450 mupDefineVar(parser, "N1", &N1);
452 mupDefineVar(parser, "N2", &N2); 451 mupDefineVar(parser, "N2", &N2);
453 mupDefineVar(parser, "N3", &N3); 452 mupDefineVar(parser, "N3", &N3);
454 mupDefineVar(parser, "Nu1", &Nu1);
455 mupDefineVar(parser, "Nu2", &Nu2);
456 mupDefineVar(parser, "DeltaDDS3", &DeltaDDS3);
457 mupDefineVar(parser, "Sign1", &Sign1); 453 mupDefineVar(parser, "Sign1", &Sign1);
458 mupDefineVar(parser, "Sign2", &Sign2); 454 mupDefineVar(parser, "Sign2", &Sign2);
459 mupDefineVar(parser, "Sign3", &Sign3); 455 mupDefineVar(parser, "Sign3", &Sign3);
460 mupDefineVar(parser, "Ndiv", &Ndiv); 456 mupDefineVar(parser, "Ndiv", &Ndiv);
461 mupDefinePostfixOprt(parser, "P", &Peta, 1); 457 mupDefinePostfixOprt(parser, "P", &Peta, 1);
519 GetCtrlVal(MainPanel, PANEL_MATHSTRING1, expr); 515 GetCtrlVal(MainPanel, PANEL_MATHSTRING1, expr);
520 mupSetExpr(MathParser1, expr); 516 mupSetExpr(MathParser1, expr);
521 517
522 MathParser2 = initMathParser(); 518 MathParser2 = initMathParser();
523 mupDefineVar(MathParser2, "Math1", &Math1); 519 mupDefineVar(MathParser2, "Math1", &Math1);
524 mupDefineVar(MathParser2, "DDS", &(DDS4xAD9912.frequency[0]));
525 GetCtrlVal(MainPanel, PANEL_MATHSTRING2, expr); 520 GetCtrlVal(MainPanel, PANEL_MATHSTRING2, expr);
526 mupSetExpr(MathParser2, expr); 521 mupSetExpr(MathParser2, expr);
527 522
528 MathParser3 = initMathParser(); 523 MathParser3 = initMathParser();
529 mupDefineVar(MathParser3, "Math1", &Math1); 524 mupDefineVar(MathParser3, "Math1", &Math1);
530 mupDefineVar(MathParser3, "Math2", &Math2); 525 mupDefineVar(MathParser3, "Math2", &Math2);
531 mupDefineVar(MathParser3, "DDS", &(DDS4xAD9912.frequency[1]));
532 GetCtrlVal(MainPanel, PANEL_MATHSTRING3, expr); 526 GetCtrlVal(MainPanel, PANEL_MATHSTRING3, expr);
533 mupSetExpr(MathParser3, expr); 527 mupSetExpr(MathParser3, expr);
534 528
535 MathParser4 = initMathParser(); 529 MathParser4 = initMathParser();
536 mupDefineVar(MathParser4, "Math1", &Math1); 530 mupDefineVar(MathParser4, "Math1", &Math1);