Changeset 2999 in Sophya for trunk/SophyaPI/PIext/basexecut.cc

Timestamp:

Jul 2, 2006, 7:20:56 PM (19 years ago)

Author:

ansari

Message:

1/ Ajout methode Services2NObjMgr::DisplayPoints3DW() et commande plot3dw
2/ Ajout et utilisation methode de verification de nom NamedObjMgr::CheckName()
3/ Changement methode NObjMgrAdapter::GetInfoString() et son utilisation
a travers la methdoe PIACmd::GetVarApp() pour acces de type $objname
4/ Ajout methode NObjMgrAdapter::PerformOperation() , implemente pour
adaptateur TMatrix<T> et TArray<T> pour extraction de ligne/colonne
(des matrices) et plan (slice) des TArray pour Rank()>3 Et mise en place
de la commande objaoper pour appel a PerformOperation()
5/ Petites corrections pour ntline2var vec2var

Reza 2 Juillet 2006

File:

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

trunk/SophyaPI/PIext/basexecut.cc

@@ -444 +444 @@
   }
   
-  mObjMgr->SetVar(tokens[1], v2str);
+  mpiac->SetVar(tokens[1], v2str);
 }
 // Une ligne du NTuple/NTupleInterface -> variable interpreteur
@@ -509 +509 @@
     }
   }
-  mObjMgr->SetVar(tokens[2], v2str);
+  mpiac->SetVar(tokens[2], v2str);
   if (adel) delete nti;
+}
+// Operation sur objets a travers l'adaptateur NObjMgrAdapter::PerformOperation()
+else if (kw == "objaoper") {
+  if (tokens.size() < 2) {
+    cout << "Usage: objaoper objname operation [args ...]" << endl; 
+    return(0); 
+  }
+  NObjMgrAdapter* oa = mObjMgr->GetObjAdapter(tokens[0]);
+  if(oa == NULL) {
+    cerr << "objaoper Error , No such object " << tokens[0] << endl; 
+    return(0);
+  }
+  tokens.erase(tokens.begin());
+  return oa->PerformOperation(tokens);
 }
 
@@ -626 +640 @@
   srvo->DisplayPoints3D(tokens[0],tokens[1],tokens[2],tokens[3], tokens[4], tokens[5], tokens[6]);
   }
+else if (kw == "plot3dw" ) {  
+  if (tokens.size() < 5) { 
+    cout << "Usage: plot3dw nomobj expx expy expz expwt [expcut opt loop_par]" << endl;
+    return(0); 
+    }
+  if (tokens.size() < 6) tokens.push_back("1");
+  while (tokens.size() < 8) tokens.push_back("");
+  srvo->DisplayPoints3DW(tokens[0],tokens[1],tokens[2],tokens[3], tokens[4], tokens[5], 
+                         tokens[6], tokens[7]);
+}
 
 else if (kw == "projh1d" ) {
@@ -1086 +1110 @@
 usage += "  Related commands: vec2var ntline2var";  
 mpiac->RegisterCommand(kw, usage, this, "Objects");
+kw = "objaoper";
+usage = "Perform an operation through the object adapter NObjMgrAdapter::PerformOperation()\n";
+usage += "  Usage: objaoper objname operation [arg1 ...] \n";
+usage += "  Examples of defined operations : \n";
+usage += "  Matrices: row indx_row , col indx_col \n";  
+usage += "  Arrays: slicexy indx_Z , slicexz indx_Y, sliceyz indxX \n";  
+mpiac->RegisterCommand(kw, usage, this, "Objects");
 
 //------- Commandes trace de fonctions
@@ -1132 +1163 @@
 usage += "\nLoop parameters can be specified as I1[:I2[:DI]] for(int i=I1; i<I2; i+=DI)"; 
 usage += "\nThe default Cut() expression in true (=1) for all"; 
-usage += "\n\n  Related commands: plot2d plot2de plot2dw plot3d "; 
-usage += "\n        projh1d projh2d  projprof fillvec fillmtx "; 
-usage += "\n        fillnt fillgd1 fillgd2 ntloop exptovec ... ";
+usage += "\n\n Related commands: plot2d plot2de plot2dw plot3d plot3dw"; 
+usage += "\n         projh1d projh2d  projprof fillvec fillmtx "; 
+usage += "\n         fillnt fillgd1 fillgd2 ntloop exptovec ... ";
 grp = "Expr. Plotting";
 mpiac->RegisterHelp(kw, usage, grp);
@@ -1140 +1171 @@
 usage = "Plots (2D) Y=g(Object) vs. X=f(Object) --- Object Variable names (double) :";
 usage += "\n Usage: plot2d nameobj f_X() g_Y() [f_Cut() graphic_attributes loop_param]";
-usage += "\n  Related commands: plot2de plot2dw plot3d ObjectExpressions ..."; 
+usage += "\n  Related commands: plot2de plot2dw plot3d plot3dw ObjectExpressions ..."; 
 mpiac->RegisterCommand(kw, usage, this, "Expr. Plotting");
 kw = "plot2de";
@@ -1153 +1184 @@
 mpiac->RegisterCommand(kw, usage, this, "Expr. Plotting");
 kw = "plot3d";
-usage = "Plots (3D) Z=h(Object) vs. Y=g(Object) vs. X=f(Object) vs ";
+usage = "Plots (3D) Z=h(Object) vs. Y=g(Object) vs. X=f(Object)";
 usage += "\n Usage: plot3d nameobj f_X() g_Y() h_Z() [Cut() graphic_attributes loop_param]";
-usage += "\n  Related commands: plot2d plot2dw plot2de plot3d ObjectExpressions ..."; 
+usage += "\n  Related commands: plot2d plot2de plot3dw ObjectExpressions ..."; 
+mpiac->RegisterCommand(kw, usage, this, "Expr. Plotting");
+kw = "plot3dw";
+usage = "Plots (3D) Z=h(Object) vs. Y=g(Object) vs. X=f(Object) with Weight W=k(Object)  ";
+usage += "\n Usage: plot3d nameobj f_X() g_Y() h_Z() k_Wt() [Cut() graphic_attributes loop_param]";
+usage += "\n  Related commands: plot2d plot2dw plot3d ObjectExpressions ..."; 
 mpiac->RegisterCommand(kw, usage, this, "Expr. Plotting");