Changeset 1131 in Sophya for trunk

Timestamp:

Aug 22, 2000, 5:09:27 PM (25 years ago)

Author:

ercodmgr

Message:

Introduction de l'option graphique tit/notit (methodes ds PIStdImgApp, modifs ds baseexcut.cc et ds servnobjmgr.cc - Reza 22/08/2000

Location:

trunk/SophyaPI/PIext

Files:

• basexecut.cc (modified) (3 diffs)
• piaversion.h (modified) (1 diff)
• pistdimgapp.cc (modified) (6 diffs)
• pistdimgapp.h (modified) (3 diffs)
• servnobjm.cc (modified) (2 diffs)

trunk/SophyaPI/PIext/basexecut.cc

@@ -103 +103 @@
   int opt = mObjMgr->GetServiceObj()->DecodeDispOption(tokens[2], fgsr);
   mImgApp->AddText(txt, xp, yp);
+  if (fgsr) mImgApp->RestoreGraphicAtt(); 
+  }
+else if (kw == "settitle") {
+  if (tokens.size() < 2) { cout << "Usage: addtitle fontatt titleup " << endl;  return(0); }
+  bool fgsr = true;
+  int opt = mObjMgr->GetServiceObj()->DecodeDispOption(tokens[0], fgsr);
+  string txt = tokens[1];
+  for(int k=2; k<tokens.size(); k++) txt += (' ' + tokens[k]);
+  string td = "";
+  mImgApp->SetTitle(txt, td);
   if (fgsr) mImgApp->RestoreGraphicAtt(); 
   }
@@ -715 +725 @@
 usage += ">> XYLimits : xylimits  -> Forces X-Y limits in 2-D plots \n";
 usage += ">> stat/nostat or stats/nostats -> Toggle statistic display flag \n";
+usage += ">> title/notitle or tit/notit -> Toggle Auto AddTitle flag \n";
 usage += ">> DisplayWindow: next same win stack inset \n";
 usage += "   Related commands: setxylimits setinsetlimits setimgcenter";  
@@ -741 +752 @@
 usage += "\n at the specified position (Gr-Object Coordinate) with graphic attribute specification";
 usage += "\n  Usage: addtext x y ColFontAtt TextString";
-usage += "\n  Related commands: graphicatt";  
+usage += "\n  Related commands: settitle graphicatt";  
+mpiac->RegisterCommand(kw, usage, this, "Graphics");
+
+kw = "settitle";
+usage = "Set the title string (top title) for the current graphic object";
+usage += "\n  Usage: settitle FontAtt TopTitle";
+usage += "\n  Related commands: addtext graphicatt";  
 mpiac->RegisterCommand(kw, usage, this, "Graphics");
 

trunk/SophyaPI/PIext/piaversion.h

@@ -2 +2 @@
 #define PIAPPVERSION_H_SEEN
 
-#define PIAPP_VERSIONNUMBER  2.4
+#define PIAPP_VERSIONNUMBER  2.5
 
 #endif

trunk/SophyaPI/PIext/pistdimgapp.cc

@@ -209 +209 @@
 mFImgCenter = false;
 maXlog = maYlog = false;
+mAddTitle = true;
 SaveGraphicAtt();
 
@@ -550 +551 @@
 else ((PIH2DWdg*)scw)->SetPIHisto((PIHisto2D*)scd);
 //   Titre du plot
-if (title.length() <= 0)  title = name;  string t2="";   
-scw->SetTitles(title, t2);    
+if (mAddTitle) {
+  if (title.length() <= 0)  title = name;  string t2="";   
+  scw->SetTitles(title, t2);    
+}
 // scw->Refresh();   ? Pas necessaire  Reza 19/08/98, 05/05/99 $CHECK$ 
 mCurWin = win;
@@ -612 +615 @@
 wd3->AddDrawer3D(dr3, true);
 //   Titre du plot
-if (title.length() <= 0)  title = name;  string t2="";   
-wd3->SetTitles(title, t2);    
+if (mAddTitle) {
+  if (title.length() <= 0)  title = name;  string t2="";   
+  wd3->SetTitles(title, t2);    
+}
 // wd3->Refresh();   ?Pas necessaire   $CHECK$ 05/05/99
 mCurWin = win;
