Changeset 184 in Sophya

Timestamp:

Jan 10, 1999, 5:13:13 PM (27 years ago)

Author:

ercodmgr

Message:

Trace d'axes 3D et programme pitst Reza 10/01/99

Location:

trunk/SophyaPI/PI

Files:

• Tests/pitst.cc (added)
• pi3ddrw.cc (modified) (9 diffs)
• pi3ddrw.h (modified) (3 diffs)
• pisurfdr.cc (modified) (3 diffs)
• pisurfdr.h (modified) (1 diff)

trunk/SophyaPI/PI/pi3ddrw.cc

@@ -26 +26 @@
   lCO = 10.;  dlCO = 3.;  
   v3D_obs = false;
-  xMin = yMin = zMin = -1.;  
-  xMax = yMax = zMax = 1.;
+  x3Min = y3Min = z3Min = -1.;  
+  x3Max = y3Max = z3Max = 1.;
 }
 
@@ -84 +84 @@
 }
 
-
+/* --Methode-- */
+void PIDrawer3D::DrawAxes(PIGraphicUC* g)
+{
+  if (axesFlags == kAxesNone) return;
+#if defined(__DECCXX) || defined(__KCC__)
+  PIGraphic3D* g3 = dynamic_cast<PIGraphic3D*>(g);
+#else
+  PIGraphic3D* g3 = (PIGraphic3D*)(g);
+#endif
+  Draw3DBoxe(g3, XMin3(), XMax3(), YMin3(), YMax3(), ZMin3(), ZMax3(),
+                 XMin3(), XMax3(), YMin3(), YMax3(), ZMin3(), ZMax3());  
+}
+
+/* --Methode-- */
+void PIDrawer3D::Draw3DBoxe(PIGraphic3D* g3, 
+                            float xx1, float xx2, float yy1, float yy2, 
+                            float zz1, float zz2, float xl1, float xl2, 
+                            float yl1, float yl2, float zl1, float zl2)
+{
+  if (mLAtt == PI_NotDefLineAtt)    g3->SelLine(PI_ThinLine);
+
+  PIGrCoord x1,y1,z1,x2,y2,z2;
+  char strg[64];
+  int k;
+  int NTicks = 5;  // Nb de ticks sur chaque axe
+
+  x1 = xx1;  y1 = yy1;  z1 = zz1;
+  x2 = xx2;   y2 = yy1;   z2 = zz1; 
+  g3->DrawLine3D(x1, y1, z1, x2, y2, z2);
+  y1 = y2 = yy2;
+  g3->DrawLine3D(x1, y1, z1, x2, y2, z2);
+  z1 = z2 = zz2;
+  g3->DrawLine3D(x1, y1, z1, x2, y2, z2);
+  y1 = y2 = yy1;  
+  g3->DrawLine3D(x1, y1, z1, x2, y2, z2);
+
+// Trace des ticks et labels axe X :
+  x1 = x2 = xx1;   y1 = y2 = yy1;  z1 = z2 = zz1;
+  for (k=0; k<NTicks; k++) {
+    x1 = x2 = (xx1+(float)k*(xx2-xx1)/(NTicks-1.));
+    z1 = zz1; z2 = zz1-0.02*(zz2-zz1);
+    y1 = y2 = yy1;
+    g3->DrawLine3D(x1, y1, z1, x2, y2, z2);
+    z2 = zz1-0.05*(zz2-zz1); 
+    y2 = yy1-0.075*(yy2-yy1);  
+    sprintf(strg,"%.2g", xl1+(float)k*(xl2-xl1)/(NTicks-1.));
+    g3->DrawString3D(x2, y2, z2, strg);
+    }
+  x2 = xx2+0.075*(xx2-xx1);  y2 = yy1;   z2 = zz1-0.05*(zz2-zz1); 
+  g3->DrawString3D(x2, y2, z2, "X");
+
+  x1 = xx1;  y1 = yy1;  z1 = zz1;
+  x2 = xx1;   y2 = yy2;   z2 = zz1; 
+  g3->DrawLine3D(x1, y1, z1, x2, y2, z2);
+  x1 = x2 = xx2;
+  g3->DrawLine3D(x1, y1, z1, x2, y2, z2);
+  z1 = z2 = zz2;
+  g3->DrawLine3D(x1, y1, z1, x2, y2, z2);
+  x1 = x2 = xx1;  
+  g3->DrawLine3D(x1, y1, z1, x2, y2, z2);
+  x1 = x2 = xx2;   y1 = y2 = yy1;  z1 = z2 = zz1;
+  for (k=1; k<NTicks; k++) {   // Attention, par le tick 0 pour Y
+    y1 = y2 = (yy1+(float)k*(yy2-yy1)/(NTicks-1.));
+    z2 = zz1-0.02*(zz2-zz1);
+    x1 = x2 = xx2; 
+    g3->DrawLine3D(x1, y1, z1, x2, y2, z2);
+    z2 = zz1-0.05*(zz2-zz1); 
+    x2 = xx2+0.075*(xx2-xx1);  
+    sprintf(strg,"%.2g", yl1+(float)k*(yl2-yl1)/(NTicks-1.));
+    g3->DrawString3D(x2, y2, z2, strg);
+    }
+  x2 = xx2;  y2 = yy2+0.075*(yy2-yy1);   z2 = zz1-0.05*(zz2-zz1); 
+  g3->DrawString3D(x2, y2, z2, "Y");
+
+  x1 = xx1;  y1 = yy1;  z1 = zz1;
+  x2 = xx1;   y2 = yy1;   z2 = zz2; 
+  g3->DrawLine3D(x1, y1, z1, x2, y2, z2);
+  x1 = x2 = xx2;
+  g3->DrawLine3D(x1, y1, z1, x2, y2, z2);
+  y1 = y2 = yy2;
+  g3->DrawLine3D(x1, y1, z1, x2, y2, z2);
+  x1 = x2 = xx1;  
+  g3->DrawLine3D(x1, y1, z1, x2, y2, z2);
+  x1 = x2 = xx1;   y1 = y2 = yy1;  z1 = z2 = zz1;
+  for (k=0; k<NTicks; k++) {
+    z1 = z2 = (zz1+(float)k*(zz2-zz1)/(NTicks-1.));
+    y2 = yy1-0.015*(yy2-yy1);
+    x2 = xx1-0.015*(xx2-xx1);
+    g3->DrawLine3D(x1, y1, z1, x2, y2, z2);
+    x2 = xx1-0.1*(xx2-xx1);  
+    y2 = yy1-0.1*(yy2-yy1);  
+    sprintf(strg,"%.2g", zl1+(float)k*(zl2-zl1)/(NTicks-1.));
+    g3->DrawString3D(x2, y2, z2, strg);
+    }
+  x2 = xx1-0.075*(xx2-xx1);  y2 = yy1-0.075*(yy2-yy1);   z2 = zz2+0.05*(zz2-zz1); 
+  g3->DrawString3D(x2, y2, z2, "Z");
+
+}
 
 // ......................................................................
