Changeset 2469 in Sophya for trunk/SophyaPI/PIext/pintuple.cc

Timestamp:

Dec 2, 2003, 8:36:10 PM (22 years ago)

Author:

cmv

Message:

gestion trace linges avec DrawPolygon cmv 02/12/03

File:

• trunk/SophyaPI/PIext/pintuple.cc (modified) (7 diffs)

trunk/SophyaPI/PIext/pintuple.cc

@@ -140 +140 @@
 
 /* --Methode-- */
+#define NMXMULTP_LOCAL  30   // Pour multipoint sans new
 void PINTuple::Draw(PIGraphicUC* g, double xmin, double ymin, double xmax, double ymax)
 {
 double xp,yp,xer,yer,wp;
 double xl,yl;
-int nok;
+int nok,npolyg;
 
 if (!mNT) return;
@@ -158 +159 @@
 PIColorMap * cmap = NULL;
 double dwc = 1.;
-double nwc = 1.;
+int nwc = 1;
 bool revcmap;
 CMapId mcmapid = GetGraphicAtt().GetColMapId(revcmap);
@@ -165 +166 @@
   cmap->ReverseColorIndex(revcmap);
   nwc = cmap->NCol();
-  dwc = (wMax-wMin)/nwc;
+  dwc = (wMax-wMin)/(double)nwc;
 }
 
@@ -187 +188 @@
 nok = 0;  
 xp = yp = xl = yl = 0;
+PIGrCoord xpolyg[NMXMULTP_LOCAL], ypolyg[NMXMULTP_LOCAL];
+npolyg = 0;  
 for (long i=0; i<(long)mNT->NbLines(); i++) {
-  xl = xp;  yl = yp; 
+  xl = xp;  yl = yp;
   xp = mNT->GetCell(i, xK);
   yp = mNT->GetCell(i, yK);
@@ -213 +216 @@
   }
 
-  if ( (i > 0) && connectPts )   
-    g->DrawLine(xl, yl, xp, yp);  // On relie les points ...
+  // Trace d'une ligne reliant les points
+  if( connectPts ) {
+    if(npolyg==0) {xpolyg[0]=xl; ypolyg[0]=yl; npolyg=1;}
+    if(npolyg<NMXMULTP_LOCAL)
+      {xpolyg[npolyg]=xp; ypolyg[npolyg]=yp; npolyg++;}
+    if(npolyg==NMXMULTP_LOCAL)
+      {g->DrawPolygon(xpolyg,ypolyg,npolyg,false); npolyg=0;}
+  }
+
+  // Trace des erreurs selon X et Y
   if ( xebK >= 0 ) {
     xer = mNT->GetCell(i, xebK);
@@ -223 +234 @@
     if(yer>0.) g->DrawLine(xp, yp-yer, xp, yp+yer);
   }
+
   // Trace du marker
   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());
 
 }
+
+// Fin du trace d'une ligne reliant les points  si necessaire
+if( connectPts && npolyg>1 )
+  {g->DrawPolygon(xpolyg,ypolyg,npolyg,false); npolyg=0;}
 
 if (stats) { // Trace de stats 
@@ -262 +279 @@
 return;
 }
+#undef NMXMULTP_LOCAL
 
 /* --Methode-- */