Changeset 316 in Sophya for trunk/SophyaPI/PI/pigraphgen.h

Timestamp:

Jun 15, 1999, 3:56:51 PM (26 years ago)

Author:

ercodmgr

Message:

Introduction PIFont - Reza 15/06/99

File:

• trunk/SophyaPI/PI/pigraphgen.h (modified) (7 diffs)

trunk/SophyaPI/PI/pigraphgen.h

@@ -11 +11 @@
 #include PIWDG_H
 #include PICMAP_H
+#include PIFONT_H
 
 
@@ -22 +23 @@
                  PI_ColorAllBits0 = 16, PI_ColorAllBits1 = 17 };
 
-enum PIFontSize { PI_NotDefFontSize = -1, 
-                  PI_SmallSizeFont = 1, PI_NormalSizeFont = 2, 
-                  PI_BigSizeFont = 3, PI_HugeSizeFont = 4 };
-
-enum PIFontAtt { PI_NotDefFontAtt = -1,
-                 PI_RomanFont = 1, PI_BoldFont = 2, PI_ItalicFont = 4 };
 
 enum PILineAtt { PI_NotDefLineAtt = -1,
@@ -112 +107 @@
   virtual void       SelBackground(PIColorMap& cmap, int cid)                  = 0;
   virtual void       SelGOMode(PIGOMode mod=PI_GOCopy)                         = 0;
-  virtual void       SelFont(PIFontSize sz=PI_NormalSizeFont, 
-                             PIFontAtt att=PI_RomanFont)                       = 0;
-  virtual void       SelFontSzPt(int npt=12, PIFontAtt att=PI_RomanFont)       = 0; 
   virtual void       SelLine(PILineAtt att=PI_NormalLine)                      = 0;
   virtual void       SelMarker(int msz=3, PIMarker mrk=PI_DotMarker)           = 0;
+// Modifications de fonte
+  virtual void       SelFont(PIFont & fnt)                                     = 0; 
+  virtual void       SelFont(PIFontSize sz=PI_NormalSizeFont, 
+                             PIFontAtt att=PI_RomanFont)                       = 0;
+  virtual void       SelFontSzPt(int npt=12, PIFontAtt att=PI_RomanFont)       = 0; 
 
 // Selection de zone de trace (clip)
@@ -126 +123 @@
   virtual PIColors   GetBackground()    = 0;
   virtual PIGOMode   GetGOMode()        = 0;
-  virtual PIFontAtt  GetFontAtt()       = 0;
-  virtual int        GetFontSize()      = 0;
   virtual PILineAtt  GetLineAtt()       = 0;
   virtual PIMarker   GetMarker()        = 0;
   virtual int        GetMarkerSize()    = 0;
 
-  virtual int        GetFontHeight(int& asc, int& desc)      = 0;
-  virtual PIGrCoord  CalcStringWidth(char const* s)          = 0;
+// Acces a la fonte et ses attributs
+  inline  PIFont     GetFont() { return (myFont) ; }
+  virtual PIGrCoord  GetFontHeight(PIGrCoord& asc, PIGrCoord& desc);
+  virtual PIGrCoord  CalcStringWidth(char const* s);
 
 // Sauvegarde des attributs graphiques 
@@ -144 +141 @@
   PIScreenBuffer* myGrb;
 
+  PIFont myFont;
   PIColors  sFCol, sBCol;
   PIGOMode sGOm;
-  PIFontAtt sFAtt;
+  PIFont sFont;
   PILineAtt sLAtt;
   int sFSize;
@@ -152 +150 @@
   int sMrkSz;
 };
-
-#endif
 
 typedef PIGraphicGen PIGraphic;
@@ -162 +158 @@
 //     PIGraphicPS
 //     PIGraphicUC
+
+#endif      // PIGRAPHGEN_H_SEEN