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

Timestamp:

Nov 14, 2002, 8:12:02 PM (23 years ago)

Author:

ansari

Message:

• Ajout commande de trace d'elements graphiques (addpoly addctext ...)
• Ajout de commandes de lecture ascii matrices/vecteurs
• Trace de vecteur vx vs vy pour tout type de vecteurs

Reza 14/11/2002

File:

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

trunk/SophyaPI/PIext/pistdimgapp.cc

@@ -19 +19 @@
 
 #include "pistdimgapp.h"
+#include "servnobjm.h"
 // #include "pihisto2d.h"
 #include "psfile.h"
@@ -95 +96 @@
 m[0]->AppendItem("Open-Fits", 10120);
 m[0]->AppendItem("Open-PPF", 10130);
+#ifndef SANS_EVOLPLANCK
+m[0]->AppendItem("Open-ASCII", 10140);
+#endif
 // m[0]->AppendItem("Options", 10101);
 m[0]->AppendItem("Help", 10100);
@@ -251 +255 @@
 pfc_fits = new PIFileChooser(this,"FITS-FileChooser", 10125); 
 pfc_ppf = new PIFileChooser(this,"PPF-FileChooser", 10135); 
+pfc_ascii = new PIFileChooser(this,"ASCII-FileChooser", 10145); 
 pfc_ps = new PIFileChooser(this,"PS-FileChooser", 10525); 
 
@@ -345 +350 @@
 delete pfc_fits;
 delete pfc_ppf;
+delete pfc_ascii;
 delete pfc_ps;
 
@@ -796 +802 @@
 
 /* --Methode-- */
-void PIStdImgApp::AddText(string const & txt, double xp, double yp, string const& sop)
+void PIStdImgApp::AddText(string const & txt, double xp, double yp, string const& sop, bool fgcn)
 {
 PIDrawer *eld=CurrentElDrawer();
@@ -813 +819 @@
 unsigned long tpd = 0;
 gratt.DecodeTextPosDirAtt(opts, tpd, false);
-elmgr->ElAddText(xp,yp,txt.c_str(), gratt, tpd);
+elmgr->ElAddText(xp,yp,txt.c_str(), gratt, tpd, fgcn);
 eld->Refresh();
 }
 
 /* --Methode-- */
+void PIStdImgApp::AddCompText(string const & txt, string const & txtup, string const & txtdn, 
+                              double xp, double yp, string const& sop, 
+                              string const& optss, bool fgcn)
+{
+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;
+if (eld2) elmgr = &(eld2->ElDrwMgr());
+else if (eld3) elmgr = &(eld3->ElDrwMgr());
+if (elmgr == NULL) return;
+
+vector<string> opts;
+ParseDisplayOption(sop, opts);
+PIGraphicAtt gratt(opts);
+unsigned long tpd = 0;
+gratt.DecodeTextPosDirAtt(opts, tpd, false);
+ParseDisplayOption(optss, opts);
+PIGraphicAtt grattss(opts);
+elmgr->ElAddCompText(xp,yp,txt.c_str(), gratt, txtup, txtdn, grattss, tpd, fgcn);
+eld->Refresh();
+}
+
+/* --Methode-- */
 void PIStdImgApp::AddLine(double xp1, double yp1, double xp2, double yp2, 
-                          string const& sop, bool fgarrow)
+                          string const& sop, bool fgarrow, bool fgcn)
 {
 PIDrawer *eld=CurrentElDrawer();
@@ -835 +867 @@
 PIGraphicAtt gratt(opts);
 if (fgarrow) 
-  elmgr->ElAddArrow(xp1, yp1, xp2, yp2, gratt);
-else elmgr->ElAddLine(xp1, yp1, xp2, yp2, gratt);
+  elmgr->ElAddArrow(xp1, yp1, xp2, yp2, gratt, fgcn);
+else elmgr->ElAddLine(xp1, yp1, xp2, yp2, gratt, fgcn);
 eld->Refresh();
 }