@@ -115 +212 @@
 
   mGr3d = new PIGraphic3D(mWGrC, 0, 0, sx, sy);
+  rOfg = false;
+  axfg = true;
+  skcfg = false;
 }
 
@@ -180 +280 @@
   else Set3DView(xc, yc, zc, xo, yo, zo, dax, day, dco, psi);
   Refresh();
-  mBDrw->Refresh();  // ? Pour reecrire par-dessus ce qui a ete efface 
 }
 
@@ -226 +325 @@
   }
 int id = AddDrawer(dr3, false, false, ad);
+if (m3DrIl.size() == 0)  dr3->SetAxesFlags(kStdAxes);
 m3DrIl.push_back(id);
 return(id);
@@ -256 +356 @@
     PIDrwTools::ShowPIDrwTools();   // Fentre axes et options de trace
     }
-  }
-}
+  if (key == 'A' || key == 'a')  {    // On affiche ou on enleve les axes
+    axfg = !axfg;
+    list<int>::iterator it;
+    if (axfg) 
+      for(it = m3DrIl.begin(); it != m3DrIl.end(); it++)  
+         GetDrawerId(*it)->SetAxesFlags(kAxesNone);
+    else { 
+      it = m3DrIl.begin(); 
+      if (it != m3DrIl.end())  GetDrawerId(*it)->SetAxesFlags(kStdAxes);
+      }
+    Refresh(); 
+    }
+//  <Alt>S active la sensibilite de la zone centrale pour tourner l'objet
+  if (key == 'S' || key == 's')  skcfg = !skcfg;  
+  if (key == 'R' || key == 'r')  Update3DView();
+  }
+}
+
 /* --Methode-- */
 void PIDraw3DWdg::PasteSelection(unsigned int typ, void *pdata, unsigned int l)
@@ -291 +407 @@
   rOfg = false;
   if (kmod ==  PIKM_Shift)  rOfg = true;
-  else {
+  else if (skcfg) {
     int dmix = x-XSize()/2;
     int dmiy = y-YSize()/2;
@@ -361 +477 @@
   SetDrawers3DView();
   Refresh();
-  mBDrw->Refresh();
 }
 
@@ -425 +540 @@
   SetDrawers3DView();
   Refresh();
-  mBDrw->Refresh();
 }
 

trunk/SophyaPI/PI/pi3ddrw.h

@@ -31 +31 @@
   virtual PIGraphicUC*  SetDrwWdg(PIBaseWdgGen* drw, int x0, int y0, int dx, int dy, PIGraphicGen* g);
 
