Changeset 2544 in Sophya

Timestamp:

Jun 1, 2004, 5:49:36 PM (21 years ago)

Author:

ansari

Message:

1/ Decodage options pour PIBarGraph et MAJ Makefile suite ajout PITextDrawer
2/ Suite (interruption de plusieurs mois) amelioration gestion des axes
et autoscale X/Y , Z ds les Drawers 3D et PIDraw3DWdg

Reza , 1 Juin 2004

Location:

trunk/SophyaPI/PI

Files:

• Makefile (modified) (2 diffs)
• pi3ddrw.cc (modified) (2 diffs)
• pi3ddrw.h (modified) (3 diffs)
• pi3dwdg.cc (modified) (7 diffs)
• pi3dwdg.h (modified) (3 diffs)
• pibargraph.cc (modified) (4 diffs)
• pibargraph.h (modified) (2 diffs)
• pisurfdr.cc (modified) (4 diffs)
• pisurfdr.h (modified) (1 diff)

trunk/SophyaPI/PI/Makefile

@@ -4 +4 @@
  
 all: $(LIB)libPI.a
-$(LIB)libPI.a : $(OBJ)lut.o $(OBJ)parradapter.o $(OBJ)pi3ddrw.o $(OBJ)pi3dwdg.o $(OBJ)piapplgen.o $(OBJ)piapplx.o $(OBJ)piaxes.o $(OBJ)piaxestools.o $(OBJ)pibargraph.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)pigrcoord.o $(OBJ)piimage.o $(OBJ)piimgtools.o $(OBJ)pilineatt.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
+$(LIB)libPI.a : $(OBJ)lut.o $(OBJ)parradapter.o $(OBJ)pi3ddrw.o $(OBJ)pi3dwdg.o $(OBJ)piapplgen.o $(OBJ)piapplx.o $(OBJ)piaxes.o $(OBJ)piaxestools.o $(OBJ)pibargraph.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)pigrcoord.o $(OBJ)piimage.o $(OBJ)piimgtools.o $(OBJ)pilineatt.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)pitxtdrw.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)pi3dwdg.o $(OBJ)piapplgen.o $(OBJ)piapplx.o $(OBJ)piaxes.o $(OBJ)piaxestools.o $(OBJ)pibargraph.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)pigrcoord.o $(OBJ)piimage.o $(OBJ)piimgtools.o $(OBJ)pilineatt.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
+        rm -f $(OBJ)lut.o $(OBJ)parradapter.o $(OBJ)pi3ddrw.o $(OBJ)pi3dwdg.o $(OBJ)piapplgen.o $(OBJ)piapplx.o $(OBJ)piaxes.o $(OBJ)piaxestools.o $(OBJ)pibargraph.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)pigrcoord.o $(OBJ)piimage.o $(OBJ)piimgtools.o $(OBJ)pilineatt.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)pitxtdrw.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
 endif 
  
-$(OBJ)lut.o: lut.cc $(INC)machdefs.h \
-  $(INC)osx_values.h lut.h
+$(OBJ)lut.o: lut.cc $(INC)machdefs.h lut.h
 $(OBJ)parradapter.o: parradapter.cc parradapter.h \
-  $(INC)machdefs.h \
-  $(INC)osx_values.h lut.h
+ $(INC)machdefs.h lut.h
 $(OBJ)pi3ddrw.o: pi3ddrw.cc pi3ddrw.h pisysdep.h \
-  $(INC)machdefs.h \
-  $(INC)osx_values.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 pigrcoord.h pilineatt.h \
-  pigraphuc.h pievthandler.h psfile.h pigratt.h piaxes.h pieldrw.h \
-  pigraph3d.h
+ $(INC)machdefs.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 pigrcoord.h \
+ pilineatt.h pigraphuc.h pievthandler.h psfile.h pigratt.h piaxes.h \
+ pieldrw.h pigraph3d.h
 $(OBJ)pi3dwdg.o: pi3dwdg.cc pi3dwdg.h pisysdep.h \
-  $(INC)machdefs.h \
-  $(INC)osx_values.h pi3ddrw.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 pigrcoord.h \
-  pilineatt.h pigraphuc.h pievthandler.h psfile.h pigratt.h piaxes.h \
-  pieldrw.h pigraph3d.h pibwdgx.h pigraphps.h pidrwtools.h pistdwdgx.h \
-  pistdwdggen.h pimenux.h pimenugen.h pioptmenux.h pioptmenugen.h \
-  piwindowx.h piwindowgen.h picontainerx.h picontainergen.h piapplx.h \
-  piapplgen.h pimenubarx.h pimenubargen.h picons.h
+ $(INC)machdefs.h pi3ddrw.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 \
+ pigrcoord.h pilineatt.h pigraphuc.h pievthandler.h psfile.h pigratt.h \
+ piaxes.h pieldrw.h pigraph3d.h pibwdgx.h pigraphps.h pidrwtools.h \
+ pistdwdgx.h pistdwdggen.h pimenux.h pimenugen.h pioptmenux.h \
+ pioptmenugen.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 \
-  $(INC)osx_values.h pisysdep.h picontainerx.h \
-  picontainergen.h piwdgx.h piwdggen.h picolist.h pimenubarx.h \
-  pimenubargen.h pimenux.h pimenugen.h picons.h pistdwdgx.h pistdwdggen.h \
-  pibwdgx.h pibwdggen.h picmap.h picmapx.h picmapgen.h pigraphx.h \
-  pigraphgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h pigraphuc.h \
-  pievthandler.h psfile.h pigraphps.h
+ $(INC)machdefs.h pisysdep.h picontainerx.h \
+ picontainergen.h piwdgx.h piwdggen.h picolist.h pimenubarx.h \
+ pimenubargen.h pimenux.h pimenugen.h picons.h pistdwdgx.h \
+ pistdwdggen.h pibwdgx.h pibwdggen.h picmap.h picmapx.h picmapgen.h \
+ pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h \
+ pigraphuc.h pievthandler.h psfile.h pigraphps.h
 $(OBJ)piapplx.o: piapplx.cc piapplx.h piapplgen.h pimsghandler.h \
-  $(INC)machdefs.h \
-  $(INC)osx_values.h pisysdep.h picontainerx.h \
-  picontainergen.h piwdgx.h piwdggen.h picolist.h pimenubarx.h \
-  pimenubargen.h pimenux.h pimenugen.h picons.h pistdwdgx.h pistdwdggen.h \
-  pibwdgx.h pibwdggen.h picmap.h picmapx.h picmapgen.h pigraphx.h \
-  pigraphgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h pigraphuc.h \
-  pievthandler.h psfile.h pigraphps.h
-$(OBJ)piaxes.o: piaxes.cc $(INC)machdefs.h \
-  $(INC)osx_values.h piaxes.h pigraphuc.h pisysdep.h \
-  pigraphgen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h picmap.h \
-  picmapx.h picmapgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h \
-  pigratt.h
+ $(INC)machdefs.h pisysdep.h picontainerx.h \
+ picontainergen.h piwdgx.h piwdggen.h picolist.h pimenubarx.h \
+ pimenubargen.h pimenux.h pimenugen.h picons.h pistdwdgx.h \
+ pistdwdggen.h pibwdgx.h pibwdggen.h picmap.h picmapx.h picmapgen.h \
+ pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h \
+ pigraphuc.h pievthandler.h psfile.h pigraphps.h
+$(OBJ)piaxes.o: piaxes.cc $(INC)machdefs.h piaxes.h \
+ pigraphuc.h pisysdep.h pigraphgen.h piwdgx.h piwdggen.h \
+ pimsghandler.h picolist.h picmap.h picmapx.h picmapgen.h pifontx.h \
+ pifontgen.h pigrcoord.h pilineatt.h pigratt.h
 $(OBJ)piaxestools.o: piaxestools.cc piaxes.h pigraphuc.h pisysdep.h \
