Changeset 3572 in Sophya for trunk/SophyaPI

Timestamp:

Feb 7, 2009, 10:50:34 PM (17 years ago)

Author:

cmv

Message:

char* -> const char* pour regler les problemes de deprecated string const... + comparaison unsigned signed + suppression EVOL_PLANCK rz+cmv 07/02/2009

Location:

trunk/SophyaPI

Files:

• PI/Makefile (modified) (23 diffs)
• PI/parradapter.cc (modified) (1 diff)
• PI/piapplx.cc (modified) (3 diffs)
• PI/pibwdgx.cc (modified) (2 diffs)
• PI/pifilechox.cc (modified) (2 diffs)
• PI/pifontx.cc (modified) (2 diffs)
• PI/pilistx.cc (modified) (1 diff)
• PI/pimenux.cc (modified) (1 diff)
• PI/pioptmenux.cc (modified) (1 diff)
• PI/pistdwdgx.cc (modified) (2 diffs)
• PI/pitherm.cc (modified) (2 diffs)
• PI/pitherm.h (modified) (1 diff)
• PI/piwdgx.cc (modified) (4 diffs)
• PI/pixtbase.cc (modified) (1 diff)
• PI/smakefile (modified) (23 diffs)
• PIGcont/Makefile (modified) (8 diffs)
• PIGcont/pigncont.cc (modified) (2 diffs)
• PIGcont/smakefile (modified) (2 diffs)
• PIext/Makefile (modified) (70 diffs)
• PIext/basexecut.cc (modified) (8 diffs)
• PIext/cxxexecutor.cc (modified) (4 diffs)
• PIext/exclude (modified) (1 diff)
• PIext/flowmodex.cc (modified) (1 diff)
• PIext/nobjmgr.cc (modified) (20 diffs)
• PIext/nomgfdadapter.cc (modified) (4 diffs)
• PIext/nomhistadapter.cc (modified) (11 diffs)
• PIext/nomhistadapter.h (modified) (2 diffs)
• PIext/nomimagadapter.cc (modified) (7 diffs)
• PIext/nommatvecadapter.cc (deleted)
• PIext/nommatvecadapter.h (deleted)
• PIext/nomstladapter.cc (deleted)
• PIext/nomstladapter.h (deleted)
• PIext/nomtarradapter.cc (modified) (1 diff)
• PIext/objlist.list (modified) (1 diff)
• PIext/pawexecut.cc (modified) (12 diffs)
• PIext/piacmd.cc (modified) (1 diff)
• PIext/piafitting.cc (modified) (4 diffs)
• PIext/piafitting.h (modified) (2 diffs)
• PIext/piinit.cc (modified) (6 diffs)
• PIext/piinit.h (modified) (1 diff)
• PIext/pimgadapter.h (modified) (1 diff)
• PIext/pipodrw.cc (modified) (1 diff)
• PIext/pipodrw.h (modified) (2 diffs)
• PIext/pisiadw.cc (modified) (4 diffs)
• PIext/pistdimgapp.cc (modified) (12 diffs)
• PIext/servnobjm.cc (modified) (25 diffs)
• PIext/servnobjm.h (modified) (3 diffs)
• PIext/smakefile (modified) (37 diffs)
• ProgPI/Makefile (modified) (15 diffs)
• ProgPI/makefile_wgrdl (modified) (1 diff)
• ProgPI/piapp.cc (modified) (3 diffs)
• ProgPI/skymapmodule.cc (modified) (1 diff)
• ProgPI/smakefile (modified) (9 diffs)
• ProgPI/smakefile_wgrdl (modified) (1 diff)

trunk/SophyaPI/PI/Makefile

@@ -4 +4 @@
  
 clean:
-         rm -f $(SOPHYAOBJP)lut.o $(SOPHYAOBJP)parradapter.o $(SOPHYAOBJP)pi3ddrw.o $(SOPHYAOBJP)pi3dwdg.o $(SOPHYAOBJP)piapplgen.o $(SOPHYAOBJP)piapplx.o $(SOPHYAOBJP)piaxes.o $(SOPHYAOBJP)piaxestools.o $(SOPHYAOBJP)pibargraph.o $(SOPHYAOBJP)pibwdggen.o $(SOPHYAOBJP)pibwdgx.o $(SOPHYAOBJP)picmap.o $(SOPHYAOBJP)picmapgen.o $(SOPHYAOBJP)picmapview.o $(SOPHYAOBJP)picmapx.o $(SOPHYAOBJP)picons.o $(SOPHYAOBJP)picontainergen.o $(SOPHYAOBJP)picontainerx.o $(SOPHYAOBJP)pidrawer.o $(SOPHYAOBJP)pidrawwin.o $(SOPHYAOBJP)pidrwtools.o $(SOPHYAOBJP)pieldrw.o $(SOPHYAOBJP)pierrdisp.o $(SOPHYAOBJP)pievthandler.o $(SOPHYAOBJP)pifilechogen.o $(SOPHYAOBJP)pifilechox.o $(SOPHYAOBJP)pifontgen.o $(SOPHYAOBJP)pifontx.o $(SOPHYAOBJP)pigraph3d.o $(SOPHYAOBJP)pigraphgen.o $(SOPHYAOBJP)pigraphps.o $(SOPHYAOBJP)pigraphuc.o $(SOPHYAOBJP)pigraphx.o $(SOPHYAOBJP)pigratt.o $(SOPHYAOBJP)pigrcoord.o $(SOPHYAOBJP)piimage.o $(SOPHYAOBJP)piimgtools.o $(SOPHYAOBJP)pilineatt.o $(SOPHYAOBJP)pilistgen.o $(SOPHYAOBJP)pilistx.o $(SOPHYAOBJP)pimenubargen.o $(SOPHYAOBJP)pimenubarx.o $(SOPHYAOBJP)pimenugen.o $(SOPHYAOBJP)pimenux.o $(SOPHYAOBJP)pimsghandler.o $(SOPHYAOBJP)pioptmenugen.o $(SOPHYAOBJP)pioptmenux.o $(SOPHYAOBJP)piperiodx.o $(SOPHYAOBJP)pipixmapgen.o $(SOPHYAOBJP)pipixmapx.o $(SOPHYAOBJP)pipixutils.o $(SOPHYAOBJP)pipplist.o $(SOPHYAOBJP)pippmenubar.o $(SOPHYAOBJP)pippoptmenu.o $(SOPHYAOBJP)pippviewadapter.o $(SOPHYAOBJP)piscdrawwdg.o $(SOPHYAOBJP)pistdwdggen.o $(SOPHYAOBJP)pistdwdgx.o $(SOPHYAOBJP)pistzwin.o $(SOPHYAOBJP)pisurfdr.o $(SOPHYAOBJP)pitherm.o $(SOPHYAOBJP)pitxtdrw.o $(SOPHYAOBJP)piup.o $(SOPHYAOBJP)piupdattachment.o $(SOPHYAOBJP)piup_def.o $(SOPHYAOBJP)piwdggen.o $(SOPHYAOBJP)piwdgx.o $(SOPHYAOBJP)piwindowgen.o $(SOPHYAOBJP)piwindowx.o $(SOPHYAOBJP)pixtbase.o $(SOPHYAOBJP)piyfxdrw.o $(SOPHYAOBJP)psfile.o $(SOPHYAOBJP)xdispim.o
+         rm -f $(SOPHYAOBJP)lut.o $(SOPHYAOBJP)parradapter.o $(SOPHYAOBJP)pi3ddrw.o $(SOPHYAOBJP)pi3dwdg.o $(SOPHYAOBJP)piapplgen.o $(SOPHYAOBJP)piapplx.o $(SOPHYAOBJP)piaxes.o $(SOPHYAOBJP)piaxestools.o $(SOPHYAOBJP)pibargraph.o $(SOPHYAOBJP)pibwdggen.o $(SOPHYAOBJP)pibwdgx.o $(SOPHYAOBJP)picmap.o $(SOPHYAOBJP)picmapgen.o $(SOPHYAOBJP)picmapview.o $(SOPHYAOBJP)picmapx.o $(SOPHYAOBJP)picons.o $(SOPHYAOBJP)picontainergen.o $(SOPHYAOBJP)picontainerx.o $(SOPHYAOBJP)pidrawer.o $(SOPHYAOBJP)pidrawwin.o $(SOPHYAOBJP)pidrwtools.o $(SOPHYAOBJP)pieldrw.o $(SOPHYAOBJP)pierrdisp.o $(SOPHYAOBJP)pievthandler.o $(SOPHYAOBJP)pifilechogen.o $(SOPHYAOBJP)pifilechox.o $(SOPHYAOBJP)pifontgen.o $(SOPHYAOBJP)pifontx.o $(SOPHYAOBJP)pigraph3d.o $(SOPHYAOBJP)pigraphgen.o $(SOPHYAOBJP)pigraphps.o $(SOPHYAOBJP)pigraphuc.o $(SOPHYAOBJP)pigraphx.o $(SOPHYAOBJP)pigratt.o $(SOPHYAOBJP)pigrcoord.o $(SOPHYAOBJP)piimage.o $(SOPHYAOBJP)piimgtools.o $(SOPHYAOBJP)pilineatt.o $(SOPHYAOBJP)pilistgen.o $(SOPHYAOBJP)pilistx.o $(SOPHYAOBJP)pimenubargen.o $(SOPHYAOBJP)pimenubarx.o $(SOPHYAOBJP)pimenugen.o $(SOPHYAOBJP)pimenux.o $(SOPHYAOBJP)pimsghandler.o $(SOPHYAOBJP)pioptmenugen.o $(SOPHYAOBJP)pioptmenux.o $(SOPHYAOBJP)piperiodx.o $(SOPHYAOBJP)pipixmapgen.o $(SOPHYAOBJP)pipixmapx.o $(SOPHYAOBJP)pipixutils.o $(SOPHYAOBJP)pipplist.o $(SOPHYAOBJP)pippmenubar.o $(SOPHYAOBJP)pippoptmenu.o $(SOPHYAOBJP)pippviewadapter.o $(SOPHYAOBJP)piscdrawwdg.o $(SOPHYAOBJP)pistdwdggen.o $(SOPHYAOBJP)pistdwdgx.o $(SOPHYAOBJP)pistzwin.o $(SOPHYAOBJP)pisurfdr.o $(SOPHYAOBJP)pitherm.o $(SOPHYAOBJP)pitxtdrw.o $(SOPHYAOBJP)piup.o $(SOPHYAOBJP)piup_def.o $(SOPHYAOBJP)piupdattachment.o $(SOPHYAOBJP)piwdggen.o $(SOPHYAOBJP)piwdgx.o $(SOPHYAOBJP)piwindowgen.o $(SOPHYAOBJP)piwindowx.o $(SOPHYAOBJP)pixtbase.o $(SOPHYAOBJP)piyfxdrw.o $(SOPHYAOBJP)psfile.o $(SOPHYAOBJP)xdispim.o
         rm -f $(SOPHYALIBP)libPI.a
  
@@ -23 +23 @@
  
 $(SOPHYAOBJP)pi3ddrw.o: pi3ddrw.cc $(SOPHYAINCP)sopnamsp.h \
-  pi3ddrw.h pisysdep.h \
-  $(SOPHYAINCP)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 pipixutils.h pigraphuc.h pievthandler.h \
-  psfile.h pigratt.h piaxes.h pieldrw.h pigraph3d.h
+  pi3ddrw.h pisysdep.h $(SOPHYAINCP)machdefs.h \
+  pidrawer.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pipixutils.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
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pi3ddrw.cc
  
 $(SOPHYAOBJP)pi3dwdg.o: pi3dwdg.cc $(SOPHYAINCP)sopnamsp.h \
-  pi3dwdg.h pisysdep.h \
-  $(SOPHYAINCP)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 pipixutils.h pigraphuc.h \
+  pi3dwdg.h pisysdep.h $(SOPHYAINCP)machdefs.h \
+  pi3ddrw.h pidrawer.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h \
+  picolist.h pipixutils.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 \
@@ -44 +42 @@
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pi3dwdg.cc
  
-$(SOPHYAOBJP)piapplgen.o: piapplgen.cc \
-  $(SOPHYAINCP)sopnamsp.h piapplgen.h \
-  pimsghandler.h $(SOPHYAINCP)machdefs.h \
-  pisysdep.h picontainerx.h picontainergen.h piwdgx.h piwdggen.h \
-  picolist.h pimenubarx.h pimenubargen.h pimenux.h pimenugen.h \
-  piconsenum.h
+$(SOPHYAOBJP)piapplgen.o: piapplgen.cc $(SOPHYAINCP)sopnamsp.h \
+  piapplgen.h pimsghandler.h \
+  $(SOPHYAINCP)machdefs.h pisysdep.h \
+  picontainerx.h picontainergen.h piwdgx.h piwdggen.h picolist.h \
+  pipixutils.h pimenubarx.h pimenubargen.h pimenux.h pimenugen.h \
+  piconsenum.h pidrawer.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 pigratt.h piaxes.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piapplgen.cc
  
@@ -56 +56 @@
   $(SOPHYAINCP)machdefs.h pisysdep.h \
   picontainerx.h picontainergen.h piwdgx.h piwdggen.h picolist.h \
-  pimenubarx.h pimenubargen.h pimenux.h pimenugen.h piconsenum.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 pipixutils.h pigraphuc.h pievthandler.h psfile.h \
+  pipixutils.h pimenubarx.h pimenubargen.h pimenux.h pimenugen.h \
+  piconsenum.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
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piapplx.cc
  
 $(SOPHYAOBJP)piaxes.o: piaxes.cc $(SOPHYAINCP)sopnamsp.h \
-  $(SOPHYAINCP)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 pipixutils.h pigratt.h
+  $(SOPHYAINCP)machdefs.h piaxes.h pigraphuc.h \
+  pisysdep.h pigraphgen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pipixutils.h picmap.h picmapx.h picmapgen.h pifontx.h pifontgen.h \
+  pigrcoord.h pilineatt.h pigratt.h pidrawer.h pibwdggen.h pigraphx.h \
+  pievthandler.h psfile.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piaxes.cc
  
 $(SOPHYAOBJP)piaxestools.o: piaxestools.cc \
-  $(SOPHYAINCP)sopnamsp.h piaxes.h \
-  pigraphuc.h pisysdep.h \
-  $(SOPHYAINCP)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 pipixutils.h \
+  $(SOPHYAINCP)sopnamsp.h piaxes.h pigraphuc.h \
+  pisysdep.h $(SOPHYAINCP)machdefs.h pigraphgen.h \
+  piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.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 \
@@ -85 +85 @@
 $(SOPHYAOBJP)pibargraph.o: pibargraph.cc \
   $(SOPHYAINCP)sopnamsp.h \
-  $(SOPHYAINCP)machdefs.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 pipixutils.h pigraphuc.h \
+  $(SOPHYAINCP)machdefs.h pibargraph.h pisysdep.h \
+  pidrawer.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pipixutils.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
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pibargraph.cc
  
-$(SOPHYAOBJP)pibwdggen.o: pibwdggen.cc \
-  $(SOPHYAINCP)sopnamsp.h pibwdggen.h \
-  pisysdep.h $(SOPHYAINCP)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 \
-  pipixutils.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 piconsenum.h
+$(SOPHYAOBJP)pibwdggen.o: pibwdggen.cc $(SOPHYAINCP)sopnamsp.h \
+  pibwdggen.h pisysdep.h $(SOPHYAINCP)machdefs.h \
+  piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.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 piconsenum.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pibwdggen.cc
  
 $(SOPHYAOBJP)pibwdgx.o: pibwdgx.cc $(SOPHYAINCP)sopnamsp.h \
   pixtbaseP.h pibwdgx.h pisysdep.h \
-  $(SOPHYAINCP)machdefs.h pibwdggen.h \
-  piwdgx.h piwdggen.h pimsghandler.h picolist.h picmap.h picmapx.h \
+  $(SOPHYAINCP)machdefs.h pibwdggen.h piwdgx.h \
+  piwdggen.h pimsghandler.h picolist.h pipixutils.h picmap.h picmapx.h \
   picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigrcoord.h \
-  pilineatt.h pipixutils.h pigraphuc.h pievthandler.h psfile.h \
-  pigraphps.h pixtbase.h
+  pilineatt.h pigraphuc.h pievthandler.h psfile.h pigraphps.h pixtbase.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pibwdgx.cc
  
@@ -118 +116 @@
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  picmap.cc
  
-$(SOPHYAOBJP)picmapgen.o: picmapgen.cc \
-  $(SOPHYAINCP)sopnamsp.h picmapgen.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
+$(SOPHYAOBJP)picmapgen.o: picmapgen.cc $(SOPHYAINCP)sopnamsp.h \
+  picmapgen.h pisysdep.h $(SOPHYAINCP)machdefs.h \
   picmapx.h picmap.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  picmapgen.cc
  
 $(SOPHYAOBJP)picmapview.o: picmapview.cc \
-  $(SOPHYAINCP)sopnamsp.h picmapview.h \
-  pisysdep.h $(SOPHYAINCP)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 pipixutils.h pigraphuc.h \
-  pievthandler.h psfile.h pigraphps.h
+  $(SOPHYAINCP)sopnamsp.h picmapview.h pisysdep.h \
+  $(SOPHYAINCP)machdefs.h pibwdgx.h pibwdggen.h \
+  piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.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
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  picmapview.cc
  
 $(SOPHYAOBJP)picmapx.o: picmapx.cc $(SOPHYAINCP)sopnamsp.h \
   piwdgx.h piwdggen.h $(SOPHYAINCP)machdefs.h \
-  pimsghandler.h picolist.h picmapx.h picmapgen.h pisysdep.h
+  pimsghandler.h picolist.h pipixutils.h picmapx.h picmapgen.h pisysdep.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  picmapx.cc
  
 $(SOPHYAOBJP)picons.o: picons.cc $(SOPHYAINCP)sopnamsp.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
-  pimenux.h pimenugen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pisysdep.h $(SOPHYAINCP)machdefs.h pimenux.h \
+  pimenugen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.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 pipixutils.h \
-  pigraphuc.h pievthandler.h psfile.h pigraphps.h piconsenum.h
+  pigraphgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h pigraphuc.h \
+  pievthandler.h psfile.h pigraphps.h piconsenum.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  picons.cc
  
@@ -150 +146 @@
   $(SOPHYAINCP)sopnamsp.h picontainergen.h \
   pisysdep.h $(SOPHYAINCP)machdefs.h piwdgx.h \
-  piwdggen.h pimsghandler.h picolist.h
+  piwdggen.h pimsghandler.h picolist.h pipixutils.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  picontainergen.cc
  
@@ -156 +152 @@
   $(SOPHYAINCP)sopnamsp.h picontainerx.h \
   pisysdep.h $(SOPHYAINCP)machdefs.h \
-  picontainergen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h
+  picontainergen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pipixutils.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  picontainerx.cc
  
-$(SOPHYAOBJP)pidrawer.o: pidrawer.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  $(SOPHYAINCP)machdefs.h pidrawer.h \
-  pibwdggen.h pisysdep.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+$(SOPHYAOBJP)pidrawer.o: pidrawer.cc $(SOPHYAINCP)sopnamsp.h \
+  $(SOPHYAINCP)machdefs.h pidrawer.h pibwdggen.h \
+  pisysdep.h piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h \
   picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h pifontx.h \
-  pifontgen.h pigrcoord.h pilineatt.h pipixutils.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 piconsenum.h ucckprot.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 piconsenum.h ucckprot.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pidrawer.cc
  
-$(SOPHYAOBJP)pidrawwin.o: pidrawwin.cc \
-  $(SOPHYAINCP)sopnamsp.h pidrawwin.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
+$(SOPHYAOBJP)pidrawwin.o: pidrawwin.cc $(SOPHYAINCP)sopnamsp.h \
+  pidrawwin.h pisysdep.h $(SOPHYAINCP)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 pipixutils.h pigraphuc.h \
+  piwdggen.h pimsghandler.h picolist.h pipixutils.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
@@ -183 +178 @@
  
 $(SOPHYAOBJP)pidrwtools.o: pidrwtools.cc \
-  $(SOPHYAINCP)sopnamsp.h pidrwtools.h \
-  pisysdep.h $(SOPHYAINCP)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 piconsenum.h pibwdggen.h picmap.h picmapx.h \
-  picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigrcoord.h \
-  pilineatt.h pipixutils.h pigraphuc.h pievthandler.h psfile.h \
+  $(SOPHYAINCP)sopnamsp.h pidrwtools.h pisysdep.h \
+  $(SOPHYAINCP)machdefs.h pistdwdgx.h \
+  pistdwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pipixutils.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 piconsenum.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 \
   piscdrawwdg.h pibwdgx.h pigraphps.h pidrawer.h pigratt.h piaxes.h \
   pieldrw.h pi3dwdg.h pi3ddrw.h pigraph3d.h
@@ -196 +191 @@
  
 $(SOPHYAOBJP)pieldrw.o: pieldrw.cc $(SOPHYAINCP)sopnamsp.h \
-  $(SOPHYAINCP)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 pigrcoord.h pilineatt.h pipixutils.h pigraphuc.h \
+  $(SOPHYAINCP)machdefs.h pieldrw.h pidrawer.h \
+  pibwdggen.h pisysdep.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pipixutils.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
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pieldrw.cc
@@ -206 +201 @@
   $(SOPHYAINCP)sopnamsp.h pievthandler.h \
   pisysdep.h $(SOPHYAINCP)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 pipixutils.h
+  pimsghandler.h piwdgx.h piwdggen.h picolist.h pipixutils.h pigraphx.h \
+  pigraphgen.h picmap.h picmapx.h picmapgen.h pifontx.h pifontgen.h \
+  pigrcoord.h pilineatt.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pievthandler.cc
  
@@ -214 +209 @@
   $(SOPHYAINCP)sopnamsp.h pifilechogen.h \
   pisysdep.h $(SOPHYAINCP)machdefs.h piwdgx.h \
-  piwdggen.h pimsghandler.h picolist.h
+  piwdggen.h pimsghandler.h picolist.h pipixutils.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pifilechogen.cc
  
 $(SOPHYAOBJP)pifilechox.o: pifilechox.cc \
   $(SOPHYAINCP)sopnamsp.h pisysdep.h \
-  $(SOPHYAINCP)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 \
-  piconsenum.h pifilechox.h pifilechogen.h piwindowx.h piwindowgen.h
+  $(SOPHYAINCP)machdefs.h piapplx.h piapplgen.h \
+  pimsghandler.h picontainerx.h picontainergen.h piwdgx.h piwdggen.h \
+  picolist.h pipixutils.h pimenubarx.h pimenubargen.h pimenux.h \
+  pimenugen.h piconsenum.h pifilechox.h pifilechogen.h piwindowx.h \
+  piwindowgen.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pifilechox.cc
  
-$(SOPHYAOBJP)pifontgen.o: pifontgen.cc \
-  $(SOPHYAINCP)sopnamsp.h pigraphgen.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h piwdgx.h \
-  piwdggen.h pimsghandler.h picolist.h picmap.h picmapx.h picmapgen.h \
-  pifontx.h pifontgen.h pigrcoord.h pilineatt.h pipixutils.h
+$(SOPHYAOBJP)pifontgen.o: pifontgen.cc $(SOPHYAINCP)sopnamsp.h \
+  pigraphgen.h pisysdep.h $(SOPHYAINCP)machdefs.h \
+  piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h picmap.h \
+  picmapx.h picmapgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pifontgen.cc
  
 $(SOPHYAOBJP)pifontx.o: pifontx.cc $(SOPHYAINCP)sopnamsp.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
-  pifontx.h pifontgen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h
+  pisysdep.h $(SOPHYAINCP)machdefs.h pifontx.h \
+  pifontgen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pifontx.cc
  
-$(SOPHYAOBJP)pigraph3d.o: pigraph3d.cc \
-  $(SOPHYAINCP)sopnamsp.h pigraph3d.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
+$(SOPHYAOBJP)pigraph3d.o: pigraph3d.cc $(SOPHYAINCP)sopnamsp.h \
+  pigraph3d.h pisysdep.h $(SOPHYAINCP)machdefs.h \
   pigraphuc.h pigraphgen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pipixutils.h picmap.h picmapx.h picmapgen.h pifontx.h pifontgen.h \
+  pigrcoord.h pilineatt.h
+        $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pigraph3d.cc
+ 
+$(SOPHYAOBJP)pigraphgen.o: pigraphgen.cc \
+  $(SOPHYAINCP)sopnamsp.h pigraphgen.h pisysdep.h \
+  $(SOPHYAINCP)machdefs.h piwdgx.h piwdggen.h \
+  pimsghandler.h picolist.h pipixutils.h picmap.h picmapx.h picmapgen.h \
+  pifontx.h pifontgen.h pigrcoord.h pilineatt.h ucckprot.h
+        $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pigraphgen.cc
+ 
+$(SOPHYAOBJP)pigraphps.o: pigraphps.cc $(SOPHYAINCP)sopnamsp.h \
+  pigraphps.h pisysdep.h $(SOPHYAINCP)machdefs.h \
+  pigraphgen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h \
   picmap.h picmapx.h picmapgen.h pifontx.h pifontgen.h pigrcoord.h \
-  pilineatt.h pipixutils.h
-        $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pigraph3d.cc
- 
-$(SOPHYAOBJP)pigraphgen.o: pigraphgen.cc \
-  $(SOPHYAINCP)sopnamsp.h pigraphgen.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h piwdgx.h \
-  piwdggen.h pimsghandler.h picolist.h picmap.h picmapx.h picmapgen.h \
-  pifontx.h pifontgen.h pigrcoord.h pilineatt.h pipixutils.h ucckprot.h
-        $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pigraphgen.cc
- 
-$(SOPHYAOBJP)pigraphps.o: pigraphps.cc \
-  $(SOPHYAINCP)sopnamsp.h pigraphps.h \
-  pisysdep.h $(SOPHYAINCP)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 \
-  pipixutils.h psfile.h
+  pilineatt.h psfile.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pigraphps.cc
  
-$(SOPHYAOBJP)pigraphuc.o: pigraphuc.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  $(SOPHYAINCP)machdefs.h pigraphuc.h \
-  pisysdep.h pigraphgen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+$(SOPHYAOBJP)pigraphuc.o: pigraphuc.cc $(SOPHYAINCP)sopnamsp.h \
+  $(SOPHYAINCP)machdefs.h pigraphuc.h pisysdep.h \
+  pigraphgen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h \
   picmap.h picmapx.h picmapgen.h pifontx.h pifontgen.h pigrcoord.h \
-  pilineatt.h pipixutils.h ucckprot.h
+  pilineatt.h ucckprot.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pigraphuc.cc
  
