Changeset 1933 in Sophya for trunk/SophyaPI

Timestamp:

Mar 13, 2002, 11:28:09 PM (24 years ago)

Author:

cmv

Message:

pd de compilation cmv 13/3/2002

Location:

trunk/SophyaPI/PI/Tests

Files:

• midasitt.cc (modified) (6 diffs)
• pit1.cc (modified) (3 diffs)
• xp3.cc (modified) (3 diffs)

trunk/SophyaPI/PI/Tests/midasitt.cc

@@ -25 +25 @@
 
 #include "pisurfdr.h"
+#include "piyfxdrw.h"
 
 //  ---------- classe PITApp -----------------------
@@ -98 +99 @@
 PIColor col;  //  Les couleurs PI sont des entiers de 0 a 65535 (16 bits)
 for(int kc=0; kc<rgb_ncol; kc++) {
-  col.red = rgb_r[kc]*65535; 
-  col.green = rgb_g[kc]*65535; 
-  col.blue = rgb_b[kc]*65535; 
+  col.red   = (short unsigned)(rgb_r[kc]*65535); 
+  col.green = (short unsigned)(rgb_g[kc]*65535); 
+  col.blue  = (short unsigned)(rgb_b[kc]*65535); 
   midas_cmap.AllocColor(col, kc);
   }
@@ -186 +187 @@
 
       PIFuncDrawer* mfd = new PIFuncDrawer(fsinc);
-      mfd->SetColAtt(PI_Gold);
-      mfd->SetLineAtt(PI_NormalLine);
+      mfd->GetGraphicAtt().SetColAtt(PI_Gold);
+      mfd->GetGraphicAtt().SetLineAtt(PI_NormalLine);
       nbwin++; sprintf(strg,"2D Graphics (PI W %d)", nbwin);
       PIWindow* wp = new PIWindow(this, strg, PIWK_normal,  300, 300, 150, 150);
@@ -214 +215 @@
       PIYfXDrawer* mxyd = new   PIYfXDrawer( new P1DAdapter<float>(vpx, 30, true), 
                                             new P1DAdapter<float>(vpy, 30, true), true); 
-      mxyd->SetColAtt(PI_Red);
-      mxyd->SetMarkerAtt(7, PI_FTriangleMarker);
+      mxyd->GetGraphicAtt().SetColAtt(PI_Red);
+      mxyd->GetGraphicAtt().SetMarkerAtt(7, PI_FTriangleMarker);
 
       nbwin++; sprintf(strg,"2D Graphics (PI W %d)", nbwin);
@@ -241 +242 @@
                                              new P1DAdapter<float>(vpy, 30, true), true); 
 
-      mxyd->SetColAtt(PI_Magenta);
-      mxyd->SetMarkerAtt(7, PI_FBoxMarker);
+      mxyd->GetGraphicAtt().SetColAtt(PI_Magenta);
+      mxyd->GetGraphicAtt().SetMarkerAtt(7, PI_FBoxMarker);
 
       PIFuncDrawer* mfd = new PIFuncDrawer(fsinc);
-      mfd->SetColAtt(PI_Blue);
-      mfd->SetLineAtt(PI_NormalLine);
+      mfd->GetGraphicAtt().SetColAtt(PI_Blue);
+      mfd->GetGraphicAtt().SetLineAtt(PI_NormalLine);
 
       nbwin++; sprintf(strg,"2D Graphics (PI W %d)", nbwin);
@@ -404 +405 @@
       PIWindow* awp = new PIWindow(this, strg, PIWK_normal, 500, 500, 200, 200);
       PISurfaceDrawer* sd = new PISurfaceDrawer(new P2DAdapter<float>(tf, 50, 50, true), true, true, true);
-      if (fgswcol%3 == 0) sd->SetColMapId(CMAP_COLRJ32);
-      else if (fgswcol%3 == 1) sd->SetColMapId(CMAP_COLBR32);
-      else sd->SetColMapId(CMAP_COLRV32);
+      if (fgswcol%3 == 0) sd->GetGraphicAtt().SetColMapId(CMAP_COLRJ32);
+      else if (fgswcol%3 == 1) sd->GetGraphicAtt().SetColMapId(CMAP_COLBR32);
+      else sd->GetGraphicAtt().SetColMapId(CMAP_COLRV32);
       fgswcol++;
       PIDraw3DWdg* drw3 = new PIDraw3DWdg(awp, "ex3ddrw", 600, 600, 0, 0);

