Changeset 2302 in Sophya

Timestamp:

Jan 2, 2003, 5:28:09 PM (23 years ago)

Author:

ansari

Message:

MAJ/ compil pour V3.90 , Reza 2/1/2003

Location:

trunk/SophyaPI/PI/Tests

Files:

• midasitt.cc (modified) (7 diffs)
• pit1.cc (modified) (1 diff)
• pitgr.cc (modified) (8 diffs)
• xp3.cc (modified) (2 diffs)

trunk/SophyaPI/PI/Tests/midasitt.cc

@@ -25 +25 @@
 
 #include "pisurfdr.h"
+#include "pi3dwdg.h"
 #include "piyfxdrw.h"
 
@@ -196 +197 @@
       scd->SetLimits(0.1, 30., -1., 1.);
       scd->AddScDrawer(mfd,true);
-      scd->BaseDrawer()->ElAddText(2, 0.8, "Y = Sin(x)/x", PI_Red);
-      scd->SetTitles(" --- PIFuncDrawer (Sin(x)/x) --- ");
+      PIGraphicAtt gatt;
+      gatt.SetColAtt(PI_Red);
+      scd->BaseDrawer()->ElDrwMgr().ElAddText(2., 0.8, "Y = Sin(x)/x", gatt, 0);
+
+      scd->SetTitles(" --- PIFuncDrawer (Sin(x)/x) --- ","");
       wp->Show();    // On affiche  la fenetre 
       SetReady();    //  souris->pointeur , on n'est plus occupe
@@ -223 +227 @@
       scd->SetBinding(PIBK_fixed,PIBK_fixed,PIBK_fixed, PIBK_fixed);
       scd->AddScDrawer(mxyd,true);
-      scd->SetTitles(" --- PIYfXDrawer (3*cons(x)+2*sin(x)) --- ");
+      scd->SetTitles(" --- PIYfXDrawer (3*cons(x)+2*sin(x)) --- ","");
       awp->SetAutoDelChilds(true);
       awp->Show();
@@ -255 +259 @@
       scd->AddScDrawer(mxyd,true);
       scd->AddScDrawer(mfd,true);
-      scd->SetTitles(" --- PIYfXDrawer + PIFuncDrawer --- ");
+      scd->SetTitles(" --- PIYfXDrawer + PIFuncDrawer --- ","");
       awp->SetAutoDelChilds(true);
       awp->Show();
@@ -372 +376 @@
       drw3->SetBinding(PIBK_fixed , PIBK_fixed , PIBK_fixed, PIBK_fixed);
       drw3->AddDrawer3D(sd, false);
-      drw3->SetTitles(" --- PISurfaceDrawer (80x60) --- ");
+      drw3->SetTitles(" --- PISurfaceDrawer (80x60) --- ","");
       awp->SetAutoDelChilds(true);
       awp->Show();
@@ -412 +416 @@
       drw3->SetBinding(PIBK_fixed , PIBK_fixed , PIBK_fixed, PIBK_fixed);
       drw3->AddDrawer3D(sd, false);
-      drw3->SetTitles(" --- PISurfaceDrawer (50x50) --- ");
+      drw3->SetTitles(" --- PISurfaceDrawer (50x50) --- ","");
       awp->SetAutoDelChilds(true);
       awp->Show();
@@ -440 +444 @@
 if ( (narg < 2) || (strcmp(arg[1],"-h") == 0) ) {
   printf("midasitt : MIDAS ITT color table test  \n");
-  printf("  Usage : midasitt [Xt options] \n");
+  printf("  Usage : midasitt MIDAS_ITT_File [Xt options] \n");
   return(0);
   }

trunk/SophyaPI/PI/Tests/pit1.cc

@@ -275 +275 @@
 // Ajout de texte
 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);
+PIGraphicAtt gatt;
+gatt.SetColAtt(PI_Red);
+BaseDrawer()->ElDrwMgr().ElAddText(-2.8, 12., "---- ScSample ----", gatt, 0);
+BaseDrawer()->ElDrwMgr().ElAddText(-2.8, 10.,  "f(x)=0.3*x^3-x^2+7.", gatt, 0);
 
 SetAxesFlags(kAxesDflt);