-$(SOPHYAOBJP)pigraphx.o: pigraphx.cc \
-  $(SOPHYAINCP)sopnamsp.h pigraphx.h \
-  pisysdep.h $(SOPHYAINCP)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 \
-  pipixutils.h
+$(SOPHYAOBJP)pigraphx.o: pigraphx.cc $(SOPHYAINCP)sopnamsp.h \
+  pigraphx.h pisysdep.h $(SOPHYAINCP)machdefs.h \
+  pigraphgen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h \
+  picmap.h picmapx.h picmapgen.h pifontx.h pifontgen.h pigrcoord.h \
+  pilineatt.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pigraphx.cc
  
 $(SOPHYAOBJP)pigratt.o: pigratt.cc $(SOPHYAINCP)sopnamsp.h \
-  pigratt.h pisysdep.h \
-  $(SOPHYAINCP)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 pipixutils.h \
-  $(SOPHYAINCP)strutilxx.h \
+  pigratt.h pisysdep.h $(SOPHYAINCP)machdefs.h \
+  pigraphgen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h \
+  picmap.h picmapx.h picmapgen.h pifontx.h pifontgen.h pigrcoord.h \
+  pilineatt.h $(SOPHYAINCP)strutilxx.h \
   $(SOPHYAINCP)machdefs.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pigratt.cc
  
-$(SOPHYAOBJP)pigrcoord.o: pigrcoord.cc \
-  $(SOPHYAINCP)sopnamsp.h pigrcoord.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h
+$(SOPHYAOBJP)pigrcoord.o: pigrcoord.cc $(SOPHYAINCP)sopnamsp.h \
+  pigrcoord.h pisysdep.h $(SOPHYAINCP)machdefs.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pigrcoord.cc
  
 $(SOPHYAOBJP)piimage.o: piimage.cc $(SOPHYAINCP)sopnamsp.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
-  piimage.h parradapter.h lut.h pipixutils.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 \
+  pisysdep.h $(SOPHYAINCP)machdefs.h piimage.h \
+  parradapter.h lut.h pipixutils.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 \
@@ -304 +293 @@
  
 $(SOPHYAOBJP)piimgtools.o: piimgtools.cc \
-  $(SOPHYAINCP)sopnamsp.h piimgtools.h \
-  pisysdep.h $(SOPHYAINCP)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 piconsenum.h piimage.h parradapter.h lut.h \
-  pipixutils.h pieldrw.h pidrawer.h pibwdggen.h picmap.h picmapx.h \
+  $(SOPHYAINCP)sopnamsp.h piimgtools.h pisysdep.h \
+  $(SOPHYAINCP)machdefs.h pistdwdgx.h \
+  pistdwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pipixutils.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 piconsenum.h piimage.h \
+  parradapter.h lut.h pieldrw.h pidrawer.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 pigratt.h piaxes.h \
@@ -316 +305 @@
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piimgtools.cc
  
-$(SOPHYAOBJP)pilineatt.o: pilineatt.cc \
-  $(SOPHYAINCP)sopnamsp.h pilineatt.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h
+$(SOPHYAOBJP)pilineatt.o: pilineatt.cc $(SOPHYAINCP)sopnamsp.h \
+  pilineatt.h pisysdep.h $(SOPHYAINCP)machdefs.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pilineatt.cc
  
-$(SOPHYAOBJP)pilistgen.o: pilistgen.cc \
-  $(SOPHYAINCP)sopnamsp.h pilistgen.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h piwdgx.h \
-  piwdggen.h pimsghandler.h picolist.h
+$(SOPHYAOBJP)pilistgen.o: pilistgen.cc $(SOPHYAINCP)sopnamsp.h \
+  pilistgen.h pisysdep.h $(SOPHYAINCP)machdefs.h \
+  piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pilistgen.cc
  
@@ -330 +317 @@
   pilistx.h pilistgen.h pisysdep.h \
   $(SOPHYAINCP)machdefs.h piwdgx.h piwdggen.h \
-  pimsghandler.h picolist.h picontainerx.h picontainergen.h
+  pimsghandler.h picolist.h pipixutils.h picontainerx.h picontainergen.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pilistx.cc
  
 $(SOPHYAOBJP)pimenubargen.o: pimenubargen.cc \
   $(SOPHYAINCP)sopnamsp.h pimenubargen.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
-  pimenux.h pimenugen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pisysdep.h $(SOPHYAINCP)machdefs.h pimenux.h \
+  pimenugen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h \
   piapplx.h piapplgen.h picontainerx.h picontainergen.h pimenubarx.h \
   piconsenum.h
@@ -344 +331 @@
   $(SOPHYAINCP)sopnamsp.h pimenubarx.h \
   pimenubargen.h pisysdep.h \
-  $(SOPHYAINCP)machdefs.h pimenux.h \
-  pimenugen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h piapplx.h \
+  $(SOPHYAINCP)machdefs.h pimenux.h pimenugen.h \
+  piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h piapplx.h \
   piapplgen.h picontainerx.h picontainergen.h piconsenum.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pimenubarx.cc
  
-$(SOPHYAOBJP)pimenugen.o: pimenugen.cc \
-  $(SOPHYAINCP)sopnamsp.h pimenugen.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h piwdgx.h \
-  piwdggen.h pimsghandler.h picolist.h
+$(SOPHYAOBJP)pimenugen.o: pimenugen.cc $(SOPHYAINCP)sopnamsp.h \
+  pimenugen.h pisysdep.h $(SOPHYAINCP)machdefs.h \
+  piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pimenugen.cc
  
 $(SOPHYAOBJP)pimenux.o: pimenux.cc $(SOPHYAINCP)sopnamsp.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
-  pimenubarx.h pimenubargen.h pimenux.h pimenugen.h piwdgx.h piwdggen.h \
-  pimsghandler.h picolist.h
+  pisysdep.h $(SOPHYAINCP)machdefs.h pimenubarx.h \
+  pimenubargen.h pimenux.h pimenugen.h piwdgx.h piwdggen.h pimsghandler.h \
+  picolist.h pipixutils.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pimenux.cc
  
@@ -368 +354 @@
 $(SOPHYAOBJP)pioptmenugen.o: pioptmenugen.cc \
   $(SOPHYAINCP)sopnamsp.h pioptmenugen.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
-  pimenux.h pimenugen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h
+  pisysdep.h $(SOPHYAINCP)machdefs.h pimenux.h \
+  pimenugen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pioptmenugen.cc
  
@@ -376 +362 @@
   $(SOPHYAINCP)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 \
+  picolist.h pipixutils.h pistdwdgx.h pistdwdggen.h piapplx.h piapplgen.h \
   picontainerx.h picontainergen.h pimenubarx.h pimenubargen.h \
   piconsenum.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pioptmenux.cc
  
-$(SOPHYAOBJP)piperiodx.o: piperiodx.cc \
-  $(SOPHYAINCP)sopnamsp.h piwdgx.h piwdggen.h \
-  $(SOPHYAINCP)machdefs.h pimsghandler.h \
-  picolist.h piperiodx.h \
+$(SOPHYAOBJP)piperiodx.o: piperiodx.cc $(SOPHYAINCP)sopnamsp.h \
+  piwdgx.h piwdggen.h $(SOPHYAINCP)machdefs.h \
+  pimsghandler.h picolist.h pipixutils.h piperiodx.h \
   $(SOPHYAINCP)periodic.h \
   $(SOPHYAINCP)machdefs.h
@@ -391 +376 @@
 $(SOPHYAOBJP)pipixmapgen.o: pipixmapgen.cc \
   $(SOPHYAINCP)sopnamsp.h pipixmapgen.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
-  pibwdgx.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pisysdep.h $(SOPHYAINCP)machdefs.h pibwdgx.h \
+  pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h \
   picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h pifontx.h \
-  pifontgen.h pigrcoord.h pilineatt.h pipixutils.h pigraphuc.h \
-  pievthandler.h psfile.h pigraphps.h
+  pifontgen.h pigrcoord.h pilineatt.h pigraphuc.h pievthandler.h psfile.h \
+  pigraphps.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pipixmapgen.cc
  
-$(SOPHYAOBJP)pipixmapx.o: pipixmapx.cc \
-  $(SOPHYAINCP)sopnamsp.h pipixmapx.h \
-  pipixmapgen.h pisysdep.h \
-  $(SOPHYAINCP)machdefs.h pibwdgx.h \
-  pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h picmap.h \
+$(SOPHYAOBJP)pipixmapx.o: pipixmapx.cc $(SOPHYAINCP)sopnamsp.h \
+  pipixmapx.h pipixmapgen.h pisysdep.h \
+  $(SOPHYAINCP)machdefs.h pibwdgx.h pibwdggen.h \
+  piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h picmap.h \
   picmapx.h picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h \
-  pigrcoord.h pilineatt.h pipixutils.h pigraphuc.h pievthandler.h \
-  psfile.h pigraphps.h
+  pigrcoord.h pilineatt.h pigraphuc.h pievthandler.h psfile.h pigraphps.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pipixmapx.cc
  
@@ -415 +398 @@
   $(SOPHYAINCP)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 pipixutils.h pigraphuc.h \
+  picolist.h pipixutils.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 \
@@ -427 +410 @@
   $(SOPHYAINCP)sopnamsp.h pistdwdggen.h \
   pisysdep.h $(SOPHYAINCP)machdefs.h piwdgx.h \
-  piwdggen.h pimsghandler.h picolist.h
+  piwdggen.h pimsghandler.h picolist.h pipixutils.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pistdwdggen.cc
  
-$(SOPHYAOBJP)pistdwdgx.o: pistdwdgx.cc \
-  $(SOPHYAINCP)sopnamsp.h pisysdep.h \
-  $(SOPHYAINCP)machdefs.h pistdwdgx.h \
+$(SOPHYAOBJP)pistdwdgx.o: pistdwdgx.cc $(SOPHYAINCP)sopnamsp.h \
+  pisysdep.h $(SOPHYAINCP)machdefs.h pistdwdgx.h \
   pistdwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
-  picontainerx.h picontainergen.h
+  pipixutils.h picontainerx.h picontainergen.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pistdwdgx.cc
  
-$(SOPHYAOBJP)pistzwin.o: pistzwin.cc \
-  $(SOPHYAINCP)sopnamsp.h pistzwin.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
+$(SOPHYAOBJP)pistzwin.o: pistzwin.cc $(SOPHYAINCP)sopnamsp.h \
+  pistzwin.h pisysdep.h $(SOPHYAINCP)machdefs.h \
   piwindowx.h piwindowgen.h picontainerx.h picontainergen.h piwdgx.h \
-  piwdggen.h pimsghandler.h picolist.h piperiodx.h \
+  piwdggen.h pimsghandler.h picolist.h pipixutils.h piperiodx.h \
   $(SOPHYAINCP)periodic.h \
-  $(SOPHYAINCP)machdefs.h psfile.h \
-  pifontgen.h pigraphgen.h picmap.h picmapx.h picmapgen.h pifontx.h \
-  pigrcoord.h pilineatt.h pipixutils.h
+  $(SOPHYAINCP)machdefs.h psfile.h pifontgen.h \
+  pigraphgen.h picmap.h picmapx.h picmapgen.h pifontx.h pigrcoord.h \
+  pilineatt.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pistzwin.cc
  
-$(SOPHYAOBJP)pisurfdr.o: pisurfdr.cc \
-  $(SOPHYAINCP)sopnamsp.h pisurfdr.h \
-  parradapter.h $(SOPHYAINCP)machdefs.h lut.h \
-  pipixutils.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
+$(SOPHYAOBJP)pisurfdr.o: pisurfdr.cc $(SOPHYAINCP)sopnamsp.h \
+  pisurfdr.h parradapter.h \
+  $(SOPHYAINCP)machdefs.h lut.h pipixutils.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
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pisurfdr.cc
  
 $(SOPHYAOBJP)pitherm.o: pitherm.cc $(SOPHYAINCP)sopnamsp.h \
-  pitherm.h pisysdep.h \
-  $(SOPHYAINCP)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 pipixutils.h pigraphuc.h pievthandler.h \
-  psfile.h pigraphps.h
+  pitherm.h pisysdep.h $(SOPHYAINCP)machdefs.h \
+  pibwdgx.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pipixutils.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
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pitherm.cc
  
-$(SOPHYAOBJP)pitxtdrw.o: pitxtdrw.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  $(SOPHYAINCP)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 pipixutils.h pigraphuc.h \
+$(SOPHYAOBJP)pitxtdrw.o: pitxtdrw.cc $(SOPHYAINCP)sopnamsp.h \
+  $(SOPHYAINCP)machdefs.h pitxtdrw.h pisysdep.h \
+  pidrawer.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pipixutils.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
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pitxtdrw.cc
  
-$(SOPHYAOBJP)piwdggen.o: piwdggen.cc \
-  $(SOPHYAINCP)sopnamsp.h piwdggen.h \
-  $(SOPHYAINCP)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 pipixutils.h psfile.h
+$(SOPHYAOBJP)piwdggen.o: piwdggen.cc $(SOPHYAINCP)sopnamsp.h \
+  piwdggen.h $(SOPHYAINCP)machdefs.h \
+  pimsghandler.h picolist.h pipixutils.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
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piwdggen.cc
  
 $(SOPHYAOBJP)piwdgx.o: piwdgx.cc $(SOPHYAINCP)sopnamsp.h \
   piwdgx.h piwdggen.h $(SOPHYAINCP)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 pipixutils.h \
+  pimsghandler.h picolist.h pipixutils.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 \
   $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)machdefs.h
@@ -497 +474 @@
   pisysdep.h $(SOPHYAINCP)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 pipixutils.h
+  picolist.h pipixutils.h psfile.h pifontgen.h pigraphgen.h picmap.h \
+  picmapx.h picmapgen.h pifontx.h pigrcoord.h pilineatt.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piwindowgen.cc
  
-$(SOPHYAOBJP)piwindowx.o: piwindowx.cc \
-  $(SOPHYAINCP)sopnamsp.h piwindowx.h \
-  piwindowgen.h pisysdep.h \
+$(SOPHYAOBJP)piwindowx.o: piwindowx.cc $(SOPHYAINCP)sopnamsp.h \
+  piwindowx.h piwindowgen.h pisysdep.h \
   $(SOPHYAINCP)machdefs.h picontainerx.h \
-  picontainergen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h
+  picontainergen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pipixutils.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piwindowx.cc
  
-$(SOPHYAOBJP)pixtbase.o: pixtbase.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  $(SOPHYAINCP)machdefs.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 pipixutils.h pigraphuc.h \
+$(SOPHYAOBJP)pixtbase.o: pixtbase.cc $(SOPHYAINCP)sopnamsp.h \
+  $(SOPHYAINCP)machdefs.h pixtbaseP.h pibwdgx.h \
+  pisysdep.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pipixutils.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
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pixtbase.cc
  
-$(SOPHYAOBJP)piyfxdrw.o: piyfxdrw.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  $(SOPHYAINCP)machdefs.h piyfxdrw.h \
-  pisysdep.h parradapter.h lut.h pipixutils.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
+$(SOPHYAOBJP)piyfxdrw.o: piyfxdrw.cc $(SOPHYAINCP)sopnamsp.h \
+  $(SOPHYAINCP)machdefs.h piyfxdrw.h pisysdep.h \
+  parradapter.h lut.h pipixutils.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
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piyfxdrw.cc
  
@@ -529 +504 @@
   psfile.h $(SOPHYAINCP)machdefs.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 \
-  pipixutils.h
+  pipixutils.h picmap.h picmapx.h picmapgen.h pifontx.h pigrcoord.h \
+  pilineatt.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  psfile.cc
  

trunk/SophyaPI/PI/parradapter.cc

@@ -202 +202 @@
   double x,y;
   this->Coord(ix, iy, x, y);
