Changeset 1938 in Sophya

Timestamp:

Mar 14, 2002, 5:41:09 PM (24 years ago)

Author:

cmv

Message:

npt par defaut pour func funcff cmv 14/3/02

File:

• trunk/SophyaPI/PIext/basexecut.cc (modified) (2 diffs)

trunk/SophyaPI/PIext/basexecut.cc

@@ -476 +476 @@
 // >>>>>>>>>>>  Trace de fonctions 
 else if ( (kw == "func") ) {
-  if (tokens.size() < 4) { cout << "Usage: func f(x) xmin xmax npt [opt]" << endl; return(0); }
-  string opt = "";
+  if(tokens.size()<3) {cout<<"Usage: func f(x) xmin xmax [npt opt]"<<endl; return(0);}
+  int np = 100;
+  double xmin=0., xmax=1.;
+  string opt = "", nom = "";
+  xmin = atof(tokens[1].c_str()); xmax = atof(tokens[2].c_str());
+  if (tokens.size() > 3)  np = atoi(tokens[3].c_str());
   if (tokens.size() > 4)  opt = tokens[4];
-  int np;
-  double xmin, xmax;
-  np = 100;
-  xmin = 0.;  xmax = 1.;
-  np = atoi(tokens[3].c_str());
-  xmin = atof(tokens[1].c_str());   xmax = atof(tokens[2].c_str());
-  string nom = "";
   mObjMgr->GetServiceObj()->PlotFunc(tokens[0], nom, xmin, xmax, np, opt); 
   }
 else if ( (kw == "funcff") ) {
-  if (tokens.size() < 5) { cout << "Usage: funcff C-filename f(x)-name xmin xmax npt [opt]" << endl; return(0); }
-  string opt = "";
-  if (tokens.size() > 5)  opt = tokens[5];
-  int np;
-  double xmin, xmax;
-  np = 100;
-  xmin = 0.;  xmax = 1.;
-  np = atoi(tokens[4].c_str());
-  xmin = atof(tokens[2].c_str());   xmax = atof(tokens[3].c_str());
-  string nom = "";
+  if (tokens.size()<4) {cout<<"Usage: funcff C-filename f(x)-name xmin xmax [npt opt]"<<endl; return(0);}
+  int np = 100;
+  double xmin=0., xmax=1.;
+  string opt = "", nom = "";
+  xmin = atof(tokens[2].c_str());  xmax = atof(tokens[3].c_str());
+  if(tokens.size()>4)  np = atoi(tokens[4].c_str());
+  if(tokens.size()>5)  opt = tokens[5];
   mObjMgr->GetServiceObj()->PlotFuncFrCFile(tokens[0], tokens[1], nom, xmin, xmax, np, opt); 
   }
@@ -1047 +1041 @@
 kw = "func";
 usage = "Displays a function y=f(x) (Fills a vector with function values)";
-usage += "\n Usage: func f(x) xmin xmax npt [graphic_attributes]";
+usage += "\n Usage: func f(x) xmin xmax [npt graphic_attributes]";
 usage += "\n  Related commands: funcff func2d func2dff ";  
 mpiac->RegisterCommand(kw, usage, this, "Func Plot");
 kw = "funcff";
 usage = "Displays a function y=f(x) from a C-file (Fills a vector with function values)";
-usage += "\n Usage: funcff C-FileName FunctionName xmin xmax npt [graphic_attributes]";
+usage += "\n Usage: funcff C-FileName FunctionName xmin xmax [npt graphic_attributes]";
 usage += "\n  Related commands: func func2d func2dff ";  
 mpiac->RegisterCommand(kw, usage, this, "Func Plot");