Changeset 403 in Sophya

Timestamp:

Sep 10, 1999, 11:19:54 AM (26 years ago)

Author:

ercodmgr

Message:

Ameliorations mineures du menu d'options PIConsole - Reza 10/09/99

Location:

trunk/SophyaPI/PI

Files:

• Tests/pit1.cc (modified) (5 diffs)
• picons.cc (modified) (2 diffs)

trunk/SophyaPI/PI/Tests/pit1.cc

@@ -83 +83 @@
 {
 PIFontAtt att[3] = { PI_RomanFont, PI_BoldFont, PI_ItalicFont};
-PIMarker  pmk[9] = { PI_DotMarker , PI_PlusMarker, PI_CrossMarker,  
+PIMarker  pmk[11] = { PI_DotMarker , PI_PlusMarker, PI_CrossMarker,  
                  PI_CircleMarker, PI_FCircleMarker,
                  PI_BoxMarker, PI_FBoxMarker,
-                 PI_TriangleMarker, PI_FTriangleMarker };
+                 PI_TriangleMarker, PI_FTriangleMarker,
+                 PI_StarMarker, PI_FStarMarker };
 EraseWindow();
 g->SelFont(PI_NormalSizeFont, att[mfnt]);
@@ -113 +114 @@
 PIFont f2(14,PI_CourierFont,PI_BoldFont);
 g->SelFont(f2);
-g->DrawString(20, 150, "Courier-Font");
+g->DrawString(20, 150, "Courier-Font-Bold");
 PIFont f3(14,PI_TimesFont,PI_BoldFont);
 g->SelFont(f3);
@@ -119 +120 @@
 PIFont f4(14,PI_HelveticaFont,PI_BoldFont);
 g->SelFont(f4);
-g->DrawString(20, 190, "Helvetica-Font");
-PIFont f5(14,PI_SymbolFont,PI_BoldFont);
+g->DrawString(20, 190, "Helvetica-Font-Bold");
+PIFont f5(14,PI_SymbolFont);
 g->SelFont(f5);
 g->DrawString(20, 210, "Symbol-Font");
@@ -141 +142 @@
 
 
-PIGrCoord x[5] = { 20, 35, 50, 65, 80 };
-PIGrCoord y[5] = { 150, 150, 150, 150, 150 };
+PIGrCoord x[5] = { 150, 165, 180, 195, 210 };
+PIGrCoord y[5] = { 50, 50, 50, 50, 50 };
 
 g->SelForeground(PI_Black);
@@ -174 +175 @@
 {
 if (++mfnt > 2)  mfnt = 0;
-if (++mmrk > 8)  mmrk = 0; 
+if (++mmrk > 10)  mmrk = 0; 
 return;
 }

trunk/SophyaPI/PI/picons.cc

@@ -24 +24 @@
   opmc->AppendItem("NormalFont", 3102);
   opmc->AppendItem("LargeFont", 3103);
-  opmc->AppendItem("25L x 80C", 3301);
-  opmc->AppendItem("25L x 132C", 3302);
-  opmc->AppendItem("5L x 80C", 3303);
+  opmc->AppendItem("25L x 132C", 3301);
+  opmc->AppendItem("20L x 80C", 3302);
+  opmc->AppendItem("10L x 80C", 3303);
+  opmc->AppendItem("5L x 60C", 3304);
   opmc->AppendItem("Bkg White", 3201);
   opmc->AppendItem("Bkg Black", 3202);
+  opmc->AppendItem("Black/Yellow", 3203);
   
   opmc->SetMsgParent((PIMsgHandler*)par);
@@ -854 +856 @@
       break;
     case 3301 :
-      AutoSize(25, 80);
+      AutoSize(25, 132);
       break;
     case 3302 :
-      AutoSize(25, 132);
+      AutoSize(20, 80);
       break;
     case 3303 :
-      AutoSize(5, 80);
+      AutoSize(10, 80);
+      break;      
+    case 3304 :
+      AutoSize(5, 60);
       break;      
     default :