-  char * isr = "";
+  const char * isr = "";
   if (ISFunc != NULL)  isr = ISFunc(this, ix, iy);
   sprintf(ibuff,"X= %g Y= %g  Pix= %g %s   ", 

trunk/SophyaPI/PI/piapplx.cc

@@ -40 +40 @@
 class PITopContAppX : public PIContainer {
 public :
-                PITopContAppX(PIContainer *par, char *nom, PIWdg* topw,
+                PITopContAppX(PIContainer *par, const char *nom, PIWdg* topw,
                           int sx=10, int sy=10, int px=0, int py=0);
    virtual      ~PITopContAppX(); 
@@ -52 +52 @@
 
 /* --Methode-- */
-PITopContAppX::PITopContAppX(PIContainer *par, char *nom, PIWdg* topw, int sx, int sy, int px, int py)
+PITopContAppX::PITopContAppX(PIContainer *par, const char *nom, PIWdg* topw, int sx, int sy, int px, int py)
         : PIContainer(par, nom, (sx>10)?sx:10, (sy>10)?sy:10, px, py)
 {
@@ -141 +141 @@
 if (sx < sxt)  sx = sxt;
 if (sy < 10) sy = 10;
-topcont = new PITopContAppX(MBCont(), "TopLevelCont", topwdg, 
-                            sx, sy, 0, msy);
+topcont = new PITopContAppX(MBCont(), "TopLevelCont", topwdg, sx, sy, 0, msy);
 MBCont()->Show();
 //DBG printf("PIApplicationX-DBG2:: MBContSize=%d %d \n", MBCont()->XSize(), MBCont()->YSize());

trunk/SophyaPI/PI/pibwdgx.cc

@@ -39 +39 @@
 CreateXtWdg(nom, piXtBaseWidgetClass, NULL, sx, sy, px, py);
 
-XtSetArg(wargs[0],PIXNobject,this); 
+XtSetArg(wargs[0],const_cast<char*>(PIXNobject),this); 
 XtSetArg(wargs[1],XtNbackground, colpixwhite);  
 XtSetArg(wargs[2],XtNborderWidth, (Dimension)0);  
@@ -72 +72 @@
 #endif
 Arg  wargs[2];
-XtSetArg(wargs[0],PIXNobject,NULL); 
+ XtSetArg(wargs[0],const_cast<char*>(PIXNobject),NULL); 
 XtSetValues(XtWdg(), wargs, 1);
 }

trunk/SophyaPI/PI/pifilechox.cc

@@ -120 +120 @@
 {
 XmString xmstr;
-xmstr = XmStringLtoRCreate((char *)path.c_str(), XmSTRING_DEFAULT_CHARSET);
+xmstr = XmStringLtoRCreate(const_cast<char*>(path.c_str()), const_cast<char*>(XmSTRING_DEFAULT_CHARSET));
 Arg warg[2];
 XtSetArg(warg[0], XmNdirectory, xmstr); 
@@ -132 +132 @@
 {
 XmString xmstr;
-xmstr = XmStringLtoRCreate((char *)fname.c_str(), XmSTRING_DEFAULT_CHARSET);
+xmstr = XmStringLtoRCreate(const_cast<char*>(fname.c_str()),  const_cast<char*>(XmSTRING_DEFAULT_CHARSET));
 Arg warg[2];
 XtSetArg(warg[0], XmNtextString, xmstr); 

trunk/SophyaPI/PI/pifontx.cc

@@ -263 +263 @@
 
 static XtResource resources[] = {
-  { "fontFamilyName", "FontFamilyName", XtRString, sizeof(String),
+  { const_cast<char *>("fontFamilyName"), const_cast<char *>("FontFamilyName"), 
+    XtRString, sizeof(String),
     /*XtOffset(apd, fntFam[0])*/ 0, XtRString, const_cast<char *>("*-courier") } ,
-  { "courierfontFamilyName", "CourierfontFamilyName", XtRString, sizeof(String),
+  { const_cast<char *>("courierfontFamilyName"), const_cast<char *>("CourierfontFamilyName"), 
+    XtRString, sizeof(String),
     sizeof(String) , XtRString, const_cast<char *>("*-courier") } ,
-  { "helveticafontFamilyName", "HelveticafontFamilyName", XtRString, sizeof(String),
+  { const_cast<char *>("helveticafontFamilyName"), const_cast<char *>("HelveticafontFamilyName"), 
+    XtRString, sizeof(String),
     2*sizeof(String) , XtRString, const_cast<char *>("*-helvetica") } ,
-  { "timesfontFamilyName", "TimesfontFamilyName", XtRString, sizeof(String),
+  { const_cast<char *>("timesfontFamilyName"), const_cast<char *>("TimesfontFamilyName"), 
+    XtRString, sizeof(String),
     3*sizeof(String) , XtRString, const_cast<char *>("*-times") } ,
-  { "symbolfontFamilyName", "SymbolfontFamilyName", XtRString, sizeof(String),
+  { const_cast<char *>("symbolfontFamilyName"), const_cast<char *>("SymbolfontFamilyName"), 
+    XtRString, sizeof(String),
     4*sizeof(String) , XtRString, const_cast<char *>("*-symbol") }
 };
  
-static char * fnbi_b[4] = { "medium-r-normal", "bold-r-normal", 
+static const char * fnbi_b[4] = { "medium-r-normal", "bold-r-normal", 
                           "medium-o-normal", "bold-o-normal" };
-static char * fnbo_b[4] = { NULL, NULL, 
+static const char * fnbo_b[4] = { NULL, NULL, 
                           "medium-i-normal", "bold-i-normal" };
 
@@ -355 +360 @@
   printf("PIFontX::Init %d fonts found for %s , switching to courier\n",
          count, apd.fntFam[0]);
-  apd.fntFam[0] = "*-courier";
+  apd.fntFam[0] = const_cast<char *>("*-courier");
   if (list) XFreeFontNames(list);
   }

trunk/SophyaPI/PI/pilistx.cc

@@ -116 +116 @@
 mNItem++;
 
-#if defined(__DECCXX) || defined(__KCC__) || defined(__aCC__)
-XmString xms = XmStringCreate(const_cast<char *>(item), XmSTRING_DEFAULT_CHARSET);
-#else
-XmString xms = XmStringCreate((char *)(item), XmSTRING_DEFAULT_CHARSET);
-#endif
+XmString xms = XmStringCreate(const_cast<char*>(item), const_cast<char*>(XmSTRING_DEFAULT_CHARSET));
 XmListAddItem(mlist, xms, 0);
 XmStringFree(xms);

trunk/SophyaPI/PI/pimenux.cc

@@ -386 +386 @@
   n=0;
   sprintf(acc,"Ctrl/%c", sc[0]);
-  xmstr = XmStringLtoRCreate(acc, XmSTRING_DEFAULT_CHARSET);
+  xmstr = XmStringLtoRCreate(acc, const_cast<char*>(XmSTRING_DEFAULT_CHARSET));
   XtSetArg(warg[n], XmNacceleratorText, xmstr); n++;
   sprintf(acc,"Ctrl<Key>%c", sc[0]);

trunk/SophyaPI/PI/pioptmenux.cc

@@ -160 +160 @@
 {
 XmString xmstr;
-xmstr = XmStringLtoRCreate((char *)lab.c_str(), XmSTRING_DEFAULT_CHARSET);
+xmstr = XmStringLtoRCreate(const_cast<char*>(lab.c_str()), const_cast<char*>(XmSTRING_DEFAULT_CHARSET));
 int n=0;
 Arg warg[2];

trunk/SophyaPI/PI/pistdwdgx.cc

@@ -51 +51 @@
 {
 XmString xmstr;
-xmstr = XmStringLtoRCreate((char *)lab.c_str(), XmSTRING_DEFAULT_CHARSET);
+xmstr = XmStringLtoRCreate(const_cast<char*>(lab.c_str()), const_cast<char*>(XmSTRING_DEFAULT_CHARSET));
 int n=0;
 Arg warg[2];
@@ -149 +149 @@
 {
 XmString xmstr;
-xmstr = XmStringLtoRCreate((char *)lab.c_str(), XmSTRING_DEFAULT_CHARSET);
+xmstr = XmStringLtoRCreate(const_cast<char*>(lab.c_str()), const_cast<char*>(XmSTRING_DEFAULT_CHARSET));
 int n=0;
 Arg warg[2];

trunk/SophyaPI/PI/pitherm.cc

@@ -24 +24 @@
 //--
 //++
-//  PIThermometer(PIContainerGen *par, char *nom, int sx=256, int sy=10, int px=0, int py=0)
+//  PIThermometer(PIContainerGen *par, const char *nom, int sx=256, int sy=10, int px=0, int py=0)
 //      Constructeur - Le choix d'affichage (vertical ou horizontal) dépend
 //      du rapport des tailles "sx", "sy"
@@ -31 +31 @@
 
 /* --Methode-- */
-PIThermometer::PIThermometer(PIContainerGen *par, char *nom,
+PIThermometer::PIThermometer(PIContainerGen *par, const char *nom,
                        int sx, int sy, int px, int py) 
 : PIBaseWdg(par, nom, sx, sy, px, py)

trunk/SophyaPI/PI/pitherm.h

@@ -16 +16 @@
   enum {ClassId = 5220};
 
-                  PIThermometer(PIContainerGen *par, char *nom,
+                  PIThermometer(PIContainerGen *par, const char *nom,
                                 int sx=256, int sy=10, int px=0, int py=0);
   virtual         ~PIThermometer();

trunk/SophyaPI/PI/piwdgx.cc

@@ -20 +20 @@
 #include "pigraphx.h"
 
-#ifdef SANS_EVOLPLANCK
-#include "perrors.h"
-#else
 #include "pexceptions.h"
-#endif
 
 
@@ -627 +623 @@
 // Ressources X si non definis 
 static const String fallback_res[26] = {
-"PeidaInt*default*background:                 LightGrey" ,
-"PeidaInt*background:                         LightGrey" ,
-"PeidaInt*Foreground:                         Black",
-"PeidaInt*default*Foreground:                 Black",
-"PeidaInt*default*bottomShadowColor:          Black",
-"PeidaInt*bottomShadowColor:                  Black",
-"PeidaInt*default*topShadowColor:             White",
-"PeidaInt*topShadowColor:                     White",
-"PeidaInt*borderColor:                        Black",
-"PeidaInt*XmLabel.borderWidth:                0",
-"PeidaInt*XmDrawingArea*background:           Black",
-"PeidaInt*XmPushButton*borderWidth:           0",
-"PeidaInt*XmText*shadowThickness:             2",
-"PeidaInt*XmText*highlightThickness:          0",
-"PeidaInt*XmText*marginHeigt:                 0",
-"PeidaInt*XmText*marginWidth:                 2",
-// "PeidaInt*DefMenubar*XtNwidth:                250",
-// "PeidaInt*DefMenubar*XtNheight:               30",
-"PeidaInt*fontList:           -*-courier-bold-r-normal-*-12-*-*-*-*-*-ISO8859-1",
-"PeidaInt*default*fontList:   -*-courier-bold-r-normal-*-12-*-*-*-*-*-ISO8859-1",
-"PeidaInt*fontFamilyName:                     *-courier",    // Pas de blanc apres le nom de font
-"PeidaInt*courierfontFamilyName:              *-courier",    //           "        " 
-"PeidaInt*helveticafontFamilyName:            *-helvetica",  //           "        " 
-"PeidaInt*timesfontFamilyName:                *-times",      //           "        " 
-"PeidaInt*symbolfontFamilyName:               *-symbol",     //           "        " 
-"PeidaInt*XmToggleButton*selectColor:         Red",
+const_cast<char*>("PeidaInt*default*background:                 LightGrey") ,
+const_cast<char*>("PeidaInt*background:                         LightGrey") ,
+const_cast<char*>("PeidaInt*Foreground:                         Black"),
+const_cast<char*>("PeidaInt*default*Foreground:                 Black"),
+const_cast<char*>("PeidaInt*default*bottomShadowColor:          Black"),
+const_cast<char*>("PeidaInt*bottomShadowColor:                  Black"),
+const_cast<char*>("PeidaInt*default*topShadowColor:             White"),
+const_cast<char*>("PeidaInt*topShadowColor:                     White"),
+const_cast<char*>("PeidaInt*borderColor:                        Black"),
+const_cast<char*>("PeidaInt*XmLabel.borderWidth:                0"),
+const_cast<char*>("PeidaInt*XmDrawingArea*background:           Black"),
+const_cast<char*>("PeidaInt*XmPushButton*borderWidth:           0"),
+const_cast<char*>("PeidaInt*XmText*shadowThickness:             2"),
+const_cast<char*>("PeidaInt*XmText*highlightThickness:          0"),
+const_cast<char*>("PeidaInt*XmText*marginHeigt:                 0"),
+const_cast<char*>("PeidaInt*XmText*marginWidth:                 2"),
+// const_cast<char*>("PeidaInt*DefMenubar*XtNwidth:                250"),
+// const_cast<char*>("PeidaInt*DefMenubar*XtNheight:               30"),
+const_cast<char*>("PeidaInt*fontList:           -*-courier-bold-r-normal-*-12-*-*-*-*-*-ISO8859-1"),
+const_cast<char*>("PeidaInt*default*fontList:   -*-courier-bold-r-normal-*-12-*-*-*-*-*-ISO8859-1"),
+const_cast<char*>("PeidaInt*fontFamilyName:                     *-courier"),    // Pas de blanc apres le nom de font
+const_cast<char*>("PeidaInt*courierfontFamilyName:              *-courier"),    //           "        " 
+const_cast<char*>("PeidaInt*helveticafontFamilyName:            *-helvetica"),  //           "        " 
+const_cast<char*>("PeidaInt*timesfontFamilyName:                *-times"),      //           "        " 
+const_cast<char*>("PeidaInt*symbolfontFamilyName:               *-symbol"),     //           "        " 
+const_cast<char*>("PeidaInt*XmToggleButton*selectColor:         Red"),
 NULL
 };
@@ -681 +677 @@
 if (top == NULL) {
   fprintf(stderr, "PIWdgX::InitXt()/ Error XtVaAppInitialize()\n");
-#ifdef SANS_EVOLPLANCK
-  throw notFoundErr;
-#else
-  throw NotFoundExc("PIWdgX::InitXt()/ Error XtVaAppInitialize()");
-#endif
+  throw PError("PIWdgX::InitXt()/ Error XtVaAppInitialize()");
   }
 dpy = XtDisplay(top);
 if (dpy == NULL)  {
   fprintf(stderr, "PIWdgX::InitXt()/ Error XtVaAppInitialize()/DisplayConnection\n");
-#ifdef SANS_EVOLPLANCK
-  throw notFoundErr;
-#else
-  throw NotFoundExc("PIWdgX::InitXt()/ Error XtVaAppInitialize()/DisplayConnection");
-#endif
+  throw PError("PIWdgX::InitXt()/ Error XtVaAppInitialize()/DisplayConnection");
   }
 
@@ -734 +722 @@
   }
 stdfnt = XLoadQueryFont(dpy, buff);
-char * myfntname = "???";
+const char * myfntname = "???";
 // Recherche du champ taille en pixel de la fonte : apres le 7eme tiret
 int mySzFont = 12;

trunk/SophyaPI/PI/pixtbase.cc

@@ -46 +46 @@
 
 static XtResource resources[] ={
-  {PIXNobject ,(char *)"Object", XtRPointer, sizeof(XtRPointer),
+  {const_cast<char*>(PIXNobject) ,const_cast<char*>("Object"), XtRPointer, sizeof(XtRPointer),
    XtOffset(PIXtBaseWidget,  pixtbase.objet), XtRImmediate, (XtPointer)0},
 };

trunk/SophyaPI/PI/smakefile

@@ -4 +4 @@
  
 clean:
-         rm -f $(SOPHYAOBJP)lut.o $(SOPHYAOBJP)parradapter.o $(SOPHYAOBJP)pi3ddrw.o $(SOPHYAOBJP)pi3dwdg.o $(SOPHYAOBJP)piapplgen.o $(SOPHYAOBJP)piapplx.o $(SOPHYAOBJP)piaxes.o $(SOPHYAOBJP)piaxestools.o $(SOPHYAOBJP)pibargraph.o $(SOPHYAOBJP)pibwdggen.o $(SOPHYAOBJP)pibwdgx.o $(SOPHYAOBJP)picmap.o $(SOPHYAOBJP)picmapgen.o $(SOPHYAOBJP)picmapview.o $(SOPHYAOBJP)picmapx.o $(SOPHYAOBJP)picons.o $(SOPHYAOBJP)picontainergen.o $(SOPHYAOBJP)picontainerx.o $(SOPHYAOBJP)pidrawer.o $(SOPHYAOBJP)pidrawwin.o $(SOPHYAOBJP)pidrwtools.o $(SOPHYAOBJP)pieldrw.o $(SOPHYAOBJP)pierrdisp.o $(SOPHYAOBJP)pievthandler.o $(SOPHYAOBJP)pifilechogen.o $(SOPHYAOBJP)pifilechox.o $(SOPHYAOBJP)pifontgen.o $(SOPHYAOBJP)pifontx.o $(SOPHYAOBJP)pigraph3d.o $(SOPHYAOBJP)pigraphgen.o $(SOPHYAOBJP)pigraphps.o $(SOPHYAOBJP)pigraphuc.o $(SOPHYAOBJP)pigraphx.o $(SOPHYAOBJP)pigratt.o $(SOPHYAOBJP)pigrcoord.o $(SOPHYAOBJP)piimage.o $(SOPHYAOBJP)piimgtools.o $(SOPHYAOBJP)pilineatt.o $(SOPHYAOBJP)pilistgen.o $(SOPHYAOBJP)pilistx.o $(SOPHYAOBJP)pimenubargen.o $(SOPHYAOBJP)pimenubarx.o $(SOPHYAOBJP)pimenugen.o $(SOPHYAOBJP)pimenux.o $(SOPHYAOBJP)pimsghandler.o $(SOPHYAOBJP)pioptmenugen.o $(SOPHYAOBJP)pioptmenux.o $(SOPHYAOBJP)piperiodx.o $(SOPHYAOBJP)pipixmapgen.o $(SOPHYAOBJP)pipixmapx.o $(SOPHYAOBJP)pipixutils.o $(SOPHYAOBJP)pipplist.o $(SOPHYAOBJP)pippmenubar.o $(SOPHYAOBJP)pippoptmenu.o $(SOPHYAOBJP)pippviewadapter.o $(SOPHYAOBJP)piscdrawwdg.o $(SOPHYAOBJP)pistdwdggen.o $(SOPHYAOBJP)pistdwdgx.o $(SOPHYAOBJP)pistzwin.o $(SOPHYAOBJP)pisurfdr.o $(SOPHYAOBJP)pitherm.o $(SOPHYAOBJP)pitxtdrw.o $(SOPHYAOBJP)piup.o $(SOPHYAOBJP)piupdattachment.o $(SOPHYAOBJP)piup_def.o $(SOPHYAOBJP)piwdggen.o $(SOPHYAOBJP)piwdgx.o $(SOPHYAOBJP)piwindowgen.o $(SOPHYAOBJP)piwindowx.o $(SOPHYAOBJP)pixtbase.o $(SOPHYAOBJP)piyfxdrw.o $(SOPHYAOBJP)psfile.o $(SOPHYAOBJP)xdispim.o
+         rm -f $(SOPHYAOBJP)lut.o $(SOPHYAOBJP)parradapter.o $(SOPHYAOBJP)pi3ddrw.o $(SOPHYAOBJP)pi3dwdg.o $(SOPHYAOBJP)piapplgen.o $(SOPHYAOBJP)piapplx.o $(SOPHYAOBJP)piaxes.o $(SOPHYAOBJP)piaxestools.o $(SOPHYAOBJP)pibargraph.o $(SOPHYAOBJP)pibwdggen.o $(SOPHYAOBJP)pibwdgx.o $(SOPHYAOBJP)picmap.o $(SOPHYAOBJP)picmapgen.o $(SOPHYAOBJP)picmapview.o $(SOPHYAOBJP)picmapx.o $(SOPHYAOBJP)picons.o $(SOPHYAOBJP)picontainergen.o $(SOPHYAOBJP)picontainerx.o $(SOPHYAOBJP)pidrawer.o $(SOPHYAOBJP)pidrawwin.o $(SOPHYAOBJP)pidrwtools.o $(SOPHYAOBJP)pieldrw.o $(SOPHYAOBJP)pierrdisp.o $(SOPHYAOBJP)pievthandler.o $(SOPHYAOBJP)pifilechogen.o $(SOPHYAOBJP)pifilechox.o $(SOPHYAOBJP)pifontgen.o $(SOPHYAOBJP)pifontx.o $(SOPHYAOBJP)pigraph3d.o $(SOPHYAOBJP)pigraphgen.o $(SOPHYAOBJP)pigraphps.o $(SOPHYAOBJP)pigraphuc.o $(SOPHYAOBJP)pigraphx.o $(SOPHYAOBJP)pigratt.o $(SOPHYAOBJP)pigrcoord.o $(SOPHYAOBJP)piimage.o $(SOPHYAOBJP)piimgtools.o $(SOPHYAOBJP)pilineatt.o $(SOPHYAOBJP)pilistgen.o $(SOPHYAOBJP)pilistx.o $(SOPHYAOBJP)pimenubargen.o $(SOPHYAOBJP)pimenubarx.o $(SOPHYAOBJP)pimenugen.o $(SOPHYAOBJP)pimenux.o $(SOPHYAOBJP)pimsghandler.o $(SOPHYAOBJP)pioptmenugen.o $(SOPHYAOBJP)pioptmenux.o $(SOPHYAOBJP)piperiodx.o $(SOPHYAOBJP)pipixmapgen.o $(SOPHYAOBJP)pipixmapx.o $(SOPHYAOBJP)pipixutils.o $(SOPHYAOBJP)pipplist.o $(SOPHYAOBJP)pippmenubar.o $(SOPHYAOBJP)pippoptmenu.o $(SOPHYAOBJP)pippviewadapter.o $(SOPHYAOBJP)piscdrawwdg.o $(SOPHYAOBJP)pistdwdggen.o $(SOPHYAOBJP)pistdwdgx.o $(SOPHYAOBJP)pistzwin.o $(SOPHYAOBJP)pisurfdr.o $(SOPHYAOBJP)pitherm.o $(SOPHYAOBJP)pitxtdrw.o $(SOPHYAOBJP)piup.o $(SOPHYAOBJP)piup_def.o $(SOPHYAOBJP)piupdattachment.o $(SOPHYAOBJP)piwdggen.o $(SOPHYAOBJP)piwdgx.o $(SOPHYAOBJP)piwindowgen.o $(SOPHYAOBJP)piwindowx.o $(SOPHYAOBJP)pixtbase.o $(SOPHYAOBJP)piyfxdrw.o $(SOPHYAOBJP)psfile.o $(SOPHYAOBJP)xdispim.o
         rm -f $(SOPHYALIBP)libPI.a
  
@@ -23 +23 @@
  
 $(SOPHYAOBJP)pi3ddrw.o: pi3ddrw.cc $(SOPHYAINCP)sopnamsp.h \
-  pi3ddrw.h pisysdep.h \
-  $(SOPHYAINCP)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 pipixutils.h pigraphuc.h pievthandler.h \
-  psfile.h pigratt.h piaxes.h pieldrw.h pigraph3d.h
+  pi3ddrw.h pisysdep.h $(SOPHYAINCP)machdefs.h \
+  pidrawer.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pipixutils.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
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pi3ddrw.cc
  
 $(SOPHYAOBJP)pi3dwdg.o: pi3dwdg.cc $(SOPHYAINCP)sopnamsp.h \
-  pi3dwdg.h pisysdep.h \
-  $(SOPHYAINCP)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 pipixutils.h pigraphuc.h \
+  pi3dwdg.h pisysdep.h $(SOPHYAINCP)machdefs.h \
+  pi3ddrw.h pidrawer.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h \
+  picolist.h pipixutils.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 \
@@ -44 +42 @@
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pi3dwdg.cc
  
-$(SOPHYAOBJP)piapplgen.o: piapplgen.cc \
-  $(SOPHYAINCP)sopnamsp.h piapplgen.h \
-  pimsghandler.h $(SOPHYAINCP)machdefs.h \
-  pisysdep.h picontainerx.h picontainergen.h piwdgx.h piwdggen.h \
-  picolist.h pimenubarx.h pimenubargen.h pimenux.h pimenugen.h \
-  piconsenum.h
+$(SOPHYAOBJP)piapplgen.o: piapplgen.cc $(SOPHYAINCP)sopnamsp.h \
+  piapplgen.h pimsghandler.h \
+  $(SOPHYAINCP)machdefs.h pisysdep.h \
+  picontainerx.h picontainergen.h piwdgx.h piwdggen.h picolist.h \
+  pipixutils.h pimenubarx.h pimenubargen.h pimenux.h pimenugen.h \
+  piconsenum.h pidrawer.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 pigratt.h piaxes.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piapplgen.cc
  
@@ -56 +56 @@
   $(SOPHYAINCP)machdefs.h pisysdep.h \
   picontainerx.h picontainergen.h piwdgx.h piwdggen.h picolist.h \
-  pimenubarx.h pimenubargen.h pimenux.h pimenugen.h piconsenum.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 pipixutils.h pigraphuc.h pievthandler.h psfile.h \
+  pipixutils.h pimenubarx.h pimenubargen.h pimenux.h pimenugen.h \
+  piconsenum.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
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piapplx.cc
  
 $(SOPHYAOBJP)piaxes.o: piaxes.cc $(SOPHYAINCP)sopnamsp.h \
-  $(SOPHYAINCP)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 pipixutils.h pigratt.h
+  $(SOPHYAINCP)machdefs.h piaxes.h pigraphuc.h \
+  pisysdep.h pigraphgen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pipixutils.h picmap.h picmapx.h picmapgen.h pifontx.h pifontgen.h \
+  pigrcoord.h pilineatt.h pigratt.h pidrawer.h pibwdggen.h pigraphx.h \
+  pievthandler.h psfile.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piaxes.cc
  
 $(SOPHYAOBJP)piaxestools.o: piaxestools.cc \
-  $(SOPHYAINCP)sopnamsp.h piaxes.h \
-  pigraphuc.h pisysdep.h \
-  $(SOPHYAINCP)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 pipixutils.h \
+  $(SOPHYAINCP)sopnamsp.h piaxes.h pigraphuc.h \
+  pisysdep.h $(SOPHYAINCP)machdefs.h pigraphgen.h \
+  piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.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 \
@@ -85 +85 @@
 $(SOPHYAOBJP)pibargraph.o: pibargraph.cc \
   $(SOPHYAINCP)sopnamsp.h \
-  $(SOPHYAINCP)machdefs.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 pipixutils.h pigraphuc.h \
+  $(SOPHYAINCP)machdefs.h pibargraph.h pisysdep.h \
+  pidrawer.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pipixutils.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
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pibargraph.cc
  
-$(SOPHYAOBJP)pibwdggen.o: pibwdggen.cc \
-  $(SOPHYAINCP)sopnamsp.h pibwdggen.h \
-  pisysdep.h $(SOPHYAINCP)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 \
-  pipixutils.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 piconsenum.h
+$(SOPHYAOBJP)pibwdggen.o: pibwdggen.cc $(SOPHYAINCP)sopnamsp.h \
+  pibwdggen.h pisysdep.h $(SOPHYAINCP)machdefs.h \
+  piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.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 piconsenum.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pibwdggen.cc
  
 $(SOPHYAOBJP)pibwdgx.o: pibwdgx.cc $(SOPHYAINCP)sopnamsp.h \
   pixtbaseP.h pibwdgx.h pisysdep.h \
-  $(SOPHYAINCP)machdefs.h pibwdggen.h \
-  piwdgx.h piwdggen.h pimsghandler.h picolist.h picmap.h picmapx.h \
+  $(SOPHYAINCP)machdefs.h pibwdggen.h piwdgx.h \
+  piwdggen.h pimsghandler.h picolist.h pipixutils.h picmap.h picmapx.h \
   picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigrcoord.h \
-  pilineatt.h pipixutils.h pigraphuc.h pievthandler.h psfile.h \
-  pigraphps.h pixtbase.h
+  pilineatt.h pigraphuc.h pievthandler.h psfile.h pigraphps.h pixtbase.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pibwdgx.cc
  
@@ -118 +116 @@
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  picmap.cc
  
-$(SOPHYAOBJP)picmapgen.o: picmapgen.cc \
-  $(SOPHYAINCP)sopnamsp.h picmapgen.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
+$(SOPHYAOBJP)picmapgen.o: picmapgen.cc $(SOPHYAINCP)sopnamsp.h \
+  picmapgen.h pisysdep.h $(SOPHYAINCP)machdefs.h \
   picmapx.h picmap.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  picmapgen.cc
  
 $(SOPHYAOBJP)picmapview.o: picmapview.cc \
-  $(SOPHYAINCP)sopnamsp.h picmapview.h \
-  pisysdep.h $(SOPHYAINCP)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 pipixutils.h pigraphuc.h \
-  pievthandler.h psfile.h pigraphps.h
+  $(SOPHYAINCP)sopnamsp.h picmapview.h pisysdep.h \
+  $(SOPHYAINCP)machdefs.h pibwdgx.h pibwdggen.h \
+  piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.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
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  picmapview.cc
  
 $(SOPHYAOBJP)picmapx.o: picmapx.cc $(SOPHYAINCP)sopnamsp.h \
   piwdgx.h piwdggen.h $(SOPHYAINCP)machdefs.h \
-  pimsghandler.h picolist.h picmapx.h picmapgen.h pisysdep.h
+  pimsghandler.h picolist.h pipixutils.h picmapx.h picmapgen.h pisysdep.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  picmapx.cc
  
 $(SOPHYAOBJP)picons.o: picons.cc $(SOPHYAINCP)sopnamsp.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
-  pimenux.h pimenugen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pisysdep.h $(SOPHYAINCP)machdefs.h pimenux.h \
+  pimenugen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.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 pipixutils.h \
-  pigraphuc.h pievthandler.h psfile.h pigraphps.h piconsenum.h
+  pigraphgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h pigraphuc.h \
+  pievthandler.h psfile.h pigraphps.h piconsenum.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  picons.cc
  
@@ -150 +146 @@
   $(SOPHYAINCP)sopnamsp.h picontainergen.h \
   pisysdep.h $(SOPHYAINCP)machdefs.h piwdgx.h \
-  piwdggen.h pimsghandler.h picolist.h
+  piwdggen.h pimsghandler.h picolist.h pipixutils.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  picontainergen.cc
  
@@ -156 +152 @@
   $(SOPHYAINCP)sopnamsp.h picontainerx.h \
   pisysdep.h $(SOPHYAINCP)machdefs.h \
-  picontainergen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h
+  picontainergen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pipixutils.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  picontainerx.cc
  
-$(SOPHYAOBJP)pidrawer.o: pidrawer.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  $(SOPHYAINCP)machdefs.h pidrawer.h \
-  pibwdggen.h pisysdep.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+$(SOPHYAOBJP)pidrawer.o: pidrawer.cc $(SOPHYAINCP)sopnamsp.h \
+  $(SOPHYAINCP)machdefs.h pidrawer.h pibwdggen.h \
+  pisysdep.h piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h \
   picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h pifontx.h \
-  pifontgen.h pigrcoord.h pilineatt.h pipixutils.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 piconsenum.h ucckprot.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 piconsenum.h ucckprot.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pidrawer.cc
  
-$(SOPHYAOBJP)pidrawwin.o: pidrawwin.cc \
-  $(SOPHYAINCP)sopnamsp.h pidrawwin.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
+$(SOPHYAOBJP)pidrawwin.o: pidrawwin.cc $(SOPHYAINCP)sopnamsp.h \
+  pidrawwin.h pisysdep.h $(SOPHYAINCP)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 pipixutils.h pigraphuc.h \
+  piwdggen.h pimsghandler.h picolist.h pipixutils.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
@@ -183 +178 @@
  
 $(SOPHYAOBJP)pidrwtools.o: pidrwtools.cc \
-  $(SOPHYAINCP)sopnamsp.h pidrwtools.h \
-  pisysdep.h $(SOPHYAINCP)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 piconsenum.h pibwdggen.h picmap.h picmapx.h \
-  picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigrcoord.h \
-  pilineatt.h pipixutils.h pigraphuc.h pievthandler.h psfile.h \
+  $(SOPHYAINCP)sopnamsp.h pidrwtools.h pisysdep.h \
+  $(SOPHYAINCP)machdefs.h pistdwdgx.h \
+  pistdwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pipixutils.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 piconsenum.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 \
   piscdrawwdg.h pibwdgx.h pigraphps.h pidrawer.h pigratt.h piaxes.h \
   pieldrw.h pi3dwdg.h pi3ddrw.h pigraph3d.h
@@ -196 +191 @@
  
 $(SOPHYAOBJP)pieldrw.o: pieldrw.cc $(SOPHYAINCP)sopnamsp.h \
-  $(SOPHYAINCP)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 pigrcoord.h pilineatt.h pipixutils.h pigraphuc.h \
+  $(SOPHYAINCP)machdefs.h pieldrw.h pidrawer.h \
+  pibwdggen.h pisysdep.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pipixutils.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
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pieldrw.cc
@@ -206 +201 @@
   $(SOPHYAINCP)sopnamsp.h pievthandler.h \
   pisysdep.h $(SOPHYAINCP)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 pipixutils.h
+  pimsghandler.h piwdgx.h piwdggen.h picolist.h pipixutils.h pigraphx.h \
+  pigraphgen.h picmap.h picmapx.h picmapgen.h pifontx.h pifontgen.h \
+  pigrcoord.h pilineatt.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pievthandler.cc
  
@@ -214 +209 @@
   $(SOPHYAINCP)sopnamsp.h pifilechogen.h \
   pisysdep.h $(SOPHYAINCP)machdefs.h piwdgx.h \
-  piwdggen.h pimsghandler.h picolist.h
+  piwdggen.h pimsghandler.h picolist.h pipixutils.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pifilechogen.cc
  
 $(SOPHYAOBJP)pifilechox.o: pifilechox.cc \
   $(SOPHYAINCP)sopnamsp.h pisysdep.h \
-  $(SOPHYAINCP)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 \
-  piconsenum.h pifilechox.h pifilechogen.h piwindowx.h piwindowgen.h
+  $(SOPHYAINCP)machdefs.h piapplx.h piapplgen.h \
+  pimsghandler.h picontainerx.h picontainergen.h piwdgx.h piwdggen.h \
+  picolist.h pipixutils.h pimenubarx.h pimenubargen.h pimenux.h \
+  pimenugen.h piconsenum.h pifilechox.h pifilechogen.h piwindowx.h \
+  piwindowgen.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pifilechox.cc
  
-$(SOPHYAOBJP)pifontgen.o: pifontgen.cc \
-  $(SOPHYAINCP)sopnamsp.h pigraphgen.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h piwdgx.h \
-  piwdggen.h pimsghandler.h picolist.h picmap.h picmapx.h picmapgen.h \
-  pifontx.h pifontgen.h pigrcoord.h pilineatt.h pipixutils.h
+$(SOPHYAOBJP)pifontgen.o: pifontgen.cc $(SOPHYAINCP)sopnamsp.h \
+  pigraphgen.h pisysdep.h $(SOPHYAINCP)machdefs.h \
+  piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h picmap.h \
+  picmapx.h picmapgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pifontgen.cc
  
 $(SOPHYAOBJP)pifontx.o: pifontx.cc $(SOPHYAINCP)sopnamsp.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
-  pifontx.h pifontgen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h
+  pisysdep.h $(SOPHYAINCP)machdefs.h pifontx.h \
+  pifontgen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pifontx.cc
  
-$(SOPHYAOBJP)pigraph3d.o: pigraph3d.cc \
-  $(SOPHYAINCP)sopnamsp.h pigraph3d.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
+$(SOPHYAOBJP)pigraph3d.o: pigraph3d.cc $(SOPHYAINCP)sopnamsp.h \
+  pigraph3d.h pisysdep.h $(SOPHYAINCP)machdefs.h \
   pigraphuc.h pigraphgen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pipixutils.h picmap.h picmapx.h picmapgen.h pifontx.h pifontgen.h \
+  pigrcoord.h pilineatt.h
+        $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pigraph3d.cc
+ 
+$(SOPHYAOBJP)pigraphgen.o: pigraphgen.cc \
+  $(SOPHYAINCP)sopnamsp.h pigraphgen.h pisysdep.h \
+  $(SOPHYAINCP)machdefs.h piwdgx.h piwdggen.h \
+  pimsghandler.h picolist.h pipixutils.h picmap.h picmapx.h picmapgen.h \
+  pifontx.h pifontgen.h pigrcoord.h pilineatt.h ucckprot.h
+        $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pigraphgen.cc
+ 
+$(SOPHYAOBJP)pigraphps.o: pigraphps.cc $(SOPHYAINCP)sopnamsp.h \
+  pigraphps.h pisysdep.h $(SOPHYAINCP)machdefs.h \
+  pigraphgen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h \
   picmap.h picmapx.h picmapgen.h pifontx.h pifontgen.h pigrcoord.h \
-  pilineatt.h pipixutils.h
-        $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pigraph3d.cc
- 
-$(SOPHYAOBJP)pigraphgen.o: pigraphgen.cc \
-  $(SOPHYAINCP)sopnamsp.h pigraphgen.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h piwdgx.h \
-  piwdggen.h pimsghandler.h picolist.h picmap.h picmapx.h picmapgen.h \
-  pifontx.h pifontgen.h pigrcoord.h pilineatt.h pipixutils.h ucckprot.h
-        $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pigraphgen.cc
- 
-$(SOPHYAOBJP)pigraphps.o: pigraphps.cc \
-  $(SOPHYAINCP)sopnamsp.h pigraphps.h \
-  pisysdep.h $(SOPHYAINCP)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 \
-  pipixutils.h psfile.h
+  pilineatt.h psfile.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pigraphps.cc
  
-$(SOPHYAOBJP)pigraphuc.o: pigraphuc.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  $(SOPHYAINCP)machdefs.h pigraphuc.h \
-  pisysdep.h pigraphgen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+$(SOPHYAOBJP)pigraphuc.o: pigraphuc.cc $(SOPHYAINCP)sopnamsp.h \
+  $(SOPHYAINCP)machdefs.h pigraphuc.h pisysdep.h \
+  pigraphgen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h \
   picmap.h picmapx.h picmapgen.h pifontx.h pifontgen.h pigrcoord.h \
-  pilineatt.h pipixutils.h ucckprot.h
+  pilineatt.h ucckprot.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pigraphuc.cc
  
-$(SOPHYAOBJP)pigraphx.o: pigraphx.cc \
-  $(SOPHYAINCP)sopnamsp.h pigraphx.h \
-  pisysdep.h $(SOPHYAINCP)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 \
-  pipixutils.h
+$(SOPHYAOBJP)pigraphx.o: pigraphx.cc $(SOPHYAINCP)sopnamsp.h \
+  pigraphx.h pisysdep.h $(SOPHYAINCP)machdefs.h \
+  pigraphgen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h \
+  picmap.h picmapx.h picmapgen.h pifontx.h pifontgen.h pigrcoord.h \
+  pilineatt.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pigraphx.cc
  
 $(SOPHYAOBJP)pigratt.o: pigratt.cc $(SOPHYAINCP)sopnamsp.h \
-  pigratt.h pisysdep.h \
-  $(SOPHYAINCP)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 pipixutils.h \
-  $(SOPHYAINCP)strutilxx.h \
+  pigratt.h pisysdep.h $(SOPHYAINCP)machdefs.h \
+  pigraphgen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h \
+  picmap.h picmapx.h picmapgen.h pifontx.h pifontgen.h pigrcoord.h \
+  pilineatt.h $(SOPHYAINCP)strutilxx.h \
   $(SOPHYAINCP)machdefs.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pigratt.cc
  
-$(SOPHYAOBJP)pigrcoord.o: pigrcoord.cc \
-  $(SOPHYAINCP)sopnamsp.h pigrcoord.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h
+$(SOPHYAOBJP)pigrcoord.o: pigrcoord.cc $(SOPHYAINCP)sopnamsp.h \
+  pigrcoord.h pisysdep.h $(SOPHYAINCP)machdefs.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pigrcoord.cc
  
 $(SOPHYAOBJP)piimage.o: piimage.cc $(SOPHYAINCP)sopnamsp.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
-  piimage.h parradapter.h lut.h pipixutils.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 \
+  pisysdep.h $(SOPHYAINCP)machdefs.h piimage.h \
+  parradapter.h lut.h pipixutils.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 \
@@ -304 +293 @@
  
 $(SOPHYAOBJP)piimgtools.o: piimgtools.cc \
-  $(SOPHYAINCP)sopnamsp.h piimgtools.h \
-  pisysdep.h $(SOPHYAINCP)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 piconsenum.h piimage.h parradapter.h lut.h \
-  pipixutils.h pieldrw.h pidrawer.h pibwdggen.h picmap.h picmapx.h \
+  $(SOPHYAINCP)sopnamsp.h piimgtools.h pisysdep.h \
+  $(SOPHYAINCP)machdefs.h pistdwdgx.h \
+  pistdwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pipixutils.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 piconsenum.h piimage.h \
+  parradapter.h lut.h pieldrw.h pidrawer.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 pigratt.h piaxes.h \
@@ -316 +305 @@
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piimgtools.cc
  
-$(SOPHYAOBJP)pilineatt.o: pilineatt.cc \
-  $(SOPHYAINCP)sopnamsp.h pilineatt.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h
+$(SOPHYAOBJP)pilineatt.o: pilineatt.cc $(SOPHYAINCP)sopnamsp.h \
+  pilineatt.h pisysdep.h $(SOPHYAINCP)machdefs.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pilineatt.cc
  
-$(SOPHYAOBJP)pilistgen.o: pilistgen.cc \
-  $(SOPHYAINCP)sopnamsp.h pilistgen.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h piwdgx.h \
-  piwdggen.h pimsghandler.h picolist.h
+$(SOPHYAOBJP)pilistgen.o: pilistgen.cc $(SOPHYAINCP)sopnamsp.h \
+  pilistgen.h pisysdep.h $(SOPHYAINCP)machdefs.h \
+  piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pilistgen.cc
  
@@ -330 +317 @@
   pilistx.h pilistgen.h pisysdep.h \
   $(SOPHYAINCP)machdefs.h piwdgx.h piwdggen.h \
-  pimsghandler.h picolist.h picontainerx.h picontainergen.h
+  pimsghandler.h picolist.h pipixutils.h picontainerx.h picontainergen.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pilistx.cc
  
 $(SOPHYAOBJP)pimenubargen.o: pimenubargen.cc \
   $(SOPHYAINCP)sopnamsp.h pimenubargen.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
-  pimenux.h pimenugen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pisysdep.h $(SOPHYAINCP)machdefs.h pimenux.h \
+  pimenugen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h \
   piapplx.h piapplgen.h picontainerx.h picontainergen.h pimenubarx.h \
   piconsenum.h
@@ -344 +331 @@
   $(SOPHYAINCP)sopnamsp.h pimenubarx.h \
   pimenubargen.h pisysdep.h \
-  $(SOPHYAINCP)machdefs.h pimenux.h \
-  pimenugen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h piapplx.h \
+  $(SOPHYAINCP)machdefs.h pimenux.h pimenugen.h \
+  piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h piapplx.h \
   piapplgen.h picontainerx.h picontainergen.h piconsenum.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pimenubarx.cc
  
-$(SOPHYAOBJP)pimenugen.o: pimenugen.cc \
-  $(SOPHYAINCP)sopnamsp.h pimenugen.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h piwdgx.h \
-  piwdggen.h pimsghandler.h picolist.h
+$(SOPHYAOBJP)pimenugen.o: pimenugen.cc $(SOPHYAINCP)sopnamsp.h \
+  pimenugen.h pisysdep.h $(SOPHYAINCP)machdefs.h \
+  piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pimenugen.cc
  
 $(SOPHYAOBJP)pimenux.o: pimenux.cc $(SOPHYAINCP)sopnamsp.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
-  pimenubarx.h pimenubargen.h pimenux.h pimenugen.h piwdgx.h piwdggen.h \
-  pimsghandler.h picolist.h
+  pisysdep.h $(SOPHYAINCP)machdefs.h pimenubarx.h \
+  pimenubargen.h pimenux.h pimenugen.h piwdgx.h piwdggen.h pimsghandler.h \
+  picolist.h pipixutils.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pimenux.cc
  
@@ -368 +354 @@
 $(SOPHYAOBJP)pioptmenugen.o: pioptmenugen.cc \
   $(SOPHYAINCP)sopnamsp.h pioptmenugen.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
-  pimenux.h pimenugen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h
+  pisysdep.h $(SOPHYAINCP)machdefs.h pimenux.h \
+  pimenugen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pioptmenugen.cc
  
@@ -376 +362 @@
   $(SOPHYAINCP)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 \
+  picolist.h pipixutils.h pistdwdgx.h pistdwdggen.h piapplx.h piapplgen.h \
   picontainerx.h picontainergen.h pimenubarx.h pimenubargen.h \
   piconsenum.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pioptmenux.cc
  
-$(SOPHYAOBJP)piperiodx.o: piperiodx.cc \
-  $(SOPHYAINCP)sopnamsp.h piwdgx.h piwdggen.h \
-  $(SOPHYAINCP)machdefs.h pimsghandler.h \
-  picolist.h piperiodx.h \
+$(SOPHYAOBJP)piperiodx.o: piperiodx.cc $(SOPHYAINCP)sopnamsp.h \
+  piwdgx.h piwdggen.h $(SOPHYAINCP)machdefs.h \
+  pimsghandler.h picolist.h pipixutils.h piperiodx.h \
   $(SOPHYAINCP)periodic.h \
   $(SOPHYAINCP)machdefs.h
@@ -391 +376 @@
 $(SOPHYAOBJP)pipixmapgen.o: pipixmapgen.cc \
   $(SOPHYAINCP)sopnamsp.h pipixmapgen.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
-  pibwdgx.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pisysdep.h $(SOPHYAINCP)machdefs.h pibwdgx.h \
+  pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h \
   picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h pifontx.h \
-  pifontgen.h pigrcoord.h pilineatt.h pipixutils.h pigraphuc.h \
-  pievthandler.h psfile.h pigraphps.h
+  pifontgen.h pigrcoord.h pilineatt.h pigraphuc.h pievthandler.h psfile.h \
+  pigraphps.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pipixmapgen.cc
  
-$(SOPHYAOBJP)pipixmapx.o: pipixmapx.cc \
-  $(SOPHYAINCP)sopnamsp.h pipixmapx.h \
-  pipixmapgen.h pisysdep.h \
-  $(SOPHYAINCP)machdefs.h pibwdgx.h \
-  pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h picmap.h \
+$(SOPHYAOBJP)pipixmapx.o: pipixmapx.cc $(SOPHYAINCP)sopnamsp.h \
+  pipixmapx.h pipixmapgen.h pisysdep.h \
+  $(SOPHYAINCP)machdefs.h pibwdgx.h pibwdggen.h \
+  piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h picmap.h \
   picmapx.h picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h \
-  pigrcoord.h pilineatt.h pipixutils.h pigraphuc.h pievthandler.h \
-  psfile.h pigraphps.h
+  pigrcoord.h pilineatt.h pigraphuc.h pievthandler.h psfile.h pigraphps.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pipixmapx.cc
  
@@ -415 +398 @@
   $(SOPHYAINCP)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 pipixutils.h pigraphuc.h \
+  picolist.h pipixutils.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 \
@@ -427 +410 @@
   $(SOPHYAINCP)sopnamsp.h pistdwdggen.h \
   pisysdep.h $(SOPHYAINCP)machdefs.h piwdgx.h \
-  piwdggen.h pimsghandler.h picolist.h
+  piwdggen.h pimsghandler.h picolist.h pipixutils.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pistdwdggen.cc
  
-$(SOPHYAOBJP)pistdwdgx.o: pistdwdgx.cc \
-  $(SOPHYAINCP)sopnamsp.h pisysdep.h \
-  $(SOPHYAINCP)machdefs.h pistdwdgx.h \
+$(SOPHYAOBJP)pistdwdgx.o: pistdwdgx.cc $(SOPHYAINCP)sopnamsp.h \
+  pisysdep.h $(SOPHYAINCP)machdefs.h pistdwdgx.h \
   pistdwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
-  picontainerx.h picontainergen.h
+  pipixutils.h picontainerx.h picontainergen.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pistdwdgx.cc
  
-$(SOPHYAOBJP)pistzwin.o: pistzwin.cc \
-  $(SOPHYAINCP)sopnamsp.h pistzwin.h \
-  pisysdep.h $(SOPHYAINCP)machdefs.h \
+$(SOPHYAOBJP)pistzwin.o: pistzwin.cc $(SOPHYAINCP)sopnamsp.h \
+  pistzwin.h pisysdep.h $(SOPHYAINCP)machdefs.h \
   piwindowx.h piwindowgen.h picontainerx.h picontainergen.h piwdgx.h \
-  piwdggen.h pimsghandler.h picolist.h piperiodx.h \
+  piwdggen.h pimsghandler.h picolist.h pipixutils.h piperiodx.h \
   $(SOPHYAINCP)periodic.h \
-  $(SOPHYAINCP)machdefs.h psfile.h \
-  pifontgen.h pigraphgen.h picmap.h picmapx.h picmapgen.h pifontx.h \
-  pigrcoord.h pilineatt.h pipixutils.h
+  $(SOPHYAINCP)machdefs.h psfile.h pifontgen.h \
+  pigraphgen.h picmap.h picmapx.h picmapgen.h pifontx.h pigrcoord.h \
+  pilineatt.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pistzwin.cc
  
-$(SOPHYAOBJP)pisurfdr.o: pisurfdr.cc \
-  $(SOPHYAINCP)sopnamsp.h pisurfdr.h \
-  parradapter.h $(SOPHYAINCP)machdefs.h lut.h \
-  pipixutils.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
+$(SOPHYAOBJP)pisurfdr.o: pisurfdr.cc $(SOPHYAINCP)sopnamsp.h \
+  pisurfdr.h parradapter.h \
+  $(SOPHYAINCP)machdefs.h lut.h pipixutils.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
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pisurfdr.cc
  
 $(SOPHYAOBJP)pitherm.o: pitherm.cc $(SOPHYAINCP)sopnamsp.h \
-  pitherm.h pisysdep.h \
-  $(SOPHYAINCP)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 pipixutils.h pigraphuc.h pievthandler.h \
-  psfile.h pigraphps.h
+  pitherm.h pisysdep.h $(SOPHYAINCP)machdefs.h \
+  pibwdgx.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pipixutils.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
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pitherm.cc
  
-$(SOPHYAOBJP)pitxtdrw.o: pitxtdrw.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  $(SOPHYAINCP)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 pipixutils.h pigraphuc.h \
+$(SOPHYAOBJP)pitxtdrw.o: pitxtdrw.cc $(SOPHYAINCP)sopnamsp.h \
+  $(SOPHYAINCP)machdefs.h pitxtdrw.h pisysdep.h \
+  pidrawer.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pipixutils.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
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pitxtdrw.cc
  
-$(SOPHYAOBJP)piwdggen.o: piwdggen.cc \
-  $(SOPHYAINCP)sopnamsp.h piwdggen.h \
-  $(SOPHYAINCP)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 pipixutils.h psfile.h
+$(SOPHYAOBJP)piwdggen.o: piwdggen.cc $(SOPHYAINCP)sopnamsp.h \
+  piwdggen.h $(SOPHYAINCP)machdefs.h \
+  pimsghandler.h picolist.h pipixutils.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
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piwdggen.cc
  
 $(SOPHYAOBJP)piwdgx.o: piwdgx.cc $(SOPHYAINCP)sopnamsp.h \
   piwdgx.h piwdggen.h $(SOPHYAINCP)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 pipixutils.h \
+  pimsghandler.h picolist.h pipixutils.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 \
   $(SOPHYAINCP)pexceptions.h \
   $(SOPHYAINCP)machdefs.h
@@ -497 +474 @@
   pisysdep.h $(SOPHYAINCP)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 pipixutils.h
+  picolist.h pipixutils.h psfile.h pifontgen.h pigraphgen.h picmap.h \
+  picmapx.h picmapgen.h pifontx.h pigrcoord.h pilineatt.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piwindowgen.cc
  
-$(SOPHYAOBJP)piwindowx.o: piwindowx.cc \
-  $(SOPHYAINCP)sopnamsp.h piwindowx.h \
-  piwindowgen.h pisysdep.h \
+$(SOPHYAOBJP)piwindowx.o: piwindowx.cc $(SOPHYAINCP)sopnamsp.h \
+  piwindowx.h piwindowgen.h pisysdep.h \
   $(SOPHYAINCP)machdefs.h picontainerx.h \
-  picontainergen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h
+  picontainergen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pipixutils.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piwindowx.cc
  
-$(SOPHYAOBJP)pixtbase.o: pixtbase.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  $(SOPHYAINCP)machdefs.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 pipixutils.h pigraphuc.h \
+$(SOPHYAOBJP)pixtbase.o: pixtbase.cc $(SOPHYAINCP)sopnamsp.h \
+  $(SOPHYAINCP)machdefs.h pixtbaseP.h pibwdgx.h \
+  pisysdep.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.h \
+  pipixutils.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
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pixtbase.cc
  
-$(SOPHYAOBJP)piyfxdrw.o: piyfxdrw.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  $(SOPHYAINCP)machdefs.h piyfxdrw.h \
-  pisysdep.h parradapter.h lut.h pipixutils.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
+$(SOPHYAOBJP)piyfxdrw.o: piyfxdrw.cc $(SOPHYAINCP)sopnamsp.h \
+  $(SOPHYAINCP)machdefs.h piyfxdrw.h pisysdep.h \
+  parradapter.h lut.h pipixutils.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
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piyfxdrw.cc
  
@@ -529 +504 @@
   psfile.h $(SOPHYAINCP)machdefs.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 \
-  pipixutils.h
+  pipixutils.h picmap.h picmapx.h picmapgen.h pifontx.h pigrcoord.h \
+  pilineatt.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  psfile.cc
  

trunk/SophyaPI/PIGcont/Makefile

@@ -22 +22 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pioptmenux.h \
   $(SOPHYAINCP)pioptmenugen.h \
@@ -35 +36 @@
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
-  $(SOPHYAINCP)picons.h \
+  $(SOPHYAINCP)piconsenum.h \
+  $(SOPHYAINCP)picmapview.h \
   $(SOPHYAINCP)pibwdgx.h \
   $(SOPHYAINCP)pibwdggen.h \
@@ -50 +52 @@
   $(SOPHYAINCP)pievthandler.h \
   $(SOPHYAINCP)psfile.h \
-  $(SOPHYAINCP)pigraphps.h \
-  $(SOPHYAINCP)picmapview.h pigncont.h \
+  $(SOPHYAINCP)pigraphps.h pigncont.h \
   $(SOPHYAINCP)pistdimgapp.h \
   $(SOPHYAINCP)piapplx.h \
@@ -60 +61 @@
   $(SOPHYAINCP)piperiodx.h \
   $(SOPHYAINCP)periodic.h \
+  $(SOPHYAINCP)picons.h \
   $(SOPHYAINCP)piimage.h \
   $(SOPHYAINCP)parradapter.h \
@@ -141 +143 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pioptmenux.h \
   $(SOPHYAINCP)pioptmenugen.h \
@@ -154 +157 @@
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
-  $(SOPHYAINCP)picons.h \
+  $(SOPHYAINCP)piconsenum.h \
+  $(SOPHYAINCP)picmapview.h \
   $(SOPHYAINCP)pibwdgx.h \
   $(SOPHYAINCP)pibwdggen.h \
@@ -169 +173 @@
   $(SOPHYAINCP)pievthandler.h \
   $(SOPHYAINCP)psfile.h \
-  $(SOPHYAINCP)pigraphps.h \
-  $(SOPHYAINCP)picmapview.h pigncont.h \
+  $(SOPHYAINCP)pigraphps.h pigncont.h \
   $(SOPHYAINCP)pistdimgapp.h \
   $(SOPHYAINCP)piapplx.h \
@@ -179 +182 @@
   $(SOPHYAINCP)piperiodx.h \
   $(SOPHYAINCP)periodic.h \
+  $(SOPHYAINCP)picons.h \
   $(SOPHYAINCP)piimage.h \
   $(SOPHYAINCP)parradapter.h \

trunk/SophyaPI/PIGcont/pigncont.cc

@@ -132 +132 @@
   _zmin = 1.e37;
   _zmax = -1.e37;
-  char *nom[4]={"x","y","z","niso"};
+  const char *nom[4]={"x","y","z","niso"};
   _myiso = new NTuple(4,nom);  
   //_myiso->Show();
@@ -343 +343 @@
    _ny = arr->YSize()  ;
    //cout << " size x,y "<<_nx<<" , "<<_ny <<endl;
-   char *nom[4]={"x","y","z","niso"};
+   const char *nom[4]={"x","y","z","niso"};
    
    _myiso = new NTuple(4,nom);  

trunk/SophyaPI/PIGcont/smakefile

@@ -22 +22 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pioptmenux.h \
   $(SOPHYAINCP)pioptmenugen.h \
@@ -142 +143 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pioptmenux.h \
   $(SOPHYAINCP)pioptmenugen.h \

trunk/SophyaPI/PIext/Makefile

@@ -42 +42 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
   $(SOPHYAINCP)pimenux.h \
   $(SOPHYAINCP)pimenugen.h \
-  $(SOPHYAINCP)picons.h \
-  $(SOPHYAINCP)pistdwdgx.h \
-  $(SOPHYAINCP)pistdwdggen.h \
-  $(SOPHYAINCP)pibwdgx.h \
-  $(SOPHYAINCP)pibwdggen.h \
-  $(SOPHYAINCP)picmap.h \
-  $(SOPHYAINCP)picmapx.h \
-  $(SOPHYAINCP)picmapgen.h \
-  $(SOPHYAINCP)pigraphx.h \
-  $(SOPHYAINCP)pigraphgen.h \
-  $(SOPHYAINCP)pifontx.h \
-  $(SOPHYAINCP)pifontgen.h \
-  $(SOPHYAINCP)pigrcoord.h \
-  $(SOPHYAINCP)pilineatt.h \
-  $(SOPHYAINCP)pigraphuc.h \
-  $(SOPHYAINCP)pievthandler.h \
-  $(SOPHYAINCP)psfile.h \
-  $(SOPHYAINCP)pigraphps.h \
+  $(SOPHYAINCP)piconsenum.h \
   $(SOPHYAINCP)piwindowx.h \
   $(SOPHYAINCP)piwindowgen.h \
@@ -69 +53 @@
   $(SOPHYAINCP)pioptmenux.h \
   $(SOPHYAINCP)pioptmenugen.h \
+  $(SOPHYAINCP)pistdwdgx.h \
+  $(SOPHYAINCP)pistdwdggen.h \
   $(SOPHYAINCP)pistdwdgx.h \
   $(SOPHYAINCP)pifilechox.h \
@@ -76 +62 @@
   $(SOPHYAINCP)periodic.h \
   $(SOPHYAINCP)picons.h \
+  $(SOPHYAINCP)pibwdgx.h \
+  $(SOPHYAINCP)pibwdggen.h \
+  $(SOPHYAINCP)picmap.h \
+  $(SOPHYAINCP)picmapx.h \
+  $(SOPHYAINCP)picmapgen.h \
+  $(SOPHYAINCP)pigraphx.h \
+  $(SOPHYAINCP)pigraphgen.h \
+  $(SOPHYAINCP)pifontx.h \
+  $(SOPHYAINCP)pifontgen.h \
+  $(SOPHYAINCP)pigrcoord.h \
+  $(SOPHYAINCP)pilineatt.h \
+  $(SOPHYAINCP)pigraphuc.h \
+  $(SOPHYAINCP)pievthandler.h \
+  $(SOPHYAINCP)psfile.h \
+  $(SOPHYAINCP)pigraphps.h \
   $(SOPHYAINCP)piimage.h \
   $(SOPHYAINCP)parradapter.h \
@@ -163 +164 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
   $(SOPHYAINCP)pimenux.h \
   $(SOPHYAINCP)pimenugen.h \
-  $(SOPHYAINCP)picons.h \
-  $(SOPHYAINCP)pistdwdgx.h \
-  $(SOPHYAINCP)pistdwdggen.h \
-  $(SOPHYAINCP)pibwdgx.h \
-  $(SOPHYAINCP)pibwdggen.h \
-  $(SOPHYAINCP)picmap.h \
-  $(SOPHYAINCP)picmapx.h \
-  $(SOPHYAINCP)picmapgen.h \
-  $(SOPHYAINCP)pigraphx.h \
-  $(SOPHYAINCP)pigraphgen.h \
-  $(SOPHYAINCP)pifontx.h \
-  $(SOPHYAINCP)pifontgen.h \
-  $(SOPHYAINCP)pigrcoord.h \
-  $(SOPHYAINCP)pilineatt.h \
-  $(SOPHYAINCP)pigraphuc.h \
-  $(SOPHYAINCP)pievthandler.h \
-  $(SOPHYAINCP)psfile.h \
-  $(SOPHYAINCP)pigraphps.h \
+  $(SOPHYAINCP)piconsenum.h \
   $(SOPHYAINCP)piwindowx.h \
   $(SOPHYAINCP)piwindowgen.h \
   $(SOPHYAINCP)pioptmenux.h \
   $(SOPHYAINCP)pioptmenugen.h \
+  $(SOPHYAINCP)pistdwdgx.h \
+  $(SOPHYAINCP)pistdwdggen.h \
   $(SOPHYAINCP)pifilechox.h \
   $(SOPHYAINCP)pifilechogen.h \
   $(SOPHYAINCP)piperiodx.h \
   $(SOPHYAINCP)periodic.h \
+  $(SOPHYAINCP)picons.h \
+  $(SOPHYAINCP)pibwdgx.h \
+  $(SOPHYAINCP)pibwdggen.h \
+  $(SOPHYAINCP)picmap.h \
+  $(SOPHYAINCP)picmapx.h \
+  $(SOPHYAINCP)picmapgen.h \
+  $(SOPHYAINCP)pigraphx.h \
+  $(SOPHYAINCP)pigraphgen.h \
+  $(SOPHYAINCP)pifontx.h \
+  $(SOPHYAINCP)pifontgen.h \
+  $(SOPHYAINCP)pigrcoord.h \
+  $(SOPHYAINCP)pilineatt.h \
+  $(SOPHYAINCP)pigraphuc.h \
+  $(SOPHYAINCP)pievthandler.h \
+  $(SOPHYAINCP)psfile.h \
+  $(SOPHYAINCP)pigraphps.h \
   $(SOPHYAINCP)piimage.h \
   $(SOPHYAINCP)parradapter.h \
@@ -277 +280 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -320 +324 @@
   $(SOPHYAINCP)pimenux.h \
   $(SOPHYAINCP)pimenugen.h \
-  $(SOPHYAINCP)picons.h \
-  $(SOPHYAINCP)pistdwdgx.h \
-  $(SOPHYAINCP)pistdwdggen.h \
-  $(SOPHYAINCP)pibwdgx.h \
-  $(SOPHYAINCP)pigraphps.h \
+  $(SOPHYAINCP)piconsenum.h \
   $(SOPHYAINCP)piwindowx.h \
   $(SOPHYAINCP)piwindowgen.h \
@@ -330 +330 @@
   $(SOPHYAINCP)pioptmenux.h \
   $(SOPHYAINCP)pioptmenugen.h \
+  $(SOPHYAINCP)pistdwdgx.h \
+  $(SOPHYAINCP)pistdwdggen.h \
   $(SOPHYAINCP)pistdwdgx.h \
   $(SOPHYAINCP)pifilechox.h \
@@ -337 +339 @@
   $(SOPHYAINCP)periodic.h \
   $(SOPHYAINCP)picons.h \
+  $(SOPHYAINCP)pibwdgx.h \
+  $(SOPHYAINCP)pigraphps.h \
   $(SOPHYAINCP)piimage.h \
   $(SOPHYAINCP)parradapter.h \
@@ -387 +391 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
   $(SOPHYAINCP)pimenux.h \
   $(SOPHYAINCP)pimenugen.h \
-  $(SOPHYAINCP)picons.h \
-  $(SOPHYAINCP)pistdwdgx.h \
-  $(SOPHYAINCP)pistdwdggen.h \
-  $(SOPHYAINCP)pibwdgx.h \
-  $(SOPHYAINCP)pibwdggen.h \
-  $(SOPHYAINCP)picmap.h \
-  $(SOPHYAINCP)picmapx.h \
-  $(SOPHYAINCP)picmapgen.h \
-  $(SOPHYAINCP)pigraphx.h \
-  $(SOPHYAINCP)pigraphgen.h \
-  $(SOPHYAINCP)pifontx.h \
-  $(SOPHYAINCP)pifontgen.h \
-  $(SOPHYAINCP)pigrcoord.h \
-  $(SOPHYAINCP)pilineatt.h \
-  $(SOPHYAINCP)pigraphuc.h \
-  $(SOPHYAINCP)pievthandler.h \
-  $(SOPHYAINCP)psfile.h \
-  $(SOPHYAINCP)pigraphps.h \
+  $(SOPHYAINCP)piconsenum.h \
   $(SOPHYAINCP)piwindowx.h \
   $(SOPHYAINCP)piwindowgen.h \
@@ -414 +402 @@
   $(SOPHYAINCP)pioptmenux.h \
   $(SOPHYAINCP)pioptmenugen.h \
+  $(SOPHYAINCP)pistdwdgx.h \
+  $(SOPHYAINCP)pistdwdggen.h \
   $(SOPHYAINCP)pistdwdgx.h \
   $(SOPHYAINCP)pifilechox.h \
@@ -421 +411 @@
   $(SOPHYAINCP)periodic.h \
   $(SOPHYAINCP)picons.h \
+  $(SOPHYAINCP)pibwdgx.h \
+  $(SOPHYAINCP)pibwdggen.h \
+  $(SOPHYAINCP)picmap.h \
+  $(SOPHYAINCP)picmapx.h \
+  $(SOPHYAINCP)picmapgen.h \
+  $(SOPHYAINCP)pigraphx.h \
+  $(SOPHYAINCP)pigraphgen.h \
+  $(SOPHYAINCP)pifontx.h \
+  $(SOPHYAINCP)pifontgen.h \
+  $(SOPHYAINCP)pigrcoord.h \
+  $(SOPHYAINCP)pilineatt.h \
+  $(SOPHYAINCP)pigraphuc.h \
+  $(SOPHYAINCP)pievthandler.h \
+  $(SOPHYAINCP)psfile.h \
+  $(SOPHYAINCP)pigraphps.h \
   $(SOPHYAINCP)piimage.h \
   $(SOPHYAINCP)parradapter.h \
@@ -473 +478 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
   $(SOPHYAINCP)pimenux.h \
   $(SOPHYAINCP)pimenugen.h \
-  $(SOPHYAINCP)picons.h \
-  $(SOPHYAINCP)pistdwdgx.h \
-  $(SOPHYAINCP)pistdwdggen.h \
-  $(SOPHYAINCP)pibwdgx.h \
-  $(SOPHYAINCP)pibwdggen.h \
-  $(SOPHYAINCP)picmap.h \
-  $(SOPHYAINCP)picmapx.h \
-  $(SOPHYAINCP)picmapgen.h \
-  $(SOPHYAINCP)pigraphx.h \
-  $(SOPHYAINCP)pigraphgen.h \
-  $(SOPHYAINCP)pifontx.h \
-  $(SOPHYAINCP)pifontgen.h \
-  $(SOPHYAINCP)pigrcoord.h \
-  $(SOPHYAINCP)pilineatt.h \
-  $(SOPHYAINCP)pigraphuc.h \
-  $(SOPHYAINCP)pievthandler.h \
-  $(SOPHYAINCP)psfile.h \
-  $(SOPHYAINCP)pigraphps.h \
+  $(SOPHYAINCP)piconsenum.h \
   $(SOPHYAINCP)piwindowx.h \
   $(SOPHYAINCP)piwindowgen.h \
@@ -500 +489 @@
   $(SOPHYAINCP)pioptmenux.h \
   $(SOPHYAINCP)pioptmenugen.h \
+  $(SOPHYAINCP)pistdwdgx.h \
+  $(SOPHYAINCP)pistdwdggen.h \
   $(SOPHYAINCP)pistdwdgx.h \
   $(SOPHYAINCP)pifilechox.h \
@@ -507 +498 @@
   $(SOPHYAINCP)periodic.h \
   $(SOPHYAINCP)picons.h \
+  $(SOPHYAINCP)pibwdgx.h \
+  $(SOPHYAINCP)pibwdggen.h \
+  $(SOPHYAINCP)picmap.h \
+  $(SOPHYAINCP)picmapx.h \
+  $(SOPHYAINCP)picmapgen.h \
+  $(SOPHYAINCP)pigraphx.h \
+  $(SOPHYAINCP)pigraphgen.h \
+  $(SOPHYAINCP)pifontx.h \
+  $(SOPHYAINCP)pifontgen.h \
+  $(SOPHYAINCP)pigrcoord.h \
+  $(SOPHYAINCP)pilineatt.h \
+  $(SOPHYAINCP)pigraphuc.h \
+  $(SOPHYAINCP)pievthandler.h \
+  $(SOPHYAINCP)psfile.h \
+  $(SOPHYAINCP)pigraphps.h \
   $(SOPHYAINCP)piimage.h \
   $(SOPHYAINCP)parradapter.h \
@@ -581 +587 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
   $(SOPHYAINCP)pimenux.h \
   $(SOPHYAINCP)pimenugen.h \
-  $(SOPHYAINCP)picons.h \
-  $(SOPHYAINCP)pistdwdgx.h \
-  $(SOPHYAINCP)pistdwdggen.h \
-  $(SOPHYAINCP)pibwdgx.h \
-  $(SOPHYAINCP)pibwdggen.h \
-  $(SOPHYAINCP)picmap.h \
-  $(SOPHYAINCP)picmapx.h \
-  $(SOPHYAINCP)picmapgen.h \
-  $(SOPHYAINCP)pigraphx.h \
-  $(SOPHYAINCP)pigraphgen.h \
-  $(SOPHYAINCP)pifontx.h \
-  $(SOPHYAINCP)pifontgen.h \
-  $(SOPHYAINCP)pigrcoord.h \
-  $(SOPHYAINCP)pilineatt.h \
-  $(SOPHYAINCP)pigraphuc.h \
-  $(SOPHYAINCP)pievthandler.h \
-  $(SOPHYAINCP)psfile.h \
-  $(SOPHYAINCP)pigraphps.h \
+  $(SOPHYAINCP)piconsenum.h \
   $(SOPHYAINCP)piwindowx.h \
   $(SOPHYAINCP)piwindowgen.h \
@@ -608 +598 @@
   $(SOPHYAINCP)pioptmenux.h \
   $(SOPHYAINCP)pioptmenugen.h \
+  $(SOPHYAINCP)pistdwdgx.h \
+  $(SOPHYAINCP)pistdwdggen.h \
   $(SOPHYAINCP)pistdwdgx.h \
   $(SOPHYAINCP)pifilechox.h \
@@ -615 +607 @@
   $(SOPHYAINCP)periodic.h \
   $(SOPHYAINCP)picons.h \
+  $(SOPHYAINCP)pibwdgx.h \
+  $(SOPHYAINCP)pibwdggen.h \
+  $(SOPHYAINCP)picmap.h \
+  $(SOPHYAINCP)picmapx.h \
+  $(SOPHYAINCP)picmapgen.h \
+  $(SOPHYAINCP)pigraphx.h \
+  $(SOPHYAINCP)pigraphgen.h \
+  $(SOPHYAINCP)pifontx.h \
+  $(SOPHYAINCP)pifontgen.h \
+  $(SOPHYAINCP)pigrcoord.h \
+  $(SOPHYAINCP)pilineatt.h \
+  $(SOPHYAINCP)pigraphuc.h \
+  $(SOPHYAINCP)pievthandler.h \
+  $(SOPHYAINCP)psfile.h \
+  $(SOPHYAINCP)pigraphps.h \
   $(SOPHYAINCP)piimage.h \
   $(SOPHYAINCP)parradapter.h \
@@ -689 +696 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -733 +741 @@
   $(SOPHYAINCP)pimenux.h \
   $(SOPHYAINCP)pimenugen.h \
-  $(SOPHYAINCP)picons.h \
-  $(SOPHYAINCP)pistdwdgx.h \
-  $(SOPHYAINCP)pistdwdggen.h \
-  $(SOPHYAINCP)pibwdgx.h \
-  $(SOPHYAINCP)pigraphps.h \
+  $(SOPHYAINCP)piconsenum.h \
   $(SOPHYAINCP)piwindowx.h \
   $(SOPHYAINCP)piwindowgen.h \
@@ -743 +747 @@
   $(SOPHYAINCP)pioptmenux.h \
   $(SOPHYAINCP)pioptmenugen.h \
+  $(SOPHYAINCP)pistdwdgx.h \
+  $(SOPHYAINCP)pistdwdggen.h \
   $(SOPHYAINCP)pistdwdgx.h \
   $(SOPHYAINCP)pifilechox.h \
@@ -750 +756 @@
   $(SOPHYAINCP)periodic.h \
   $(SOPHYAINCP)picons.h \
+  $(SOPHYAINCP)pibwdgx.h \
+  $(SOPHYAINCP)pigraphps.h \
   $(SOPHYAINCP)piimage.h \
   $(SOPHYAINCP)parradapter.h \
@@ -799 +807 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -860 +869 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -920 +930 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -989 +1000 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -1086 +1098 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -1130 +1143 @@
   $(SOPHYAINCP)hisprof.h \
   $(SOPHYAINCP)ntuple.h \
-  $(SOPHYAINCP)xntuple.h \
   $(SOPHYAINCP)basedtable.h \
   $(SOPHYAINCP)segdatablock.h \
@@ -1195 +1207 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -1264 +1277 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -1347 +1361 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -1412 +1427 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -1510 +1526 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -1593 +1610 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -1623 +1641 @@
   $(SOPHYAINCP)pimenux.h \
   $(SOPHYAINCP)pimenugen.h \
-  $(SOPHYAINCP)picons.h \
-  $(SOPHYAINCP)pistdwdgx.h \
-  $(SOPHYAINCP)pistdwdggen.h \
-  $(SOPHYAINCP)pibwdgx.h \
-  $(SOPHYAINCP)pigraphps.h \
+  $(SOPHYAINCP)piconsenum.h \
   $(SOPHYAINCP)piwindowx.h \
   $(SOPHYAINCP)piwindowgen.h \
@@ -1633 +1647 @@
   $(SOPHYAINCP)pioptmenux.h \
   $(SOPHYAINCP)pioptmenugen.h \
+  $(SOPHYAINCP)pistdwdgx.h \
+  $(SOPHYAINCP)pistdwdggen.h \
   $(SOPHYAINCP)pistdwdgx.h \
   $(SOPHYAINCP)pifilechox.h \
@@ -1640 +1656 @@
   $(SOPHYAINCP)periodic.h \
   $(SOPHYAINCP)picons.h \
+  $(SOPHYAINCP)pibwdgx.h \
+  $(SOPHYAINCP)pigraphps.h \
   $(SOPHYAINCP)piimage.h \
   $(SOPHYAINCP)parradapter.h \
@@ -1700 +1718 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
   $(SOPHYAINCP)pimenux.h \
   $(SOPHYAINCP)pimenugen.h \
-  $(SOPHYAINCP)picons.h \
-  $(SOPHYAINCP)pistdwdgx.h \
-  $(SOPHYAINCP)pistdwdggen.h \
-  $(SOPHYAINCP)pibwdgx.h \
-  $(SOPHYAINCP)pibwdggen.h \
-  $(SOPHYAINCP)picmap.h \
-  $(SOPHYAINCP)picmapx.h \
-  $(SOPHYAINCP)picmapgen.h \
-  $(SOPHYAINCP)pigraphx.h \
-  $(SOPHYAINCP)pigraphgen.h \
-  $(SOPHYAINCP)pifontx.h \
-  $(SOPHYAINCP)pifontgen.h \
-  $(SOPHYAINCP)pigrcoord.h \
-  $(SOPHYAINCP)pilineatt.h \
-  $(SOPHYAINCP)pigraphuc.h \
-  $(SOPHYAINCP)pievthandler.h \
-  $(SOPHYAINCP)psfile.h \
-  $(SOPHYAINCP)pigraphps.h \
+  $(SOPHYAINCP)piconsenum.h \
   $(SOPHYAINCP)piwindowx.h \
   $(SOPHYAINCP)piwindowgen.h \
@@ -1727 +1729 @@
   $(SOPHYAINCP)pioptmenux.h \
   $(SOPHYAINCP)pioptmenugen.h \
+  $(SOPHYAINCP)pistdwdgx.h \
+  $(SOPHYAINCP)pistdwdggen.h \
   $(SOPHYAINCP)pistdwdgx.h \
   $(SOPHYAINCP)pifilechox.h \
@@ -1734 +1738 @@
   $(SOPHYAINCP)periodic.h \
   $(SOPHYAINCP)picons.h \
+  $(SOPHYAINCP)pibwdgx.h \
+  $(SOPHYAINCP)pibwdggen.h \
+  $(SOPHYAINCP)picmap.h \
+  $(SOPHYAINCP)picmapx.h \
+  $(SOPHYAINCP)picmapgen.h \
+  $(SOPHYAINCP)pigraphx.h \
+  $(SOPHYAINCP)pigraphgen.h \
+  $(SOPHYAINCP)pifontx.h \
+  $(SOPHYAINCP)pifontgen.h \
+  $(SOPHYAINCP)pigrcoord.h \
+  $(SOPHYAINCP)pilineatt.h \
+  $(SOPHYAINCP)pigraphuc.h \
+  $(SOPHYAINCP)pievthandler.h \
+  $(SOPHYAINCP)psfile.h \
+  $(SOPHYAINCP)pigraphps.h \
   $(SOPHYAINCP)piimage.h \
   $(SOPHYAINCP)parradapter.h \
@@ -1797 +1816 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
   $(SOPHYAINCP)pimenux.h \
   $(SOPHYAINCP)pimenugen.h \
-  $(SOPHYAINCP)picons.h \
-  $(SOPHYAINCP)pistdwdgx.h \
-  $(SOPHYAINCP)pistdwdggen.h \
-  $(SOPHYAINCP)pibwdgx.h \
-  $(SOPHYAINCP)pibwdggen.h \
-  $(SOPHYAINCP)picmap.h \
-  $(SOPHYAINCP)picmapx.h \
-  $(SOPHYAINCP)picmapgen.h \
-  $(SOPHYAINCP)pigraphx.h \
-  $(SOPHYAINCP)pigraphgen.h \
-  $(SOPHYAINCP)pifontx.h \
-  $(SOPHYAINCP)pifontgen.h \
-  $(SOPHYAINCP)pigrcoord.h \
-  $(SOPHYAINCP)pilineatt.h \
-  $(SOPHYAINCP)pigraphuc.h \
-  $(SOPHYAINCP)pievthandler.h \
-  $(SOPHYAINCP)psfile.h \
-  $(SOPHYAINCP)pigraphps.h \
+  $(SOPHYAINCP)piconsenum.h \
   $(SOPHYAINCP)piwindowx.h \
   $(SOPHYAINCP)piwindowgen.h \
@@ -1824 +1827 @@
   $(SOPHYAINCP)pioptmenux.h \
   $(SOPHYAINCP)pioptmenugen.h \
+  $(SOPHYAINCP)pistdwdgx.h \
+  $(SOPHYAINCP)pistdwdggen.h \
   $(SOPHYAINCP)pistdwdgx.h \
   $(SOPHYAINCP)pifilechox.h \
@@ -1831 +1836 @@
   $(SOPHYAINCP)periodic.h \
   $(SOPHYAINCP)picons.h \
+  $(SOPHYAINCP)pibwdgx.h \
+  $(SOPHYAINCP)pibwdggen.h \
+  $(SOPHYAINCP)picmap.h \
+  $(SOPHYAINCP)picmapx.h \
+  $(SOPHYAINCP)picmapgen.h \
+  $(SOPHYAINCP)pigraphx.h \
+  $(SOPHYAINCP)pigraphgen.h \
+  $(SOPHYAINCP)pifontx.h \
+  $(SOPHYAINCP)pifontgen.h \
+  $(SOPHYAINCP)pigrcoord.h \
+  $(SOPHYAINCP)pilineatt.h \
+  $(SOPHYAINCP)pigraphuc.h \
+  $(SOPHYAINCP)pievthandler.h \
+  $(SOPHYAINCP)psfile.h \
+  $(SOPHYAINCP)pigraphps.h \
   $(SOPHYAINCP)piimage.h \
   $(SOPHYAINCP)parradapter.h \
@@ -1937 +1957 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -1969 +1990 @@
   $(SOPHYAINCP)pimenux.h \
   $(SOPHYAINCP)pimenugen.h \
-  $(SOPHYAINCP)picons.h \
-  $(SOPHYAINCP)pistdwdgx.h \
-  $(SOPHYAINCP)pistdwdggen.h \
-  $(SOPHYAINCP)pibwdgx.h \
-  $(SOPHYAINCP)pigraphps.h \
+  $(SOPHYAINCP)piconsenum.h \
   $(SOPHYAINCP)piwindowx.h \
   $(SOPHYAINCP)piwindowgen.h \
@@ -1979 +1996 @@
   $(SOPHYAINCP)pioptmenux.h \
   $(SOPHYAINCP)pioptmenugen.h \
+  $(SOPHYAINCP)pistdwdgx.h \
+  $(SOPHYAINCP)pistdwdggen.h \
   $(SOPHYAINCP)pistdwdgx.h \
   $(SOPHYAINCP)pifilechox.h \
@@ -1986 +2005 @@
   $(SOPHYAINCP)periodic.h \
   $(SOPHYAINCP)picons.h \
+  $(SOPHYAINCP)pibwdgx.h \
+  $(SOPHYAINCP)pigraphps.h \
   $(SOPHYAINCP)piimage.h \
   $(SOPHYAINCP)parradapter.h \
@@ -2002 +2023 @@
   $(SOPHYAINCP)pitherm.h \
   $(SOPHYAINCP)resusage.h nomhistadapter.h \
-  $(SOPHYAINCP)xntuple.h \
   $(SOPHYAINCP)basedtable.h \
   $(SOPHYAINCP)segdatablock.h \
@@ -2045 +2065 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -2097 +2118 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -2124 +2146 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -2153 +2176 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
   $(SOPHYAINCP)pimenux.h \
   $(SOPHYAINCP)pimenugen.h \
-  $(SOPHYAINCP)picons.h \
-  $(SOPHYAINCP)pistdwdgx.h \
-  $(SOPHYAINCP)pistdwdggen.h \
-  $(SOPHYAINCP)pibwdgx.h \
-  $(SOPHYAINCP)pibwdggen.h \
-  $(SOPHYAINCP)picmap.h \
-  $(SOPHYAINCP)picmapx.h \
-  $(SOPHYAINCP)picmapgen.h \
-  $(SOPHYAINCP)pigraphx.h \
-  $(SOPHYAINCP)pigraphgen.h \
-  $(SOPHYAINCP)pifontx.h \
-  $(SOPHYAINCP)pifontgen.h \
-  $(SOPHYAINCP)pigrcoord.h \
-  $(SOPHYAINCP)pilineatt.h \
-  $(SOPHYAINCP)pigraphuc.h \
-  $(SOPHYAINCP)pievthandler.h \
-  $(SOPHYAINCP)psfile.h \
-  $(SOPHYAINCP)pigraphps.h \
+  $(SOPHYAINCP)piconsenum.h \
   $(SOPHYAINCP)sopnamsp.h pihisto2d.h \
   $(SOPHYAINCP)pimenux.h \
@@ -2180 +2187 @@
   $(SOPHYAINCP)pioptmenux.h \
   $(SOPHYAINCP)pioptmenugen.h \
-  $(SOPHYAINCP)pidrawer.h \
+  $(SOPHYAINCP)pistdwdgx.h \
+  $(SOPHYAINCP)pistdwdggen.h \
+  $(SOPHYAINCP)pidrawer.h \
+  $(SOPHYAINCP)pibwdggen.h \
+  $(SOPHYAINCP)picmap.h \
+  $(SOPHYAINCP)picmapx.h \
+  $(SOPHYAINCP)picmapgen.h \
+  $(SOPHYAINCP)pigraphx.h \
+  $(SOPHYAINCP)pigraphgen.h \
+  $(SOPHYAINCP)pifontx.h \
+  $(SOPHYAINCP)pifontgen.h \
+  $(SOPHYAINCP)pigrcoord.h \
+  $(SOPHYAINCP)pilineatt.h \
+  $(SOPHYAINCP)pigraphuc.h \
+  $(SOPHYAINCP)pievthandler.h \
+  $(SOPHYAINCP)psfile.h \
   $(SOPHYAINCP)pigratt.h \
   $(SOPHYAINCP)piaxes.h \
   $(SOPHYAINCP)piscdrawwdg.h \
+  $(SOPHYAINCP)pibwdgx.h \
+  $(SOPHYAINCP)pigraphps.h \
   $(SOPHYAINCP)piwindowx.h \
   $(SOPHYAINCP)piwindowgen.h \
@@ -2211 +2235 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
   $(SOPHYAINCP)pimenux.h \
   $(SOPHYAINCP)pimenugen.h \
-  $(SOPHYAINCP)picons.h \
-  $(SOPHYAINCP)pistdwdgx.h \
-  $(SOPHYAINCP)pistdwdggen.h \
-  $(SOPHYAINCP)pibwdgx.h \
-  $(SOPHYAINCP)pibwdggen.h \
-  $(SOPHYAINCP)picmap.h \
-  $(SOPHYAINCP)picmapx.h \
-  $(SOPHYAINCP)picmapgen.h \
-  $(SOPHYAINCP)pigraphx.h \
-  $(SOPHYAINCP)pigraphgen.h \
-  $(SOPHYAINCP)pifontx.h \
-  $(SOPHYAINCP)pifontgen.h \
-  $(SOPHYAINCP)pigrcoord.h \
-  $(SOPHYAINCP)pilineatt.h \
-  $(SOPHYAINCP)pigraphuc.h \
-  $(SOPHYAINCP)pievthandler.h \
-  $(SOPHYAINCP)psfile.h \
-  $(SOPHYAINCP)pigraphps.h \
+  $(SOPHYAINCP)piconsenum.h \
   $(SOPHYAINCP)piwindowx.h \
   $(SOPHYAINCP)piwindowgen.h \
@@ -2238 +2246 @@
   $(SOPHYAINCP)pioptmenux.h \
   $(SOPHYAINCP)pioptmenugen.h \
+  $(SOPHYAINCP)pistdwdgx.h \
+  $(SOPHYAINCP)pistdwdggen.h \
   $(SOPHYAINCP)pistdwdgx.h \
   $(SOPHYAINCP)pifilechox.h \
@@ -2245 +2255 @@
   $(SOPHYAINCP)periodic.h \
   $(SOPHYAINCP)picons.h \
+  $(SOPHYAINCP)pibwdgx.h \
+  $(SOPHYAINCP)pibwdggen.h \
+  $(SOPHYAINCP)picmap.h \
+  $(SOPHYAINCP)picmapx.h \
+  $(SOPHYAINCP)picmapgen.h \
+  $(SOPHYAINCP)pigraphx.h \
+  $(SOPHYAINCP)pigraphgen.h \
+  $(SOPHYAINCP)pifontx.h \
+  $(SOPHYAINCP)pifontgen.h \
+  $(SOPHYAINCP)pigrcoord.h \
+  $(SOPHYAINCP)pilineatt.h \
+  $(SOPHYAINCP)pigraphuc.h \
+  $(SOPHYAINCP)pievthandler.h \
+  $(SOPHYAINCP)psfile.h \
+  $(SOPHYAINCP)pigraphps.h \
   $(SOPHYAINCP)piimage.h \
   $(SOPHYAINCP)parradapter.h \
@@ -2308 +2333 @@
   $(SOPHYAINCP)hisprof.h \
   $(SOPHYAINCP)ntuple.h \
-  $(SOPHYAINCP)xntuple.h \
   $(SOPHYAINCP)basedtable.h \
   $(SOPHYAINCP)segdatablock.h \
@@ -2357 +2381 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -2385 +2410 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -2411 +2437 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -2478 +2505 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
   $(SOPHYAINCP)pimenux.h \
   $(SOPHYAINCP)pimenugen.h \
-  $(SOPHYAINCP)picons.h \
-  $(SOPHYAINCP)pistdwdgx.h \
-  $(SOPHYAINCP)pistdwdggen.h \
-  $(SOPHYAINCP)pibwdgx.h \
-  $(SOPHYAINCP)pibwdggen.h \
-  $(SOPHYAINCP)picmap.h \
-  $(SOPHYAINCP)picmapx.h \
-  $(SOPHYAINCP)picmapgen.h \
-  $(SOPHYAINCP)pigraphx.h \
-  $(SOPHYAINCP)pigraphgen.h \
-  $(SOPHYAINCP)pifontx.h \
-  $(SOPHYAINCP)pifontgen.h \
-  $(SOPHYAINCP)pigrcoord.h \
-  $(SOPHYAINCP)pilineatt.h \
-  $(SOPHYAINCP)pigraphuc.h \
-  $(SOPHYAINCP)pievthandler.h \
-  $(SOPHYAINCP)psfile.h \
-  $(SOPHYAINCP)pigraphps.h \
+  $(SOPHYAINCP)piconsenum.h \
   $(SOPHYAINCP)piwindowx.h \
   $(SOPHYAINCP)piwindowgen.h \
@@ -2505 +2516 @@
   $(SOPHYAINCP)pioptmenux.h \
   $(SOPHYAINCP)pioptmenugen.h \
+  $(SOPHYAINCP)pistdwdgx.h \
+  $(SOPHYAINCP)pistdwdggen.h \
   $(SOPHYAINCP)pistdwdgx.h \
   $(SOPHYAINCP)pifilechox.h \
@@ -2512 +2525 @@
   $(SOPHYAINCP)periodic.h \
   $(SOPHYAINCP)picons.h \
+  $(SOPHYAINCP)pibwdgx.h \
+  $(SOPHYAINCP)pibwdggen.h \
+  $(SOPHYAINCP)picmap.h \
+  $(SOPHYAINCP)picmapx.h \
+  $(SOPHYAINCP)picmapgen.h \
+  $(SOPHYAINCP)pigraphx.h \
+  $(SOPHYAINCP)pigraphgen.h \
+  $(SOPHYAINCP)pifontx.h \
+  $(SOPHYAINCP)pifontgen.h \
+  $(SOPHYAINCP)pigrcoord.h \
+  $(SOPHYAINCP)pilineatt.h \
+  $(SOPHYAINCP)pigraphuc.h \
+  $(SOPHYAINCP)pievthandler.h \
+  $(SOPHYAINCP)psfile.h \
+  $(SOPHYAINCP)pigraphps.h \
   $(SOPHYAINCP)piimage.h \
   $(SOPHYAINCP)parradapter.h \
@@ -2591 +2619 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
   $(SOPHYAINCP)pimenux.h \
   $(SOPHYAINCP)pimenugen.h \
-  $(SOPHYAINCP)picons.h \
-  $(SOPHYAINCP)pistdwdgx.h \
-  $(SOPHYAINCP)pistdwdggen.h \
-  $(SOPHYAINCP)pibwdgx.h \
-  $(SOPHYAINCP)pibwdggen.h \
-  $(SOPHYAINCP)picmap.h \
-  $(SOPHYAINCP)picmapx.h \
-  $(SOPHYAINCP)picmapgen.h \
-  $(SOPHYAINCP)pigraphx.h \
-  $(SOPHYAINCP)pigraphgen.h \
-  $(SOPHYAINCP)pifontx.h \
-  $(SOPHYAINCP)pifontgen.h \
-  $(SOPHYAINCP)pigrcoord.h \
-  $(SOPHYAINCP)pilineatt.h \
-  $(SOPHYAINCP)pigraphuc.h \
-  $(SOPHYAINCP)pievthandler.h \
-  $(SOPHYAINCP)psfile.h \
-  $(SOPHYAINCP)pigraphps.h \
+  $(SOPHYAINCP)piconsenum.h \
   $(SOPHYAINCP)piwindowx.h \
   $(SOPHYAINCP)piwindowgen.h \
@@ -2618 +2630 @@
   $(SOPHYAINCP)pioptmenux.h \
   $(SOPHYAINCP)pioptmenugen.h \
+  $(SOPHYAINCP)pistdwdgx.h \
+  $(SOPHYAINCP)pistdwdggen.h \
   $(SOPHYAINCP)pistdwdgx.h \
   $(SOPHYAINCP)pifilechox.h \
@@ -2625 +2639 @@
   $(SOPHYAINCP)periodic.h \
   $(SOPHYAINCP)picons.h \
+  $(SOPHYAINCP)pibwdgx.h \
+  $(SOPHYAINCP)pibwdggen.h \
+  $(SOPHYAINCP)picmap.h \
+  $(SOPHYAINCP)picmapx.h \
+  $(SOPHYAINCP)picmapgen.h \
+  $(SOPHYAINCP)pigraphx.h \
+  $(SOPHYAINCP)pigraphgen.h \
+  $(SOPHYAINCP)pifontx.h \
+  $(SOPHYAINCP)pifontgen.h \
+  $(SOPHYAINCP)pigrcoord.h \
+  $(SOPHYAINCP)pilineatt.h \
+  $(SOPHYAINCP)pigraphuc.h \
+  $(SOPHYAINCP)pievthandler.h \
+  $(SOPHYAINCP)psfile.h \
+  $(SOPHYAINCP)pigraphps.h \
   $(SOPHYAINCP)piimage.h \
   $(SOPHYAINCP)parradapter.h \
@@ -2672 +2701 @@
   $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)lut.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)tmatrix.h \
   $(SOPHYAINCP)tarray.h \
@@ -2720 +2750 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -2764 +2795 @@
   $(SOPHYAINCP)pimenux.h \
   $(SOPHYAINCP)pimenugen.h \
-  $(SOPHYAINCP)picons.h \
-  $(SOPHYAINCP)pistdwdgx.h \
-  $(SOPHYAINCP)pistdwdggen.h \
-  $(SOPHYAINCP)pibwdgx.h \
-  $(SOPHYAINCP)pigraphps.h \
+  $(SOPHYAINCP)piconsenum.h \
   $(SOPHYAINCP)piwindowx.h \
   $(SOPHYAINCP)piwindowgen.h \
@@ -2774 +2801 @@
   $(SOPHYAINCP)pioptmenux.h \
   $(SOPHYAINCP)pioptmenugen.h \
+  $(SOPHYAINCP)pistdwdgx.h \
+  $(SOPHYAINCP)pistdwdggen.h \
   $(SOPHYAINCP)pistdwdgx.h \
   $(SOPHYAINCP)pifilechox.h \
@@ -2781 +2810 @@
   $(SOPHYAINCP)periodic.h \
   $(SOPHYAINCP)picons.h \
+  $(SOPHYAINCP)pibwdgx.h \
+  $(SOPHYAINCP)pigraphps.h \
   $(SOPHYAINCP)piimage.h \
   $(SOPHYAINCP)parradapter.h \

trunk/SophyaPI/PIext/basexecut.cc

@@ -24 +24 @@
 #include "datatable.h"
 
-#ifdef SANS_EVOLPLANCK
-#include "cvector.h"
-#else
 #include "tvector.h"
-#endif
 
 
@@ -95 +91 @@
   mImgApp->RedirectStdOutErr(false);
                                     --------DEL  */
-#ifdef SANS_EVOLPLANCK
-  TRY {
-    tokens.erase(tokens.begin());
-    fuf(tokens);
-  }  CATCH(merr) {
-    fflush(stdout); 
-    string es = PeidaExc(merr);
-    cerr << "\n PIABaseExecutor: Call UserFunc  Exception :" << merr << es;
-    cout << endl; 
-    }
-#else
   try {
     tokens.erase(tokens.begin());
@@ -122 +107 @@
     return(-79);
   }
-#endif
 /*DEL----- Plus besoin en multi-thread ? / Reza 06/01/2004 
   mImgApp->RedirectStdOutErr(red);
@@ -732 +716 @@
   }
 
-#ifndef SANS_EVOLPLANCK
 /* Lecture matrice/vecteur depuis fichier ASCII  */
 else if ((kw == "mtxfrascii") || (kw == "vecfrascii") ) {
@@ -788 +771 @@
 }
   
-#endif
 
 else if (kw == "fillnt" ) {
@@ -970 +952 @@
 usage += "\n  Related commands: ntloop fillnt ";
 mpiac->RegisterCommand(kw, usage, this, "FileIO");
-#ifndef SANS_EVOLPLANCK
 kw = "mtxfrascii";
 usage = "Reads a matrix from an ASCII file (TMatrix<r_8>)";
@@ -986 +967 @@
 usage += "\n  Related commands:  mtxfrascii vecfrascii ntfrascii ";
 mpiac->RegisterCommand(kw, usage, this, "FileIO");
-#endif
 
 kw = "print";
@@ -1181 +1161 @@
 usage += "\n-         i,k,val,real,imag,mod,phas,teta,phi,_nl";
 usage += "\n- FITS Binary/ASCII table: fits column names,_nl";
-#ifdef SANS_EVOLPLANCK
-usage += "\n  ------ Eros Variable names (double) -------- ";
-usage += "\n- StarList: x,y,flux,fond,pixmax,flags,";
-usage += "\n-           xref,yref,fluxref,fondref,pixmaxref,_nl";
-#endif
 usage += "\n  ------ Other parameters -------- ";
 usage += "\nLoop parameters can be specified as I1[:I2[:DI]] for(int i=I1; i<I2; i+=DI)"; 

trunk/SophyaPI/PIext/cxxexecutor.cc

@@ -394 +394 @@
   <<endl
 
-#ifdef SANS_EVOLPLANCK
-  <<"//---- Peida include files"<<endl
-  <<"#include \"toutpeida.h\""<<endl
-#else
   // Si on enleve sopnamsp.h (using namespace SOPHYA), il faudra accoler 
   // SOPHYA:: à toutes les déclarations automatiques - Reza, 10/09/2004 
@@ -409 +405 @@
   <<"#include \"histats.h\""<<endl
   <<endl
-#endif
 
   <<"//---- Spiapp include files"<<endl
@@ -497 +492 @@
   os<<obtype<<"* "<<stmp
     <<" = dynamic_cast< "<<obtype<<" * >(omg.GetObj(___nomobj));"<<endl;
-#ifdef SANS_EVOLPLANCK
-  os<<"if("<<stmp<<"==NULL) { \n"
-    <<" long mExcErr = nullPtrErr; \n"
-    <<" cerr << \"CxxExecutor::PutObject: Non existing object "
-    <<" ... please update file \\n \" ;"
-    <<" throw mExcErr ; \n } "<<endl;
-#else
   os<<"if("<<stmp<<"==NULL) throw NullPtrError"
     <<"(\"CxxExecutor::PutObject: Non existing object "<<nobj
     <<"... please update file\");"<<endl;
-#endif
   os<<obtype<<"& "<<nobj<<" = (*"<<stmp<<");"<<endl<<endl;
 }
@@ -622 +609 @@
 
 int rc;
-#ifdef SANS_EVOLPLANCK
-CxxCompilerLinker cxx;
-string sophlib = " -lPIE -lm ";
-cxx.AddLinkOptions(sophlib);
-#else
 CxxCompilerLinker cxx(true,true,true);
-#endif
 if(TmpDir().size()>0) cxx.SetTmpDir(TmpDir());
 if(mPrtLevel>0) cxx.SetVerbose(true);

trunk/SophyaPI/PIext/exclude

@@ -1 +1 @@
 userfitfunex.c
-nommatvecadapter.cc
-nomstladapter.cc
 pistlist.cc

trunk/SophyaPI/PIext/flowmodex.cc

@@ -117 +117 @@
   
   // Creation NTuple 
-  char* ntn[4] = {"expx","expy","expex","expey"};
+  const char* ntn[4] = {"expx","expy","expex","expey"};
   NTuple * ntint = NULL;
   ntint = new NTuple(4,ntn);

trunk/SophyaPI/PIext/nobjmgr.cc

@@ -20 +20 @@
 #include "dvlist.h"
 
-// EVOL-PLANCK
-#ifdef SANS_EVOLPLANCK
-#include "fitsimage.h"  
-#else
 #include "tvector.h"
 #include "pitvmaad.h"
 #include "piyfxdrw.h"
-#endif
 
 #include "pisurfdr.h"
@@ -259 +254 @@
   }
   NObjMgrSync zs(0); zs.NOp(); 
-#ifdef SANS_EVOLPLANCK
-  bool fg = true;
-#else
   bool fg = myVars->HasKey(key);
-#endif
   myVars->SetS(key, val);
   //  cout << " DEBUG::SetVar " << *myVars << endl;
@@ -277 +268 @@
   }
   NObjMgrSync zs(0); zs.NOp(); 
-#ifdef SANS_EVOLPLANCK
-  DVList::ValList::const_iterator it;
-  for(it=myVars->Begin(); it!= myVars->End(); it++)
-    if ((*it).first == key)  return true;
-  return(false);
-#else
   return(myVars->HasKey(key));
-#endif
 }
 
@@ -295 +279 @@
   }
   NObjMgrSync zs(0); zs.NOp(); 
-#ifdef SANS_EVOLPLANCK
-  return(false);
-#else
   return(myVars->DeleteKey(key));
-#endif
 }
 
@@ -945 +925 @@
 PPersist* ppobj=NULL;
 bool ok = true;
-#ifdef SANS_EVOLPLANCK
-TRY{
-  PInPersist pis(flnm);
-  ppobj = PPersistMgr::ReadObject(pis);
-  if (ppobj == NULL) ok = false;
-}  CATCH(merr) 
-  { printf("NamedObjMgr::ReadObj()/Error Exception= %ld (%s) \n", 
-    (long)merr, PeidaExc(merr));  ok = false; } ENDTRY;
-#else
 try {
   PInPersist pis(flnm);
@@ -962 +933 @@
   ok = false;
   }
-#endif
 if (!ok)  return;
 if (nobj.length()<1)  nobj = servnobjm->FileName2Name(flnm);
@@ -1011 +981 @@
 {
 int_4 i; // $CHECK$ int -> int_4 a cause de TagKey
-#ifdef SANS_EVOLPLANCK
-int_4 cid, key, ln; // $CHECK$ int -> int_4 a cause de TagKey
-#endif
 int n0, n1;
 bool ok = true;
@@ -1021 +988 @@
 int nread = 0;
 int nbtags = 0;
-#ifdef SANS_EVOLPLANCK
-nbtags = s.NbTags();
-#else 
 nbtags = s.NbNameTags();
-#endif
 if ( (nbtags < 1) || (num >= nbtags) ) {
   if (num >= 0) { 
@@ -1033 +996 @@
   }
 
-#ifdef SANS_EVOLPLANCK
-  TRY {
-    obj = PPersistMgr::ReadObject(s);
-    if (obj == NULL)  ok = false;
-  }  CATCH(merr) { 
-    printf("NamedObjMgr::ReadObj()/Error Exception= %ld (%s) \n", (long)merr, PeidaExc(merr)); 
-    ok = false; 
-  } ENDTRY;
-#else
 try {
   obj = s.ReadObject();
@@ -1049 +1003 @@
   ok = false;
   }
-#endif
 
   if (!ok)  return;
@@ -1060 +1013 @@
 else { n0 = num; n1 = num+1; }
 for(i=n0; i<n1; i++) {
-#ifdef SANS_EVOLPLANCK
-  key = s.TagKey(i, cid, ln); 
-  if (ln <= 0)  nom = "";
-  else nom = s.TagName(i);
-  s.GotoTag(i);
-  TRY {
-    obj = PPersistMgr::ReadObject(s);
-    if (obj == NULL)  ok = false;
-  }  CATCH(merr) { 
-    printf("NamedObjMgr::ReadObj()/Error Exception= %ld (%s) \n", (long)merr, PeidaExc(merr)); 
-    ok = false; 
-  } ENDTRY;
-#else
   s.GotoNameTagNum(i);
   nom = s.GetTagName(i);
@@ -1082 +1022 @@
     ok = false;
     }
-#endif
   if (ok)  { AddObj_P(obj->DataObj(), nom, true);  nread++; }
 }
@@ -1095 +1034 @@
   //    sinon, tous les objets sequentiellement
 {
-#ifdef SANS_EVOLPLANCK
-bool ok = true;
-PPersist* obj=NULL;
-
-PInPersist* ppin=NULL;
-TRY{
-  ppin = new PInPersist(flnm);
-  if (ppin->NbTags() < 1)  obj = PPersistMgr::ReadObject((*ppin));
-  else obj = NULL;
-}  CATCH(merr) 
-  { printf("NamedObjMgr::ReadAll()/Error Exception= %ld (%s) \n", 
-    (long)merr, PeidaExc(merr));  ok = false; } 
-ENDTRY;
-if (!ok)  return;
-if (obj) {
-  string nom = servnobjm->FileName2Name(flnm);
-  AddObj(obj->DataObj(), nom, false);
-  }
-else ReadObj((*ppin), -1);
-delete ppin;
-#else
 try {
   PInPersist pis(flnm);
@@ -1151 +1069 @@
   cerr << "NamedObjMgr::ReadAll()/Error Exception - Msg= " << iox.Msg() << endl;
 }
-#endif
 return;
 }
@@ -1193 +1110 @@
 bool ok = true;
 POutPersist* pout=NULL;
-#ifdef SANS_EVOLPLANCK 
-TRY{
-  pout = new POutPersist(flnm);
-}  CATCH(merr) 
-  { printf("NamedObjMgr::SaveObjects()/Error Exception= %ld (%s) \n", 
-    (long)merr, PeidaExc(merr));  ok = false; } ENDTRY;
-#else
 try {
  pout = new POutPersist(flnm);
@@ -1207 +1117 @@
     ok = false;
 }
-#endif
 if (!ok)  return;
 NObjList::iterator it;
@@ -1262 +1171 @@
 
 POutPersist* pout=NULL;
-#ifdef SANS_EVOLPLANCK 
-TRY{
-  pout = new POutPersist(flnm);
-}  CATCH(merr) 
-  { printf("NamedObjMgr::SaveAll()/Error Exception= %ld (%s) \n", 
-    (long)merr, PeidaExc(merr));  ok = false; } ENDTRY;
-#else
 try {
  pout = new POutPersist(flnm);
@@ -1276 +1178 @@
     ok = false;
 }
-#endif
 if (!ok)  return;
 NObjList::iterator it;
@@ -1583 +1484 @@
 NObjMgrSync zs(0); zs.NOp(); 
 
-#ifdef SANS_EVOLPLANCK
-  cerr << " NamedObjMgr::DisplayVector() Error: Not implemented with PEIDA " << endl;
-#else
-
 if(!myImgApp) return; 
 
@@ -1651 +1548 @@
 return;
 
-#endif
 }
 

trunk/SophyaPI/PIext/nomgfdadapter.cc

@@ -9 +9 @@
 #include "pipodrw.h"
 
-#ifndef SANS_EVOLPLANCK
 #include "objfitter.h"
-#endif
 
 //-------------------------------------------------------------------------
@@ -53 +51 @@
 void NOMAdapter_GeneralFitData::SavePPF(POutPersist& pos, string const & nom)
 {
-#ifdef SANS_EVOLPLANCK
-string tag = nom;  // A cause de const
-mG->Write(pos,0,tag);
-#else
 ObjFileIO<GeneralFitData> fio(mG);
 fio.Write(pos, nom);
-#endif
 }
 
@@ -113 +106 @@
 {
 GeneralFitData* g = NULL;
-#ifdef SANS_EVOLPLANCK
-g = mG->FitResidus(mfit); 
-#else
 g = new GeneralFitData(ObjectFitter::FitResidus(*mG,mfit));
-#endif
 return g;
 }
@@ -124 +113 @@
 {
 GeneralFitData* g = NULL;
-#ifdef SANS_EVOLPLANCK
-g = mG->FitFunction(mfit); 
-#else
 g = new GeneralFitData(ObjectFitter::FitFunction(*mG,mfit));
-#endif
 return g;
 }

trunk/SophyaPI/PIext/nomhistadapter.cc

@@ -16 +16 @@
 #include "strutilxx.h"
 
-#ifndef SANS_EVOLPLANCK
 #include "objfitter.h"
 // Pour les DataTable ( Depuis Avril 2005 )
 #include "datatable.h"
 #include "swppfdtable.h"
-#endif
 
 //-----------------------------------------------------------------------------
@@ -139 +137 @@
 void NOMAdapter_Histo::SavePPF(POutPersist& pos, string const & nom)
 {
-#ifdef SANS_EVOLPLANCK
-// PEIDA-EROS L'histo est lui-meme PPersist
-string tag = nom;  // A cause de const
-mHis->Write(pos,0,tag);
-#else
 ObjFileIO<Histo> fio(mHis);
 fio.Write(pos, nom);
-#endif
 }
 
@@ -204 +196 @@
 {
 Histo* h = NULL;
-#ifdef SANS_EVOLPLANCK
-h = mHis->FitResidus(mfit); 
-#else
 h = new Histo(ObjectFitter::FitResidus(*mHis,mfit));
-#endif
 return h;
 }
@@ -215 +203 @@
 {
 Histo* h = NULL;
-#ifdef SANS_EVOLPLANCK
-h = mHis->FitFunction(mfit); 
-#else
 h = new Histo(ObjectFitter::FitFunction(*mHis,mfit));
-#endif
 return h;
 }
@@ -316 +300 @@
 void NOMAdapter_Histo2D::SavePPF(POutPersist& pos, string const & nom)
 {
-#ifdef SANS_EVOLPLANCK
-// PEIDA-EROS L'histo est lui-meme PPersist
-string tag = nom;  // A cause de const
-mHis->Write(pos,0,tag);
-#else
 ObjFileIO<Histo2D> fio(mHis);
 fio.Write(pos, nom);
-#endif
 }
 
@@ -389 +367 @@
 {
 Histo2D* h2 = NULL;
-#ifdef SANS_EVOLPLANCK
-h2 = mHis->FitFunction(mfit);
-#else
 h2 = new Histo2D(ObjectFitter::FitResidus(*mHis,mfit));
-#endif
 return h2;
 }
@@ -400 +374 @@
 {
 Histo2D* h2 = NULL;
-#ifdef SANS_EVOLPLANCK
-h2 = mHis->FitFunction(mfit);
-#else
 h2 = new Histo2D(ObjectFitter::FitFunction(*mHis,mfit));
-#endif
 return h2;
 }
@@ -555 +525 @@
 void NOMAdapter_NTuple::SavePPF(POutPersist& pos, string const & nom)
 {
-#ifdef SANS_EVOLPLANCK
-// PEIDA-EROS L'histo est lui-meme PPersist
-string tag = nom;  // A cause de const
-mNt->Write(pos,0,tag);
-#else
 ObjFileIO<NTuple> fio(mNt);
 fio.Write(pos, nom);
-#endif
 }
 
@@ -571 +535 @@
 char buff[128];
 if (opts[0] == "sizes") {
-  sprintf(buff, "%ld %ld", mNt->NEntry(), mNt->NVar());
+  sprintf(buff, "%ld %ld", (long)mNt->NEntry(), (long)mNt->NVar());
   return string(buff);   
 }
 else if ((opts[0] == "nlines") || (opts[0] == "nentry") || (opts[0] == "nrows")) {
-  sprintf(buff, "%ld", mNt->NEntry());
+  sprintf(buff, "%ld", (long)mNt->NEntry());
   return string(buff);   
 }
 else if ((opts[0] == "nvar") || (opts[0] == "ncols")) {
-  sprintf(buff, "%ld", mNt->NVar());
+  sprintf(buff, "%ld", (long)mNt->NVar());
   return string(buff);   
 }
@@ -610 +574 @@
 return(mNt);
 // return( new NTupInt_NTuple(mNt) );
-}
-
-//-------------------------------------------------------------------------
-// Class Adaptateur d'objet (Pour NamedObjMgr) d'objet XNTuple
-//-------------------------------------------------------------------------
-
-/* --Methode-- */
-NOMAdapter_XNTuple::NOMAdapter_XNTuple(XNTuple* o)
-  : NObjMgrAdapter(o)
-{
-mNt = o;
-}
-
-/* --Methode-- */
-NOMAdapter_XNTuple::~NOMAdapter_XNTuple()
-{
-}
-
-/* --Methode-- */
-NObjMgrAdapter* NOMAdapter_XNTuple::Clone(AnyDataObj* o)
-{
-XNTuple* nt = dynamic_cast<XNTuple *>(o);
-if (nt) return ( new NOMAdapter_XNTuple(nt) );
-return ( new NObjMgrAdapter(o) );
-}
-
-/* --Methode-- */
-string NOMAdapter_XNTuple::GetDataObjType()
-{
-return ("XNTuple ");
-}
-
-/* --Methode-- */
-AnyDataObj* NOMAdapter_XNTuple::CloneDataObj(bool /*share*/)
-{
-return ( new XNTuple(*mNt) );
-}
-
-/* --Methode-- */
-void NOMAdapter_XNTuple::SavePPF(POutPersist& pos, string const & nom)
-{
-#ifdef SANS_EVOLPLANCK
-// PEIDA-EROS L'histo est lui-meme PPersist
-string tag = nom;  // A cause de const
-mNt->Write(pos,0,tag);
-#else
-ObjFileIO<XNTuple> fio(mNt);
-fio.Write(pos, nom);
-#endif
-}
-
-/* --Methode-- */
-void NOMAdapter_XNTuple::Print(ostream& os, int lev)
-{
-// os << mNt->Info();
-mNt->Show(os);
-}
-
-
-/* --Methode-- */
-NTupleInterface* NOMAdapter_XNTuple::GetNTupleInterface(bool& adel)
-{
-adel = false;
-return(mNt);
 }
 
@@ -751 +651 @@
 char buff[128];
 if (opts[0] == "sizes") {
-  sprintf(buff, "%ld %ld", mDT->NEntry(), mDT->NVar());
+  sprintf(buff, "%ld %ld", (long)mDT->NEntry(), (long)mDT->NVar());
   return string(buff);   
 }
 else if ((opts[0] == "nlines") || (opts[0] == "nentry") || (opts[0] == "nrows")) {
-  sprintf(buff, "%ld", mDT->NEntry());
+  sprintf(buff, "%ld", (long)mDT->NEntry());
   return string(buff);   
 }
 else if ((opts[0] == "nvar") || (opts[0] == "ncols")) {
-  sprintf(buff, "%ld", mDT->NVar());
+  sprintf(buff, "%ld", (long)mDT->NVar());
   return string(buff);   
 }

trunk/SophyaPI/PIext/nomhistadapter.h

@@ -12 +12 @@
 #include "hisprof.h"
 #include "ntuple.h"
-#include "xntuple.h"
 #include "basedtable.h"
 
@@ -142 +141 @@
 };
 
-//-------------------------------------------------------------------------
-// Class Adaptateur d'objet (Pour NamedObjMgr) d'objet XNTuple 
-//-------------------------------------------------------------------------
-
-class NOMAdapter_XNTuple : public NObjMgrAdapter {
-public:
-                                NOMAdapter_XNTuple(XNTuple* nt = NULL);
-  virtual                       ~NOMAdapter_XNTuple();
-
-  virtual NObjMgrAdapter*       Clone(AnyDataObj* o);
-
-  virtual string                GetDataObjType();
-
-  virtual AnyDataObj*           CloneDataObj(bool share=false);
-
-  virtual void                  SavePPF(POutPersist& s, string const & nom);
-
-  virtual void                  Print(ostream& os, int lev=0);
-  virtual NTupleInterface*      GetNTupleInterface(bool& adel);
-
-protected:
-  XNTuple* mNt;
-};
 
 //-------------------------------------------------------------------------

trunk/SophyaPI/PIext/nomimagadapter.cc

@@ -11 +11 @@
 #include "pimgadapter.h"
 
-#ifdef SANS_EVOLPLANCK
-#include "fitsimage.h"
-#else
 #include "objfitter.h"
-#endif
 
 
@@ -62 +58 @@
 AnyDataObj* NOMAdapter_Image<T>::CloneDataObj(bool share)
 {
-#ifdef SANS_EVOLPLANCK
-FitsImage<T> * fima = dynamic_cast<FitsImage<T> *>(mImg);
-if (fima == NULL)   return( new Image<T>(*mImg ) );
-else return ( new FitsImage<T>(*fima) );
-#else
 return( new Image<T>(*mImg, share) );
-#endif
 }
 
@@ -76 +66 @@
 void NOMAdapter_Image<T>::SavePPF(POutPersist& pos, string const & nom)
 {
-#ifdef SANS_EVOLPLANCK
-// PEIDA-EROS L'histo est lui-meme PPersist
-string tag = nom;  // A cause de const
-mImg->Write(pos,0,tag);
-#else
 string s = typeid(*mObj).name();
 cout << "NOMAdapter_Image<T>::SavePPF() - Error : Not supported for " << s << endl;
-#endif
 }
 
@@ -147 +131 @@
 AnyDataObj* NOMAdapter_Image<T>::FitResidusObj(GeneralFit& mfit)
 {
-#ifdef SANS_EVOLPLANCK
-RzImage* rzim = mImg->FitResidus(mfit);  
-ImageR4* im   = new ImageR4(*rzim);
-return im;
-#else
 Image<T>* im = new Image<T>(ObjectFitter::FitResidus(*mImg,mfit));
 return im;
-#endif
 }
 
@@ -160 +138 @@
 AnyDataObj* NOMAdapter_Image<T>::FitFunctionObj(GeneralFit& mfit)
 {
-#ifdef SANS_EVOLPLANCK
-RzImage* rzim = mImg->FitFunction(mfit);  
-ImageR4* im   = new ImageR4(*rzim);
-return im;
-#else
 Image<T>* im = NULL;
 //im = new Image<T>(ObjectFitter::FitFunction(*mImg,mfit));
 return im;
-#endif
 }
 
@@ -236 +208 @@
 #pragma define_template NTupInt_Image<r_4>
 #pragma define_template NTupInt_Image<r_8>
-#ifdef SANS_EVOLPLANCK
-#pragma define_template NOMAdapter_Image<int_2>
-#pragma define_template NTupInt_Image<int_2>
-#endif
 #endif
 #if defined(ANSI_TEMPLATES) || defined(__ANSI_TEMPLATES__) || defined(__GNU_TEMPLATES__) 
@@ -250 +218 @@
 template class NTupInt_Image<r_4>;
 template class NTupInt_Image<r_8>;
-#ifdef SANS_EVOLPLANCK
-template class NOMAdapter_Image<int_2>;
-template class NTupInt_Image<int_2>;
 #endif
-#endif
-
-
+
+

trunk/SophyaPI/PIext/nomtarradapter.cc

@@ -193 +193 @@
     return 1; 
   }
+
+  return 0;
 }
 

trunk/SophyaPI/PIext/objlist.list

@@ -22 +22 @@
 pigfd1.o
 pigfd2.o
+pihisto2d.o
 pihisto.o
-pihisto2d.o
 piinit.o
 pintup3d.o

trunk/SophyaPI/PIext/pawexecut.cc

@@ -23 +23 @@
 #include "pihisto.h"
 
-#ifdef SANS_EVOLPLANCK
-#include "cvector.h"
-#include "matrix.h"
-#else
 #include "tmatrix.h"
 #include "tvector.h"
-#endif
 
 /* Reza + cmv  13/10/99 */
@@ -421 +416 @@
 string ctyp = typeid(*mobj).name();
 
-#ifdef SANS_EVOLPLANCK
-if(typeid(*mobj)==typeid(Vector))       {Vector*  ob=(Vector*) mobj; ob->Zero();}
-else if(typeid(*mobj)==typeid(Matrix))  {Matrix*  ob=(Matrix*) mobj; ob->Zero();}
-#else
  if(typeid(*mobj)==typeid(Vector))       {Vector*  ob=(Vector*) mobj; (*ob) = 0.; }
 // ob->DataBlock().Reset(0.);}
  else if(typeid(*mobj)==typeid(Matrix))   {Matrix*  ob=(Matrix*) mobj; (*ob) = 0.; }
 //ob->DataBlock().Reset(0.);}
-#endif
 else if(typeid(*mobj)==typeid(Histo))    {Histo* ob=(Histo*)  mobj; ob->Zero();}
 else if(typeid(*mobj)==typeid(HProf))    {HProf* ob=(HProf*)  mobj; ob->Zero();}
@@ -701 +691 @@
   }
 }   // fin du try
-#ifdef SANS_EVOLPLANCK
-CATCH(merr) {
-  fflush(stdout); cout<<endl; cerr<<endl;
-  string es = PeidaExc(merr);
-  cerr<<"Services2NObjMgr::ComputeExpressions()  Exception :"<<merr<<es;
-} ENDTRY;
-#else
 catch ( PException exc ) {
   fflush(stdout); cout<<endl; cerr<<endl;
   cerr<<"Services2NObjMgr::ComputeExpressions()  Exception :"<<exc.Msg()<<endl; 
 }
-#endif
 
 if(adel) delete objnt;
@@ -1380 +1362 @@
 r_8 norm=-1.;
 if(tokens.size()>=2) norm = atof(tokens[1].c_str());
-#ifdef SANS_EVOLPLANCK
-Vector* v = dynamic_cast<Vector*>(mobj);
-#else
+
 TVector<r_8>* v = dynamic_cast<TVector<r_8>*>(mobj);
-#endif
 
 if(!v)
@@ -1390 +1369 @@
   return;}
 
-#ifdef SANS_EVOLPLANCK
-uint_4 n = v->NElts();
-#else
 uint_4 n = v->Size();
-#endif
 
 if(n==0)
@@ -1507 +1482 @@
 if(tokens.size()>=2) deriv_option = atoi(tokens[1].c_str());
 
-#ifdef SANS_EVOLPLANCK
-Vector* v = dynamic_cast<Vector*>(mobj);
-#else
 TVector<r_8>* v = dynamic_cast<TVector<r_8>*>(mobj);
-#endif
 
 if(!v)
@@ -1517 +1488 @@
   return;}
 
-
-#ifdef SANS_EVOLPLANCK
-uint_4 n = v->NElts();
-#else
 uint_4 n = v->Size();
-#endif
 
 if(n==0)
@@ -1529 +1495 @@
 if(n<=1) return;
 
-#ifdef SANS_EVOLPLANCK
-Vector vsave(*v);
-#else
 TVector<r_8> vsave(*v,false);
-#endif
 
 if(deriv_option<0) {
@@ -1742 +1704 @@
   Vector* h3 = NULL;
   if( mobjh3 == NULL ) {  // l'objet n'existe pas, on le cree
-#ifdef SANS_EVOLPLANCK
-    h3 = new Vector(*h1);
-#else
     h3 = new Vector(*h1,false);
-#endif
     *h3 = 0.; omg.AddObj(h3,h3name); mobjh3 = omg.GetObj(h3name);
   }
@@ -1758 +1716 @@
   if( oper[0]=='+')      *h3 = *h1 + *h2;
   else if( oper[0]=='-') *h3 = *h1 - *h2;
-#ifdef SANS_EVOLPLANCK
-  else if(oper[0]=='*' || oper[0]=='/')
-    cout<<"PAWExecutor::h_oper Error: operation "<<oper[0]
-        <<" not implemented for Vector in Peida"<<endl;
-#else
   else if( oper[0]=='*') {h3->Clone(*h1); h3->MulElt(*h2,*h3);}
   else if( oper[0]=='/') {h3->Clone(*h1); h3->DivElt(*h2,*h3,false,true);}
-#endif
 
 // Operations on Matrix
@@ -1781 +1733 @@
   Matrix* h3 = NULL;
   if( mobjh3 == NULL ) {  // l'objet n'existe pas, on le cree
-#ifdef SANS_EVOLPLANCK
-    h3 = new Matrix(*h1);
-#else
     h3 = new Matrix(*h1,false);
-#endif
     *h3 = 0.; omg.AddObj(h3,h3name); mobjh3 = omg.GetObj(h3name);
   }
@@ -1798 +1746 @@
   if( oper[0]=='+')      *h3 = *h1 + *h2;
   else if( oper[0]=='-') *h3 = *h1 - *h2;
-#ifdef SANS_EVOLPLANCK
-  else if(oper[0]=='*' || oper[0]=='/')
-    cout<<"PAWExecutor::h_oper Error: operation "<<oper[0]
-        <<" not implemented for Vector in Peida"<<endl;
-#else
   else if( oper[0]=='*') {h3->Clone(*h1); h3->MulElt(*h2,*h3);}
   else if( oper[0]=='/') {h3->Clone(*h1); h3->DivElt(*h2,*h3,false,true);}
-#endif
 
 // Doesn't work for other objects

trunk/SophyaPI/PIext/piacmd.cc

@@ -12 +12 @@
 #include "strutilxx.h"
 // #include "dlftypes.h"
-#ifdef SANS_EVOLPLANCK
-#include "nbrandom.h"
-#else
 #include "srandgen.h"
-#endif
 
 #include "pistdimgapp.h"

trunk/SophyaPI/PIext/piafitting.cc

@@ -25 +25 @@
 #include "hisprof.h"
 
-#ifdef SANS_EVOLPLANCK
-#include "matrix.h"
-#include "cvector.h"
-#else
 #include "tmatrix.h"
 #include "tvector.h"
 #include "objfitter.h"
-#endif
 
 #include "piafitting.h"
@@ -42 +37 @@
 #include "nomgfdadapter.h"
 #include "nomimagadapter.h"
-#ifdef SANS_EVOLPLANCK
-#include "nommatvecadapter.h"
-#else
 #include "nomtmatvecadapter.h"
-#endif
 
 ////////////////////////////////////////////////////////////////////
@@ -854 +845 @@
 
 // Fit
-#ifdef SANS_EVOLPLANCK
-mParSave = mPar; mStepSave = mStep; mFixSave = mFix;
-mMinSave = mMin; mMaxSave = mMax;
-#else
 mParSave.Clone(mPar); mStepSave.Clone(mStep); mFixSave.Clone(mFix);
 mMinSave.Clone(mMin); mMaxSave.Clone(mMax);
-#endif
 mOptSave = mOpt;
 double c2r = -1.;
@@ -1218 +1204 @@
 , saveErrScale(1.),saveErrMin(0.), saveXC(0.), saveYC(0.)
 {
-#ifdef SANS_EVOLPLANCK
-COMPATIBLE_ASSERT(mFitter);
-#else
 ASSERT(mFitter);
-#endif
 
 int npar = mFitter->mNPar;

trunk/SophyaPI/PIext/piafitting.h

@@ -21 +21 @@
 class PIAFitterWind;
 
-#ifdef SANS_EVOLPLANCK
-#include "cvector.h"
-class GeneralFunction; class GeneralFunc; class GeneralFit;
-class GeneralFitData;
-#else
 #include "tvector.h"
 namespace SOPHYA { 
@@ -31 +26 @@
 class GeneralFitData;
 }
-#endif
 
 class PIAFitter : public CmdExecutor {

trunk/SophyaPI/PIext/piinit.cc

@@ -11 +11 @@
 #include "nomimagadapter.h"
 
-#ifdef SANS_EVOLPLANCK
-#include "nommatvecadapter.h"
-#include "fitsimage.h"
-#include "nomstladapter.h"
-#else
 #include <complex>
 #include "nomtmatvecadapter.h"
@@ -35 +30 @@
 #include "piaversion.h"
 
-#endif
 
 int PIAppInitiator::FgInit = 0;
 
 PIAppInitiator::PIAppInitiator(PIStdImgApp * app)
-#ifdef SANS_EVOLPLANCK
- : PeidaStarRecoInitiator()
-#else
  : SambaInitiator()
-#endif
 {
   FgInit++;
@@ -63 +53 @@
   serv->RegisterClass(new DataTable, new NOMAdapter_DataTable );
   serv->RegisterClass(new SwPPFDataTable, new NOMAdapter_DataTable );
-  char* varenv=NULL;
-  if ( (varenv=getenv("PEIDA_TMP")) == NULL )   varenv=getenv("TMPDIR") ;
-  if (varenv)  XNTuple::SetSwapPath(varenv);
 
   serv->RegisterClass(new GeneralFitData, new NOMAdapter_GeneralFitData );
 
-#ifdef SANS_EVOLPLANCK
-  serv->RegisterClass(new Vector, new NOMAdapter_Vector );
-  serv->RegisterClass(new Matrix, new NOMAdapter_Matrix );
-#else
 //  Octobre 2008 : prise en charge tableaux/matrice/vecteurs en uint_4 uint_8 
   serv->RegisterClass(new TArray<uint_2>, new NOMAdapter_TArray<uint_2> );
@@ -105 +88 @@
   serv->RegisterClass(new TVector<complex<r_8> >, new NOMAdapter_TMatrix<complex<r_8> > );
   serv->RegisterClass(new TMatrix<complex<r_8> >, new NOMAdapter_TMatrix<complex<r_8> > );
-#endif
 
   /*  Avril 2007 : Prise en charge des images par NOMAdapter_TMatrix  au lieu de
@@ -120 +102 @@
   serv->RegisterClass(new Image<complex<r_8> >, new NOMAdapter_TMatrix<complex<r_8> > );
 
-#ifdef SANS_EVOLPLANCK
-  serv->RegisterClass(new Image<uint_2>, new  NOMAdapter_Image<uint_2> );
-  serv->RegisterClass(new Image<int_2>, new  NOMAdapter_Image<int_2> );
-  serv->RegisterClass(new Image<int_4>, new  NOMAdapter_Image<int_4> );
-  serv->RegisterClass(new Image<r_4>, new  NOMAdapter_Image<r_4> );
-  serv->RegisterClass(new Image<r_8>, new  NOMAdapter_Image<r_8> );
-
-  serv->RegisterClass(new FitsImage<uint_2>, new  NOMAdapter_Image<uint_2> );
-  serv->RegisterClass(new FitsImage<int_2>, new  NOMAdapter_Image<int_2> );
-  serv->RegisterClass(new FitsImage<int_4>, new  NOMAdapter_Image<int_4> );
-  serv->RegisterClass(new FitsImage<r_4>, new  NOMAdapter_Image<r_4> );
-
-  serv->RegisterClass(new StarList, new NOMAdapter_StarList );
-#else
   serv->RegisterClass(new LocalMap<int_4>, new NOMAdapter_PixelMap<int_4> );
   serv->RegisterClass(new SphereThetaPhi<int_4>, new NOMAdapter_PixelMap<int_4> );
@@ -159 +127 @@
 
   SophyaInitiator::RegisterModule("PIext/piapp", PIAPP_VERSIONNUMBER);
-#endif  
 }
 

trunk/SophyaPI/PIext/piinit.h

@@ -12 +12 @@
 // Classe d initialisation pour le module PIext de PEIDA
 
-#ifdef SANS_EVOLPLANCK
-class PIAppInitiator : public PeidaStarRecoInitiator {
-#else
 class PIAppInitiator : public SambaInitiator {
-#endif
 private:
   static int FgInit;

trunk/SophyaPI/PIext/pimgadapter.h

@@ -5 +5 @@
 #include "parradapter.h"
 
-#ifdef SANS_EVOLPLANCK 
-class RzImageAdapter : public P2DArrayAdapter {
-public:
-                  RzImageAdapter(RzImage* rzi, bool ad=false) :
-                    P2DArrayAdapter(rzi->XSize(), rzi->YSize())
-                    { aDel = ad; mImg = rzi; 
-                    DefineXYCoordinates(rzi->XOrg(), rzi->YOrg(), 1., 1. ); }
-
-  virtual         ~RzImageAdapter() { if (aDel) delete mImg; }
-  virtual double  Value(int ix, int iy) { return mImg->FValue(ix, iy); }
-
-protected :
-  bool aDel;
-  RzImage* mImg;
-};
-#endif
 
 template <class T> 

trunk/SophyaPI/PIext/pipodrw.cc

@@ -56 +56 @@
 
 
-#ifdef SANS_EVOLPLANCK
 
-// ----------------------------------------------------------
-// Adaptateur de vecteurs Peida++ a P1DArrayAdapter
-// ----------------------------------------------------------
-
-/* --Methode-- */
-POVectorAdapter::POVectorAdapter(Vector* v, bool ad)
-        : P1DArrayAdapter(v->NElts())
-{
-aDel = ad; mVec = v;
-}
-
-/* --Methode-- */
-POVectorAdapter::~POVectorAdapter()
-{
-if (aDel) delete mVec;
-}
-
-/* --Methode-- */
-double POVectorAdapter::Value(int i)
-{ 
-return((*mVec)(i)); 
-}
-
-------- FIN SUPPRESSION */
-
-// ----------------------------------------------------------
-// Adaptateur de matrice Peida++ a P2DArrayAdapter
-// Attention  Y: Lignes (rows)  X: Colonnes
-// ----------------------------------------------------------
-
-/* --Methode-- */
-POMatrixAdapter::POMatrixAdapter(Matrix* mtx, bool ad)
-        : P2DArrayAdapter(mtx->NCol(), mtx->NRows())
-{
-aDel = ad; mMtx = mtx;
-}
-
-/* --Methode-- */
-POMatrixAdapter::~POMatrixAdapter()
-{
-if (aDel)  delete mMtx;
-}
-
-/* --Methode-- */
-double POMatrixAdapter::Value(int ix, int iy)
-{
-// Attention MatrixAdapter(X=Colonne, Y= Row) = Matrix(row, col)  
-return((*mMtx)(iy, ix));
-}
-
-#endif   // SANS_EVOLPLANCK
-

trunk/SophyaPI/PIext/pipodrw.h

@@ -13 +13 @@
 #include "hist2err.h"
 
-#ifdef SANS_EVOLPLANCK
-class GeneralFunction;
-#else
 namespace SOPHYA {class GeneralFunction;} 
-#endif
 
 class PIGFFDrawer : public PIDrawer {
@@ -34 +30 @@
 
 
-#ifdef SANS_EVOLPLANCK
-#include "cvector.h"
-#include "matrix.h"
-
-// Adaptateur de vecteurs Peida++ a P1DArrayAdapter
-class POVectorAdapter : public P1DArrayAdapter {
-public :
-                  POVectorAdapter(Vector* v, bool ad=false);
-  virtual         ~POVectorAdapter();
-  virtual double  Value(int i);
-
-protected:
-  bool aDel;
-  Vector* mVec;
-};
-
-// Adaptateur de matrice Peida++ a P2DArrayAdapter
-// Attention MatrixAdapter(X=Colonne, Y= Row) = Matrix(row, col)  
-class POMatrixAdapter :  public P2DArrayAdapter {
-public :
-                  POMatrixAdapter(Matrix* mtx, bool ad=false);
-  virtual         ~POMatrixAdapter();
-
-  virtual double  Value(int ix, int iy);   
-
-protected:
-  bool aDel;
-  Matrix* mMtx;
-};
-
-#endif   // SANS_EVOLPLANCK
-
 #endif

trunk/SophyaPI/PIext/pisiadw.cc

@@ -244 +244 @@
 
 bool ok = true;
-#ifdef SANS_EVOLPLANCK
-TRY {
-  mPin = new PInPersist(flnm);
-}  CATCH(merr) 
-  { printf("ObjMgrWind::SetFile Exception= %ld (%s) \n", (long)merr, PeidaExc(merr)); 
-  ok = false; } ENDTRY;
-#else
 try {
   mPin = new PInPersist(flnm);
@@ -258 +251 @@
   ok = false;
   }
-#endif
 
 if (!ok) { mPin = NULL;  dap->SetReady(); return; }
 
 int nbtags = 0;
-#ifdef SANS_EVOLPLANCK
-nbtags = mPin->NbTags();
-#else 
 nbtags = mPin->NbNameTags();
-#endif
 
 if (nbtags < 1) {
@@ -282 +270 @@
 objlist->SetBorderWidth(2);
 
-
-#ifdef SANS_EVOLPLANCK
-for(i=0; i<mPin->NbTags(); i++) {
-  key = mPin->TagKey(i, cid, ln);  // $CHECK$ non-const & reference initialized to temporary, car int -> long&
-  if (ln <= 0)  nom = "?";
-  else { strncpy(noms, mPin->TagName(i).c_str(), 31);  noms[31] = '\0'; nom = noms; }
-  sprintf(strg, "%s  (T=%s, Key=%d)",  nom, dap->ObjMgr()->GetServiceObj()->PClassIdToClassName(cid), key);
-  //  sprintf(strg, "%s  (T=%s, Key=%d)",  nom, " DataObject ?", key);  Attention SANS_EVOLPLANCK
-  objlist->AppendItem(strg, 5000+i);
-}
-#else
 string tn;
 for(i=0; i<mPin->NbNameTags(); i++) {
@@ -298 +275 @@
   objlist->AppendItem(tn.c_str(), 5000+i);
 }
-#endif
 
 }

trunk/SophyaPI/PIext/pistdimgapp.cc

@@ -102 +102 @@
 m[0]->AppendItem("Open-Fits", 10120);
 m[0]->AppendItem("Open-PPF", 10130);
-#ifndef SANS_EVOLPLANCK
 m[0]->AppendItem("Open-ASCII", 10140);
-#endif
 // m[0]->AppendItem("Options", 10101);
 m[0]->AppendItem("Help", 10100);
@@ -316 +314 @@
 glst_piai = new PIAppInitiator(this);
 
-char buff[128];
 mCons->AddStr("  ............  starting piapp .............\n", PIVA_Blue );
-#ifdef SANS_EVOLPLANCK
-sprintf(buff, "Version: piapp=%g  PI=%g  PEIDA=%g \n", (double)PIAPP_VERSIONNUMBER, 
-              (double)PI_VERSIONNUMBER, (float)PeidaVersion());
-mCons->AddStr(buff, PIVA_Blue );
-#else
 string svers;
 SophyaInitiator::GetVersion(svers);
 mCons->AddStr(svers.c_str(), PIVA_Blue );
-#endif
 mCons->AddStr("  ..........................................\n", PIVA_Blue );
 // PrintPeidaVersion();
@@ -539 +530 @@
 if  ((GetState()) && (msg != mFCMsg)) { PIBeep(); return; }
 
-#ifdef SANS_EVOLPLANCK
-  TRY {
-#else
-  try {
-#endif
+try {
 
 //   Messages active-window
@@ -628 +615 @@
   mCons->AddChar('\n', PIVA_Def, true);
   SetBusy();
-#ifdef SANS_EVOLPLANCK
-  TRY {
-    mCmd->Interpret(s);
-    }  CATCH(merr) { 
-    fflush(stdout); 
-    cout << endl; 
-    cerr << endl;
-    string es = PeidaExc(merr);
-    cerr << "PIStdImgApp::Process()/ Cmd->Do() Exception :" << es << " (" << merr << ")" << endl ;
-    }
-#else
   try {
     //    mCmd->Interpret(s);
@@ -655 +631 @@
   }
 
-#endif
   SetReady();
   }
@@ -662 +637 @@
             (int)tmsg,(int)msg,(int)smm);
 
-#ifdef SANS_EVOLPLANCK
-}  CATCH(merr) { 
-  fflush(stdout); 
-  cout << endl; 
-  cerr << endl;
-  string es = PeidaExc(merr);
-  cerr << "PIStdImgApp::Process()/  Exception :" << es << " (" << merr << ")" << endl ;
-  SetReady();
-  }
-#else
   }
   catch ( PThrowable & exc ) {
@@ -690 +655 @@
   }
 
-#endif
 
 return;
@@ -1781 +1745 @@
 void PIStdImgApp::CatchSignals(bool fgfpe, bool fgsegv)
 {    
-#ifdef SANS_EVOLPLANCK
-PeidaConfigureSignalhandling(fgfpe, fgsegv, true, true);  
-#else
 // On active aussi SIGUSR1 pour stopthr
 SophyaConfigureSignalhandling(fgfpe, fgsegv, true, true);  
-#endif
 m[5]->SetStateMsg(10603, fgfpe);
 m[5]->SetStateMsg(10604, fgsegv);
@@ -1953 +1913 @@
       break;
         
-#ifndef SANS_EVOLPLANCK
     case 10140 :
       pfc_ascii->AcceptNewFile(false);
@@ -1988 +1947 @@
       SetReady();
       break;
-#endif
 
     case 10105:
@@ -2396 +2354 @@
 string info = "piapp : Interactive analysis program\n";
 char buff[128];
-#ifdef SANS_EVOLPLANCK
-sprintf(buff, "Version: piapp=%g  PI=%g  PEIDA=%g \n", (double)PIAPP_VERSIONNUMBER, 
-              (double)PI_VERSIONNUMBER, (float)PeidaVersion());
-info += buff;
-#else
+
 string svers;
 SophyaInitiator::GetVersion(svers);
@@ -2407 +2361 @@
         (double)PIAPP_VERSIONNUMBER);
 info += buff; 
-#endif
-info += "(C) LAL-IN2P3/CNRS  1996-2006\n";
-info += "(C) SPP-DAPNIA/CEA 1996-2006\n";
-#ifndef SANS_EVOLPLANCK
- info += "Check http://www.sophya.org for more information";
-#endif
+
+info += "(C) LAL-IN2P3/CNRS  1996-2009\n";
+info += "(C) SPP-DAPNIA/CEA 1996-2009\n";
+info += "Check http://www.sophya.org for more information";
+
 infow_txt->SetText(info);
 }

trunk/SophyaPI/PIext/servnobjm.cc

@@ -20 +20 @@
 #include "fct2dfit.h"
 
-#ifdef SANS_EVOLPLANCK
-#include "matrix.h"
-#include "cvector.h"
-#else
 #include "tmatrix.h"
 #include "tvector.h"
 #include "matharr.h"
 #include "pitvmaad.h"
-#endif
 
 #include "ntuple.h"
@@ -70 +65 @@
 ObjAdaptList::iterator it;
 for(it = objadaplist.begin(); it != objadaplist.end(); it++) 
-#ifdef SANS_EVOLPLANCK
-    if (typeid(*o) == typeid(*((*it).obj)))  THROW(dupIdErr);
-#else
-    if (typeid(*o) == typeid(*((*it).obj)))  
+  if (typeid(*o) == typeid(*((*it).obj)))  
      throw(DuplicateIdExc("Services2NObjMgr::RegisterClass() - Duplicate class"));
-#endif
+
 dataobj_adapter oba;
 oba.obj = o;
@@ -215 +207 @@
   for(k=0; k<np; k++) { xx = xmin+dx*k; (*vpy)(k) = f(xx); }
 } 
-#ifdef SANS_EVOLPLANCK
-CATCH(merr) {
-  fflush(stdout); 
-  cout << endl; 
-  cerr << endl;
-  string es = PeidaExc(merr);
-  cerr << "Services2NObjMgr::PlotFunc()  Exception :" << merr << es;
-  delete vpy;
-  vpy = NULL;
-  } ENDTRY;
-#else
 catch ( PException exc ) {
   fflush(stdout); 
@@ -234 +215 @@
   vpy = NULL;
 }
-#endif
 
 if (vpy) {
@@ -286 +266 @@
   }
 }
-#ifdef SANS_EVOLPLANCK
-CATCH(merr) {
-  fflush(stdout); 
-  cout << endl; 
-  cerr << endl;
-  string es = PeidaExc(merr);
-  cerr << "Services2NObjMgr::PlotFunc2D()  Exception :" << merr << es;
-  delete mtx;  mtx = NULL;
-  } ENDTRY;
-#else
 catch ( PException exc ) {
   fflush(stdout); 
@@ -303 +273 @@
   delete mtx;  mtx = NULL;
 }
-#endif
 
 if (mtx) {
@@ -348 +317 @@
  DVList::ValList::const_iterator it;
  for(it = varlist.Begin(); it != varlist.End(); it++) {
-#ifdef SANS_EVOLPLANCK
-   MuTyV mtv = (*it).second;
-   double value = (double)(mtv);
-#else
    double value = (double)((*it).second.elval);
-#endif
    string name_var = (*it).first;
    fprintf(fip,"double %s = %.17f;\n",name_var.c_str(),value);
@@ -408 +372 @@
 
 // Creation NTuple 
-char* ntn[4] = {"expx","expy","expex","expey",};
+const char* ntn[4] = {"expx","expy","expex","expey",};
 NTuple* nt = NULL;
 bool haserr = false;
@@ -447 +411 @@
 if (!mImgapp)  return; 
 
-char* ntn[3] = {"expx","expy","expz"};
+const char* ntn[3] = {"expx","expy","expz"};
 NTuple* nt = new NTuple(3,ntn);  // Creation NTuple
 
@@ -486 +450 @@
 if (!mImgapp)  return; 
 
-char* ntn[3] = {"expx","expy","expw"};
+const char* ntn[3] = {"expx","expy","expw"};
 NTuple* nt = new NTuple(3,ntn);  // Creation NTuple
 
@@ -520 +484 @@
 if (!mImgapp)  return; 
 
-char* ntn[4] = {"expx","expy","expz","expw"};
+const char* ntn[4] = {"expx","expy","expz","expw"};
 NTuple* nt = new NTuple(4,ntn);  // Creation NTuple
 
@@ -571 +535 @@
   // Pas de remise a zero ! h1->Zero();
 } else {
-  char* ntn[2]= {"hxval", "hwt"};
+  const char* ntn[2]= {"hxval", "hwt"};
   nt = new NTuple(2,ntn);  // Creation NTuple 
 }
@@ -624 +588 @@
   // Pas de remise a zero ! h2->Zero();
 } else {
-  char* ntn[3]= {"hxval", "hyval", "hwt"};
+  const char* ntn[3]= {"hxval", "hyval", "hwt"};
   nt = new NTuple(3,ntn);  // Creation NTuple 
 }
@@ -688 +652 @@
   hp_already_exist = true;
 } else {
-  char* ntn[3]= {"hxval", "hyval", "hwt"};
+  const char* ntn[3]= {"hxval", "hyval", "hwt"};
   nt = new NTuple(3,ntn);  // Creation NTuple 
 }
@@ -741 +705 @@
   }
 