@@ -650 +655 @@
   if ( (mFSz != PI_NotDefFontSize) && (mFAtt != PI_NotDefFontAtt) )     eld->SetFontAtt(mFSz, mFAtt); 
   eld->ElAddText(xp,yp,txt.c_str(),mFCol);
+  eld->Refresh();
+  }
+}
+/* --Methode-- */
+void PIStdImgApp::SetTitle(string const & titletop, string const & titlebottom)
+{
+if (!mLastWdg)  return;
+PIElDrawer *eld=NULL;
+PIScDrawWdg* sdw=NULL;
+PIDraw3DWdg* w3d=NULL;
+PIImage* imgw;
+switch(mLastWdg->kind()) {
+  case PIScDrawWdg::ClassId :
+    sdw = dynamic_cast<PIScDrawWdg *>(mLastWdg);
+    if (sdw) eld = sdw->BaseDrawer();
+    break;
+  case PIDraw3DWdg::ClassId :
+    w3d = dynamic_cast<PIDraw3DWdg *>(mLastWdg);
+    if (w3d) eld = w3d->BaseDrawer();
+    break;
+  case PIImage::ClassId :
+    imgw = dynamic_cast<PIImage *>(mLastWdg);
+    if (imgw) eld = imgw->MyElDrawer();
+    break;
+  default :
+    break;
+  }
+if (eld) { 
+  if ( (mFSz != PI_NotDefFontSize) && (mFAtt != PI_NotDefFontAtt) )     eld->SetFontAtt(mFSz, mFAtt); 
+  eld->SetTitles(titletop, titlebottom);
   eld->Refresh();
   }
@@ -1412 +1447 @@
   mSaXlog = maXlog;
   mSaYlog = maYlog;
+  mSAddTitle = mAddTitle;
 }
 
@@ -1437 +1473 @@
   maXlog = mSaXlog;
   maYlog = mSaYlog;
+  mAddTitle = mSAddTitle;
 }
 

trunk/SophyaPI/PIext/pistdimgapp.h

@@ -53 +53 @@
   //  Fonction d'ajout de texte (provisoire - Aout 99)
      void AddText(string const & txt, double xp, double yp);
+  //  Fonction Ajout de titre de trace
+     void SetTitle(string const & titleup, string const & titledown);
 
 
@@ -107 +109 @@
      inline void  SetXLogScale(bool logx=false) { maXlog = logx; }
      inline void  SetYLogScale(bool logy=false) { maYlog = logy; }
+     inline void  SetAutoAddTitle(bool aatit=true) { mAddTitle = aatit; }
 
 // Pour sauvegarder-restauration de  l'etat des attributs graphiques
@@ -184 +187 @@
     bool         maXlog, mSaXlog;
     bool         maYlog, mSaYlog;
+    bool         mAddTitle, mSAddTitle;
 
     PIMessage mFCMsg;  // Message for processing FileOpen

trunk/SophyaPI/PIext/servnobjm.cc

@@ -1353 +1353 @@
   mImgapp->SetXLogScale();
   mImgapp->SetYLogScale();
+  mImgapp->SetAutoAddTitle();
   stats_option = true;
   return(ropt);
@@ -1401 +1402 @@
   if ( grt[k] == "logy" )  { mImgapp->SetYLogScale(true); fgsrgr = true;  continue; }
   if ( grt[k] == "liny" )  { mImgapp->SetYLogScale(false); fgsrgr = true;  continue; }
+  // Ajout automatique de titre
+  if ( ( grt[k] == "tit" ) || ( grt[k] == "title" ) )
+    { mImgapp->SetAutoAddTitle(true); fgsrgr = true;  continue; }
+  if ( ( grt[k] == "notit" ) || ( grt[k] == "notitle" ) )
+    { mImgapp->SetAutoAddTitle(false); fgsrgr = true;  continue; }
 
   // Si c'est une couleur