Changeset 2797 in Sophya

Timestamp:

Jun 3, 2005, 4:56:17 PM (20 years ago)

Author:

ansari

Message:

Corrections liees au trace des axes et caption (axes centres) et correction pour Refresh de DrwOptionStringWindow - Reza 3 Juin 2005

Location:

trunk/SophyaPI/PI

Files:

• piaxes.cc (modified) (2 diffs)
• pidrwtools.cc (modified) (3 diffs)
• pieldrw.cc (modified) (1 diff)

trunk/SophyaPI/PI/piaxes.cc

@@ -259 +259 @@
   else {
     fh = 0.04*(yMax-yMin);  
-    fy = 0.5*(yMin+yMax);
+    if(axesCenter) fy = axesCentY0;
+    else fy = 0.5*(yMin+yMax);
+    if(fy<yMin || fy>yMax) fy = (yMin+yMax)/2.;
   }
   if (g->isAxeYDirUpDown()) fh = -fh;
@@ -291 +293 @@
   else {
     fh = 0.04*(xMax-xMin);
-    fx = 0.5*(xMin+xMax);
+    if(axesCenter) fx = axesCentX0;
+    else fx = 0.5*(xMin+xMax);
+    if(fx<xMin || fx>xMax) fx = (xMin+xMax)/2.;
   }
   if (g->isAxeXDirRtoL()) fh = -fh;

trunk/SophyaPI/PI/pidrwtools.cc

@@ -823 +823 @@
   PIMessage mod = ModMsg(msg);
   msg = UserMsg(msg);
-
   switch (msg) {
   case 777:
@@ -836 +835 @@
       //cout << " DBG-A " << ops << endl; 
       size_t len = ops.length();
+      if (len == 0) {
+        if (msg == 500) mDrw->Refresh(true);
+        return;
+      }
       size_t cp = ops.find_first_not_of(' ', 0);
-      if ((cp < 0) || (cp >= len) ) break;
+      if ((cp < 0) || (cp >= len) ) { 
+        if (msg == 500) mDrw->Refresh(true);
+        return;
+      }
       size_t tp = ops.find(' ', cp);
       while ((tp > cp) && (tp < len)) {
@@ -852 +858 @@
       ops = "";
       mTxt[1]->SetText(ops);
-      if (msg == 500) mDrw->Refresh(true);
+      if (msg == 500)  mDrw->Refresh(true);
       else mDrw->Refresh(false);
     }

trunk/SophyaPI/PI/pieldrw.cc

@@ -545 +545 @@
       SetAxesFlags(kAxesDflt | kMinTicks | kMajTicks | kGridOn);
     else if (opts == "centeredaxes")
-      SetAxesFlags(kCentAxes | kMajTicks | kLabels);
+      SetAxesFlags(kCentAxes | kTicks | kMajTicks | kLabels);
     else if (opts == "finecenteredaxes")
-      SetAxesFlags(kCentAxes | kMajTicks | kMinTicks | kLabels);
+      SetAxesFlags(kCentAxes | kTicks | kMajTicks | kMinTicks | kLabels);
     else if (opts == "centeredaxesgrid")
-      SetAxesFlags(kCentAxes | kMajTicks | kLabels | kGridOn);
+      SetAxesFlags(kCentAxes | kTicks | kMajTicks | kLabels | kGridOn);
     else if (opts == "finecenteredaxesgrid")
-      SetAxesFlags(kCentAxes | kMajTicks | kMinTicks | kLabels | kGridOn);
+      SetAxesFlags(kCentAxes | kTicks | kMajTicks | kMinTicks | kLabels | kGridOn);
     else if (opts == "axesnone")
       SetAxesFlags(kAxesNone);