Changeset 1910 in Sophya for trunk/SophyaPI

Timestamp:

Feb 21, 2002, 12:41:53 AM (24 years ago)

Author:

cmv

Message:

Possibilites de translation/zoom par increment (>,>>,<,<<)
dans le PiAxesTools cmv 21/02/2002

Location:

trunk/SophyaPI/PI

Files:

• piaxestools.cc (modified) (9 diffs)
• piaxestools.h (modified) (1 diff)

trunk/SophyaPI/PI/piaxestools.cc

@@ -75 +75 @@
 PIAxesTools::PIAxesTools(PIApplication* par)
 : PIWindow((PIMsgHandler*)par, "PIAxesTools", PIWK_normal, 240, 240, 150, 150)
+, mTypAction(0), mSclAction(0.)
 {
 int bsx, bsy, spx, spy;
@@ -80 +81 @@
 // On definit la taille a partir de la taille par defaut des composantes 
 // PIApplicationPrefCompSize(bsx, bsy);
-par->PrefCompSize(bsx, bsy);
+par->PrefCompSize(bsx, bsy);  // environ 6 lettres
 spx = bsx/10;
 spy = bsy/4;
 
-int wszx = 5*spx+3.5*bsx; 
-int wszy = 6*bsy+8*spy;
+int wszx = 6*spx+4.*bsx; 
+int wszy = 7*bsy+9*spy;
 SetSize(wszx, wszy);
 
@@ -109 +110 @@
 
 cpx = spx+0.25*bsx;
-cpy += spy+bsy; 
+cpy += spy+bsy;
 mCkb[0] = new PICheckBox(this,"X-RtoL", 2000, bsx, bsy, cpx, cpy);
 cpx += spx+bsx; 
@@ -142 +143 @@
 mBut[3]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
 
-/*
-int offy = cpy+bsy+spy*2;
-
-//  Option-Menu  Marker, Line, couleur, etc...
-cpx = 2*spx;
-cpy += 3*spy+bsy;
-
-int bsyo = bsy;  
-int spyo = spy; 
-bsy = 0.85*bsy;   spy = 0.85*spy;
-
-mOpt[0] = new PIOptMenu(this, "bwt-opt-0", bsx*1.75, bsy, cpx, cpy);
-mOpt[0]->AppendItem("Def.Col", 100);
-mOpt[0]->AppendItem("Black", 101);
-mOpt[0]->AppendItem("White", 102);
-mOpt[0]->SetValue(100);
-mOpt[0]->SetBinding(PIBK_elastic, PIBK_elastic, PIBK_elastic, PIBK_elastic);
-
-cpx += spx+1.75*bsx; 
-mOpt[1] = new PIOptMenu(this, "bwt-opt-1", bsx*1.75, bsy, cpx, cpy);
-mOpt[1]->AppendItem("No.CMap", 200);
-*/
-
+  cpy += spy+bsy; 
+  cpx = spx;
+mBut[4] = new PIButton(this,"<<",2801,0.5*bsx,bsy,cpx,cpy);
+mBut[4]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
+ cpx += spx+0.5*bsx;
+mBut[5] = new PIButton(this,"<",2802,0.5*bsx,bsy,cpx,cpy);
+mBut[5]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
+ cpx += spx+0.5*bsx;
+mOpt = new PIOptMenu(this,"choix-action",2.*bsx,bsy,cpx,cpy);
+mOpt->AppendItem("Transl X",2850);  // mTypAction=0
+mOpt->AppendItem("Transl Y",2851);  // mTypAction=1
+mOpt->AppendItem("Zoom X",2852);    // mTypAction=2
+mOpt->AppendItem("Zoom Y",2853);    // mTypAction=3
+mOpt->AppendItem("Zoom X-Y",2854);  // mTypAction=4
+mOpt->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
+ string sdum="Transl X"; mOpt->SetValueStr(sdum); mTypAction=0;
+ cpx += spx+2.*bsx;
+mBut[6] = new PIButton(this,">",2803,0.5*bsx,bsy,cpx,cpy);
+mBut[6]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
+ cpx += spx+0.5*bsx;
+mBut[7] = new PIButton(this,">>",2804,0.5*bsx,bsy,cpx,cpy);
+mBut[7]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
 
 cwaxet = this;
@@ -174 +174 @@
 if (cwaxet == this)  cwaxet = NULL;
 int i;
-for(i=0; i<2; i++)  {
-  delete mLab[i];
-  delete mBut[i];
-  delete mText[i];
-}
-for(i=0; i<4; i++)  delete mBut[i];
-for(i=0; i<5; i++)  delete mCkb[i];
-
-}
-
+for(i=0;i<2;i++) delete mLab[i];
+for(i=0;i<2;i++) delete mText[i];
+for(i=0;i<8;i++) delete mBut[i];
+for(i=0;i<5;i++) delete mCkb[i];
+delete mOpt;
+}
 
 /* --Methode-- */