-  $(INC)machdefs.h \
-  $(INC)osx_values.h pigraphgen.h piwdgx.h piwdggen.h \
-  pimsghandler.h picolist.h picmap.h picmapx.h picmapgen.h pifontx.h \
-  pifontgen.h pigrcoord.h pilineatt.h pigratt.h piaxestools.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 pibwdgx.h pibwdggen.h \
-  pigraphx.h pievthandler.h psfile.h pigraphps.h piscdrawwdg.h pidrawer.h \
-  pieldrw.h
+ $(INC)machdefs.h pigraphgen.h piwdgx.h \
+ piwdggen.h pimsghandler.h picolist.h picmap.h picmapx.h picmapgen.h \
+ pifontx.h pifontgen.h pigrcoord.h pilineatt.h pigratt.h piaxestools.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 pibwdgx.h \
+ pibwdggen.h pigraphx.h pievthandler.h psfile.h pigraphps.h \
+ piscdrawwdg.h pidrawer.h pieldrw.h
 $(OBJ)pibargraph.o: pibargraph.cc $(INC)machdefs.h \
-  $(INC)osx_values.h pibargraph.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 pigrcoord.h pilineatt.h pigraphuc.h pievthandler.h psfile.h \
-  pigratt.h piaxes.h
+ pibargraph.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 pigrcoord.h pilineatt.h \
+ pigraphuc.h pievthandler.h psfile.h pigratt.h piaxes.h
 $(OBJ)pibwdggen.o: pibwdggen.cc pibwdggen.h pisysdep.h \
-  $(INC)machdefs.h \
-  $(INC)osx_values.h piwdgx.h piwdggen.h \
-  pimsghandler.h picolist.h picmap.h picmapx.h picmapgen.h pigraphx.h \
-  pigraphgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h pigraphuc.h \
-  pievthandler.h psfile.h pidrawer.h pigratt.h piaxes.h pigraphps.h \
-  pidrwtools.h pistdwdgx.h pistdwdggen.h pimenux.h pimenugen.h \
-  pioptmenux.h pioptmenugen.h piwindowx.h piwindowgen.h picontainerx.h \
-  picontainergen.h piapplx.h piapplgen.h pimenubarx.h pimenubargen.h \
-  picons.h pibwdgx.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 pigrcoord.h pilineatt.h \
+ pigraphuc.h pievthandler.h psfile.h pidrawer.h pigratt.h piaxes.h \
+ pigraphps.h pidrwtools.h pistdwdgx.h pistdwdggen.h pimenux.h \
+ pimenugen.h pioptmenux.h pioptmenugen.h piwindowx.h piwindowgen.h \
+ picontainerx.h picontainergen.h piapplx.h piapplgen.h pimenubarx.h \
+ pimenubargen.h picons.h pibwdgx.h
 $(OBJ)pibwdgx.o: pibwdgx.cc pixtbaseP.h pibwdgx.h pisysdep.h \
-  $(INC)machdefs.h \
-  $(INC)osx_values.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 pigrcoord.h pilineatt.h pigraphuc.h \
-  pievthandler.h psfile.h pigraphps.h pixtbase.h
+ $(INC)machdefs.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 pigrcoord.h pilineatt.h \
+ pigraphuc.h pievthandler.h psfile.h pigraphps.h pixtbase.h
 $(OBJ)picmap.o: picmap.cc picmap.h pisysdep.h \
-  $(INC)machdefs.h \
-  $(INC)osx_values.h picmapx.h picmapgen.h
+ $(INC)machdefs.h picmapx.h picmapgen.h
 $(OBJ)picmapgen.o: picmapgen.cc picmapgen.h pisysdep.h \
-  $(INC)machdefs.h \
-  $(INC)osx_values.h picmapx.h picmap.h
+ $(INC)machdefs.h picmapx.h picmap.h
 $(OBJ)picmapview.o: picmapview.cc picmapview.h pisysdep.h \
-  $(INC)machdefs.h \
-  $(INC)osx_values.h pibwdgx.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 pigrcoord.h pilineatt.h \
-  pigraphuc.h pievthandler.h psfile.h pigraphps.h
+ $(INC)machdefs.h pibwdgx.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 pigrcoord.h \
+ pilineatt.h pigraphuc.h pievthandler.h psfile.h pigraphps.h
 $(OBJ)picmapx.o: picmapx.cc piwdgx.h piwdggen.h \
-  $(INC)machdefs.h \
-  $(INC)osx_values.h pimsghandler.h picolist.h \
-  picmapx.h picmapgen.h pisysdep.h
-$(OBJ)picons.o: picons.cc pisysdep.h $(INC)machdefs.h \
-  $(INC)osx_values.h pimenux.h pimenugen.h piwdgx.h \
-  piwdggen.h pimsghandler.h picolist.h picons.h pistdwdgx.h pistdwdggen.h \
-  picontainerx.h picontainergen.h pibwdgx.h pibwdggen.h picmap.h \
-  picmapx.h picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h \
-  pigrcoord.h pilineatt.h pigraphuc.h pievthandler.h psfile.h pigraphps.h
+ $(INC)machdefs.h pimsghandler.h picolist.h \
+ picmapx.h picmapgen.h pisysdep.h
+$(OBJ)picons.o: picons.cc pisysdep.h \
+ $(INC)machdefs.h pimenux.h pimenugen.h \
+ piwdgx.h piwdggen.h pimsghandler.h picolist.h picons.h pistdwdgx.h \
+ pistdwdggen.h picontainerx.h picontainergen.h pibwdgx.h pibwdggen.h \
+ picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h pifontx.h \
+ pifontgen.h pigrcoord.h pilineatt.h pigraphuc.h pievthandler.h \
+ psfile.h pigraphps.h
 $(OBJ)picontainergen.o: picontainergen.cc picontainergen.h pisysdep.h \
-  $(INC)machdefs.h \
-  $(INC)osx_values.h piwdgx.h piwdggen.h \
-  pimsghandler.h picolist.h
+ $(INC)machdefs.h piwdgx.h piwdggen.h \
+ pimsghandler.h picolist.h
 $(OBJ)picontainerx.o: picontainerx.cc picontainerx.h pisysdep.h \
-  $(INC)machdefs.h \
-  $(INC)osx_values.h picontainergen.h piwdgx.h \
-  piwdggen.h pimsghandler.h picolist.h
+ $(INC)machdefs.h picontainergen.h piwdgx.h \
+ piwdggen.h pimsghandler.h picolist.h
 $(OBJ)pidrawer.o: pidrawer.cc $(INC)machdefs.h \
-  $(INC)osx_values.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 \
-  pigrcoord.h pilineatt.h pigraphuc.h pievthandler.h psfile.h pigratt.h \
-  piaxes.h pidrwtools.h pistdwdgx.h pistdwdggen.h pimenux.h pimenugen.h \
-  pioptmenux.h pioptmenugen.h piwindowx.h piwindowgen.h picontainerx.h \
-  picontainergen.h piapplx.h piapplgen.h pimenubarx.h pimenubargen.h \
-  picons.h pibwdgx.h pigraphps.h ucckprot.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 pigrcoord.h pilineatt.h pigraphuc.h \
+ pievthandler.h psfile.h pigratt.h piaxes.h pidrwtools.h pistdwdgx.h \
+ pistdwdggen.h pimenux.h pimenugen.h pioptmenux.h pioptmenugen.h \
+ piwindowx.h piwindowgen.h picontainerx.h picontainergen.h piapplx.h \
+ piapplgen.h pimenubarx.h pimenubargen.h picons.h pibwdgx.h \
+ pigraphps.h ucckprot.h
 $(OBJ)pidrawwin.o: pidrawwin.cc pidrawwin.h pisysdep.h \