-char* ntn[2]= {"vi", "vv"};
+const char* ntn[2]= {"vi", "vv"};
 NTuple* nt = new NTuple(2,ntn);  // Creation NTuple 
 
@@ -790 +754 @@
   }
 
-char* ntn[3]= {"mi", "mj", "mv"};
+const char* ntn[3]= {"mi", "mj", "mv"};
 NTuple* nt = new NTuple(3,ntn);  // Creation NTuple 
 
@@ -836 +800 @@
 // if (nomvec.length() < 1) nomvec = "/tmp/expvec";
 
-char* ntn[2]= {"vecval", "vecwt"};
+const char* ntn[2]= {"vecval", "vecwt"};
 nt = new NTuple(1,ntn);  // Creation NTuple
  
@@ -933 +897 @@
   }  
 if (nt == NULL) {
-  char* ntn[4]= {"x", "y","z","t"};
+  const char* ntn[4]= {"x", "y","z","t"};
   nt = new NTuple(4,ntn);  // Creation NTuple 
   fgnnt = true;
@@ -987 +951 @@
     }  
   if (nt == NULL) {
-    char* ntn[4]= {"x", "y","z","t"};
+    const char* ntn[4]= {"x", "y","z","t"};
     nt = new NTuple(4,ntn);  // Creation NTuple 
     fgnnt = true;
@@ -1016 +980 @@
     }
  }
