Changeset 2003 in Sophya for trunk

Timestamp:

May 15, 2002, 5:24:19 PM (23 years ago)

Author:

ansari

Message:

Amelioration protection de PIDrawer::SetLimits() et PIGraphicUC::SetUCS() pour xmax-xmin petits - Reza 15/5/2002

Location:

trunk/SophyaPI/PI

Files:

• Makefile (modified) (2 diffs)
• pidrawer.cc (modified) (4 diffs)
• pigraphuc.cc (modified) (6 diffs)
• piscdrawwdg.cc (modified) (2 diffs)
• piscdrawwdg.h (modified) (1 diff)
• ucckprot.h (added)

trunk/SophyaPI/PI/Makefile

@@ -89 +89 @@
  piwdggen.h pimsghandler.h picolist.h
 $(OBJ)pidrawer.o: pidrawer.cc $(INC)machdefs.h \
- pidrawer.h pibwdggen.h pisysdep.h piwdgx.h piwdggen.h pimsghandler.h \
- picolist.h picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h \
- pifontx.h pifontgen.h pigraphuc.h pievthandler.h psfile.h pigratt.h \
- pidrwtools.h pistdwdgx.h pistdwdggen.h pioptmenux.h pioptmenugen.h \
- pimenux.h pimenugen.h piwindowx.h piwindowgen.h picontainerx.h \
- picontainergen.h piapplx.h piapplgen.h pimenubarx.h pimenubargen.h \
- picons.h pibwdgx.h pigraphps.h
+ $(INC)utilgeom.h pidrawer.h pibwdggen.h \
+ pisysdep.h piwdgx.h piwdggen.h pimsghandler.h picolist.h picmap.h \
+ picmapx.h picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h \
+ pigraphuc.h pievthandler.h psfile.h pigratt.h pidrwtools.h \
+ pistdwdgx.h pistdwdggen.h pioptmenux.h pioptmenugen.h pimenux.h \
+ pimenugen.h piwindowx.h piwindowgen.h picontainerx.h picontainergen.h \
+ piapplx.h piapplgen.h pimenubarx.h pimenubargen.h picons.h pibwdgx.h \
+ pigraphps.h ucckprot.h
 $(OBJ)pidrawwin.o: pidrawwin.cc pidrawwin.h pisysdep.h \
  $(INC)machdefs.h piwindowx.h piwindowgen.h \
@@ -154 +155 @@
  pigraphuc.h pisysdep.h pigraphgen.h piwdgx.h piwdggen.h \
  pimsghandler.h picolist.h picmap.h picmapx.h picmapgen.h pifontx.h \
- pifontgen.h
+ pifontgen.h ucckprot.h
 $(OBJ)pigraphx.o: pigraphx.cc pigraphx.h pisysdep.h \
  $(INC)machdefs.h pigraphgen.h piwdgx.h \

trunk/SophyaPI/PI/pidrawer.cc

@@ -12 +12 @@
 #include "pidrwtools.h"
 
-#include <math.h>
-//  Pour la declaration de finite() isnan() ...
-#if defined(SunOS)
-#include <ieeefp.h>
-#endif
+#include "ucckprot.h"
 
 //++
@@ -128 +124 @@
 //    return; 
 //    }