-  $(INC)machdefs.h \
-  $(INC)osx_values.h piwindowx.h piwindowgen.h \
-  picontainerx.h picontainergen.h piwdgx.h piwdggen.h pimsghandler.h \
-  picolist.h piscdrawwdg.h pibwdgx.h pibwdggen.h picmap.h picmapx.h \
-  picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigrcoord.h \
-  pilineatt.h pigraphuc.h pievthandler.h psfile.h pigraphps.h pistdwdgx.h \
-  pistdwdggen.h pidrawer.h pigratt.h piaxes.h pieldrw.h
+ $(INC)machdefs.h piwindowx.h piwindowgen.h \
+ picontainerx.h picontainergen.h piwdgx.h piwdggen.h pimsghandler.h \
+ picolist.h piscdrawwdg.h pibwdgx.h pibwdggen.h picmap.h picmapx.h \
+ picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigrcoord.h \
+ pilineatt.h pigraphuc.h pievthandler.h psfile.h pigraphps.h \
+ pistdwdgx.h pistdwdggen.h pidrawer.h pigratt.h piaxes.h pieldrw.h
 $(OBJ)pidrwtools.o: pidrwtools.cc pidrwtools.h pisysdep.h \
-  $(INC)machdefs.h \
-  $(INC)osx_values.h pistdwdgx.h pistdwdggen.h \
-  piwdgx.h piwdggen.h pimsghandler.h picolist.h pimenux.h pimenugen.h \
-  pioptmenux.h pioptmenugen.h piwindowx.h piwindowgen.h picontainerx.h \
-  picontainergen.h piapplx.h piapplgen.h pimenubarx.h pimenubargen.h \
-  picons.h pibwdgx.h pibwdggen.h picmap.h picmapx.h picmapgen.h \
-  pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h \
-  pigraphuc.h pievthandler.h psfile.h pigraphps.h piscdrawwdg.h \
-  pidrawer.h pigratt.h piaxes.h pieldrw.h pi3dwdg.h pi3ddrw.h pigraph3d.h
+ $(INC)machdefs.h pistdwdgx.h pistdwdggen.h \
+ piwdgx.h piwdggen.h pimsghandler.h picolist.h pimenux.h pimenugen.h \
+ pioptmenux.h pioptmenugen.h piwindowx.h piwindowgen.h picontainerx.h \
+ picontainergen.h piapplx.h piapplgen.h pimenubarx.h pimenubargen.h \
+ picons.h pibwdgx.h pibwdggen.h picmap.h picmapx.h picmapgen.h \
+ pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h \
+ pigraphuc.h pievthandler.h psfile.h pigraphps.h piscdrawwdg.h \
+ pidrawer.h pigratt.h piaxes.h pieldrw.h pi3dwdg.h pi3ddrw.h \
+ pigraph3d.h
 $(OBJ)pieldrw.o: pieldrw.cc $(INC)machdefs.h \
-  $(INC)osx_values.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 \
-  pigrcoord.h pilineatt.h pigraphuc.h pievthandler.h psfile.h pigratt.h \
-  piaxes.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 pigrcoord.h pilineatt.h \
+ pigraphuc.h pievthandler.h psfile.h pigratt.h piaxes.h
 $(OBJ)pievthandler.o: pievthandler.cc pievthandler.h pisysdep.h \
-  $(INC)machdefs.h \
-  $(INC)osx_values.h pimsghandler.h piwdgx.h \
-  piwdggen.h picolist.h pigraphx.h pigraphgen.h picmap.h picmapx.h \
-  picmapgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h
+ $(INC)machdefs.h pimsghandler.h piwdgx.h \
+ piwdggen.h picolist.h pigraphx.h pigraphgen.h picmap.h picmapx.h \
+ picmapgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h
 $(OBJ)pifilechogen.o: pifilechogen.cc pifilechogen.h pisysdep.h \
-  $(INC)machdefs.h \
-  $(INC)osx_values.h piwdgx.h piwdggen.h \
-  pimsghandler.h picolist.h
+ $(INC)machdefs.h piwdgx.h piwdggen.h \
+ pimsghandler.h picolist.h
 $(OBJ)pifilechox.o: pifilechox.cc pisysdep.h \
-  $(INC)machdefs.h \
-  $(INC)osx_values.h piapplx.h piapplgen.h \
-  pimsghandler.h picontainerx.h picontainergen.h piwdgx.h piwdggen.h \
-  picolist.h pimenubarx.h pimenubargen.h pimenux.h pimenugen.h picons.h \
-  pistdwdgx.h pistdwdggen.h pibwdgx.h pibwdggen.h picmap.h picmapx.h \
-  picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigrcoord.h \
-  pilineatt.h pigraphuc.h pievthandler.h psfile.h pigraphps.h \
-  pifilechox.h pifilechogen.h piwindowx.h piwindowgen.h
+ $(INC)machdefs.h piapplx.h piapplgen.h \
+ pimsghandler.h picontainerx.h picontainergen.h piwdgx.h piwdggen.h \
+ picolist.h pimenubarx.h pimenubargen.h pimenux.h pimenugen.h picons.h \
+ pistdwdgx.h pistdwdggen.h pibwdgx.h pibwdggen.h picmap.h picmapx.h \
+ picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigrcoord.h \
+ pilineatt.h pigraphuc.h pievthandler.h psfile.h pigraphps.h \
+ pifilechox.h pifilechogen.h piwindowx.h piwindowgen.h
 $(OBJ)pifontgen.o: pifontgen.cc pigraphgen.h pisysdep.h \
-  $(INC)machdefs.h \
-  $(INC)osx_values.h piwdgx.h piwdggen.h \
-  pimsghandler.h picolist.h picmap.h picmapx.h picmapgen.h pifontx.h \
-  pifontgen.h pigrcoord.h pilineatt.h
-$(OBJ)pifontx.o: pifontx.cc pisysdep.h $(INC)machdefs.h \
-  $(INC)osx_values.h pifontx.h pifontgen.h piwdgx.h \
-  piwdggen.h pimsghandler.h picolist.h
+ $(INC)machdefs.h piwdgx.h piwdggen.h \
+ pimsghandler.h picolist.h picmap.h picmapx.h picmapgen.h pifontx.h \
+ pifontgen.h pigrcoord.h pilineatt.h
+$(OBJ)pifontx.o: pifontx.cc pisysdep.h \
+ $(INC)machdefs.h pifontx.h pifontgen.h \
+ piwdgx.h piwdggen.h pimsghandler.h picolist.h
 $(OBJ)pigraph3d.o: pigraph3d.cc pigraph3d.h pisysdep.h \
-  $(INC)machdefs.h \
-  $(INC)osx_values.h pigraphuc.h pigraphgen.h \
-  piwdgx.h piwdggen.h pimsghandler.h picolist.h picmap.h picmapx.h \
-  picmapgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h
+ $(INC)machdefs.h pigraphuc.h pigraphgen.h \
+ piwdgx.h piwdggen.h pimsghandler.h picolist.h picmap.h picmapx.h \
+ picmapgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h
 $(OBJ)pigraphgen.o: pigraphgen.cc pigraphgen.h pisysdep.h \
