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

trunk/SophyaPI/PIext/pintuple.cc

@@ -149 +149 @@
 if (axesFlags != kAxesNone) DrawAxes(g);
 if ( (xK < 0) || (yK < 0) )  return;
-if (mLAtt == PI_NotDefLineAtt)  g->SelLine(PI_ThinLine);
+if (GetGraphicAtt().GetLineAtt() == PI_NotDefLineAtt)  g->SelLine(PI_ThinLine);
 
 //  Pour tracer des markers avec taille fonction de Wt (poids)
@@ -156 +156 @@
 int msz,sz;
 
+PIMarker mmrk = GetGraphicAtt().GetMarker();
 PIMarker mrk;
-if (wK >= 0)  mrk = (mMrk != PI_NotDefMarker) ? mMrk : PI_CircleMarker;
-else   mrk = (mMrk != PI_NotDefMarker) ? mMrk : PI_DotMarker;
-msz = mMSz;
+if (wK >= 0)  mrk = (mmrk != PI_NotDefMarker) ? mmrk : PI_CircleMarker;
+else   mrk = (mmrk != PI_NotDefMarker) ? mmrk : PI_DotMarker;
+msz = GetGraphicAtt().GetMarkerSz();;
 if (msz < 1) msz = 1;
 g->SelMarker(msz, mrk);
@@ -179 +180 @@
   nok++;
   if ( (xp < xmin) || (xp > xmax) || (yp < ymin) || (yp > ymax) )  continue;
-  if ( (i > 0) && (mLAtt != PI_NotDefLineAtt) )   // On relie les points ...
-    g->DrawLine(xl, yl, xp, yp);
+  if ( (i > 0) && (GetGraphicAtt().GetLineAtt() != PI_NotDefLineAtt) )   
+    g->DrawLine(xl, yl, xp, yp);  // On relie les points ...
   if ( xebK >= 0 ) {
     xer = mNT->GetCell(i, xebK);
@@ -199 +200 @@
   }
   // Trace du marker
-  if ((wK >= 0)||(lK < 0)||(mMrk != PI_NotDefMarker))  g->DrawMarker(xp, yp); 
+  if ((wK >= 0)||(lK < 0)||(mmrk != PI_NotDefMarker))  g->DrawMarker(xp, yp); 
   // Trace eventuel du label
   if (lK >= 0) g->DrawString(xp, yp, mNT->GetCelltoString(i, lK).c_str());
@@ -206 +207 @@
 
 if (stats) { // Trace de stats 
-  g->SelFontSz((YMax() - YMin())/30, mFAtt);  
+  g->SelFontSz((YMax() - YMin())/30);  
   // La hauteur de la cellule
   PIGrCoord a,d;