-#if defined(OSF1) || defined(SunOS) || (defined(Linux) && !defined(__KCC__) )
-  if (!finite(xmin) || !finite(xmax) || !finite(ymin) || !finite(ymax)) {
+  
+  if (!UC_CheckFinite(xmin, xmax) || !UC_CheckFinite(ymin, ymax)) {
     cerr << "PIDrawer::SetLimits() Error - Non finite value for x/ymin-max ! " << endl;
     return; 
     }
-#endif
+
   if (axrl == kAxeDirLtoR)  aXdir = false;
   else if (axrl == kAxeDirRtoL)  aXdir = true;
   if (ayud == kAxeDirDownUp)  aYdir = false;
   else if (ayud == kAxeDirUpDown)  aYdir = true;
+  //  cerr << " DBG-SetLimits xmax-xmin= " << xmax-xmin << " xmin,max=" 
+  //     << xmin << "," << xmax << endl;
+  UC_CheckMinMaxDiff(xmin, xmax);
+  //cerr << " DBG-SetLimits ymax-ymin= " << ymax-ymin << " ymin,max=" 
+  //     << ymin << "," << ymax << endl;
+  UC_CheckMinMaxDiff(ymin, ymax);
   xMin = xmin;
   xMax = xmax;
@@ -545 +547 @@
 PIDrawer::DrawHLabels(PIGraphicUC* g, double y, double xBeg, double xStep, unsigned long just)
 {
-  double fsz = xMajTickLen*4.;
+  double fsz = xMajTickLen*3.5;
   if(axesAFSz) g->SelFontSz(fsz);
 
@@ -584 +586 @@
 PIDrawer::DrawVLabels(PIGraphicUC* g, double x, double yBeg, double yStep, unsigned long just)
 {
-  double fsz = xMajTickLen*4.;
+  double fsz = xMajTickLen*3.5;
   if(axesAFSz) g->SelFontSz(fsz);
 

trunk/SophyaPI/PI/pigraphuc.cc

@@ -7 +7 @@
 #include "pigraphuc.h"
 
-#include <math.h>
-//  Pour la declaration de finite() isnan() ...
-#if defined(SunOS)
-#include <ieeefp.h>
-#endif
-
-//define PETIT_DBLE 1.e-39
-//define PREC_DBLE  1.e-5
-//define PROT_DBLE  1.e-19
-#define PETIT_DBLE 1.e-100
-// qque probleme sur le trace - J'augmente les marges - Reza 14/5/2002 
-// #define PREC_DBLE  1.e-16  
-#define PREC_DBLE  1.e-14
-#define PROT_DBLE  1.e-40
+#include "ucckprot.h"
+
 
 //++
@@ -178 +166 @@
   }
 
-  double xym;
-  //DBG-REZA  cerr << " DBG-SetUCS() xmax-xmin = " << xmax-xmin << " xmin,max=" << xmin << "," << xmax << endl;
-  if ((xmax-xmin) < PREC_DBLE*fabs(xmax+xmin)) { 
-    xym = fabs(xmax);  xym = (xym > PETIT_DBLE) ? xym : PETIT_DBLE;
-    xmax += PREC_DBLE/2.*xym;
-    xmin -= PREC_DBLE/2.*xym;
-    //DBG-REZA  cerr << " PIGraphicUC::SetUCS() xmin,max=" << xmin << "," << xmax << " xym=" << xym << endl;
-  }
-  //DBG-REZAcerr << " DBG-SetUCS() ymax-ymin = " << ymax-ymin << " ymin,max=" << ymin << "," << ymax << endl;
-  if ((ymax-ymin) < PREC_DBLE*fabs(ymax+ymin)) { 
-    xym = fabs(ymax);  xym = (xym > PETIT_DBLE) ? xym : PETIT_DBLE;
-    ymax += PREC_DBLE/2.*xym;
-    ymin -= PREC_DBLE/2.*xym;
-    //DBG-REZAcerr << " PIGraphicUC::SetUCS() ymin,max=" << ymin << "," << ymax << " xym=" << xym << endl;
-  }
-  //    xym = fabs(xmax+xmin); xym = (xym > PETIT_DBLE) ? xym : PETIT_DBLE;
-  // if ((xmax-xmin)/xym < PREC_DBLE) {xmin=xmin-PREC_DBLE/2.*xym; xmax=xmin+PREC_DBLE*xym;}
-  // xym = fabs(ymax+ymin); xym = (xym > PETIT_DBLE) ? xym : PETIT_DBLE;
-  // if ((ymax-ymin)/xym < PREC_DBLE) {ymin=ymin-PREC_DBLE/2.*xym; ymax=ymin+PREC_DBLE*xym;}
+  UC_CheckMinMaxDiff(xmin, xmax);
+  UC_CheckMinMaxDiff(ymin, ymax);
+
+  //  xym = fabs(xmax+xmin); xym = (xym > PETIT_DBLE) ? xym : PETIT_DBLE;
+  //  if ((xmax-xmin)/xym < PREC_DBLE) {xmin=xmin-PREC_DBLE/2.*xym; xmax=xmin+PREC_DBLE*xym;}
+  //  xym = fabs(ymax+ymin); xym = (xym > PETIT_DBLE) ? xym : PETIT_DBLE;
+  //  if ((ymax-ymin)/xym < PREC_DBLE) {ymin=ymin-PREC_DBLE/2.*xym; ymax=ymin+PREC_DBLE*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)) {
+
+  if (!UC_CheckFinite(xmin, xmax) || !UC_CheckFinite(ymin, ymax)) {
     cerr << "PIGraphicUC::SetUCS() Error - Non finite value for x/ymin-max ! " << endl;
     return; 
     }
-#endif
+
   if (axrl == kAxeDirLtoR)  aXdir = false;
   else if (axrl == kAxeDirRtoL)  aXdir = true;
@@ -216 +192 @@
   yMax = ymax;
 
-  xScale = xWd/(xMax-xMin);
-  if (xScale < PROT_DBLE)  xScale = PROT_DBLE;  // Protection 
+  xScale = UC_LimitProtectDouble(xWd/(xMax-xMin)); // Protection 
   if (aXdir)  { 
     xScale = -xScale;
@@ -225 +200 @@
   xOrg += xW0;
 
-  yScale = yWd/(yMax-yMin);
-  if (yScale < PROT_DBLE)  yScale = PROT_DBLE;  // Protection 
+  yScale = UC_LimitProtectDouble(yWd/(yMax-yMin)); // Protection  
   if (!aYdir) {
     yScale = -yScale;
@@ -259 +233 @@
   xMinLog = (xMin > PETIT_DBLE) ? xMin : ( (1. < xMax/10.) ? 1. : xMax/10.);
   xScaleLog = xWd*(xMax-xMinLog)/(xMax-xMin) / (log10(xMax)-log10(xMinLog));
-  if (xScaleLog < PROT_DBLE)  xScaleLog = PROT_DBLE;  // Protection 
+  xScaleLog = UC_LimitProtectDouble(xScaleLog); // Protection 
   if (aXdir)  { 
     xScaleLog = -xScaleLog;
@@ -276 +250 @@
   yMinLog = (yMin > PETIT_DBLE) ? yMin : ( (1. < yMax/10.) ? 1. : yMax/10.);
   yScaleLog = yWd*(yMax-yMinLog)/(yMax-yMin) / (log10(yMax)-log10(yMinLog));
-  if (yScaleLog < PROT_DBLE)  yScaleLog = PROT_DBLE;  // Protection 
+  yScaleLog = UC_LimitProtectDouble(yScaleLog); // Protection 
   if (!aYdir) {
     yScaleLog = -yScaleLog;

trunk/SophyaPI/PI/piscdrawwdg.cc

@@ -91 +91 @@
   mBDrw->SetName("AxesDrw");
   SetLimits(-1.,1.,-1.,1.,kAxeDirLtoR,kAxeDirDownUp);
+  // SetDefaultDrawRectangle(0.12, 0.12, 0.88, 0.88, true); fait par SetAxesFlags() - Reza Mai 2002
   SetAxesFlags(kBoxAxes | kExtTicks | kLabels);  
   FreeLimits();
   xEndDrag = yEndDrag = xBegDrag = yBegDrag = 0;
-  SetDefaultDrawRectangle(0.12, 0.12, 0.88, 0.88, true);
-//  SetDefaultDrawRectangle(0.12, 0.08, 0.88, 0.92, true);
   AddDrawer(mBDrw, true, false, false);
 
@@ -205 +204 @@
 }
 
+void
+PIScDrawWdg::SetAxesFlags(unsigned int flags)
+{
+  mBDrw->SetAxesFlags(flags);
+  if ((flags & kBoxAxes) == kBoxAxes) 
+    SetDefaultDrawRectangle(0.13, 0.09, 0.93, 0.89, true);
+  else 
+    SetDefaultDrawRectangle(0.06, 0.06, 0.94, 0.94, true);
+}
+
 int 
 PIScDrawWdg::DecodeOptionString(vector<string> & opt, bool rmdecopt)
 {
   if (opt.size() == 0)  return(0);  
+  unsigned int aflg = BaseDrawer()->GetAxesFlags();
   int ndec1 = BaseDrawer()->DecodeOptionString(opt, rmdecopt);
+  if (aflg != BaseDrawer()->GetAxesFlags())
+    SetAxesFlags(BaseDrawer()->GetAxesFlags());
   vector<string> udopt;
   unsigned int k = 0;

trunk/SophyaPI/PI/piscdrawwdg.h

@@ -36 +36 @@
   virtual void       UpdateLimits();  // Calcule et change les limites a partir de Drawer-No-1 
 
-  inline void        SetAxesFlags(unsigned int flags=kBoxAxes | kExtTicks | kLabels) 
-                                  { mBDrw->SetAxesFlags(flags); }
+  virtual void       SetAxesFlags(unsigned int flags=kBoxAxes | kExtTicks | kLabels);
+
   inline void        SetTitles(const char* tt=NULL, const char* tb=NULL)
                             { mBDrw->SetTitles(tt, tb); }