Changeset 3024 in Sophya for trunk/SophyaPI/PIext

Timestamp:

Jul 17, 2006, 2:33:29 PM (19 years ago)

Author:

ansari

Message:

Adaptation modification SophyaInitiator::RegisterModule()/PrintVersion() - pret pour tag V2 Reza 17/7/2006

Location:

trunk/SophyaPI/PIext

Files:

• piaversion.h (modified) (1 diff)
• piinit.cc (modified) (2 diffs)
• pistdimgapp.cc (modified) (3 diffs)

trunk/SophyaPI/PIext/piaversion.h

@@ -2 +2 @@
 #define PIAPPVERSION_H_SEEN
 
-#define PIAPP_VERSIONNUMBER  3.985
+#define PIAPP_VERSIONNUMBER  4.0
 
 #endif

trunk/SophyaPI/PIext/piinit.cc

@@ -29 +29 @@
 #include "gaussfilt.h"
 #include "nomspecrespadapter.h"
+
+#include "piaversion.h"
 
 #endif
@@ -128 +130 @@
   serv->RegisterClass(new GaussianFilter, new NOMAdapter_SpectralResponse );
   serv->RegisterClass(new SpecRespVec, new NOMAdapter_SpectralResponse );
-#endif
 
+  SophyaInitiator::RegisterModule("PIext/piapp", PIAPP_VERSIONNUMBER);
+#endif  
 }
 

trunk/SophyaPI/PIext/pistdimgapp.cc

@@ -319 +319 @@
 sprintf(buff, "Version: piapp=%g  PI=%g  PEIDA=%g \n", (double)PIAPP_VERSIONNUMBER, 
               (double)PI_VERSIONNUMBER, (float)PeidaVersion());
+mCons->AddStr(buff, PIVA_Blue );
 #else
-sprintf(buff, "Version: piapp=%g  PI=%g  SOPHYA=%g \n", (double)PIAPP_VERSIONNUMBER, 
-              (double)PI_VERSIONNUMBER, glst_piai->Version());
+string svers;
+SophyaInitiator::GetVersion(svers);
+mCons->AddStr(svers.c_str(), PIVA_Blue );
 #endif
-mCons->AddStr(buff, PIVA_Blue );
 mCons->AddStr("  ..........................................\n", PIVA_Blue );
 // PrintPeidaVersion();
@@ -2283 +2284 @@
                          PIWK_dialog, bsx*5+3*spx, bsy*4+spy*3, 200, 200);
 infow_win->SetAutoDelChilds(true);
-infow_txt = new PIText(infow_win,"about_piapp_text", bsx*5+spx, bsy*3, spx, spy);
+infow_txt = new PIText(infow_win,"about_piapp_text", true, false, bsx*5+spx, bsy*3, spx, spy);
 infow_txt->SetMutiLineMode(true);
 infow_txt->SetTextEditable(false);
@@ -2293 +2294 @@
 infow_but->SetMsgParent((PIMsgHandler *)app);
 infow_but->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
+
+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
-{
-sprintf(buff, "Version: piapp=%g  PI=%g  SOPHYA=%g \n", (double)PIAPP_VERSIONNUMBER, 
-              (double)PI_VERSIONNUMBER, glst_piai->Version());
-}
+string svers;
+SophyaInitiator::GetVersion(svers);
+info += svers;
+sprintf(buff, "\n Version: PI=%g  --  PIext/piapp= %g \n", (double)PI_VERSIONNUMBER, 
+        (double)PIAPP_VERSIONNUMBER);
+info += buff; 
 #endif
-string info = "piapp : Interactive analysis program\n";
-info += buff;
-info += "(C) LAL-IN2P3/CNRS  1996-2003\n";
-info += "(C) SPP-DAPNIA/CEA 1996-2003\n";
+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";