Changeset 1905 in Sophya for trunk/SophyaPI/PIGcont/pigncont.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/PIGcont/pigncont.cc (modified) (5 diffs)

trunk/SophyaPI/PIGcont/pigncont.cc

@@ -546 +546 @@
   bool Invx, Invy, Exy;
   PIColorMap * cmap = NULL;
-  if(mCmapid !=CMAP_OTHER ){
-    cmap = new PIColorMap(mCmapid);
+  CMapId mcmapid = GetGraphicAtt().GetColMapId();
+  if(mcmapid !=CMAP_OTHER ){
+    cmap = new PIColorMap(mcmapid);
   }
   int numdr = 0;
@@ -568 +569 @@
     // choix de la couleur 
     
-    g->SelForeground(mFCol);
-    if(mCmapid !=CMAP_OTHER ){
+    g->SelForeground(GetGraphicAtt().GetFgColor());
+    if(mcmapid !=CMAP_OTHER ){
       if(_zmax-_zmin!=0){
         int kc = ((lev - _zmin)/(_zmax-_zmin))*cmap->NCol();    
@@ -579 +580 @@
     if(IsMarkOn()==true){
       
-      g->SelMarker(mMSz,mMrk);
+      g->SelMarker(GetGraphicAtt().GetMarkerSz(), GetGraphicAtt().GetMarker());
       g->DrawMarkers(xx,yy,npts);
     }
@@ -585 +586 @@
     if(mLineOn==true){
       
-      g->SelLine(mLAtt);
+      g->SelLine(GetGraphicAtt().GetLineAtt());
       g->DrawPolygon(xx,yy,npts,false);
     }
@@ -595 +596 @@
       char strg[10];
       sprintf(strg,"%g",lev);
-      PIFont myfont(mFName);
-      myfont.SetFontAtt(mFAtt);
-      myfont.SetFontSz(mFSz);
+      PIFont myfont(GetGraphicAtt().GetFont());
       
       g->SelFont(myfont);