@@ -226 +222 @@
 void PIAxesTools::SetAxes(bool refr)
 {
+  PIScDrawWdg* scd = curscdwdg;
+  if ( scd == NULL )  return;
+
   double xmin, xmax, ymin, ymax;
+  if(mText[0]->GetText().length()>1 && mSclAction==0.) {
+    xmin = -1.;   xmax = 1.;
+    sscanf(mText[0]->GetText().c_str(), "%lg %lg" , &xmin, &xmax);
+  } else {
+    xmin = scd->XMin();
+    xmax = scd->XMax();
+  }
+  if(mText[1]->GetText().length()>1 && mSclAction==0.) {
+    ymin = -1.;   ymax = 1.;
+    sscanf(mText[1]->GetText().c_str(), "%lg %lg" , &ymin, &ymax);
+  } else {
+    ymin = scd->YMin();
+    ymax = scd->YMax();
+  }
+
+  if(mSclAction!=0.) {
+    double d;
+    if(mTypAction==0) { // Translation X
+      d = mSclAction*(xmax-xmin); xmin += d; xmax += d;
+    } else if(mTypAction==1) { // Translation Y
+      d = mSclAction*(ymax-ymin); ymin += d; ymax += d;
+    } else { // Zoom X, Y ou X-Y
+      double c, s=(mSclAction>0.)? 1./(1.+mSclAction): (1.-mSclAction);
+      if((mTypAction==2 || mTypAction==4) && xmax-xmin>0.) {
+        c = (xmin+xmax)/2.; d = s*(xmax-xmin)/2.;
+        xmin = c - d; xmax = c + d;
+      }
+      if((mTypAction==3 || mTypAction==4) && ymax-ymin>0.) {
+        c = (ymin+ymax)/2.; d = s*(ymax-ymin)/2.;
+        ymin = c - d; ymax = c + d;
+      }
+    }
+  }
+
   int axrl = kAxeDirLtoR;
   int ayud = kAxeDirDownUp;
-  PIScDrawWdg* scd = curscdwdg;
-  if ( scd == NULL )  return;
-  if (mText[0]->GetText().length() > 1) {
-    xmin = -1.;   xmax = 1.;
-    sscanf(mText[0]->GetText().c_str(), "%lg %lg" , &xmin, &xmax);
-  }
-  else {
-    xmin = scd->XMin();
-    xmax = scd->XMax();
-  }
-  if (mText[1]->GetText().length() > 1) {
-    ymin = -1.;   ymax = 1.;
-    sscanf(mText[1]->GetText().c_str(), "%lg %lg" , &ymin, &ymax);
-  }
-  else {
-    ymin = scd->YMin();
-    ymax = scd->YMax();
-  }      
   if (mCkb[0]->GetState())  axrl = kAxeDirRtoL ;
   if (mCkb[1]->GetState())  ayud = kAxeDirUpDown;
@@ -262 +277 @@
 void PIAxesTools::Process(PIMessage msg, PIMsgHandler* /*sender*/, void* /*data*/)
 {
+// Petit deplacement (zoom) ">"  ou "<"  de 20%
+// Grand deplacement (zoom) ">>" ou "<<" de 50%
+// *** ATTENTION: Valeurs OBLIGATOIREMENT ]0,1[ bornes exclues ***
+double smallstep=0.2, bigstep=0.5;
 
 msg = UserMsg(msg);
-
+mSclAction = 0.;
 
 switch (msg) {
+
   case 2100 :
     UpdateAxesInfoFromScWdg();
     break;
-
   case 2200 :
     if ( curscdwdg != NULL ) { 
@@ -276 +295 @@
       UpdateAxesInfoFromScWdg();
     }
-    /*
-      PIDraw3DWdg* dr3 = dynamic_cast<PIDraw3DWdg *>(curscdwdg);
-      if (dr3 != NULL) dr3->Update3DView();
-    */
-    break;
-
+    break;
   case 2500 :
     SetAxes(true);
@@ -290 +304 @@
     break;
 
+  case 2801 :  // <
+    mSclAction = -bigstep;
+    SetAxes(true);
+    break;
+  case 2802 :  // <<
+    mSclAction = -smallstep;
+    SetAxes(true);
+    break;
+  case 2803 :  // >
+    mSclAction = smallstep;
+    SetAxes(true);
+    break;
+  case 2804 :  // >>
+    mSclAction = bigstep;
+    SetAxes(true);
+    break;
+
+  case 2850 :
+  case 2851 :
+  case 2852 :
+  case 2853 :
+  case 2854 :
+    mTypAction = msg - 2850;
+    break;
+
   default :
     break;

trunk/SophyaPI/PI/piaxestools.h

@@ -38 +38 @@
 // Pour changer les axes
   PILabel* mLab[2];
-  PIButton* mBut[4];
+  PIButton* mBut[8];
   PIText* mText[2];
   PICheckBox* mCkb[5];
-//
+  PIOptMenu * mOpt;
+  unsigned short mTypAction;
+  double mSclAction;
+
   static PIScDrawWdg* curscdwdg;
   static PIAxesTools* cwaxet;