Changeset 448 in Sophya for trunk

Timestamp:

Oct 1, 1999, 3:45:51 PM (26 years ago)

Author:

ercodmgr

Message:

modifs cosmetiques Reza 1/10/99

File:

• trunk/SophyaPI/PI/piimgtools.cc (modified) (4 diffs)

trunk/SophyaPI/PI/piimgtools.cc

@@ -32 +32 @@
 // int wszx = 8*spx+3*bsx+2*bsy; 
 int wszx = 8*spx+3.5*bsx; 
-int wszy = 9*spy+9*bsy;
+int wszy = (10+4)*spy+9*bsy;
 SetSize(wszx, wszy);
 
@@ -82 +82 @@
 
 cpy += 2*spy+bsy; 
-cpx = 3*spx;
-mBut[0] = new PIButton(this, "Apply", 2500, bsx, bsy, cpx, cpy);
+cpx = 3*spx+0.2*bsx;
+mBut[0] = new PIButton(this, "Apply", 2500, bsx*1.6, bsy, cpx, cpy);
+// mBut[0] = new PIButton(this, "Apply", 2500, bsx, bsy, cpx, cpy);
 mBut[0]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
-cpx += bsx+2*spx;
-mBut[1] = new PIButton(this, "Dismiss", 2600, bsx, bsy, cpx, cpy);
+cpx += bsx*1.6+2*spx;
+// cpx += bsx+2*spx;
+mBut[1] = new PIButton(this, "Dismiss", 2600,  bsx*1.6, bsy, cpx, cpy);
+// mBut[1] = new PIButton(this, "Dismiss", 2600, bsx, bsy, cpx, cpy);
 mBut[1]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
-cpx += bsx+2*spx;
-mOptCut = new PIOptMenu(this, "Cut", bsx, bsy, cpx, cpy);
-mOptCut->AppendItem("Cut X",301);
-mOptCut->AppendItem("Cut Y",302);
-mOptCut->AppendItem("CutXY",303);
-mOptCut->AppendItem("Cut D",304);
-mOptCut->AppendItem("Cut A",308);
-mOptCut->AppendItem("CutDA",312);
-mOptCut->AppendItem("CutAll",315);
-mOptCut->SetValue(303);
-mOptCut->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
-
-int offy = cpy+bsy+spy*2;
+
+int offy = cpy+bsy+spy*3;
 // printf("-DBG- PIImgTools()  SzX,Y= %d %d , ButPos= %d %d (off=%d)\n", wszx, wszy, cpx, cpy, offy);
 
@@ -153 +145 @@
 mOptzc[1]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
 
+cpy += spy+bsy;
+cpx = 4*spx+0.875*bsx;
+mOptCut = new PIOptMenu(this, "Cut", bsx*1.75, bsy, cpx, cpy);
+mOptCut->AppendItem("Cut X",301);
+mOptCut->AppendItem("Cut Y",302);
+mOptCut->AppendItem("CutXY",303);
+mOptCut->AppendItem("Cut D",304);
+mOptCut->AppendItem("Cut A",308);
+mOptCut->AppendItem("CutDA",312);
+mOptCut->AppendItem("CutAll",315);
+mOptCut->SetValue(303);
+mOptCut->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
+
 int pbsx = bsy;
 int pbsy = bsy;
@@ -159 +164 @@
 
 cpx = 2*spx;
-cpy += pbsy+2*spy;
+cpy += bsy+spy;
 mButsz[0] = new PIButton(this, "1x1", 3201,  pbsx, pbsy, cpx, cpy);
 mButsz[0]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);