Changeset 2188 in Sophya

Timestamp:

Sep 9, 2002, 6:48:34 PM (23 years ago)

Author:

ansari

Message:

Ajout commande exitpiapp et possibilite de soumettre une commande a executer a PIStdImgApp (pour execution du script specifie au demarrage) - Reza 9/9/2002

Location:

trunk/SophyaPI/PIext

Files:

• basexecut.cc (modified) (2 diffs)
• pistdimgapp.cc (modified) (4 diffs)
• pistdimgapp.h (modified) (2 diffs)

trunk/SophyaPI/PIext/basexecut.cc

@@ -50 +50 @@
 {
 Services2NObjMgr* srvo = mObjMgr->GetServiceObj();
+// ----> Sortie d'application
+if (kw == "exitpiapp") {
+  mImgApp->Stop();
+  return(0);
+}
 // >>>>> Chargement de modules
-if (kw == "loadmodule") {
+else if (kw == "loadmodule") {
   if (tokens.size() < 2) { cout << "Usage: loadmodule fnameso modulename" << endl;  return(0); }
   mpiac->LoadModule(tokens[0], tokens[1]);
@@ -742 +747 @@
 {
 string kw, usage;
+kw = "exitpiapp";
+usage = "To end the piapp session";
+mpiac->RegisterCommand(kw, usage, this, "Commands");
 kw = "loadmodule";
 usage = "To load and initialize modules \n  Usage: loadmodule fnameso modulename";

trunk/SophyaPI/PIext/pistdimgapp.cc

@@ -47 +47 @@
 /*    Classe SIA_RU__Periodic : mise a jour periodique de      */
 /*    la fenetre Stat/Ressource info                           */
+/*    + execution de commande soumis de l'exterieur            */
 /* ........................................................... */
 
@@ -71 +72 @@
 void SIA_RU__Periodic::DoPeriodic()
 {
-  if (_app) _app->UpdateStatResourceInfo();
+  if (_app) { 
+    _app->ExecuteExtCommand();
+    _app->UpdateStatResourceInfo();
+  }
 }
 
@@ -210 +214 @@
 therm_cpu->SetThreshold(0.75, 0.90);
 
+ fg_exc_cmd = false;
 UpdateStatResourceInfo();
 resupd_periodic = new SIA_RU__Periodic(this);
@@ -775 +780 @@
 
 /* --Methode-- */
+int PIStdImgApp::ExecuteExtCommand() 
+{ 
+if (!fg_exc_cmd) return(0); 
+else {
+  fg_exc_cmd = false; 
+  return CmdInterpreter()->Interpret(exc_command); 
+  }
+}
+
+/* --Methode-- */
 void PIStdImgApp::AddText(string const & txt, double xp, double yp, string const& sop)
 {

trunk/SophyaPI/PIext/pistdimgapp.h

@@ -59 +59 @@
                        string title="", int oid=0);
 
+  //  Specification (de l'exterieur) de commande a executer 
+     inline void SubmitCommand(string const& cmd) 
+            { exc_command = cmd;  fg_exc_cmd = true; }
+  //  Execution de commande soumis de l'exterieur
+     int  ExecuteExtCommand();
+     
   //  Fonction d'ajout de texte (provisoire - Aout 99) 
      void AddText(string const & txt, double xp, double yp, string const& opt);
@@ -202 +208 @@
     ResourceUsage resusg;
     PIPeriodic* resupd_periodic;
+
+  // Commande specifie de l'exterieur a executer 
+  // Pris en charge par resupd_periodic
+    string exc_command;
+    bool fg_exc_cmd;
 };