Changeset 202 in Sophya for trunk/SophyaPI

Timestamp:

Feb 26, 1999, 3:18:35 PM (27 years ago)

Author:

ercodmgr

Message:

protec mem piimage, amelioration trace axes, rz+cmv 26/2/99

Location:

trunk/SophyaPI/PI

Files:

• pidrawer.cc (modified) (3 diffs)
• pidrawer.h (modified) (1 diff)
• pidrwtools.cc (modified) (4 diffs)
• pidrwtools.h (modified) (1 diff)
• pigraphuc.cc (modified) (1 diff)
• piimage.cc (modified) (7 diffs)
• piscdrawwdg.cc (modified) (2 diffs)
• piscdrawwdg.h (modified) (1 diff)

trunk/SophyaPI/PI/pidrawer.cc

@@ -245 +245 @@
 {
   BestTicks(xMin,xMax,7,xMajTickStep);
-  xMinTickStep = xMajTickStep/10;
+  xMinTickStep = xMajTickStep/5;
   xFirstMajTick = int(xMin / xMajTickStep) * xMajTickStep;
   if (xFirstMajTick < xMin) xFirstMajTick += xMajTickStep;
@@ -252 +252 @@
 
   BestTicks(yMin,yMax,12,yMajTickStep);
-  yMinTickStep = yMajTickStep/10;
+  yMinTickStep = yMajTickStep/5;
   yFirstMajTick = int(yMin / yMajTickStep) * yMajTickStep;
   if (yFirstMajTick < yMin) yFirstMajTick += yMajTickStep;
@@ -291 +291 @@
     g->DrawLine(xMin, 0, xMax, 0);
     g->DrawLine(0, yMin, 0, yMax);
+
+    // La grille en pointilles
+
+    if (flags & kGridOn) DrawGrid(g);
   
     // Les ticks majeurs

trunk/SophyaPI/PI/pidrawer.h

@@ -49 +49 @@
   float YMin() const {return yMin;}
   float YMax() const {return yMax;}
+  inline unsigned int GetAxesFlags() { return(axesFlags); }
   
   inline PIGraphicUC*    GetGraphicUC() { return(mGrUC); }

trunk/SophyaPI/PI/pidrwtools.cc

@@ -78 +78 @@
 mText[1]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
 
-cpx = 2*spx+0.25*bsx;
+cpx = spx+0.25*bsx;
 cpy += spy+bsy; 
-mCkb[0] = new PICheckBox(this,"AxeX-RtoL", 2000, 1.5*bsx, bsy, cpx, cpy);
-cpx += spx+1.5*bsx; 
-mCkb[1] = new PICheckBox(this,"AxeY-UpDown", 2000, 1.5*bsx, bsy, cpx, cpy);
+mCkb[0] = new PICheckBox(this,"X-RtoL", 2000, bsx, bsy, cpx, cpy);
+cpx += spx+bsx; 
+mCkb[1] = new PICheckBox(this,"Y-UpDn", 2000, bsx, bsy, cpx, cpy);
+cpx += spx+bsx; 
+mCkb[2] = new PICheckBox(this,"Grid", 2000, bsx, bsy, cpx, cpy);
 mCkb[0]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
 mCkb[1]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
+mCkb[2]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
 
 cpy += spy+bsy; 
@@ -248 +251 @@
   delete mButcf[i];
   }
+for(i=0; i<3; i++) delete mCkb[i];
 delete mBut[2];
 for(i=0; i<6; i++)  delete mOpt[i];
@@ -305 +309 @@
 mCkb[0]->SetState(false);
 mCkb[1]->SetState(false);
+mCkb[2]->SetState(false);
 
 mOpt[0]->SetValue(100);
@@ -339 +344 @@
     if (mCkb[0]->GetState())  axrl = kAxeDirRtoL ;
     if (mCkb[1]->GetState())  ayud = kAxeDirUpDown;