-  $(INC)machdefs.h \
-  $(INC)osx_values.h piwdgx.h piwdggen.h \
-  pimsghandler.h picolist.h picmap.h picmapx.h picmapgen.h pifontx.h \
-  pifontgen.h pigrcoord.h pilineatt.h ucckprot.h
+ $(INC)machdefs.h piwdgx.h piwdggen.h \
+ pimsghandler.h picolist.h picmap.h picmapx.h picmapgen.h pifontx.h \
+ pifontgen.h pigrcoord.h pilineatt.h ucckprot.h
 $(OBJ)pigraphps.o: pigraphps.cc pigraphps.h pisysdep.h \
-  $(INC)machdefs.h \
-  $(INC)osx_values.h pigraphgen.h piwdgx.h piwdggen.h \
-  pimsghandler.h picolist.h picmap.h picmapx.h picmapgen.h pifontx.h \
-  pifontgen.h pigrcoord.h pilineatt.h psfile.h
+ $(INC)machdefs.h pigraphgen.h piwdgx.h \
+ piwdggen.h pimsghandler.h picolist.h picmap.h picmapx.h picmapgen.h \
+ pifontx.h pifontgen.h pigrcoord.h pilineatt.h psfile.h
 $(OBJ)pigraphuc.o: pigraphuc.cc $(INC)machdefs.h \
-  $(INC)osx_values.h pigraphuc.h pisysdep.h \
-  pigraphgen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h picmap.h \
-  picmapx.h picmapgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h \
-  ucckprot.h
+ pigraphuc.h pisysdep.h pigraphgen.h piwdgx.h piwdggen.h \
+ pimsghandler.h picolist.h picmap.h picmapx.h picmapgen.h pifontx.h \
+ pifontgen.h pigrcoord.h pilineatt.h ucckprot.h
 $(OBJ)pigraphx.o: pigraphx.cc pigraphx.h pisysdep.h \
-  $(INC)machdefs.h \
-  $(INC)osx_values.h pigraphgen.h piwdgx.h piwdggen.h \
-  pimsghandler.h picolist.h picmap.h picmapx.h picmapgen.h pifontx.h \
-  pifontgen.h pigrcoord.h pilineatt.h
+ $(INC)machdefs.h pigraphgen.h piwdgx.h \
+ piwdggen.h pimsghandler.h picolist.h picmap.h picmapx.h picmapgen.h \
+ pifontx.h pifontgen.h pigrcoord.h pilineatt.h
 $(OBJ)pigratt.o: pigratt.cc pigratt.h pisysdep.h \
-  $(INC)machdefs.h \
-  $(INC)osx_values.h pigraphgen.h piwdgx.h piwdggen.h \
-  pimsghandler.h picolist.h picmap.h picmapx.h picmapgen.h pifontx.h \
-  pifontgen.h pigrcoord.h pilineatt.h \
-  $(INC)strutilxx.h
+ $(INC)machdefs.h pigraphgen.h piwdgx.h \
+ piwdggen.h pimsghandler.h picolist.h picmap.h picmapx.h picmapgen.h \
+ pifontx.h pifontgen.h pigrcoord.h pilineatt.h \
+ $(INC)strutilxx.h
 $(OBJ)pigrcoord.o: pigrcoord.cc pigrcoord.h pisysdep.h \
-  $(INC)machdefs.h \
-  $(INC)osx_values.h
-$(OBJ)piimage.o: piimage.cc pisysdep.h $(INC)machdefs.h \
-  $(INC)osx_values.h piimage.h parradapter.h lut.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 pigrcoord.h pilineatt.h pigraphuc.h \
-  pievthandler.h psfile.h pigratt.h piaxes.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
+ $(INC)machdefs.h
+$(OBJ)piimage.o: piimage.cc pisysdep.h \
+ $(INC)machdefs.h piimage.h parradapter.h \
+ lut.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 pigrcoord.h pilineatt.h \
+ pigraphuc.h pievthandler.h psfile.h pigratt.h piaxes.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 \
-  $(INC)osx_values.h pistdwdgx.h pistdwdggen.h \
-  piwdgx.h piwdggen.h pimsghandler.h picolist.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 pibwdgx.h pibwdggen.h picmap.h picmapx.h \
-  picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigrcoord.h \
-  pilineatt.h pigraphuc.h pievthandler.h psfile.h pigraphps.h piimage.h \
-  parradapter.h lut.h pieldrw.h pidrawer.h pigratt.h piaxes.h pipixmapx.h \
-  pipixmapgen.h picmapview.h
+ $(INC)machdefs.h pistdwdgx.h pistdwdggen.h \
+ piwdgx.h piwdggen.h pimsghandler.h picolist.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 pibwdgx.h pibwdggen.h picmap.h picmapx.h \
+ picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigrcoord.h \
+ pilineatt.h pigraphuc.h pievthandler.h psfile.h pigraphps.h piimage.h \
+ parradapter.h lut.h pieldrw.h pidrawer.h pigratt.h piaxes.h \
+ pipixmapx.h pipixmapgen.h picmapview.h
 $(OBJ)pilineatt.o: pilineatt.cc pilineatt.h pisysdep.h \
-  $(INC)machdefs.h \
-  $(INC)osx_values.h
+ $(INC)machdefs.h
 $(OBJ)pilistgen.o: pilistgen.cc pilistgen.h pisysdep.h \
-  $(INC)machdefs.h \
-  $(INC)osx_values.h piwdgx.h piwdggen.h \
-  pimsghandler.h picolist.h
+ $(INC)machdefs.h piwdgx.h piwdggen.h \
+ pimsghandler.h picolist.h
 $(OBJ)pilistx.o: pilistx.cc pilistx.h pilistgen.h pisysdep.h \
-  $(INC)machdefs.h \
-  $(INC)osx_values.h piwdgx.h piwdggen.h \
-  pimsghandler.h picolist.h picontainerx.h picontainergen.h
+ $(INC)machdefs.h piwdgx.h piwdggen.h \
+ pimsghandler.h picolist.h picontainerx.h picontainergen.h
 $(OBJ)pimenubargen.o: pimenubargen.cc pimenubargen.h pisysdep.h \
-  $(INC)machdefs.h \
-  $(INC)osx_values.h pimenux.h pimenugen.h piwdgx.h \
-  piwdggen.h pimsghandler.h picolist.h piapplx.h piapplgen.h \
-  picontainerx.h picontainergen.h pimenubarx.h picons.h pistdwdgx.h \
-  pistdwdggen.h pibwdgx.h pibwdggen.h picmap.h picmapx.h picmapgen.h \
-  pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h \
-  pigraphuc.h pievthandler.h psfile.h pigraphps.h
+ $(INC)machdefs.h pimenux.h pimenugen.h \
+ piwdgx.h piwdggen.h pimsghandler.h picolist.h piapplx.h piapplgen.h \
+ picontainerx.h picontainergen.h pimenubarx.h picons.h pistdwdgx.h \
+ pistdwdggen.h pibwdgx.h pibwdggen.h picmap.h picmapx.h picmapgen.h \
+ pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h \
+ pigraphuc.h pievthandler.h psfile.h pigraphps.h
 $(OBJ)pimenubarx.o: pimenubarx.cc pimenubarx.h pimenubargen.h pisysdep.h \