-#ifdef SANS_EVOLPLANCK
-CATCH(merr) {
-  fflush(stdout); 
-  cout << endl; 
-  cerr << endl;
-  string es = PeidaExc(merr);
-  cerr << "Services2NObjMgr::FillNTFrCFile()  Exception :" << merr << es;
-  } ENDTRY;
-#else
 catch ( PException exc ) {
   fflush(stdout); 
@@ -1031 +986 @@
   cerr << "Services2NObjMgr::FillNTFrCFile()  Exception :" << exc.Msg() << endl; 
 }
-#endif
 
 if (adel) delete objnt;   // Delete de l'objet NTupleInterface si necessaire
@@ -1154 +1108 @@
 
 // Creation NTuple Buffer
-char* ntn[4]= {"x","y","f","e"};
+const char* ntn[4]= {"x","y","f","e"};
 NTuple*nt = new NTuple(4,ntn);
 
@@ -1301 +1255 @@
     }
  }
-#ifdef SANS_EVOLPLANCK
-CATCH(merr) {
-  fflush(stdout); 
-  cout << endl; 
-  cerr << endl;
-  string es = PeidaExc(merr);
-  cerr << "Services2NObjMgr::ComputeExpressions()  Exception :" << merr << es;
-  } ENDTRY;
-#else
 catch ( PException exc ) {
   fflush(stdout); 
@@ -1316 +1261 @@
   cerr << "Services2NObjMgr::ComputeExpressions()  Exception :" << exc.Msg() << endl; 
 }
