Changeset 1904 in Sophya for trunk/SophyaPI

Timestamp:

Feb 18, 2002, 11:37:22 PM (24 years ago)

Author:

ansari

Message:

Introduction de la classe PIGraphicAtt - Separation en fichiers separes
des classes PIElDrawer, et PIYfXDrawer - Ajout de methodes GetFontSz
et GetFontSzPt a la classe PIFont - Extension de l'enum PIFontSize.

Reza - 18/02/2002

Location:

trunk/SophyaPI/PI

Files:

• Makefile (modified) (12 diffs)
• objlist.list (modified) (3 diffs)
• pi3ddrw.cc (modified) (1 diff)
• pi3ddrw.h (modified) (1 diff)
• picons.cc (modified) (1 diff)
• pidrawer.cc (modified) (8 diffs)
• pidrawer.h (modified) (7 diffs)
• pidrwtools.cc (modified) (7 diffs)
• pieldrw.cc (added)
• pieldrw.h (added)
• pifontgen.cc (modified) (2 diffs)
• pifontgen.h (modified) (2 diffs)
• pifontx.cc (modified) (9 diffs)
• pifontx.h (modified) (1 diff)
• pigraphuc.cc (modified) (2 diffs)
• pigraphuc.h (modified) (1 diff)
• pigratt.cc (added)
• pigratt.h (added)
• piimage.cc (modified) (5 diffs)
• piimage.h (modified) (1 diff)
• piscdrawwdg.cc (modified) (2 diffs)
• piscdrawwdg.h (modified) (3 diffs)
• pisurfdr.cc (modified) (3 diffs)
• piyfxdrw.cc (added)
• piyfxdrw.h (added)
• psfile.cc (modified) (2 diffs)

trunk/SophyaPI/PI/Makefile

@@ -4 +4 @@
  
 all: $(LIB)libPI.a
-$(LIB)libPI.a : $(OBJ)lut.o $(OBJ)parradapter.o $(OBJ)pi3ddrw.o $(OBJ)piapplgen.o $(OBJ)piapplx.o $(OBJ)piaxestools.o $(OBJ)pibwdggen.o $(OBJ)pibwdgx.o $(OBJ)picmap.o $(OBJ)picmapgen.o $(OBJ)picmapview.o $(OBJ)picmapx.o $(OBJ)picons.o $(OBJ)picontainergen.o $(OBJ)picontainerx.o $(OBJ)pidrawer.o $(OBJ)pidrawwin.o $(OBJ)pidrwtools.o $(OBJ)pievthandler.o $(OBJ)pifilechogen.o $(OBJ)pifilechox.o $(OBJ)pifontgen.o $(OBJ)pifontx.o $(OBJ)pigraph3d.o $(OBJ)pigraphgen.o $(OBJ)pigraphps.o $(OBJ)pigraphuc.o $(OBJ)pigraphx.o $(OBJ)piimage.o $(OBJ)piimgtools.o $(OBJ)pilistgen.o $(OBJ)pilistx.o $(OBJ)pimenubargen.o $(OBJ)pimenubarx.o $(OBJ)pimenugen.o $(OBJ)pimenux.o $(OBJ)pimsghandler.o $(OBJ)pioptmenugen.o $(OBJ)pioptmenux.o $(OBJ)piperiodx.o $(OBJ)pipixmapgen.o $(OBJ)pipixmapx.o $(OBJ)piscdrawwdg.o $(OBJ)pistdwdggen.o $(OBJ)pistdwdgx.o $(OBJ)pistzwin.o $(OBJ)pisurfdr.o $(OBJ)pitherm.o $(OBJ)piwdggen.o $(OBJ)piwdgx.o $(OBJ)piwindowgen.o $(OBJ)piwindowx.o $(OBJ)pixtbase.o $(OBJ)psfile.o
+$(LIB)libPI.a : $(OBJ)lut.o $(OBJ)parradapter.o $(OBJ)pi3ddrw.o $(OBJ)piapplgen.o $(OBJ)piapplx.o $(OBJ)piaxestools.o $(OBJ)pibwdggen.o $(OBJ)pibwdgx.o $(OBJ)picmap.o $(OBJ)picmapgen.o $(OBJ)picmapview.o $(OBJ)picmapx.o $(OBJ)picons.o $(OBJ)picontainergen.o $(OBJ)picontainerx.o $(OBJ)pidrawer.o $(OBJ)pidrawwin.o $(OBJ)pidrwtools.o $(OBJ)pieldrw.o $(OBJ)pievthandler.o $(OBJ)pifilechogen.o $(OBJ)pifilechox.o $(OBJ)pifontgen.o $(OBJ)pifontx.o $(OBJ)pigraph3d.o $(OBJ)pigraphgen.o $(OBJ)pigraphps.o $(OBJ)pigraphuc.o $(OBJ)pigraphx.o $(OBJ)pigratt.o $(OBJ)piimage.o $(OBJ)piimgtools.o $(OBJ)pilistgen.o $(OBJ)pilistx.o $(OBJ)pimenubargen.o $(OBJ)pimenubarx.o $(OBJ)pimenugen.o $(OBJ)pimenux.o $(OBJ)pimsghandler.o $(OBJ)pioptmenugen.o $(OBJ)pioptmenux.o $(OBJ)piperiodx.o $(OBJ)pipixmapgen.o $(OBJ)pipixmapx.o $(OBJ)piscdrawwdg.o $(OBJ)pistdwdggen.o $(OBJ)pistdwdgx.o $(OBJ)pistzwin.o $(OBJ)pisurfdr.o $(OBJ)pitherm.o $(OBJ)piwdggen.o $(OBJ)piwdgx.o $(OBJ)piwindowgen.o $(OBJ)piwindowx.o $(OBJ)pixtbase.o $(OBJ)piyfxdrw.o $(OBJ)psfile.o
         $(AR) $(ARFLAGS)  $@ $($(ARARGS)) 
 ifeq ($(CXX),cxx)
@@ -11 +11 @@
  
 clean:
-        rm -f $(OBJ)lut.o $(OBJ)parradapter.o $(OBJ)pi3ddrw.o $(OBJ)piapplgen.o $(OBJ)piapplx.o $(OBJ)piaxestools.o $(OBJ)pibwdggen.o $(OBJ)pibwdgx.o $(OBJ)picmap.o $(OBJ)picmapgen.o $(OBJ)picmapview.o $(OBJ)picmapx.o $(OBJ)picons.o $(OBJ)picontainergen.o $(OBJ)picontainerx.o $(OBJ)pidrawer.o $(OBJ)pidrawwin.o $(OBJ)pidrwtools.o $(OBJ)pievthandler.o $(OBJ)pifilechogen.o $(OBJ)pifilechox.o $(OBJ)pifontgen.o $(OBJ)pifontx.o $(OBJ)pigraph3d.o $(OBJ)pigraphgen.o $(OBJ)pigraphps.o $(OBJ)pigraphuc.o $(OBJ)pigraphx.o $(OBJ)piimage.o $(OBJ)piimgtools.o $(OBJ)pilistgen.o $(OBJ)pilistx.o $(OBJ)pimenubargen.o $(OBJ)pimenubarx.o $(OBJ)pimenugen.o $(OBJ)pimenux.o $(OBJ)pimsghandler.o $(OBJ)pioptmenugen.o $(OBJ)pioptmenux.o $(OBJ)piperiodx.o $(OBJ)pipixmapgen.o $(OBJ)pipixmapx.o $(OBJ)piscdrawwdg.o $(OBJ)pistdwdggen.o $(OBJ)pistdwdgx.o $(OBJ)pistzwin.o $(OBJ)pisurfdr.o $(OBJ)pitherm.o $(OBJ)piwdggen.o $(OBJ)piwdgx.o $(OBJ)piwindowgen.o $(OBJ)piwindowx.o $(OBJ)pixtbase.o $(OBJ)psfile.o
+        rm -f $(OBJ)lut.o $(OBJ)parradapter.o $(OBJ)pi3ddrw.o $(OBJ)piapplgen.o $(OBJ)piapplx.o $(OBJ)piaxestools.o $(OBJ)pibwdggen.o $(OBJ)pibwdgx.o $(OBJ)picmap.o $(OBJ)picmapgen.o $(OBJ)picmapview.o $(OBJ)picmapx.o $(OBJ)picons.o $(OBJ)picontainergen.o $(OBJ)picontainerx.o $(OBJ)pidrawer.o $(OBJ)pidrawwin.o $(OBJ)pidrwtools.o $(OBJ)pieldrw.o $(OBJ)pievthandler.o $(OBJ)pifilechogen.o $(OBJ)pifilechox.o $(OBJ)pifontgen.o $(OBJ)pifontx.o $(OBJ)pigraph3d.o $(OBJ)pigraphgen.o $(OBJ)pigraphps.o $(OBJ)pigraphuc.o $(OBJ)pigraphx.o $(OBJ)pigratt.o $(OBJ)piimage.o $(OBJ)piimgtools.o $(OBJ)pilistgen.o $(OBJ)pilistx.o $(OBJ)pimenubargen.o $(OBJ)pimenubarx.o $(OBJ)pimenugen.o $(OBJ)pimenux.o $(OBJ)pimsghandler.o $(OBJ)pioptmenugen.o $(OBJ)pioptmenux.o $(OBJ)piperiodx.o $(OBJ)pipixmapgen.o $(OBJ)pipixmapx.o $(OBJ)piscdrawwdg.o $(OBJ)pistdwdggen.o $(OBJ)pistdwdgx.o $(OBJ)pistzwin.o $(OBJ)pisurfdr.o $(OBJ)pitherm.o $(OBJ)piwdggen.o $(OBJ)piwdgx.o $(OBJ)piwindowgen.o $(OBJ)piwindowx.o $(OBJ)pixtbase.o $(OBJ)piyfxdrw.o $(OBJ)psfile.o
 ifeq ($(CXX),cxx)
         cd $(REPM); rm -f *.o