-  $(INC)machdefs.h \
-  $(INC)osx_values.h pimenux.h pimenugen.h piwdgx.h \
-  piwdggen.h pimsghandler.h picolist.h piapplx.h piapplgen.h \
-  picontainerx.h picontainergen.h picons.h pistdwdgx.h pistdwdggen.h \
-  pibwdgx.h pibwdggen.h picmap.h picmapx.h picmapgen.h pigraphx.h \
-  pigraphgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h pigraphuc.h \
-  pievthandler.h psfile.h pigraphps.h
+ $(INC)machdefs.h pimenux.h pimenugen.h \
+ piwdgx.h piwdggen.h pimsghandler.h picolist.h piapplx.h piapplgen.h \
+ picontainerx.h picontainergen.h picons.h pistdwdgx.h pistdwdggen.h \
+ pibwdgx.h pibwdggen.h picmap.h picmapx.h picmapgen.h pigraphx.h \
+ pigraphgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h \
+ pigraphuc.h pievthandler.h psfile.h pigraphps.h
 $(OBJ)pimenugen.o: pimenugen.cc pimenugen.h pisysdep.h \
-  $(INC)machdefs.h \
-  $(INC)osx_values.h piwdgx.h piwdggen.h \
-  pimsghandler.h picolist.h
-$(OBJ)pimenux.o: pimenux.cc pisysdep.h $(INC)machdefs.h \
-  $(INC)osx_values.h pimenubarx.h pimenubargen.h \
-  pimenux.h pimenugen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h
+ $(INC)machdefs.h piwdgx.h piwdggen.h \
+ pimsghandler.h picolist.h
+$(OBJ)pimenux.o: pimenux.cc pisysdep.h \
+ $(INC)machdefs.h pimenubarx.h pimenubargen.h \
+ pimenux.h pimenugen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h
 $(OBJ)pimsghandler.o: pimsghandler.cc pimsghandler.h \
-  $(INC)machdefs.h \
-  $(INC)osx_values.h
+ $(INC)machdefs.h
 $(OBJ)pioptmenugen.o: pioptmenugen.cc pioptmenugen.h pisysdep.h \
-  $(INC)machdefs.h \
-  $(INC)osx_values.h pimenux.h pimenugen.h piwdgx.h \
-  piwdggen.h pimsghandler.h picolist.h
+ $(INC)machdefs.h pimenux.h pimenugen.h \
+ piwdgx.h piwdggen.h pimsghandler.h picolist.h
 $(OBJ)pioptmenux.o: pioptmenux.cc pisysdep.h \
-  $(INC)machdefs.h \
-  $(INC)osx_values.h pioptmenux.h pioptmenugen.h \
-  pimenux.h pimenugen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
-  pistdwdgx.h pistdwdggen.h piapplx.h piapplgen.h picontainerx.h \
-  picontainergen.h pimenubarx.h pimenubargen.h picons.h pibwdgx.h \
-  pibwdggen.h picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h \
-  pifontx.h pifontgen.h pigrcoord.h pilineatt.h pigraphuc.h \
-  pievthandler.h psfile.h pigraphps.h
+ $(INC)machdefs.h pioptmenux.h pioptmenugen.h \
+ pimenux.h pimenugen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+ pistdwdgx.h pistdwdggen.h piapplx.h piapplgen.h picontainerx.h \
+ picontainergen.h pimenubarx.h pimenubargen.h picons.h pibwdgx.h \
+ pibwdggen.h picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h \
+ pifontx.h pifontgen.h pigrcoord.h pilineatt.h pigraphuc.h \
+ pievthandler.h psfile.h pigraphps.h
 $(OBJ)piperiodx.o: piperiodx.cc piwdgx.h piwdggen.h \
-  $(INC)machdefs.h \
-  $(INC)osx_values.h pimsghandler.h picolist.h \
-  piperiodx.h $(INC)periodic.h
+ $(INC)machdefs.h pimsghandler.h picolist.h \
+ piperiodx.h $(INC)periodic.h
 $(OBJ)pipixmapgen.o: pipixmapgen.cc pipixmapgen.h pisysdep.h \
-  $(INC)machdefs.h \
-  $(INC)osx_values.h pibwdgx.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 pigrcoord.h pilineatt.h \
-  pigraphuc.h pievthandler.h psfile.h pigraphps.h
+ $(INC)machdefs.h pibwdgx.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 pigrcoord.h \
+ pilineatt.h pigraphuc.h pievthandler.h psfile.h pigraphps.h
 $(OBJ)pipixmapx.o: pipixmapx.cc pipixmapx.h pipixmapgen.h pisysdep.h \
-  $(INC)machdefs.h \
-  $(INC)osx_values.h pibwdgx.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 pigrcoord.h pilineatt.h \
-  pigraphuc.h pievthandler.h psfile.h pigraphps.h
-$(OBJ)piscdrawwdg.o: piscdrawwdg.cc $(INC)machdefs.h \
-  $(INC)osx_values.h piscdrawwdg.h pisysdep.h \
-  pibwdgx.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 pigrcoord.h pilineatt.h pigraphuc.h pievthandler.h psfile.h \
-  pigraphps.h pistdwdgx.h pistdwdggen.h piwindowx.h piwindowgen.h \
-  picontainerx.h picontainergen.h pidrawer.h pigratt.h piaxes.h pieldrw.h \
-  pidrwtools.h pimenux.h pimenugen.h pioptmenux.h pioptmenugen.h \
-  piapplx.h piapplgen.h pimenubarx.h pimenubargen.h picons.h \
-  piaxestools.h
+ $(INC)machdefs.h pibwdgx.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 pigrcoord.h \
+ pilineatt.h pigraphuc.h pievthandler.h psfile.h pigraphps.h
+$(OBJ)piscdrawwdg.o: piscdrawwdg.cc \
+ $(INC)machdefs.h piscdrawwdg.h pisysdep.h \
+ pibwdgx.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 pigrcoord.h pilineatt.h pigraphuc.h pievthandler.h \
+ psfile.h pigraphps.h pistdwdgx.h pistdwdggen.h piwindowx.h \
+ piwindowgen.h picontainerx.h picontainergen.h pidrawer.h pigratt.h \
+ piaxes.h pieldrw.h pidrwtools.h pimenux.h pimenugen.h pioptmenux.h \
+ pioptmenugen.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 \
-  $(INC)osx_values.h piwdgx.h piwdggen.h \
-  pimsghandler.h picolist.h
-$(OBJ)pistdwdgx.o: pistdwdgx.cc pisysdep.h $(INC)machdefs.h \
-  $(INC)osx_values.h pistdwdgx.h pistdwdggen.h \
-  piwdgx.h piwdggen.h pimsghandler.h picolist.h picontainerx.h \
-  picontainergen.h
+ $(INC)machdefs.h piwdgx.h piwdggen.h \
+ pimsghandler.h picolist.h
+$(OBJ)pistdwdgx.o: pistdwdgx.cc pisysdep.h \
+ $(INC)machdefs.h pistdwdgx.h pistdwdggen.h \
+ piwdgx.h piwdggen.h pimsghandler.h picolist.h picontainerx.h \
+ picontainergen.h
 $(OBJ)pistzwin.o: pistzwin.cc pistzwin.h pisysdep.h \
-  $(INC)machdefs.h \
-  $(INC)osx_values.h piwindowx.h piwindowgen.h \
-  picontainerx.h picontainergen.h piwdgx.h piwdggen.h pimsghandler.h \
-  picolist.h piperiodx.h $(INC)periodic.h psfile.h \
-  pifontgen.h pigraphgen.h picmap.h picmapx.h picmapgen.h pifontx.h \
-  pigrcoord.h pilineatt.h
+ $(INC)machdefs.h piwindowx.h piwindowgen.h \
+ picontainerx.h picontainergen.h piwdgx.h piwdggen.h pimsghandler.h \
+ picolist.h piperiodx.h $(INC)periodic.h \
+ psfile.h pifontgen.h pigraphgen.h picmap.h picmapx.h picmapgen.h \
+ pifontx.h pigrcoord.h pilineatt.h
 $(OBJ)pisurfdr.o: pisurfdr.cc pisurfdr.h parradapter.h \