-  float ZMin() const {return zMin;}
-  float ZMax() const {return zMax;}
+  virtual void          DrawAxes(PIGraphicUC* g);
+  virtual void          Draw3DBoxe(PIGraphic3D* g3, float xx1, float xx2, float yy1, float yy2, 
+                                                    float zz1, float zz2, float xl1, float xl2, 
+                                                    float yl1, float yl2, float zl1, float zl2);
+
+  float XMin3() const {return x3Min;}
+  float XMax3() const {return x3Max;}
+  float YMin3() const {return y3Min;}
+  float YMax3() const {return y3Max;}
+  float ZMin3() const {return z3Min;}
+  float ZMax3() const {return z3Max;}
 
 protected :
@@ -41 +50 @@
   float lCO, dlCO;   // Distance Camera-Centre du champ et profondeur de champ 
   bool v3D_obs;      // Si defini par Set3DView_Obs 
-  float zMin, zMax;  // Pour delimiter le cube 3D (avec x/yMin-Max)
+  float x3Min, x3Max;  // Pour delimiter le cube 3D 
+  float y3Min, y3Max;  // Pour delimiter le cube 3D 
+  float z3Min, z3Max;  // Pour delimiter le cube 3D 
 };
 
@@ -106 +117 @@
   float cXc, cYc, cZc;         // Pour garder position du centre de champ 
   float clCO, cDax, cDay;      // Pour garder les valeurs avant Zoom In/Out
-  bool  rOfg;                  // Vrai si on fait tourner l'objet et pas la camera
+  bool  rOfg;                  // si Vrai  on fait tourner l'objet et pas la camera
+  bool  axfg;                  // si Vrai on trace les axes
+  bool  skcfg;                 // si Vrai click-2 au centre -> rotation objet
 };
 

trunk/SophyaPI/PI/pisurfdr.cc

@@ -55 +55 @@
   
   Set3DView((xmin+xmax)/2., (ymin+ymax)/2, zmin+(zmax-zmin)*0.40, 
-            (xmin+xmax)/2.+D , (ymin+ymax)/2.+2*D , zmin+(zmax-zmin)*0.60, 0.25, 0.25);  
+            (xmin+xmax)/2.+D , (ymin+ymax)/2.-2.5*D , zmin+(zmax-zmin)*0.85, 0.25, 0.25);  
   
-  xMin = xmin - 0.05*(xmax-xmin);
-  xMax = xmax + 0.05*(xmax-xmin);
-  yMin = ymin - 0.05*(ymax-ymin);
-  yMax = ymax + 0.05*(ymax-ymin);
-  zMin = zmin - 0.05*(zmax-zmin);
-  zMax = zmax + 0.05*(zmax-zmin);
+  x3Min = xmin;   x3Max = xmax;
+  y3Min = ymin;   y3Max = ymax;
+  z3Min = zmin-0.05*(zmax-zmin);   z3Max = zmax+0.05*(zmax-zmin);
 
 //  printf("PISurfaceDrawer::UpdateLimits() : %g-%g  %g-%g  %g-%g (%g) \n", xmin,xmax,ymin,ymax,zmin,zmax,D);
@@ -86 +83 @@
 
 /* --Methode-- */
-void PISurfaceDrawer::Draw(PIGraphicUC* g, float xmin, float ymin, float xmax, float ymax)
-{
-  if (mArr == NULL)  return;
-
+void PISurfaceDrawer::DrawAxes(PIGraphicUC* g)
+{
+  if (axesFlags == kAxesNone) return;
 #if defined(__DECCXX) || defined(__KCC__)
   PIGraphic3D* g3 = dynamic_cast<PIGraphic3D*>(g);
@@ -95 +91 @@
   PIGraphic3D* g3 = (PIGraphic3D*)(g);
 #endif
-
-//  g3->SelForeground(PI_White);
+  Draw3DBoxe(g3, XMin3(), XMax3(), YMin3(), YMax3(), ZMin3(), ZMax3(),
+                 mXmin, mXmax, mYmin, mYmax, mZmin-0.05*(mZmax-mZmin), mZmax+0.05*(mZmax-mZmin));
+}
+
+/* --Methode-- */
+void PISurfaceDrawer::Draw(PIGraphicUC* g, float xmin, float ymin, float xmax, float ymax)
+{
+// On trace les axes - En attendant de faire mieux - Reza 8/12/98
+  if (axesFlags != kAxesNone)  DrawAxes(g);
+
+  if (mArr == NULL)  return;
+
+#if defined(__DECCXX) || defined(__KCC__)
+  PIGraphic3D* g3 = dynamic_cast<PIGraphic3D*>(g);
+#else
+  PIGraphic3D* g3 = (PIGraphic3D*)(g);
+#endif
+
   g3->SelBackground(PI_White);
 //  g3->Erase(xmin, ymin, xmax-xmin, ymax-ymin);

trunk/SophyaPI/PI/pisurfdr.h

@@ -18 +18 @@
 
   virtual void          Draw(PIGraphicUC* g, float xmin, float ymin, float xmax, float ymax); 
+  virtual void          DrawAxes(PIGraphicUC* g);
+
 protected :
   P2DArrayAdapter* mArr;