Changeset 338 in Sophya for trunk/SophyaPI

Timestamp:

Jul 22, 1999, 7:00:19 PM (26 years ago)

Author:

ercodmgr

Message:

Extract pave avec conservation origine - Reza 22/7/99

Location:

trunk/SophyaPI/PIext

Files:

• pimgadapter.h (modified) (2 diffs)
• pisiadw.cc (modified) (1 diff)
• pistdimgapp.cc (modified) (3 diffs)

trunk/SophyaPI/PIext/pimgadapter.h

@@ -9 +9 @@
                   RzImageAdapter(RzImage* rzi, bool ad=false) :
                     P2DArrayAdapter(rzi->XSize(), rzi->YSize())
-                    { aDel = ad; mImg = rzi; }
+                    { aDel = ad; mImg = rzi; 
+                    DefineXYCoordinates(rzi->XOrg(), rzi->YOrg(), 1., 1. ); }
 
   virtual         ~RzImageAdapter() { if (aDel) delete mImg; }
@@ -24 +25 @@
                   ImageAdapter(Image<T>* img, bool ad=false) :
                     P2DArrayAdapter(img->XSize(), img->YSize())
-                    { aDel = ad; mImg = img; }
+                    { aDel = ad; mImg = img; 
+                    DefineXYCoordinates(img->XOrg(), img->YOrg(), 1., 1. ); }
 
   virtual         ~ImageAdapter() { if (aDel) delete mImg; }

trunk/SophyaPI/PIext/pisiadw.cc

@@ -52 +52 @@
 mBut[5] = new PIButton(this, "Dismiss", 90, bsx, bsy, px, py);   py += (bsy+spy);
 
-for(i=0; i<5; i++)
+for(i=0; i<6; i++)
   mBut[i]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
 

trunk/SophyaPI/PIext/pistdimgapp.cc

@@ -65 +65 @@
 m[2]->AppendItem("Show ImageTools", 10301);
 m[2]->AppendItem("Show DrawerTools", 10302);
-m[2]->AppendItem("Extract Pave", 10305);
+m[2]->AppendItem("Ext.Pave", 10304);
+m[2]->AppendItem("Ext.Pave+Org", 10305);
 m[2]->SetSensitivityMsg(10305, false);
 m[2]->AppendItem("Cuts X,Y", 10306);
@@ -902 +903 @@
     break;
 
+  case 10304 :
   case 10305 :
     {
@@ -926 +928 @@
     for(jj=0; jj<dy; jj++) 
       for(ii=0; ii<dx; ii++) (*pim)(ii,jj) = (*img)(ii+x0, jj+y0);
+    if (msg == 10305) {  // Calcul des coordonnees du sous-pave
+      double xc1, yc1;
+      img->Coord(x0, y0, xc1, yc1);
+      pim->SetOrg((int)xc1, (int)yc1);
+    }
     string nom = mCurWdg->Nom() + "_pave";
     ObjMgr()->AddObj(pim, nom);