Changeset 587 in Sophya for trunk

Timestamp:

Nov 17, 1999, 12:53:26 PM (26 years ago)

Author:

ercodmgr

Message:

Protection/amelioration limites d'axes - Reza 17/11/99

Location:

trunk/SophyaPI/PI

Files:

• pidrawer.cc (modified) (2 diffs)
• pigraphuc.cc (modified) (1 diff)
• piscdrawwdg.cc (modified) (1 diff)

trunk/SophyaPI/PI/pidrawer.cc

@@ -112 +112 @@
     else  ayud = kAxeDirDownUp;
   }
-  if (xmax <= xmin || ymax <= ymin) {  
+//  if (xmax <= xmin || ymax <= ymin) {  
 //    cerr << "PIDrawer::SetLimits() Error - xmax <= xmin  || ymax <= ymin ! " << endl;
-    return; 
-    }
+//    return; 
+//    }
 #if defined(OSF1) || defined(SunOS) || (defined(Linux) && !defined(__KCC__) )
   if (!finite(xmin) || !finite(xmax) || !finite(ymin) || !finite(ymax)) {
@@ -294 +294 @@
 {
 double d = rmax - rmin;
+if (d < 1.e-39) d = 1.e-39; 
 double ld = log10(d);
 double fld = floor(fabs(ld));

trunk/SophyaPI/PI/pigraphuc.cc

@@ -166 +166 @@
   }
 
-  if (xmax <= xmin  || ymax <= ymin) {
-    cerr << "PIGraphicUC::SetUCS() Error - xmax <= xmin  || ymax <= ymin ! " << endl;
-    return; 
-    }
+  double xym;
+  xym = fabs(xmax+xmin); xym = (xym > 1.e-39) ? xym : 1.e-39;
+  if ((xmax-xmin)/xym < 1.e-5) { xmin = xmin - 5.e-6*xym;  xmax = xmin + 1.e-5*xym; }
+  xym = fabs(ymax+ymin); xym = (xym > 1.e-39) ? xym : 1.e-39;
+  if ((ymax-ymin)/xym < 1.e-5) { ymin = ymin - 5.e-6*xym;  ymax = ymin + 1.e-5*xym; }
+//  if (xmax <= xmin  || ymax <= ymin) {
+//    cerr << "PIGraphicUC::SetUCS() Error - xmax <= xmin  || ymax <= ymin ! " << endl;
+//    return; 
+//    }
 #if defined(OSF1) || defined(SunOS) || (defined(Linux) && !defined(__KCC__) )
   if (!finite(xmin) || !finite(xmax) || !finite(ymin) || !finite(ymax)) {

trunk/SophyaPI/PI/piscdrawwdg.cc

@@ -142 +142 @@
                        int axrl, int ayud, bool tmp)
 {
-  if (xmax <= xmin || ymax <= ymin) {
-    cerr << "PIScDrawWdg::SetLimits() Error - xmax <= xmin or ymax <= ymin !" << endl;
-    return; 
-    }
+//  if (xmax <= xmin || ymax <= ymin) {
+//    cerr << "PIScDrawWdg::SetLimits() Error - xmax <= xmin or ymax <= ymin !" << endl;
+//    return; 
+//    }
+  double xym;
+  xym = fabs(xmax+xmin); xym = (xym > 1.e-39) ? xym : 1.e-39;
+  if ((xmax-xmin)/xym < 1.e-5) { xmin = xmin - 5.e-6*xym;  xmax = xmin + 1.e-5*xym; }
+  xym = fabs(ymax+ymin); xym = (xym > 1.e-39) ? xym : 1.e-39;
+  if ((ymax-ymin)/xym < 1.e-5) { ymin = ymin - 5.e-6*xym;  ymax = ymin + 1.e-5*xym; }
+
   SetDefaultDrawerLimits(xmin, xmax, ymin, ymax, axrl, ayud);
   mBDrw->SetLimits(xmin, xmax, ymin, ymax, axrl, ayud);