@@ -23 +23 @@
  piwdgx.h piwdggen.h pimsghandler.h picolist.h picmap.h picmapx.h \
  picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigraphuc.h \
- pievthandler.h psfile.h pigraph3d.h pibwdgx.h pigraphps.h \
- pidrwtools.h pistdwdgx.h pistdwdggen.h pioptmenux.h pioptmenugen.h \
- pimenux.h pimenugen.h piwindowx.h piwindowgen.h picontainerx.h \
- picontainergen.h piapplx.h piapplgen.h pimenubarx.h pimenubargen.h \
- picons.h
+ pievthandler.h psfile.h pigratt.h pieldrw.h pigraph3d.h pibwdgx.h \
+ pigraphps.h pidrwtools.h pistdwdgx.h pistdwdggen.h pioptmenux.h \
+ pioptmenugen.h pimenux.h pimenugen.h piwindowx.h piwindowgen.h \
+ picontainerx.h picontainergen.h piapplx.h piapplgen.h pimenubarx.h \
+ pimenubargen.h picons.h
 $(OBJ)piapplgen.o: piapplgen.cc piapplgen.h pimsghandler.h \
  $(INC)machdefs.h pisysdep.h picontainerx.h \
@@ -49 +49 @@
  pimenubargen.h picons.h pibwdgx.h pibwdggen.h picmap.h picmapx.h \
  picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigraphuc.h \
- pievthandler.h psfile.h pigraphps.h piscdrawwdg.h pidrawer.h
+ pievthandler.h psfile.h pigraphps.h piscdrawwdg.h pidrawer.h \
+ pigratt.h pieldrw.h
 $(OBJ)pibwdggen.o: pibwdggen.cc pibwdggen.h pisysdep.h \
  $(INC)machdefs.h piwdgx.h piwdggen.h \
  pimsghandler.h picolist.h picmap.h picmapx.h picmapgen.h pigraphx.h \
  pigraphgen.h pifontx.h pifontgen.h pigraphuc.h pievthandler.h \
- psfile.h pidrawer.h pigraphps.h pidrwtools.h pistdwdgx.h \
+ psfile.h pidrawer.h pigratt.h pigraphps.h pidrwtools.h pistdwdgx.h \
  pistdwdggen.h pioptmenux.h pioptmenugen.h pimenux.h pimenugen.h \
  piwindowx.h piwindowgen.h picontainerx.h picontainergen.h piapplx.h \
@@ -90 +91 @@
  pidrawer.h pibwdggen.h pisysdep.h piwdgx.h piwdggen.h pimsghandler.h \
  picolist.h picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h \
- pifontx.h pifontgen.h pigraphuc.h pievthandler.h psfile.h \
+ pifontx.h pifontgen.h pigraphuc.h pievthandler.h psfile.h pigratt.h \
  pidrwtools.h pistdwdgx.h pistdwdggen.h pioptmenux.h pioptmenugen.h \
  pimenux.h pimenugen.h piwindowx.h piwindowgen.h picontainerx.h \
@@ -101 +102 @@
  picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigraphuc.h \
  pievthandler.h psfile.h pigraphps.h pistdwdgx.h pistdwdggen.h \
- pidrawer.h
+ pidrawer.h pigratt.h pieldrw.h
 $(OBJ)pidrwtools.o: pidrwtools.cc pidrwtools.h pisysdep.h \
  $(INC)machdefs.h pistdwdgx.h pistdwdggen.h \
@@ -110 +111 @@
  picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigraphuc.h \
  pievthandler.h psfile.h pigraphps.h piscdrawwdg.h pidrawer.h \
- pi3ddrw.h pigraph3d.h
+ pigratt.h pieldrw.h pi3ddrw.h pigraph3d.h
+$(OBJ)pieldrw.o: pieldrw.cc $(INC)machdefs.h \
+ pieldrw.h pidrawer.h pibwdggen.h pisysdep.h piwdgx.h piwdggen.h \
+ pimsghandler.h picolist.h picmap.h picmapx.h picmapgen.h pigraphx.h \
+ pigraphgen.h pifontx.h pifontgen.h pigraphuc.h pievthandler.h \
+ psfile.h pigratt.h
 $(OBJ)pievthandler.o: pievthandler.cc pievthandler.h pisysdep.h \
  $(INC)machdefs.h pimsghandler.h piwdgx.h \
@@ -153 +159 @@
  piwdggen.h pimsghandler.h picolist.h picmap.h picmapx.h picmapgen.h \
  pifontx.h pifontgen.h
+$(OBJ)pigratt.o: pigratt.cc pigratt.h pisysdep.h \
+ $(INC)machdefs.h pigraphgen.h piwdgx.h \
+ piwdggen.h pimsghandler.h picolist.h picmap.h picmapx.h picmapgen.h \
+ pifontx.h pifontgen.h
 $(OBJ)piimage.o: piimage.cc piimage.h parradapter.h \
- $(INC)machdefs.h lut.h pisysdep.h pidrawer.h \
- pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h picmap.h \
- picmapx.h picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h \
- pigraphuc.h pievthandler.h psfile.h pipixmapx.h pipixmapgen.h \
- pibwdgx.h pigraphps.h pistdwdgx.h pistdwdggen.h piwindowx.h \
- piwindowgen.h picontainerx.h picontainergen.h picmapview.h \
- piimgtools.h pioptmenux.h pioptmenugen.h pimenux.h pimenugen.h \
- piapplx.h piapplgen.h pimenubarx.h pimenubargen.h picons.h \
- pidrwtools.h piscdrawwdg.h
+ $(INC)machdefs.h lut.h pisysdep.h pieldrw.h \
+ pidrawer.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+ picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h pifontx.h \
+ pifontgen.h pigraphuc.h pievthandler.h psfile.h pigratt.h pipixmapx.h \
+ pipixmapgen.h pibwdgx.h pigraphps.h pistdwdgx.h pistdwdggen.h \
+ piwindowx.h piwindowgen.h picontainerx.h picontainergen.h \
+ picmapview.h piimgtools.h pioptmenux.h pioptmenugen.h pimenux.h \
+ pimenugen.h piapplx.h piapplgen.h pimenubarx.h pimenubargen.h \
+ picons.h pidrwtools.h piscdrawwdg.h piyfxdrw.h
 $(OBJ)piimgtools.o: piimgtools.cc piimgtools.h pisysdep.h \
  $(INC)machdefs.h pistdwdgx.h pistdwdggen.h \
@@ -171 +181 @@
  picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigraphuc.h \
  pievthandler.h psfile.h pigraphps.h piimage.h parradapter.h lut.h \
- pidrawer.h pipixmapx.h pipixmapgen.h picmapview.h
+ pieldrw.h pidrawer.h pigratt.h pipixmapx.h pipixmapgen.h picmapview.h
 $(OBJ)pilistgen.o: pilistgen.cc pilistgen.h pisysdep.h \
  $(INC)machdefs.h piwdgx.h piwdggen.h \
@@ -229 +239 @@
  pifontgen.h pigraphuc.h pievthandler.h psfile.h pigraphps.h \
  pistdwdgx.h pistdwdggen.h piwindowx.h piwindowgen.h picontainerx.h \
- picontainergen.h pidrawer.h pidrwtools.h pioptmenux.h pioptmenugen.h \
- pimenux.h pimenugen.h piapplx.h piapplgen.h pimenubarx.h \
- pimenubargen.h picons.h piaxestools.h parradapter.h lut.h
+ picontainergen.h pidrawer.h pigratt.h pieldrw.h pidrwtools.h \
+ pioptmenux.h pioptmenugen.h pimenux.h pimenugen.h piapplx.h \
+ piapplgen.h pimenubarx.h pimenubargen.h picons.h piaxestools.h
 $(OBJ)pistdwdggen.o: pistdwdggen.cc pistdwdggen.h pisysdep.h \
  $(INC)machdefs.h piwdgx.h piwdggen.h \
@@ -249 +259 @@
  pidrawer.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
  picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h pifontx.h \
- pifontgen.h pigraphuc.h pievthandler.h psfile.h pigraph3d.h pibwdgx.h \
- pigraphps.h
+ pifontgen.h pigraphuc.h pievthandler.h psfile.h pigratt.h pieldrw.h \
+ pigraph3d.h pibwdgx.h pigraphps.h
 $(OBJ)pitherm.o: pitherm.cc pitherm.h pisysdep.h \
  $(INC)machdefs.h pibwdgx.h pibwdggen.h \
@@ -278 +288 @@
  pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigraphuc.h \
  pievthandler.h psfile.h pigraphps.h pixtbase.h
+$(OBJ)piyfxdrw.o: piyfxdrw.cc $(INC)machdefs.h \
+ piyfxdrw.h pisysdep.h parradapter.h lut.h pidrawer.h pibwdggen.h \
+ piwdgx.h piwdggen.h pimsghandler.h picolist.h picmap.h picmapx.h \
+ picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigraphuc.h \
+ pievthandler.h psfile.h pigratt.h
 $(OBJ)psfile.o: psfile.cc psfile.h $(INC)machdefs.h \
  pisysdep.h pifontgen.h pigraphgen.h piwdgx.h piwdggen.h \

trunk/SophyaPI/PI/objlist.list

@@ -17 +17 @@
 pidrawwin.o
 pidrwtools.o
