Changeset 2945 in Sophya for trunk/SophyaPI/ProgPI/piapp.cc

Timestamp:

Apr 26, 2006, 5:53:18 PM (19 years ago)

Author:

ansari

Message:

1/ Ajout classe de lecture sur stdin (terminal) avec thread separe pour
piapp - incluant la possibilite d'utilisation de la librairie GNU readline
(fichiers piacmdrdr.cc piacmdrdr.h + fichier makfile specifique makefile_wgrdl

pour compil+link avec GNU readline)

2/ MAJ Makefile et modif programme principal piapp.cc avec flag -small
et activation thread de lecture sur terminal

Reza , 26/04/2006

File:

• trunk/SophyaPI/ProgPI/piapp.cc (modified) (9 diffs)

trunk/SophyaPI/ProgPI/piapp.cc

@@ -7 +7 @@
 #include "pistdimgapp.h"
 #include "piacmd.h"
+#include "piacmdrdr.h"
 #include "piversion.h"
 #include "piaversion.h"
@@ -48 +49 @@
   \verbatim
   csh> spiapp -h
- SophyaInitiator::SophyaInitiator() BaseTools Init
- PIOPersist::Initialize() Starting Sophya Persistence management service 
-SOPHYA Version  1.9 Revision 0 (V_Mai2005) -- Jun  9 2005 22:01:01 
-gcc 3.3-fast 20030304 (Apple Computer, Inc. build 1614)
+ PIOPersist::Initialize() Starting Sophya Persistence management service
+SOPHYA Version  2.0 Revision 0 (V_Mai2006) -- Apr 26 2006 17:17:22 cxx
 
  piapp: Interactive data analysis and visualisation program 
  Usage: piapp [-nored] [-nosig] [-nosigfpe] [-nosigsegv] [-hidezswin] 
-              [-tmpdir TmpDirectory] [-help2tex] [-exec file [args]] 
-  -nored : NoRedirect StdOut/StdErr 
+              [-small] [-tmpdir TmpDirectory] [-help2tex] [-exec file [args]] 
+  -nored : Don't redirect stdout/stderr to piapp console
   -nosig : Don't catch SigFPE, SigSEGV 
   -nosigfpe -nosigsegv: Don t catch SigFPE / SigSEGV 
+  -small : Create small size main piapp window 
   -hidezswin : Hide Zoom/Stat/ColMap window 
   -tmpdir TmpDirectory: defines TMDIR for temporary files 
   -help2tex: Create a LaTeX help file (piahelp.tex)
   -exec file [args] : Execute command file 
-  
+
   \endverbatim
  
@@ -77 +77 @@
     cout << "\n piapp: Interactive data analysis and visualisation program \n"
          << " Usage: piapp [-nored] [-nosig] [-nosigfpe] [-nosigsegv] [-hidezswin] \n"
-         << "              [-tmpdir TmpDirectory] [-help2tex] [-exec file [args]] \n"
-         << "  -nored : NoRedirect StdOut/StdErr \n"
+         << "              [-small] [-tmpdir TmpDirectory] [-help2tex] [-exec file [args]] \n"
+         << "  -nored : Don't redirect stdout/stderr to piapp console\n"
          << "  -nosig : Don't catch SigFPE, SigSEGV \n"
          << "  -nosigfpe -nosigsegv: Don t catch SigFPE / SigSEGV \n"
+         << "  -small : Create small size main piapp window \n"
          << "  -hidezswin : Hide Zoom/Stat/ColMap window \n"
          << "  -tmpdir TmpDirectory: defines TMDIR for temporary files \n"
@@ -95 +96 @@
 {
 int ofa;
-bool fgfpe, fgsegv, fgred, fghidezsw, fgexec;
+bool fgfpe, fgsegv, fgred, fghidezsw, fgexec, fgsmall;
 
 SkyTInitiator skyinit;
@@ -109 +110 @@
 fgexec = false;
 bool fgtmp = false;
+fgsmall = false;
 string tmpdir;
 string exfc;
@@ -119 +121 @@
   else if (strcmp(arg[ka],"-nosigfpe") == 0)   fgfpe=false; 
   else if (strcmp(arg[ka],"-nosigsegv") == 0)   fgsegv=false; 
+  else if (strcmp(arg[ka],"-small") == 0)     fgsmall=true; 
   else if (strcmp(arg[ka],"-hidezswin") == 0)   fghidezsw=true; 
   else if (strcmp(arg[ka],"-help2tex") == 0) { fgtexh=true; fgred=false; }
@@ -176 +179 @@
 // cout << " DBG-TMPDIR= " << getenv("TMPDIR") << endl;
 
-PIStdImgApp * app = new PIStdImgApp(narg, arg);
+PIStdImgApp * app = new PIStdImgApp(fgsmall, narg, arg);
 // cout << " DBG-2 " <<  app->ObjMgr()->GetTmpDir() << endl;
 cout << "  NamedObjMgr::SetTmpDir()+XNTuple::SetSwapPath() " << tmpdir << endl;
@@ -213 +216 @@
   exit(0);
 }
+
+// Creation du lecteur de commande sur terminal (avec GNU readline)
+PIACmdReader cmdrdr(app);
+cmdrdr.start();
 
 int rc = 0;
@@ -277 +284 @@
 
 app->RedirectStdOutErr(false);  
+cmdrdr.cancel();
+
 // On de-charge le module sopiamodule et fitsbtadapter
 sopiamodule_end();