-  $(INC)machdefs.h \
-  $(INC)osx_values.h lut.h pi3ddrw.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 pigrcoord.h pilineatt.h pigraphuc.h pievthandler.h psfile.h \
-  pigratt.h piaxes.h pieldrw.h pigraph3d.h
+ $(INC)machdefs.h lut.h pi3ddrw.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 pigrcoord.h pilineatt.h pigraphuc.h pievthandler.h \
+ psfile.h pigratt.h piaxes.h pieldrw.h pigraph3d.h
 $(OBJ)pitherm.o: pitherm.cc pitherm.h pisysdep.h \
-  $(INC)machdefs.h \
-  $(INC)osx_values.h pibwdgx.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 pigrcoord.h pilineatt.h \
-  pigraphuc.h pievthandler.h psfile.h pigraphps.h
-$(OBJ)piwdggen.o: piwdggen.cc piwdggen.h $(INC)machdefs.h \
-  $(INC)osx_values.h pimsghandler.h picolist.h \
-  picontainergen.h pisysdep.h piwdgx.h pievthandler.h pigraphx.h \
-  pigraphgen.h picmap.h picmapx.h picmapgen.h pifontx.h pifontgen.h \
-  pigrcoord.h pilineatt.h psfile.h
+ $(INC)machdefs.h pibwdgx.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 pigrcoord.h \
+ pilineatt.h pigraphuc.h pievthandler.h psfile.h pigraphps.h
+$(OBJ)pitxtdrw.o: pitxtdrw.cc $(INC)machdefs.h \
+ pitxtdrw.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 pigrcoord.h pilineatt.h \
+ pigraphuc.h pievthandler.h psfile.h pigratt.h piaxes.h
+$(OBJ)piwdggen.o: piwdggen.cc piwdggen.h \
+ $(INC)machdefs.h pimsghandler.h picolist.h \
+ picontainergen.h pisysdep.h piwdgx.h pievthandler.h pigraphx.h \
+ pigraphgen.h picmap.h picmapx.h picmapgen.h pifontx.h pifontgen.h \
+ pigrcoord.h pilineatt.h psfile.h
 $(OBJ)piwdgx.o: piwdgx.cc piwdgx.h piwdggen.h \
-  $(INC)machdefs.h \
-  $(INC)osx_values.h pimsghandler.h picolist.h \
-  picontainerx.h pisysdep.h picontainergen.h pievthandler.h pigraphx.h \
-  pigraphgen.h picmap.h picmapx.h picmapgen.h pifontx.h pifontgen.h \
-  pigrcoord.h pilineatt.h $(INC)pexceptions.h
+ $(INC)machdefs.h pimsghandler.h picolist.h \
+ picontainerx.h pisysdep.h picontainergen.h pievthandler.h pigraphx.h \
+ pigraphgen.h picmap.h picmapx.h picmapgen.h pifontx.h pifontgen.h \
+ pigrcoord.h pilineatt.h $(INC)pexceptions.h
 $(OBJ)piwindowgen.o: piwindowgen.cc piwindowgen.h pisysdep.h \
-  $(INC)machdefs.h \
-  $(INC)osx_values.h picontainerx.h picontainergen.h \
-  piwdgx.h piwdggen.h pimsghandler.h picolist.h psfile.h pifontgen.h \
-  pigraphgen.h picmap.h picmapx.h picmapgen.h pifontx.h pigrcoord.h \
-  pilineatt.h
+ $(INC)machdefs.h picontainerx.h \
+ picontainergen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+ psfile.h pifontgen.h pigraphgen.h picmap.h picmapx.h picmapgen.h \
+ pifontx.h pigrcoord.h pilineatt.h
 $(OBJ)piwindowx.o: piwindowx.cc piwindowx.h piwindowgen.h pisysdep.h \
-  $(INC)machdefs.h \
-  $(INC)osx_values.h picontainerx.h picontainergen.h \
-  piwdgx.h piwdggen.h pimsghandler.h picolist.h
+ $(INC)machdefs.h picontainerx.h \
+ picontainergen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h
 $(OBJ)pixtbase.o: pixtbase.cc $(INC)machdefs.h \
-  $(INC)osx_values.h pixtbaseP.h pibwdgx.h pisysdep.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 \
-  pigrcoord.h pilineatt.h pigraphuc.h pievthandler.h psfile.h pigraphps.h \
-  pixtbase.h
+ pixtbaseP.h pibwdgx.h pisysdep.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 pigrcoord.h pilineatt.h \
+ pigraphuc.h pievthandler.h psfile.h pigraphps.h pixtbase.h
 $(OBJ)piyfxdrw.o: piyfxdrw.cc $(INC)machdefs.h \
-  $(INC)osx_values.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 pigrcoord.h pilineatt.h pigraphuc.h \
-  pievthandler.h psfile.h pigratt.h piaxes.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 pigrcoord.h \
+ pilineatt.h pigraphuc.h pievthandler.h psfile.h pigratt.h piaxes.h
 $(OBJ)psfile.o: psfile.cc psfile.h $(INC)machdefs.h \
-  $(INC)osx_values.h pisysdep.h pifontgen.h \
-  pigraphgen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h picmap.h \
-  picmapx.h picmapgen.h pifontx.h pigrcoord.h pilineatt.h
+ pisysdep.h pifontgen.h pigraphgen.h piwdgx.h piwdggen.h \
+ pimsghandler.h picolist.h picmap.h picmapx.h picmapgen.h pifontx.h \
+ pigrcoord.h pilineatt.h

trunk/SophyaPI/PI/pi3ddrw.cc

@@ -35 +35 @@
 //--
 //++
-// PIDrawer3D()
+// PIDrawer3D(bool asxy=false, asz=false)
 //      Constructeur
 // void Set3DView_Obs(double xo, double yo, double zo, double teta, double phi, double psi, -
@@ -75 +75 @@
   v3D_obs = false;
   Set3DBox(-1., 1., -1., 1., -1., 1.);
+  SetAutoScale(false, false);
 }
 

trunk/SophyaPI/PI/pi3ddrw.h

@@ -32 +32 @@
                                  double zmin, double zmax,
                                  double scx=1., double scy=1., double scz=1.);
+  inline  void          SetAutoScale(bool fgxy, bool fgz) 
+    { aScxy = fgxy;  aScz = fgz; }
+
   inline  void          Copy3DBox(PIDrawer3D& dr3) {
     Set3DBox(dr3.XMin3(), dr3.XMax3(), dr3.YMin3(), dr3.YMax3(), 
-             dr3.ZMin3(), dr3.ZMax3(), dr3.ScaleX(), dr3.ScaleY(), dr3.ScaleZ());  }
+             dr3.ZMin3(), dr3.ZMax3(), dr3.GetScaleX(), dr3.GetScaleY(), dr3.GetScaleZ());  
+    SetAutoScale(dr3.isAutoScaleXY(), dr3.isAutoScaleZ());
+  }
 
