Changeset 316 in Sophya for trunk/SophyaPI/PI/pigraphps.cc

Timestamp:

Jun 15, 1999, 3:56:51 PM (26 years ago)

Author:

ercodmgr

Message:

Introduction PIFont - Reza 15/06/99

File:

• trunk/SophyaPI/PI/pigraphps.cc (modified) (7 diffs)

trunk/SophyaPI/PI/pigraphps.cc

@@ -327 +327 @@
 return;
 }
+/* --Methode-- */
+void PIGraphicPS::SelFont(PIFont & fnt)
+{
+//  $CHECK$   -  Reza 13/06/99
+SelFontSzPt(fnt.GetFontSize(), fnt.GetFontAtt());
+}
 
 /* --Methode-- */
 void PIGraphicPS::SelFontSzPt(int npt, PIFontAtt att)
 {
+//  $CHECK$   -  Reza 13/06/99
+myFont.SetFontSzPt(npt);
+myFont.SetFontAtt(att);
 mFSize = npt;
 mFAtt = att;
@@ -341 +350 @@
 void PIGraphicPS::SelFont(PIFontSize sz, PIFontAtt att)
 {
+//  $CHECK$   -  Reza 13/06/99
 int i;
 switch (sz) {
@@ -356 +366 @@
     break;
   }
+myFont.SetFontSz(sz);
+myFont.SetFontAtt(att);
 mFSize = fntsz[i];
 mFAtt = att;
@@ -413 +425 @@
 }
 
-/* --Methode-- */
-PIFontAtt  PIGraphicPS::GetFontAtt()
-{
-return (mFAtt);
-}
-
-/* --Methode-- */
-int        PIGraphicPS::GetFontSize()
-{
-return (mFSize);
-}
 
 /* --Methode-- */
@@ -443 +444 @@
 }
 
-/* --Methode-- */
+/* --Methode-- 
 int        PIGraphicPS::GetFontHeight(int& asc, int& desc)   
 {
-/*  $CHECK$  A refaire , voir Nicolas  */
+  $CHECK$  A refaire , voir Nicolas  
 asc = mFSize; desc = 0; 
 return(asc+desc);
-}
-
-
-/* --Methode-- */
+} 
+*/
+
+
+/* --Methode-- 
 PIGrCoord PIGraphicPS::CalcStringWidth(char const* s)
 {
-return((double)(mFSize*strlen(s)*0.5));   /*  facteur 0.5 ad'hoc $CHECK$  Voir Nicolas ! */
-}
+return((double)(mFSize*strlen(s)*0.5));   
+//  facteur 0.5 ad hoc $CHECK$  Voir Nicolas 
+}
+*/
+ 
 
 /* --Methode-- */
@@ -464 +469 @@
 sFCol = mFCol;    sBCol = mBCol;
 sGOm = mGOm;
-sFAtt = mFAtt;   sFSize = mFSize;
+sFont = myFont; 
 sMrk = mMrk;   sMrkSz = mMrkSz;
 return;
@@ -478 +483 @@
 // else    A faire Nicolas  
   SelGOMode(sGOm);
-  SelFontSzPt(sFSize, sFAtt);
+  SelFont(sFont);
   SelLine(sLAtt);
   SelMarker(sMrkSz, sMrk);