Changeset 2637 in Sophya

Timestamp:

Nov 19, 2004, 6:40:30 PM (21 years ago)

Author:

ansari

Message:

Ajout prise en charge trace d'ellipse ds PIElDrawer - Reza 19/11/2004

Location:

trunk/SophyaPI/PI

Files:

• pieldrw.cc (modified) (1 diff)
• pieldrw.h (modified) (2 diffs)

trunk/SophyaPI/PI/pieldrw.cc

@@ -143 +143 @@
                         D_CN_To_CG_X((*it).edx), D_CN_To_CG_Y((*it).edy) ); 
           else g->DrawFBox((*it).ex, (*it).ey, (*it).edx, (*it).edy ); 
+          break;
+        case PIDEL_Oval :
+          if ((*it).scc)  // Coord specifie normalise 0..1
+            g->DrawOval(CN_To_CG_X((*it).ex), CN_To_CG_Y((*it).ey), 
+                       D_CN_To_CG_X((*it).edx), D_CN_To_CG_Y((*it).edy) ); 
+          else  g->DrawOval((*it).ex, (*it).ey, (*it).edx, (*it).edy ); 
+          break;
+        case PIDEL_FOval :
+          if ((*it).scc)  // Coord specifie normalise 0..1
+            g->DrawFOval(CN_To_CG_X((*it).ex), CN_To_CG_Y((*it).ey), 
+                        D_CN_To_CG_X((*it).edx), D_CN_To_CG_Y((*it).edy) ); 
+          else g->DrawFOval((*it).ex, (*it).ey, (*it).edx, (*it).edy ); 
           break;
         case PIDEL_Circ :

trunk/SophyaPI/PI/pieldrw.h

@@ -17 +17 @@
          PIDEL_Rect = 3, PIDEL_FRect = 4, 
          PIDEL_Circ = 5, PIDEL_FCirc = 6,
-         PIDEL_Arc = 7,  PIDEL_FArc = 8,
-         PIDEL_Arc3P = 9,  PIDEL_FArc3P = 10,
-         PIDEL_Poly = 11, PIDEL_FPoly = 12,
-         PIDEL_Mark = 13, PIDEL_Arrow = 14,
-         PIDEL_CText = 15  } ; 
+         PIDEL_Oval = 7, PIDEL_FOval = 8,
+         PIDEL_Arc = 9,  PIDEL_FArc = 10,
+         PIDEL_Arc3P = 11,  PIDEL_FArc3P = 12,
+         PIDEL_Poly = 13, PIDEL_FPoly = 14,
+         PIDEL_Mark = 15, PIDEL_Arrow = 16,
+         PIDEL_CText = 17  } ; 
 
                 PIElDrwMgr();
@@ -103 +104 @@
     { return( ElAdd(PIDEL_FCirc, x, y, 0., 360., NULL, gatt, 0, fgsc, r) ); }  
 
+  // ---- Ajout d' ovales
+  inline int    ElAddOval(double x, double y, double dx, double dy, bool fgsc=false)
+    { PIGraphicAtt gatt; return( ElAdd(PIDEL_Oval, x, y, dx, dy, NULL, gatt, 0, fgsc) ); }  
+  inline int    ElAddOval(double x, double y, double dx, double dy, 
+                          PIGraphicAtt const & gatt, bool fgsc=false)
+    { return( ElAdd(PIDEL_Oval, x, y, dx, dy, NULL, gatt, 0, fgsc) ); }  
+
+  inline int    ElAddFOval(double x, double y, double dx, double dy, bool fgsc=false)
+    { PIGraphicAtt gatt; return( ElAdd(PIDEL_FOval, x, y, dx, dy, NULL, gatt, 0, fgsc) ); }  
+  inline int    ElAddFOval(double x, double y, double dx, double dy, 
+                           PIGraphicAtt const & gatt, bool fgsc=false)
+    { return( ElAdd(PIDEL_FOval, x, y, dx, dy, NULL, gatt, 0, fgsc) ); }  
+
   // ---- Ajout d' arcs specifies par deux angles
   inline int    ElAddArc(double x, double y, double r,