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

Timestamp:

Feb 7, 2009, 10:50:34 PM (17 years ago)

Author:

cmv

Message:

char* -> const char* pour regler les problemes de deprecated string const... + comparaison unsigned signed + suppression EVOL_PLANCK rz+cmv 07/02/2009

File:

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

trunk/SophyaPI/PIext/pistdimgapp.cc

@@ -102 +102 @@
 m[0]->AppendItem("Open-Fits", 10120);
 m[0]->AppendItem("Open-PPF", 10130);
-#ifndef SANS_EVOLPLANCK
 m[0]->AppendItem("Open-ASCII", 10140);
-#endif
 // m[0]->AppendItem("Options", 10101);
 m[0]->AppendItem("Help", 10100);
@@ -316 +314 @@
 glst_piai = new PIAppInitiator(this);
 
-char buff[128];
 mCons->AddStr("  ............  starting piapp .............\n", PIVA_Blue );
-#ifdef SANS_EVOLPLANCK
-sprintf(buff, "Version: piapp=%g  PI=%g  PEIDA=%g \n", (double)PIAPP_VERSIONNUMBER, 
-              (double)PI_VERSIONNUMBER, (float)PeidaVersion());
-mCons->AddStr(buff, PIVA_Blue );
-#else
 string svers;
 SophyaInitiator::GetVersion(svers);
 mCons->AddStr(svers.c_str(), PIVA_Blue );
-#endif
 mCons->AddStr("  ..........................................\n", PIVA_Blue );
 // PrintPeidaVersion();
@@ -539 +530 @@
 if  ((GetState()) && (msg != mFCMsg)) { PIBeep(); return; }
 
-#ifdef SANS_EVOLPLANCK
-  TRY {
-#else
-  try {
-#endif
+try {
 
 //   Messages active-window
@@ -628 +615 @@
   mCons->AddChar('\n', PIVA_Def, true);
   SetBusy();
-#ifdef SANS_EVOLPLANCK
-  TRY {
-    mCmd->Interpret(s);
-    }  CATCH(merr) { 
-    fflush(stdout); 
-    cout << endl; 
-    cerr << endl;
-    string es = PeidaExc(merr);
-    cerr << "PIStdImgApp::Process()/ Cmd->Do() Exception :" << es << " (" << merr << ")" << endl ;
-    }
-#else
   try {
     //    mCmd->Interpret(s);
@@ -655 +631 @@
   }
 
-#endif
   SetReady();
   }
@@ -662 +637 @@
             (int)tmsg,(int)msg,(int)smm);
 
-#ifdef SANS_EVOLPLANCK
-}  CATCH(merr) { 
-  fflush(stdout); 
-  cout << endl; 
-  cerr << endl;
-  string es = PeidaExc(merr);
-  cerr << "PIStdImgApp::Process()/  Exception :" << es << " (" << merr << ")" << endl ;
-  SetReady();
-  }
-#else
   }
   catch ( PThrowable & exc ) {
@@ -690 +655 @@
   }
 
-#endif
 
 return;
@@ -1781 +1745 @@
 void PIStdImgApp::CatchSignals(bool fgfpe, bool fgsegv)
 {    
-#ifdef SANS_EVOLPLANCK
-PeidaConfigureSignalhandling(fgfpe, fgsegv, true, true);  
-#else
 // On active aussi SIGUSR1 pour stopthr
 SophyaConfigureSignalhandling(fgfpe, fgsegv, true, true);  
-#endif
 m[5]->SetStateMsg(10603, fgfpe);
 m[5]->SetStateMsg(10604, fgsegv);
@@ -1953 +1913 @@
       break;
         
-#ifndef SANS_EVOLPLANCK
     case 10140 :
       pfc_ascii->AcceptNewFile(false);
@@ -1988 +1947 @@
       SetReady();
       break;
-#endif
 
     case 10105:
@@ -2396 +2354 @@
 string info = "piapp : Interactive analysis program\n";
 char buff[128];
-#ifdef SANS_EVOLPLANCK
-sprintf(buff, "Version: piapp=%g  PI=%g  PEIDA=%g \n", (double)PIAPP_VERSIONNUMBER, 
-              (double)PI_VERSIONNUMBER, (float)PeidaVersion());
-info += buff;
-#else
+
 string svers;
 SophyaInitiator::GetVersion(svers);
@@ -2407 +2361 @@
         (double)PIAPP_VERSIONNUMBER);
 info += buff; 
-#endif
-info += "(C) LAL-IN2P3/CNRS  1996-2006\n";
-info += "(C) SPP-DAPNIA/CEA 1996-2006\n";
-#ifndef SANS_EVOLPLANCK
- info += "Check http://www.sophya.org for more information";
-#endif
+
+info += "(C) LAL-IN2P3/CNRS  1996-2009\n";
+info += "(C) SPP-DAPNIA/CEA 1996-2009\n";
+info += "Check http://www.sophya.org for more information";
+
 infow_txt->SetText(info);
 }