@@ -842 +874 @@
 /* --Methode-- */
 void PIStdImgApp::AddRectangle(double xp1, double yp1, double xp2, double yp2, 
-                               string const& sop, bool fgfill)
+                               string const& sop, bool fgfill, bool fgcn)
 {
 PIDrawer *eld=CurrentElDrawer();
@@ -872 +904 @@
 PIGraphicAtt gratt(opts);
 
-if (fgfill) elmgr->ElAddFRect(xp, yp, dx, dy, gratt);
-else elmgr->ElAddRect(xp, yp, dx, dy, gratt);
+if (fgfill) elmgr->ElAddFRect(xp, yp, dx, dy, gratt, fgcn);
+else elmgr->ElAddRect(xp, yp, dx, dy, gratt, fgcn);
 eld->Refresh();
 }
 
 /* --Methode-- */
-void PIStdImgApp::AddCircle(double xc, double yc, double r, string const& sop, bool fgfill)
+void PIStdImgApp::AddCircle(double xc, double yc, double r, string const& sop, 
+                            bool fgfill, bool fgcn)
 {
 PIDrawer *eld=CurrentElDrawer();
@@ -895 +928 @@
   elmgr->ElAddMarker(xc, yc, gratt);
 else {
-  if (fgfill) elmgr->ElAddFCirc(xc, yc, r, gratt);
-  else elmgr->ElAddCirc(xc, yc, r, gratt);
+  if (fgfill) elmgr->ElAddFCirc(xc, yc, r, gratt, fgcn);
+  else elmgr->ElAddCirc(xc, yc, r, gratt, fgcn);
 }
 eld->Refresh();
@@ -903 +936 @@
 /* --Methode-- */
 void PIStdImgApp::AddArc(double x1, double y1, double x2, double y2,
-                         double x3, double y3, string const& sop, bool fgfill)
+                         double x3, double y3, string const& sop, bool fgfill, bool fgcn)
 {
 PIDrawer *eld=CurrentElDrawer();
@@ -919 +952 @@
 PIGraphicAtt gratt(opts);
 if (fgfill) 
-  elmgr->ElAddFArc(x1, y1, x2, y2, x3, y3, gratt);
-else  elmgr->ElAddArc(x1, y1, x2, y2, x3, y3, gratt);
+  elmgr->ElAddFArc(x1, y1, x2, y2, x3, y3, gratt, fgcn);
+else  elmgr->ElAddArc(x1, y1, x2, y2, x3, y3, gratt, fgcn);
 eld->Refresh();
 }
+
+/* --Methode-- */
+void PIStdImgApp::AddPoly(vector<double>& xpol, vector<double>& ypol, 
+                          string const& sop, bool fgfill, bool fgcn)
+{
+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->ElAddFPoly(xpol, ypol, gratt, fgcn);
+else  elmgr->ElAddPoly(xpol, ypol, gratt, fgcn);
+eld->Refresh();
+
+}
+
 
 /* --Methode-- */
@@ -1426 +1484 @@
       break;
         
+#ifndef SANS_EVOLPLANCK
+    case 10140 :
+      pfc_ascii->AcceptNewFile(false);
+      mFCMsg = 10145; 
+      pfc_ascii->SetMsg(mFCMsg);
+      SetBlocked();
+      pfc_ascii->Show();
+      break;
+
+    case 10145 :
+      SetBusy();
+      if (data)  { 
+        string afname = pfc_ascii->GetFileName();
+        string nomobj = ObjMgr()->GetServiceObj()->FileName2Name(afname);
+        string cmd = "mtxfrascii ";
+        cmd += nomobj;  cmd += " ";  cmd += afname;
+        try {
+          mCmd->Interpret(cmd);
+        }  
+        catch ( PThrowable & exc ) {
+          cerr << "\n PIStdImgApp::Process()/ Cmd->Interpret() Exception :" 
+               << (string)typeid(exc).name() << " Msg= " 
+               << exc.Msg() << endl;
+          cout << endl; 
+        }
+        catch ( ... ) {
+          cerr << "\n PIStdImgApp::Process()/ Cmd->Interpret() Catched Exception ... " << endl;
+          cout << endl; 
+        }
+        
+      }
+      mFCMsg = 0;
+      SetReady();
+      break;
+#endif
+
     case 10105:
       Stop();