Changeset 374 in Sophya for trunk/SophyaPI

Timestamp:

Aug 9, 1999, 4:42:11 PM (26 years ago)

Author:

ercodmgr

Message:

Corrections diverses et fichier de numero de version pour piapp Reza 9/8/99

Location:

trunk/SophyaPI/PIext

Files:

• nobjmgr.cc (modified) (1 diff)
• piacmd.cc (modified) (1 diff)
• piaversion.h (added)
• pistdimgapp.cc (modified) (6 diffs)
• pistdimgapp.h (modified) (1 diff)

trunk/SophyaPI/PIext/nobjmgr.cc

@@ -343 +343 @@
 if ( !CheckDirName(dirname) ) {
   cout << "NamedObjMgr::CleanDir( " << dirname << ") Error - Invalid name !" << endl;
-  return(false); 
   }
 NObjDirList::iterator itr = myDirs->find(dirname);
 if (itr == myDirs->end()) {
   cout << "NamedObjMgr::CleanDir( " << dirname << ") Error - No such directory !" << endl;
-  return(false);
   }
 

trunk/SophyaPI/PIext/piacmd.cc

@@ -448 +448 @@
 #ifndef __mac__
   /* On vide le buffer X-Window */
-  XFlush(PIXDisplay());
+  XSync(PIXDisplay(),False);
 #endif
 }

trunk/SophyaPI/PIext/pistdimgapp.cc

@@ -32 +32 @@
 
 #include "piinit.h"
+#include "piversion.h"
+#include "piaversion.h"
 
 
@@ -102 +104 @@
 m[5]->AppendItem("CloseAll", 10601);
 m[5]->AppendCheckItem("Red.Out/Err", 10602);
-m[5]->AppendCheckItem("Catch SigFPE/SEGV", 10603);
+m[5]->AppendCheckItem("Catch SigFPE", 10603);
+m[5]->AppendCheckItem("Catch SigSEGV", 10604);
 
 m[6] = new PIMenu(Menubar(),"Modules");
@@ -112 +115 @@
 AppendMenu(m[4]);
 AppendMenu(m[5]);
-AppendMenu(m[6]);
+// AppendMenu(m[6]);  Menu Modules vide pour le moment 
 
 int scsx, scsy;
@@ -142 +145 @@
 
 char buff[128];
-sprintf(buff, "piapp V2.0   ---  PEIDA++ Version %5.3f \n", (float)PeidaVersion());
 mCons->AddStr("  ............  starting piapp .............\n", PIVA_Blue );
+sprintf(buff, "Version: piapp=%g  PI=%g  PEIDA=%g \n", (double)PIAPP_VERSIONNUMBER, 
+              (double)PI_VERSIONNUMBER, (float)PeidaVersion());
 mCons->AddStr(buff, PIVA_Blue );
 mCons->AddStr("  ..........................................\n", PIVA_Blue );
@@ -804 +808 @@
 
 /* --Methode-- */
-void PIStdImgApp::CatchSignals(bool fg)
+void PIStdImgApp::CatchSignals(bool fgfpe, bool fgsegv)
 {    
-PeidaConfigureSignalhandling(fg, fg, true, true);  
-m[5]->SetStateMsg(10603, fg);
+PeidaConfigureSignalhandling(fgfpe, fgsegv, true, true);  
+m[5]->SetStateMsg(10603, fgfpe);
+m[5]->SetStateMsg(10604, fgsegv);
 }
 
@@ -1208 +1213 @@
     break;
   case 10603:
-    CatchSignals(*((bool*)data));
+  case 10604:
+    CatchSignals(m[5]->GetStateMsg(10603), m[5]->GetStateMsg(10604));
     break;
   default:

trunk/SophyaPI/PIext/pistdimgapp.h

@@ -93 +93 @@
      inline bool HasRedirectedStdOutErr() { return(redirecout); }
 // Gestion des signaux
-     void  CatchSignals(bool fg = true);
+     void  CatchSignals(bool fgfpe=true, bool fgsegv=true);
 
 //  Gestion d attributs graphiques courants