Changeset 3279 in Sophya

Timestamp:

Jul 6, 2007, 6:22:05 PM (18 years ago)

Author:

ansari

Message:

correction commandes nt2dcn nt2dci et ajout commande plot2dc - Reza 05/07/2007

Location:

trunk/SophyaPI/PIext

Files:

• basexecut.cc (modified) (2 diffs)
• graphexecut.cc (modified) (3 diffs)
• piaversion.h (modified) (1 diff)
• servnobjm.cc (modified) (2 diffs)
• servnobjm.h (modified) (1 diff)

trunk/SophyaPI/PIext/basexecut.cc

@@ -622 +622 @@
   }
 
-else if (kw == "plot2dw" ) {   // Plot2d avec poids
+else if ((kw == "plot2dw")||(kw == "plot2dc")) {   // Plot2d avec poids
   if (tokens.size() < 4) { 
-    cout << "Usage: plot2dw nomobj expx expy expwt [expcut opt loop_par]" << endl;
+    cout << "Usage: plot2dw/c nomobj expx expy expwt/expcolidx [expcut opt loop_par]" << endl;
     return(0); 
     }
   if (tokens.size() < 5) tokens.push_back("1");
   while (tokens.size() < 7) tokens.push_back("");
-  srvo->DisplayPoints2DW(tokens[0],tokens[1],tokens[2],tokens[3], tokens[4], tokens[5], tokens[6]);
+  bool fgcolidx = false;
+  if (kw == "plot2dc") fgcolidx = true;
+  srvo->DisplayPoints2DW(tokens[0],tokens[1],tokens[2],tokens[3], tokens[4], 
+                         fgcolidx, tokens[5], tokens[6]);
   }
 else if (kw == "plot3d" ) {  
@@ -1183 +1186 @@
 usage = "Plots (2D) Y=g(Object) vs. X=f(Object) with Weight W=h(Object) ";
 usage += "\n Usage: plot2dw nameobj f_X() g_Y() h_Wt() [Cut() graphic_attributes loop_param]";
+usage += "\n  Related commands: plot2d plot2dc plot3d ObjectExpressions ..."; 
+mpiac->RegisterCommand(kw, usage, this, "Expr. Plotting");
+kw = "plot2dc";
+usage = "Plots (2D) Y=g(Object) vs. X=f(Object) with Color ColIndex=h(Object) ";
+usage += "\n Usage: plot2dc nameobj f_X() g_Y() h_Col() [Cut() graphic_attributes loop_param]";
 usage += "\n  Related commands: plot2d plot2dw plot3d ObjectExpressions ..."; 
 mpiac->RegisterCommand(kw, usage, this, "Expr. Plotting");

trunk/SophyaPI/PIext/graphexecut.cc

@@ -287 +287 @@
                      tokens[5], tokens[6], ph, false, tokens[7], false);
   }
-else if (kw == "nt2dcn") {
+else if ((kw == "nt2dcn")||(kw == "nt2dci")) {
   if (tokens.size() < 4) { 
     cout << "Usage: nt2dcn nameobj color varx vary [errx erry wt label opt]" << endl; 
@@ -294 +294 @@
   while (tokens.size() < 9) tokens.push_back("");
   string ph = "";
-  mObjMgr->DisplayNT(tokens[1], tokens[2], tokens[3], ph, tokens[4], tokens[5], ph, 
-                     tokens[6], tokens[7], tokens[0], false, tokens[8], false);
-  }
-else if (kw == "nt2dci") {
-  if (tokens.size() < 4) { 
-    cout << "Usage: nt2dci nameobj color varx vary [errx erry wt label opt]" << endl; 
-    return(0); 
-  }
-  while (tokens.size() < 9) tokens.push_back("");
-  string ph = "";
-  mObjMgr->DisplayNT(tokens[1], tokens[2], tokens[3], ph, tokens[4], tokens[5], ph, 
-                     tokens[6], tokens[7], tokens[0], true, tokens[8], false);
+  bool colidx = false;
+  if (kw == "nt2dci")  colidx = true;
+  mObjMgr->DisplayNT(tokens[0], tokens[2], tokens[3], ph, tokens[4], tokens[5], ph, 
+                     tokens[6], tokens[7], tokens[1], colidx, tokens[8], false);
   }
 else if (kw == "nt3d") {
@@ -313 +305 @@
   }
   while (tokens.size() < 10) tokens.push_back("");
+  string ph = "";
   mObjMgr->DisplayNT(tokens[0], tokens[1], tokens[2], tokens[3], tokens[4], tokens[5],
-                     tokens[6], tokens[7], tokens[8], tokens[9], true);
+                     tokens[6], tokens[7], tokens[8], ph, false, tokens[9], true);
   }
 else if (kw == "vecplot") {

trunk/SophyaPI/PIext/piaversion.h

@@ -2 +2 @@
 #define PIAPPVERSION_H_SEEN
 
-#define PIAPP_VERSIONNUMBER  4.1
+#define PIAPP_VERSIONNUMBER  4.15
 
 #endif

trunk/SophyaPI/PIext/servnobjm.cc

@@ -477 +477 @@
 /* --Methode-- */
 void Services2NObjMgr::DisplayPoints2DW(string& nom, string& expx, string& expy, 
-                                        string& expwt, string& expcut, string dopt, string loop)
+                                        string& expwt, string& expcut, bool fgcolidx, string dopt, string loop)
 {
 NObjMgrAdapter* obja=NULL;
@@ -501 +501 @@
 PINTuple* pin = new PINTuple(nt, true);
 pin->SelectXY(ntn[0], ntn[1]);
-pin->SelectWt(ntn[2]);
+if (fgcolidx) pin->SelectColorByIndex(ntn[2]);  // Use the weight expression as a color index 
+else pin->SelectWt(ntn[2]);
 
 string titre =  nom + ":" + expwt + "_" + expy + "%" + expx ;

trunk/SophyaPI/PIext/servnobjm.h

@@ -79 +79 @@
                                         string& expcut, string dopt="", string loop="");
   virtual void          DisplayPoints2DW(string & nom, string& expx, string& expy, 
-                                         string& expwt, string& expcut, string dopt="", string loop="");
+                                         string& expwt, string& expcut, 
+                                         bool fgcolidx=false, string dopt="", string loop="");
   virtual void          DisplayPoints3DW(string & nom, string& expx, string& expy, string& expz, 
                                          string& expwt, string& expcut, string dopt="", string loop="");