Changeset 1893 in Sophya

Timestamp:

Feb 7, 2002, 10:11:55 AM (24 years ago)

Author:

ansari

Message:

Implementation du trace de fleches et programme test associe - Reza 7 Fev 2002

Location:

trunk/SophyaPI/PI

Files:

• Tests/pilinetst.cc (added)
• pigraphgen.cc (modified) (2 diffs)
• pigraphgen.h (modified) (3 diffs)
• psfile.cc (modified) (1 diff)

trunk/SophyaPI/PI/pigraphgen.cc

@@ -6 +6 @@
 
 #include "pigraphgen.h"
+#include <math.h>
 
 //++
@@ -247 +248 @@
 /* --Methode-- */
 void 
-PIGraphicGen::DrawArrowMarker(PIGrCoord x1, PIGrCoord y1, PIGrCoord x2, PIGrCoord y2)
-{
-  // AFAIREREZA012002
+PIGraphicGen::DrawArrowMarker(PIGrCoord x1, PIGrCoord y1, PIGrCoord x2, PIGrCoord y2, bool fgline)
+{
+  double dx = (double)x2-(double)x1;
+  double dy = (double)y2-(double)y1;
+  double theta = atan2(dy, dx);
+
+  PIGrCoord x[5], y[5];
+  PIGrCoord x2l, y2l;
+  bool fgfill = false;
+  int npt = 3;
+  double t0,tp,tm,asz;
+
+  switch (myArrowMrk) {
+
+  case PI_BasicArrowMarker :
+    t0 = M_PI/4.;
+    asz = (double)myArrowMrkSz/cos(t0);
+    tp = theta+0.75*M_PI;
+    tm = theta-0.75*M_PI;
+    x[0] = (double)x2 + cos(tp)*asz;
+    y[0] = (double)y2 + sin(tp)*asz;
+    x[1] = x2;
+    y[1] = y2;
+    x[2] = (double)x2 + cos(tm)*asz;
+    y[2] = (double)y2 + sin(tm)*asz;
+    x2l = x2;  y2l =y2;
+    fgfill = false;
+    npt = 3;
+    break;
+
+  case PI_TriangleArrowMarker :
+  case PI_FTriangleArrowMarker :
+    t0 = M_PI/6.;
+    asz = (double)myArrowMrkSz/cos(t0);
+    tp = theta+5.*M_PI/6.;
+    tm = theta-5.*M_PI/6.;
+    x[0] = (double)x2 + cos(tp)*asz;
+    y[0] = (double)y2 + sin(tp)*asz;
+    x[1] = x2;
+    y[1] = y2;
+    x[2] = (double)x2 + cos(tm)*asz;
+    y[2] = (double)y2 + sin(tm)*asz;
+    x[3] = x[0];
+    y[3] = y[0];
+    x2l = (double)x2 - cos(theta)*myArrowMrkSz;
+    y2l = (double)y2 - sin(theta)*myArrowMrkSz;
+    npt = 4;
+    if (myArrowMrk == PI_FTriangleArrowMarker)  fgfill = true;
+    else  fgfill = false;
+    break;
+
+  case PI_ArrowShapedArrowMarker :
+  case PI_FArrowShapedArrowMarker :
+    t0 = M_PI/8.;
+    asz = 2.*(double)myArrowMrkSz*cos(t0);
+    tp = theta+7.*M_PI/8.;
+    tm = theta-7.*M_PI/8.;
+    x2l = (double)x2 - cos(theta)*myArrowMrkSz;
+    y2l = (double)y2 - sin(theta)*myArrowMrkSz;
+    x[0] = x2;  
+    y[0] = y2;
+    x[1] = (double)x2 + cos(tp)*asz;
+    y[1] = (double)y2 + sin(tp)*asz;
+    x[2] = x2l;
+    y[2] = y2l;
+    x[3] = (double)x2 + cos(tm)*asz;
+    y[3] = (double)y2 + sin(tm)*asz;
+    x[4] = x[0];
+    y[4] = y[0];
+    npt = 5;
+    if (myArrowMrk == PI_FArrowShapedArrowMarker)  fgfill = true;
+    else  fgfill = false;
+    break;
+    
+  default:
+    t0 = M_PI/4.;
+    asz = (double)myArrowMrkSz/cos(t0);
+    tp = theta+5.*M_PI/4.;
+    tm = theta-5.*M_PI/4.;
+
+    x[0] = (double)x2 + cos(tp)*asz;
+    y[0] = (double)y2 + sin(tp)*asz;
+    x[1] = x2;
+    y[1] = y2;
+    x[2] = (double)x2 + cos(tm)*asz;
+    y[2] = (double)y2 + sin(tm)*asz;
+    x[3] = x[0];
+    y[3] = y[0];
+    x2l = x2;  y2l =y2;
+    fgfill = false;
+    npt = 3;
+    break;
+  }
+
+  if (fgline)  DrawLine(x1, y1, x2l, y2l);
+
+  if (fgfill)  DrawFPolygon(x, y, npt, false);
+  else  DrawPolygon(x, y, npt, false);
 }
 

trunk/SophyaPI/PI/pigraphgen.h

@@ -61 +61 @@
   inline PIGrCoord() { iv = 0; dv = 0.;}
   inline PIGrCoord(int a) { iv = a; dv = (double)a;}
-  inline PIGrCoord(float a) { iv = (int)a; dv = (double)a;}
-  inline PIGrCoord(double a) { iv = (int)a; dv = a;}
+  inline PIGrCoord(float a) { iv = (a>=0.)?(int)(a+0.5):(int)(a-0.5); dv = (double)a;}
+  inline PIGrCoord(double a) { iv = (a>=0.)?(int)(a+0.5):(int)(a-0.5); dv = a;}
   inline PIGrCoord(PIGrCoord const & gc) { iv = gc.iv;  dv = gc.dv; }
   inline operator int() { return(iv); }
@@ -71 +71 @@
   inline operator double() { return(dv); }
   inline PIGrCoord& operator= (int a) { iv = a; dv = (double)a; return(*this); }
-  inline PIGrCoord& operator= (float a) { iv = (int)a; dv = (double)a; return(*this); }
-  inline PIGrCoord& operator= (double a) { iv = (int)a; dv = a; return(*this); }
+  inline PIGrCoord& operator= (float a) 
+        { iv = (a>=0.)?(int)(a+0.5):(int)(a-0.5); dv = (double)a; return(*this); }
+  inline PIGrCoord& operator= (double a) 
+        { iv = (a>=0.)?(int)(a+0.5):(int)(a-0.5); dv = a; return(*this); }
   inline PIGrCoord& operator= (PIGrCoord const & gc) { iv = gc.iv; dv = gc.dv;  return(*this); }
+protected:
   int iv;
   double dv;
@@ -172 +175 @@
   virtual void       DrawMarker(PIGrCoord x0, PIGrCoord y0)                            = 0;
   virtual void       DrawMarkers(PIGrCoord *x, PIGrCoord *y, int n)                    = 0;
-  virtual void       DrawArrowMarker(PIGrCoord x1, PIGrCoord y1, PIGrCoord x2, PIGrCoord y2);
+  virtual void       DrawArrowMarker(PIGrCoord x1, PIGrCoord y1, PIGrCoord x2, PIGrCoord y2, 
+                                     bool fgline=true);
 
   virtual void       DrawPixmap(PIGrCoord x, PIGrCoord y, unsigned char *pix, 

trunk/SophyaPI/PI/psfile.cc

@@ -1119 +1119 @@
     for(int i = 1; i<n; i++) 
       fprintf(mPSFile, cmd, x[i], y[i]);
-    fprintf(mPSFile, "c s\n");
+    fprintf(mPSFile, " s\n");   // On ne ferme pas le path - Reza 02/2002 - fprintf(mPSFile, "c s\n");
 }