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

Timestamp:

Jul 6, 2001, 3:44:54 PM (24 years ago)

Author:

ansari

Message:

Gestion des attributs de nom de fontes - Reza 6/7/2001

File:

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

trunk/SophyaPI/PIext/pistdimgapp.cc

@@ -200 +200 @@
 mFCol = mBCol = PI_NotDefColor;
 mLAtt = PI_NotDefLineAtt;
+mFName = PI_DefaultFont;   
 mFSz = PI_NotDefFontSize;
 mFAtt = PI_NotDefFontAtt;
@@ -523 +524 @@
 if (mLAtt != PI_NotDefLineAtt) scd->SetLineAtt(mLAtt);
 if ( (mFSz != PI_NotDefFontSize) && (mFAtt != PI_NotDefFontAtt) ) scd->SetFontAtt(mFSz, mFAtt); 
+if ( mFName != PI_DefaultFont ) scd->SetFont(mFName, scd->GetFontSz(), scd->GetFontAtt());
 if ( (mMrk != PI_NotDefMarker) && (mMSz >= 0) ) scd->SetMarkerAtt(mMSz, mMrk);
 if ( mCmapid != CMAP_OTHER ) scd->SetColMapId(mCmapid);
@@ -569 +571 @@
   scw->SetLimits(mXmin, mXmax, mYmin, mYmax);
 scw->SetAxesFlags(mAxesFlags);
+// Fonte de trace d'axe
+scw->BaseDrawer()->SetFont(mFName, mFSz, mFAtt);
 
 if (typeid(*scd) != typeid(PIHisto2D)) scw->AddScDrawer(scd, true);
@@ -577 +581 @@
   scw->SetTitles(title, t2);    
 }
+
 // scw->Refresh();   ? Pas necessaire  Reza 19/08/98, 05/05/99 $CHECK$ 
 mCurWin = win;
@@ -599 +604 @@
 if (mLAtt != PI_NotDefLineAtt) dr3->SetLineAtt(mLAtt);
 if ( (mFSz != PI_NotDefFontSize) && (mFAtt != PI_NotDefFontAtt) ) dr3->SetFontAtt(mFSz, mFAtt); 
+if ( mFName != PI_DefaultFont ) dr3->SetFont(mFName, dr3->GetFontSz(), dr3->GetFontAtt());
 if ( (mMrk != PI_NotDefMarker) && (mMSz >= 0) ) dr3->SetMarkerAtt(mMSz, mMrk);
 if ( mCmapid != CMAP_OTHER ) dr3->SetColMapId(mCmapid);
@@ -1407 +1413 @@
   mLAtt = lat;
 }
+
+/* --Methode-- */
+void PIStdImgApp::SetFontName(PIFontName fn)
+{
+  mFName = fn;
+}
+
 /* --Methode-- */
 void PIStdImgApp::SetFontAtt(PIFontSize fsz, PIFontAtt fat)
@@ -1455 +1468 @@
   mSBCol = mBCol;
   mSLAtt = mLAtt;
+  mSFName = mFName;
   mSFSz = mFSz;
   mSFAtt = mFAtt;
@@ -1482 +1496 @@
   mBCol = mSBCol;
   mLAtt = mSLAtt;
+  mFName = mSFName;
   mFSz = mSFSz;
   mFAtt = mSFAtt;