Changeset 2536 in Sophya for trunk/SophyaPI/PIext

Timestamp:

May 13, 2004, 1:54:02 PM (21 years ago)

Author:

ansari

Message:

Correction bug ds PIACmd : remplacement stack<string> par queue<string> pour empilement de commandes soumises a l'interpreteur et ajout commande bargraph pour drawer PIBarGraph - Reza 13 Mai 2004

Location:

trunk/SophyaPI/PIext

Files:

• basexecut.cc (modified) (3 diffs)
• piacmd.cc (modified) (2 diffs)
• piacmd.h (modified) (2 diffs)

trunk/SophyaPI/PIext/basexecut.cc

@@ -16 +16 @@
 #include "nomgadapter.h"
 #include "piyfxdrw.h"
+#include "pibargraph.h"
 
 #include "histos.h"
@@ -739 +740 @@
   while (tokens.size() < 3) tokens.push_back("");
   mObjMgr->DisplayVector(tokens[0], tokens[1], tokens[2]);
+}
+else if (kw == "bargraph") {
+  if (tokens.size() < 2) { 
+    cout << "Usage: bargraph gr_opt v1 [v2 ...]" << endl;
+    return(0); 
+  }
+  PIBarGraph* bgd = new PIBarGraph;
+  for(int k=1; k<tokens.size(); k++)
+    bgd->AddBar(atof(tokens[k].c_str()));
+  string grname = "BarGraph";
+  mImgApp->DispScDrawer(bgd, grname, tokens[0]); 
 }
 
@@ -1604 +1616 @@
 usage += "\n  Related commands: disp nt2d ";  
 mpiac->RegisterCommand(kw, usage, this, "Obj. Display");
+kw = "bargraph";
+usage = "Bar-Graph view of a sequence of values ";
+usage += "\n Usage : bargraph graphic_attributes v1 [v2 v3 ...] ";
+usage += "\n  Related commands: disp nt2d vecplot";  
+mpiac->RegisterCommand(kw, usage, this, "Obj. Display");
 
 // Ceci est maintenant obsolete, on garde pour info.

trunk/SophyaPI/PIext/piacmd.cc

@@ -203 +203 @@
 {
   mutx_inps.lock();
-  inputlines.push(line);
+  inputlines.push(line);   // Ajout d'un element en fin de queue
   mutx_inps.unlock();
   mutx_inps.broadcast();
@@ -224 +224 @@
       mutx_inps.wait();
     }
-    string line = inputlines.top();
-    inputlines.pop();
+    string line = inputlines.front();   // On recupere l'element de tete
+    inputlines.pop();    // On supprime l'element de tete
     fg_threxe = true;
     mutx_inps.unlock();

trunk/SophyaPI/PIext/piacmd.h

@@ -11 +11 @@
 #include <string>
 #include <vector>
-#include <stack>
+#include <queue>
 #include "zthread.h"
 
@@ -87 +87 @@
   CxxOptionWind* cxxoptwin;
 
-// Stack d'entree et controle de thread
-  stack<string> inputlines;
+// Queue des entrees et controle de thread
+  queue<string> inputlines;
   bool fg_thrstop;
   ZMutex mutx_inps;