Changeset 2544 in Sophya for trunk/SophyaPI/PI/pi3dwdg.cc

Timestamp:

Jun 1, 2004, 5:49:36 PM (21 years ago)

Author:

ansari

Message:

1/ Decodage options pour PIBarGraph et MAJ Makefile suite ajout PITextDrawer
2/ Suite (interruption de plusieurs mois) amelioration gestion des axes
et autoscale X/Y , Z ds les Drawers 3D et PIDraw3DWdg

Reza , 1 Juin 2004

File:

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

trunk/SophyaPI/PI/pi3dwdg.cc

@@ -82 +82 @@
   AddDrawer3D(mBDrw, false, true);
   mBDrw->SetAxesFlags(kStdAxes);
+  Set3DViewBox(0., 1., 0., 1., 0., 1., false, false);
   vfixed = false; // Il faut laisser le premier Drawer3D fixer les limites et la vue 3D
+  fixed3DBox = false;  
 
   mPx = mPy = 0;
@@ -150 +152 @@
 }
 
+/* --Methode-- */
+void PIDraw3DWdg::Set3DViewBox(double xmin, double xmax, double ymin, double ymax,
+                               double zmin, double zmax, bool asxy, bool asz)
+{
+  double mscx, mscy, mscz;
+  PIDrawer3D::ComputeScaleFactor(xmin, xmax, ymin, ymax, zmin, zmax, 
+                                 asxy, asz, mscy, mscz);
+  mscx = 1.;
+  xmin *= mscx;  xmax *= mscx;
+  ymin *= mscy;  ymax *= mscy;
+  zmin *= mscz;  zmax *= mscz;
+  mBDrw->Set3DBox(xmin, xmax, ymin, ymax, zmin, zmax, mscx, mscy, mscz);
+  mBDrw->SetAutoScale(asxy, asz);
+  fixed3DBox = true;
+
+  double D = xmax-xmin;
+  if (D < (ymax-ymin))  D = ymax-ymin;
+  D *= 1.4;
+  Set3DView((xmin+xmax)/2., (ymin+ymax)/2, zmin+(zmax-zmin)*0.40, 
+            (xmin+xmax)/2.+D , (ymin+ymax)/2.-2.5*D , zmin+(zmax-zmin)*0.85, 0.25, 0.25);  
+    
+}
 
 /* --Methode-- */
@@ -177 +201 @@
 
 /* --Methode-- */
+void PIDraw3DWdg::Refresh()
+{
+  SetDrawers3DView();
+  PIBaseWdg::Refresh();
+}
+
+/* --Methode-- */
 int PIDraw3DWdg::DecodeOptionString(vector<string> & opt, bool rmdecopt)
 {
@@ -194 +225 @@
   list<int>::iterator it;
 
+  for(it = m3DrIl.begin(); it != m3DrIl.end(); it++) {
 #if defined(CC_HAS_RTTI_SUPPORT)
-  if (vo)   for(it = m3DrIl.begin(); it != m3DrIl.end(); it++)   
+    if (vo) 
     (dynamic_cast<PIDrawer3D*>(GetDrawerId(*it)))->Set3DView_Obs(xo, yo, zo, teta, phi, psi, dax, day, co, dco);
-  else   for(it = m3DrIl.begin(); it != m3DrIl.end(); it++)   
-    (dynamic_cast<PIDrawer3D*>(GetDrawerId(*it)))->Set3DView(xc, yc, zc, xo, yo, zo, dax, day, dco, psi);    
+    else   
+    (dynamic_cast<PIDrawer3D*>(GetDrawerId(*it)))->Set3DView(xc, yc, zc, xo, yo, zo, dax, day, dco, psi);  
+  (dynamic_cast<PIDrawer3D*>(GetDrawerId(*it)))->Copy3DBox(*mBDrw);
 #else
-  if (vo)   for(it = m3DrIl.begin(); it != m3DrIl.end(); it++)   
+  if (vo)   
     ((PIDrawer3D*)(GetDrawerId(*it)))->Set3DView_Obs(xo, yo, zo, teta, phi, psi, dax, day, co, dco);
-  else   for(it = m3DrIl.begin(); it != m3DrIl.end(); it++)   
-    ((PIDrawer3D*)(GetDrawerId(*it)))->Set3DView(xc, yc, zc, xo, yo, zo, dax, day, dco, psi);    
+  else  
+    ((PIDrawer3D*)(GetDrawerId(*it)))->Set3DView(xc, yc, zc, xo, yo, zo, dax, day, dco, psi);  
+  ((PIDrawer3D*)(GetDrawerId(*it)))->Copy3DBox(*mBDrw);
 #endif
+  }
 
 }
@@ -225 +260 @@
       dr3->Set3DView_Obs(xo, yo, zo, teta, phi, psi, dax, day, co, dco);
   else  dr3->Set3DView(xc, yc, zc, xo, yo, zo, dax, day, co, psi);
+  dr3->Copy3DBox(*mBDrw);
   }
 int id = AddDrawer(dr3, false, false, ad, lock);
@@ -276 +312 @@
 //  <Alt>S active la sensibilite de la zone centrale pour tourner l'objet
   else if (key == 'S' || key == 's')  skcfg = !skcfg;  
-  else if (key == 'R' || key == 'r')  Update3DView();
+  else if (key == 'R' || key == 'r')  Refresh();
+  else if (key == 'B' || key == 'b')  Update3DView();
   }
 }
@@ -381 +418 @@
   SelPointerShape(PI_ArrowPointer);
   mWGrC->SelForeground(lCol);
-  SetDrawers3DView();
   Refresh();
 }