+pieldrw.o
 pievthandler.o
 pifilechogen.o
@@ -27 +28 @@
 pigraphuc.o
 pigraphx.o
+pigratt.o
 piimage.o
 piimgtools.o
@@ -52 +54 @@
 piwindowx.o
 pixtbase.o
+piyfxdrw.o
 psfile.o

trunk/SophyaPI/PI/pi3ddrw.cc

@@ -141 +141 @@
                             double yl1, double yl2, double zl1, double zl2)
 {
-  if (mLAtt == PI_NotDefLineAtt)    g3->SelLine(PI_ThinLine);
-  if (mFSz == PI_NotDefFontSize)    g3->SelFontSz((YMax()-YMin())/150.);
+  if (mGrAtt.GetLineAtt() == PI_NotDefLineAtt)    g3->SelLine(PI_ThinLine);
+  // RZZZZZ  if (mGrAtt. == PI_NotDefFontSize)    g3->SelFontSz((YMax()-YMin())/150.);
 
   PIGrCoord x1,y1,z1,x2,y2,z2;

trunk/SophyaPI/PI/pi3ddrw.h

@@ -9 +9 @@
 #include "pisysdep.h"
 #include "pidrawer.h"
+#include "pieldrw.h"
 #include "pigraph3d.h"
 

trunk/SophyaPI/PI/picons.cc

@@ -968 +968 @@
       break;
     case 3103 :
-      SelectFont(PI_BigSizeFont);
+      SelectFont(PI_LargeSizeFont);
       AutoSize();
       break;

trunk/SophyaPI/PI/pidrawer.cc

@@ -1 +1 @@
 // Module PI : Peida Interactive     PIDrawer
-// Classe de traceurs pouvat être attachés à une PIBaseWdg
+// Classe de traceurs pouvant être attachés à une PIBaseWdg
 //            E. Aubourg , R.Ansari     96-98
 // LAL (Orsay) / IN2P3-CNRS  DAPNIA/SPP (Saclay) / CEA
@@ -56 +56 @@
   mFgHighLight = false;  // Flag de control d'affichage en mode HighLight
 
-  mFCol = mBCol = PI_NotDefColor;
-  mLAtt = PI_NotDefLineAtt;
-  mFSz = PI_NotDefFontSize;
-  mFAtt = PI_NotDefFontAtt;
-  mMSz = -1;
-  mMrk = PI_NotDefMarker;
-  mCmapid = CMAP_OTHER;
-  mRevCmap = false;
-  mFName = PI_DefaultFont;
 
   // Nom par defaut : Le nom de la classe
@@ -239 +230 @@
 //--
 
-void 
-PIDrawer::SetColAtt(PIColors fg, PIColors bg)
-{
-  mFCol = fg;
-  mBCol = bg;
-}
-
-void 
-PIDrawer::SetLineAtt(PILineAtt lat)
-{
-  mLAtt = lat;
-}
-
-void 
-PIDrawer::SetFontAtt(PIFontSize fsz, PIFontAtt fat)
-{
-  mFSz = fsz;
-  mFAtt = fat;
-}
-
-void 
-PIDrawer::SetFont(PIFontName fn, PIFontSize fsz, PIFontAtt fat)
-{
-  mFName = fn;
-  mFSz = fsz;
-  mFAtt = fat;
-}
-
-void 
-PIDrawer::SetMarkerAtt(int sz, PIMarker mrk)
-{
-  mMSz = sz;
-  mMrk = mrk;
-}
-
-void 
-PIDrawer::SetArrowMarkerAtt(int sz, PIArrowMarker mrk)
-{
-  mArrowMrkSz = sz;
-  mArrowMrk = mrk;
-}
-
-void 
-PIDrawer::SetColMapId(CMapId cid, bool rev)
-{
-  mCmapid = cid;
-  mRevCmap = rev;
-}
 
 void 
 PIDrawer::SelGraAtt(PIGraphicUC* g)
 {
-  if (mFCol != PI_NotDefColor)    g->SelForeground(mFCol);
-  if (mBCol != PI_NotDefColor)    g->SelBackground(mBCol);
-  if (mLAtt != PI_NotDefLineAtt)  g->SelLine(mLAtt);
-  if (mFName != PI_DefaultFont) {
-    PIFont myfont(mFName);
-    myfont.SetFontAtt(mFAtt);
-    myfont.SetFontSz(mFSz);
-    g->SelFont(myfont);
-  }
-  else if ( (mFSz != PI_NotDefFontSize) || (mFAtt != PI_NotDefFontAtt)  )
-                                  g->SelFont(mFSz, mFAtt);
-  if ( (mMrk != PI_NotDefMarker) || (mMSz >= 0) )
-                                  g->SelMarker(mMSz, mMrk);
+  PIColors fcol = GetGraphicAtt().GetFgColor(); 
+  if (fcol != PI_NotDefColor)    g->SelForeground(fcol);
+  PIColors bcol = GetGraphicAtt().GetBgColor(); 
+  if (bcol != PI_NotDefColor)    g->SelBackground(bcol);
+  if (GetGraphicAtt().GetLineAtt() != PI_NotDefLineAtt)  
+    g->SelLine(GetGraphicAtt().GetLineAtt());
+  if ( (GetGraphicAtt().GetFontName() != PI_DefaultFont) ||
+       (GetGraphicAtt().GetFontAtt() != PI_NotDefFontAtt) )
+    g->SelFont(GetGraphicAtt().GetFont());
+  if (GetGraphicAtt().GetMarker() != PI_NotDefMarker) 
+    g->SelMarker(GetGraphicAtt().GetMarkerSize(), GetGraphicAtt().GetMarker());
 }
 
@@ -343 +284 @@
 
 int
-PIDrawer::DecodeOptionString(vector<string> & opt)
+PIDrawer::DecodeOptionString(vector<string> & opt, bool rmdecop)
 {
   // a faire un jour OP+Reza 30/11/01
@@ -422 +363 @@
 {
   g->NoClip();
-  if (mLAtt == PI_NotDefLineAtt)  g->SelLine(PI_ThinLine);
-  else g->SelLine(mLAtt);
-  if (mFCol == PI_NotDefColor) g->SelForeground(PI_Black);
-  else g->SelForeground(mFCol);
+  if (GetGraphicAtt().GetLineAtt() == PI_NotDefLineAtt)  g->SelLine(PI_ThinLine);
+  else g->SelLine(GetGraphicAtt().GetLineAtt());
+  if (GetGraphicAtt().GetColor() == PI_NotDefColor) g->SelForeground(PI_Black);
+  else g->SelForeground(GetGraphicAtt().GetColor());
   //  On calcule les ticks 
   CalcTicks();
@@ -575 +516 @@
   int kk;
 
-  if (mFSz == PI_NotDefFontSize) 
-    g->SelFontSz(xMajTickLen*4., mFAtt);  // Passage de x3. a x4. - Reza Janvier 2002
+  if (axesAFSz) 
+    g->SelFontSz(xMajTickLen*4.);  // Passage de x3. a x4. - Reza Janvier 2002
 
   // Choix du bon format pour les labels des axes;
@@ -606 +547 @@
   double xOffset = 0;
 
-  if (mFSz == PI_NotDefFontSize) 
-    g->SelFontSz(xMajTickLen*4., mFAtt);    // Passage de x3. a x4. - Reza Janvier 2002
+  if (axesAFSz) 
+    g->SelFontSz(xMajTickLen*4.);  // Passage de x3. a x4. - Reza Janvier 2002
 
   // Choix du bon format pour les labels des axes;
@@ -714 +655 @@
 }
 
-/*  --------------------------------------------------------------  */
-/*  ------------------- Classe PIElDrawer ------------------------  */
-/*  --------------------------------------------------------------  */
-
-//++
-// Class        PIElDrawer
-// Lib          PI
-// include      pidrawer.h
-//
-//      Classe de traceur ("Drawer") capable de gérer et de 
-//      tracer une liste d'éléments simples. Cette classe
-//      est utilisé pour le tracé des axes et des éléments de
-//      texte ds les "PIScDrawWdg", "PIDraw3DWdg" et "PIImage".
-//--
-//++
-// Links        Parents
-// PIDrawer
-//--
-
-//++
-// Titre        Constructeurs et méthodes
-//--
-
-//++
-// PIElDrawer()
-//      Constructeur
-//--
-
-/* --Methode-- */
-PIElDrawer::PIElDrawer()
-{
-mEn = 0;
-titleT = titleB = "";
-}
-
-/* --Methode-- */
-PIElDrawer::~PIElDrawer()
-{
-}
-
-
-//++
-//  void  SetTitles(const char* tt=NULL, const char* tb=NULL)
-//      Ajout de titres haut ("tt") et bas ("tb")
-//  void  SetTitles(string const & tt, string const & tb)
-//      Ajout de titres haut ("tt") et bas ("tb")
-//--
-
-/* --Methode-- */
-void PIElDrawer::SetTitles(const char* tt, const char* tb)
-{
-if (tt != NULL)  titleT = tt;
-if (tb != NULL)  titleB = tb;
-}
-
-/* --Methode-- */
-void PIElDrawer::SetTitles(string const & tt, string const & tb)
-{
-titleT = tt;  titleB = tb;
-}
-
-//++
-// int  ElAddText(PIGrCoord x, PIGrCoord y, const char* s, PIColors c=PI_NotDefColor)
-//      Ajout d'un élément texte avec un attribut de couleur.
-//      Renvoie le numéro identificateur de l'élément.
-// int  ElAddLine(PIGrCoord x1, PIGrCoord y1, PIGrCoord x2, PIGrCoord y2, -
-//                 PIColors c=PI_NotDefColor)
-//      Ajout d'un élément de ligne avec un attribut de couleur.
-//      Renvoie le numéro identificateur de l'élément.
-// int  ElAddRect(PIGrCoord x, PIGrCoord y, PIGrCoord dx, PIGrCoord dy, -
-//                PIColors c=PI_NotDefColor)
-//      Ajout d'un élément de type rectangle avec un attribut de couleur.
-//      Renvoie le numéro identificateur de l'élément.
-// int  ElAddFRect(PIGrCoord x, PIGrCoord y, PIGrCoord dx, PIGrCoord dy, -
-//                PIColors c=PI_NotDefColor)
-//      Ajout d'un élément de type rectangle plein avec un attribut de couleur.
-//      Renvoie le numéro identificateur de l'élément.
-// int  ElAddCirc(PIGrCoord x, PIGrCoord y, PIGrCoord r, PIColors c=PI_NotDefColor)
-//      Ajout d'un élément de type cercle avec un attribut de couleur.
-//      Renvoie le numéro identificateur de l'élément.
-// int  ElAddFCirc(PIGrCoord x, PIGrCoord y, PIGrCoord r, PIColors c=PI_NotDefColor)
-//      Ajout d'un élément de type cercle plein avec un attribut de couleur.
-//      Renvoie le numéro identificateur de l'élément.
-// 
-// void  ElDel(int id)
-//      Suppression de l'élément avec l'identificateur "id".
-// void  ElDelAll()
-//      Suppression de tous les éléments du dessin.
-//--
-
-/* --Methode-- */
-void  PIElDrawer::Draw(PIGraphicUC* g, double /*xmin*/, double /*ymin*/, double /*xmax*/, double /*ymax*/)
-{
-SelGraAtt(g);   // DrawAxes change certains attributs graphiques
-DrawAxes(g);   // Trace des axes 
-g->SelFont(PI_NormalSizeFont, mFAtt);
-SelGraAtt(g);   // DrawAxes change certains attributs graphiques
-
-// Trace des titres 
-if ( (titleT.length() > 0) || (titleB.length() > 0) ) {
-  aXdir = false;  // Vrai si Axe X de Droite vers Gauche 
-  aYdir = false;  // Vrai si Axe Y de Haut vers Bas
-  PIGrCoord gas, gds;
-  double fx, fy, fh;
-//  fh = g->GetFontHeightUC(gas, gds);
-  fh = 0.075*(YMax()-YMin());
-  if ( titleT.length() > 0) {
-      fx = g->CalcStringWidth(titleT.c_str());
-      if(aXdir) fx = g->DeltaUCX(XMax(), -(XMax()-XMin()-fx)/2.);
-      else fx = g->DeltaUCX(XMin(), (XMax()-XMin()-fx)/2.);
-      if (g->isAxeYDirUpDown()) fy = g->DeltaUCY(YMin(), -fh);
-      else fy = g->DeltaUCY(YMax(), fh);
-      g->DrawString(fx, fy, titleT.c_str());
-//      printf(" PIElDrawer::Draw()/DBG (%g , %g) %s  - %g \n", fx, fy, titleT.c_str(), fh);
-    }
-  if ( titleB.length() > 0) {
-      fx = g->CalcStringWidth(titleB.c_str());
-      if(aXdir) fx = g->DeltaUCX(XMax(), -(XMax()-XMin()-fx)/2.);
-      else fx = g->DeltaUCX(XMin(), (XMax()-XMin()-fx)/2.);
-      if (g->isAxeYDirUpDown()) fy =  g->DeltaUCY(YMax(), fh*1.5);
-      else fy = g->DeltaUCY(YMin(), -fh*1.5);
-      g->DrawString(fx, fy, titleB.c_str());
-//      printf(" PIElDrawer::Draw()/DBG (%g , %g) %s  - %g \n", fx, fy, titleT.c_str(), fh);
-    }
-  }
-DrwElList::iterator it;
-PIColors cc = g->GetForeground();
-for (it = mElist.begin(); it != mElist.end(); it++)
-  {
-  if ((*it).col != PI_NotDefColor)  g->SelForeground((*it).col);
-  switch ( (*it).etyp )
-    {
-    case PIDEL_Line :
-      g->DrawLine((*it).ex, (*it).ey, (*it).edx, (*it).edy ); 
-      break;
-    case PIDEL_Text :
-      g->DrawString((*it).ex, (*it).ey, (char*) ((*it).es.c_str()) ); 
-      break;
-    case PIDEL_Rect :
-      g->DrawBox((*it).ex, (*it).ey, (*it).edx, (*it).edy ); 
-      break;
-    case PIDEL_FRect :
-      g->DrawFBox((*it).ex, (*it).ey, (*it).edx, (*it).edy ); 
-      break;
-    case PIDEL_Circ :
-      g->DrawCircle((*it).ex, (*it).ey, (*it).edx ); 
-      break;
-    case PIDEL_FCirc :
-      g->DrawFCircle((*it).ex, (*it).ey, (*it).edx ); 
-      break;
-    default :
-      break;
-    }
-  g->SelForeground(cc);
-  }
-}
-
-
-/* --Methode-- */
-int PIElDrawer::ElAdd(int typ, PIGrCoord x, PIGrCoord  y, PIGrCoord dx, PIGrCoord dy, const char* s, PIColors c)
-{
-DrwEl dre;
-mEn++;
-dre.eid = mEn;  dre.etyp = typ;
-dre.ex = x;   dre.ey = y;
-dre.edx = dx;  dre.edy = dy;
-dre.col = c;
-if (s)  dre.es = s;
-mElist.push_back(dre);
-return(mEn);
-}
-
-/* --Methode-- */
-void  PIElDrawer::ElDel(int id)
-{
-DrwElList::iterator it;
-for (it = mElist.begin(); it != mElist.end(); it++)
-  if ( (*it).eid == id) { mElist.erase(it);   break; }
-return;
-}
-
-/* --Methode-- */
-void  PIElDrawer::ElDelAll()
-{
-mElist.erase(mElist.begin(), mElist.end());
-return;
-}
-

trunk/SophyaPI/PI/pidrawer.h

@@ -8 +8 @@
 #include "pibwdggen.h"
 #include "pigraphuc.h"
+#include "pigratt.h"
 
 
@@ -38 +39 @@
                              { aXlog = logx; aYlog = logy; }
 
+  virtual void       SetAxesFlags(unsigned int flags=kAxesNone);
+  inline  void       SetAxesAutoFontSize(bool fg=true) { axesAFSz = fg; }
+
   virtual void       DrawAxes(PIGraphicUC* g);
-  virtual void       SetAxesFlags(unsigned int flags=kAxesNone);
-    
+
   virtual void       Draw(PIGraphicUC* g, double xmin, double ymin, double xmax, double ymax); 
 
@@ -66 +69 @@
 
   inline unsigned int GetAxesFlags() { return(axesFlags); }
+  inline  bool       isAxesAutoFontSize(bool fg=true) { return axesAFSz; }
 
   inline PIGraphicUC*    GetGraphicUC() { return(mGrUC); }
@@ -72 +76 @@
   inline void         FreeLimits() {limitsFixed = 0;}
 
+  virtual void        SelGraAtt(PIGraphicUC* g);
+
 // Changement des attributs graphiques
-  virtual void       SetColAtt(PIColors fg=PI_NotDefColor, 
-                               PIColors bg=PI_NotDefColor);
-  virtual void       SetLineAtt(PILineAtt lat=PI_NotDefLineAtt);
-  virtual void       SetFontAtt(PIFontSize fsz=PI_NotDefFontSize,
-                                PIFontAtt fat=PI_NotDefFontAtt);
-  virtual void       SetFont(PIFontName fn, PIFontSize fsz=PI_NotDefFontSize,
-                             PIFontAtt fat=PI_NotDefFontAtt);
-  virtual void       SetMarkerAtt(int sz=1, PIMarker mrk=PI_NotDefMarker);
-  virtual void       SetArrowMarkerAtt(int sz=5, PIArrowMarker mrk=PI_NotDefArrowMarker);
-  virtual void       SetColMapId(CMapId cid=CMAP_OTHER, bool rev=false);
-
-  void               SelGraAtt(PIGraphicUC* g);
+  inline void         SetGraphicAtt(PIGraphicAtt const& att) { mGrAtt = att; }
+  inline void         UpdateGraphicAtt(PIGraphicAtt const& att) 
+                      { mGrAtt.UpdateFrom(att); }
 
 // Acces aux attributs graphiques
-  inline PIColors    GetFgColAtt()  { return(mFCol); }
-  inline PIColors    GetBgColAtt()  { return(mBCol); }
-  inline PILineAtt   GetLineAtt()   { return(mLAtt); }
-  inline PIFontSize  GetFontSz()    { return(mFSz);  }
-  inline PIFontAtt   GetFontAtt()   { return(mFAtt); }
-  inline PIFontName  GetFontName()  { return(mFName);} 
-  inline int         GetMarkerSz()  { return(mMSz);  }
-  inline PIMarker    GetMarker()    { return(mMrk);  } 
-  inline int           GetArrowMarkerSz()  { return(mArrowMrkSz);  }
-  inline PIArrowMarker GetArrowMarker()  { return(mArrowMrk);  } 
-  inline CMapId      GetColMapId()  { return(mCmapid); }
-  inline CMapId      GetColMapId(bool & rev)  { rev = mRevCmap; return(mCmapid); }
-
+  inline PIGraphicAtt  GetGraphicAtt() const { return(mGrAtt); }
+  inline PIGraphicAtt& GetGraphicAtt() { return(mGrAtt); }
 
 //  Methode permettant l'affichage d'une fenetre de controle specialisee 
@@ -107 +93 @@
 
 //   Methode permettant de decoder des options a partir de chaines
-  virtual int        DecodeOptionString(vector<string> & opt);
+  virtual int        DecodeOptionString(vector<string> & opt, bool rmdecopt=true);
 
 //   On peut donner un nom a un drawer (par defaut = nom de la classe)
@@ -158 +144 @@
   int limitsFixed;
   unsigned int axesFlags;
-  
+  bool axesAFSz;
   PIBaseWdgGen* mBWdg;
   PIGraphicUC* mGrUC;
@@ -173 +159 @@
 
 //  Gestion d attributs graphiques associes a chaque drawer
-  PIColors           mFCol, mBCol;
-  PILineAtt          mLAtt;
-  PIFontName         mFName;
-  PIFontSize         mFSz;
-  PIFontAtt          mFAtt;
-  int                mMSz;
-  PIMarker           mMrk;  
-  int                mArrowMrkSz;
-  PIArrowMarker      mArrowMrk;
-  CMapId             mCmapid;
-  bool               mRevCmap;
+  PIGraphicAtt   mGrAtt;
 
 };
 
 
-//  Classe avec gestion d une liste d elements a tracer 
-
-class PIElDrawer : public PIDrawer 
-{
-public:
-  enum { PIDEL_Line = 1, PIDEL_Text = 2,
-         PIDEL_Rect = 3, PIDEL_FRect = 4, 
-         PIDEL_Circ = 5, PIDEL_FCirc = 6 } ; 
-
-                     PIElDrawer();
-  virtual           ~PIElDrawer();
-
-  virtual void       SetTitles(const char* tt=NULL, const char* tb=NULL);
-  virtual void       SetTitles(string const & tt, string const & tb);
-
-  virtual void       Draw(PIGraphicUC* g, double xmin, double ymin, double xmax, double ymax); 
-
-  inline int         ElAddLine(PIGrCoord x1, PIGrCoord y1, PIGrCoord x2, PIGrCoord y2, 
-                               PIColors c=PI_NotDefColor)
-    { return( ElAdd(PIDEL_Line, x1, y1, x2, y2, NULL, c) ); }  
-  inline int         ElAddText(PIGrCoord x, PIGrCoord y, const char* s, PIColors c=PI_NotDefColor)
-    { return( ElAdd(PIDEL_Text, x, y, 0, 0, s, c) ); }  
-  inline int         ElAddRect(PIGrCoord x, PIGrCoord y, PIGrCoord dx, PIGrCoord dy, 
-                               PIColors c=PI_NotDefColor)
-    { return( ElAdd(PIDEL_Rect, x, y, dx, dy, NULL, c) ); }  
-  inline int         ElAddFRect(PIGrCoord x, PIGrCoord y, PIGrCoord dx, PIGrCoord dy,
-                               PIColors c=PI_NotDefColor)
-    { return( ElAdd(PIDEL_FRect, x, y, dx, dy, NULL, c) ); }  
-  inline int         ElAddCirc(PIGrCoord x, PIGrCoord y, PIGrCoord r, PIColors c=PI_NotDefColor)
-    { return( ElAdd(PIDEL_Circ, x, y, r, r, NULL, c) ); }  
-  inline int         ElAddFCirc(PIGrCoord x, PIGrCoord y, PIGrCoord r, PIColors c=PI_NotDefColor)
-    { return( ElAdd(PIDEL_FCirc, x, y, r, r, NULL, c) ); }  
-
-  void               ElDel(int id);
-  void               ElDelAll();
-
-protected:
-  int                ElAdd(int typ, PIGrCoord x, PIGrCoord y, PIGrCoord dx, PIGrCoord dy, 
-                           const char* s, PIColors c=PI_NotDefColor);
-#ifdef __DECCXX
-public:
-#endif
-  struct DrwEl{
-    int eid, etyp;
-    PIGrCoord ex,ey;
-    PIGrCoord edx,edy;
-    string es;
-    PIColors col;
-  };
-#ifdef __DECCXX
-protected:
-#endif
-  typedef list<DrwEl> DrwElList;
-
-  DrwElList mElist;
-  int mEn;
-
-  string titleT, titleB;       // Titre Haut - Bas
-
-};
 
 #endif

trunk/SophyaPI/PI/pidrwtools.cc

@@ -250 +250 @@
 mOpt[7]->AppendItem("Small FontSz", 802);
 mOpt[7]->AppendItem("Normal FontSz", 803);
-mOpt[7]->AppendItem("Big FontSz", 804);
+mOpt[7]->AppendItem("Large FontSz", 804);
 mOpt[7]->AppendItem("Huge FontSz", 805);
 mOpt[7]->SetBinding(PIBK_elastic, PIBK_elastic, PIBK_elastic, PIBK_elastic);
@@ -348 +348 @@
                                PI_ItalicFont, PI_BoldItalicFont };
 static PIFontSize fntsz[6] = { PI_NotDefFontSize, PI_TinySizeFont, PI_SmallSizeFont, 
-                               PI_NormalSizeFont, PI_BigSizeFont, PI_HugeSizeFont };
+                               PI_NormalSizeFont, PI_LargeSizeFont, PI_HugeSizeFont };
 
 /* --Methode-- */
