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

Timestamp:

Nov 4, 1999, 5:20:32 PM (26 years ago)

Author:

ercodmgr

Message:

Ajout trace en medaillon - Reza 4/11/99

File:

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

trunk/SophyaPI/PIext/pistdimgapp.cc

@@ -201 +201 @@
 mZoom = 0;
 mAxesFlags = kBoxAxes | kExtTicks | kLabels;
-mXmin = mYmin = -1.;
-mXmax = mYmax = 1;
+SetXYLimits(-1, 1., -1., 1.);
+SetInsetLimits(0.4, 0.6, 0.4, 0.6);
 maXlog = maYlog = false;
 SaveGraphicAtt();
@@ -463 +463 @@
 if ( mCmapid != CMAP_OTHER ) scd->SetColMapId(mCmapid);
 
-if ( (opt == Disp_Same) && (mLastWdg) ) {
+
+if ( (!mLastWdg) && ( (opt == Disp_Same) || (opt == Disp_Inset) ) )  opt = Disp_Next;
+// Trace en superpoistion
+if ( (opt == Disp_Same) && (mLastWdg) ) {  
   if (mLastWdg->kind() == PIScDrawWdg::ClassId)  ((PIScDrawWdg*)mLastWdg)->AddScDrawer(scd, true);
   else mLastWdg->AddDrawer(scd, true, true, true);
+  scd->Refresh(); 
+  mDId++;
+  mDrwList[mDId] = scd;
+  return(-mDId);   
+}
+// Trace en medaillon
+else if ( (opt == Disp_Inset) && (mLastWdg) ) {
+  PIGrCoord x1, x2, y1, y2;
+  x1 = mIXmin;  x2 = mIXmax;
+  y2 = 1.-mIYmin;  y1 = 1.-mIYmax;
+  scd->SetAxesFlags(mAxesFlags);
+  scd->UpdateLimits();
+  mLastWdg->AddDrawer(scd, x1, y1, x2, y2, true, false, true);
   scd->Refresh();
   mDId++;
@@ -471 +487 @@
   return(-mDId);   
 }
-else if (opt == Disp_Same)  opt = Disp_Next;
 
 PIWindow* win;
@@ -519 +534 @@
 if ( mCmapid != CMAP_OTHER ) dr3->SetColMapId(mCmapid);
 
+if ( (!mLastWdg) && ( (opt == Disp_Same) || (opt == Disp_Inset) ) )  opt = Disp_Next;
+// Trace en superpoistion
 if ( (opt == Disp_Same) && (mLastWdg) ) {
   if (mLastWdg->kind() == PIDraw3DWdg::ClassId)  ((PIDraw3DWdg*)mLastWdg)->AddDrawer3D(dr3, true);
@@ -527 +544 @@
   return(-mDId);   
 }
-else if (opt == Disp_Same)  opt = Disp_Next;
+// Trace en medaillon
+else if ( (opt == Disp_Inset) && (mLastWdg) ) {
+  PIGrCoord x1, x2, y1, y2;
+  x1 = mIXmin;  x2 = mIXmax;
+  y2 = 1.-mIYmin;  y1 = 1.-mIYmax;
+  dr3->SetAxesFlags(mAxesFlags);
+  dr3->UpdateLimits();
+  mLastWdg->AddDrawer(dr3, x1, y1, x2, y2, true, false, true);
+  dr3->Refresh();
+  mDId++;
+  mDrwList[mDId] = dr3;
+  return(-mDId);   
+}
+
 
 PIWindow* win;
@@ -1294 +1324 @@
 
 /* --Methode-- */
+void PIStdImgApp::SetInsetLimits(double xmin, double xmax, double ymin, double ymax)
+{
+  mIXmin = xmin;  mIXmax= xmax;
+  mIYmin = ymin;  mIYmax= ymax;
+}
+
+/* --Methode-- */
 void PIStdImgApp::SaveGraphicAtt()
 {
@@ -1308 +1345 @@
   mSXmin = mXmin;  mSXmax = mXmax;
   mSYmin = mYmin;  mSYmax = mYmax;
+  mSIXmin = mIXmin;  mSIXmax = mIXmax;
+  mSIYmin = mIYmin;  mSIYmax = mIYmax;
   mSFXYlim = mFXYlim;
   mSaXlog = maXlog;
@@ -1328 +1367 @@
   mXmin = mSXmin;  mXmax = mSXmax;
   mYmin = mSYmin;  mYmax = mSYmax;
+  mIXmin = mSIXmin;  mIXmax = mSIXmax;
+  mIYmin = mSIYmin;  mIYmax = mSIYmax;
   mFXYlim = mSFXYlim;
   maXlog = mSaXlog;