Changeset 2522 in Sophya for trunk/SophyaPI

Timestamp:

Mar 19, 2004, 10:47:37 AM (22 years ago)

Author:

cmv

Message:

intro de ConfigureAxesCenter pour option axescenter=x0,y0 cmv 19/03/04

Location:

trunk/SophyaPI/PI

Files:

• piaxes.cc (modified) (4 diffs)
• piaxes.h (modified) (2 diffs)
• pidrawer.cc (modified) (3 diffs)
• pidrawer.h (modified) (3 diffs)
• pieldrw.cc (modified) (1 diff)

trunk/SophyaPI/PI/piaxes.cc

@@ -41 +41 @@
   ConfigureTicks();
   ConfigureAutoFontSize();
+  ConfigureAxesCenter();
   setupDone = false;
 }
@@ -111 +112 @@
 
     // Les axes
-    double x0axes = (xMin+xMax)/2.;
-    double y0axes = (yMin+yMax)/2.;
-    // POUR REZA: ici si on a demande de forcer les axes en x0,y0
-    // alors on le fait ici: il faut faire a peu pres ca:
-    // > if(getaxescenter()) getaxescenter(x0axes,y0axes);
+    double x0axes = (xMin+xMax)/2.,  y0axes = (yMin+yMax)/2.;
+    if(axesCenter) {x0axes = axesCentX0; y0axes = axesCentY0;}
     if(x0axes<xMin || x0axes>xMax) x0axes = (xMin+xMax)/2.;
     if(y0axes<yMin || y0axes>yMax) y0axes = (yMin+yMax)/2.;
@@ -310 +308 @@
 //      Configuration de la taille de fonte, en mode AutoFontSize.
 //      La taille est exprimée en fraction de la taille totale YMax-Min
+// void  ConfigureAxesCenter(bool fset,double x0,double y0)
+//      Force axe center to be at (x0,y0) or let it be in the middle
 //--
 
@@ -321 +321 @@
   if (mintl > 1.e-19) fMinTickLen = mintl;
 }
+
 /* --Methode-- */
 void PIAxes::ConfigureAutoFontSize(double fszf)
 {
   if (fszf > 1.e-19) fontSz = fszf;
+}
+
+/* --Methode-- */
+void PIAxes::ConfigureAxesCenter(bool fset,double x0,double y0)
+{
+ axesCenter = fset;
+ if(!axesCenter) return;
+ axesCentX0 = x0;
+ axesCentY0 = y0;
 }
 

trunk/SophyaPI/PI/piaxes.h

@@ -52 +52 @@
                        double majtl=0.0125, double mintl=0.007);
   void  ConfigureAutoFontSize(double fszf=0.04);
+  void  ConfigureAxesCenter(bool fset=false,double x0=0.,double y0=0.);
 
   //  virtual void      DrawHorizontalAxe(double xmin, double xmax, double y, 
@@ -96 +97 @@
   double xMajTickLen,  xMinTickLen;
   double yMajTickLen,  yMinTickLen;
+  bool axesCenter; double axesCentX0,axesCentY0;
 
 };

trunk/SophyaPI/PI/pidrawer.cc

@@ -65 +65 @@
   SetAxesFlags(kAxesNone);   // Pas de trace d'axes par defaut 
   SetAxesAutoFontSize();
-  SetAxesCenter();
 
   mDndfg = false;  // Pour controle de l'appel de Detach() si delete
@@ -143 +142 @@
 //|     kMajTicks , kMinTicks , kLabels , kGridOn
 //|     kAxesDflt , kAxesNone
-// void  SetAxesCenter(bool fset,double x0,double y0)
-//      Force axe center to be at (x0,y0) or let it be in the middle
 // void SetAxesAutoFontSize(bool fg=true)
 //      Si "fg==true", la taille de la fonte pour les labels d'axes (chiffres) est 
@@ -492 +489 @@
 
 void
-PIDrawer::SetAxesCenter(bool fset,double x0,double y0)
-{
- axesCenter = fset;
- if(!axesCenter) return;
- axesCentX0 = x0;
- axesCentY0 = y0;
-}
-
-void
 PIDrawer::DrawAxes(PIGraphicUC* g)
 {

trunk/SophyaPI/PI/pidrawer.h

@@ -30 +30 @@
 
   virtual void       SetAxesFlags(unsigned int flags=kAxesNone);
-  virtual void       SetAxesCenter(bool fset=false,double x0=0.,double y0=0.);
   inline  void       SetAxesAutoFontSize(bool fg=true) { axesAFSz = fg; }
 
@@ -64 +63 @@
 
   inline unsigned int GetAxesFlags() { return(axesFlags); }
-  inline  bool        GetAxesCenter() { return(axesCenter); }
-  inline  bool        GetAxesCenter(double &x0,double& y0)
-                       {x0=axesCentX0; y0=axesCentY0; return(axesCenter);}
-  inline  bool        isAxesAutoFontSize() { return axesAFSz; }
+  inline bool         isAxesAutoFontSize() { return axesAFSz; }
 
   inline PIGraphicUC*    GetGraphicUC() { return(mGrUC); }
@@ -132 +128 @@
   unsigned int axesFlags;
   bool axesAFSz;
-  bool axesCenter; double axesCentX0,axesCentY0;
   PIBaseWdgGen* mBWdg;
   PIGraphicUC* mGrUC;

trunk/SophyaPI/PI/pieldrw.cc

@@ -565 +565 @@
     else if (opts.substr(0,11) == "axescenter=") {
       if(opts == "axescenter=") {
-        SetAxesCenter();
+        axeDr.ConfigureAxesCenter();
       } else {
         double x0=0., y0=0.;
         sscanf(opts.substr(11).c_str(),"%lf,%lf",&x0,&y0);
-        SetAxesCenter(true,x0,y0);
+        axeDr.ConfigureAxesCenter(true,x0,y0);
       }
     }