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

Timestamp:

Aug 16, 2001, 2:19:01 PM (24 years ago)

Author:

ansari

Message:

1/ Definition d'attributs graphiques texte pour les nouvelles couleurs violettes
2/ Ajout commandes addline addrect addfrect addfcircle ....

Reza 16/8/2001

File:

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

trunk/SophyaPI/PIext/pistdimgapp.cc

@@ -661 +661 @@
 void PIStdImgApp::AddText(string const & txt, double xp, double yp)
 {
-if (!mLastWdg)  return;
+PIElDrawer *eld=CurrentElDrawer();
+if (eld == NULL) return;
+
+if ( (mFSz != PI_NotDefFontSize) && (mFAtt != PI_NotDefFontAtt) ) 
+  eld->SetFontAtt(mFSz, mFAtt); 
+if ( mFName != PI_DefaultFont ) 
+  eld->SetFont(mFName, eld->GetFontSz(), eld->GetFontAtt());
+eld->ElAddText(xp,yp,txt.c_str(),mFCol);
+eld->Refresh();
+}
+
+/* --Methode-- */
+void PIStdImgApp::AddLine(double xp1, double yp1, double xp2, double yp2)
+{
+PIElDrawer *eld=CurrentElDrawer();
+if (eld == NULL) return;
+
+eld->ElAddLine(xp1, yp1, xp2, yp2, mFCol);
+eld->Refresh();
+}
+
+/* --Methode-- */
+void PIStdImgApp::AddRectangle(double xp1, double yp1, double xp2, double yp2, bool fgfill)
+{
+PIElDrawer *eld=CurrentElDrawer();
+if (eld == NULL) return;
+
+double xp,yp;
+double dx, dy;
+if (xp1 < xp2) {
+  xp = xp1; dx = xp2-xp1;
+}
+else {
+  xp = xp2; dx = xp1-xp2;
+}
+if (yp1 < yp2) {
+  yp = yp1; dy = yp2-yp1;
+}
+else {
+  yp = yp2; dy = yp1-yp2;
+}
+if (fgfill) eld->ElAddFRect(xp, yp, dx, dy, mFCol);
+else eld->ElAddRect(xp, yp, dx, dy, mFCol);
+eld->Refresh();
+}
+
+/* --Methode-- */
+void PIStdImgApp::AddCircle(double xc, double yc, double r, bool fgfill)
+{
+PIElDrawer *eld=CurrentElDrawer();
+if (eld == NULL) return;
+
+if (fgfill) eld->ElAddFCirc(xc, yc, r, mFCol);
+else eld->ElAddCirc(xc, yc, r, mFCol);
+eld->Refresh();
+}
+
+/* --Methode-- */
+void PIStdImgApp::SetTitle(string const & titletop, string const & titlebottom)
+{
+PIElDrawer *eld=CurrentElDrawer();
+if (eld == NULL) return;
+
+if ( (mFSz != PI_NotDefFontSize) && (mFAtt != PI_NotDefFontAtt) ) 
+  eld->SetFontAtt(mFSz, mFAtt); 
+if ( mFName != PI_DefaultFont ) 
+  eld->SetFont(mFName, eld->GetFontSz(), eld->GetFontAtt());
+eld->SetTitles(titletop, titlebottom);
+eld->Refresh();
+}
+
+/* --Methode-- */
+PIElDrawer* PIStdImgApp::CurrentElDrawer()
+{
 PIElDrawer *eld=NULL;
+if (!mLastWdg)  return(eld);
 PIScDrawWdg* sdw=NULL;
 PIDraw3DWdg* w3d=NULL;
@@ -677 +751 @@
   case PIImage::ClassId :
     imgw = dynamic_cast<PIImage *>(mLastWdg);
-    if (imgw) eld = imgw->MyElDrawer();
+    if (imgw) eld = imgw->BaseDrawer();
     break;
   default :
     break;
   }
-if (eld) { 
-  if ( (mFSz != PI_NotDefFontSize) && (mFAtt != PI_NotDefFontAtt) )     eld->SetFontAtt(mFSz, mFAtt); 
-  eld->ElAddText(xp,yp,txt.c_str(),mFCol);
-  eld->Refresh();
-  }
-}
-/* --Methode-- */
-void PIStdImgApp::SetTitle(string const & titletop, string const & titlebottom)
-{
-if (!mLastWdg)  return;
-PIElDrawer *eld=NULL;
-PIScDrawWdg* sdw=NULL;
-PIDraw3DWdg* w3d=NULL;
-PIImage* imgw;
-switch(mLastWdg->kind()) {
-  case PIScDrawWdg::ClassId :
-    sdw = dynamic_cast<PIScDrawWdg *>(mLastWdg);
-    if (sdw) eld = sdw->BaseDrawer();
-    break;
-  case PIDraw3DWdg::ClassId :
-    w3d = dynamic_cast<PIDraw3DWdg *>(mLastWdg);
-    if (w3d) eld = w3d->BaseDrawer();
-    break;
-  case PIImage::ClassId :
-    imgw = dynamic_cast<PIImage *>(mLastWdg);
-    if (imgw) eld = imgw->MyElDrawer();
-    break;
-  default :
-    break;
-  }
-if (eld) { 
-  if ( (mFSz != PI_NotDefFontSize) && (mFAtt != PI_NotDefFontAtt) )     eld->SetFontAtt(mFSz, mFAtt); 
-  eld->SetTitles(titletop, titlebottom);
-  eld->Refresh();
-  }
+return(eld);
 }