-  virtual void          ComputeScaleFactor(double xmin, double xmax, double ymin, double ymax,
+  static  void          ComputeScaleFactor(double xmin, double xmax, double ymin, double ymax,
                                            double zmin, double zmax, bool asxy, bool asz,
                                            double& scy, double& scz);
@@ -48 +53 @@
 
   // Cordonnees du cube 3D
-  double XMin3() const {return x3Min;}
-  double XMax3() const {return x3Max;}
-  double YMin3() const {return y3Min;}
-  double YMax3() const {return y3Max;}
-  double ZMin3() const {return z3Min;}
-  double ZMax3() const {return z3Max;}
+  inline double XMin3() const {return x3Min;}
+  inline double XMax3() const {return x3Max;}
+  inline double YMin3() const {return y3Min;}
+  inline double YMax3() const {return y3Max;}
+  inline double ZMin3() const {return z3Min;}
+  inline double ZMax3() const {return z3Max;}
   // Facteur d'echelle: Cube3D = Coord.User(3D)*Scale
-  double ScaleX() const {return mScx;}
-  double ScaleY() const {return mScy;}
-  double ScaleZ() const {return mScz;}
+  inline double GetScaleX() const {return mScx;}
+  inline double GetScaleY() const {return mScy;}
+  inline double GetScaleZ() const {return mScz;}
+  inline double ScaleX(double x) const {return x*mScx;}
+  inline double ScaleY(double y) const {return y*mScy;}
+  inline double ScaleZ(double z) const {return z*mScz;}
+  inline bool   isAutoScaleXY() const { return aScxy; }
+  inline bool   isAutoScaleZ()  const { return aScz; }
 
 protected :
@@ -71 +81 @@
   double mScx, mScy, mScz;  // Facteur d'echelle entre coord. utilise et cube 3D
                             // x/y/z-Cube3D = x/y/z-User * mScx/y/z 
+  bool aScxy, aScz;    // Auto-scale X-Y, Z
 };
 

trunk/SophyaPI/PI/pi3dwdg.cc

@@ -82 +82 @@
   AddDrawer3D(mBDrw, false, true);
   mBDrw->SetAxesFlags(kStdAxes);
+  Set3DViewBox(0., 1., 0., 1., 0., 1., false, false);
   vfixed = false; // Il faut laisser le premier Drawer3D fixer les limites et la vue 3D
+  fixed3DBox = false;  
 
   mPx = mPy = 0;
@@ -150 +152 @@
 }
 
+/* --Methode-- */
+void PIDraw3DWdg::Set3DViewBox(double xmin, double xmax, double ymin, double ymax,
+                               double zmin, double zmax, bool asxy, bool asz)
+{
+  double mscx, mscy, mscz;
+  PIDrawer3D::ComputeScaleFactor(xmin, xmax, ymin, ymax, zmin, zmax, 
+                                 asxy, asz, mscy, mscz);
+  mscx = 1.;
+  xmin *= mscx;  xmax *= mscx;
+  ymin *= mscy;  ymax *= mscy;
+  zmin *= mscz;  zmax *= mscz;
+  mBDrw->Set3DBox(xmin, xmax, ymin, ymax, zmin, zmax, mscx, mscy, mscz);
+  mBDrw->SetAutoScale(asxy, asz);
+  fixed3DBox = true;
+
+  double D = xmax-xmin;
+  if (D < (ymax-ymin))  D = ymax-ymin;
+  D *= 1.4;
+  Set3DView((xmin+xmax)/2., (ymin+ymax)/2, zmin+(zmax-zmin)*0.40, 
+            (xmin+xmax)/2.+D , (ymin+ymax)/2.-2.5*D , zmin+(zmax-zmin)*0.85, 0.25, 0.25);  
+    
+}
 
 /* --Methode-- */
@@ -177 +201 @@
 
 /* --Methode-- */
+void PIDraw3DWdg::Refresh()
+{
+  SetDrawers3DView();
+  PIBaseWdg::Refresh();
+}
+
+/* --Methode-- */
 int PIDraw3DWdg::DecodeOptionString(vector<string> & opt, bool rmdecopt)
 {
@@ -194 +225 @@
   list<int>::iterator it;
 
+  for(it = m3DrIl.begin(); it != m3DrIl.end(); it++) {
 #if defined(CC_HAS_RTTI_SUPPORT)
-  if (vo)   for(it = m3DrIl.begin(); it != m3DrIl.end(); it++)   
+    if (vo) 
     (dynamic_cast<PIDrawer3D*>(GetDrawerId(*it)))->Set3DView_Obs(xo, yo, zo, teta, phi, psi, dax, day, co, dco);
-  else   for(it = m3DrIl.begin(); it != m3DrIl.end(); it++)   
-    (dynamic_cast<PIDrawer3D*>(GetDrawerId(*it)))->Set3DView(xc, yc, zc, xo, yo, zo, dax, day, dco, psi);    
+    else   
+    (dynamic_cast<PIDrawer3D*>(GetDrawerId(*it)))->Set3DView(xc, yc, zc, xo, yo, zo, dax, day, dco, psi);  
+  (dynamic_cast<PIDrawer3D*>(GetDrawerId(*it)))->Copy3DBox(*mBDrw);
 #else
-  if (vo)   for(it = m3DrIl.begin(); it != m3DrIl.end(); it++)   
+  if (vo)   
     ((PIDrawer3D*)(GetDrawerId(*it)))->Set3DView_Obs(xo, yo, zo, teta, phi, psi, dax, day, co, dco);
-  else   for(it = m3DrIl.begin(); it != m3DrIl.end(); it++)   
-    ((PIDrawer3D*)(GetDrawerId(*it)))->Set3DView(xc, yc, zc, xo, yo, zo, dax, day, dco, psi);    
+  else  
+    ((PIDrawer3D*)(GetDrawerId(*it)))->Set3DView(xc, yc, zc, xo, yo, zo, dax, day, dco, psi);  
+  ((PIDrawer3D*)(GetDrawerId(*it)))->Copy3DBox(*mBDrw);
 #endif
+  }
 
 }
@@ -225 +260 @@
       dr3->Set3DView_Obs(xo, yo, zo, teta, phi, psi, dax, day, co, dco);
   else  dr3->Set3DView(xc, yc, zc, xo, yo, zo, dax, day, co, psi);
+  dr3->Copy3DBox(*mBDrw);
   }
 int id = AddDrawer(dr3, false, false, ad, lock);
@@ -276 +312 @@
 //  <Alt>S active la sensibilite de la zone centrale pour tourner l'objet
   else if (key == 'S' || key == 's')  skcfg = !skcfg;  
-  else if (key == 'R' || key == 'r')  Update3DView();
+  else if (key == 'R' || key == 'r')  Refresh();
+  else if (key == 'B' || key == 'b')  Update3DView();
   }
 }
@@ -381 +418 @@
   SelPointerShape(PI_ArrowPointer);
   mWGrC->SelForeground(lCol);
-  SetDrawers3DView();
   Refresh();
 }

trunk/SophyaPI/PI/pi3dwdg.h

@@ -32 +32 @@
   virtual void          Set3DView(double xc, double yc, double zc, double xo, double yo, double zo, 
                                   double dax, double day, double dco=0.2, double psi=0.);
-  bool                  Get3DView(double& xc, double& yc, double& zc, double& xo, double& yo, double& zo, 
+  virtual bool          Get3DView(double& xc, double& yc, double& zc, double& xo, double& yo, double& zo, 
                                   double& teta, double& phi, double& psi, double& dax, double& day, double& co, double& dco);
 
+  // Definition/on impose la boite 3D
+  virtual void          Set3DViewBox(double xmin, double xmax, double ymin, double ymax,
+                                     double zmin, double zmax, bool asxy, bool asz);
+
   virtual void          Update3DView();   // Vue 3-D a partir de Drawer No 1
+
+  virtual void          Refresh();
 
   inline void           SetTitles(const char* tt=NULL, const char* tb=NULL)
@@ -75 +81 @@
   
   bool vfixed;       // SetView fait ou pas
+  bool fixed3DBox;  // Set3DViewBox() fait ou pas 
+
   list<int> m3DrIl;  // Liste des Id drawers 3D 
   PIGraphic3D* mGr3d;   // PIGraphic3D courante
@@ -86 +94 @@
   bool  skcfg;                 // si Vrai click-2 au centre -> rotation objet
 
+
 // Menu pour la manipulation des drawers 
   PIDrwMgrMenu* mDrwMen;

trunk/SophyaPI/PI/pibargraph.cc

@@ -41 +41 @@
   fgFill = fill;
   fgHoriz = horiz;
-  fillFrac = 0.5;
+  packFrac = 0.5;
 } 
 
