Changeset 316 in Sophya for trunk/SophyaPI/PI/pigraphuc.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/pigraphuc.cc (modified) (6 diffs)

trunk/SophyaPI/PI/pigraphuc.cc

@@ -583 +583 @@
 
 /* --Methode-- */
+void PIGraphicUC::SelFont(PIFont & fnt)
+{
+  if (!mGrC) return;
+  mGrC->SelFont(fnt);
+  return;  
+}
+
+/* --Methode-- */
 void PIGraphicUC::SelFont(PIFontSize sz, PIFontAtt att)
 {
@@ -671 +679 @@
 }
 
-/* --Methode-- */
-PIFontAtt PIGraphicUC::GetFontAtt()
-{
-  if (!mGrC) return(PI_NotDefFontAtt);
-  return(mGrC->GetFontAtt());
-}
-
-/* --Methode-- */
-int PIGraphicUC::GetFontSize()
-{
-  if (!mGrC) return(0);
-  return(mGrC->GetFontSize());
-}
 
 /* --Methode-- */
@@ -706 +701 @@
 }
 /* --Methode-- */
-PIGrCoord PIGraphicUC::GetFontHeightUC(PIGrCoord& asc, PIGrCoord& desc)
+PIGrCoord PIGraphicUC::GetFontHeight(PIGrCoord& asc, PIGrCoord& desc)
 {
   asc = desc = 0;
@@ -712 +707 @@
   int h,a,d;
   double fh, fa, fd, x;
-  h = mGrC->GetFontHeight(a, d) ;
+  h = myFont.GetFontHeight(a, d) ;
   DGrC2UC(0., h, x, fh);
   DGrC2UC(0., a, x, fa);
@@ -720 +715 @@
 }
 
-/* --Methode-- */
-int PIGraphicUC::GetFontHeight(int& asc, int& desc)
-{
-  asc = desc = 0;
-  if (!mGrC) return(0);
-  return( mGrC->GetFontHeight(asc, desc) );
-}
 
 /* --Methode-- */
@@ -732 +720 @@
 {
   if (!mGrC) return(0.);
-  double dx = mGrC->CalcStringWidth(s);
+  double dx = myFont.GetStringWidth(s);
   double dxx, dxy;
   DGrC2UC(dx, dx, dxx, dxy);