trunk/SophyaPI/PI/Tests/pitgr.cc

@@ -24 +24 @@
 #include "piimgtools.h"
 #include "pidrwtools.h"
+#include "piaxestools.h"
 
 #include "pisurfdr.h"
@@ -72 +73 @@
 m[2]->AppendItem("ShowImageTools", 10301);
 m[2]->AppendItem("ShowDrawerTools", 10302);
+m[2]->AppendItem("ShowAxesTools", 10303);
 m[2]->AppendItem("PostScript (EPS)", 10305);
 AppendMenu(m[2]);
@@ -160 +162 @@
       PIDrwTools::ShowPIDrwTools();
       break;
+    case 10303 :
+      PIAxesTools::ShowPIAxesTools();
+      break;
     case 10305 :
       if(mCurW) {
@@ -189 +194 @@
       scd->SetLimits(0.1, 30., -1., 1.);
       scd->AddScDrawer(mfd,true);
-      scd->BaseDrawer()->ElAddText(2, 0.8, "Y = Sin(x)/x", PI_Red);
-      scd->SetTitles(" --- PIFuncDrawer (Sin(x)/x) --- ");
+      PIGraphicAtt gatt;
+      gatt.SetColAtt(PI_Red);
+      scd->BaseDrawer()->ElDrwMgr().ElAddText(2., 0.8, "Y = Sin(x)/x", gatt, 0);
+      scd->SetTitles(" --- PIFuncDrawer (Sin(x)/x) --- ", "");
       wp->Show();    // On affiche  la fenetre 
       SetReady();    //  souris->pointeur , on n'est plus occupe
@@ -216 +223 @@
       scd->SetBinding(PIBK_fixed,PIBK_fixed,PIBK_fixed, PIBK_fixed);
       scd->AddScDrawer(mxyd,true);
-      scd->SetTitles(" --- PIYfXDrawer (3*cons(x)+2*sin(x)) --- ");
+      scd->SetTitles(" --- PIYfXDrawer (3*cons(x)+2*sin(x)) --- ", "");
       awp->SetAutoDelChilds(true);
       awp->Show();
@@ -248 +255 @@
       scd->AddScDrawer(mxyd,true);
       scd->AddScDrawer(mfd,true);
-      scd->SetTitles(" --- PIYfXDrawer + PIFuncDrawer --- ");
+      scd->SetTitles(" --- PIYfXDrawer + PIFuncDrawer --- ", "");
       awp->SetAutoDelChilds(true);
       awp->Show();
@@ -330 +337 @@
       drw3->SetBinding(PIBK_fixed , PIBK_fixed , PIBK_fixed, PIBK_fixed);
       drw3->AddDrawer3D(sd, false);
-      drw3->SetTitles(" --- PISurfaceDrawer (80x60) --- ");
+      drw3->SetTitles(" --- PISurfaceDrawer (80x60) --- ", "");
       awp->SetAutoDelChilds(true);
       awp->Show();
@@ -370 +377 @@
       drw3->SetBinding(PIBK_fixed , PIBK_fixed , PIBK_fixed, PIBK_fixed);
       drw3->AddDrawer3D(sd, false);
-      drw3->SetTitles(" --- PISurfaceDrawer (50x50) --- ");
+      drw3->SetTitles(" --- PISurfaceDrawer (50x50) --- ", "");
       awp->SetAutoDelChilds(true);
       awp->Show();

trunk/SophyaPI/PI/Tests/xp3.cc

@@ -164 +164 @@
     scd->AddScDrawer(mxyd,true);
     scd->AddScDrawer(mfd,true);
-    scd->SetTitles(" --- PIYfXDrawer + PIFuncDrawer --- ");
+    scd->SetTitles(" --- PIYfXDrawer + PIFuncDrawer --- ", "");
     awp->SetAutoDelChilds(true);
     awp->Show();
@@ -189 +189 @@
     // Adding the drawer
     drw3->AddDrawer3D(sd, false);
-    drw3->SetTitles(" --- PISurfaceDrawer (50x50) --- ");
+    drw3->SetTitles(" --- PISurfaceDrawer (50x50) --- ", "");
     // Showing the window
     awp->SetAutoDelChilds(true);