-    if ( mCurBW->kind() == PIScDrawWdg::ClassId ) ((PIScDrawWdg*)mCurBW)-> SetLimits(xmin, xmax, ymin, ymax, axrl, ayud);
+    if ( mCurBW->kind() == PIScDrawWdg::ClassId ) { 
+      ((PIScDrawWdg*)mCurBW)->SetLimits(xmin, xmax, ymin, ymax, axrl, ayud);
+      unsigned int flags = ((PIScDrawWdg*)mCurBW)->GetAxesFlags();
+      if (mCkb[2]->GetState()) ((PIScDrawWdg*)mCurBW)->SetAxesFlags(flags | kGridOn);
+      else  ((PIScDrawWdg*)mCurBW)->SetAxesFlags(flags & ~kGridOn);
+      }
     else mCurBW->SetDefaultDrawerLimits(xmin, xmax, ymin, ymax, axrl, ayud);
     mCurBW->Refresh();

trunk/SophyaPI/PI/pidrwtools.h

@@ -37 +37 @@
   PIButton* mBut[3];
   PIText* mText[2];
-  PICheckBox* mCkb[2];
+  PICheckBox* mCkb[3];
 // Pour couleur, fontes, etc 
   PIOptMenu* mOpt[6];

trunk/SophyaPI/PI/pigraphuc.cc

@@ -167 +167 @@
 void PIGraphicUC::UC2GrC(float x, float y, float& xpix, float& ypix)
 {
-  xpix = (float)(xOrg + x*xScale);  // $CHECK$ Reza 21/06/98 ? + .5);
-  ypix = (float)(yOrg + y*yScale);  // $CHECK$ Reza 21/06/98 ?+ .5);
+  xpix = (float)(xOrg + x*xScale);  
+  ypix = (float)(yOrg + y*yScale);  
 }
 

trunk/SophyaPI/PI/piimage.cc

@@ -421 +421 @@
   }
 
-if (showinfo) {
+if (showinfo && img) {
   char buff[256];
   float x,y;
@@ -443 +443 @@
 
 // ----  Le copier ---- 
-  if (key == 'C' || key == 'c') { 
+  if ((key == 'C' || key == 'c') && img) { 
     // On limite la taille a 48x48
     int i1 = XPave();  
@@ -664 +664 @@
 void PIImage::PasteSelection(unsigned int typ, void *pdata, unsigned int l)
 {
+if (!img) return;
 if (typ != PICP_string) return;
 int ll = (l<256) ? l+1 : 256;
@@ -917 +918 @@
 int PIImage::PosW2Img(int xiw, int yiw, int * xp, int * yp)
 {
+if (!img) { *xp = *yp = 0;  return(1); }
 xiw -= ofx;  yiw -= ofy;   // Offset d'affichage du pixmap
 if (zoom > 0)
@@ -938 +940 @@
 int PIImage::PosImg2W(int xp, int yp, int * xiw, int * yiw)
 {
+if (!img) { *xiw = *yiw = -1;  return(1); }
 if (zoom > 0)
   {
@@ -961 +964 @@
 void PIImage::SetOffsetFromPave()
 {
+if (!img) { offx = offy = 0; return; }
 if (zoom > 0)
   {
@@ -991 +995 @@
   { xwsz = -(XSize()*zoom); 
   ywsz = -(YSize()*zoom); }
-  
-if (xwsz > (img->XSize()-offx)) xwsz = (img->XSize()-offx);
-if (ywsz > (img->YSize()-offy)) ywsz = (img->YSize()-offy);
+
+if (img) {   
+  if (xwsz > (img->XSize()-offx)) xwsz = (img->XSize()-offx);
+  if (ywsz > (img->YSize()-offy)) ywsz = (img->YSize()-offy);
+  }
 xpav = offx+xwsz/2; 
 ypav = offx+ywsz/2;

trunk/SophyaPI/PI/piscdrawwdg.cc

@@ -182 +182 @@
   char buff[128];
   sprintf(buff, "X= %g  Y= %g",  x, y);
+  //  sprintf(buff, "%.3f,%.3f ",  x, y);
   return((string)buff);
 }
@@ -229 +230 @@
   
   string ctxt =  GetClickText(dx, dy);
-
+//DEBUG  char buff[32];    sprintf(buff, " %d:%d",xp,yp); ctxt += buff;
   if (mTxw)
     mTxw->SetLabel(ctxt);

trunk/SophyaPI/PI/piscdrawwdg.h

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