Changeset 331 in Sophya for trunk/SophyaPI/PIext/pistdimgapp.cc

Timestamp:

Jun 28, 1999, 1:56:16 PM (26 years ago)

Author:

ercodmgr

Message:

Ajout SetXYLimits et debut d'introduction de repertoire dans la gestion des objets nommes - Reza 28/6/99

File:

• trunk/SophyaPI/PIext/pistdimgapp.cc (modified) (12 diffs)

trunk/SophyaPI/PIext/pistdimgapp.cc

@@ -194 +194 @@
 mZoom = 0;
 mAxesFlags = kBoxAxes | kExtTicks | kLabels;
+mXmin = mYmin = -1.;
+mXmax = mYmax = 1;
 SaveGraphicAtt();
 
@@ -367 +369 @@
 
 /* --Methode-- */
-int PIStdImgApp::DispImage(P2DArrayAdapter* nouv, string const & name, int opt)
+int PIStdImgApp::DispImage(P2DArrayAdapter* nouv, string const & name, int opt, int oid)
 {
 PIImage* pii;
@@ -414 +416 @@
 if ( mCmapid != CMAP_OTHER ) pii->SetColMapId(mCmapid, false);
 pii->ShowCursor(true);
-pii->SetUserData(NULL, flag);
+pii->SetUserData(NULL, oid);
 pii->SetImage(nouv, true);
 // printf("!!DBG!! PIImage Pos= %d %d  Size= %d %d \n", pii->XPos(), pii->YPos(), pii->XSize(), pii->YSize()   );
@@ -427 +429 @@
 
 /* --Methode-- */
-int PIStdImgApp::DispScDrawer(PIDrawer* scd, string const & name, int opt, string title)
+int PIStdImgApp::DispScDrawer(PIDrawer* scd, string const & name, int opt, string title, int oid)
 {
 if (scd == NULL)
@@ -462 +464 @@
 else scw = new PIH2DWdg(win, (char *)name.c_str(), sx, sy, px, py);
 scw->SetBinding(PIBK_elastic, PIBK_elastic, PIBK_elastic, PIBK_elastic);
-scw->SetUserData(NULL, flag);
+scw->SetUserData(NULL, oid);
+if (mFXYlim)  // Forcage limites XY 
+  scw->SetLimits(mXmin, mXmax, mYmin, mYmax);
 scw->SetAxesFlags(mAxesFlags);
 
@@ -480 +484 @@
 
 /* --Methode-- */
-int PIStdImgApp::Disp3DDrawer(PIDrawer3D* dr3, string const & name, int opt, string title)
+int PIStdImgApp::Disp3DDrawer(PIDrawer3D* dr3, string const & name, int opt, string title, int oid)
 {
 if (dr3 == NULL)
@@ -512 +516 @@
 PIDraw3DWdg* wd3 = new PIDraw3DWdg(win, (char *)name.c_str(), sx, sy, px, py);
 wd3->SetBinding(PIBK_elastic, PIBK_elastic, PIBK_elastic, PIBK_elastic);
-wd3->SetUserData(NULL, flag);
+wd3->SetUserData(NULL, oid);
 wd3->AddDrawer3D(dr3, true);
 //   Titre du plot
@@ -785 +789 @@
       SetBusy();
       if (data)  { 
-        ObjMgr()->ReadFits(pfc->GetFileName());
-        ObjMgr()->DisplayObj(ObjMgr()->LastObjName(), "win");
+        string nomobj="";
+        ObjMgr()->ReadFits(pfc->GetFileName(), nomobj);
+        ObjMgr()->DisplayObj(nomobj, "win");
       }
       mFCMsg = 0;
@@ -816 +821 @@
     case 10111 :
       if (mCurWdg) {
-        string no = mCurWdg->Nom();
+        int oid = mCurWdg->UserFlag();
         DeleteBaseWidget(mCurWdg);
-        mObjMgr->DelObj(no);
+        mObjMgr->DelObj_Id(oid);
         }
       break;
@@ -1193 +1198 @@
   mAxesFlags = axfl; 
 }
+/* --Methode-- */
+void PIStdImgApp::SetXYLimits(double xmin, double xmax, double ymin, double ymax)
+{
+  mXmin = xmin;  mXmax= xmax;
+  mYmin = ymin;  mYmax= ymax;
+}
 
 /* --Methode-- */
@@ -1207 +1218 @@
   mSZoom = mZoom;
   mSAxesFlags = mAxesFlags;
+  mSXmin = mXmin;  mSXmax = mXmax;
+  mSYmin = mYmin;  mSYmax = mYmax;
+  mSFXYlim = mFXYlim;
 }
 
@@ -1222 +1236 @@
   mZoom = mSZoom;
   mAxesFlags = mSAxesFlags;
-}
+  mXmin = mSXmin;  mXmax = mSXmax;
+  mYmin = mSYmin;  mYmax = mSYmax;
+  mFXYlim = mSFXYlim;
+}