Mercurial > hg > fxanalyse

changeset 168:4de7f2c9f328

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Minor cleanup
author Daniele Nicolodi <daniele.nicolodi@obspm.fr>
date Fri, 14 Feb 2014 16:58:08 +0100
parents 8a94f1913b4e
children 97112b45b838
files FXAnalyse.c
diffstat 1 files changed, 18 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/FXAnalyse.c	Thu Feb 13 19:18:02 2014 +0100
+++ b/FXAnalyse.c	Fri Feb 14 16:58:08 2014 +0100
@@ -51,8 +51,10 @@
 double N1, N2, N3;
 double Ndiv = 8.0;
 double Sign1 = 1.0, Sign2 = 1.0, Sign3 = 0.0;
-typedef void* mathparser_t;
-mathparser_t *MathParser1, *MathParser2, *MathParser3, *MathParser4, *MathParser5;
+
+
+void *MathParser1, *MathParser2, *MathParser3, *MathParser4, *MathParser5;
+
 
 // panels
 static int MainPanel;
@@ -278,13 +280,13 @@
 };
 
 #define DATAFILE(__name, __data, __nchan, __control, __write)	\
-     {															\
-	  .name = __name,											\
-	  .data = __data,											\
-	  .nchan = __nchan,											\
-	  .control = __control,										\
-	  .write = __write											\
-     }
+	{															\
+		.name = __name,											\
+		.data = __data,											\
+		.nchan = __nchan,										\
+		.control = __control,									\
+		.write = __write										\
+	}
 
 struct datafile datafiles[] = {
      DATAFILE("Raw", event.data, 4, PANEL_SAVE_RAW, TRUE),
@@ -388,9 +390,9 @@
 }
 
 
-mathparser_t * mathparser_new()
+void * muParserNew()
 {
-	mathparser_t parser = mupCreate();
+	void *parser = mupCreate();
 	
 	mupDefineOprtChars(parser, "abcdefghijklmnopqrstuvwxyzµ"
                         	   "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
@@ -491,29 +493,29 @@
 	GetCtrlVal(MainPanel, PANEL_N2CHOICE, &N2);
 	GetCtrlVal(MainPanel, PANEL_N3CHOICE, &N3);
 
-	MathParser1 = mathparser_new();
+	MathParser1 = muParserNew();
 	GetCtrlVal(MainPanel, PANEL_MATHSTRING1, expr);
 	mupSetExpr(MathParser1, expr);
 	
-	MathParser2 = mathparser_new();
+	MathParser2 = muParserNew();
 	mupDefineVar(MathParser2, "Math1", &Math1);
 	GetCtrlVal(MainPanel, PANEL_MATHSTRING2, expr);
 	mupSetExpr(MathParser2, expr);
 	
-	MathParser3 = mathparser_new();
+	MathParser3 = muParserNew();
 	mupDefineVar(MathParser3, "Math1", &Math1);
 	mupDefineVar(MathParser3, "Math2", &Math2);
 	GetCtrlVal(MainPanel, PANEL_MATHSTRING3, expr);
 	mupSetExpr(MathParser3, expr);
 	
-	MathParser4 = mathparser_new();
+	MathParser4 = muParserNew();
 	mupDefineVar(MathParser4, "Math1", &Math1);
 	mupDefineVar(MathParser4, "Math2", &Math2);
 	mupDefineVar(MathParser4, "Math3", &Math3);
 	GetCtrlVal(MainPanel, PANEL_MATHSTRING4, expr);
 	mupSetExpr(MathParser4, expr);
 	
-	MathParser5 = mathparser_new();
+	MathParser5 = muParserNew();
 	mupDefineVar(MathParser5, "Math1", &Math1);
 	mupDefineVar(MathParser5, "Math2", &Math2);
 	mupDefineVar(MathParser5, "Math3", &Math3);