@@ -438 +438 @@
 if (!dr)  return;
 int ii,jj,kk;
-PIColors fc = dr->GetFgColAtt();
+PIGraphicAtt const & gratt = dr->GetGraphicAtt();
+PIColors fc = gratt.GetFgColor();
 for(kk=0; kk<MYNMXCOLORS; kk++) 
   if (fc == cols[kk])  { mOpt[0]->SetValue(100+kk);  break; }    
-CMapId cmi = dr->GetColMapId();
+CMapId cmi = gratt.GetColMapId();
 if (cmi == CMAP_OTHER)  mOpt[1]->SetValue(200);
 else for(kk=0; kk<PIColorMap::NumberStandardColorMaps(); kk++)
   if (cmi == PIColorMap::GetStandardColorMapId(kk)) { mOpt[1]->SetValue(201+kk);  break; }  
-PIMarker mk = dr->GetMarker();   
+PIMarker mk = gratt.GetMarker();   
 for(kk=0; kk<12; kk++) 
   if (mk == mrk[kk])   { mOpt[2]->SetValue(300+kk);  break; }
-kk = dr->GetMarkerSz();
+kk = gratt.GetMarkerSz();
 if (kk < 1)  kk = 1;
 if (kk > 15) kk = 15;
 if (kk%2 == 0) kk++;
 mOpt[3]->SetValue(400+kk);
