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

Timestamp:

Nov 3, 2002, 10:52:49 PM (23 years ago)

Author:

ansari

Message:

Ajout commande addarc, addarrow, ... , Reza 3/11/2002

File:

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

trunk/SophyaPI/PIext/pistdimgapp.cc

@@ -811 +811 @@
 ParseDisplayOption(sop, opts);
 PIGraphicAtt gratt(opts);
-elmgr->ElAddText(xp,yp,txt.c_str(), gratt);
+unsigned long tpd = 0;
+gratt.DecodeTextPosDirAtt(opts, tpd, false);
+elmgr->ElAddText(xp,yp,txt.c_str(), gratt, tpd);
 eld->Refresh();
 }
 
 /* --Methode-- */
-void PIStdImgApp::AddLine(double xp1, double yp1, double xp2, double yp2, string const& sop)
+void PIStdImgApp::AddLine(double xp1, double yp1, double xp2, double yp2, 
+                          string const& sop, bool fgarrow)
 {
 PIDrawer *eld=CurrentElDrawer();
@@ -831 +834 @@
 ParseDisplayOption(sop, opts);
 PIGraphicAtt gratt(opts);
-elmgr->ElAddLine(xp1, yp1, xp2, yp2, gratt);
+if (fgarrow) 
+  elmgr->ElAddArrow(xp1, yp1, xp2, yp2, gratt);
+else elmgr->ElAddLine(xp1, yp1, xp2, yp2, gratt);
 eld->Refresh();
 }
@@ -887 +892 @@
 ParseDisplayOption(sop, opts);
 PIGraphicAtt gratt(opts);
-
-if (fgfill) elmgr->ElAddFCirc(xc, yc, r, gratt);
-else elmgr->ElAddCirc(xc, yc, r, gratt);
+if (r < -0.5)
+  elmgr->ElAddMarker(xc, yc, gratt);
+else {
+  if (fgfill) elmgr->ElAddFCirc(xc, yc, r, gratt);
+  else elmgr->ElAddCirc(xc, yc, r, gratt);
+}
+eld->Refresh();
+}
+
+/* --Methode-- */
+void PIStdImgApp::AddArc(double x1, double y1, double x2, double y2,
+                         double x3, double y3, string const& sop, bool fgfill)
+{
+PIDrawer *eld=CurrentElDrawer();
+if (eld == NULL) return;
+PIElDrawer* eld2 = dynamic_cast<PIElDrawer *>(eld);
+PIElDrawer3D* eld3 = dynamic_cast<PIElDrawer3D *>(eld);
+if ((eld2 == NULL) && (eld3 == NULL)) return;
+PIElDrwMgr* elmgr = NULL;
+if (eld2) elmgr = &(eld2->ElDrwMgr());
+else if (eld3) elmgr = &(eld3->ElDrwMgr());
+if (elmgr == NULL) return;
+
+vector<string> opts;
+ParseDisplayOption(sop, opts);
+PIGraphicAtt gratt(opts);
+if (fgfill) 
+  elmgr->ElAddFArc(x1, y1, x2, y2, x3, y3, gratt);
+else  elmgr->ElAddArc(x1, y1, x2, y2, x3, y3, gratt);
 eld->Refresh();
 }