-#endif
 
 if (adel) delete objnt;  // Delete de l'objet NTupleInterface si necessaire
@@ -1473 +1417 @@
 
 
-
-
-// SANS_EVOLPLANCK     Attention !
-#ifdef SANS_EVOLPLANCK
-#include "pclassids.h"
-
-/* --Methode-- */
-char* Services2NObjMgr::PClassIdToClassName(int cid)
-{
-switch (cid) {
-  case ClassId_Poly1 : 
-    return("Poly1");
-  case ClassId_Poly2 : 
-    return("Poly2");
-  case ClassId_Matrix : 
-    return("Matrix");
-  case ClassId_Vector : 
-    return("Vector");
-
-  case ClassId_DVList : 
-    return("DVList");
-
-  case ClassId_Histo1D : 
-    return("Histo1D");
-  case ClassId_Histo2D : 
-    return("Histo2D");
-  case ClassId_HProf : 
-    return("HProf");
-  case ClassId_HistoErr : 
-    return("HistoErr");
-  case ClassId_NTuple : 
-    return("NTuple");
-  case ClassId_XNTuple : 
-    return("XNTuple");
-  case ClassId_GeneralFitData : 
-    return("GeneralFitData");
-
-  case ClassId_Image : 
-    return("RzImage");
-  case ClassId_Image + kuint_1 : 
-    return("ImageU1");
-  case ClassId_Image + kint_1 : 
-    return("ImageI1");
-  case ClassId_Image + kuint_2 : 
-    return("ImageU2");
-  case ClassId_Image + kint_2 : 
-    return("ImageI2");
-  case ClassId_Image + kuint_4 : 
-    return("ImageU4");
-  case ClassId_Image + kint_4 : 
-    return("ImageI4");
-  case ClassId_Image + kr_4 : 
-    return("ImageR4");
-  case ClassId_Image + kr_8 : 
-    return("ImageR8");
-  case ClassId_ZFidu : 
-    return("ZFidu");
-
-  case ClassId_StarList : 
-    return("StarList");
-  case ClassId_Transfo : 
-    return("Transfo");
-  case ClassId_PSF : 
-    return("PSF");
-
-
-// - Ajout objet PPF
-  default:
+const char* Services2NObjMgr::PClassIdToClassName(int cid)
+{
     return("AnyDataObj");
-  }
-}  
-
-#else
-char* Services2NObjMgr::PClassIdToClassName(int cid)
-{
-    return("AnyDataObj");
-}
-#endif
+}