-PIFontName fnm = dr->GetFontName();
-PIFontAtt fat = dr->GetFontAtt();
-PIFontSize fsz = dr->GetFontSz();
+PIFontName fnm = gratt.GetFontName();
+PIFontAtt fat = gratt.GetFontAtt();
+PIFontSize fsz = gratt.GetFontSz();
+
 for(ii=0; ii<5; ii++)
   if (fnm ==  fntname[ii]) break;
@@ -470 +472 @@
 mOpt[7]->SetValue(800+jj);
 
-PILineAtt lat = dr->GetLineAtt();
+PILineAtt lat = gratt.GetLineAtt();
 for(kk=0; kk<13; kk++)
   if (lat == line[kk])   { mOpt[5]->SetValue(600+kk);  break; }
@@ -484 +486 @@
   if (drw == NULL)  return;
   mCurBW->SetActiveDrawer(mNDr);
+  PIGraphicAtt gratt;
   int k,ii,jj,kk;
   k = mOpt[0]->GetValue()-100;
   if ( (k < 0) || (k >= MYNMXCOLORS) )  k = 0;
-  drw->SetColAtt(cols[k]);
+  gratt.SetColAtt(cols[k]);
   k = mOpt[1]->GetValue()-200;
-  if (k == 0) drw->SetColMapId(CMAP_OTHER);
-  else drw->SetColMapId(PIColorMap::GetStandardColorMapId(k-1));
+  if (k == 0) gratt.SetColMapId(CMAP_OTHER);
+  else gratt.SetColMapId(PIColorMap::GetStandardColorMapId(k-1));
   k =  mOpt[2]->GetValue()-300;
   if ( (k < 0) || (k > 11) )  k = 0;
@@ -499 +502 @@
   //   kk = 3;
   //  }
-  drw->SetMarkerAtt(kk, mrk[k]);
+  gratt.SetMarkerAtt(kk, mrk[k]);
   ii =  (mOpt[4]->GetValue()-500);
   jj =  (mOpt[6]->GetValue()-700);
   kk =  (mOpt[7]->GetValue()-800);
-  drw->SetFont(fntname[ii], fntsz[kk], fntatt[jj]);
+  gratt.SetFontAtt(fntname[ii], fntsz[kk], fntatt[jj]);
 
   k =  mOpt[5]->GetValue()-600;
   if ( (k < 0) || (k > 12) )  k = 0;
-  drw->SetLineAtt(PILineAtt(line[k]));
+  gratt.SetLineAtt(PILineAtt(line[k]));
   if (fgref)  mCurBW->Refresh();
   else drw->Refresh();
