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

Timestamp:

Feb 18, 2002, 11:41:28 PM (24 years ago)

Author:

ansari

Message:

Adaptation a l'introduction de la classe PIGraphicAtt - Reza 18/02/2002

File:

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

trunk/SophyaPI/PIext/pistdimgapp.cc

@@ -523 +523 @@
 
 // Changement d'attributs graphiques courants du drawer
-if (mFCol != PI_NotDefColor) scd->SetColAtt(mFCol, mBCol);
-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);
+if (mFCol != PI_NotDefColor) scd->GetGraphicAtt().SetColAtt(mFCol, mBCol);
+if (mLAtt != PI_NotDefLineAtt) scd->GetGraphicAtt().SetLineAtt(mLAtt);
+if ( (mFSz != PI_NotDefFontSize) && (mFAtt != PI_NotDefFontAtt) ) 
+  scd->GetGraphicAtt().SetFontAtt(mFSz, mFAtt); 
+if ( mFName != PI_DefaultFont ) 
+  scd->GetGraphicAtt().SetFontAtt(mFName, scd->GetGraphicAtt().GetFontSz(), 
+                               scd->GetGraphicAtt().GetFontAtt());
+if ( (mMrk != PI_NotDefMarker) && (mMSz >= 0) ) 
+  scd->GetGraphicAtt().SetMarkerAtt(mMSz, mMrk);
+if ( mCmapid != CMAP_OTHER ) scd->GetGraphicAtt().SetColMapId(mCmapid);
 
 
@@ -576 +580 @@
 scw->SetAxesFlags(mAxesFlags);
 // Fonte de trace d'axe
-scw->BaseDrawer()->SetFont(mFName, mFSz, mFAtt);
+scw->BaseDrawer()->GetGraphicAtt().SetFontAtt(mFName, mFSz, mFAtt);
 /*
 if (typeid(*scd) != typeid(PIHisto2D)) 
@@ -607 +611 @@
 
 // Changement d'attributs graphiques courants du drawer
-if (mFCol != PI_NotDefColor) dr3->SetColAtt(mFCol, mBCol);
-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);
+if (mFCol != PI_NotDefColor) dr3->GetGraphicAtt().SetColAtt(mFCol, mBCol);
+if (mLAtt != PI_NotDefLineAtt) dr3->GetGraphicAtt().SetLineAtt(mLAtt);
+if ( (mFSz != PI_NotDefFontSize) && (mFAtt != PI_NotDefFontAtt) ) 
+  dr3->GetGraphicAtt().SetFontAtt(mFSz, mFAtt); 
+if ( mFName != PI_DefaultFont ) 
+  dr3->GetGraphicAtt().SetFontAtt(mFName, dr3->GetGraphicAtt().GetFontSz(), 
+                                  dr3->GetGraphicAtt().GetFontAtt());
+if ( (mMrk != PI_NotDefMarker) && (mMSz >= 0) ) 
+  dr3->GetGraphicAtt().SetMarkerAtt(mMSz, mMrk);
+if ( mCmapid != CMAP_OTHER ) dr3->GetGraphicAtt().SetColMapId(mCmapid);
 
 if ( (!mLastWdg) && ( (opt == Disp_Same) || (opt == Disp_Inset) ) )  opt = Disp_Next;
@@ -669 +677 @@
 
 if ( (mFSz != PI_NotDefFontSize) && (mFAtt != PI_NotDefFontAtt) ) 
-  eld->SetFontAtt(mFSz, mFAtt); 
+  eld->GetGraphicAtt().SetFontAtt(mFSz, mFAtt); 
 if ( mFName != PI_DefaultFont ) 
-  eld->SetFont(mFName, eld->GetFontSz(), eld->GetFontAtt());
+  eld->GetGraphicAtt().SetFontAtt(mFName, eld->GetGraphicAtt().GetFontSz(), 
+                                  eld->GetGraphicAtt().GetFontAtt());
 eld->ElAddText(xp,yp,txt.c_str(),mFCol);
 eld->Refresh();
@@ -729 +738 @@
 
 if ( (mFSz != PI_NotDefFontSize) && (mFAtt != PI_NotDefFontAtt) ) 
-  eld->SetFontAtt(mFSz, mFAtt); 
+  eld->GetGraphicAtt().SetFontAtt(mFSz, mFAtt); 
 if ( mFName != PI_DefaultFont ) 
-  eld->SetFont(mFName, eld->GetFontSz(), eld->GetFontAtt());
+  eld->GetGraphicAtt().SetFontAtt(mFName, eld->GetGraphicAtt().GetFontSz(), 
+                                  eld->GetGraphicAtt().GetFontAtt());
 eld->SetTitles(titletop, titlebottom);
 eld->Refresh();