Changeset 201 in Sophya for trunk/SophyaPI

Timestamp:

Feb 26, 1999, 11:19:46 AM (27 years ago)

Author:

ercodmgr

Message:

Modifs-intermediaire trace axes et grid Reza 26/02/99

Location:

trunk/SophyaPI/PI

Files:

• pidrawer.cc (modified) (1 diff)
• pidrawer.h (modified) (1 diff)
• pidrwtools.cc (modified) (2 diffs)

trunk/SophyaPI/PI/pidrawer.cc

@@ -226 +226 @@
 }
 
-static void BestTicks(float rmin,float rmax,int nticks,float& majt)
+/* --Methode-Static-- */
+void PIDrawer::BestTicks(float rmin,float rmax,int nticks,float& majt)
 {
 double d = rmax - rmin;

trunk/SophyaPI/PI/pidrawer.h

@@ -64 +64 @@
 
   void               SelGraAtt(PIGraphicUC* g);
+
+//  --- Methode static ----
+//  Calcul des Distances optimales des subdivisions 
+  static void        BestTicks(float rmin,float rmax,int nticks,float& majt);
 
 //  Les objets/methodes suivants devraient etre protected     

trunk/SophyaPI/PI/pidrwtools.cc

@@ -253 +253 @@
 }
 
+//  Declaration des differents attributs graphiques 
+static PIColors cols[17] = { PI_NotDefColor, 
+                     PI_Black, PI_White, PI_Grey, 
+                     PI_Red, PI_Blue, PI_Green, 
+                     PI_Yellow, PI_Magenta, 
+                     PI_Cyan , PI_Turquoise, PI_NavyBlue, 
+                     PI_Orange, PI_SiennaRed, PI_Purple, 
+                     PI_LimeGreen, PI_Gold };
+
+static PIMarker mrk[12] = { PI_NotDefMarker, PI_DotMarker, 
+                            PI_PlusMarker, PI_CrossMarker,
+                            PI_CircleMarker, PI_FCircleMarker,
+                            PI_BoxMarker, PI_FBoxMarker,
+                            PI_TriangleMarker, PI_FTriangleMarker,
+                            PI_StarMarker, PI_FStarMarker };
+static PILineAtt line[10] = { PI_NotDefLineAtt, PI_ThinLine, PI_NormalLine, PI_ThickLine, 
+                              PI_ThinDashedLine, PI_DashedLine, PI_ThickDashedLine, 
+                              PI_ThinDottedLine, PI_DottedLine, PI_ThickDottedLine };
+
+static PIFontAtt fntatt[4] = { PI_NotDefFontAtt, PI_RomanFont, PI_BoldFont, PI_ItalicFont };
+static PIFontSize fntsz[5] = { PI_NotDefFontSize, PI_NormalSizeFont, PI_SmallSizeFont, 
+                               PI_BigSizeFont, PI_HugeSizeFont };
+static CMapId cmap[11] = {  CMAP_OTHER, CMAP_GREY32, CMAP_GREYINV32,
+                            CMAP_COLRJ32, CMAP_COLBR32, CMAP_COLRV32,  
+                            CMAP_GREY128, CMAP_GREYINV128, CMAP_COLRJ128, CMAP_COLBR128, CMAP_COL16 };
+
 /* --Methode-- */
 void PIDrwTools::Show()
@@ -294 +320 @@
 void PIDrwTools::Process(PIMessage msg, PIMsgHandler* /*sender*/, void* /*data*/)
 {
-PIColors cols[17] = { PI_NotDefColor, 
-                     PI_Black, PI_White, PI_Grey, 
-                     PI_Red, PI_Blue, PI_Green, 
-                     PI_Yellow, PI_Magenta, 
-                     PI_Cyan , PI_Turquoise, PI_NavyBlue, 
-                     PI_Orange, PI_SiennaRed, PI_Purple, 
-                     PI_LimeGreen, PI_Gold };
-
-PIMarker mrk[12] = { PI_NotDefMarker, PI_DotMarker, 
-                     PI_PlusMarker, PI_CrossMarker,
-                     PI_CircleMarker, PI_FCircleMarker,
-                     PI_BoxMarker, PI_FBoxMarker,
-                     PI_TriangleMarker, PI_FTriangleMarker,
-                     PI_StarMarker, PI_FStarMarker };
-PILineAtt line[10] = { PI_NotDefLineAtt, PI_ThinLine, PI_NormalLine, PI_ThickLine, 
-                                         PI_ThinDashedLine, PI_DashedLine, PI_ThickDashedLine, 
-                                         PI_ThinDottedLine, PI_DottedLine, PI_ThickDottedLine };
-
-PIFontAtt fntatt[4] = { PI_NotDefFontAtt, PI_RomanFont, PI_BoldFont, PI_ItalicFont };
-PIFontSize fntsz[5] = { PI_NotDefFontSize, PI_NormalSizeFont, PI_SmallSizeFont, 
-                        PI_BigSizeFont, PI_HugeSizeFont };
-CMapId cmap[11] = {  CMAP_OTHER, CMAP_GREY32, CMAP_GREYINV32,
-                     CMAP_COLRJ32, CMAP_COLBR32, CMAP_COLRV32,  
-                     CMAP_GREY128, CMAP_GREYINV128, CMAP_COLRJ128, CMAP_COLBR128, CMAP_COL16 };
 
 msg = UserMsg(msg);