@@ -515 +518 @@
 void PIDrwTools::Process(PIMessage msg, PIMsgHandler* /*sender*/, void* /*data*/)
 {
-  char strg[64];
 
   PIMessage mod = ModMsg(msg);

trunk/SophyaPI/PI/pifontgen.cc

@@ -21 +21 @@
 //      et de la taille *PIFontSize*.
 //      * PIFontName :
-//|     PI_DefaultFont , PI_CourierFont , PI_SymbolFont
+//|     PI_DefaultFont , PI_CourierFont , PI_HelveticaFont, 
+//|     PI_TimesFont, PI_SymbolFont
 //      * PIFontSize :
-//|     PI_SmallSizeFont , PI_NormalSizeFont , PI_BigSizeFont, PI_HugeSizeFont
+//|     PI_TinySizeFont, PI_SmallSizeFont , PI_NormalSizeFont , 
+//|     PI_LargeSizeFont, PI_VeryLargeSizeFont, PI_HugeSizeFont
 //      * PIFontAtt :   
-//|     PI_RomanFont , PI_BoldFont , PI_ItalicFont 
+//|     PI_RomanFont , PI_BoldFont , PI_ItalicFont , PI_BoldItalicFont 
 //--
 
@@ -76 +78 @@
 // PIFontAtt  GetFontAtt()
 //      Retourne l'attribut de fonte
-// int  GetFontSize()
+// PIFontSize  GetFontSz()
+//      Retourne la taille de fonte converti en enum PIFontSize
+// int  GetFontSzPt()
 //      Retourne la taille de fonte en points (pixels)
+// int  GetFontSeze()
+//      Retourne la taille de fonte en points (pixels) - idem GetFontSzPt()
 // int GetFontHeight(int& asc, int& desc) 
 //      Renvoie la hauteur des caractères, ainsi que la taille au dessus

trunk/SophyaPI/PI/pifontgen.h

@@ -14 +14 @@
                   PI_TinySizeFont = 1,
                   PI_SmallSizeFont = 2, PI_NormalSizeFont = 3, 
-                  PI_BigSizeFont = 4, PI_HugeSizeFont = 5 };
+                  PI_LargeSizeFont = 4, PI_VeryLargeSizeFont = 5,
+                  PI_HugeSizeFont = 6 };
 
 enum PIFontAtt { PI_NotDefFontAtt = -1,
@@ -35 +36 @@
   virtual void          SetFontSzPt(int npt)            = 0;
 
-  virtual PIFontName    GetFontName()                   = 0;
-  virtual PIFontAtt     GetFontAtt()                    = 0;
-  virtual int           GetFontSize()                   = 0;
+  virtual PIFontName    GetFontName()  const            = 0;
+  virtual PIFontAtt     GetFontAtt()  const             = 0;
+  virtual PIFontSize    GetFontSz() const               = 0;
+  virtual int           GetFontSzPt() const             = 0;
+  inline  int           GetFontSize() const { return GetFontSzPt(); }
 
-  virtual int           GetFontHeight(int& asc, int& desc)      = 0;
-  virtual int           GetStringWidth(char const* s)           = 0;
+  virtual int           GetFontHeight(int& asc, int& desc) const        = 0;
+  virtual int           GetStringWidth(char const* s) const             = 0;
 };
 

trunk/SophyaPI/PI/pifontx.cc

@@ -82 +82 @@
 
 /* --Methode-- */