trunk/SophyaPI/PIext/servnobjm.h

@@ -20 +20 @@
 #include "zthread.h"
 
-#ifdef SANS_EVOLPLANCK
-class NTuple;
-class Histo;
-class Histo2D;
-class HProf;
-#else
 namespace SOPHYA { 
 class NTuple;
@@ -32 +26 @@
 class HProf;
 }
-#endif
 
 class PIStdImgApp;
@@ -127 +120 @@
   static void   DecodeLoopParameters(string& loop, int_8& i1, int_8& i2, int_8& di);
   string        FileName2Name(string const & fn);
-  char*         PClassIdToClassName(int cid);
+  const char*   PClassIdToClassName(int cid);
 
 protected:

trunk/SophyaPI/PIext/smakefile

@@ -4 +4 @@
  
 clean:
-         rm -f $(SOPHYAOBJP)basexecut.o $(SOPHYAOBJP)contmodex.o $(SOPHYAOBJP)cxxexecutor.o $(SOPHYAOBJP)cxxexecwin.o $(SOPHYAOBJP)flowmodex.o $(SOPHYAOBJP)graphexecut.o $(SOPHYAOBJP)nobjmgr.o $(SOPHYAOBJP)nomdvladapter.o $(SOPHYAOBJP)nomgadapter.o $(SOPHYAOBJP)nomgfdadapter.o $(SOPHYAOBJP)nomherradapter.o $(SOPHYAOBJP)nomhistadapter.o $(SOPHYAOBJP)nomimagadapter.o $(SOPHYAOBJP)nommatvecadapter.o $(SOPHYAOBJP)nomskymapadapter.o $(SOPHYAOBJP)nomspecrespadapter.o $(SOPHYAOBJP)nomstladapter.o $(SOPHYAOBJP)nomtarradapter.o $(SOPHYAOBJP)nomtmatvecadapter.o $(SOPHYAOBJP)pawexecut.o $(SOPHYAOBJP)pi2dvec.o $(SOPHYAOBJP)piacmd.o $(SOPHYAOBJP)piafitting.o $(SOPHYAOBJP)pigfd1.o $(SOPHYAOBJP)pigfd2.o $(SOPHYAOBJP)pihisto.o $(SOPHYAOBJP)pihisto2d.o $(SOPHYAOBJP)piinit.o $(SOPHYAOBJP)pintup3d.o $(SOPHYAOBJP)pintuple.o $(SOPHYAOBJP)pipodrw.o $(SOPHYAOBJP)pisiadw.o $(SOPHYAOBJP)pistdimgapp.o $(SOPHYAOBJP)pistlist.o $(SOPHYAOBJP)pitvmaad.o $(SOPHYAOBJP)servnobjm.o $(SOPHYAOBJP)userfitfunex.o
+         rm -f $(SOPHYAOBJP)basexecut.o $(SOPHYAOBJP)contmodex.o $(SOPHYAOBJP)cxxexecutor.o $(SOPHYAOBJP)cxxexecwin.o $(SOPHYAOBJP)flowmodex.o $(SOPHYAOBJP)graphexecut.o $(SOPHYAOBJP)nobjmgr.o $(SOPHYAOBJP)nomdvladapter.o $(SOPHYAOBJP)nomgadapter.o $(SOPHYAOBJP)nomgfdadapter.o $(SOPHYAOBJP)nomherradapter.o $(SOPHYAOBJP)nomhistadapter.o $(SOPHYAOBJP)nomimagadapter.o $(SOPHYAOBJP)nomskymapadapter.o $(SOPHYAOBJP)nomspecrespadapter.o $(SOPHYAOBJP)nomtarradapter.o $(SOPHYAOBJP)nomtmatvecadapter.o $(SOPHYAOBJP)pawexecut.o $(SOPHYAOBJP)pi2dvec.o $(SOPHYAOBJP)piacmd.o $(SOPHYAOBJP)piafitting.o $(SOPHYAOBJP)pigfd1.o $(SOPHYAOBJP)pigfd2.o $(SOPHYAOBJP)pihisto.o $(SOPHYAOBJP)pihisto2d.o $(SOPHYAOBJP)piinit.o $(SOPHYAOBJP)pintup3d.o $(SOPHYAOBJP)pintuple.o $(SOPHYAOBJP)pipodrw.o $(SOPHYAOBJP)pisiadw.o $(SOPHYAOBJP)pistdimgapp.o $(SOPHYAOBJP)pistlist.o $(SOPHYAOBJP)pitvmaad.o $(SOPHYAOBJP)servnobjm.o $(SOPHYAOBJP)userfitfunex.o
         rm -f $(SOPHYALIBP)libPIext.a
  
