Changeset 506 in Sophya

Timestamp:

Oct 25, 1999, 10:35:36 AM (26 years ago)

Author:

ercodmgr

Message:

Modifs pour echelle Log - Reza 25/10/99

Location:

trunk/SophyaPI/PIext

Files:

• basexecut.cc (modified) (1 diff)
• nomimagadapter.cc (modified) (1 diff)
• pistdimgapp.cc (modified) (4 diffs)
• pistdimgapp.h (modified) (2 diffs)
• servnobjm.cc (modified) (2 diffs)

trunk/SophyaPI/PIext/basexecut.cc

@@ -684 +684 @@
 usage += ">> Axes:  stdaxes=defaxes=boxaxes  simpleaxes boxaxesgrid \n";
 usage += "          fineaxes  grid=fineaxesgrid \n"; 
+usage += ">> LogScale : linx liny logx logy -> Lin/Log Scales for 2D plots \n";
 usage += ">> XYLimits : xylimits  -> Forces X-Y limits in 2-D plots \n";
 usage += ">> DisplayWindow: next same win stack \n";

trunk/SophyaPI/PIext/nomimagadapter.cc

@@ -170 +170 @@
 #pragma define_template NTupInt_Image<r_4>
 #endif
-#if defined(__ANSI_TEMPLATES__) || defined(__GNU_TEMPLATES__)
+#if defined(ANSI_TEMPLATES) || defined(__ANSI_TEMPLATES__) || defined(__GNU_TEMPLATES__) 
 template class NOMAdapter_Image<uint_2>;
 template class NOMAdapter_Image<int_2>;

trunk/SophyaPI/PIext/pistdimgapp.cc

@@ -203 +203 @@
 mXmin = mYmin = -1.;
 mXmax = mYmax = 1;
+maXlog = maYlog = false;
 SaveGraphicAtt();
 
@@ -483 +484 @@
 scw->SetBinding(PIBK_elastic, PIBK_elastic, PIBK_elastic, PIBK_elastic);
 scw->SetUserData(NULL, oid);
+if (maXlog || maYlog)  scw->SetLogScale(maXlog, maYlog);  // Echelle log
 if (mFXYlim)  // Forcage limites XY 
   scw->SetLimits(mXmin, mXmax, mYmin, mYmax);
@@ -1307 +1309 @@
   mSYmin = mYmin;  mSYmax = mYmax;
   mSFXYlim = mFXYlim;
+  mSaXlog = maXlog;
+  mSaYlog = maYlog;
 }
 
@@ -1325 +1329 @@
   mYmin = mSYmin;  mYmax = mSYmax;
   mFXYlim = mSFXYlim;
-}
+  maXlog = mSaXlog;
+  maYlog = mSaYlog;
+}

trunk/SophyaPI/PIext/pistdimgapp.h

@@ -102 +102 @@
      void  SetXYLimits(double xmin=-1., double xmax=1., double ymin=-1., double ymax=1.);
      inline void  UseXYLimits(bool fg=false) {  mFXYlim=fg; }
+     inline void  SetXLogScale(bool logx=false) { maXlog = logx; }
+     inline void  SetYLogScale(bool logy=false) { maYlog = logy; }
+
 // Pour sauvegarder-restauration de  l'etat des attributs graphiques
      void  SaveGraphicAtt();   
@@ -169 +172 @@
     double       mSXmin, mSXmax, mSYmin, mSYmax;
     bool         mFXYlim, mSFXYlim;
+    bool         maXlog, mSaXlog;
+    bool         maYlog, mSaYlog;
 
     PIMessage mFCMsg;  // Message for processing FileOpen

trunk/SophyaPI/PIext/servnobjm.cc

@@ -1226 +1226 @@
   mImgapp->SetXYLimits();
   mImgapp->UseXYLimits();
+  mImgapp->SetXLogScale();
+  mImgapp->SetYLogScale();
   return(ropt);
   }
@@ -1265 +1267 @@
 
   // Utilisation limites X-Y
-  if ( grt[k] == "xylimits" ) { mImgapp->UseXYLimits(true);  fgsrgr = true;  continue; } 
+  if ( grt[k] == "xylimits" ) { mImgapp->UseXYLimits(true);  fgsrgr = true;  continue; }
+  // Echelle logarithmique d'axe
+  if ( grt[k] == "logx" )  { mImgapp->SetXLogScale(true); fgsrgr = true;  continue; }
+  if ( grt[k] == "linx" )  { mImgapp->SetXLogScale(false); fgsrgr = true;  continue; }
+  if ( grt[k] == "logy" )  { mImgapp->SetYLogScale(true); fgsrgr = true;  continue; }
+  if ( grt[k] == "liny" )  { mImgapp->SetYLogScale(false); fgsrgr = true;  continue; }
+
   // Si c'est une couleur
   it = GrAcolors.find(grt[k]);