Changeset 2373 in Sophya for trunk/SophyaPI/PIext/pintup3d.cc

Timestamp:

Apr 25, 2003, 3:36:47 PM (22 years ago)

Author:

ansari

Message:

Ajout possibilite de trace de marker suivant table de couleur/poids ds PINTuple/PINTuple3D - Reza 25/04/03

File:

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

trunk/SophyaPI/PIext/pintup3d.cc

@@ -48 +48 @@
   mNT = nt;
   mAdDO = ad; 
+  UseSizeScale(true, 5);
+  UseColorScale(true);
   SelectXYZ(NULL, NULL, NULL);
-  SelectWt(NULL, 1);
+  SelectWt(NULL);
   SelectErrBar();
   SelectLabel(NULL);
@@ -91 +93 @@
 
 /* --Methode-- */
-void  PINTuple3D::SelectWt(const char* pw, int nbins)
-{
-nWbins = (nbins > 0) ? nbins : 10;
+void  PINTuple3D::SelectWt(const char* pw)
+{
 if (pw == NULL) wK = -1;  
 else { string name = pw;   wK = mNT->ColumnIndex(name);  }
@@ -189 +190 @@
 //  Pour tracer des markers avec taille fonction de Wt (poids)
 double dw = (wMax-wMin)/nWbins;
-if (dw < 1.e-19) dw = 1.e19;
+if (dw < 1.e-19) dw = 1.e-19;
+//  Pour tracer des markers avec couleur en fonction de Wt (poids)
+PIColorMap * cmap = NULL;
+double dwc = 1.;
+double nwc = 1.;
+bool revcmap;
+CMapId mcmapid = GetGraphicAtt().GetColMapId(revcmap);
+if( colorScale && (wK >= 0) && (mcmapid != CMAP_OTHER) ) {
+  cmap = new PIColorMap(mcmapid);
+  cmap->ReverseColorIndex(revcmap);
+  nwc = cmap->NCol();
+  dwc = (wMax-wMin)/nwc;
+}
+
 int msz,sz;
 
@@ -207 +221 @@
   yp = mNT->GetCell(i, yK);
   zp = mNT->GetCell(i, zK);
+
+// Taille - couleur de marker en fonction du poids
+  if (wK >= 0) wp = mNT->GetCell(i, wK);
+  if (mrkSzScale && (wK >= 0)) {   // Changement de taille
+    sz = (int)((wp-wMin)/dw);
+    if (sz < 0) sz = 0;
+    if (sz > nWbins)  sz = nWbins;
+    sz += msz;
+    if (sz < 2)  g->SelMarker(sz, PI_DotMarker);
+    else g->SelMarker(sz, mrk);
+  }
+// Couleur du marker en fonction du poids
+  if( colorScale && (wK >= 0) && cmap ) {
+    int cid = (int)((wp-wMin)/dwc);
+    if (cid < 0) cid = 0;
+    if (cid >= nwc)  cid = nwc-1;
+    g->SelForeground(*cmap, cid);
+  }
+
   if ( (i > 0) && connectPts ) // On relie les points ...
     g3->DrawLine3D(xl, yl, zl, xp, yp, zp);
@@ -221 +254 @@
     zer = mNT->GetCell(i, zebK);
     g3->DrawLine3D(xp, yp, zp-zer, xp, yp, zp+zer);
-  }
-  if (wK >= 0) { // Taille de marker en fonction du poids
-    wp = mNT->GetCell(i, wK);
-    sz = (int)((wp-wMin)/dw);
-    if (sz < 0) sz = 0;
-    if (sz > nWbins)  sz = nWbins;
-    sz += msz;
-    if (sz < 2)  g->SelMarker(sz, PI_DotMarker);
-    else g->SelMarker(sz, mrk);
   }
   // Trace du marker
@@ -271 +295 @@
     if (opts == "connectpoints") ConnectPoints(true);
     else if (opts == "noconnectpoints") ConnectPoints(false);
+    else if (opts == "colorscale") UseColorScale(true);
+    else if (opts == "nocolorscale") UseColorScale(false);
+    else if (opts == "sizescale") UseSizeScale(true);
+    else if (opts == "nosizescale") UseSizeScale(false);
+    else if (opts.substr(0,10) == "sizescale=") { 
+      int nbn = atoi(opts.substr(10).c_str());
+      UseSizeScale(true, nbn);
+    }
     else {
       // Si option non decode
@@ -298 +330 @@
 info += "  connectpoints: The points are connected by a line \n";
 info += "  noconnectpoints (this is the default) \n";
+info += "  colorscale/nocolorscale (Use color scale for weight) \n";
+info += "  sizescale/sizescale=nbins/nosizescale (Use marker size for weight) \n";
 info += "  and usual color/line/marker/... attribute decoding  \n";
 return;