@@ -42 +42 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
@@ -163 +164 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
@@ -278 +280 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -388 +391 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
@@ -474 +478 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
@@ -582 +587 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
@@ -690 +696 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -800 +807 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -861 +869 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -921 +930 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -990 +1000 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -1087 +1098 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -1131 +1143 @@
   $(SOPHYAINCP)hisprof.h \
   $(SOPHYAINCP)ntuple.h \
-  $(SOPHYAINCP)xntuple.h \
   $(SOPHYAINCP)basedtable.h \
   $(SOPHYAINCP)segdatablock.h \
@@ -1196 +1207 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -1265 +1277 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -1348 +1361 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -1413 +1427 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -1511 +1526 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -1594 +1610 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -1701 +1718 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
@@ -1798 +1816 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
@@ -1938 +1957 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -2003 +2023 @@
   $(SOPHYAINCP)pitherm.h \
   $(SOPHYAINCP)resusage.h nomhistadapter.h \
-  $(SOPHYAINCP)xntuple.h \
   $(SOPHYAINCP)basedtable.h \
   $(SOPHYAINCP)segdatablock.h \
@@ -2046 +2065 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -2098 +2118 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -2125 +2146 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -2154 +2176 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
@@ -2212 +2235 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
@@ -2309 +2333 @@
   $(SOPHYAINCP)hisprof.h \
   $(SOPHYAINCP)ntuple.h \
-  $(SOPHYAINCP)xntuple.h \
   $(SOPHYAINCP)basedtable.h \
   $(SOPHYAINCP)segdatablock.h \
@@ -2358 +2381 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -2386 +2410 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -2412 +2437 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -2479 +2505 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
@@ -2592 +2619 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
@@ -2673 +2701 @@
   $(SOPHYAINCP)machdefs.h \
   $(SOPHYAINCP)lut.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)tmatrix.h \
   $(SOPHYAINCP)tarray.h \
@@ -2721 +2750 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \

trunk/SophyaPI/ProgPI/Makefile

@@ -43 +43 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -85 +86 @@
   $(SOPHYAINCP)pimenux.h \
   $(SOPHYAINCP)pimenugen.h \
-  $(SOPHYAINCP)picons.h \
-  $(SOPHYAINCP)pistdwdgx.h \
-  $(SOPHYAINCP)pistdwdggen.h \
-  $(SOPHYAINCP)pibwdgx.h \
-  $(SOPHYAINCP)pigraphps.h \
+  $(SOPHYAINCP)piconsenum.h \
   $(SOPHYAINCP)piwindowx.h \
   $(SOPHYAINCP)piwindowgen.h \
   $(SOPHYAINCP)pioptmenux.h \
   $(SOPHYAINCP)pioptmenugen.h \
+  $(SOPHYAINCP)pistdwdgx.h \
+  $(SOPHYAINCP)pistdwdggen.h \
   $(SOPHYAINCP)pifilechox.h \
   $(SOPHYAINCP)pifilechogen.h \
   $(SOPHYAINCP)piperiodx.h \
   $(SOPHYAINCP)periodic.h \
+  $(SOPHYAINCP)picons.h \
+  $(SOPHYAINCP)pibwdgx.h \
+  $(SOPHYAINCP)pigraphps.h \
   $(SOPHYAINCP)piimage.h \
   $(SOPHYAINCP)pieldrw.h \
@@ -124 +126 @@
   $(SOPHYAINCP)hisprof.h \
   $(SOPHYAINCP)ntuple.h \
-  $(SOPHYAINCP)xntuple.h \
   $(SOPHYAINCP)basedtable.h \
   $(SOPHYAINCP)segdatablock.h \
@@ -155 +156 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
   $(SOPHYAINCP)pimenux.h \
   $(SOPHYAINCP)pimenugen.h \
-  $(SOPHYAINCP)picons.h \
+  $(SOPHYAINCP)piconsenum.h \
+  $(SOPHYAINCP)piwindowx.h \
+  $(SOPHYAINCP)piwindowgen.h \
+  $(SOPHYAINCP)pioptmenux.h \
+  $(SOPHYAINCP)pioptmenugen.h \
   $(SOPHYAINCP)pistdwdgx.h \
   $(SOPHYAINCP)pistdwdggen.h \
+  $(SOPHYAINCP)pifilechox.h \
+  $(SOPHYAINCP)pifilechogen.h \
+  $(SOPHYAINCP)piperiodx.h \
+  $(SOPHYAINCP)periodic.h \
+  $(SOPHYAINCP)picons.h \
   $(SOPHYAINCP)pibwdgx.h \
   $(SOPHYAINCP)pibwdggen.h \
@@ -177 +188 @@
   $(SOPHYAINCP)psfile.h \
   $(SOPHYAINCP)pigraphps.h \
-  $(SOPHYAINCP)piwindowx.h \
-  $(SOPHYAINCP)piwindowgen.h \
-  $(SOPHYAINCP)pioptmenux.h \
-  $(SOPHYAINCP)pioptmenugen.h \
-  $(SOPHYAINCP)pifilechox.h \
-  $(SOPHYAINCP)pifilechogen.h \
-  $(SOPHYAINCP)piperiodx.h \
-  $(SOPHYAINCP)periodic.h \
   $(SOPHYAINCP)piimage.h \
   $(SOPHYAINCP)parradapter.h \
@@ -235 +238 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
   $(SOPHYAINCP)pimenux.h \
   $(SOPHYAINCP)pimenugen.h \
-  $(SOPHYAINCP)picons.h \
+  $(SOPHYAINCP)piconsenum.h \
+  $(SOPHYAINCP)piwindowx.h \
+  $(SOPHYAINCP)piwindowgen.h \
+  $(SOPHYAINCP)pioptmenux.h \
+  $(SOPHYAINCP)pioptmenugen.h \
   $(SOPHYAINCP)pistdwdgx.h \
   $(SOPHYAINCP)pistdwdggen.h \
+  $(SOPHYAINCP)pifilechox.h \
+  $(SOPHYAINCP)pifilechogen.h \
+  $(SOPHYAINCP)piperiodx.h \
+  $(SOPHYAINCP)periodic.h \
+  $(SOPHYAINCP)picons.h \
   $(SOPHYAINCP)pibwdgx.h \
   $(SOPHYAINCP)pibwdggen.h \
@@ -257 +270 @@
   $(SOPHYAINCP)psfile.h \
   $(SOPHYAINCP)pigraphps.h \
-  $(SOPHYAINCP)piwindowx.h \
-  $(SOPHYAINCP)piwindowgen.h \
-  $(SOPHYAINCP)pioptmenux.h \
-  $(SOPHYAINCP)pioptmenugen.h \
-  $(SOPHYAINCP)pifilechox.h \
-  $(SOPHYAINCP)pifilechogen.h \
-  $(SOPHYAINCP)piperiodx.h \
-  $(SOPHYAINCP)periodic.h \
   $(SOPHYAINCP)piimage.h \
   $(SOPHYAINCP)parradapter.h \
@@ -311 +316 @@
   $(SOPHYAINCP)ntoolsinit.h \
   $(SOPHYAINCP)tarrinit.h \
-  $(SOPHYAINCP)sophyainit.h \
-  $(SOPHYAINCP)xntuple.h \
-  $(SOPHYAINCP)ntupintf.h
+  $(SOPHYAINCP)sophyainit.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piapp.cc
  
@@ -348 +351 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
   $(SOPHYAINCP)pimenux.h \
   $(SOPHYAINCP)pimenugen.h \
-  $(SOPHYAINCP)picons.h \
+  $(SOPHYAINCP)piconsenum.h \
+  $(SOPHYAINCP)piwindowx.h \
+  $(SOPHYAINCP)piwindowgen.h \
+  $(SOPHYAINCP)pioptmenux.h \
+  $(SOPHYAINCP)pioptmenugen.h \
   $(SOPHYAINCP)pistdwdgx.h \
   $(SOPHYAINCP)pistdwdggen.h \
+  $(SOPHYAINCP)pifilechox.h \
+  $(SOPHYAINCP)pifilechogen.h \
+  $(SOPHYAINCP)piperiodx.h \
+  $(SOPHYAINCP)periodic.h \
+  $(SOPHYAINCP)picons.h \
   $(SOPHYAINCP)pibwdgx.h \
   $(SOPHYAINCP)pibwdggen.h \
@@ -370 +383 @@
   $(SOPHYAINCP)psfile.h \
   $(SOPHYAINCP)pigraphps.h \
-  $(SOPHYAINCP)piwindowx.h \
-  $(SOPHYAINCP)piwindowgen.h \
-  $(SOPHYAINCP)pioptmenux.h \
-  $(SOPHYAINCP)pioptmenugen.h \
-  $(SOPHYAINCP)pifilechox.h \
-  $(SOPHYAINCP)pifilechogen.h \
-  $(SOPHYAINCP)piperiodx.h \
-  $(SOPHYAINCP)periodic.h \
   $(SOPHYAINCP)piimage.h \
   $(SOPHYAINCP)parradapter.h \
@@ -438 +443 @@
   $(SOPHYAINCP)fftservintf.h \
   $(SOPHYAINCP)fftpserver.h \
+  $(SOPHYAINCP)stsrand.h \
   $(SOPHYAINCP)alm.h \
-  $(SOPHYAINCP)srandgen.h \
   $(SOPHYAINCP)nbmath.h \
   $(SOPHYAINCP)triangmtx.h \
@@ -477 +482 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
   $(SOPHYAINCP)pimenux.h \
   $(SOPHYAINCP)pimenugen.h \
-  $(SOPHYAINCP)picons.h \
+  $(SOPHYAINCP)piconsenum.h \
+  $(SOPHYAINCP)piwindowx.h \
+  $(SOPHYAINCP)piwindowgen.h \
+  $(SOPHYAINCP)pioptmenux.h \
+  $(SOPHYAINCP)pioptmenugen.h \
   $(SOPHYAINCP)pistdwdgx.h \
   $(SOPHYAINCP)pistdwdggen.h \
+  $(SOPHYAINCP)pifilechox.h \
+  $(SOPHYAINCP)pifilechogen.h \
+  $(SOPHYAINCP)piperiodx.h \
+  $(SOPHYAINCP)periodic.h \
+  $(SOPHYAINCP)picons.h \
   $(SOPHYAINCP)pibwdgx.h \
   $(SOPHYAINCP)pibwdggen.h \
@@ -499 +514 @@
   $(SOPHYAINCP)psfile.h \
   $(SOPHYAINCP)pigraphps.h \
-  $(SOPHYAINCP)piwindowx.h \
-  $(SOPHYAINCP)piwindowgen.h \
-  $(SOPHYAINCP)pioptmenux.h \
-  $(SOPHYAINCP)pioptmenugen.h \
-  $(SOPHYAINCP)pifilechox.h \
-  $(SOPHYAINCP)pifilechogen.h \
-  $(SOPHYAINCP)piperiodx.h \
-  $(SOPHYAINCP)periodic.h \
   $(SOPHYAINCP)piimage.h \
   $(SOPHYAINCP)parradapter.h \
@@ -597 +604 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
   $(SOPHYAINCP)pimenux.h \
   $(SOPHYAINCP)pimenugen.h \
-  $(SOPHYAINCP)picons.h \
+  $(SOPHYAINCP)piconsenum.h \
+  $(SOPHYAINCP)piwindowx.h \
+  $(SOPHYAINCP)piwindowgen.h \
+  $(SOPHYAINCP)pioptmenux.h \
+  $(SOPHYAINCP)pioptmenugen.h \
   $(SOPHYAINCP)pistdwdgx.h \
   $(SOPHYAINCP)pistdwdggen.h \
+  $(SOPHYAINCP)pifilechox.h \
+  $(SOPHYAINCP)pifilechogen.h \
+  $(SOPHYAINCP)piperiodx.h \
+  $(SOPHYAINCP)periodic.h \
+  $(SOPHYAINCP)picons.h \
   $(SOPHYAINCP)pibwdgx.h \
   $(SOPHYAINCP)pibwdggen.h \
@@ -619 +636 @@
   $(SOPHYAINCP)psfile.h \
   $(SOPHYAINCP)pigraphps.h \
-  $(SOPHYAINCP)piwindowx.h \
-  $(SOPHYAINCP)piwindowgen.h \
-  $(SOPHYAINCP)pioptmenux.h \
-  $(SOPHYAINCP)pioptmenugen.h \
-  $(SOPHYAINCP)pifilechox.h \
-  $(SOPHYAINCP)pifilechogen.h \
-  $(SOPHYAINCP)piperiodx.h \
-  $(SOPHYAINCP)periodic.h \
   $(SOPHYAINCP)piimage.h \
   $(SOPHYAINCP)parradapter.h \

trunk/SophyaPI/ProgPI/makefile_wgrdl

@@ -294 +294 @@
   $(SOPHYAINCP)tarrinit.h \
   $(SOPHYAINCP)sophyainit.h \
-  $(SOPHYAINCP)xntuple.h \
   $(SOPHYAINCP)ntupintf.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piapp.cc

trunk/SophyaPI/ProgPI/piapp.cc

@@ -13 +13 @@
 #include "timing.h"
 #include "skyinit.h"
-
-#include "xntuple.h" // Pour faire le SetTmpDir()
 
 
@@ -177 +175 @@
 }
 
-char* tmpde = getenv("TMPDIR");
+const char* tmpde = getenv("TMPDIR");
 char  tmpdname[32];
 if (tmpde == NULL) tmpde = "./";
@@ -198 +196 @@
 }
 
-cout << "  NamedObjMgr::SetTmpDir()+XNTuple::SetSwapPath() " << tmpdir << endl;
+cout << "  NamedObjMgr::SetTmpDir() " << tmpdir << endl;
 app->ObjMgr()->SetTmpDir(tmpdir);
-XNTuple::SetSwapPath(const_cast<char *>(tmpdir.c_str()));
 
 // Gestion de redirection stdout/err et Signaux

trunk/SophyaPI/ProgPI/skymapmodule.cc

@@ -1410 +1410 @@
  
  const int ndim = 8;
- char *nament[ndim] =
+ const char *nament[ndim] =
    {"l","n","clmean","cllin","clpar","sclmean","scllin","sclpar"};
  NTuple clbin(ndim,nament);

trunk/SophyaPI/ProgPI/smakefile

@@ -43 +43 @@
   $(SOPHYAINCP)pimsghandler.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)picmap.h \
   $(SOPHYAINCP)picmapx.h \
@@ -125 +126 @@
   $(SOPHYAINCP)hisprof.h \
   $(SOPHYAINCP)ntuple.h \
-  $(SOPHYAINCP)xntuple.h \
   $(SOPHYAINCP)basedtable.h \
   $(SOPHYAINCP)segdatablock.h \
@@ -156 +156 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
@@ -237 +238 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
@@ -314 +316 @@
   $(SOPHYAINCP)ntoolsinit.h \
   $(SOPHYAINCP)tarrinit.h \
-  $(SOPHYAINCP)sophyainit.h \
-  $(SOPHYAINCP)xntuple.h \
-  $(SOPHYAINCP)ntupintf.h
+  $(SOPHYAINCP)sophyainit.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piapp.cc
  
@@ -351 +351 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
@@ -442 +443 @@
   $(SOPHYAINCP)fftservintf.h \
   $(SOPHYAINCP)fftpserver.h \
+  $(SOPHYAINCP)stsrand.h \
   $(SOPHYAINCP)alm.h \
-  $(SOPHYAINCP)srandgen.h \
   $(SOPHYAINCP)nbmath.h \
   $(SOPHYAINCP)triangmtx.h \
@@ -481 +482 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \
@@ -602 +604 @@
   $(SOPHYAINCP)piwdggen.h \
   $(SOPHYAINCP)picolist.h \
+  $(SOPHYAINCP)pipixutils.h \
   $(SOPHYAINCP)pimenubarx.h \
   $(SOPHYAINCP)pimenubargen.h \

trunk/SophyaPI/ProgPI/smakefile_wgrdl

@@ -294 +294 @@
   $(SOPHYAINCP)tarrinit.h \
   $(SOPHYAINCP)sophyainit.h \
-  $(SOPHYAINCP)xntuple.h \
   $(SOPHYAINCP)ntupintf.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piapp.cc