Changeset 4077 in Sophya for trunk/SophyaPI/PI/piaxestools.cc

Timestamp:

Jul 19, 2012, 12:08:30 PM (13 years ago)

Author:

garnier

Message:

Last version of PI comming from Reza

File:

• trunk/SophyaPI/PI/piaxestools.cc (modified) (7 diffs)

trunk/SophyaPI/PI/piaxestools.cc

@@ -131 +131 @@
 cpx = spx+0.25*bsx;
 cpy += spycb+bsycb;
-// mCkb[5] = new PICheckBox(this,"Centerd-Axes", 2005, bsx*1.5, bsycb, cpx, cpy);
-mCkb[5] = NULL;
-mOpt[0] = new PIOptMenu(this,"TypeAxes",1.5*bsx,bsycb,cpx,cpy);
-mOpt[0]->AppendItem("BoxAxes",2021);  
-mOpt[0]->AppendItem("CenteredAxes",2022);  
-mOpt[0]->AppendItem("PolarAxes",2023);   
-
+mCkb[5] = new PICheckBox(this,"Centerd-Axes", 2005, bsx*1.5, bsycb, cpx, cpy);
 cpx += bsx*1.5+3*spx;
 mCkb[2] = new PICheckBox(this,"Grid", 2002, bsx*1.5, bsycb, cpx, cpy);
-// mCkb[5]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
+mCkb[5]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
 mCkb[2]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
 
@@ -176 +170 @@
 mBut[5]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
  cpx += spx+0.5*bsx;
-mOpt[1] = new PIOptMenu(this,"choix-action",1.5*bsx,bsy,cpx,cpy);
-mOpt[1]->AppendItem("Transl X",2850);  // mTypAction=0
-mOpt[1]->AppendItem("Transl Y",2851);  // mTypAction=1
-mOpt[1]->AppendItem("Zoom X",2852);    // mTypAction=2
-mOpt[1]->AppendItem("Zoom Y",2853);    // mTypAction=3
-mOpt[1]->AppendItem("Zoom X-Y",2854);  // mTypAction=4
-mOpt[1]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
- string sdum="Transl X"; mOpt[1]->SetValueStr(sdum); mTypAction=0;
+mOpt = new PIOptMenu(this,"choix-action",1.5*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+1.5*bsx;
 mBut[6] = new PIButton(this,">",2803,0.5*bsx,bsy,cpx,cpy);
@@ -202 +196 @@
 for(i=0;i<2;i++) delete mText[i];
 for(i=0;i<8;i++) delete mBut[i];
-for(i=0;i<7;i++) 
-  if (mCkb[i]) delete mCkb[i];
-for(i=0;i<2;i++) delete mOpt[i];
+for(i=0;i<8;i++) delete mCkb[i];
+delete mOpt;
 }
 
@@ -238 +231 @@
   if (scd->GetAxesFlags() & kGridOn) mCkb[2]->SetState(true);
   else mCkb[2]->SetState(false);
-  //  if (scd->GetAxesFlags() & kCentAxes) mCkb[5]->SetState(true);
-  //  else mCkb[5]->SetState(false);
-  if (scd->GetAxesFlags() & kCentAxes) mOpt[0]->SetValue(2022);
-  else if (scd->GetAxesFlags() & kPolarAxes)  mOpt[0]->SetValue(2023);
-  else mOpt[0]->SetValue(2021);
+  if (scd->GetAxesFlags() & kCentAxes) mCkb[5]->SetState(true);
+  else mCkb[5]->SetState(false);
   if (scd->GetAxesFlags() & kMinTicks) mCkb[6]->SetState(true);
   else mCkb[6]->SetState(false);
   mCkb[3]->SetState(scd->isLogScaleX());
   mCkb[4]->SetState(scd->isLogScaleY());
-  mCkb[7]->SetState(scd->BaseDrawer()->GetAutoFontSizeState());
+  mCkb[7]->SetState(scd->BaseDrawer()->isAxesAutoFontSize());
   }
 else {
@@ -257 +247 @@
   mCkb[3]->SetState(false);
   mCkb[4]->SetState(false);
-  //  mCkb[5]->SetState(false);
-  mOpt[0]->SetValue(2021);
+  mCkb[5]->SetState(false);
   mCkb[6]->SetState(false);
   mCkb[7]->SetState(true);
@@ -315 +304 @@
   if (mCkb[2]->GetState()) flags |= kGridOn;
   else  flags &= ~kGridOn;
-  PIMessage typax=mOpt[0]->GetValue();
-  if (typax==2022)   { flags |= kCentAxes;  flags &= ~(kBoxAxes|kPolarAxes); }
-  else if (typax==2023)  { flags |= kPolarAxes;  flags &= ~(kBoxAxes|kCentAxes); }
-  else { flags |= kBoxAxes; flags &= ~(kCentAxes|kPolarAxes);}
+  if (mCkb[5]->GetState()) { flags |= kCentAxes;  flags &= ~kBoxAxes; }
+  else { flags &= ~kCentAxes;  flags |= kBoxAxes; }
   if (mCkb[6]->GetState()) flags |= kMinTicks;
   else  flags &= ~kMinTicks;
@@ -325 +312 @@
 
   scd->SetLogScale(mCkb[3]->GetState(), mCkb[4]->GetState() );
-  scd->BaseDrawer()->ConfigureAutoFontSize(mCkb[7]->GetState(), -1);
+  scd->BaseDrawer()->SetAxesAutoFontSize(mCkb[7]->GetState() );
   if (refr) scd->Refresh();
   return;