-PIFontName PIFontX::GetFontName()
+PIFontName PIFontX::GetFontName() const
 {
 return(mFName);
@@ -88 +88 @@
 
 /* --Methode-- */
-PIFontAtt PIFontX::GetFontAtt()
+PIFontAtt PIFontX::GetFontAtt() const
 {
 return(mFAtt);
@@ -94 +94 @@
 
 /* --Methode-- */
-int PIFontX::GetFontSize()
+int PIFontX::GetFontSzPt() const
 {
 return(mFSize);
 }
 
-/* --Methode-- */
-int PIFontX::GetFontHeight(int& asc, int& desc)
+
+/* --Methode-- */
+int PIFontX::GetFontHeight(int& asc, int& desc) const
 {
 char a[2];
@@ -111 +112 @@
 
 /* --Methode-- */
-int PIFontX::GetStringWidth(char const* s)
+int PIFontX::GetStringWidth(char const* s) const
 {
 return(XTextWidth(mFSt, s, strlen(s)));
@@ -117 +118 @@
 
 
-#define NMAXFONTSZ    9
+#define NMAXFONTSZ    13
 #define NMAXFONTATT   4
 #define NMAXFONTTYP   5
@@ -123 +124 @@
 /*  Variables globales pour la gestion des fontes  */
 static XFontStruct * fntst[NMAXFONTSZ][NMAXFONTATT][NMAXFONTTYP];
-static int fntsz[NMAXFONTSZ] = {8,9,10,11,12,14,18,24,36};
-static int TinyFontIndex = 0; 
-static int SmallFontIndex = 2; 
-static int NormalFontIndex = 4;
-static int BigFontIndex = 6;
-static int HugeFontIndex = 8;
+static int fntsz[NMAXFONTSZ] = {8,9,10,11,12,14,16,18,20,24,28,32,36};
+static int TinyFontIndex = 1; 
+static int SmallFontIndex = 3; 
+static int NormalFontIndex = 5;
+static int LargeFontIndex = 7;
+static int VeryLargeFontIndex = 9;
+static int HugeFontIndex = 11;
 static  PIFontAtt fntatt[NMAXFONTATT] = 
         { PI_RomanFont, PI_BoldFont, PI_ItalicFont, PI_BoldItalicFont };
@@ -136 +138 @@
 
 /* --Methode-- */
+PIFontSize PIFontX::GetFontSz() const
+{
+  int fnidx[6],k;
+  fnidx[0] = TinyFontIndex;
+  fnidx[1] = SmallFontIndex;
+  fnidx[2] = NormalFontIndex;
+  fnidx[3] = LargeFontIndex;
+  fnidx[4] = VeryLargeFontIndex;
+  fnidx[5] = HugeFontIndex;
+  PIFontSize rfnsz[6] = {PI_TinySizeFont, PI_SmallSizeFont, PI_NormalSizeFont, 
+                         PI_LargeSizeFont, PI_VeryLargeSizeFont, PI_HugeSizeFont};
+  PIFontSize rs = PI_NormalSizeFont;
+  int diff = mFSize-fntsz[NormalFontIndex];
+  int diffsz = (diff < 0) ? -diff : diff;
+  for(k=0; k<6; k++) {
+    diff = mFSize-fntsz[fnidx[k]];
+    if (diff < 0)  diff = -diff;
+    if (diff < diffsz) {
+      diffsz = diff; 
+      rs = rfnsz[k];
+    }
+  }
+return(rs);
+}
+
+/* --Methode-- */
 void PIFontX::SelectFont(PIFontName fn, PIFontAtt fa, PIFontSize fs)
 {
@@ -149 +177 @@
     isz = fntsz[NormalFontIndex];
     break;
-  case PI_BigSizeFont:
-    isz = fntsz[BigFontIndex];
+  case PI_LargeSizeFont:
+    isz = fntsz[LargeFontIndex];
+    break;
+  case PI_VeryLargeSizeFont:
+    isz = fntsz[VeryLargeFontIndex];
     break;
   case PI_HugeSizeFont:
@@ -360 +391 @@
 NormalFontIndex = kksel;
 SmallFontIndex = (kksel > 1) ? kksel-2 : 0 ;
-BigFontIndex =  (kksel < NMAXFONTSZ-2) ? kksel+2 :  NMAXFONTSZ-1;
+TinyFontIndex = (kksel > 3) ? kksel-4 : 0 ;  
+LargeFontIndex =  (kksel < NMAXFONTSZ-2) ? kksel+2 :  NMAXFONTSZ-1;
+VeryLargeFontIndex =  (kksel < NMAXFONTSZ-4) ? kksel+4 :  NMAXFONTSZ-1;
+HugeFontIndex =  (kksel < NMAXFONTSZ-6) ? kksel+6 :  NMAXFONTSZ-1;
 // On garde HugeFontIndex et TinyFontIndex aux tailles extremes 
 // HugeFontIndex = NMAXFONTSZ-1;

trunk/SophyaPI/PI/pifontx.h

@@ -28 +28 @@
   virtual void          SetFontSzPt(int npt);
 
-  virtual PIFontName    GetFontName();
-  virtual PIFontAtt     GetFontAtt();
-  virtual int           GetFontSize();
+  virtual PIFontName    GetFontName() const ;
+  virtual PIFontAtt     GetFontAtt() const ;
+  virtual PIFontSize    GetFontSz() const;
+  virtual int           GetFontSzPt() const ;
 
-  virtual int           GetFontHeight(int& asc, int& desc);
-  virtual int           GetStringWidth(char const* s);
+  virtual int           GetFontHeight(int& asc, int& desc) const ;
+  virtual int           GetStringWidth(char const* s) const ;
 
 // En public pour PIGraphicX

trunk/SophyaPI/PI/pigraphuc.cc

@@ -45 +45 @@
 //      Permet de modifier l'objet "PIGraphic" de départ et l'espace graphique correspondant.
 //
-// void  SelFontSz(PIGrCoord sz, PIFontAtt att=PI_RomanFont)
+// void  SelFontSz(PIGrCoord sz)
 //      Sélection de fonte avec la taille exprimée en coordonnées utilisateur
+// void  SelFontSz(PIGrCoord sz, PIFontAtt att)
+//      Sélection de fonte avec la taille exprimée en coordonnées utilisateur, avec 
+//      Spécification d'attribut de fonte
 // void  SelMarkerSz(PIGrCoord msz, PIMarker mrk=PI_DotMarker)
 //      Sélection de marker avec la taille exprimée en coordonnées utilisateur
@@ -802 +805 @@
 
 /* --Methode-- */
+void PIGraphicUC::SelFontSz(PIGrCoord sz)
+{
+  if (!mGrC) return;
+  SelFontSz(sz, mGrC->GetFont().GetFontAtt());
+}
+
+/* --Methode-- */
 void PIGraphicUC::SelFontSz(PIGrCoord sz, PIFontAtt att)
 {

trunk/SophyaPI/PI/pigraphuc.h

@@ -89 +89 @@
   virtual void       SelFontSzPt(int npt=12, PIFontAtt att=PI_RomanFont);
 //  Fonctions specifiques a PIGraphicUC :
-  virtual void       SelFontSz(PIGrCoord sz, PIFontAtt att=PI_RomanFont);
+  virtual void       SelFontSz(PIGrCoord sz);
+  virtual void       SelFontSz(PIGrCoord sz, PIFontAtt att);
   virtual void       SelMarkerSz(PIGrCoord msz, PIMarker mrk=PI_DotMarker);
 

trunk/SophyaPI/PI/piimage.cc

@@ -13 +13 @@
 #include "pidrwtools.h"
 #include "piscdrawwdg.h"
+#include "piyfxdrw.h"
 #include PIAPP_H
 
@@ -352 +353 @@
   string dum = "";
   drw = new PIYfXDrawer(cutarrx, NULL, true);
-    drw->SetColAtt(PI_Red);
-    drw->SetMarkerAtt(5, PI_CrossMarker);
-    drw->SetLineAtt(PI_ThinLine);
+    drw->GetGraphicAtt().SetColAtt(PI_Red);
+    drw->GetGraphicAtt().SetMarkerAtt(5, PI_CrossMarker);
+    drw->GetGraphicAtt().SetLineAtt(PI_ThinLine);
     cutscw->AddScDrawer(drw, true);
     dum += "Red: X, ";
   drw = new PIYfXDrawer(cutarry, NULL, true);
-    drw->SetColAtt(PI_Blue);
-    drw->SetMarkerAtt(5, PI_TriangleMarker);
-    drw->SetLineAtt(PI_ThinLine);
+    drw->GetGraphicAtt().SetColAtt(PI_Blue);
+    drw->GetGraphicAtt().SetMarkerAtt(5, PI_TriangleMarker);
+    drw->GetGraphicAtt().SetLineAtt(PI_ThinLine);
     cutscw->AddScDrawer(drw, true);
     dum += "Blue: Y, ";
   drw = new PIYfXDrawer(cutarrd, NULL, true);
-    drw->SetColAtt(PI_Green);
-    drw->SetMarkerAtt(5, PI_PlusMarker);
-    drw->SetLineAtt(PI_ThinLine);
+    drw->GetGraphicAtt().SetColAtt(PI_Green);
+    drw->GetGraphicAtt().SetMarkerAtt(5, PI_PlusMarker);
+    drw->GetGraphicAtt().SetLineAtt(PI_ThinLine);
     cutscw->AddScDrawer(drw, true);
     dum += "Green: XY, ";
   drw = new PIYfXDrawer(cutarra, NULL, true);
-    drw->SetColAtt(PI_Orange);
-    drw->SetMarkerAtt(5, PI_BoxMarker);
-    drw->SetLineAtt(PI_ThinLine);
+    drw->GetGraphicAtt().SetColAtt(PI_Orange);
+    drw->GetGraphicAtt().SetMarkerAtt(5, PI_BoxMarker);
+    drw->GetGraphicAtt().SetLineAtt(PI_ThinLine);
     cutscw->AddScDrawer(drw, true);
     dum += "Orange: -XY";
@@ -533 +534 @@
 int cmapid = cmp->Type();
 if ( (cmapid == CMAP_GREY32) || (cmapid == CMAP_GREYINV32) || 
-     (cmapid == CMAP_GREY128) || (cmapid == CMAP_GREYINV128))  mdrw->SetColAtt(PI_Red);
-else mdrw->SetColAtt(PI_Turquoise);
+     (cmapid == CMAP_GREY128) || (cmapid == CMAP_GREYINV128))  mdrw->GetGraphicAtt().SetColAtt(PI_Red);
+else mdrw->GetGraphicAtt().SetColAtt(PI_Turquoise);
 PIPixmap::SetColMap(cmp, refr);
 if (refr) { xcurs =  ycurs = -1; }
@@ -547 +548 @@
 {
 if ( (cmapid == CMAP_GREY32) || (cmapid == CMAP_GREYINV32) || 
-     (cmapid == CMAP_GREY128) || (cmapid == CMAP_GREYINV128))  mdrw->SetColAtt(PI_Red);
-else mdrw->SetColAtt(PI_Turquoise);
+     (cmapid == CMAP_GREY128) || (cmapid == CMAP_GREYINV128))  mdrw->GetGraphicAtt().SetColAtt(PI_Red);
+else mdrw->GetGraphicAtt().SetColAtt(PI_Turquoise);
 PIPixmap::SetColMapId(cmapid, revidx, refr);
 if (zow)  zow->SetColMapId(cmapid, revidx, refr);
@@ -1019 +1020 @@
 int cmapid = cmap->Type();
 if ( (cmapid == CMAP_GREY32) || (cmapid == CMAP_GREYINV32) || 
-     (cmapid == CMAP_GREY128) || (cmapid == CMAP_GREYINV128)) gvdrw->SetColAtt(PI_Red); 
-else gvdrw->SetColAtt(PI_Turquoise);
-gvdrw->SetLineAtt(PI_NormalLine);
+     (cmapid == CMAP_GREY128) || (cmapid == CMAP_GREYINV128)) 
+  gvdrw->GetGraphicAtt().SetColAtt(PI_Red); 
+else gvdrw->GetGraphicAtt().SetColAtt(PI_Turquoise);
+gvdrw->GetGraphicAtt().SetLineAtt(PI_NormalLine);
 gvdrw->ElAddRect(x,y,dx,dy);
 gvw->AddDrawer(gvdrw, xw1, yw1, xw2, yw2, false); 

trunk/SophyaPI/PI/piimage.h

@@ -11 +11 @@
 #include "pisysdep.h"
 
-#include "pidrawer.h"
+#include "pieldrw.h"
 #include PIPIXMAP_H
 #include PISTDWDG_H

trunk/SophyaPI/PI/piscdrawwdg.cc

@@ -10 +10 @@
 #include "pidrwtools.h"
 #include "piaxestools.h"
-#include "parradapter.h"
 
 
@@ -565 +564 @@
 }
 
-// --------------------------------------------------------------------------
-// --------------------------------------------------------------------------
-// --------------------------------------------------------------------------
-// ----------------------------------------------------------
-//  Classe de trace de points/fonctions Y=f(X)
-//  Trace Y=ay->Value() = f(X= ax->Value()) si ax et ay != NULL
-//  Trace Y=ax->Value() = f(X= ax->X())  si ay == NULL
-// ----------------------------------------------------------
-// --------------------------------------------------------------------------
-
-//++
-// Class        PIYfXDrawer
-// Lib          PI
-// include      piscdrawwdg.h
-//
-//      Classe de traceur de points/fonctions Y = f(X).
-//--
-//++
-// Links        Parents
-// PIDrawer
-//--
-//++
-// Links        Voir aussi
-// P1DArrayAdapter
-//--
-//++
-// Titre        Constructeur
-//--
-
-//++
-// PIYfXDrawer(P1DArrayAdapter* ax, P1DArrayAdapter* ay, bool ad)
-//      Constructeur. Tracé de 
-//|      Y=ay->Value() = f(X= ax->Value()) si ax et ay != NULL
-//|     Y=ax->Value() = f(X= ax->X())  si ay == NULL
-//      Si "ad==true" les objets "ax" et "ay" sont détruits par 
-//      le destructeur de "PIYfXDrawer".
-//--
-
-/* --Methode-- */
-PIYfXDrawer::PIYfXDrawer(P1DArrayAdapter* ax, P1DArrayAdapter* ay, bool ad)
-    : PIDrawer()
-{
-  mAdDO = ad;
-  mAx = ax;
-  mAy = ay;
-  mName = "YfXDrawer";
-} 
-
-/* --Methode-- */
-PIYfXDrawer::~PIYfXDrawer()
-{
-  if (mAdDO && mAx)  delete mAx;
-  if (mAdDO && mAy)  delete mAy;
-}
-
-/* --Methode-- */
-void PIYfXDrawer::UpdateLimits()
-{
-  if ((mAx == NULL))  mSz = 0;
-  else {
-    if (!mAy)  mSz = mAx->Size();
-    else   mSz = (mAx->Size() < mAy->Size()) ? mAx->Size() :  mAy->Size();
-    }
-  if (mSz <= 0)  return;
-  double xmin, xmax, ymin, ymax;
-  int i=0;
-  double cv;
-  if (mAy) {
-    xmin = xmax = mAx->Value(0);
-    ymin = ymax = mAy->Value(0);
-    for(i=1; i<mSz; i++) {
-      cv = mAx->Value(i); 
-      if (cv < xmin)  xmin = cv;
-      if (cv > xmax)  xmax = cv;
-      cv = mAy->Value(i); 
-      if (cv < ymin)  ymin = cv;
-      if (cv > ymax)  ymax = cv;
-      }
-    }
-  else {
-    xmin = xmax = mAx->X(0);
-    ymin = ymax = mAx->Value(0);
-    for(i=1; i<mSz; i++) {
-      cv = mAx->X(i); 
-      if (cv < xmin)  xmin = cv;
-      if (cv > xmax)  xmax = cv;
-      cv = mAx->Value(i); 
-      if (cv < ymin)  ymin = cv;
-      if (cv > ymax)  ymax = cv;
-      }
-    }
-
-  double dx, dy;
-  dx = 0.02*(xmax-xmin);
-  dy = 0.02*(ymax-ymin);
-
-  SetLimits(xmin-dx, xmax+dx, ymin-dy, ymax+dy);
-  SetAxesFlags(kBoxAxes | kExtTicks | kLabels);
-}
-
-
-/* --Methode-- */
-void PIYfXDrawer::Draw(PIGraphicUC* g, double xmin, double ymin, double xmax, double ymax)
-{
-  double xp,yp;
-  int i;
-
-  if ((mAx == NULL))  mSz = 0;
-  else {
-    if (!mAy)  mSz = mAx->Size();
-    else   mSz = (mAx->Size() < mAy->Size()) ? mAx->Size() :  mAy->Size();
-    }
-  if (mSz <= 0)  return;
-
-//  Trace des markers 
-  if ( (mMrk != PI_NotDefMarker) ||  (mLAtt == PI_NotDefLineAtt) ) {
-    for(i=0; i<mSz; i++) {
-      if (mAy) { xp = mAx->Value(i); yp = mAy->Value(i); }
-      else { xp = mAx->X(i);  yp = mAx->Value(i); }
-      if ( (xp < xmin) || (xp > xmax) || (yp < ymin) || (yp > ymax) )  continue;
-      g->DrawMarker(xp, yp);
-    }
-  }
-
-  if (mLAtt == PI_NotDefLineAtt)    return;
-
-// Trace des lignes 
-  double xp2, yp2;
-  if (mAy) { xp2 = mAx->Value(0); yp2 = mAy->Value(0); }
-  else { xp2 = mAx->X(0);  yp2 = mAx->Value(0); }
-  for(i=1; i<mSz; i++) {
-    xp = xp2; yp = yp2;
-    if (mAy) { xp2 = mAx->Value(i); yp2 = mAy->Value(i); }
-    else { xp2 = mAx->X(i);  yp2 = mAx->Value(i); }
-    if ( ((xp < xmin) || (xp > xmax) || (yp < ymin) || (yp > ymax)) &&
-         ((xp2 < xmin) || (xp2 > xmax) || (yp2 < ymin) || (yp2 > ymax)) )  continue;
-    g->DrawLine(xp, yp, xp2, yp2);
-  }
-}
-
-
-//================================================================
-// PIFuncDrawer
-// Classe de traceur de fonction  double = f(fouble)
-//================================================================
-
-//++
-// Class        PIFuncDrawer
-// Lib          PI
-// include      piscdrawwdg.h
-//
-//      Classe de traceur de fonctions Y = f(double X).
-//--
-//++
-// Links        Parents
-// PIDrawer
-//--
-//++
-// Titre        Constructeur
-//--
-//++
-//  PIFuncDrawer(FUNC f)
-//      Cosntructeur de traceur d'une fonction "FUNC f" avec
-//|     typedef double(*FUNC)(double)
-//--
-
-
-/* --Methode-- */
-PIFuncDrawer::PIFuncDrawer(PIFuncDrawer::FUNC f)
-: mFunc(f)
-{}
-
-/* --Methode-- */
-PIFuncDrawer::~PIFuncDrawer()
-{
-}
-
-/* --Methode-- */
-void
-PIFuncDrawer::Draw(PIGraphicUC* g, double /*xmin*/, double/*ymin*/, double/*xmax*/, double/*ymax*/)
-{
-  PIGrCoord x1, x2, y1, y2;
-  g->GetGrSpace(x1, x2, y1, y2);
-  double xMax = x2;
-  double xMin = x1;
-  double yMax = y2;
-  double yMin = y1;
-  double xStep = (xMax - xMin)/100;
-  double xOld = xMin;
-  double yOld = mFunc(xMin);
-  for (double x = xMin+xStep; x<xMax; x+=xStep) {
-    double y = mFunc(x);
-    if (y>yMin && yOld>yMin && 
-        y<yMax && yOld<yMax) 
-           g->DrawLine(xOld, yOld, x, y);
-    xOld = x;
-    yOld = y;
-  }
-}
+

trunk/SophyaPI/PI/piscdrawwdg.h

@@ -1 +1 @@
 // This may look like C code, but it is really -*- C++ -*-
-// Module PI : Peida Interactive  PIScDrawWdg PIYfXDrawer
+// Module PI : Peida Interactive  PIScDrawWdg 
 // Gestionnaire Drawer-2D  E.Aubourg, R. Ansari  96-98
 // LAL (Orsay) / IN2P3-CNRS  DAPNIA/SPP (Saclay) / CEA
@@ -12 +12 @@
 #include PIWIN_H
 #include "pidrawer.h"
+#include "pieldrw.h"
 
 
@@ -121 +122 @@
 
 
-// ----------------------------------------------------------
-// Classe de traceur de points/fonction Y=F(x)
-// Trace Y=ay->Value() = f(X= ax->Value()) si ax et ay != NULL
-// Trace Y=ax->Value() = f(X= ax->X())  si ay == NULL
- 
-class P1DArrayAdapter;
-class PIYfXDrawer : public PIDrawer {
-public:
-                     PIYfXDrawer(P1DArrayAdapter* ax, P1DArrayAdapter* ay, bool ad);
-  virtual           ~PIYfXDrawer();
-  
-  virtual void       Draw(PIGraphicUC* g, double xmin, double ymin, double xmax, double ymax);
-  virtual void       UpdateLimits();
-  
-       
-protected:
-  P1DArrayAdapter* mAx;
-  P1DArrayAdapter* mAy;
-  int mSz;
-  bool mAdDO;
-};
-
-// ----------------------------------------------------------
-// Classe de traceur de fonction  double = f(fouble)
-// ----------------------------------------------------------
-
-class PIFuncDrawer : public PIDrawer {
-public:
-  typedef double(*FUNC)(double);
-                     PIFuncDrawer(FUNC);
-  virtual           ~PIFuncDrawer();
-  
-  virtual void       Draw(PIGraphicUC* g, double xmin, double ymin, double xmax, double ymax);
-protected:
-  FUNC               mFunc;
-};
 
 #endif

trunk/SophyaPI/PI/pisurfdr.cc

@@ -226 +226 @@
 
   PIGrCoord xg[5],yg[5],zg[5];
-  PIColors fgc; 
-
-
-  if (mCmapid == CMAP_OTHER) {   // Trace avec des lignes
-    if (mLAtt == PI_NotDefLineAtt)    g3->SelLine(PI_ThinLine);
-    fgc = ( mFCol == PI_NotDefColor ) ? PI_Black : mFCol;
+  PIColors mfcol = GetGraphicAtt().GetFgColor();
+  PIColors fgc = mfcol;
+
+
+  if (GetGraphicAtt().GetColMapId() == CMAP_OTHER) {   // Trace avec des lignes
+    if (GetGraphicAtt().GetLineAtt() == PI_NotDefLineAtt)    g3->SelLine(PI_ThinLine);
+    fgc = (mfcol  == PI_NotDefColor ) ? PI_Black : mfcol;
     for(l=0;l<k;l++) {
       i =  ijzp[l].ij%xsz;
@@ -254 +255 @@
   }
   else {   // Trace avec niveaux de couleur
-    PIColorMap* cmap = new PIColorMap(mCmapid);
-    PIColors fgc; 
-    if ( (mCmapid == CMAP_GREY32) || (mCmapid == CMAP_GREYINV32) || 
-         (mCmapid == CMAP_GREY128)  || (mCmapid == CMAP_GREYINV128) )
-      fgc = ( mFCol == PI_NotDefColor ) ? PI_Red : mFCol;
-    else  fgc = ( mFCol == PI_NotDefColor ) ? PI_Black : mFCol;
+    PIColorMap* cmap = new PIColorMap(GetGraphicAtt().GetColMapId());
+    CMapId mcmapid = GetGraphicAtt().GetColMapId();
+    if ( (mcmapid == CMAP_GREY32) || (mcmapid == CMAP_GREYINV32) || 
+         (mcmapid == CMAP_GREY128)  || (mcmapid == CMAP_GREYINV128) )
+      fgc = ( mfcol == PI_NotDefColor ) ? PI_Red : mfcol;
+    else  fgc = ( mfcol == PI_NotDefColor ) ? PI_Black : mfcol;
     for(l=0;l<k;l++) {
       i =  ijzp[l].ij%xsz;
@@ -275 +276 @@
       g3->DrawFPolygon3D(xg,yg,zg,5);
 // On trace 
-      if (mLAtt == PI_NotDefLineAtt)   continue;
+      if (GetGraphicAtt().GetLineAtt() == PI_NotDefLineAtt)   continue;
       g3->SelForeground(fgc);
       g3->DrawPolygon3D(xg,yg,zg,5);

trunk/SophyaPI/PI/psfile.cc

@@ -57 +57 @@
   \
   PI_RomanFont, PI_BoldFont, PI_ItalicFont, PI_NotDefFontAtt,\
-  PI_SmallSizeFont, PI_NormalSizeFont, PI_BigSizeFont, PI_NotDefFontSize, \
+  PI_SmallSizeFont, PI_NormalSizeFont, PI_LargeSizeFont, PI_NotDefFontSize, \
   \
   PI_NormalLine, PI_ThinLine, PI_ThickLine, PI_NotDefLineAtt
@@ -95 +95 @@
 %%/FS%-2d {8  scalefont setfont} bind def          %% PI_SmallSizeFont\n\
 %%/FS%-2d {12 scalefont setfont} bind def          %% PI_NormalSizeFont\n\
-%%/FS%-2d {16 scalefont setfont} bind def          %% PI_BigSizeFont\n\
+%%/FS%-2d {16 scalefont setfont} bind def          %% PI_LargeSizeFont\n\
 /FS%-2d {}                     bind def          %% PI_NotDefFontSize\n\
 /L%-2d  {1    slw} bind def                      %% PI_NormalLine\n\