trunk/SophyaPI/PI/Tests/pit1.cc

@@ -15 +15 @@
 #include "parradapter.h"
 
+#include "piyfxdrw.h"
 
 /*  Exemple d'utilisation PIBaseWdg - Creation d'une nouvelle composante graphique  */
@@ -261 +262 @@
 // Creation et ajout d'un drawer de fonctions
 PIFuncDrawer* mfd = new PIFuncDrawer(fpol);
-mfd->SetColAtt(PI_Blue);
-mfd->SetLineAtt(PI_NormalLine);
+mfd->GetGraphicAtt().SetColAtt(PI_Blue);
+mfd->GetGraphicAtt().SetLineAtt(PI_NormalLine);
 AddScDrawer(mfd,true);
 
@@ -268 +269 @@
 PIYfXDrawer* mxyd = new PIYfXDrawer(new P1DAdapter<float>(xpts, 10, false), 
                                     new P1DAdapter<float>(ypts, 10, false), true);
-mxyd->SetColAtt(PI_Magenta);
-mxyd->SetMarkerAtt(7, PI_FBoxMarker);
+mxyd->GetGraphicAtt().SetColAtt(PI_Magenta);
+mxyd->GetGraphicAtt().SetMarkerAtt(7, PI_FBoxMarker);
 AddScDrawer(mxyd, true);
 
 // Ajout de texte
-BaseDrawer()->SetFontAtt(PI_NormalSizeFont, PI_BoldFont);
+BaseDrawer()->GetGraphicAtt().SetFontAtt(PI_NormalSizeFont, PI_BoldFont);
 BaseDrawer()->ElAddText(-2.8, 12., "---- ScSample ----", PI_Red);
 BaseDrawer()->ElAddText(-2.8, 10.,  "f(x)=0.3*x^3-x^2+7.", PI_Red);

trunk/SophyaPI/PI/Tests/xp3.cc

@@ -24 +24 @@
 
 #include "pisurfdr.h"
+#include "piyfxdrw.h"
 
 
@@ -144 +145 @@
                                   new P1DAdapter<float>(vpy, 30, true), true); 
     // Changing graphic attributes for the drawer
-    mxyd->SetColAtt(PI_Magenta);
-    mxyd->SetMarkerAtt(7, PI_FBoxMarker);
+    mxyd->GetGraphicAtt().SetColAtt(PI_Magenta);
+    mxyd->GetGraphicAtt().SetMarkerAtt(7, PI_FBoxMarker);
 
     // Using PIFuncDrawer and changing its attributes
     PIFuncDrawer* mfd = new PIFuncDrawer(fsinc);
-    mfd->SetColAtt(PI_Blue);
-    mfd->SetLineAtt(PI_NormalLine);
+    mfd->GetGraphicAtt().SetColAtt(PI_Blue);
+    mfd->GetGraphicAtt().SetLineAtt(PI_NormalLine);
 
     nbwin++; sprintf(strg,"2D Graphics (PI W %d)", nbwin);
@@ -178 +179 @@
                   new P2DAdapter<float>(tf, 50, 50, true), true, true, true);
     // Selecting color map
-    if (fgswcol%3 == 0) sd->SetColMapId(CMAP_COLRJ32);
-    else if (fgswcol%3 == 1) sd->SetColMapId(CMAP_COLBR32);
-    else sd->SetColMapId(CMAP_GREY32);
+    if (fgswcol%3 == 0) sd->GetGraphicAtt().SetColMapId(CMAP_COLRJ32);
+    else if (fgswcol%3 == 1) sd->GetGraphicAtt().SetColMapId(CMAP_COLBR32);
+    else sd->GetGraphicAtt().SetColMapId(CMAP_GREY32);
     fgswcol++;
     // Creating a 3D Widget (managing 3D-Drawers, rotation , ... )