Changeset 387 in Sophya

Timestamp:

Aug 13, 1999, 3:47:47 PM (26 years ago)

Author:

ercodmgr

Message:

bug (vicieux) de gestion de fontes Reza 13/08/99

Location:

trunk/SophyaPI/PI

Files:

• pifontx.cc (modified) (4 diffs)
• pigraphuc.cc (modified) (4 diffs)

trunk/SophyaPI/PI/pifontx.cc

@@ -15 +15 @@
 /* --Methode-- */
 PIFontX::PIFontX(PIFontName fn)
-  : PIFontGen(fn)
+  : PIFontGen(fn) , mFSize(-1) 
 {
 GlInit();
@@ -23 +23 @@
 /* --Methode-- */
 PIFontX::PIFontX(int npt, PIFontName fn, PIFontAtt fa)
-  : PIFontGen(npt, fn, fa)
+  : PIFontGen(npt, fn, fa), mFSize(-1) 
 {
 GlInit();
@@ -31 +31 @@
 /* --Methode-- */
 PIFontX::PIFontX(PIFontX const & fnt)
-  : PIFontGen(fnt.mFName)
+  : PIFontGen(fnt.mFName), mFSize(-1) 
 {
 GlInit();
@@ -162 +162 @@
 void PIFontX::SelectFontPt(PIFontName fn, PIFontAtt fa, int npt)
 {
-if ( (fn == mFName) && (fa == mFAtt) && (npt == mFSize) )   return;
+if ( (mFSize > 0) && (fn == mFName) && (fa == mFAtt) && (npt == mFSize) )   return;
 int dsz,i,isel, j, k;
 isel = 0;

trunk/SophyaPI/PI/pigraphuc.cc

@@ -587 +587 @@
   if (!mGrC) return;
   mGrC->SelFont(fnt);
+  myFont = mGrC->GetFont();
   return;  
 }
@@ -595 +596 @@
   if (!mGrC) return;
   mGrC->SelFont(sz, att);
+  myFont = mGrC->GetFont();
   return;  
 }
@@ -603 +605 @@
   if (!mGrC) return;
   mGrC->SelFontSzPt(npt, att);
+  myFont = mGrC->GetFont();
   return;  
 }
@@ -629 +632 @@
   DUC2GrC((double)sz, (double)sz, fx, fy);
   int npt = (int)fy;
-  if (npt < 8) npt = 8;
+  if (npt < 6) npt = 6;
   if (npt > 127) npt = 127;
   mGrC->SelFontSzPt(npt, att);
+  myFont = mGrC->GetFont();
 }