Changeset 3370 in Sophya for trunk/SophyaPI/PIext/pistdimgapp.cc

Timestamp:

Oct 31, 2007, 11:49:04 PM (18 years ago)

Author:

ansari

Message:

Adaptation pour redirection stdout/err a travers un fichier ds PIATmpxxx/, Reza 31/10/2007

File:

• trunk/SophyaPI/PIext/pistdimgapp.cc (modified) (4 diffs)

trunk/SophyaPI/PIext/pistdimgapp.cc

@@ -162 +162 @@
 m[5] = new PIMenu(Menubar(),"Special");
 m[5]->AppendItem("CloseAll", 10601);
-m[5]->AppendCheckItem("Red.Out/Err", 10602);
+// m[5]->AppendCheckItem("Red.Out/Err", 10602);
 m[5]->AppendCheckItem("Catch SigFPE", 10603);
 m[5]->AppendCheckItem("Catch SigSEGV", 10604);
@@ -257 +257 @@
 mCons->AcceptCmd(true, 50);
 consolecont->Show();
-redirecout = false;
-// RedirectStdOutErr(true);  pas par defaut 
+redirecout = NORED_OE;
+RedirectStdOutErr(NORED_OE);  // pas de redirect par defaut 
 
 mFgScSz = sfgsz;
@@ -1739 +1739 @@
 
 /* --Methode-- */
-void PIStdImgApp::RedirectStdOutErr(bool fg)
-{
-if (fg) { 
-  RedirectOutStream(mCons);
-  RedirectErrStream(mCons);
-  m[5]->SetStateMsg(10602, true);
-  redirecout = true;
-  }
-else {
-  RedirectOutStream(NULL);
-  RedirectErrStream(NULL);
-  m[5]->SetStateMsg(10602, false);
-  redirecout = false;
-  }
+void PIStdImgApp::RedirectStdOutErr(RED_OUTERR_FLG redflg)
+{
+if (redflg == redirecout) return;
+string fnout = ObjMgr()->GetTmpDir() + "/sout.log";
+string fnerr = ObjMgr()->GetTmpDir() + "/serr.log";
+bool drfg = false;
+PIConsole* pcons = NULL;
+switch (redflg) {
+  case NORED_OE :
+    pcons = NULL;
+    break;
+  case CONSRED_OE :
+    pcons = mCons;
+    drfg = false;
+    break;
+  case DOUBLERED_OE:
+    pcons = mCons;
+    drfg = true;
+    break;
+}
+
+char piva =  PIVA_Def;
+RedirectOutStream(pcons, fnout, drfg, piva);
+// ancienne maniere redirect, avec pipe : RedirectOutStream(pcons, piva);
+piva = PIVA_Red;
+RedirectErrStream(pcons, fnerr, drfg, piva);
+// ancienne maniere redirect, avec pipe : RedirectErrStream(pcons, piva);
+ 
+//  m[5]->SetStateMsg(10602, false);
+redirecout = redflg;
 return;
 }
@@ -2316 +2332 @@
     CloseAllWindows();
     break;
-  case 10602:
+    /*
+ case 10602:
     RedirectStdOutErr(*((bool*)data));
     break;
+    */
   case 10603:
   case 10604: