Changeset 2547 in Sophya for trunk/SophyaPI/PIext

Timestamp:

Jun 2, 2004, 3:23:24 PM (21 years ago)

Author:

ansari

Message:

Suite (et presque fin) adaptation/codage options auto/rescaling ds PINTup3D - Reza 2 Juin 2004

File:

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

trunk/SophyaPI/PIext/pintup3d.cc

@@ -252 +252 @@
 
   if ( (i > 0) && connectPts ) // On relie les points ...
-    g3->DrawLine3D(xl*mScx, yl*mScy, zl*mScz, xp*mScx, yp*mScy, zp*mScz);
+    g3->DrawLine3D(ScaleX(xl), ScaleY(yl), ScaleZ(zl), ScaleX(xp), ScaleY(yp), ScaleZ(zp));
   nok++;
   if ( xebK >= 0 ) {
     xer = mNT->GetCell(i, xebK);
-    g3->DrawLine3D((xp-xer)*mScx, yp*mScy, zp*mScz, (xp+xer)*mScx, yp*mScy, zp*mScz);
+    g3->DrawLine3D(ScaleX(xp-xer), ScaleY(yp), ScaleZ(zp), ScaleX(xp+xer), ScaleY(yp), ScaleZ(zp) );
   }
   if ( yebK >= 0 ) {
     yer = mNT->GetCell(i, yebK);
-    g3->DrawLine3D(xp*mScx, (yp-yer)*mScy, zp*mScz, xp*mScx, (yp+yer)*mScy, zp*mScz);
+    g3->DrawLine3D(ScaleX(xp), ScaleY(yp-yer), ScaleZ(zp), ScaleX(xp), ScaleY(yp+yer), ScaleZ(zp) );
   }
   if ( zebK >= 0 ) {
     zer = mNT->GetCell(i, zebK);
-    g3->DrawLine3D(xp*mScx, yp*mScy, (zp-zer)*mScz, xp*mScx, yp*mScy, (zp+zer)*mScz);
+    g3->DrawLine3D(ScaleX(xp), ScaleY(yp), ScaleZ(zp-zer), ScaleX(xp), ScaleY(yp), ScaleZ(zp+zer));
   }
   // Trace du marker
   if ((wK >= 0)||(lK < 0)||(mmrk != PI_NotDefMarker))  
-    g3->DrawMarker3D(xp*mScx, yp*mScy, zp*mScz); 
+    g3->DrawMarker3D(ScaleX(xp), ScaleY(yp), ScaleZ(zp)); 
   // Trace eventuel du label
-  if (lK >= 0) g3->DrawString3D(xp*mScx, yp*mScy, zp*mScz, 
+  if (lK >= 0) g3->DrawString3D(ScaleX(xp), ScaleY(yp), ScaleZ(zp), 
                                 mNT->GetCelltoString(i, lK).c_str());
 }
@@ -295 +295 @@
   // on herite. (Pas obligatoire) on decode donc ici les attributs de
   // couleur, fontes ...
-  int ndec1 = PIDrawer::DecodeOptionString(opt, rmdecopt);
+  int ndec1 = PIDrawer3D::DecodeOptionString(opt, rmdecopt);
   if(optsz1-ndec1<1) return(ndec1);  // si tout a ete decode
 
@@ -313 +313 @@
       UseSizeScale(true, nbn);
     }
-    else if (opts == "rescalexy") aScxy = true;
-    else if (opts == "norescalexy") aScxy = false;
-    else if (opts == "rescalez") aScz = true;
-    else if (opts == "norescalez") aScz = false;
     else {
       // Si option non decode
@@ -332 +328 @@
 int PINTuple3D::OptionToString(vector<string> & opt) const
 {
- PIDrawer::OptionToString(opt);
+ PIDrawer3D::OptionToString(opt);
 
  if(connectPts) opt.push_back("connectpoints");
@@ -346 +342 @@
  } else opt.push_back("nosizescale");
 
- if(aScxy) opt.push_back("rescalexy");
-   else opt.push_back("norescalexy");
-
- if(aScz) opt.push_back("rescalez");
-   else opt.push_back("norescalez");
-
  return 1;
 }
@@ -369 +359 @@
 info += "  colorscale/nocolorscale (Use color scale for weight) \n";
 info += "  sizescale/sizescale=nbins/nosizescale (Use marker size for weight) \n";
-info += "  rescalexy / norescalexy   rescalez / norescalez \n";
-info += "  and usual color/line/marker/... attribute decoding  \n";
 // On recupere ensuite la chaine info de la classe de base
-PIDrawer::GetOptionsHelpInfo(info);
+PIDrawer3D::GetOptionsHelpInfo(info);
 return;
 }