@@ -88 +88 @@
   if (mBars.size() < 1)  return;
   double xmin, xmax, ymin, ymax;
-  xmin = idMin-fillFrac*(idMax-idMin)/mBars.size(); 
-  xmax = idMax+fillFrac*(idMax-idMin)/mBars.size();
+  xmin = idMin-packFrac*(idMax-idMin)/mBars.size(); 
+  xmax = idMax+packFrac*(idMax-idMin)/mBars.size();
   if (mMin*mMax >= 0.) {
     ymin = 0.; ymax = mMax*1.1;
@@ -117 +117 @@
   if (mBars.size() < 1) return;
   PIGrCoord x,y,dx,dy;
-  double larg = fillFrac*(idMax-idMin)/mBars.size();
+  double larg = packFrac*(idMax-idMin)/mBars.size();
   for(unsigned int k=0; k<mBars.size(); k++) {
     x = mBars[k].id-0.5*larg; dx = larg;
@@ -144 +144 @@
 
 
+/* --Methode-- */
+int PIBarGraph::DecodeOptionString(vector<string> & opt, bool rmdecopt)
+{
+  int optsz1 = opt.size();
+  if(optsz1<1)  return(0);  
+  // On appelle d'abord le decodage de la classe PIDrawer de laquelle
+  // on herite. (Pas obligatoire) on decode donc ici les attributs de
+  // couleur, fontes ...
+  int ndec1 = PIDrawer::DecodeOptionString(opt, rmdecopt);
+  if(optsz1-ndec1<1) return(ndec1);  // si tout a ete decode
+
+  vector<string> udopt;  // On gardera ici les options non decodees
+  unsigned int k = 0;
+  int ndec = opt.size();
+  for( k=0; k<opt.size(); k++ ) {
+    string opts = opt[k];
+    if (opts=="horizontalbars") SetHorizontalBars(); 
+    else if (opts=="verticalbars") SetVerticalBars();
+    else if (opts=="fill")  SetFill(true);
+    else if (opts=="nofill")  SetFill(false);
+    else if (opts=="packfrac=") {
+      double frac = atof(opts.substr(9).c_str()); 
+      SetPacking(frac);
+    }
+    else {
+      // Si option non decode
+      ndec--;
+      // S'il faut supprimer les options decodees
+      if (rmdecopt)  udopt.push_back(opts);
+    }
+  }  
+  // S'il faut supprimer les options decodees, on remplace l'argument opt
+  // par le vecteur des options non decodees.
+  if (rmdecopt)  opt = udopt;
+  return(ndec+ndec1);  
+}
+
+/* --Methode-- */
+int PIBarGraph::OptionToString(vector<string> & opt) const
+{
+ PIDrawer::OptionToString(opt);
+ if (fgHoriz) opt.push_back("horizontalbars"); else opt.push_back("verticalbars");
+ if (fgFill) opt.push_back("fill");  else opt.push_back("nofill");
+ char buff[64];
+ sprintf(buff,"packfrac=%g", packFrac);
+ opt.push_back(buff);
+ return 1;
+}
+
+/* --Methode-- */
+void PIBarGraph::GetOptionsHelpInfo(string& info)
+{
+info += " ---- PIBarGraph options help info : \n" ;
+info += "  fill/nofill: set bar fill option \n";
+info += "  horizontalbars/verticalbars: set bar orientation \n";
+info += "  packfrac=value : set bar packing fraction (0..1) \n";
+info += " --- + Usual colr/line/font  attribute decoding ... \n";
+PIDrawer::GetOptionsHelpInfo(info);
+return;
+}

trunk/SophyaPI/PI/pibargraph.h

@@ -22 +22 @@
   int                AddBar(double id, double val, string const& lab, PIColors col);
   int                AddBar(double val);
-  
+
+  // --- Methodes inline pour changer les options de representation  
+  // Barres horizontales ou vertiacales (defaut=vertical)
+  inline  void       SetVerticalBars() { fgHoriz=false; }
+  inline  void       SetHorizontalBars() { fgHoriz=true; }  
+  // Barres pleines ou contour
+  inline  void       SetFill(bool fg) { fgFill=fg; } 
+  // Fraction de remplissage des bars
+  inline  void       SetPacking(double frac=0.5) { packFrac=frac; }
+
   virtual void       Draw(PIGraphicUC* g, double xmin, double ymin, double xmax, double ymax);
   virtual void       UpdateLimits();
-  
+
+  // Methode de decodage des options   
+  virtual int        DecodeOptionString(vector<string> & opt, bool rmdecopt=true);  
+  virtual int        OptionToString(vector<string> & opt) const;
+  virtual void       GetOptionsHelpInfo(string& info);
+
  // Renvoie une distance au point x,y
  // virtual double     GetDistanceToPoint(double x, double y);
@@ -35 +49 @@
   double idMin, idMax;
   bool fgFill, fgHoriz;
-  double fillFrac;
+  double packFrac;
  };
 

trunk/SophyaPI/PI/pisurfdr.cc

@@ -46 +46 @@
   arr->XYfromxy(arr->XSize(),arr->YSize(),mXmax, mYmax);
 
-  mAutoScaleXY = asxy;
-  mAutoScaleZ = asz;
+  aScxy = asxy;
+  aScz = asz;
 
   int i,j;   double cv;
@@ -80 +80 @@
   if (mArr == NULL)  return;
   ComputeScaleFactor(mXmin, mXmax, mYmin, mYmax, mZmin, mZmax, 
-                     mAutoScaleXY, mAutoScaleZ, mScy, mScz);
+                     aScxy, aScz, mScy, mScz);
   double xmin, xmax, ymin, ymax, zmin, zmax;
   xmin = mXmin*mScx;  xmax = mXmax*mScx;
@@ -307 +307 @@
   for( k=0; k<opt.size(); k++ ) {
     string opts = opt[k];
-    if (opts == "rescalexy") mAutoScaleXY = true;
-    else if (opts == "norescalexy") mAutoScaleXY = false;
-    else if (opts == "rescalez") mAutoScaleZ = true;
-    else if (opts == "norescalez") mAutoScaleZ = false;
+    if (opts == "rescalexy") aScxy = true;
+    else if (opts == "norescalexy") aScxy = false;
+    else if (opts == "rescalez") aScz = true;
+    else if (opts == "norescalez") aScz = false;
     else {
       // Si option non decode
@@ -329 +329 @@
  PIDrawer::OptionToString(opt);
 
- if(mAutoScaleXY) opt.push_back("rescalexy"); else opt.push_back("norescalexy");
- if(mAutoScaleZ) opt.push_back("rescalez"); else opt.push_back("norescalez");
+ if(aScxy) opt.push_back("rescalexy"); else opt.push_back("norescalexy");
+ if(aScz) opt.push_back("rescalez"); else opt.push_back("norescalez");
 
  return 1;

trunk/SophyaPI/PI/pisurfdr.h

@@ -27 +27 @@
   P2DArrayAdapter* mArr;
   bool mAda;
-  bool mAutoScaleXY, mAutoScaleZ;
   double mXmin, mXmax;
   double mYmin, mYmax;