Index: /trunk/SophyaPI/PI/Makefile
===================================================================
--- /trunk/SophyaPI/PI/Makefile	(revision 4076)
+++ /trunk/SophyaPI/PI/Makefile	(revision 4077)
@@ -4,607 +4,503 @@
  
 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)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
  
-$(SOPHYALIBP)libPI.a : $(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)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)piscdrawwdg.o $(SOPHYAOBJP)pistdwdggen.o $(SOPHYAOBJP)pistdwdgx.o $(SOPHYAOBJP)pistzwin.o $(SOPHYAOBJP)pisurfdr.o $(SOPHYAOBJP)pitherm.o $(SOPHYAOBJP)pitxtdrw.o $(SOPHYAOBJP)piwdggen.o $(SOPHYAOBJP)piwdgx.o $(SOPHYAOBJP)piwindowgen.o $(SOPHYAOBJP)piwindowx.o $(SOPHYAOBJP)pixtbase.o $(SOPHYAOBJP)piyfxdrw.o $(SOPHYAOBJP)psfile.o
+$(SOPHYALIBP)libPI.a : $(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)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)piscdrawwdg.o $(SOPHYAOBJP)pistdwdggen.o $(SOPHYAOBJP)pistdwdgx.o $(SOPHYAOBJP)pistzwin.o $(SOPHYAOBJP)pisurfdr.o $(SOPHYAOBJP)pitherm.o $(SOPHYAOBJP)pitxtdrw.o $(SOPHYAOBJP)piwdggen.o $(SOPHYAOBJP)piwdgx.o $(SOPHYAOBJP)piwindowgen.o $(SOPHYAOBJP)piwindowx.o $(SOPHYAOBJP)pixtbase.o $(SOPHYAOBJP)piyfxdrw.o $(SOPHYAOBJP)psfile.o
 	$(AR) $(ARFLAGS) $@ $? 
 	touch $(SOPHYAINCP)/SophyaConfInfo/libPI.objlist
  
-$(SOPHYAOBJP)lut.o: lut.cc \
-  $(SOPHYAINCP)sopnamsp.h \
+$(SOPHYAOBJP)lut.o: lut.cc $(SOPHYAINCP)sopnamsp.h \
   $(SOPHYAINCP)machdefs.h lut.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  lut.cc
  
 $(SOPHYAOBJP)parradapter.o: parradapter.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  $(SOPHYAINCP)nbtri.h \
-  $(SOPHYAINCP)machdefs.h \
-  parradapter.h \
-  $(SOPHYAINCP)machdefs.h lut.h \
-  pipixutils.h
+  $(SOPHYAINCP)sopnamsp.h parradapter.h \
+  $(SOPHYAINCP)machdefs.h lut.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  parradapter.cc
  
-$(SOPHYAOBJP)pi3ddrw.o: pi3ddrw.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  pi3ddrw.h pisysdep.h \
-  $(SOPHYAINCP)machdefs.h \
+$(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 \
-  pipixutils.h picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.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 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 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 \
   pimenugen.h pioptmenux.h pioptmenugen.h piwindowx.h piwindowgen.h \
   picontainerx.h picontainergen.h piapplx.h piapplgen.h pimenubarx.h \
-  pimenubargen.h piconsenum.h
+  pimenubargen.h picons.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pi3dwdg.cc
  
-$(SOPHYAOBJP)piapplgen.o: piapplgen.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 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 $@  piapplgen.cc
+ 
+$(SOPHYAOBJP)piapplx.o: piapplx.cc $(SOPHYAINCP)sopnamsp.h \
+  piapplx.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 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 pigratt.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 pigratt.h \
+  piaxestools.h pistdwdgx.h pistdwdggen.h pioptmenux.h pioptmenugen.h \
+  pimenux.h pimenugen.h piwindowx.h piwindowgen.h picontainerx.h \
+  picontainergen.h piapplx.h piapplgen.h pimenubarx.h pimenubargen.h \
+  picons.h pibwdgx.h pibwdggen.h pigraphx.h pievthandler.h psfile.h \
+  pigraphps.h piscdrawwdg.h pidrawer.h pieldrw.h
+	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piaxestools.cc
+ 
+$(SOPHYAOBJP)pibargraph.o: pibargraph.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 \
+  $(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 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 pigraphuc.h pievthandler.h psfile.h pigratt.h piaxes.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piapplgen.cc
- 
-$(SOPHYAOBJP)piapplx.o: piapplx.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  piapplx.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 picons.h pistdwdgx.h pistdwdggen.h pibwdgx.h \
+  pilineatt.h pigraphuc.h pievthandler.h psfile.h pidrawer.h pigratt.h \
+  piaxes.h pigraphps.h pidrwtools.h pistdwdgx.h pistdwdggen.h pimenux.h \
+  pimenugen.h pioptmenux.h pioptmenugen.h piwindowx.h piwindowgen.h \
+  picontainerx.h picontainergen.h piapplx.h piapplgen.h pimenubarx.h \
+  pimenubargen.h picons.h pibwdgx.h
+	$(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 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 $@  pibwdgx.cc
+ 
+$(SOPHYAOBJP)picmap.o: picmap.cc $(SOPHYAINCP)sopnamsp.h \
+  picmap.h pisysdep.h $(SOPHYAINCP)machdefs.h \
+  picmapx.h picmapgen.h
+	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  picmap.cc
+ 
+$(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 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
+	$(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 picons.h \
+  pistdwdgx.h pistdwdggen.h picontainerx.h picontainergen.h pibwdgx.h \
   pibwdggen.h picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h \
   pifontx.h pifontgen.h pigrcoord.h pilineatt.h pigraphuc.h \
   pievthandler.h psfile.h pigraphps.h
-	$(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 pipixutils.h picmap.h picmapx.h picmapgen.h \
-  pifontx.h pifontgen.h pigrcoord.h pilineatt.h pigratt.h pidrawer.h \
-  ucckprot.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 pipixutils.h \
+	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  picons.cc
+ 
+$(SOPHYAOBJP)picontainergen.o: picontainergen.cc \
+  $(SOPHYAINCP)sopnamsp.h picontainergen.h \
+  pisysdep.h $(SOPHYAINCP)machdefs.h piwdgx.h \
+  piwdggen.h pimsghandler.h picolist.h
+	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  picontainergen.cc
+ 
+$(SOPHYAOBJP)picontainerx.o: picontainerx.cc \
+  $(SOPHYAINCP)sopnamsp.h picontainerx.h \
+  pisysdep.h $(SOPHYAINCP)machdefs.h \
+  picontainergen.h piwdgx.h piwdggen.h pimsghandler.h picolist.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 picmap.h \
+  picmapx.h picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h \
+  pigrcoord.h pilineatt.h pigraphuc.h pievthandler.h psfile.h pigratt.h \
+  piaxes.h pidrwtools.h pistdwdgx.h pistdwdggen.h pimenux.h pimenugen.h \
+  pioptmenux.h pioptmenugen.h piwindowx.h piwindowgen.h picontainerx.h \
+  picontainergen.h piapplx.h piapplgen.h pimenubarx.h pimenubargen.h \
+  picons.h pibwdgx.h pigraphps.h ucckprot.h
+	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pidrawer.cc
+ 
+$(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 pigraphuc.h \
+  pievthandler.h psfile.h pigraphps.h pistdwdgx.h pistdwdggen.h \
+  pidrawer.h pigratt.h piaxes.h pieldrw.h
+	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pidrawwin.cc
+ 
+$(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 picons.h pibwdgx.h pibwdggen.h picmap.h picmapx.h \
+  picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigrcoord.h \
+  pilineatt.h pigraphuc.h pievthandler.h psfile.h pigraphps.h \
+  piscdrawwdg.h pidrawer.h pigratt.h piaxes.h pieldrw.h pi3dwdg.h \
+  pi3ddrw.h pigraph3d.h
+	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pidrwtools.cc
+ 
+$(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 pigraphuc.h pievthandler.h psfile.h \
+  pigratt.h piaxes.h
+	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pieldrw.cc
+ 
+$(SOPHYAOBJP)pievthandler.o: pievthandler.cc \
+  $(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 pigratt.h piaxestools.h pistdwdgx.h pistdwdggen.h \
+  pilineatt.h
+	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pievthandler.cc
+ 
+$(SOPHYAOBJP)pifilechogen.o: pifilechogen.cc \
+  $(SOPHYAINCP)sopnamsp.h pifilechogen.h \
+  pisysdep.h $(SOPHYAINCP)machdefs.h piwdgx.h \
+  piwdggen.h pimsghandler.h picolist.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 picons.h \
+  pistdwdgx.h pistdwdggen.h pibwdgx.h pibwdggen.h picmap.h picmapx.h \
+  picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigrcoord.h \
+  pilineatt.h pigraphuc.h pievthandler.h psfile.h pigraphps.h \
+  pifilechox.h pifilechogen.h piwindowx.h piwindowgen.h
+	$(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
+	$(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
+	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pifontx.cc
+ 
+$(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 \
+  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 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 picmap.h \
+  picmapx.h picmapgen.h pifontx.h pifontgen.h pigrcoord.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 picmap.h \
+  picmapx.h picmapgen.h pifontx.h pifontgen.h pigrcoord.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
+	$(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 \
+  $(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
+	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pigrcoord.cc
+ 
+$(SOPHYAOBJP)piimage.o: piimage.cc $(SOPHYAINCP)sopnamsp.h \
+  pisysdep.h $(SOPHYAINCP)machdefs.h piimage.h \
+  parradapter.h lut.h pieldrw.h pidrawer.h pibwdggen.h piwdgx.h \
+  piwdggen.h pimsghandler.h picolist.h picmap.h picmapx.h picmapgen.h \
+  pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h \
+  pigraphuc.h pievthandler.h psfile.h pigratt.h piaxes.h pipixmapx.h \
+  pipixmapgen.h pibwdgx.h pigraphps.h pistdwdgx.h pistdwdggen.h \
+  piwindowx.h piwindowgen.h picontainerx.h picontainergen.h picmapview.h \
+  piimgtools.h pioptmenux.h pioptmenugen.h pimenux.h pimenugen.h \
+  piapplx.h piapplgen.h pimenubarx.h pimenubargen.h picons.h pidrwtools.h \
+  piscdrawwdg.h piyfxdrw.h
+	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piimage.cc
+ 
+$(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 piscdrawwdg.h pibwdgx.h \
-  pibwdggen.h pigraphx.h pievthandler.h psfile.h pigraphps.h pidrawer.h \
-  pieldrw.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piaxestools.cc
- 
-$(SOPHYAOBJP)pibargraph.o: pibargraph.cc \
+  pimenubarx.h pimenubargen.h picons.h pibwdgx.h pibwdggen.h picmap.h \
+  picmapx.h picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h \
+  pigrcoord.h pilineatt.h pigraphuc.h pievthandler.h psfile.h pigraphps.h \
+  piimage.h parradapter.h lut.h pieldrw.h pidrawer.h pigratt.h piaxes.h \
+  pipixmapx.h pipixmapgen.h picmapview.h
+	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piimgtools.cc
+ 
+$(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
+	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pilistgen.cc
+ 
+$(SOPHYAOBJP)pilistx.o: pilistx.cc $(SOPHYAINCP)sopnamsp.h \
+  pilistx.h pilistgen.h pisysdep.h \
+  $(SOPHYAINCP)machdefs.h piwdgx.h piwdggen.h \
+  pimsghandler.h picolist.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 piapplx.h \
+  piapplgen.h picontainerx.h picontainergen.h pimenubarx.h picons.h \
+  pistdwdgx.h pistdwdggen.h pibwdgx.h pibwdggen.h picmap.h picmapx.h \
+  picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigrcoord.h \
+  pilineatt.h pigraphuc.h pievthandler.h psfile.h pigraphps.h
+	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pimenubargen.cc
+ 
+$(SOPHYAOBJP)pimenubarx.o: pimenubarx.cc \
+  $(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 piapplgen.h \
+  picontainerx.h picontainergen.h picons.h pistdwdgx.h pistdwdggen.h \
+  pibwdgx.h pibwdggen.h picmap.h picmapx.h picmapgen.h pigraphx.h \
+  pigraphgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h pigraphuc.h \
+  pievthandler.h psfile.h pigraphps.h
+	$(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
+	$(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
+	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pimenux.cc
+ 
+$(SOPHYAOBJP)pimsghandler.o: pimsghandler.cc \
+  $(SOPHYAINCP)sopnamsp.h pimsghandler.h \
+  $(SOPHYAINCP)machdefs.h
+	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pimsghandler.cc
+ 
+$(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
+	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pioptmenugen.cc
+ 
+$(SOPHYAOBJP)pioptmenux.o: pioptmenux.cc \
+  $(SOPHYAINCP)sopnamsp.h pisysdep.h \
+  $(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 \
+  picontainerx.h picontainergen.h pimenubarx.h pimenubargen.h picons.h \
+  pibwdgx.h pibwdggen.h picmap.h picmapx.h picmapgen.h pigraphx.h \
+  pigraphgen.h pifontx.h pifontgen.h pigrcoord.h pilineatt.h pigraphuc.h \
+  pievthandler.h psfile.h pigraphps.h
+	$(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 \
+  $(SOPHYAINCP)periodic.h \
+  $(SOPHYAINCP)machdefs.h
+	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piperiodx.cc
+ 
+$(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 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 $@  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 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 $@  pipixmapx.cc
+ 
+$(SOPHYAOBJP)piscdrawwdg.o: piscdrawwdg.cc \
   $(SOPHYAINCP)sopnamsp.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 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 pipixutils.h \
+  $(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 pigraphuc.h \
+  pievthandler.h psfile.h pigraphps.h pistdwdgx.h pistdwdggen.h \
+  piwindowx.h piwindowgen.h picontainerx.h picontainergen.h pidrawer.h \
+  pigratt.h piaxes.h pieldrw.h pidrwtools.h pimenux.h pimenugen.h \
+  pioptmenux.h pioptmenugen.h piapplx.h piapplgen.h pimenubarx.h \
+  pimenubargen.h picons.h piaxestools.h
+	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piscdrawwdg.cc
+ 
+$(SOPHYAOBJP)pistdwdggen.o: pistdwdggen.cc \
+  $(SOPHYAINCP)sopnamsp.h pistdwdggen.h \
+  pisysdep.h $(SOPHYAINCP)machdefs.h piwdgx.h \
+  piwdggen.h pimsghandler.h picolist.h
+	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pistdwdggen.cc
+ 
+$(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
+	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pistdwdgx.cc
+ 
+$(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 \
+  $(SOPHYAINCP)periodic.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 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 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 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 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 \
+  $(SOPHYAINCP)pexceptions.h \
+  $(SOPHYAINCP)machdefs.h
+	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piwdgx.cc
+ 
+$(SOPHYAOBJP)piwindowgen.o: piwindowgen.cc \
+  $(SOPHYAINCP)sopnamsp.h piwindowgen.h \
+  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
+	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piwindowgen.cc
+ 
+$(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
+	$(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 pigraphuc.h pievthandler.h psfile.h \
   pigraphps.h pixtbase.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pibwdgx.cc
- 
-$(SOPHYAOBJP)picmap.o: picmap.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  picmap.h pisysdep.h \
-  $(SOPHYAINCP)machdefs.h \
-  picmapx.h picmapgen.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  picmap.cc
- 
-$(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 \
-  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 pidrawer.h pigratt.h piaxes.h lut.h \
-  $(SOPHYAINCP)strutil.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 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 \
-  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 \
-  pigraphuc.h pievthandler.h psfile.h pigraphps.h piconsenum.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  picons.cc
- 
-$(SOPHYAOBJP)picontainergen.o: picontainergen.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  picontainergen.h pisysdep.h \
-  $(SOPHYAINCP)machdefs.h \
-  piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  picontainergen.cc
- 
-$(SOPHYAOBJP)picontainerx.o: picontainerx.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  picontainerx.h pisysdep.h \
-  $(SOPHYAINCP)machdefs.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 pipixutils.h picmap.h picmapx.h picmapgen.h pigraphx.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 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 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 \
-  piwindowx.h piwindowgen.h picontainerx.h picontainergen.h piwdgx.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
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pidrawwin.cc
- 
-$(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 \
-  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
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pidrwtools.cc
- 
-$(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 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
- 
-$(SOPHYAOBJP)pievthandler.o: pievthandler.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  pievthandler.h pisysdep.h \
-  $(SOPHYAINCP)machdefs.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
- 
-$(SOPHYAOBJP)pifilechogen.o: pifilechogen.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  pifilechogen.h pisysdep.h \
-  $(SOPHYAINCP)machdefs.h \
-  piwdgx.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 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 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 \
-  pipixutils.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pifontx.cc
- 
-$(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 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 pipixutils.h picmap.h picmapx.h picmapgen.h pifontx.h \
-  pifontgen.h pigrcoord.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 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 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
-	$(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 \
-  pistdwdggen.h piwindowx.h piwindowgen.h picontainerx.h picontainergen.h \
-  picmapview.h piimgtools.h pioptmenux.h pioptmenugen.h pimenux.h \
-  pimenugen.h piapplx.h piapplgen.h pimenubarx.h pimenubargen.h \
-  piconsenum.h pidrwtools.h piscdrawwdg.h piyfxdrw.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piimage.cc
- 
-$(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 \
-  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 \
-  pipixmapx.h pipixmapgen.h pibwdgx.h pigraphps.h picmapview.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piimgtools.cc
- 
-$(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 pipixutils.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pilistgen.cc
- 
-$(SOPHYAOBJP)pilistx.o: pilistx.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  pilistx.h pilistgen.h pisysdep.h \
-  $(SOPHYAINCP)machdefs.h \
-  piwdgx.h piwdggen.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 \
-  pipixutils.h piapplx.h piapplgen.h picontainerx.h picontainergen.h \
-  pimenubarx.h piconsenum.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pimenubargen.cc
- 
-$(SOPHYAOBJP)pimenubarx.o: pimenubarx.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  pimenubarx.h pimenubargen.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 \
-  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 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 pipixutils.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pimenux.cc
- 
-$(SOPHYAOBJP)pimsghandler.o: pimsghandler.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  pimsghandler.h \
-  $(SOPHYAINCP)machdefs.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pimsghandler.cc
- 
-$(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 \
-  pipixutils.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pioptmenugen.cc
- 
-$(SOPHYAOBJP)pioptmenux.o: pioptmenux.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  pisysdep.h \
-  $(SOPHYAINCP)machdefs.h \
-  pioptmenux.h pioptmenugen.h pimenux.h pimenugen.h piwdgx.h piwdggen.h \
-  pimsghandler.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 pipixutils.h piperiodx.h \
-  $(SOPHYAINCP)periodic.h \
-  $(SOPHYAINCP)machdefs.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piperiodx.cc
- 
-$(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 \
-  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 $@  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 \
-  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 $@  pipixmapx.cc
- 
-$(SOPHYAOBJP)pipixutils.o: pipixutils.cc pipixutils.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pipixutils.cc
- 
-$(SOPHYAOBJP)piscdrawwdg.o: piscdrawwdg.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  $(SOPHYAINCP)machdefs.h \
-  piscdrawwdg.h pisysdep.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 pistdwdgx.h \
-  pistdwdggen.h piwindowx.h piwindowgen.h picontainerx.h picontainergen.h \
-  pidrawer.h pigratt.h piaxes.h pieldrw.h pidrwtools.h pimenux.h \
-  pimenugen.h pioptmenux.h pioptmenugen.h piapplx.h piapplgen.h \
-  pimenubarx.h pimenubargen.h piconsenum.h piaxestools.h ucckprot.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piscdrawwdg.cc
- 
-$(SOPHYAOBJP)pistdwdggen.o: pistdwdggen.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  pistdwdggen.h pisysdep.h \
-  $(SOPHYAINCP)machdefs.h \
-  piwdgx.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 pistdwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.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 \
-  piwindowx.h piwindowgen.h picontainerx.h picontainergen.h piwdgx.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
-	$(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
-	$(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 \
-  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 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 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 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
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piwdgx.cc
- 
-$(SOPHYAOBJP)piwindowgen.o: piwindowgen.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  piwindowgen.h pisysdep.h \
-  $(SOPHYAINCP)machdefs.h \
-  picontainerx.h picontainergen.h piwdgx.h piwdggen.h pimsghandler.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 \
-  $(SOPHYAINCP)machdefs.h \
-  picontainerx.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 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
+  pievthandler.h psfile.h pigratt.h piaxes.h
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piyfxdrw.cc
  
-$(SOPHYAOBJP)psfile.o: psfile.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  psfile.h \
-  $(SOPHYAINCP)machdefs.h \
-  pisysdep.h pifontgen.h pigraphgen.h piwdgx.h piwdggen.h pimsghandler.h \
-  picolist.h pipixutils.h picmap.h picmapx.h picmapgen.h pifontx.h \
-  pigrcoord.h pilineatt.h
+$(SOPHYAOBJP)psfile.o: psfile.cc $(SOPHYAINCP)sopnamsp.h \
+  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
 	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  psfile.cc
  
Index: /trunk/SophyaPI/PI/Quartz/#PIContainerQuartz.cpp#
===================================================================
--- /trunk/SophyaPI/PI/Quartz/#PIContainerQuartz.cpp#	(revision 4077)
+++ /trunk/SophyaPI/PI/Quartz/#PIContainerQuartz.cpp#	(revision 4077)
@@ -0,0 +1,32 @@
+/*
+ *  PIContainerQuartz.cpp
+ *  PI
+ *
+ *  Created by Bruno MANSOUX on Tue May 04 2004.
+ *
+ */
+
+#include "PIContainerQuartz.h"
+
+/* --Methode-- */
+PIContainerQuartz::PIContainerQuartz(PIContainerGen *par, const char *nom, 
+                           int sx, int sy, int px, int py) 
+:PIContainerGen(par, nom, sx, sy, px, py)
+{
+}
+
+/* --Methode-- */
+PIContainerQuartz::~PIContainerQuartz()
+{
+}
+
+/* --Methode-- */
+void PIContainerQuartz::Process(PIMessage msg, PIMsgHandler* sender, void* data)
+{
+}
+
+/* --Methode-- */
+WindowRef PIContainerQuartz::GetWindowRef()
+{
+    return HIViewGetWindow(wdgHIView);
+}
Index: /trunk/SophyaPI/PI/Quartz/BaoAdc-Info.plist
===================================================================
--- /trunk/SophyaPI/PI/Quartz/BaoAdc-Info.plist	(revision 4077)
+++ /trunk/SophyaPI/PI/Quartz/BaoAdc-Info.plist	(revision 4077)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>BaoAdc</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.yourcompany.BaoAdc</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+</dict>
+</plist>
Index: /trunk/SophyaPI/PI/Quartz/Info-PIAQTest__Upgraded_.plist
===================================================================
--- /trunk/SophyaPI/PI/Quartz/Info-PIAQTest__Upgraded_.plist	(revision 4077)
+++ /trunk/SophyaPI/PI/Quartz/Info-PIAQTest__Upgraded_.plist	(revision 4077)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string></string>
+	<key>CFBundleGetInfoString</key>
+	<string></string>
+	<key>CFBundleIconFile</key>
+	<string></string>
+	<key>CFBundleIdentifier</key>
+	<string></string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string></string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string></string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>0.0.1d1</string>
+</dict>
+</plist>
Index: /trunk/SophyaPI/PI/Quartz/Info-PIT0__Upgraded_.plist
===================================================================
--- /trunk/SophyaPI/PI/Quartz/Info-PIT0__Upgraded_.plist	(revision 4077)
+++ /trunk/SophyaPI/PI/Quartz/Info-PIT0__Upgraded_.plist	(revision 4077)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string></string>
+	<key>CFBundleGetInfoString</key>
+	<string></string>
+	<key>CFBundleIconFile</key>
+	<string></string>
+	<key>CFBundleIdentifier</key>
+	<string></string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string></string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string></string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>0.0.1d1</string>
+</dict>
+</plist>
Index: /trunk/SophyaPI/PI/Quartz/Info-PI__Upgraded_.plist
===================================================================
--- /trunk/SophyaPI/PI/Quartz/Info-PI__Upgraded_.plist	(revision 4077)
+++ /trunk/SophyaPI/PI/Quartz/Info-PI__Upgraded_.plist	(revision 4077)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>PI</string>
+	<key>CFBundleIconFile</key>
+	<string></string>
+	<key>CFBundleIdentifier</key>
+	<string></string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>0.0.1d1</string>
+	<key>CSResourcesFileMapped</key>
+	<true/>
+</dict>
+</plist>
Index: /trunk/SophyaPI/PI/Quartz/Info-XP0__Upgraded_.plist
===================================================================
--- /trunk/SophyaPI/PI/Quartz/Info-XP0__Upgraded_.plist	(revision 4077)
+++ /trunk/SophyaPI/PI/Quartz/Info-XP0__Upgraded_.plist	(revision 4077)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string></string>
+	<key>CFBundleGetInfoString</key>
+	<string></string>
+	<key>CFBundleIconFile</key>
+	<string></string>
+	<key>CFBundleIdentifier</key>
+	<string></string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string></string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string></string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>0.0.1d1</string>
+</dict>
+</plist>
Index: /trunk/SophyaPI/PI/Quartz/Info-XP1__Upgraded_.plist
===================================================================
--- /trunk/SophyaPI/PI/Quartz/Info-XP1__Upgraded_.plist	(revision 4077)
+++ /trunk/SophyaPI/PI/Quartz/Info-XP1__Upgraded_.plist	(revision 4077)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string></string>
+	<key>CFBundleGetInfoString</key>
+	<string></string>
+	<key>CFBundleIconFile</key>
+	<string></string>
+	<key>CFBundleIdentifier</key>
+	<string></string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string></string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string></string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>0.0.1d1</string>
+</dict>
+</plist>
Index: /trunk/SophyaPI/PI/Quartz/PI.xcodeproj/brunomansoux.mode1
===================================================================
--- /trunk/SophyaPI/PI/Quartz/PI.xcodeproj/brunomansoux.mode1	(revision 4076)
+++ /trunk/SophyaPI/PI/Quartz/PI.xcodeproj/brunomansoux.mode1	(revision 4077)
@@ -219,4 +219,6 @@
 			<array>
 				<dict>
+					<key>BecomeActive</key>
+					<true/>
 					<key>ContentConfiguration</key>
 					<dict>
@@ -243,5 +245,5 @@
 							<key>PBXSmartGroupTreeModuleColumnWidthsKey</key>
 							<array>
-								<real>255</real>
+								<real>241</real>
 							</array>
 							<key>PBXSmartGroupTreeModuleColumnsKey_v4</key>
@@ -255,14 +257,18 @@
 							<array>
 								<string>0867D691FE84028FC02AAC07</string>
+								<string>6D7D4E4B066710DA009E5976</string>
+								<string>0867D69AFE84028FC02AAC07</string>
+								<string>034768DDFF38A45A11DB9C8B</string>
 							</array>
 							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
 							<array>
 								<array>
-									<integer>7</integer>
+									<integer>4</integer>
+									<integer>3</integer>
 									<integer>0</integer>
 								</array>
 							</array>
 							<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
-							<string>{{0, 0}, {255, 878}}</string>
+							<string>{{0, 0}, {241, 903}}</string>
 						</dict>
 						<key>PBXTopSmartGroupGIDs</key>
@@ -276,17 +282,17 @@
 					<dict>
 						<key>Frame</key>
-						<string>{{0, 0}, {272, 896}}</string>
+						<string>{{0, 0}, {258, 921}}</string>
 						<key>GroupTreeTableConfiguration</key>
 						<array>
 							<string>MainColumn</string>
-							<real>255</real>
+							<real>241</real>
 						</array>
 						<key>RubberWindowFrame</key>
-						<string>46 65 1132 937 0 0 1280 1002 </string>
+						<string>224 40 1032 962 0 0 1280 1002 </string>
 					</dict>
 					<key>Module</key>
 					<string>PBXSmartGroupTreeModule</string>
 					<key>Proportion</key>
-					<string>272pt</string>
+					<string>258pt</string>
 				</dict>
 				<dict>
@@ -294,6 +300,4 @@
 					<array>
 						<dict>
-							<key>BecomeActive</key>
-							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
@@ -301,5 +305,5 @@
 								<string>1CE0B20306471E060097A5F4</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>QuartzAppTest.cpp</string>
+								<string>pigraphquartz.h</string>
 								<key>PBXSplitModuleInNavigatorKey</key>
 								<dict>
@@ -309,50 +313,31 @@
 										<string>1CE0B20406471E060097A5F4</string>
 										<key>PBXProjectModuleLabel</key>
-										<string>QuartzAppTest.cpp</string>
+										<string>pigraphquartz.h</string>
 										<key>_historyCapacity</key>
 										<integer>20</integer>
 										<key>bookmark</key>
-										<string>6DD3B7DA112E6EF400FF73F4</string>
+										<string>6D45E1BD1499067500CE9FAB</string>
 										<key>history</key>
 										<array>
-											<string>6D475934103C205F009DB4E2</string>
-											<string>6D475935103C205F009DB4E2</string>
-											<string>6D475AFC103C50CE009DB4E2</string>
-											<string>6D475AFD103C50CE009DB4E2</string>
-											<string>6D475AFE103C50CE009DB4E2</string>
-											<string>6D475AFF103C50CE009DB4E2</string>
-											<string>6D475B00103C50CE009DB4E2</string>
-											<string>6D475B02103C50CE009DB4E2</string>
-											<string>6D475B04103C50CE009DB4E2</string>
-											<string>6D475B05103C50CE009DB4E2</string>
-											<string>6D475B08103C50CE009DB4E2</string>
-											<string>6D475B09103C50CE009DB4E2</string>
-											<string>6DECAF30103EDEC600699E89</string>
-											<string>6DECAF31103EDEC600699E89</string>
-											<string>6DECAF32103EDEC600699E89</string>
-											<string>6D24D0E8108F71D400C9A36C</string>
-											<string>6DE9119710D24B1B003F0B29</string>
-											<string>6DD55619112DA8D800BA57AE</string>
+											<string>6DE1384112DF4A5700579496</string>
+											<string>6DE38B8712E72FAC00872A9D</string>
+											<string>6D45E1B01499067500CE9FAB</string>
+											<string>6D45E1B11499067500CE9FAB</string>
+											<string>6D45E1B31499067500CE9FAB</string>
+											<string>6D45E1B41499067500CE9FAB</string>
+											<string>6D45E1B51499067500CE9FAB</string>
 										</array>
 										<key>prevStack</key>
 										<array>
-											<string>6D47593A103C205F009DB4E2</string>
-											<string>6D475941103C205F009DB4E2</string>
-											<string>6D47595E103C205F009DB4E2</string>
 											<string>6D47596F103C205F009DB4E2</string>
 											<string>6D475972103C205F009DB4E2</string>
-											<string>6D475973103C205F009DB4E2</string>
 											<string>6D475974103C205F009DB4E2</string>
-											<string>6D475A1B103C320A009DB4E2</string>
-											<string>6D475A20103C320A009DB4E2</string>
-											<string>6D475A25103C320A009DB4E2</string>
-											<string>6D475B0B103C50CE009DB4E2</string>
-											<string>6D475B0D103C50CE009DB4E2</string>
-											<string>6D475B0E103C50CE009DB4E2</string>
 											<string>6D475B0F103C50CE009DB4E2</string>
-											<string>6D475B11103C50CE009DB4E2</string>
-											<string>6D475B15103C50CE009DB4E2</string>
-											<string>6D475B25103C50CE009DB4E2</string>
-											<string>6D475B2B103C50CE009DB4E2</string>
+											<string>6D45E1B61499067500CE9FAB</string>
+											<string>6D45E1B71499067500CE9FAB</string>
+											<string>6D45E1B91499067500CE9FAB</string>
+											<string>6D45E1BA1499067500CE9FAB</string>
+											<string>6D45E1BB1499067500CE9FAB</string>
+											<string>6D45E1BC1499067500CE9FAB</string>
 										</array>
 									</dict>
@@ -366,12 +351,12 @@
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 0}, {855, 433}}</string>
+								<string>{{0, 0}, {769, 446}}</string>
 								<key>RubberWindowFrame</key>
-								<string>46 65 1132 937 0 0 1280 1002 </string>
+								<string>224 40 1032 962 0 0 1280 1002 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
 							<key>Proportion</key>
-							<string>433pt</string>
+							<string>446pt</string>
 						</dict>
 						<dict>
@@ -393,46 +378,23 @@
 										<integer>20</integer>
 										<key>bookmark</key>
-										<string>6DD3B7DB112E6EF400FF73F4</string>
+										<string>6D45E1C31499067500CE9FAB</string>
 										<key>history</key>
 										<array>
-											<string>6D475934103C205F009DB4E2</string>
-											<string>6D475935103C205F009DB4E2</string>
-											<string>6D475AFC103C50CE009DB4E2</string>
-											<string>6D475AFD103C50CE009DB4E2</string>
-											<string>6D475AFE103C50CE009DB4E2</string>
-											<string>6D475AFF103C50CE009DB4E2</string>
-											<string>6D475B00103C50CE009DB4E2</string>
-											<string>6D475B02103C50CE009DB4E2</string>
-											<string>6D475B03103C50CE009DB4E2</string>
-											<string>6D475B04103C50CE009DB4E2</string>
-											<string>6D475B05103C50CE009DB4E2</string>
-											<string>6D475B08103C50CE009DB4E2</string>
-											<string>6DECAF30103EDEC600699E89</string>
-											<string>6DECAF31103EDEC600699E89</string>
-											<string>6DECAF32103EDEC600699E89</string>
-											<string>6DE3BEB310501DB00074C72E</string>
-											<string>6D052AE0107B3725001E23C1</string>
-											<string>6DD5561A112DA8D800BA57AE</string>
+											<string>6DD04F3E113D763C00B55104</string>
+											<string>6DE1384212DF4A5700579496</string>
+											<string>6DE38B8712E72FAC00872A9D</string>
+											<string>6D45E1BE1499067500CE9FAB</string>
+											<string>6D45E1BF1499067500CE9FAB</string>
 										</array>
 										<key>prevStack</key>
 										<array>
-											<string>6D47593A103C205F009DB4E2</string>
-											<string>6D475941103C205F009DB4E2</string>
-											<string>6D47595E103C205F009DB4E2</string>
 											<string>6D47596F103C205F009DB4E2</string>
 											<string>6D475972103C205F009DB4E2</string>
-											<string>6D475973103C205F009DB4E2</string>
 											<string>6D475974103C205F009DB4E2</string>
-											<string>6D475A1B103C320A009DB4E2</string>
-											<string>6D475A20103C320A009DB4E2</string>
-											<string>6D475A25103C320A009DB4E2</string>
-											<string>6D475B0B103C50CE009DB4E2</string>
-											<string>6D475B0D103C50CE009DB4E2</string>
-											<string>6D475B0E103C50CE009DB4E2</string>
 											<string>6D475B0F103C50CE009DB4E2</string>
-											<string>6D475B11103C50CE009DB4E2</string>
-											<string>6D475B15103C50CE009DB4E2</string>
-											<string>6D475B25103C50CE009DB4E2</string>
-											<string>6D475B2B103C50CE009DB4E2</string>
+											<string>6DD04F42113D763C00B55104</string>
+											<string>6D45E1C01499067500CE9FAB</string>
+											<string>6D45E1C11499067500CE9FAB</string>
+											<string>6D45E1C21499067500CE9FAB</string>
 										</array>
 									</dict>
@@ -446,12 +408,68 @@
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 438}, {855, 453}}</string>
+								<string>{{0, 451}, {769, 458}}</string>
 								<key>RubberWindowFrame</key>
-								<string>46 65 1132 937 0 0 1280 1002 </string>
+								<string>224 40 1032 962 0 0 1280 1002 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
 							<key>Proportion</key>
-							<string>453pt</string>
+							<string>458pt</string>
+						</dict>
+						<dict>
+							<key>ContentConfiguration</key>
+							<dict>
+								<key>PBXProjectModuleGUID</key>
+								<string>1CE0B20306471E060097A5F4</string>
+								<key>PBXProjectModuleLabel</key>
+								<string>pigraphquartz.cpp</string>
+								<key>PBXSplitModuleInNavigatorKey</key>
+								<dict>
+									<key>Split0</key>
+									<dict>
+										<key>PBXProjectModuleGUID</key>
+										<string>1CE0B20406471E060097A5F4</string>
+										<key>PBXProjectModuleLabel</key>
+										<string>pigraphquartz.cpp</string>
+										<key>_historyCapacity</key>
+										<integer>20</integer>
+										<key>bookmark</key>
+										<string>6D45E1C41499067500CE9FAB</string>
+										<key>history</key>
+										<array>
+											<string>6D475934103C205F009DB4E2</string>
+											<string>6D475935103C205F009DB4E2</string>
+											<string>6D475AFC103C50CE009DB4E2</string>
+											<string>6DECAF32103EDEC600699E89</string>
+											<string>6D052AE0107B3725001E23C1</string>
+											<string>6D62438F14069C80009BDE9A</string>
+										</array>
+										<key>prevStack</key>
+										<array>
+											<string>6D47596F103C205F009DB4E2</string>
+											<string>6D475972103C205F009DB4E2</string>
+											<string>6D475973103C205F009DB4E2</string>
+											<string>6D475974103C205F009DB4E2</string>
+											<string>6D475B0B103C50CE009DB4E2</string>
+											<string>6D475B0F103C50CE009DB4E2</string>
+										</array>
+									</dict>
+									<key>SplitCount</key>
+									<string>1</string>
+								</dict>
+								<key>StatusBarVisibility</key>
+								<true/>
+							</dict>
+							<key>GeometryConfiguration</key>
+							<dict>
+								<key>Frame</key>
+								<string>{{0, 914}, {769, 1}}</string>
+								<key>RubberWindowFrame</key>
+								<string>224 40 1032 962 0 0 1280 1002 </string>
+							</dict>
+							<key>Module</key>
+							<string>PBXNavigatorGroup</string>
+							<key>Proportion</key>
+							<string>1pt</string>
 						</dict>
 						<dict>
@@ -466,16 +484,16 @@
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 896}, {855, 0}}</string>
+								<string>{{0, 920}, {769, 1}}</string>
 								<key>RubberWindowFrame</key>
-								<string>46 65 1132 937 0 0 1280 1002 </string>
+								<string>224 40 1032 962 0 0 1280 1002 </string>
 							</dict>
 							<key>Module</key>
 							<string>XCDetailModule</string>
 							<key>Proportion</key>
-							<string>0pt</string>
+							<string>1pt</string>
 						</dict>
 					</array>
 					<key>Proportion</key>
-					<string>855pt</string>
+					<string>769pt</string>
 				</dict>
 			</array>
@@ -489,11 +507,13 @@
 				<string>PBXNavigatorGroup</string>
 				<string>PBXNavigatorGroup</string>
+				<string>PBXNavigatorGroup</string>
 				<string>XCDetailModule</string>
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>6DD3B7DC112E6EF400FF73F4</string>
+				<string>6D45E1381498EB1D00CE9FAB</string>
 				<string>1CE0B1FE06471DED0097A5F4</string>
-				<string>6DD3B7DD112E6EF400FF73F4</string>
+				<string>6D45E1391498EB1D00CE9FAB</string>
+				<string>1CE0B20306471E060097A5F4</string>
 				<string>1CE0B20306471E060097A5F4</string>
 				<string>1CE0B20306471E060097A5F4</string>
@@ -630,9 +650,10 @@
 	<key>WindowOrderList</key>
 	<array>
+		<string>6D51EC7C0BA8059900CD4CE8</string>
 		<string>1C0AD2B3069F1EA900FABCE6</string>
 		<string>/Users/brunomansoux/Programmes/PI4Mac/PI/Quartz/PI.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
-	<string>46 65 1132 937 0 0 1280 1002 </string>
+	<string>224 40 1032 962 0 0 1280 1002 </string>
 	<key>WindowTools</key>
 	<array>
@@ -657,5 +678,5 @@
 								<string>1CD0528F0623707200166675</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>pistdwdgquartz.cpp</string>
+								<string>QuartzAppTest.cpp</string>
 								<key>StatusBarVisibility</key>
 								<true/>
@@ -664,12 +685,12 @@
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 0}, {1089, 392}}</string>
+								<string>{{0, 0}, {1089, 134}}</string>
 								<key>RubberWindowFrame</key>
-								<string>273 96 1089 904 0 0 1280 1002 </string>
+								<string>113 98 1089 904 0 0 1280 1002 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
 							<key>Proportion</key>
-							<string>392pt</string>
+							<string>134pt</string>
 						</dict>
 						<dict>
@@ -677,5 +698,5 @@
 							<dict>
 								<key>PBXBuildLogShowsTranscriptDefaultKey</key>
-								<string>{{0, 149}, {1089, 317}}</string>
+								<string>{{0, 228}, {1089, 496}}</string>
 								<key>PBXProjectModuleGUID</key>
 								<string>XCMainBuildResultsModuleGUID</string>
@@ -690,12 +711,12 @@
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 397}, {1089, 466}}</string>
+								<string>{{0, 139}, {1089, 724}}</string>
 								<key>RubberWindowFrame</key>
-								<string>273 96 1089 904 0 0 1280 1002 </string>
+								<string>113 98 1089 904 0 0 1280 1002 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXBuildResultsModule</string>
 							<key>Proportion</key>
-							<string>466pt</string>
+							<string>724pt</string>
 						</dict>
 					</array>
@@ -715,5 +736,5 @@
 			<array>
 				<string>6D51EC7C0BA8059900CD4CE8</string>
-				<string>6D475903103BF11E009DB4E2</string>
+				<string>6D45E1741498F21800CE9FAB</string>
 				<string>1CD0528F0623707200166675</string>
 				<string>XCMainBuildResultsModuleGUID</string>
@@ -722,5 +743,5 @@
 			<string>xcode.toolbar.config.build</string>
 			<key>WindowString</key>
-			<string>273 96 1089 904 0 0 1280 1002 </string>
+			<string>113 98 1089 904 0 0 1280 1002 </string>
 			<key>WindowToolGUID</key>
 			<string>6D51EC7C0BA8059900CD4CE8</string>
@@ -757,6 +778,6 @@
 										<key>sizes</key>
 										<array>
-											<string>{{0, 0}, {267, 468}}</string>
-											<string>{{267, 0}, {687, 468}}</string>
+											<string>{{0, 0}, {0, 387}}</string>
+											<string>{{0, 0}, {954, 387}}</string>
 										</array>
 									</dict>
@@ -773,6 +794,6 @@
 										<key>sizes</key>
 										<array>
-											<string>{{0, 0}, {954, 468}}</string>
-											<string>{{0, 468}, {954, 399}}</string>
+											<string>{{0, 0}, {954, 387}}</string>
+											<string>{{0, 387}, {954, 480}}</string>
 										</array>
 									</dict>
@@ -820,13 +841,13 @@
 			<key>TableOfContents</key>
 			<array>
-				<string>1CD10A99069EF8BA00B06720</string>
-				<string>6DF0EDB10DBDC2370047313D</string>
+				<string>6DD55C3911328EAD00AA6752</string>
+				<string>6DE2624F12F080EB0004413C</string>
 				<string>1C162984064C10D400B95A72</string>
-				<string>6DF0EDB20DBDC2370047313D</string>
-				<string>6DF0EDB30DBDC2370047313D</string>
-				<string>6DF0EDB40DBDC2370047313D</string>
-				<string>6DF0EDB50DBDC2370047313D</string>
-				<string>6DF0EDB60DBDC2370047313D</string>
-				<string>6DF0EDB70DBDC2370047313D</string>
+				<string>6DE2625012F080EB0004413C</string>
+				<string>6DE2625112F080EB0004413C</string>
+				<string>6DE2625212F080EB0004413C</string>
+				<string>6DE2625312F080EB0004413C</string>
+				<string>6DE2625412F080EB0004413C</string>
+				<string>6DE2625512F080EB0004413C</string>
 			</array>
 			<key>ToolbarConfiguration</key>
@@ -835,5 +856,5 @@
 			<string>107 159 954 690 0 0 1280 1002 </string>
 			<key>WindowToolGUID</key>
-			<string>1CD10A99069EF8BA00B06720</string>
+			<string>6DD55C3911328EAD00AA6752</string>
 			<key>WindowToolIsVisible</key>
 			<false/>
@@ -918,6 +939,6 @@
 			<array>
 				<string>1C530D57069F1CE1000CFCEE</string>
-				<string>6D475A8E103C42C6009DB4E2</string>
-				<string>6D475A8F103C42C6009DB4E2</string>
+				<string>6DE7568212DDACBE00446C79</string>
+				<string>6DE7568312DDACBE00446C79</string>
 				<string>1CDD528C0622207200134675</string>
 				<string>1CD0528E0623707200166675</string>
@@ -982,5 +1003,5 @@
 			<array>
 				<string>6DF69ABA0C7ADAAD0091767B</string>
-				<string>6DF0EDB80DBDC2370047313D</string>
+				<string>6DE2625612F080EB0004413C</string>
 				<string>1C78EAAC065D492600B07095</string>
 			</array>
@@ -1027,6 +1048,6 @@
 										<key>sizes</key>
 										<array>
-											<string>{{0, 0}, {491, 168}}</string>
-											<string>{{0, 173}, {491, 270}}</string>
+											<string>{{0, 0}, {367, 168}}</string>
+											<string>{{0, 173}, {367, 270}}</string>
 										</array>
 									</dict>
@@ -1052,16 +1073,16 @@
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 0}, {524, 746}}</string>
+								<string>{{0, 0}, {637, 754}}</string>
 								<key>RubberWindowFrame</key>
-								<string>32 110 524 787 0 0 1280 1002 </string>
+								<string>31 90 637 795 0 0 1280 1002 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXRunSessionModule</string>
 							<key>Proportion</key>
-							<string>746pt</string>
+							<string>754pt</string>
 						</dict>
 					</array>
 					<key>Proportion</key>
-					<string>746pt</string>
+					<string>754pt</string>
 				</dict>
 			</array>
@@ -1077,12 +1098,12 @@
 			<array>
 				<string>1C0AD2B3069F1EA900FABCE6</string>
-				<string>6DD3B7DE112E6EF400FF73F4</string>
+				<string>6D45E13A1498EB1D00CE9FAB</string>
 				<string>1CD0528B0623707200166675</string>
-				<string>6DD3B7DF112E6EF400FF73F4</string>
+				<string>6D45E13B1498EB1D00CE9FAB</string>
 			</array>
 			<key>ToolbarConfiguration</key>
 			<string>xcode.toolbar.config.run</string>
 			<key>WindowString</key>
-			<string>32 110 524 787 0 0 1280 1002 </string>
+			<string>31 90 637 795 0 0 1280 1002 </string>
 			<key>WindowToolGUID</key>
 			<string>1C0AD2B3069F1EA900FABCE6</string>
Index: /trunk/SophyaPI/PI/Quartz/PI.xcodeproj/brunomansoux.pbxuser
===================================================================
--- /trunk/SophyaPI/PI/Quartz/PI.xcodeproj/brunomansoux.pbxuser	(revision 4076)
+++ /trunk/SophyaPI/PI/Quartz/PI.xcodeproj/brunomansoux.pbxuser	(revision 4077)
@@ -4,6 +4,6 @@
 		activeBuildConfigurationName = Development;
 		activeBuildStyle = 4F0BB7EC011F40E904CA0E50 /* Development */;
-		activeExecutable = 6D10687F067DC9AB009E5976 /* PIAQTest */;
-		activeTarget = 6D10687D067DC9AB009E5976 /* PIAQTest */;
+		activeExecutable = 6D622CD70D8ECB6300428D9A /* BaoAdc */;
+		activeTarget = 6D622CD50D8ECB6300428D9A /* BaoAdc */;
 		addToTargets = (
 			0867D69CFE84028FC02AAC07 /* PI */,
@@ -62,5 +62,5 @@
 				PBXFileTableDataSourceColumnWidthsKey = (
 					20,
-					616,
+					530,
 					20,
 					48,
@@ -117,5 +117,5 @@
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 288255717;
+			PBXPerProjectTemplateStateSaveDate = 345631602;
 			PBXWorkspaceContents = (
 				{
@@ -375,50 +375,42 @@
 				},
 			);
-			PBXWorkspaceStateSaveDate = 288255717;
+			PBXWorkspaceStateSaveDate = 345631602;
 		};
 		perUserProjectItems = {
 			6D052AE0107B3725001E23C1 = 6D052AE0107B3725001E23C1 /* PBXTextBookmark */;
-			6D24D0E8108F71D400C9A36C = 6D24D0E8108F71D400C9A36C /* PBXTextBookmark */;
+			6D45E1B01499067500CE9FAB = 6D45E1B01499067500CE9FAB /* PBXTextBookmark */;
+			6D45E1B11499067500CE9FAB = 6D45E1B11499067500CE9FAB /* PBXTextBookmark */;
+			6D45E1B31499067500CE9FAB = 6D45E1B31499067500CE9FAB /* PBXTextBookmark */;
+			6D45E1B41499067500CE9FAB = 6D45E1B41499067500CE9FAB /* PBXTextBookmark */;
+			6D45E1B51499067500CE9FAB = 6D45E1B51499067500CE9FAB /* PBXTextBookmark */;
+			6D45E1B61499067500CE9FAB = 6D45E1B61499067500CE9FAB /* PBXTextBookmark */;
+			6D45E1B71499067500CE9FAB = 6D45E1B71499067500CE9FAB /* PBXTextBookmark */;
+			6D45E1B91499067500CE9FAB = 6D45E1B91499067500CE9FAB /* PBXTextBookmark */;
+			6D45E1BA1499067500CE9FAB = 6D45E1BA1499067500CE9FAB /* PBXTextBookmark */;
+			6D45E1BB1499067500CE9FAB = 6D45E1BB1499067500CE9FAB /* PBXTextBookmark */;
+			6D45E1BC1499067500CE9FAB = 6D45E1BC1499067500CE9FAB /* PBXTextBookmark */;
+			6D45E1BD1499067500CE9FAB = 6D45E1BD1499067500CE9FAB /* PBXTextBookmark */;
+			6D45E1BE1499067500CE9FAB = 6D45E1BE1499067500CE9FAB /* PBXTextBookmark */;
+			6D45E1BF1499067500CE9FAB = 6D45E1BF1499067500CE9FAB /* PBXTextBookmark */;
+			6D45E1C01499067500CE9FAB = 6D45E1C01499067500CE9FAB /* PBXTextBookmark */;
+			6D45E1C11499067500CE9FAB = 6D45E1C11499067500CE9FAB /* PBXTextBookmark */;
+			6D45E1C21499067500CE9FAB = 6D45E1C21499067500CE9FAB /* PBXTextBookmark */;
+			6D45E1C31499067500CE9FAB = 6D45E1C31499067500CE9FAB /* PBXTextBookmark */;
+			6D45E1C41499067500CE9FAB = 6D45E1C41499067500CE9FAB /* PBXTextBookmark */;
 			6D475934103C205F009DB4E2 = 6D475934103C205F009DB4E2 /* PBXTextBookmark */;
 			6D475935103C205F009DB4E2 = 6D475935103C205F009DB4E2 /* PBXTextBookmark */;
-			6D47593A103C205F009DB4E2 = 6D47593A103C205F009DB4E2 /* PBXTextBookmark */;
-			6D475941103C205F009DB4E2 = 6D475941103C205F009DB4E2 /* PBXTextBookmark */;
-			6D47595E103C205F009DB4E2 = 6D47595E103C205F009DB4E2 /* PBXTextBookmark */;
 			6D47596F103C205F009DB4E2 = 6D47596F103C205F009DB4E2 /* PBXTextBookmark */;
 			6D475972103C205F009DB4E2 = 6D475972103C205F009DB4E2 /* PBXTextBookmark */;
 			6D475973103C205F009DB4E2 = 6D475973103C205F009DB4E2 /* PBXTextBookmark */;
 			6D475974103C205F009DB4E2 = 6D475974103C205F009DB4E2 /* PBXTextBookmark */;
-			6D475A1B103C320A009DB4E2 = 6D475A1B103C320A009DB4E2 /* PBXTextBookmark */;
-			6D475A20103C320A009DB4E2 = 6D475A20103C320A009DB4E2 /* PBXTextBookmark */;
-			6D475A25103C320A009DB4E2 = 6D475A25103C320A009DB4E2 /* PBXTextBookmark */;
 			6D475AFC103C50CE009DB4E2 = 6D475AFC103C50CE009DB4E2 /* PBXTextBookmark */;
-			6D475AFD103C50CE009DB4E2 = 6D475AFD103C50CE009DB4E2 /* PBXTextBookmark */;
-			6D475AFE103C50CE009DB4E2 = 6D475AFE103C50CE009DB4E2 /* PBXTextBookmark */;
-			6D475AFF103C50CE009DB4E2 = 6D475AFF103C50CE009DB4E2 /* PBXTextBookmark */;
-			6D475B00103C50CE009DB4E2 = 6D475B00103C50CE009DB4E2 /* PBXTextBookmark */;
-			6D475B02103C50CE009DB4E2 = 6D475B02103C50CE009DB4E2 /* PBXTextBookmark */;
-			6D475B03103C50CE009DB4E2 = 6D475B03103C50CE009DB4E2 /* PBXTextBookmark */;
-			6D475B04103C50CE009DB4E2 = 6D475B04103C50CE009DB4E2 /* PBXTextBookmark */;
-			6D475B05103C50CE009DB4E2 = 6D475B05103C50CE009DB4E2 /* PBXTextBookmark */;
-			6D475B08103C50CE009DB4E2 = 6D475B08103C50CE009DB4E2 /* PBXTextBookmark */;
-			6D475B09103C50CE009DB4E2 = 6D475B09103C50CE009DB4E2 /* PBXTextBookmark */;
 			6D475B0B103C50CE009DB4E2 = 6D475B0B103C50CE009DB4E2 /* PBXTextBookmark */;
-			6D475B0D103C50CE009DB4E2 = 6D475B0D103C50CE009DB4E2 /* PBXTextBookmark */;
-			6D475B0E103C50CE009DB4E2 = 6D475B0E103C50CE009DB4E2 /* PBXTextBookmark */;
 			6D475B0F103C50CE009DB4E2 = 6D475B0F103C50CE009DB4E2 /* PBXTextBookmark */;
-			6D475B11103C50CE009DB4E2 = 6D475B11103C50CE009DB4E2 /* PBXTextBookmark */;
-			6D475B15103C50CE009DB4E2 = 6D475B15103C50CE009DB4E2 /* PBXTextBookmark */;
-			6D475B25103C50CE009DB4E2 = 6D475B25103C50CE009DB4E2 /* PBXTextBookmark */;
-			6D475B2B103C50CE009DB4E2 = 6D475B2B103C50CE009DB4E2 /* PBXTextBookmark */;
-			6DD3B7DA112E6EF400FF73F4 /* PBXTextBookmark */ = 6DD3B7DA112E6EF400FF73F4 /* PBXTextBookmark */;
-			6DD3B7DB112E6EF400FF73F4 /* PBXTextBookmark */ = 6DD3B7DB112E6EF400FF73F4 /* PBXTextBookmark */;
-			6DD55619112DA8D800BA57AE = 6DD55619112DA8D800BA57AE /* PBXTextBookmark */;
-			6DD5561A112DA8D800BA57AE = 6DD5561A112DA8D800BA57AE /* PBXTextBookmark */;
-			6DD8F35B1105B82700A5CC5B = 6DD8F35B1105B82700A5CC5B /* PBXTextBookmark */;
-			6DD8F35C1105B82700A5CC5B = 6DD8F35C1105B82700A5CC5B /* PBXTextBookmark */;
-			6DE3BEB310501DB00074C72E = 6DE3BEB310501DB00074C72E /* PBXTextBookmark */;
-			6DE9119710D24B1B003F0B29 = 6DE9119710D24B1B003F0B29 /* PBXTextBookmark */;
-			6DECAF30103EDEC600699E89 = 6DECAF30103EDEC600699E89 /* PBXTextBookmark */;
-			6DECAF31103EDEC600699E89 = 6DECAF31103EDEC600699E89 /* PBXTextBookmark */;
+			6D62438F14069C80009BDE9A = 6D62438F14069C80009BDE9A /* PBXTextBookmark */;
+			6DD04F3E113D763C00B55104 = 6DD04F3E113D763C00B55104 /* PBXTextBookmark */;
+			6DD04F42113D763C00B55104 = 6DD04F42113D763C00B55104 /* PBXTextBookmark */;
+			6DE1384112DF4A5700579496 = 6DE1384112DF4A5700579496 /* PBXTextBookmark */;
+			6DE1384212DF4A5700579496 = 6DE1384212DF4A5700579496 /* PBXTextBookmark */;
+			6DE38B8712E72FAC00872A9D = 6DE38B8712E72FAC00872A9D /* PBXTextBookmark */;
 			6DECAF32103EDEC600699E89 = 6DECAF32103EDEC600699E89 /* PBXTextBookmark */;
 		};
@@ -442,5 +434,5 @@
 		name = "QuartzAppTest.cpp: 42";
 		rLen = 0;
-		rLoc = 716;
+		rLoc = 1005;
 		rType = 0;
 		vrLen = 584;
@@ -456,7 +448,7 @@
 	6D106876067DC8FC009E5976 /* QuartzAppTest.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {814, 2520}}";
-			sepNavSelRange = "{3794, 0}";
-			sepNavVisRect = "{{0, 2104}, {814, 401}}";
+			sepNavIntBoundsRect = "{{0, 0}, {728, 3500}}";
+			sepNavSelRange = "{7041, 0}";
+			sepNavVisRect = "{{0, 3074}, {728, 426}}";
 		};
 	};
@@ -496,7 +488,7 @@
 	6D189BFE0619C1F5009E5976 /* piwdgquartz.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {727, 1848}}";
-			sepNavSelRange = "{870, 0}";
-			sepNavVisRect = "{{0, 1109}, {727, 407}}";
+			sepNavIntBoundsRect = "{{0, 0}, {800, 1904}}";
+			sepNavSelRange = "{3711, 0}";
+			sepNavVisRect = "{{0, 1333}, {800, 401}}";
 			sepNavWindowFrame = "{{15, 33}, {936, 964}}";
 		};
@@ -504,33 +496,227 @@
 	6D189BFF0619C1F5009E5976 /* piwdgquartz.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {802, 4298}}";
-			sepNavSelRange = "{502, 0}";
-			sepNavVisRect = "{{0, 78}, {802, 405}}";
+			sepNavIntBoundsRect = "{{0, 0}, {800, 4284}}";
+			sepNavSelRange = "{6572, 0}";
+			sepNavVisRect = "{{0, 3883}, {800, 401}}";
 			sepNavWindowFrame = "{{15, 53}, {838, 944}}";
 		};
 	};
-	6D24D0E8108F71D400C9A36C /* PBXTextBookmark */ = {
+	6D41F30A064771A8009E5976 /* PIContainerQuartz.h */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {767, 591}}";
+			sepNavSelRange = "{565, 0}";
+			sepNavVisRect = "{{0, 0}, {767, 591}}";
+		};
+	};
+	6D41F30B064771A8009E5976 /* PIContainerQuartz.cpp */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {767, 591}}";
+			sepNavSelRange = "{323, 0}";
+			sepNavVisRect = "{{0, 0}, {767, 591}}";
+		};
+	};
+	6D45E1B01499067500CE9FAB /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6DD04EE3113D3FCB00B55104 /* pieventquartz.h */;
+		name = "pieventquartz.h: 6";
+		rLen = 0;
+		rLoc = 75;
+		rType = 0;
+		vrLen = 217;
+		vrLoc = 0;
+	};
+	6D45E1B11499067500CE9FAB /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6D45E1B21499067500CE9FAB /* pitherm.h */;
+		name = "(null): 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 1193;
+		vrLoc = 0;
+	};
+	6D45E1B21499067500CE9FAB /* pitherm.h */ = {
+		isa = PBXFileReference;
+		lastKnownFileType = sourcecode.c.h;
+		name = pitherm.h;
+		path = /Users/brunomansoux/Programmes/PI4Mac/PI/pitherm.h;
+		sourceTree = "<absolute>";
+	};
+	6D45E1B31499067500CE9FAB /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6D6F13300D64550C00583608 /* pifontquartz.cpp */;
+		name = "pifontquartz.cpp: 14";
+		rLen = 0;
+		rLoc = 352;
+		rType = 0;
+		vrLen = 815;
+		vrLoc = 0;
+	};
+	6D45E1B41499067500CE9FAB /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 6D6F137F0D6458E200583608 /* pigraphquartz.cpp */;
-		name = "pigraphquartz.cpp: 140";
-		rLen = 0;
-		rLoc = 3976;
-		rType = 0;
-		vrLen = 958;
-		vrLoc = 3174;
-	};
-	6D41F30A064771A8009E5976 /* PIContainerQuartz.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {727, 859}}";
-			sepNavSelRange = "{634, 0}";
-			sepNavVisRect = "{{0, 0}, {727, 859}}";
-		};
-	};
-	6D41F30B064771A8009E5976 /* PIContainerQuartz.cpp */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {727, 859}}";
-			sepNavSelRange = "{658, 23}";
-			sepNavVisRect = "{{0, 0}, {727, 859}}";
-		};
+		name = "PIGraphicQuartz::DrawCircle";
+		rLen = 27;
+		rLoc = 4736;
+		rType = 0;
+		vrLen = 648;
+		vrLoc = 4340;
+	};
+	6D45E1B51499067500CE9FAB /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6D6F12F30D644DA100583608 /* pigraphquartz.h */;
+		name = DrawCircle;
+		rLen = 10;
+		rLoc = 1350;
+		rType = 0;
+		vrLen = 2539;
+		vrLoc = 764;
+	};
+	6D45E1B61499067500CE9FAB /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6DD04EE3113D3FCB00B55104 /* pieventquartz.h */;
+		name = "pieventquartz.h: 6";
+		rLen = 0;
+		rLoc = 75;
+		rType = 0;
+		vrLen = 217;
+		vrLoc = 0;
+	};
+	6D45E1B71499067500CE9FAB /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6D45E1B81499067500CE9FAB /* pitherm.h */;
+		name = "(null): 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 1193;
+		vrLoc = 0;
+	};
+	6D45E1B81499067500CE9FAB /* pitherm.h */ = {
+		isa = PBXFileReference;
+		lastKnownFileType = sourcecode.c.h;
+		name = pitherm.h;
+		path = /Users/brunomansoux/Programmes/PI4Mac/PI/pitherm.h;
+		sourceTree = "<absolute>";
+	};
+	6D45E1B91499067500CE9FAB /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6D6F13300D64550C00583608 /* pifontquartz.cpp */;
+		name = "pifontquartz.cpp: 14";
+		rLen = 0;
+		rLoc = 352;
+		rType = 0;
+		vrLen = 815;
+		vrLoc = 0;
+	};
+	6D45E1BA1499067500CE9FAB /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6D6F137F0D6458E200583608 /* pigraphquartz.cpp */;
+		name = "pigraphquartz.cpp: 240";
+		rLen = 0;
+		rLoc = 5874;
+		rType = 0;
+		vrLen = 1102;
+		vrLoc = 20780;
+	};
+	6D45E1BB1499067500CE9FAB /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6D6F12F30D644DA100583608 /* pigraphquartz.h */;
+		name = DrawCircle;
+		rLen = 10;
+		rLoc = 1350;
+		rType = 0;
+		vrLen = 2539;
+		vrLoc = 764;
+	};
+	6D45E1BC1499067500CE9FAB /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6D6F137F0D6458E200583608 /* pigraphquartz.cpp */;
+		name = "PIGraphicQuartz::DrawCircle";
+		rLen = 27;
+		rLoc = 4736;
+		rType = 0;
+		vrLen = 648;
+		vrLoc = 4340;
+	};
+	6D45E1BD1499067500CE9FAB /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6D6F12F30D644DA100583608 /* pigraphquartz.h */;
+		name = "pigraphquartz.h: GetCGContext";
+		rLen = 0;
+		rLoc = 4040;
+		rType = 0;
+		vrLen = 1928;
+		vrLoc = 693;
+	};
+	6D45E1BE1499067500CE9FAB /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6D106876067DC8FC009E5976 /* QuartzAppTest.cpp */;
+		name = "QuartzAppTest.cpp: 233";
+		rLen = 0;
+		rLoc = 7041;
+		rType = 0;
+		vrLen = 772;
+		vrLoc = 6632;
+	};
+	6D45E1BF1499067500CE9FAB /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6D6F137F0D6458E200583608 /* pigraphquartz.cpp */;
+		name = "pigraphquartz.cpp: 818";
+		rLen = 0;
+		rLoc = 19511;
+		rType = 0;
+		vrLen = 623;
+		vrLoc = 20128;
+	};
+	6D45E1C01499067500CE9FAB /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6D106876067DC8FC009E5976 /* QuartzAppTest.cpp */;
+		name = "QuartzAppTest.cpp: 72";
+		rLen = 0;
+		rLoc = 1452;
+		rType = 0;
+		vrLen = 681;
+		vrLoc = 0;
+	};
+	6D45E1C11499067500CE9FAB /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6D6F137F0D6458E200583608 /* pigraphquartz.cpp */;
+		name = "pigraphquartz.cpp: 818";
+		rLen = 0;
+		rLoc = 19511;
+		rType = 0;
+		vrLen = 625;
+		vrLoc = 20128;
+	};
+	6D45E1C21499067500CE9FAB /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6D106876067DC8FC009E5976 /* QuartzAppTest.cpp */;
+		name = "QuartzAppTest.cpp: 233";
+		rLen = 0;
+		rLoc = 7041;
+		rType = 0;
+		vrLen = 772;
+		vrLoc = 6632;
+	};
+	6D45E1C31499067500CE9FAB /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6D6F137F0D6458E200583608 /* pigraphquartz.cpp */;
+		name = "pigraphquartz.cpp: 818";
+		rLen = 0;
+		rLoc = 19511;
+		rType = 0;
+		vrLen = 623;
+		vrLoc = 20128;
+	};
+	6D45E1C41499067500CE9FAB /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6D6F137F0D6458E200583608 /* pigraphquartz.cpp */;
+		name = "pigraphquartz.cpp: 279";
+		rLen = 0;
+		rLoc = 6617;
+		rType = 0;
+		vrLen = 0;
+		vrLoc = 0;
 	};
 	6D475934103C205F009DB4E2 /* PBXTextBookmark */ = {
@@ -549,39 +735,9 @@
 		name = "pibwdgquartz.h: 44";
 		rLen = 0;
-		rLoc = 1197;
+		rLoc = 2211;
 		rType = 0;
 		vrLen = 1800;
 		vrLoc = 29;
 	};
-	6D47593A103C205F009DB4E2 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6D189BFE0619C1F5009E5976 /* piwdgquartz.h */;
-		name = "piwdgquartz.h: RemoveEventHandler";
-		rLen = 0;
-		rLoc = 2932;
-		rType = 0;
-		vrLen = 1760;
-		vrLoc = 0;
-	};
-	6D475941103C205F009DB4E2 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6D189BFF0619C1F5009E5976 /* piwdgquartz.cpp */;
-		name = "piwdgquartz.cpp: 10";
-		rLen = 0;
-		rLoc = 111;
-		rType = 0;
-		vrLen = 1249;
-		vrLoc = 0;
-	};
-	6D47595E103C205F009DB4E2 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6D98FCF5062C1CDB009E5976 /* PIWindowQuartz.cpp */;
-		name = "PIWindowQuartz.cpp: 22";
-		rLen = 0;
-		rLoc = 498;
-		rType = 0;
-		vrLen = 1418;
-		vrLoc = 0;
-	};
 	6D47596F103C205F009DB4E2 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
@@ -589,5 +745,5 @@
 		name = "pigraphquartz.cpp: 32";
 		rLen = 0;
-		rLoc = 886;
+		rLoc = 734;
 		rType = 0;
 		vrLen = 1654;
@@ -599,5 +755,5 @@
 		name = "pibwdgquartz.h: 44";
 		rLen = 0;
-		rLoc = 1197;
+		rLoc = 2211;
 		rType = 0;
 		vrLen = 1795;
@@ -619,39 +775,9 @@
 		name = CGContextRef;
 		rLen = 12;
-		rLoc = 4548;
+		rLoc = 4874;
 		rType = 0;
 		vrLen = 2835;
 		vrLoc = 0;
 	};
-	6D475A1B103C320A009DB4E2 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6D7D4E5506673450009E5976 /* PIMenuQuartz.h */;
-		name = "PIMenuQuartz.h: parent";
-		rLen = 0;
-		rLoc = 2013;
-		rType = 0;
-		vrLen = 595;
-		vrLoc = 1565;
-	};
-	6D475A20103C320A009DB4E2 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6DEA831E0C7F162300B7D5DD /* pistdwdgquartz.h */;
-		name = "pistdwdgquartz.h: 4";
-		rLen = 0;
-		rLoc = 78;
-		rType = 0;
-		vrLen = 806;
-		vrLoc = 171;
-	};
-	6D475A25103C320A009DB4E2 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6D98FCF4062C1CDB009E5976 /* PIWindowQuartz.h */;
-		name = "PIWindowQuartz.h: wParent";
-		rLen = 0;
-		rLoc = 1619;
-		rType = 0;
-		vrLen = 930;
-		vrLoc = 736;
-	};
 	6D475AFC103C50CE009DB4E2 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
@@ -664,104 +790,4 @@
 		vrLoc = 1034;
 	};
-	6D475AFD103C50CE009DB4E2 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6D189BFE0619C1F5009E5976 /* piwdgquartz.h */;
-		name = "piwdgquartz.h: 42";
-		rLen = 0;
-		rLoc = 870;
-		rType = 0;
-		vrLen = 1124;
-		vrLoc = 2402;
-	};
-	6D475AFE103C50CE009DB4E2 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6DE18B850E837AD800414227 /* pioptmenuquartz.cpp */;
-		name = "pioptmenuquartz.cpp: 36";
-		rLen = 0;
-		rLoc = 601;
-		rType = 0;
-		vrLen = 1179;
-		vrLoc = 37;
-	};
-	6D475AFF103C50CE009DB4E2 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6D7D4E5506673450009E5976 /* PIMenuQuartz.h */;
-		name = "PIMenuQuartz.h: parent";
-		rLen = 0;
-		rLoc = 2013;
-		rType = 0;
-		vrLen = 1884;
-		vrLoc = 0;
-	};
-	6D475B00103C50CE009DB4E2 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6D7D4E5606673450009E5976 /* PIMenuQuartz.cpp */;
-		name = "PIMenuQuartz.cpp: GetNumItemMsg";
-		rLen = 0;
-		rLoc = 8237;
-		rType = 0;
-		vrLen = 1844;
-		vrLoc = 837;
-	};
-	6D475B02103C50CE009DB4E2 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6DFD5AD406774017009E5976 /* PIApplQuartz.h */;
-		name = "PIApplQuartz.h: 27";
-		rLen = 0;
-		rLoc = 579;
-		rType = 0;
-		vrLen = 1516;
-		vrLoc = 0;
-	};
-	6D475B03103C50CE009DB4E2 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6DFD5AD506774017009E5976 /* PIApplQuartz.cpp */;
-		name = "PIApplQuartz.cpp: 27";
-		rLen = 0;
-		rLoc = 685;
-		rType = 0;
-		vrLen = 1540;
-		vrLoc = 34;
-	};
-	6D475B04103C50CE009DB4E2 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6D41F30A064771A8009E5976 /* PIContainerQuartz.h */;
-		name = "PIContainerQuartz.h: GetWindowRef";
-		rLen = 0;
-		rLoc = 634;
-		rType = 0;
-		vrLen = 719;
-		vrLoc = 0;
-	};
-	6D475B05103C50CE009DB4E2 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6D189BFF0619C1F5009E5976 /* piwdgquartz.cpp */;
-		name = "piwdgquartz.cpp: 18";
-		rLen = 0;
-		rLoc = 452;
-		rType = 0;
-		vrLen = 1330;
-		vrLoc = 0;
-	};
-	6D475B08103C50CE009DB4E2 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6DEA831E0C7F162300B7D5DD /* pistdwdgquartz.h */;
-		name = "pistdwdgquartz.h: 120";
-		rLen = 0;
-		rLoc = 3041;
-		rType = 0;
-		vrLen = 1569;
-		vrLoc = 1739;
-	};
-	6D475B09103C50CE009DB4E2 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6DEA83220C7F166500B7D5DD /* pistdwdgquartz.cpp */;
-		name = "pistdwdgquartz.cpp: 286";
-		rLen = 0;
-		rLoc = 7169;
-		rType = 0;
-		vrLen = 1712;
-		vrLoc = 5655;
-	};
 	6D475B0B103C50CE009DB4E2 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
@@ -774,24 +800,4 @@
 		vrLoc = 1034;
 	};
-	6D475B0D103C50CE009DB4E2 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6DE18B850E837AD800414227 /* pioptmenuquartz.cpp */;
-		name = "pioptmenuquartz.cpp: 36";
-		rLen = 0;
-		rLoc = 601;
-		rType = 0;
-		vrLen = 1179;
-		vrLoc = 37;
-	};
-	6D475B0E103C50CE009DB4E2 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6DEA83220C7F166500B7D5DD /* pistdwdgquartz.cpp */;
-		name = "pistdwdgquartz.cpp: 347";
-		rLen = 0;
-		rLoc = 8728;
-		rType = 0;
-		vrLen = 1510;
-		vrLoc = 7251;
-	};
 	6D475B0F103C50CE009DB4E2 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
@@ -799,48 +805,8 @@
 		name = "QuartzAppTest.cpp: 75";
 		rLen = 0;
-		rLoc = 1631;
+		rLoc = 2772;
 		rType = 0;
 		vrLen = 1801;
 		vrLoc = 1067;
-	};
-	6D475B11103C50CE009DB4E2 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6D7D4E5606673450009E5976 /* PIMenuQuartz.cpp */;
-		name = "PIMenuQuartz.cpp: GetNumItemMsg";
-		rLen = 0;
-		rLoc = 8237;
-		rType = 0;
-		vrLen = 1844;
-		vrLoc = 837;
-	};
-	6D475B15103C50CE009DB4E2 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6DFD5AD506774017009E5976 /* PIApplQuartz.cpp */;
-		name = "PIApplQuartz.cpp: 27";
-		rLen = 0;
-		rLoc = 685;
-		rType = 0;
-		vrLen = 1538;
-		vrLoc = 0;
-	};
-	6D475B25103C50CE009DB4E2 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6D41F30A064771A8009E5976 /* PIContainerQuartz.h */;
-		name = "PIContainerQuartz.h: GetWindowRef";
-		rLen = 0;
-		rLoc = 634;
-		rType = 0;
-		vrLen = 719;
-		vrLoc = 0;
-	};
-	6D475B2B103C50CE009DB4E2 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6DFD5AD406774017009E5976 /* PIApplQuartz.h */;
-		name = "PIApplQuartz.h: 27";
-		rLen = 0;
-		rLoc = 579;
-		rType = 0;
-		vrLen = 1516;
-		vrLoc = 0;
 	};
 	6D526BF706624488009E5976 /* picontainergen.cc */ = {
@@ -853,14 +819,14 @@
 	6D526BFA06624512009E5976 /* picontainergen.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1048, 1036}}";
-			sepNavSelRange = "{299, 17}";
-			sepNavVisRect = "{{0, 0}, {1048, 360}}";
+			sepNavIntBoundsRect = "{{0, 0}, {767, 1036}}";
+			sepNavSelRange = "{1545, 0}";
+			sepNavVisRect = "{{0, 433}, {767, 591}}";
 		};
 	};
 	6D526C000662461A009E5976 /* piwdggen.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {727, 2198}}";
+			sepNavIntBoundsRect = "{{0, 0}, {765, 2198}}";
 			sepNavSelRange = "{709, 0}";
-			sepNavVisRect = "{{0, 624}, {727, 407}}";
+			sepNavVisRect = "{{0, 417}, {765, 414}}";
 			sepNavWindowFrame = "{{15, 53}, {1136, 944}}";
 		};
@@ -937,4 +903,21 @@
 		);
 	};
+	6D622CD80D8ECB6300428D9A /* BaoAdc-Info.plist */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {973, 401}}";
+			sepNavSelRange = "{0, 0}";
+			sepNavVisRect = "{{0, 0}, {973, 401}}";
+		};
+	};
+	6D62438F14069C80009BDE9A /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6D6F137F0D6458E200583608 /* pigraphquartz.cpp */;
+		name = "pigraphquartz.cpp: 279";
+		rLen = 0;
+		rLoc = 6617;
+		rType = 0;
+		vrLen = 0;
+		vrLoc = 0;
+	};
 	6D6F12700D6446D500583608 /* machdefs.h */ = {
 		uiCtxt = {
@@ -954,7 +937,7 @@
 	6D6F12F30D644DA100583608 /* pigraphquartz.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {727, 1722}}";
-			sepNavSelRange = "{4635, 0}";
-			sepNavVisRect = "{{0, 849}, {727, 859}}";
+			sepNavIntBoundsRect = "{{0, 0}, {728, 1848}}";
+			sepNavSelRange = "{4040, 0}";
+			sepNavVisRect = "{{0, 394}, {728, 414}}";
 			sepNavWindowFrame = "{{15, 52}, {1242, 945}}";
 		};
@@ -969,7 +952,7 @@
 	6D6F13300D64550C00583608 /* pifontquartz.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {657, 3080}}";
+			sepNavIntBoundsRect = "{{0, 0}, {728, 3080}}";
 			sepNavSelRange = "{352, 0}";
-			sepNavVisRect = "{{0, 0}, {657, 854}}";
+			sepNavVisRect = "{{0, 0}, {728, 541}}";
 		};
 	};
@@ -990,7 +973,7 @@
 	6D6F137F0D6458E200583608 /* pigraphquartz.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {814, 12796}}";
-			sepNavSelRange = "{7203, 0}";
-			sepNavVisRect = "{{0, 3822}, {814, 421}}";
+			sepNavIntBoundsRect = "{{0, 0}, {728, 13062}}";
+			sepNavSelRange = "{6617, 0}";
+			sepNavVisRect = "{{0, 0}, {0, 0}}";
 		};
 	};
@@ -1075,7 +1058,7 @@
 	6D7D4E510667277A009E5976 /* PIMenuBarQuartz.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {727, 2142}}";
-			sepNavSelRange = "{569, 0}";
-			sepNavVisRect = "{{0, 136}, {727, 415}}";
+			sepNavIntBoundsRect = "{{0, 0}, {973, 2142}}";
+			sepNavSelRange = "{3692, 0}";
+			sepNavVisRect = "{{0, 1702}, {973, 440}}";
 			sepNavWindowFrame = "{{15, 53}, {1136, 944}}";
 		};
@@ -1083,14 +1066,14 @@
 	6D7D4E5506673450009E5976 /* PIMenuQuartz.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {727, 1148}}";
+			sepNavIntBoundsRect = "{{0, 0}, {767, 1148}}";
 			sepNavSelRange = "{2013, 0}";
-			sepNavVisRect = "{{0, 0}, {727, 859}}";
+			sepNavVisRect = "{{0, 265}, {767, 603}}";
 		};
 	};
 	6D7D4E5606673450009E5976 /* PIMenuQuartz.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {727, 4732}}";
-			sepNavSelRange = "{8237, 0}";
-			sepNavVisRect = "{{0, 456}, {727, 859}}";
+			sepNavIntBoundsRect = "{{0, 0}, {973, 4732}}";
+			sepNavSelRange = "{423, 0}";
+			sepNavVisRect = "{{0, 0}, {973, 440}}";
 			sepNavWindowFrame = "{{15, 53}, {1136, 944}}";
 		};
@@ -1098,14 +1081,14 @@
 	6D98FCF4062C1CDB009E5976 /* PIWindowQuartz.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {727, 896}}";
-			sepNavSelRange = "{1619, 0}";
-			sepNavVisRect = "{{0, 37}, {727, 859}}";
+			sepNavIntBoundsRect = "{{0, 0}, {767, 868}}";
+			sepNavSelRange = "{1515, 0}";
+			sepNavVisRect = "{{0, 277}, {767, 591}}";
 		};
 	};
 	6D98FCF5062C1CDB009E5976 /* PIWindowQuartz.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {727, 2030}}";
-			sepNavSelRange = "{1018, 0}";
-			sepNavVisRect = "{{0, 0}, {727, 859}}";
+			sepNavIntBoundsRect = "{{0, 0}, {754, 2044}}";
+			sepNavSelRange = "{1941, 0}";
+			sepNavVisRect = "{{0, 945}, {754, 445}}";
 			sepNavWindowFrame = "{{15, 53}, {1136, 944}}";
 		};
@@ -1113,69 +1096,43 @@
 	6DC3740A070405C7009E5976 /* todo.txt */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {727, 187}}";
-			sepNavSelRange = "{260, 0}";
-			sepNavVisRect = "{{0, 0}, {727, 187}}";
+			sepNavIntBoundsRect = "{{0, 0}, {772, 840}}";
+			sepNavSelRange = "{189, 0}";
+			sepNavVisRect = "{{0, 0}, {772, 840}}";
 			sepNavWindowFrame = "{{15, 33}, {811, 969}}";
 		};
 	};
-	6DD3B7DA112E6EF400FF73F4 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6D106876067DC8FC009E5976 /* QuartzAppTest.cpp */;
-		name = "QuartzAppTest.cpp: 165";
-		rLen = 0;
-		rLoc = 3794;
-		rType = 0;
-		vrLen = 693;
-		vrLoc = 3455;
-	};
-	6DD3B7DB112E6EF400FF73F4 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6D6F137F0D6458E200583608 /* pigraphquartz.cpp */;
-		name = "pigraphquartz.cpp: 289";
-		rLen = 0;
-		rLoc = 7203;
-		rType = 0;
-		vrLen = 854;
-		vrLoc = 6872;
-	};
-	6DD55619112DA8D800BA57AE /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6D106876067DC8FC009E5976 /* QuartzAppTest.cpp */;
-		name = "QuartzAppTest.cpp: 165";
-		rLen = 0;
-		rLoc = 3794;
-		rType = 0;
-		vrLen = 693;
-		vrLoc = 3455;
-	};
-	6DD5561A112DA8D800BA57AE /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6D6F137F0D6458E200583608 /* pigraphquartz.cpp */;
-		name = "pigraphquartz.cpp: 289";
-		rLen = 0;
-		rLoc = 7203;
-		rType = 0;
-		vrLen = 854;
-		vrLoc = 6872;
-	};
-	6DD8F35B1105B82700A5CC5B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6D106876067DC8FC009E5976 /* QuartzAppTest.cpp */;
-		name = "QuartzAppTest.cpp: 165";
-		rLen = 0;
-		rLoc = 3794;
-		rType = 0;
-		vrLen = 693;
-		vrLoc = 3455;
-	};
-	6DD8F35C1105B82700A5CC5B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6D6F137F0D6458E200583608 /* pigraphquartz.cpp */;
-		name = "pigraphquartz.cpp: 289";
-		rLen = 0;
-		rLoc = 7203;
-		rType = 0;
-		vrLen = 854;
-		vrLoc = 6872;
+	6DD04EE3113D3FCB00B55104 /* pieventquartz.h */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {754, 549}}";
+			sepNavSelRange = "{75, 0}";
+			sepNavVisRect = "{{0, 0}, {754, 549}}";
+		};
+	};
+	6DD04EE4113D3FCB00B55104 /* pieventquartz.cpp */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {767, 1274}}";
+			sepNavSelRange = "{151, 0}";
+			sepNavVisRect = "{{0, 0}, {767, 603}}";
+		};
+	};
+	6DD04F3E113D763C00B55104 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6DD04EE3113D3FCB00B55104 /* pieventquartz.h */;
+		name = "pieventquartz.h: 6";
+		rLen = 0;
+		rLoc = 75;
+		rType = 0;
+		vrLen = 217;
+		vrLoc = 0;
+	};
+	6DD04F42113D763C00B55104 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6DD04EE3113D3FCB00B55104 /* pieventquartz.h */;
+		name = "pieventquartz.h: 6";
+		rLen = 0;
+		rLoc = 75;
+		rType = 0;
+		vrLen = 217;
+		vrLoc = 0;
 	};
 	6DDB77DC0663260E009E5976 /* piapplgen.cc */ = {
@@ -1238,7 +1195,7 @@
 	6DDB77E80663268E009E5976 /* piwindowgen.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 821}}";
+			sepNavIntBoundsRect = "{{0, 0}, {765, 532}}";
 			sepNavSelRange = "{274, 0}";
-			sepNavVisRect = "{{0, 0}, {931, 821}}";
+			sepNavVisRect = "{{0, 76}, {765, 450}}";
 			sepNavWindowFrame = "{{15, 47}, {970, 950}}";
 		};
@@ -1251,4 +1208,24 @@
 		};
 	};
+	6DE1384112DF4A5700579496 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6D106876067DC8FC009E5976 /* QuartzAppTest.cpp */;
+		name = "QuartzAppTest.cpp: 221";
+		rLen = 0;
+		rLoc = 6888;
+		rType = 0;
+		vrLen = 864;
+		vrLoc = 6018;
+	};
+	6DE1384212DF4A5700579496 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6D6F12F30D644DA100583608 /* pigraphquartz.h */;
+		name = "GetCGContext()";
+		rLen = 14;
+		rLoc = 4023;
+		rType = 0;
+		vrLen = 752;
+		vrLoc = 4257;
+	};
 	6DE18B840E837AD800414227 /* pioptmenuquartz.h */ = {
 		uiCtxt = {
@@ -1260,7 +1237,7 @@
 	6DE18B850E837AD800414227 /* pioptmenuquartz.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1048, 1008}}";
-			sepNavSelRange = "{601, 0}";
-			sepNavVisRect = "{{0, 331}, {1048, 360}}";
+			sepNavIntBoundsRect = "{{0, 0}, {973, 1008}}";
+			sepNavSelRange = "{0, 0}";
+			sepNavVisRect = "{{0, 0}, {973, 440}}";
 			sepNavWindowFrame = "{{199, 52}, {970, 950}}";
 		};
@@ -1282,7 +1259,7 @@
 	6DE18C180E83E91700414227 /* pibwdgquartz.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {657, 896}}";
-			sepNavSelRange = "{1197, 0}";
-			sepNavVisRect = "{{0, 42}, {657, 854}}";
+			sepNavIntBoundsRect = "{{0, 0}, {754, 1218}}";
+			sepNavSelRange = "{1293, 0}";
+			sepNavVisRect = "{{0, 140}, {754, 884}}";
 			sepNavWindowFrame = "{{15, 46}, {1069, 951}}";
 		};
@@ -1290,18 +1267,18 @@
 	6DE18C190E83E91700414227 /* pibwdgquartz.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {727, 1064}}";
-			sepNavSelRange = "{492, 0}";
-			sepNavVisRect = "{{0, 0}, {727, 859}}";
-		};
-	};
-	6DE3BEB310501DB00074C72E /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6DEA83220C7F166500B7D5DD /* pistdwdgquartz.cpp */;
-		name = "pistdwdgquartz.cpp: 286";
-		rLen = 0;
-		rLoc = 7185;
-		rType = 0;
-		vrLen = 769;
-		vrLoc = 6600;
+			sepNavIntBoundsRect = "{{0, 0}, {1766, 2688}}";
+			sepNavSelRange = "{4067, 0}";
+			sepNavVisRect = "{{702, 1863}, {754, 549}}";
+		};
+	};
+	6DE38B8712E72FAC00872A9D /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6DE18C180E83E91700414227 /* pibwdgquartz.h */;
+		name = "pibwdgquartz.h: 41";
+		rLen = 0;
+		rLoc = 1293;
+		rType = 0;
+		vrLen = 2381;
+		vrLoc = 138;
 	};
 	6DE7443F0C7C2E390051D656 /* xp0.cc */ = {
@@ -1352,14 +1329,4 @@
 		};
 	};
-	6DE9119710D24B1B003F0B29 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6DFD5AD506774017009E5976 /* PIApplQuartz.cpp */;
-		name = "PIApplQuartz.cpp: 32";
-		rLen = 0;
-		rLoc = 757;
-		rType = 0;
-		vrLen = 788;
-		vrLoc = 632;
-	};
 	6DEA07D30C88612B0016C028 /* PIT0 */ = {
 		activeExec = 0;
@@ -1434,14 +1401,14 @@
 	6DEA831E0C7F162300B7D5DD /* pistdwdgquartz.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {727, 1848}}";
-			sepNavSelRange = "{3041, 0}";
-			sepNavVisRect = "{{0, 989}, {727, 859}}";
+			sepNavIntBoundsRect = "{{0, 0}, {767, 1848}}";
+			sepNavSelRange = "{460, 0}";
+			sepNavVisRect = "{{0, 0}, {767, 603}}";
 		};
 	};
 	6DEA83220C7F166500B7D5DD /* pistdwdgquartz.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {778, 4998}}";
-			sepNavSelRange = "{7185, 0}";
-			sepNavVisRect = "{{0, 3768}, {778, 446}}";
+			sepNavIntBoundsRect = "{{0, 0}, {767, 4998}}";
+			sepNavSelRange = "{6079, 0}";
+			sepNavVisRect = "{{0, 3220}, {767, 603}}";
 			sepNavWindowFrame = "{{15, 53}, {1136, 944}}";
 		};
@@ -1453,24 +1420,4 @@
 		);
 	};
-	6DECAF30103EDEC600699E89 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6D98FCF4062C1CDB009E5976 /* PIWindowQuartz.h */;
-		name = "PIWindowQuartz.h: wParent";
-		rLen = 0;
-		rLoc = 1619;
-		rType = 0;
-		vrLen = 1642;
-		vrLoc = 24;
-	};
-	6DECAF31103EDEC600699E89 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6D98FCF5062C1CDB009E5976 /* PIWindowQuartz.cpp */;
-		name = "PIWindowQuartz.cpp: 42";
-		rLen = 0;
-		rLoc = 1018;
-		rType = 0;
-		vrLen = 1318;
-		vrLoc = 0;
-	};
 	6DECAF32103EDEC600699E89 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
@@ -1478,5 +1425,5 @@
 		name = "pigraphquartz.h: PIGraphicWin";
 		rLen = 0;
-		rLoc = 4635;
+		rLoc = 5000;
 		rType = 0;
 		vrLen = 1879;
@@ -1500,14 +1447,15 @@
 	6DF26D160E7FB7EC001AE7EF /* pibwdggen.cc */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {750, 11228}}";
-			sepNavSelRange = "{15441, 53}";
-			sepNavVisRect = "{{0, 6041}, {750, 858}}";
+			sepNavIntBoundsRect = "{{0, 0}, {763, 11228}}";
+			sepNavSelRange = "{5709, 18}";
+			sepNavVisRect = "{{0, 1890}, {763, 533}}";
 		};
 	};
 	6DF26D170E7FB7EC001AE7EF /* pibwdggen.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {881, 2254}}";
-			sepNavSelRange = "{2265, 0}";
-			sepNavVisRect = "{{0, 1190}, {881, 854}}";
+			sepNavIntBoundsRect = "{{0, 0}, {767, 2254}}";
+			sepNavSelRange = "{2026, 0}";
+			sepNavVisRect = "{{0, 0}, {767, 591}}";
+			sepNavWindowFrame = "{{67, 20}, {792, 956}}";
 		};
 	};
@@ -1591,14 +1539,14 @@
 	6DFD5AD406774017009E5976 /* PIApplQuartz.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {727, 859}}";
+			sepNavIntBoundsRect = "{{0, 0}, {767, 770}}";
 			sepNavSelRange = "{579, 0}";
-			sepNavVisRect = "{{0, 0}, {727, 859}}";
+			sepNavVisRect = "{{0, 0}, {767, 603}}";
 		};
 	};
 	6DFD5AD506774017009E5976 /* PIApplQuartz.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {813, 1414}}";
+			sepNavIntBoundsRect = "{{0, 0}, {767, 1414}}";
 			sepNavSelRange = "{757, 0}";
-			sepNavVisRect = "{{0, 336}, {813, 385}}";
+			sepNavVisRect = "{{0, 140}, {767, 603}}";
 		};
 	};
Index: /trunk/SophyaPI/PI/Quartz/PI.xcodeproj/project.pbxproj
===================================================================
--- /trunk/SophyaPI/PI/Quartz/PI.xcodeproj/project.pbxproj	(revision 4076)
+++ /trunk/SophyaPI/PI/Quartz/PI.xcodeproj/project.pbxproj	(revision 4077)
@@ -7,388 +7,120 @@
 	objects = {
 
-/* Begin PBXApplicationTarget section */
-		6D10687D067DC9AB009E5976 /* PIAQTest */ = {
-			isa = PBXApplicationTarget;
-			buildConfigurationList = 6DF29DDD0B71EEB300F55B65 /* Build configuration list for PBXApplicationTarget "PIAQTest" */;
-			buildPhases = (
-				6D106878067DC9AB009E5976 /* Headers */,
-				6D106879067DC9AB009E5976 /* Resources */,
-				6D10687A067DC9AB009E5976 /* Sources */,
-				6D10687B067DC9AB009E5976 /* Frameworks */,
-				6D10687C067DC9AB009E5976 /* Rez */,
-			);
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
-				INSTALL_PATH = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
-				OPTIMIZATION_CFLAGS = "-O0";
-				OTHER_CFLAGS = "-D__MACOSX__";
-				OTHER_LDFLAGS = "";
-				OTHER_REZFLAGS = "";
-				PREBINDING = NO;
-				PRODUCT_NAME = PIAQTest;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = app;
-			};
-			dependencies = (
-			);
-			name = PIAQTest;
-			productInstallPath = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
-			productName = PIAQTest;
-			productReference = 6D10687E067DC9AB009E5976 /* PIAQTest.app */;
-			productSettingsXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
-<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
-<plist version=\"1.0\">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string></string>
-	<key>CFBundleGetInfoString</key>
-	<string></string>
-	<key>CFBundleIconFile</key>
-	<string></string>
-	<key>CFBundleIdentifier</key>
-	<string></string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string></string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string></string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>0.0.1d1</string>
-</dict>
-</plist>
-";
-		};
-		6DE745DF0C7C4F530051D656 /* XP0 */ = {
-			isa = PBXApplicationTarget;
-			buildConfigurationList = 6DE745E90C7C4F530051D656 /* Build configuration list for PBXApplicationTarget "XP0" */;
-			buildPhases = (
-				6DE745E00C7C4F530051D656 /* Headers */,
-				6DE745E20C7C4F530051D656 /* Resources */,
-				6DE745E30C7C4F530051D656 /* Sources */,
-				6DE745E50C7C4F530051D656 /* Frameworks */,
-				6DE745E80C7C4F530051D656 /* Rez */,
-			);
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
-				INSTALL_PATH = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
-				OPTIMIZATION_CFLAGS = "-O0";
-				OTHER_CFLAGS = "-D__MACOSX__";
-				OTHER_LDFLAGS = "";
-				OTHER_REZFLAGS = "";
-				PREBINDING = NO;
-				PRODUCT_NAME = PIAQTest;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = app;
-			};
-			dependencies = (
-			);
-			name = XP0;
-			productInstallPath = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
-			productName = PIAQTest;
-			productReference = 6DE745ED0C7C4F530051D656 /* XP0.app */;
-			productSettingsXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
-<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
-<plist version=\"1.0\">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string></string>
-	<key>CFBundleGetInfoString</key>
-	<string></string>
-	<key>CFBundleIconFile</key>
-	<string></string>
-	<key>CFBundleIdentifier</key>
-	<string></string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string></string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string></string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>0.0.1d1</string>
-</dict>
-</plist>
-";
-		};
-		6DEA07D30C88612B0016C028 /* PIT0 */ = {
-			isa = PBXApplicationTarget;
-			buildConfigurationList = 6DEA07DC0C88612B0016C028 /* Build configuration list for PBXApplicationTarget "PIT0" */;
-			buildPhases = (
-				6DEA07D40C88612B0016C028 /* Headers */,
-				6DEA07D50C88612B0016C028 /* Resources */,
-				6DEA07D60C88612B0016C028 /* Sources */,
-				6DEA07D80C88612B0016C028 /* Frameworks */,
-				6DEA07DB0C88612B0016C028 /* Rez */,
-			);
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
-				INSTALL_PATH = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
-				OPTIMIZATION_CFLAGS = "-O0";
-				OTHER_CFLAGS = "-D__MACOSX__";
-				OTHER_LDFLAGS = "";
-				OTHER_REZFLAGS = "";
-				PREBINDING = NO;
-				PRODUCT_NAME = PIAQTest;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = app;
-			};
-			dependencies = (
-			);
-			name = PIT0;
-			productInstallPath = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
-			productName = PIAQTest;
-			productReference = 6DEA07E00C88612B0016C028 /* PIT0.app */;
-			productSettingsXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
-<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
-<plist version=\"1.0\">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string></string>
-	<key>CFBundleGetInfoString</key>
-	<string></string>
-	<key>CFBundleIconFile</key>
-	<string></string>
-	<key>CFBundleIdentifier</key>
-	<string></string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string></string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string></string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>0.0.1d1</string>
-</dict>
-</plist>
-";
-		};
-		6DEA82650C7ED3A500B7D5DD /* XP1 */ = {
-			isa = PBXApplicationTarget;
-			buildConfigurationList = 6DEA826F0C7ED3A500B7D5DD /* Build configuration list for PBXApplicationTarget "XP1" */;
-			buildPhases = (
-				6DEA82660C7ED3A500B7D5DD /* Headers */,
-				6DEA82680C7ED3A500B7D5DD /* Resources */,
-				6DEA82690C7ED3A500B7D5DD /* Sources */,
-				6DEA826B0C7ED3A500B7D5DD /* Frameworks */,
-				6DEA826E0C7ED3A500B7D5DD /* Rez */,
-			);
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
-				INSTALL_PATH = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
-				OPTIMIZATION_CFLAGS = "-O0";
-				OTHER_CFLAGS = "-D__MACOSX__";
-				OTHER_LDFLAGS = "";
-				OTHER_REZFLAGS = "";
-				PREBINDING = NO;
-				PRODUCT_NAME = PIAQTest;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = app;
-			};
-			dependencies = (
-			);
-			name = XP1;
-			productInstallPath = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
-			productName = PIAQTest;
-			productReference = 6DEA82730C7ED3A500B7D5DD /* XP1.app */;
-			productSettingsXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
-<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
-<plist version=\"1.0\">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string></string>
-	<key>CFBundleGetInfoString</key>
-	<string></string>
-	<key>CFBundleIconFile</key>
-	<string></string>
-	<key>CFBundleIdentifier</key>
-	<string></string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string></string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string></string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>0.0.1d1</string>
-</dict>
-</plist>
-";
-		};
-/* End PBXApplicationTarget section */
-
 /* Begin PBXBuildFile section */
-		089C1668FE841158C02AAC07 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C1666FE841158C02AAC07 /* InfoPlist.strings */; };
-		08FB77ABFE841565C02AAC07 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08FB77AAFE841565C02AAC07 /* Carbon.framework */; };
-		6D0E25040665D32C009E5976 /* pimsghandler.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6D0E25030665D32C009E5976 /* pimsghandler.cc */; };
-		6D0E251D0665D642009E5976 /* pimsghandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D526C020662462C009E5976 /* pimsghandler.h */; };
-		6D0E251E0665D653009E5976 /* PI_Prefix.h in Headers */ = {isa = PBXBuildFile; fileRef = 32BAE0B70371A74B00C91783 /* PI_Prefix.h */; };
-		6D0E25200665D8A2009E5976 /* picolist.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D526C040662464E009E5976 /* picolist.h */; };
-		6D0E25210665E286009E5976 /* picontainergen.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D526BFA06624512009E5976 /* picontainergen.h */; };
-		6D0E25220665E287009E5976 /* picontainergen.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6D526BF706624488009E5976 /* picontainergen.cc */; };
-		6D0E25240665E29E009E5976 /* piwdgquartz.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D189BFE0619C1F5009E5976 /* piwdgquartz.h */; };
-		6D0E25250665E29F009E5976 /* piwdggen.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D526C000662461A009E5976 /* piwdggen.h */; };
-		6D0E25260665E2A9009E5976 /* piwdgquartz.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6D189BFF0619C1F5009E5976 /* piwdgquartz.cpp */; };
-		6D0E25270665E2A9009E5976 /* piwdggen.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6D526C0606624678009E5976 /* piwdggen.cc */; };
-		6D0E25280665E337009E5976 /* pievthandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D526C0A066246A9009E5976 /* pievthandler.h */; };
-		6D0E25290665E337009E5976 /* PIWindowQuartz.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D98FCF4062C1CDB009E5976 /* PIWindowQuartz.h */; };
-		6D0E252B0665E338009E5976 /* PIContainerQuartz.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D41F30A064771A8009E5976 /* PIContainerQuartz.h */; };
-		6D0E252C0665E33A009E5976 /* PIContainerQuartz.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6D41F30B064771A8009E5976 /* PIContainerQuartz.cpp */; };
-		6D0E252D0665E33A009E5976 /* pievthandler.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6D526C0806624689009E5976 /* pievthandler.cc */; };
-		6D0E252E0665E33B009E5976 /* PIWindowQuartz.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6D98FCF5062C1CDB009E5976 /* PIWindowQuartz.cpp */; };
-		6D0E253006661DC2009E5976 /* piwindowgen.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DDB77E80663268E009E5976 /* piwindowgen.h */; };
-		6D0E253106661DC4009E5976 /* piwindowgen.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6DDB77E90663268E009E5976 /* piwindowgen.cc */; };
-		6D106880067DC9B3009E5976 /* QuartzAppTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6D106876067DC8FC009E5976 /* QuartzAppTest.cpp */; };
-		6D106881067DC9B6009E5976 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08FB77AAFE841565C02AAC07 /* Carbon.framework */; };
-		6D622CF60D8ED19100428D9A /* PI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 034768DEFF38A45A11DB9C8B /* PI.framework */; };
-		6D6F12710D6446D500583608 /* machdefs.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D6F12700D6446D500583608 /* machdefs.h */; };
-		6D6F129A0D6448E500583608 /* sopnamsp.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D6F12990D6448E500583608 /* sopnamsp.h */; };
-		6D6F12AE0D644B2B00583608 /* pisysdep.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D6F12AD0D644B2B00583608 /* pisysdep.h */; };
-		6D6F12F40D644DA100583608 /* pigraphquartz.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D6F12F30D644DA100583608 /* pigraphquartz.h */; };
-		6D6F132F0D6454DD00583608 /* pifontquartz.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D6F132E0D6454DD00583608 /* pifontquartz.h */; };
-		6D6F13310D64550C00583608 /* pifontquartz.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6D6F13300D64550C00583608 /* pifontquartz.cpp */; };
-		6D6F134E0D64572500583608 /* picmapquartz.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6D6F134D0D64572500583608 /* picmapquartz.cpp */; };
-		6D6F13500D64573200583608 /* picmapquartz.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D6F134F0D64573200583608 /* picmapquartz.h */; };
-		6D6F13800D6458E200583608 /* pigraphquartz.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6D6F137F0D6458E200583608 /* pigraphquartz.cpp */; };
-		6D6F13AC0D645C3200583608 /* picmap.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D6F13AB0D645C3200583608 /* picmap.h */; };
-		6D6F13B00D645C4D00583608 /* picmap.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6D6F13AD0D645C4D00583608 /* picmap.cc */; };
-		6D6F13B10D645C4D00583608 /* picmapgen.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6D6F13AE0D645C4D00583608 /* picmapgen.cc */; };
-		6D6F13B20D645C4D00583608 /* picmapgen.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D6F13AF0D645C4D00583608 /* picmapgen.h */; };
-		6D6F13C00D645E8B00583608 /* piconsenum.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D6F13BF0D645E8B00583608 /* piconsenum.h */; };
-		6D6F13FE0D64604000583608 /* pigraphgen.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6D6F13F60D64604000583608 /* pigraphgen.cc */; };
-		6D6F13FF0D64604000583608 /* pigratt.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6D6F13F70D64604000583608 /* pigratt.cc */; };
-		6D6F14000D64604000583608 /* pigratt.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D6F13F80D64604000583608 /* pigratt.h */; };
-		6D6F14010D64604000583608 /* pigrcoord.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6D6F13F90D64604000583608 /* pigrcoord.cc */; };
-		6D6F14020D64604000583608 /* pigrcoord.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D6F13FA0D64604000583608 /* pigrcoord.h */; };
-		6D6F14030D64604000583608 /* pilineatt.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6D6F13FB0D64604000583608 /* pilineatt.cc */; };
-		6D6F14040D64604000583608 /* pilineatt.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D6F13FC0D64604000583608 /* pilineatt.h */; };
-		6D6F14050D64604000583608 /* psfile.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6D6F13FD0D64604000583608 /* psfile.cc */; };
-		6D6F14090D64605E00583608 /* pifontgen.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6D6F14070D64605E00583608 /* pifontgen.cc */; };
-		6D6F140A0D64605E00583608 /* pifontgen.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D6F14080D64605E00583608 /* pifontgen.h */; };
-		6D6F14120D64611D00583608 /* strutilxx.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6D6F14100D64611D00583608 /* strutilxx.cc */; };
-		6D6F14130D64611D00583608 /* strutilxx.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D6F14110D64611D00583608 /* strutilxx.h */; };
-		6D6F14750D6463FA00583608 /* xp1.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6D6F14740D6463FA00583608 /* xp1.cc */; };
-		6D7D4E4C066710EB009E5976 /* pimenubargen.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DDB77DE06632635009E5976 /* pimenubargen.h */; };
-		6D7D4E4D066710EB009E5976 /* pimenubargen.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6DDB77DF0663263C009E5976 /* pimenubargen.cc */; };
-		6D7D4E4E066713CB009E5976 /* pimenugen.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6DDB77E10663264C009E5976 /* pimenugen.cc */; };
-		6D7D4E4F066713CC009E5976 /* pimenugen.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DDB77E00663264C009E5976 /* pimenugen.h */; };
-		6D7D4E520667277A009E5976 /* PIMenuBarQuartz.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D7D4E500667277A009E5976 /* PIMenuBarQuartz.h */; };
-		6D7D4E530667277A009E5976 /* PIMenuBarQuartz.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6D7D4E510667277A009E5976 /* PIMenuBarQuartz.cpp */; };
-		6D7D4E5706673450009E5976 /* PIMenuQuartz.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D7D4E5506673450009E5976 /* PIMenuQuartz.h */; };
-		6D7D4E5806673450009E5976 /* PIMenuQuartz.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6D7D4E5606673450009E5976 /* PIMenuQuartz.cpp */; };
-		6DBF802306D0A01F009E5976 /* PI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 034768DEFF38A45A11DB9C8B /* PI.framework */; };
-		6DE18B860E837AD800414227 /* pioptmenuquartz.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DE18B840E837AD800414227 /* pioptmenuquartz.h */; };
-		6DE18B870E837AD800414227 /* pioptmenuquartz.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6DE18B850E837AD800414227 /* pioptmenuquartz.cpp */; };
-		6DE18BF80E83E4FE00414227 /* pidrwtools.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6DE18BF60E83E4FE00414227 /* pidrwtools.cc */; };
-		6DE18BF90E83E4FE00414227 /* pidrwtools.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DE18BF70E83E4FE00414227 /* pidrwtools.h */; };
-		6DE18C1A0E83E91700414227 /* pibwdgquartz.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DE18C180E83E91700414227 /* pibwdgquartz.h */; };
-		6DE18C1B0E83E91700414227 /* pibwdgquartz.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6DE18C190E83E91700414227 /* pibwdgquartz.cpp */; };
-		6DE745E60C7C4F530051D656 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08FB77AAFE841565C02AAC07 /* Carbon.framework */; };
-		6DE745E70C7C4F530051D656 /* PI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 034768DEFF38A45A11DB9C8B /* PI.framework */; };
-		6DE745F00C7C4F720051D656 /* xp0.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6DE7443F0C7C2E390051D656 /* xp0.cc */; };
-		6DE8E8160E87BA6D0031A5D9 /* pigraphps.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6DE8E8130E87BA6D0031A5D9 /* pigraphps.cc */; };
-		6DE8E8170E87BA6D0031A5D9 /* pigraphps.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DE8E8140E87BA6D0031A5D9 /* pigraphps.h */; };
-		6DEA07D90C88612B0016C028 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08FB77AAFE841565C02AAC07 /* Carbon.framework */; };
-		6DEA07DA0C88612B0016C028 /* PI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 034768DEFF38A45A11DB9C8B /* PI.framework */; };
-		6DEA07E60C8861E90016C028 /* pit0.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6DEA07E50C8861E90016C028 /* pit0.cc */; };
-		6DEA826C0C7ED3A500B7D5DD /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08FB77AAFE841565C02AAC07 /* Carbon.framework */; };
-		6DEA826D0C7ED3A500B7D5DD /* PI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 034768DEFF38A45A11DB9C8B /* PI.framework */; };
-		6DEA82D00C7EDF5700B7D5DD /* pistdwdggen.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6DDB77E30663266A009E5976 /* pistdwdggen.cc */; };
-		6DEA82D10C7EDF5B00B7D5DD /* pistdwdggen.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DDB77E20663266A009E5976 /* pistdwdggen.h */; };
-		6DEA831F0C7F162300B7D5DD /* pistdwdgquartz.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DEA831E0C7F162300B7D5DD /* pistdwdgquartz.h */; };
-		6DEA83230C7F166500B7D5DD /* pistdwdgquartz.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6DEA83220C7F166500B7D5DD /* pistdwdgquartz.cpp */; };
-		6DF012F60CBF6A510026E580 /* PIPeriodQuartz.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DF012F40CBF6A510026E580 /* PIPeriodQuartz.h */; };
-		6DF012F70CBF6A510026E580 /* PIPeriodQuartz.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6DF012F50CBF6A510026E580 /* PIPeriodQuartz.cpp */; };
-		6DF26D1A0E7FB7EC001AE7EF /* pibwdggen.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6DF26D160E7FB7EC001AE7EF /* pibwdggen.cc */; };
-		6DF26D1B0E7FB7EC001AE7EF /* pibwdggen.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DF26D170E7FB7EC001AE7EF /* pibwdggen.h */; };
-		6DF26D1C0E7FB7EC001AE7EF /* pidrawer.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6DF26D180E7FB7EC001AE7EF /* pidrawer.cc */; };
-		6DF26D1D0E7FB7EC001AE7EF /* pidrawer.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DF26D190E7FB7EC001AE7EF /* pidrawer.h */; };
-		6DF26D240E7FB84E001AE7EF /* piaxes.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6DF26D1E0E7FB84E001AE7EF /* piaxes.cc */; };
-		6DF26D250E7FB84E001AE7EF /* piaxes.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DF26D1F0E7FB84E001AE7EF /* piaxes.h */; };
-		6DF26D260E7FB84E001AE7EF /* pigraphgen.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DF26D200E7FB84E001AE7EF /* pigraphgen.h */; };
-		6DF26D270E7FB84E001AE7EF /* pigraphuc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6DF26D210E7FB84E001AE7EF /* pigraphuc.cc */; };
-		6DF26D280E7FB84E001AE7EF /* pigraphuc.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DF26D220E7FB84E001AE7EF /* pigraphuc.h */; };
-		6DF26D290E7FB84E001AE7EF /* psfile.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DF26D230E7FB84E001AE7EF /* psfile.h */; };
-		6DF26D2B0E7FDF45001AE7EF /* ucckprot.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DF26D2A0E7FDF45001AE7EF /* ucckprot.h */; };
-		6DF26D500E7FED78001AE7EF /* pioptmenugen.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6DF26D4E0E7FED78001AE7EF /* pioptmenugen.cc */; };
-		6DF26D510E7FED78001AE7EF /* pioptmenugen.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DF26D4F0E7FED78001AE7EF /* pioptmenugen.h */; };
-		6DF7756D0CC3A8DA00D784C9 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6DF7756C0CC3A8DA00D784C9 /* CoreFoundation.framework */; };
-		6DFD5AD206773E42009E5976 /* piapplgen.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DDB77DD06632616009E5976 /* piapplgen.h */; };
-		6DFD5AD306773E43009E5976 /* piapplgen.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6DDB77DC0663260E009E5976 /* piapplgen.cc */; };
-		6DFD5AD606774018009E5976 /* PIApplQuartz.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DFD5AD406774017009E5976 /* PIApplQuartz.h */; };
-		6DFD5AD706774018009E5976 /* PIApplQuartz.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6DFD5AD506774017009E5976 /* PIApplQuartz.cpp */; };
+		088CC8E4149A494B00210C77 /* pimsghandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D526C020662462C009E5976 /* pimsghandler.h */; };
+		088CC8E5149A494B00210C77 /* PI_Prefix.h in Headers */ = {isa = PBXBuildFile; fileRef = 32BAE0B70371A74B00C91783 /* PI_Prefix.h */; };
+		088CC8E6149A494B00210C77 /* picolist.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D526C040662464E009E5976 /* picolist.h */; };
+		088CC8E7149A494B00210C77 /* picontainergen.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D526BFA06624512009E5976 /* picontainergen.h */; };
+		088CC8E8149A494B00210C77 /* piwdgquartz.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D189BFE0619C1F5009E5976 /* piwdgquartz.h */; };
+		088CC8E9149A494B00210C77 /* piwdggen.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D526C000662461A009E5976 /* piwdggen.h */; };
+		088CC8EA149A494B00210C77 /* pievthandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D526C0A066246A9009E5976 /* pievthandler.h */; };
+		088CC8EB149A494B00210C77 /* PIWindowQuartz.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D98FCF4062C1CDB009E5976 /* PIWindowQuartz.h */; };
+		088CC8EC149A494B00210C77 /* PIContainerQuartz.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D41F30A064771A8009E5976 /* PIContainerQuartz.h */; };
+		088CC8ED149A494B00210C77 /* piwindowgen.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DDB77E80663268E009E5976 /* piwindowgen.h */; };
+		088CC8EE149A494B00210C77 /* pimenubargen.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DDB77DE06632635009E5976 /* pimenubargen.h */; };
+		088CC8EF149A494B00210C77 /* pimenugen.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DDB77E00663264C009E5976 /* pimenugen.h */; };
+		088CC8F0149A494B00210C77 /* PIMenuBarQuartz.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D7D4E500667277A009E5976 /* PIMenuBarQuartz.h */; };
+		088CC8F1149A494B00210C77 /* PIMenuQuartz.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D7D4E5506673450009E5976 /* PIMenuQuartz.h */; };
+		088CC8F2149A494B00210C77 /* piapplgen.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DDB77DD06632616009E5976 /* piapplgen.h */; };
+		088CC8F3149A494B00210C77 /* PIApplQuartz.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DFD5AD406774017009E5976 /* PIApplQuartz.h */; };
+		088CC8F4149A494B00210C77 /* pistdwdggen.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DDB77E20663266A009E5976 /* pistdwdggen.h */; };
+		088CC8F5149A494B00210C77 /* pistdwdgquartz.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DEA831E0C7F162300B7D5DD /* pistdwdgquartz.h */; };
+		088CC8F6149A494B00210C77 /* PIPeriodQuartz.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DF012F40CBF6A510026E580 /* PIPeriodQuartz.h */; };
+		088CC8F7149A494B00210C77 /* machdefs.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D6F12700D6446D500583608 /* machdefs.h */; };
+		088CC8F8149A494B00210C77 /* sopnamsp.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D6F12990D6448E500583608 /* sopnamsp.h */; };
+		088CC8F9149A494B00210C77 /* pisysdep.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D6F12AD0D644B2B00583608 /* pisysdep.h */; };
+		088CC8FA149A494B00210C77 /* pigraphquartz.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D6F12F30D644DA100583608 /* pigraphquartz.h */; };
+		088CC8FB149A494B00210C77 /* pifontquartz.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D6F132E0D6454DD00583608 /* pifontquartz.h */; };
+		088CC8FC149A494B00210C77 /* picmapquartz.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D6F134F0D64573200583608 /* picmapquartz.h */; };
+		088CC8FD149A494B00210C77 /* picmap.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D6F13AB0D645C3200583608 /* picmap.h */; };
+		088CC8FE149A494B00210C77 /* picmapgen.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D6F13AF0D645C4D00583608 /* picmapgen.h */; };
+		088CC8FF149A494B00210C77 /* piconsenum.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D6F13BF0D645E8B00583608 /* piconsenum.h */; };
+		088CC900149A494B00210C77 /* pigratt.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D6F13F80D64604000583608 /* pigratt.h */; };
+		088CC901149A494B00210C77 /* pigrcoord.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D6F13FA0D64604000583608 /* pigrcoord.h */; };
+		088CC902149A494B00210C77 /* pilineatt.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D6F13FC0D64604000583608 /* pilineatt.h */; };
+		088CC903149A494B00210C77 /* pifontgen.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D6F14080D64605E00583608 /* pifontgen.h */; };
+		088CC904149A494B00210C77 /* strutilxx.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D6F14110D64611D00583608 /* strutilxx.h */; };
+		088CC905149A494B00210C77 /* pibwdggen.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DF26D170E7FB7EC001AE7EF /* pibwdggen.h */; };
+		088CC906149A494B00210C77 /* pidrawer.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DF26D190E7FB7EC001AE7EF /* pidrawer.h */; };
+		088CC907149A494B00210C77 /* piaxes.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DF26D1F0E7FB84E001AE7EF /* piaxes.h */; };
+		088CC908149A494B00210C77 /* pigraphgen.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DF26D200E7FB84E001AE7EF /* pigraphgen.h */; };
+		088CC909149A494B00210C77 /* pigraphuc.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DF26D220E7FB84E001AE7EF /* pigraphuc.h */; };
+		088CC90A149A494B00210C77 /* psfile.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DF26D230E7FB84E001AE7EF /* psfile.h */; };
+		088CC90B149A494B00210C77 /* ucckprot.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DF26D2A0E7FDF45001AE7EF /* ucckprot.h */; };
+		088CC90C149A494B00210C77 /* pioptmenugen.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DF26D4F0E7FED78001AE7EF /* pioptmenugen.h */; };
+		088CC90D149A494B00210C77 /* pioptmenuquartz.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DE18B840E837AD800414227 /* pioptmenuquartz.h */; };
+		088CC90E149A494B00210C77 /* pidrwtools.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DE18BF70E83E4FE00414227 /* pidrwtools.h */; };
+		088CC90F149A494B00210C77 /* pibwdgquartz.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DE18C180E83E91700414227 /* pibwdgquartz.h */; };
+		088CC910149A494B00210C77 /* pigraphps.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DE8E8140E87BA6D0031A5D9 /* pigraphps.h */; };
+		088CC911149A494B00210C77 /* pieventquartz.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DD04EE3113D3FCB00B55104 /* pieventquartz.h */; };
+		088CC913149A494B00210C77 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C1666FE841158C02AAC07 /* InfoPlist.strings */; };
+		088CC915149A494B00210C77 /* pimsghandler.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6D0E25030665D32C009E5976 /* pimsghandler.cc */; };
+		088CC916149A494B00210C77 /* picontainergen.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6D526BF706624488009E5976 /* picontainergen.cc */; };
+		088CC917149A494B00210C77 /* piwdgquartz.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6D189BFF0619C1F5009E5976 /* piwdgquartz.cpp */; };
+		088CC918149A494B00210C77 /* piwdggen.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6D526C0606624678009E5976 /* piwdggen.cc */; };
+		088CC919149A494B00210C77 /* PIContainerQuartz.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6D41F30B064771A8009E5976 /* PIContainerQuartz.cpp */; };
+		088CC91A149A494B00210C77 /* pievthandler.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6D526C0806624689009E5976 /* pievthandler.cc */; };
+		088CC91B149A494B00210C77 /* PIWindowQuartz.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6D98FCF5062C1CDB009E5976 /* PIWindowQuartz.cpp */; };
+		088CC91C149A494B00210C77 /* piwindowgen.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6DDB77E90663268E009E5976 /* piwindowgen.cc */; };
+		088CC91D149A494B00210C77 /* pimenubargen.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6DDB77DF0663263C009E5976 /* pimenubargen.cc */; };
+		088CC91E149A494B00210C77 /* pimenugen.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6DDB77E10663264C009E5976 /* pimenugen.cc */; };
+		088CC91F149A494B00210C77 /* PIMenuBarQuartz.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6D7D4E510667277A009E5976 /* PIMenuBarQuartz.cpp */; };
+		088CC920149A494B00210C77 /* PIMenuQuartz.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6D7D4E5606673450009E5976 /* PIMenuQuartz.cpp */; };
+		088CC921149A494B00210C77 /* piapplgen.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6DDB77DC0663260E009E5976 /* piapplgen.cc */; };
+		088CC922149A494B00210C77 /* PIApplQuartz.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6DFD5AD506774017009E5976 /* PIApplQuartz.cpp */; };
+		088CC923149A494B00210C77 /* pistdwdggen.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6DDB77E30663266A009E5976 /* pistdwdggen.cc */; };
+		088CC924149A494B00210C77 /* pistdwdgquartz.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6DEA83220C7F166500B7D5DD /* pistdwdgquartz.cpp */; };
+		088CC925149A494B00210C77 /* PIPeriodQuartz.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6DF012F50CBF6A510026E580 /* PIPeriodQuartz.cpp */; };
+		088CC926149A494B00210C77 /* pifontquartz.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6D6F13300D64550C00583608 /* pifontquartz.cpp */; };
+		088CC927149A494B00210C77 /* picmapquartz.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6D6F134D0D64572500583608 /* picmapquartz.cpp */; };
+		088CC928149A494B00210C77 /* pigraphquartz.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6D6F137F0D6458E200583608 /* pigraphquartz.cpp */; };
+		088CC929149A494B00210C77 /* picmap.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6D6F13AD0D645C4D00583608 /* picmap.cc */; };
+		088CC92A149A494B00210C77 /* picmapgen.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6D6F13AE0D645C4D00583608 /* picmapgen.cc */; };
+		088CC92B149A494B00210C77 /* pigraphgen.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6D6F13F60D64604000583608 /* pigraphgen.cc */; };
+		088CC92C149A494B00210C77 /* pigratt.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6D6F13F70D64604000583608 /* pigratt.cc */; };
+		088CC92D149A494B00210C77 /* pigrcoord.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6D6F13F90D64604000583608 /* pigrcoord.cc */; };
+		088CC92E149A494B00210C77 /* pilineatt.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6D6F13FB0D64604000583608 /* pilineatt.cc */; };
+		088CC92F149A494B00210C77 /* psfile.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6D6F13FD0D64604000583608 /* psfile.cc */; };
+		088CC930149A494B00210C77 /* pifontgen.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6D6F14070D64605E00583608 /* pifontgen.cc */; };
+		088CC931149A494B00210C77 /* strutilxx.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6D6F14100D64611D00583608 /* strutilxx.cc */; };
+		088CC932149A494B00210C77 /* pibwdggen.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6DF26D160E7FB7EC001AE7EF /* pibwdggen.cc */; };
+		088CC933149A494B00210C77 /* pidrawer.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6DF26D180E7FB7EC001AE7EF /* pidrawer.cc */; };
+		088CC934149A494B00210C77 /* piaxes.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6DF26D1E0E7FB84E001AE7EF /* piaxes.cc */; };
+		088CC935149A494B00210C77 /* pigraphuc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6DF26D210E7FB84E001AE7EF /* pigraphuc.cc */; };
+		088CC936149A494B00210C77 /* pioptmenugen.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6DF26D4E0E7FED78001AE7EF /* pioptmenugen.cc */; };
+		088CC937149A494B00210C77 /* pioptmenuquartz.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6DE18B850E837AD800414227 /* pioptmenuquartz.cpp */; };
+		088CC938149A494B00210C77 /* pidrwtools.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6DE18BF60E83E4FE00414227 /* pidrwtools.cc */; };
+		088CC939149A494B00210C77 /* pibwdgquartz.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6DE18C190E83E91700414227 /* pibwdgquartz.cpp */; };
+		088CC93A149A494B00210C77 /* pigraphps.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6DE8E8130E87BA6D0031A5D9 /* pigraphps.cc */; };
+		088CC93B149A494B00210C77 /* pieventquartz.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6DD04EE4113D3FCB00B55104 /* pieventquartz.cpp */; };
+		088CC93D149A494B00210C77 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08FB77AAFE841565C02AAC07 /* Carbon.framework */; };
+		088CC93E149A494B00210C77 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6DF7756C0CC3A8DA00D784C9 /* CoreFoundation.framework */; };
+		088CC94A149A494B00210C77 /* QuartzAppTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6D106876067DC8FC009E5976 /* QuartzAppTest.cpp */; };
+		088CC94C149A494B00210C77 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08FB77AAFE841565C02AAC07 /* Carbon.framework */; };
+		088CC95A149A494B00210C77 /* xp0.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6DE7443F0C7C2E390051D656 /* xp0.cc */; };
+		088CC95C149A494B00210C77 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08FB77AAFE841565C02AAC07 /* Carbon.framework */; };
+		088CC96A149A494B00210C77 /* xp1.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6D6F14740D6463FA00583608 /* xp1.cc */; };
+		088CC96C149A494B00210C77 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08FB77AAFE841565C02AAC07 /* Carbon.framework */; };
+		088CC97A149A494B00210C77 /* pit0.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6DEA07E50C8861E90016C028 /* pit0.cc */; };
+		088CC97C149A494B00210C77 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08FB77AAFE841565C02AAC07 /* Carbon.framework */; };
+		088CC991149A494B00210C77 /* PI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 088CC945149A494B00210C77 /* PI.framework */; };
+		088CC992149A494C00210C77 /* PI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 088CC945149A494B00210C77 /* PI.framework */; };
+		088CC993149A494C00210C77 /* PI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 088CC945149A494B00210C77 /* PI.framework */; };
+		088CC994149A494C00210C77 /* PI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 088CC945149A494B00210C77 /* PI.framework */; };
+		088CC995149A494C00210C77 /* PI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 088CC945149A494B00210C77 /* PI.framework */; };
 /* End PBXBuildFile section */
 
-/* Begin PBXBuildStyle section */
-		4F0BB7EC011F40E904CA0E50 /* Development */ = {
-			isa = PBXBuildStyle;
-			buildSettings = {
-				COPY_PHASE_STRIP = NO;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				OPTIMIZATION_CFLAGS = "-O0";
-				ZERO_LINK = YES;
-			};
-			name = Development;
-		};
-		4F0BB7ED011F40E904CA0E50 /* Deployment */ = {
-			isa = PBXBuildStyle;
-			buildSettings = {
-				COPY_PHASE_STRIP = YES;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				ZERO_LINK = NO;
-			};
-			name = Deployment;
-		};
-/* End PBXBuildStyle section */
-
 /* Begin PBXFileReference section */
-		034768DEFF38A45A11DB9C8B /* PI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = PI.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		088CC944149A494B00210C77 /* Info-PI__Upgraded_.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-PI__Upgraded_.plist"; sourceTree = "<group>"; };
+		088CC945149A494B00210C77 /* PI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PI.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		088CC953149A494B00210C77 /* Info-PIAQTest__Upgraded_.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-PIAQTest__Upgraded_.plist"; sourceTree = "<group>"; };
+		088CC954149A494B00210C77 /* PIAQTest.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PIAQTest.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		088CC963149A494B00210C77 /* Info-XP0__Upgraded_.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-XP0__Upgraded_.plist"; sourceTree = "<group>"; };
+		088CC964149A494B00210C77 /* XP0.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = XP0.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		088CC973149A494B00210C77 /* Info-XP1__Upgraded_.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-XP1__Upgraded_.plist"; sourceTree = "<group>"; };
+		088CC974149A494B00210C77 /* XP1.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = XP1.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		088CC983149A494B00210C77 /* Info-PIT0__Upgraded_.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-PIT0__Upgraded_.plist"; sourceTree = "<group>"; };
+		088CC984149A494B00210C77 /* PIT0.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PIT0.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		088CC98F149A494B00210C77 /* BaoAdc.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = BaoAdc.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		089C1667FE841158C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		08FB77AAFE841565C02AAC07 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
@@ -396,5 +128,4 @@
 		6D0E25030665D32C009E5976 /* pimsghandler.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = pimsghandler.cc; path = ../pimsghandler.cc; sourceTree = SOURCE_ROOT; };
 		6D106876067DC8FC009E5976 /* QuartzAppTest.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; path = QuartzAppTest.cpp; sourceTree = SOURCE_ROOT; };
-		6D10687E067DC9AB009E5976 /* PIAQTest.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; path = PIAQTest.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		6D189BFE0619C1F5009E5976 /* piwdgquartz.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = piwdgquartz.h; sourceTree = "<group>"; };
 		6D189BFF0619C1F5009E5976 /* piwdgquartz.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = piwdgquartz.cpp; sourceTree = "<group>"; };
@@ -409,6 +140,5 @@
 		6D526C0806624689009E5976 /* pievthandler.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = pievthandler.cc; path = ../pievthandler.cc; sourceTree = SOURCE_ROOT; };
 		6D526C0A066246A9009E5976 /* pievthandler.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = pievthandler.h; path = ../pievthandler.h; sourceTree = SOURCE_ROOT; };
-		6D622CD60D8ECB6300428D9A /* BaoAdc.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = BaoAdc.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		6D622CD80D8ECB6300428D9A /* BaoAdc-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "BaoAdc-Info.plist"; sourceTree = "<group>"; };
+		6D622CD80D8ECB6300428D9A /* BaoAdc-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "BaoAdc-Info.plist"; sourceTree = "<group>"; };
 		6D6F12700D6446D500583608 /* machdefs.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = machdefs.h; sourceTree = "<group>"; };
 		6D6F12990D6448E500583608 /* sopnamsp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sopnamsp.h; sourceTree = "<group>"; };
@@ -445,4 +175,6 @@
 		6D98FCF5062C1CDB009E5976 /* PIWindowQuartz.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PIWindowQuartz.cpp; sourceTree = SOURCE_ROOT; };
 		6DC3740A070405C7009E5976 /* todo.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = todo.txt; sourceTree = "<group>"; };
+		6DD04EE3113D3FCB00B55104 /* pieventquartz.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pieventquartz.h; sourceTree = "<group>"; };
+		6DD04EE4113D3FCB00B55104 /* pieventquartz.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pieventquartz.cpp; sourceTree = "<group>"; };
 		6DDB77DC0663260E009E5976 /* piapplgen.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = piapplgen.cc; path = ../piapplgen.cc; sourceTree = SOURCE_ROOT; };
 		6DDB77DD06632616009E5976 /* piapplgen.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = piapplgen.h; path = ../piapplgen.h; sourceTree = SOURCE_ROOT; };
@@ -461,12 +193,9 @@
 		6DE18C180E83E91700414227 /* pibwdgquartz.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pibwdgquartz.h; sourceTree = "<group>"; };
 		6DE18C190E83E91700414227 /* pibwdgquartz.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pibwdgquartz.cpp; sourceTree = "<group>"; };
-		6DE744360C7C2DF40051D656 /* XP0-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "XP0-Info.plist"; sourceTree = "<group>"; };
+		6DE744360C7C2DF40051D656 /* XP0-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "XP0-Info.plist"; sourceTree = "<group>"; };
 		6DE7443F0C7C2E390051D656 /* xp0.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = xp0.cc; path = ../Tests/xp0.cc; sourceTree = SOURCE_ROOT; };
-		6DE745ED0C7C4F530051D656 /* XP0.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = XP0.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		6DE8E8130E87BA6D0031A5D9 /* pigraphps.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = pigraphps.cc; path = ../pigraphps.cc; sourceTree = SOURCE_ROOT; };
 		6DE8E8140E87BA6D0031A5D9 /* pigraphps.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = pigraphps.h; path = ../pigraphps.h; sourceTree = SOURCE_ROOT; };
-		6DEA07E00C88612B0016C028 /* PIT0.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PIT0.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		6DEA07E50C8861E90016C028 /* pit0.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = pit0.cc; path = ../Tests/pit0.cc; sourceTree = SOURCE_ROOT; };
-		6DEA82730C7ED3A500B7D5DD /* XP1.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = XP1.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		6DEA831E0C7F162300B7D5DD /* pistdwdgquartz.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = pistdwdgquartz.h; sourceTree = "<group>"; };
 		6DEA83220C7F166500B7D5DD /* pistdwdgquartz.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pistdwdgquartz.cpp; sourceTree = "<group>"; };
@@ -491,121 +220,55 @@
 /* End PBXFileReference section */
 
-/* Begin PBXFrameworkTarget section */
-		0867D69CFE84028FC02AAC07 /* PI */ = {
-			isa = PBXFrameworkTarget;
-			buildConfigurationList = 6DF29DD90B71EEB300F55B65 /* Build configuration list for PBXFrameworkTarget "PI" */;
-			buildPhases = (
-				0867D69DFE84028FC02AAC07 /* Headers */,
-				0867D69EFE84028FC02AAC07 /* Resources */,
-				0867D69FFE84028FC02AAC07 /* Sources */,
-				0867D6A0FE84028FC02AAC07 /* Frameworks */,
-				0867D6A2FE84028FC02AAC07 /* Rez */,
-			);
-			buildSettings = {
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				FRAMEWORK_SEARCH_PATHS = "";
-				FRAMEWORK_VERSION = A;
-				HEADER_SEARCH_PATHS = "";
-				INSTALL_PATH = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
-				LIBRARY_SEARCH_PATHS = "";
-				OPTIMIZATION_CFLAGS = "-O0";
-				OTHER_CFLAGS = "-D__MACOSX__";
-				OTHER_LDFLAGS = "";
-				PREBINDING = NO;
-				PRODUCT_NAME = PI;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = framework;
-			};
-			dependencies = (
-			);
-			name = PI;
-			productInstallPath = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
-			productName = PI;
-			productReference = 034768DEFF38A45A11DB9C8B /* PI.framework */;
-			productSettingsXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
-<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
-<plist version=\"1.0\">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>PI</string>
-	<key>CFBundleIconFile</key>
-	<string></string>
-	<key>CFBundleIdentifier</key>
-	<string></string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>0.0.1d1</string>
-	<key>CSResourcesFileMapped</key>
-	<true/>
-</dict>
-</plist>
-";
-		};
-/* End PBXFrameworkTarget section */
-
 /* Begin PBXFrameworksBuildPhase section */
-		0867D6A0FE84028FC02AAC07 /* Frameworks */ = {
+		088CC93C149A494B00210C77 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				08FB77ABFE841565C02AAC07 /* Carbon.framework in Frameworks */,
-				6DF7756D0CC3A8DA00D784C9 /* CoreFoundation.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		6D10687B067DC9AB009E5976 /* Frameworks */ = {
+				088CC93D149A494B00210C77 /* Carbon.framework in Frameworks */,
+				088CC93E149A494B00210C77 /* CoreFoundation.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		088CC94B149A494B00210C77 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				6D106881067DC9B6009E5976 /* Carbon.framework in Frameworks */,
-				6DBF802306D0A01F009E5976 /* PI.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		6D622CD40D8ECB6300428D9A /* Frameworks */ = {
+				088CC94C149A494B00210C77 /* Carbon.framework in Frameworks */,
+				088CC991149A494B00210C77 /* PI.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		088CC95B149A494B00210C77 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				6D622CF60D8ED19100428D9A /* PI.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		6DE745E50C7C4F530051D656 /* Frameworks */ = {
+				088CC95C149A494B00210C77 /* Carbon.framework in Frameworks */,
+				088CC992149A494C00210C77 /* PI.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		088CC96B149A494B00210C77 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				6DE745E60C7C4F530051D656 /* Carbon.framework in Frameworks */,
-				6DE745E70C7C4F530051D656 /* PI.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		6DEA07D80C88612B0016C028 /* Frameworks */ = {
+				088CC96C149A494B00210C77 /* Carbon.framework in Frameworks */,
+				088CC993149A494C00210C77 /* PI.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		088CC97B149A494B00210C77 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				6DEA07D90C88612B0016C028 /* Carbon.framework in Frameworks */,
-				6DEA07DA0C88612B0016C028 /* PI.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		6DEA826B0C7ED3A500B7D5DD /* Frameworks */ = {
+				088CC97C149A494B00210C77 /* Carbon.framework in Frameworks */,
+				088CC994149A494C00210C77 /* PI.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		088CC989149A494B00210C77 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				6DEA826C0C7ED3A500B7D5DD /* Carbon.framework in Frameworks */,
-				6DEA826D0C7ED3A500B7D5DD /* PI.framework in Frameworks */,
+				088CC995149A494C00210C77 /* PI.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -617,10 +280,10 @@
 			isa = PBXGroup;
 			children = (
-				034768DEFF38A45A11DB9C8B /* PI.framework */,
-				6D10687E067DC9AB009E5976 /* PIAQTest.app */,
-				6DE745ED0C7C4F530051D656 /* XP0.app */,
-				6DEA82730C7ED3A500B7D5DD /* XP1.app */,
-				6DEA07E00C88612B0016C028 /* PIT0.app */,
-				6D622CD60D8ECB6300428D9A /* BaoAdc.app */,
+				088CC945149A494B00210C77 /* PI.framework */,
+				088CC954149A494B00210C77 /* PIAQTest.app */,
+				088CC964149A494B00210C77 /* XP0.app */,
+				088CC974149A494B00210C77 /* XP1.app */,
+				088CC984149A494B00210C77 /* PIT0.app */,
+				088CC98F149A494B00210C77 /* BaoAdc.app */,
 			);
 			name = Products;
@@ -640,4 +303,9 @@
 				6DE744360C7C2DF40051D656 /* XP0-Info.plist */,
 				6D622CD80D8ECB6300428D9A /* BaoAdc-Info.plist */,
+				088CC944149A494B00210C77 /* Info-PI__Upgraded_.plist */,
+				088CC953149A494B00210C77 /* Info-PIAQTest__Upgraded_.plist */,
+				088CC963149A494B00210C77 /* Info-XP0__Upgraded_.plist */,
+				088CC973149A494B00210C77 /* Info-XP1__Upgraded_.plist */,
+				088CC983149A494B00210C77 /* Info-PIT0__Upgraded_.plist */,
 			);
 			name = PI;
@@ -739,4 +407,5 @@
 			isa = PBXGroup;
 			children = (
+				6DD04EE3113D3FCB00B55104 /* pieventquartz.h */,
 				6DE18C180E83E91700414227 /* pibwdgquartz.h */,
 				6DE18B840E837AD800414227 /* pioptmenuquartz.h */,
@@ -772,4 +441,5 @@
 				6DE18B850E837AD800414227 /* pioptmenuquartz.cpp */,
 				6DE18C190E83E91700414227 /* pibwdgquartz.cpp */,
+				6DD04EE4113D3FCB00B55104 /* pieventquartz.cpp */,
 			);
 			name = Specific;
@@ -779,57 +449,58 @@
 
 /* Begin PBXHeadersBuildPhase section */
-		0867D69DFE84028FC02AAC07 /* Headers */ = {
+		088CC8E3149A494B00210C77 /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				6D0E251D0665D642009E5976 /* pimsghandler.h in Headers */,
-				6D0E251E0665D653009E5976 /* PI_Prefix.h in Headers */,
-				6D0E25200665D8A2009E5976 /* picolist.h in Headers */,
-				6D0E25210665E286009E5976 /* picontainergen.h in Headers */,
-				6D0E25240665E29E009E5976 /* piwdgquartz.h in Headers */,
-				6D0E25250665E29F009E5976 /* piwdggen.h in Headers */,
-				6D0E25280665E337009E5976 /* pievthandler.h in Headers */,
-				6D0E25290665E337009E5976 /* PIWindowQuartz.h in Headers */,
-				6D0E252B0665E338009E5976 /* PIContainerQuartz.h in Headers */,
-				6D0E253006661DC2009E5976 /* piwindowgen.h in Headers */,
-				6D7D4E4C066710EB009E5976 /* pimenubargen.h in Headers */,
-				6D7D4E4F066713CC009E5976 /* pimenugen.h in Headers */,
-				6D7D4E520667277A009E5976 /* PIMenuBarQuartz.h in Headers */,
-				6D7D4E5706673450009E5976 /* PIMenuQuartz.h in Headers */,
-				6DFD5AD206773E42009E5976 /* piapplgen.h in Headers */,
-				6DFD5AD606774018009E5976 /* PIApplQuartz.h in Headers */,
-				6DEA82D10C7EDF5B00B7D5DD /* pistdwdggen.h in Headers */,
-				6DEA831F0C7F162300B7D5DD /* pistdwdgquartz.h in Headers */,
-				6DF012F60CBF6A510026E580 /* PIPeriodQuartz.h in Headers */,
-				6D6F12710D6446D500583608 /* machdefs.h in Headers */,
-				6D6F129A0D6448E500583608 /* sopnamsp.h in Headers */,
-				6D6F12AE0D644B2B00583608 /* pisysdep.h in Headers */,
-				6D6F12F40D644DA100583608 /* pigraphquartz.h in Headers */,
-				6D6F132F0D6454DD00583608 /* pifontquartz.h in Headers */,
-				6D6F13500D64573200583608 /* picmapquartz.h in Headers */,
-				6D6F13AC0D645C3200583608 /* picmap.h in Headers */,
-				6D6F13B20D645C4D00583608 /* picmapgen.h in Headers */,
-				6D6F13C00D645E8B00583608 /* piconsenum.h in Headers */,
-				6D6F14000D64604000583608 /* pigratt.h in Headers */,
-				6D6F14020D64604000583608 /* pigrcoord.h in Headers */,
-				6D6F14040D64604000583608 /* pilineatt.h in Headers */,
-				6D6F140A0D64605E00583608 /* pifontgen.h in Headers */,
-				6D6F14130D64611D00583608 /* strutilxx.h in Headers */,
-				6DF26D1B0E7FB7EC001AE7EF /* pibwdggen.h in Headers */,
-				6DF26D1D0E7FB7EC001AE7EF /* pidrawer.h in Headers */,
-				6DF26D250E7FB84E001AE7EF /* piaxes.h in Headers */,
-				6DF26D260E7FB84E001AE7EF /* pigraphgen.h in Headers */,
-				6DF26D280E7FB84E001AE7EF /* pigraphuc.h in Headers */,
-				6DF26D290E7FB84E001AE7EF /* psfile.h in Headers */,
-				6DF26D2B0E7FDF45001AE7EF /* ucckprot.h in Headers */,
-				6DF26D510E7FED78001AE7EF /* pioptmenugen.h in Headers */,
-				6DE18B860E837AD800414227 /* pioptmenuquartz.h in Headers */,
-				6DE18BF90E83E4FE00414227 /* pidrwtools.h in Headers */,
-				6DE18C1A0E83E91700414227 /* pibwdgquartz.h in Headers */,
-				6DE8E8170E87BA6D0031A5D9 /* pigraphps.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		6D106878067DC9AB009E5976 /* Headers */ = {
+				088CC8E4149A494B00210C77 /* pimsghandler.h in Headers */,
+				088CC8E5149A494B00210C77 /* PI_Prefix.h in Headers */,
+				088CC8E6149A494B00210C77 /* picolist.h in Headers */,
+				088CC8E7149A494B00210C77 /* picontainergen.h in Headers */,
+				088CC8E8149A494B00210C77 /* piwdgquartz.h in Headers */,
+				088CC8E9149A494B00210C77 /* piwdggen.h in Headers */,
+				088CC8EA149A494B00210C77 /* pievthandler.h in Headers */,
+				088CC8EB149A494B00210C77 /* PIWindowQuartz.h in Headers */,
+				088CC8EC149A494B00210C77 /* PIContainerQuartz.h in Headers */,
+				088CC8ED149A494B00210C77 /* piwindowgen.h in Headers */,
+				088CC8EE149A494B00210C77 /* pimenubargen.h in Headers */,
+				088CC8EF149A494B00210C77 /* pimenugen.h in Headers */,
+				088CC8F0149A494B00210C77 /* PIMenuBarQuartz.h in Headers */,
+				088CC8F1149A494B00210C77 /* PIMenuQuartz.h in Headers */,
+				088CC8F2149A494B00210C77 /* piapplgen.h in Headers */,
+				088CC8F3149A494B00210C77 /* PIApplQuartz.h in Headers */,
+				088CC8F4149A494B00210C77 /* pistdwdggen.h in Headers */,
+				088CC8F5149A494B00210C77 /* pistdwdgquartz.h in Headers */,
+				088CC8F6149A494B00210C77 /* PIPeriodQuartz.h in Headers */,
+				088CC8F7149A494B00210C77 /* machdefs.h in Headers */,
+				088CC8F8149A494B00210C77 /* sopnamsp.h in Headers */,
+				088CC8F9149A494B00210C77 /* pisysdep.h in Headers */,
+				088CC8FA149A494B00210C77 /* pigraphquartz.h in Headers */,
+				088CC8FB149A494B00210C77 /* pifontquartz.h in Headers */,
+				088CC8FC149A494B00210C77 /* picmapquartz.h in Headers */,
+				088CC8FD149A494B00210C77 /* picmap.h in Headers */,
+				088CC8FE149A494B00210C77 /* picmapgen.h in Headers */,
+				088CC8FF149A494B00210C77 /* piconsenum.h in Headers */,
+				088CC900149A494B00210C77 /* pigratt.h in Headers */,
+				088CC901149A494B00210C77 /* pigrcoord.h in Headers */,
+				088CC902149A494B00210C77 /* pilineatt.h in Headers */,
+				088CC903149A494B00210C77 /* pifontgen.h in Headers */,
+				088CC904149A494B00210C77 /* strutilxx.h in Headers */,
+				088CC905149A494B00210C77 /* pibwdggen.h in Headers */,
+				088CC906149A494B00210C77 /* pidrawer.h in Headers */,
+				088CC907149A494B00210C77 /* piaxes.h in Headers */,
+				088CC908149A494B00210C77 /* pigraphgen.h in Headers */,
+				088CC909149A494B00210C77 /* pigraphuc.h in Headers */,
+				088CC90A149A494B00210C77 /* psfile.h in Headers */,
+				088CC90B149A494B00210C77 /* ucckprot.h in Headers */,
+				088CC90C149A494B00210C77 /* pioptmenugen.h in Headers */,
+				088CC90D149A494B00210C77 /* pioptmenuquartz.h in Headers */,
+				088CC90E149A494B00210C77 /* pidrwtools.h in Headers */,
+				088CC90F149A494B00210C77 /* pibwdgquartz.h in Headers */,
+				088CC910149A494B00210C77 /* pigraphps.h in Headers */,
+				088CC911149A494B00210C77 /* pieventquartz.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		088CC947149A494B00210C77 /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
@@ -838,5 +509,5 @@
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		6DE745E00C7C4F530051D656 /* Headers */ = {
+		088CC957149A494B00210C77 /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
@@ -845,5 +516,5 @@
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		6DEA07D40C88612B0016C028 /* Headers */ = {
+		088CC967149A494B00210C77 /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
@@ -852,5 +523,5 @@
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		6DEA82660C7ED3A500B7D5DD /* Headers */ = {
+		088CC977149A494B00210C77 /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
@@ -862,63 +533,119 @@
 
 /* Begin PBXNativeTarget section */
-		6D622CD50D8ECB6300428D9A /* BaoAdc */ = {
+		088CC8E2149A494B00210C77 /* PI (Upgraded) */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 6D622CDF0D8ECB6400428D9A /* Build configuration list for PBXNativeTarget "BaoAdc" */;
+			buildConfigurationList = 088CC940149A494B00210C77 /* Build configuration list for PBXNativeTarget "PI (Upgraded)" */;
 			buildPhases = (
-				6D622CD20D8ECB6300428D9A /* Resources */,
-				6D622CD30D8ECB6300428D9A /* Sources */,
-				6D622CD40D8ECB6300428D9A /* Frameworks */,
+				088CC8E3149A494B00210C77 /* Headers */,
+				088CC912149A494B00210C77 /* Resources */,
+				088CC914149A494B00210C77 /* Sources */,
+				088CC93C149A494B00210C77 /* Frameworks */,
+				088CC93F149A494B00210C77 /* Rez */,
 			);
 			buildRules = (
 			);
-			buildSettings = {
-				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_MODEL_TUNING = G5;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
-				INFOPLIST_FILE = "BaoAdc-Info.plist";
-				INSTALL_PATH = "$(USER_APPS_DIR)";
-				OPTIMIZATION_CFLAGS = "";
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = (
-					"-framework",
-					Carbon,
-				);
-				OTHER_REZFLAGS = "";
-				PREBINDING = NO;
-				PRODUCT_NAME = BaoAdc;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-			};
 			dependencies = (
 			);
-			name = BaoAdc;
+			name = "PI (Upgraded)";
+			productInstallPath = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
+			productName = PI;
+			productReference = 088CC945149A494B00210C77 /* PI.framework */;
+			productType = "com.apple.product-type.framework";
+		};
+		088CC946149A494B00210C77 /* PIAQTest (Upgraded) */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 088CC94F149A494B00210C77 /* Build configuration list for PBXNativeTarget "PIAQTest (Upgraded)" */;
+			buildPhases = (
+				088CC947149A494B00210C77 /* Headers */,
+				088CC948149A494B00210C77 /* Resources */,
+				088CC949149A494B00210C77 /* Sources */,
+				088CC94B149A494B00210C77 /* Frameworks */,
+				088CC94E149A494B00210C77 /* Rez */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "PIAQTest (Upgraded)";
+			productInstallPath = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
+			productName = PIAQTest;
+			productReference = 088CC954149A494B00210C77 /* PIAQTest.app */;
+			productType = "com.apple.product-type.application";
+		};
+		088CC956149A494B00210C77 /* XP0 (Upgraded) */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 088CC95F149A494B00210C77 /* Build configuration list for PBXNativeTarget "XP0 (Upgraded)" */;
+			buildPhases = (
+				088CC957149A494B00210C77 /* Headers */,
+				088CC958149A494B00210C77 /* Resources */,
+				088CC959149A494B00210C77 /* Sources */,
+				088CC95B149A494B00210C77 /* Frameworks */,
+				088CC95E149A494B00210C77 /* Rez */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "XP0 (Upgraded)";
+			productInstallPath = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
+			productName = PIAQTest;
+			productReference = 088CC964149A494B00210C77 /* XP0.app */;
+			productType = "com.apple.product-type.application";
+		};
+		088CC966149A494B00210C77 /* XP1 (Upgraded) */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 088CC96F149A494B00210C77 /* Build configuration list for PBXNativeTarget "XP1 (Upgraded)" */;
+			buildPhases = (
+				088CC967149A494B00210C77 /* Headers */,
+				088CC968149A494B00210C77 /* Resources */,
+				088CC969149A494B00210C77 /* Sources */,
+				088CC96B149A494B00210C77 /* Frameworks */,
+				088CC96E149A494B00210C77 /* Rez */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "XP1 (Upgraded)";
+			productInstallPath = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
+			productName = PIAQTest;
+			productReference = 088CC974149A494B00210C77 /* XP1.app */;
+			productType = "com.apple.product-type.application";
+		};
+		088CC976149A494B00210C77 /* PIT0 (Upgraded) */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 088CC97F149A494B00210C77 /* Build configuration list for PBXNativeTarget "PIT0 (Upgraded)" */;
+			buildPhases = (
+				088CC977149A494B00210C77 /* Headers */,
+				088CC978149A494B00210C77 /* Resources */,
+				088CC979149A494B00210C77 /* Sources */,
+				088CC97B149A494B00210C77 /* Frameworks */,
+				088CC97E149A494B00210C77 /* Rez */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "PIT0 (Upgraded)";
+			productInstallPath = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
+			productName = PIAQTest;
+			productReference = 088CC984149A494B00210C77 /* PIT0.app */;
+			productType = "com.apple.product-type.application";
+		};
+		088CC986149A494B00210C77 /* BaoAdc (Copied) */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 088CC98B149A494B00210C77 /* Build configuration list for PBXNativeTarget "BaoAdc (Copied)" */;
+			buildPhases = (
+				088CC987149A494B00210C77 /* Resources */,
+				088CC988149A494B00210C77 /* Sources */,
+				088CC989149A494B00210C77 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "BaoAdc (Copied)";
 			productName = BaoAdc;
-			productReference = 6D622CD60D8ECB6300428D9A /* BaoAdc.app */;
-			productSettingsXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
-<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
-<plist version=\"1.0\">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>BaoAdc</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.yourcompany.BaoAdc</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1.0</string>
-</dict>
-</plist>
-";
+			productReference = 088CC98F149A494B00210C77 /* BaoAdc.app */;
 			productType = "com.apple.product-type.application";
 		};
@@ -929,21 +656,24 @@
 			isa = PBXProject;
 			buildConfigurationList = 6DF29DE10B71EEB300F55B65 /* Build configuration list for PBXProject "PI" */;
-			buildSettings = {
-			};
-			buildStyles = (
-				4F0BB7EC011F40E904CA0E50 /* Development */,
-				4F0BB7ED011F40E904CA0E50 /* Deployment */,
-			);
+			compatibilityVersion = "Xcode 2.4";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
+			knownRegions = (
+				English,
+				Japanese,
+				French,
+				German,
+			);
 			mainGroup = 0867D691FE84028FC02AAC07 /* PI */;
 			productRefGroup = 034768DDFF38A45A11DB9C8B /* Products */;
 			projectDirPath = "";
+			projectRoot = "";
 			targets = (
-				0867D69CFE84028FC02AAC07 /* PI */,
-				6D10687D067DC9AB009E5976 /* PIAQTest */,
-				6DE745DF0C7C4F530051D656 /* XP0 */,
-				6DEA82650C7ED3A500B7D5DD /* XP1 */,
-				6DEA07D30C88612B0016C028 /* PIT0 */,
-				6D622CD50D8ECB6300428D9A /* BaoAdc */,
+				088CC8E2149A494B00210C77 /* PI (Upgraded) */,
+				088CC946149A494B00210C77 /* PIAQTest (Upgraded) */,
+				088CC956149A494B00210C77 /* XP0 (Upgraded) */,
+				088CC966149A494B00210C77 /* XP1 (Upgraded) */,
+				088CC976149A494B00210C77 /* PIT0 (Upgraded) */,
+				088CC986149A494B00210C77 /* BaoAdc (Copied) */,
 			);
 		};
@@ -951,13 +681,13 @@
 
 /* Begin PBXResourcesBuildPhase section */
-		0867D69EFE84028FC02AAC07 /* Resources */ = {
+		088CC912149A494B00210C77 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				089C1668FE841158C02AAC07 /* InfoPlist.strings in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		6D106879067DC9AB009E5976 /* Resources */ = {
+				088CC913149A494B00210C77 /* InfoPlist.strings in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		088CC948149A494B00210C77 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -966,5 +696,5 @@
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		6D622CD20D8ECB6300428D9A /* Resources */ = {
+		088CC958149A494B00210C77 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -973,5 +703,5 @@
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		6DE745E20C7C4F530051D656 /* Resources */ = {
+		088CC968149A494B00210C77 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -980,5 +710,5 @@
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		6DEA07D50C88612B0016C028 /* Resources */ = {
+		088CC978149A494B00210C77 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -987,5 +717,5 @@
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		6DEA82680C7ED3A500B7D5DD /* Resources */ = {
+		088CC987149A494B00210C77 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -997,5 +727,5 @@
 
 /* Begin PBXRezBuildPhase section */
-		0867D6A2FE84028FC02AAC07 /* Rez */ = {
+		088CC93F149A494B00210C77 /* Rez */ = {
 			isa = PBXRezBuildPhase;
 			buildActionMask = 2147483647;
@@ -1004,5 +734,5 @@
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		6D10687C067DC9AB009E5976 /* Rez */ = {
+		088CC94E149A494B00210C77 /* Rez */ = {
 			isa = PBXRezBuildPhase;
 			buildActionMask = 2147483647;
@@ -1011,5 +741,5 @@
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		6DE745E80C7C4F530051D656 /* Rez */ = {
+		088CC95E149A494B00210C77 /* Rez */ = {
 			isa = PBXRezBuildPhase;
 			buildActionMask = 2147483647;
@@ -1018,5 +748,5 @@
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		6DEA07DB0C88612B0016C028 /* Rez */ = {
+		088CC96E149A494B00210C77 /* Rez */ = {
 			isa = PBXRezBuildPhase;
 			buildActionMask = 2147483647;
@@ -1025,5 +755,5 @@
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		6DEA826E0C7ED3A500B7D5DD /* Rez */ = {
+		088CC97E149A494B00210C77 /* Rez */ = {
 			isa = PBXRezBuildPhase;
 			buildActionMask = 2147483647;
@@ -1035,85 +765,86 @@
 
 /* Begin PBXSourcesBuildPhase section */
-		0867D69FFE84028FC02AAC07 /* Sources */ = {
+		088CC914149A494B00210C77 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				6D0E25040665D32C009E5976 /* pimsghandler.cc in Sources */,
-				6D0E25220665E287009E5976 /* picontainergen.cc in Sources */,
-				6D0E25260665E2A9009E5976 /* piwdgquartz.cpp in Sources */,
-				6D0E25270665E2A9009E5976 /* piwdggen.cc in Sources */,
-				6D0E252C0665E33A009E5976 /* PIContainerQuartz.cpp in Sources */,
-				6D0E252D0665E33A009E5976 /* pievthandler.cc in Sources */,
-				6D0E252E0665E33B009E5976 /* PIWindowQuartz.cpp in Sources */,
-				6D0E253106661DC4009E5976 /* piwindowgen.cc in Sources */,
-				6D7D4E4D066710EB009E5976 /* pimenubargen.cc in Sources */,
-				6D7D4E4E066713CB009E5976 /* pimenugen.cc in Sources */,
-				6D7D4E530667277A009E5976 /* PIMenuBarQuartz.cpp in Sources */,
-				6D7D4E5806673450009E5976 /* PIMenuQuartz.cpp in Sources */,
-				6DFD5AD306773E43009E5976 /* piapplgen.cc in Sources */,
-				6DFD5AD706774018009E5976 /* PIApplQuartz.cpp in Sources */,
-				6DEA82D00C7EDF5700B7D5DD /* pistdwdggen.cc in Sources */,
-				6DEA83230C7F166500B7D5DD /* pistdwdgquartz.cpp in Sources */,
-				6DF012F70CBF6A510026E580 /* PIPeriodQuartz.cpp in Sources */,
-				6D6F13310D64550C00583608 /* pifontquartz.cpp in Sources */,
-				6D6F134E0D64572500583608 /* picmapquartz.cpp in Sources */,
-				6D6F13800D6458E200583608 /* pigraphquartz.cpp in Sources */,
-				6D6F13B00D645C4D00583608 /* picmap.cc in Sources */,
-				6D6F13B10D645C4D00583608 /* picmapgen.cc in Sources */,
-				6D6F13FE0D64604000583608 /* pigraphgen.cc in Sources */,
-				6D6F13FF0D64604000583608 /* pigratt.cc in Sources */,
-				6D6F14010D64604000583608 /* pigrcoord.cc in Sources */,
-				6D6F14030D64604000583608 /* pilineatt.cc in Sources */,
-				6D6F14050D64604000583608 /* psfile.cc in Sources */,
-				6D6F14090D64605E00583608 /* pifontgen.cc in Sources */,
-				6D6F14120D64611D00583608 /* strutilxx.cc in Sources */,
-				6DF26D1A0E7FB7EC001AE7EF /* pibwdggen.cc in Sources */,
-				6DF26D1C0E7FB7EC001AE7EF /* pidrawer.cc in Sources */,
-				6DF26D240E7FB84E001AE7EF /* piaxes.cc in Sources */,
-				6DF26D270E7FB84E001AE7EF /* pigraphuc.cc in Sources */,
-				6DF26D500E7FED78001AE7EF /* pioptmenugen.cc in Sources */,
-				6DE18B870E837AD800414227 /* pioptmenuquartz.cpp in Sources */,
-				6DE18BF80E83E4FE00414227 /* pidrwtools.cc in Sources */,
-				6DE18C1B0E83E91700414227 /* pibwdgquartz.cpp in Sources */,
-				6DE8E8160E87BA6D0031A5D9 /* pigraphps.cc in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		6D10687A067DC9AB009E5976 /* Sources */ = {
+				088CC915149A494B00210C77 /* pimsghandler.cc in Sources */,
+				088CC916149A494B00210C77 /* picontainergen.cc in Sources */,
+				088CC917149A494B00210C77 /* piwdgquartz.cpp in Sources */,
+				088CC918149A494B00210C77 /* piwdggen.cc in Sources */,
+				088CC919149A494B00210C77 /* PIContainerQuartz.cpp in Sources */,
+				088CC91A149A494B00210C77 /* pievthandler.cc in Sources */,
+				088CC91B149A494B00210C77 /* PIWindowQuartz.cpp in Sources */,
+				088CC91C149A494B00210C77 /* piwindowgen.cc in Sources */,
+				088CC91D149A494B00210C77 /* pimenubargen.cc in Sources */,
+				088CC91E149A494B00210C77 /* pimenugen.cc in Sources */,
+				088CC91F149A494B00210C77 /* PIMenuBarQuartz.cpp in Sources */,
+				088CC920149A494B00210C77 /* PIMenuQuartz.cpp in Sources */,
+				088CC921149A494B00210C77 /* piapplgen.cc in Sources */,
+				088CC922149A494B00210C77 /* PIApplQuartz.cpp in Sources */,
+				088CC923149A494B00210C77 /* pistdwdggen.cc in Sources */,
+				088CC924149A494B00210C77 /* pistdwdgquartz.cpp in Sources */,
+				088CC925149A494B00210C77 /* PIPeriodQuartz.cpp in Sources */,
+				088CC926149A494B00210C77 /* pifontquartz.cpp in Sources */,
+				088CC927149A494B00210C77 /* picmapquartz.cpp in Sources */,
+				088CC928149A494B00210C77 /* pigraphquartz.cpp in Sources */,
+				088CC929149A494B00210C77 /* picmap.cc in Sources */,
+				088CC92A149A494B00210C77 /* picmapgen.cc in Sources */,
+				088CC92B149A494B00210C77 /* pigraphgen.cc in Sources */,
+				088CC92C149A494B00210C77 /* pigratt.cc in Sources */,
+				088CC92D149A494B00210C77 /* pigrcoord.cc in Sources */,
+				088CC92E149A494B00210C77 /* pilineatt.cc in Sources */,
+				088CC92F149A494B00210C77 /* psfile.cc in Sources */,
+				088CC930149A494B00210C77 /* pifontgen.cc in Sources */,
+				088CC931149A494B00210C77 /* strutilxx.cc in Sources */,
+				088CC932149A494B00210C77 /* pibwdggen.cc in Sources */,
+				088CC933149A494B00210C77 /* pidrawer.cc in Sources */,
+				088CC934149A494B00210C77 /* piaxes.cc in Sources */,
+				088CC935149A494B00210C77 /* pigraphuc.cc in Sources */,
+				088CC936149A494B00210C77 /* pioptmenugen.cc in Sources */,
+				088CC937149A494B00210C77 /* pioptmenuquartz.cpp in Sources */,
+				088CC938149A494B00210C77 /* pidrwtools.cc in Sources */,
+				088CC939149A494B00210C77 /* pibwdgquartz.cpp in Sources */,
+				088CC93A149A494B00210C77 /* pigraphps.cc in Sources */,
+				088CC93B149A494B00210C77 /* pieventquartz.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		088CC949149A494B00210C77 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				6D106880067DC9B3009E5976 /* QuartzAppTest.cpp in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		6D622CD30D8ECB6300428D9A /* Sources */ = {
+				088CC94A149A494B00210C77 /* QuartzAppTest.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		088CC959149A494B00210C77 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		6DE745E30C7C4F530051D656 /* Sources */ = {
+				088CC95A149A494B00210C77 /* xp0.cc in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		088CC969149A494B00210C77 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				6DE745F00C7C4F720051D656 /* xp0.cc in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		6DEA07D60C88612B0016C028 /* Sources */ = {
+				088CC96A149A494B00210C77 /* xp1.cc in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		088CC979149A494B00210C77 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				6DEA07E60C8861E90016C028 /* pit0.cc in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		6DEA82690C7ED3A500B7D5DD /* Sources */ = {
+				088CC97A149A494B00210C77 /* pit0.cc in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		088CC988149A494B00210C77 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				6D6F14750D6463FA00583608 /* xp1.cc in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1133,332 +864,5 @@
 
 /* Begin XCBuildConfiguration section */
-		6D622CE00D8ECB6400428D9A /* Development */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = NO;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-				GCC_MODEL_TUNING = G5;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
-				INFOPLIST_FILE = "BaoAdc-Info.plist";
-				INSTALL_PATH = "$(USER_APPS_DIR)";
-				LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../USB/LALUsb/build/Debug\"";
-				OPTIMIZATION_CFLAGS = "-O0";
-				OTHER_CFLAGS = (
-					"-D__PIWQUARTZ__",
-					"-D_TEST245_CONSOLE_",
-				);
-				OTHER_CPLUSPLUSFLAGS = (
-					"-D__PIWQUARTZ__",
-					"-D_TEST245_CONSOLE_",
-				);
-				OTHER_LDFLAGS = (
-					"-framework",
-					Carbon,
-				);
-				OTHER_REZFLAGS = "";
-				PREBINDING = NO;
-				PRODUCT_NAME = BaoAdc;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-			};
-			name = Development;
-		};
-		6D622CE10D8ECB6400428D9A /* Deployment */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = YES;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_MODEL_TUNING = G5;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
-				INFOPLIST_FILE = "BaoAdc-Info.plist";
-				INSTALL_PATH = "$(USER_APPS_DIR)";
-				LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../USB/LALUsb/build/Debug\"";
-				OPTIMIZATION_CFLAGS = "-O0";
-				OTHER_CFLAGS = (
-					"-D__PIWQUARTZ__",
-					"-D_TEST245_CONSOLE_",
-				);
-				OTHER_CPLUSPLUSFLAGS = (
-					"-D__PIWQUARTZ__",
-					"-D_TEST245_CONSOLE_",
-				);
-				OTHER_LDFLAGS = (
-					"-framework",
-					Carbon,
-				);
-				OTHER_REZFLAGS = "";
-				PREBINDING = NO;
-				PRODUCT_NAME = BaoAdc;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-			};
-			name = Deployment;
-		};
-		6D622CE20D8ECB6400428D9A /* Default */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_MODEL_TUNING = G5;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
-				INFOPLIST_FILE = "BaoAdc-Info.plist";
-				INSTALL_PATH = "$(USER_APPS_DIR)";
-				LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../USB/LALUsb/build/Debug\"";
-				OPTIMIZATION_CFLAGS = "-O0";
-				OTHER_CFLAGS = (
-					"-D__PIWQUARTZ__",
-					"-D_TEST245_CONSOLE_",
-				);
-				OTHER_CPLUSPLUSFLAGS = (
-					"-D__PIWQUARTZ__",
-					"-D_TEST245_CONSOLE_",
-				);
-				OTHER_LDFLAGS = (
-					"-framework",
-					Carbon,
-				);
-				OTHER_REZFLAGS = "";
-				PREBINDING = NO;
-				PRODUCT_NAME = BaoAdc;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-			};
-			name = Default;
-		};
-		6DE745EA0C7C4F530051D656 /* Development */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = NO;
-				FRAMEWORK_SEARCH_PATHS = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				HEADER_SEARCH_PATHS = .;
-				OPTIMIZATION_CFLAGS = "-O0";
-				OTHER_CFLAGS = "-D__PIWQUARTZ__";
-				OTHER_LDFLAGS = "";
-				OTHER_REZFLAGS = "";
-				PREBINDING = NO;
-				PRODUCT_NAME = XP0;
-				SECTORDER_FLAGS = "";
-				USE_GCC3_PFE_SUPPORT = NO;
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = app;
-				ZERO_LINK = YES;
-			};
-			name = Development;
-		};
-		6DE745EB0C7C4F530051D656 /* Deployment */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = YES;
-				FRAMEWORK_SEARCH_PATHS = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				INSTALL_PATH = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
-				OPTIMIZATION_CFLAGS = "-O0";
-				OTHER_CFLAGS = "-D__MACOSX__";
-				OTHER_LDFLAGS = "";
-				OTHER_REZFLAGS = "";
-				PREBINDING = NO;
-				PRODUCT_NAME = PIAQTest;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = app;
-				ZERO_LINK = NO;
-			};
-			name = Deployment;
-		};
-		6DE745EC0C7C4F530051D656 /* Default */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
-				INSTALL_PATH = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
-				OPTIMIZATION_CFLAGS = "-O0";
-				OTHER_CFLAGS = "-D__MACOSX__";
-				OTHER_LDFLAGS = "";
-				OTHER_REZFLAGS = "";
-				PREBINDING = NO;
-				PRODUCT_NAME = PIAQTest;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = app;
-			};
-			name = Default;
-		};
-		6DEA07DD0C88612B0016C028 /* Development */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = NO;
-				FRAMEWORK_SEARCH_PATHS = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				OPTIMIZATION_CFLAGS = "-O0";
-				OTHER_CFLAGS = (
-					"-D__MACOSX__",
-					"-D__PIWQUARTZ__",
-				);
-				OTHER_LDFLAGS = "";
-				OTHER_REZFLAGS = "";
-				PREBINDING = NO;
-				PRODUCT_NAME = PIT0;
-				SECTORDER_FLAGS = "";
-				USE_GCC3_PFE_SUPPORT = NO;
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = app;
-				ZERO_LINK = YES;
-			};
-			name = Development;
-		};
-		6DEA07DE0C88612B0016C028 /* Deployment */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = YES;
-				FRAMEWORK_SEARCH_PATHS = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				INSTALL_PATH = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
-				OPTIMIZATION_CFLAGS = "-O0";
-				OTHER_CFLAGS = "-D__MACOSX__";
-				OTHER_LDFLAGS = "";
-				OTHER_REZFLAGS = "";
-				PREBINDING = NO;
-				PRODUCT_NAME = PIAQTest;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = app;
-				ZERO_LINK = NO;
-			};
-			name = Deployment;
-		};
-		6DEA07DF0C88612B0016C028 /* Default */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
-				INSTALL_PATH = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
-				OPTIMIZATION_CFLAGS = "-O0";
-				OTHER_CFLAGS = "-D__MACOSX__";
-				OTHER_LDFLAGS = "";
-				OTHER_REZFLAGS = "";
-				PREBINDING = NO;
-				PRODUCT_NAME = PIAQTest;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = app;
-			};
-			name = Default;
-		};
-		6DEA82700C7ED3A500B7D5DD /* Development */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = NO;
-				FRAMEWORK_SEARCH_PATHS = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				OPTIMIZATION_CFLAGS = "-O0";
-				OTHER_CFLAGS = "-D__PIWQUARTZ__";
-				OTHER_LDFLAGS = "";
-				OTHER_REZFLAGS = "";
-				PREBINDING = NO;
-				PRODUCT_NAME = XP1;
-				SECTORDER_FLAGS = "";
-				USE_GCC3_PFE_SUPPORT = NO;
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = app;
-				ZERO_LINK = YES;
-			};
-			name = Development;
-		};
-		6DEA82710C7ED3A500B7D5DD /* Deployment */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = YES;
-				FRAMEWORK_SEARCH_PATHS = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				INSTALL_PATH = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
-				OPTIMIZATION_CFLAGS = "-O0";
-				OTHER_CFLAGS = "-D__MACOSX__";
-				OTHER_LDFLAGS = "";
-				OTHER_REZFLAGS = "";
-				PREBINDING = NO;
-				PRODUCT_NAME = PIAQTest;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = app;
-				ZERO_LINK = NO;
-			};
-			name = Deployment;
-		};
-		6DEA82720C7ED3A500B7D5DD /* Default */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
-				INSTALL_PATH = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
-				OPTIMIZATION_CFLAGS = "-O0";
-				OTHER_CFLAGS = "-D__MACOSX__";
-				OTHER_LDFLAGS = "";
-				OTHER_REZFLAGS = "";
-				PREBINDING = NO;
-				PRODUCT_NAME = PIAQTest;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = app;
-			};
-			name = Default;
-		};
-		6DF29DDA0B71EEB300F55B65 /* Development */ = {
+		088CC941149A494B00210C77 /* Development */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -1472,14 +876,16 @@
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = __PIWQUARTZ__;
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_USE_GCC3_PFE_SUPPORT = NO;
 				HEADER_SEARCH_PATHS = "";
+				INFOPLIST_FILE = "Info-PI__Upgraded_.plist";
 				INSTALL_PATH = /Library/PI;
 				LIBRARY_SEARCH_PATHS = "";
-				OPTIMIZATION_CFLAGS = "-O0";
-				OTHER_CFLAGS = "-D__PIWQUARTZ__";
+				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = "";
 				PREBINDING = NO;
 				PRODUCT_NAME = PI;
 				SECTORDER_FLAGS = "";
-				USE_GCC3_PFE_SUPPORT = NO;
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -1492,5 +898,5 @@
 			name = Development;
 		};
-		6DF29DDB0B71EEB300F55B65 /* Deployment */ = {
+		088CC942149A494B00210C77 /* Deployment */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -1501,9 +907,12 @@
 				FRAMEWORK_VERSION = A;
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = __MACOSX__;
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				HEADER_SEARCH_PATHS = "";
+				INFOPLIST_FILE = "Info-PI__Upgraded_.plist";
 				INSTALL_PATH = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
 				LIBRARY_SEARCH_PATHS = "";
-				OPTIMIZATION_CFLAGS = "-O0";
-				OTHER_CFLAGS = "-D__MACOSX__";
+				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = "";
 				PREBINDING = NO;
@@ -1520,5 +929,5 @@
 			name = Deployment;
 		};
-		6DF29DDC0B71EEB300F55B65 /* Default */ = {
+		088CC943149A494B00210C77 /* Default */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -1527,9 +936,12 @@
 				FRAMEWORK_SEARCH_PATHS = "";
 				FRAMEWORK_VERSION = A;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = __MACOSX__;
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				HEADER_SEARCH_PATHS = "";
+				INFOPLIST_FILE = "Info-PI__Upgraded_.plist";
 				INSTALL_PATH = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
 				LIBRARY_SEARCH_PATHS = "";
-				OPTIMIZATION_CFLAGS = "-O0";
-				OTHER_CFLAGS = "-D__MACOSX__";
+				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = "";
 				PREBINDING = NO;
@@ -1545,18 +957,24 @@
 			name = Default;
 		};
-		6DF29DDE0B71EEB300F55B65 /* Development */ = {
+		088CC950149A494B00210C77 /* Development */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				COPY_PHASE_STRIP = NO;
-				FRAMEWORK_SEARCH_PATHS = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
+				FRAMEWORK_SEARCH_PATHS = (
+					/Users/brunomansoux/Programmes/PI4Mac/PI/build,
+					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+				);
+				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/build/Development\"";
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
-				OPTIMIZATION_CFLAGS = "-O0";
-				OTHER_CFLAGS = (
-					"-D__MACOSX__",
-					"-D__PIWQUARTZ__",
-				);
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					__MACOSX__,
+					__PIWQUARTZ__,
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				INFOPLIST_FILE = "Info-PIAQTest__Upgraded_.plist";
+				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = "";
 				OTHER_REZFLAGS = "";
@@ -1574,13 +992,20 @@
 			name = Development;
 		};
-		6DF29DDF0B71EEB300F55B65 /* Deployment */ = {
+		088CC951149A494B00210C77 /* Deployment */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				COPY_PHASE_STRIP = YES;
-				FRAMEWORK_SEARCH_PATHS = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
+				FRAMEWORK_SEARCH_PATHS = (
+					/Users/brunomansoux/Programmes/PI4Mac/PI/build,
+					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+				);
+				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/build/Development\"";
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = __MACOSX__;
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				INFOPLIST_FILE = "Info-PIAQTest__Upgraded_.plist";
 				INSTALL_PATH = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
-				OPTIMIZATION_CFLAGS = "-O0";
-				OTHER_CFLAGS = "-D__MACOSX__";
+				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = "";
 				OTHER_REZFLAGS = "";
@@ -1598,11 +1023,18 @@
 			name = Deployment;
 		};
-		6DF29DE00B71EEB300F55B65 /* Default */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
+		088CC952149A494B00210C77 /* Default */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				FRAMEWORK_SEARCH_PATHS = (
+					/Users/brunomansoux/Programmes/PI4Mac/PI/build,
+					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+				);
+				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/build/Development\"";
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = __MACOSX__;
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				INFOPLIST_FILE = "Info-PIAQTest__Upgraded_.plist";
 				INSTALL_PATH = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
-				OPTIMIZATION_CFLAGS = "-O0";
-				OTHER_CFLAGS = "-D__MACOSX__";
+				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = "";
 				OTHER_REZFLAGS = "";
@@ -1619,8 +1051,412 @@
 			name = Default;
 		};
+		088CC960149A494B00210C77 /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = NO;
+				FRAMEWORK_SEARCH_PATHS = (
+					/Users/brunomansoux/Programmes/PI4Mac/PI/build,
+					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+				);
+				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/build/Development\"";
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = __PIWQUARTZ__;
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_USE_GCC3_PFE_SUPPORT = NO;
+				HEADER_SEARCH_PATHS = .;
+				INFOPLIST_FILE = "Info-XP0__Upgraded_.plist";
+				OTHER_CFLAGS = "";
+				OTHER_LDFLAGS = "";
+				OTHER_REZFLAGS = "";
+				PREBINDING = NO;
+				PRODUCT_NAME = XP0;
+				SECTORDER_FLAGS = "";
+				WARNING_CFLAGS = (
+					"-Wmost",
+					"-Wno-four-char-constants",
+					"-Wno-unknown-pragmas",
+				);
+				WRAPPER_EXTENSION = app;
+				ZERO_LINK = YES;
+			};
+			name = Development;
+		};
+		088CC961149A494B00210C77 /* Deployment */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = YES;
+				FRAMEWORK_SEARCH_PATHS = (
+					/Users/brunomansoux/Programmes/PI4Mac/PI/build,
+					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+				);
+				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/build/Development\"";
+				GCC_ENABLE_FIX_AND_CONTINUE = NO;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = __MACOSX__;
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				INFOPLIST_FILE = "Info-XP0__Upgraded_.plist";
+				INSTALL_PATH = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
+				OTHER_CFLAGS = "";
+				OTHER_LDFLAGS = "";
+				OTHER_REZFLAGS = "";
+				PREBINDING = NO;
+				PRODUCT_NAME = PIAQTest;
+				SECTORDER_FLAGS = "";
+				WARNING_CFLAGS = (
+					"-Wmost",
+					"-Wno-four-char-constants",
+					"-Wno-unknown-pragmas",
+				);
+				WRAPPER_EXTENSION = app;
+				ZERO_LINK = NO;
+			};
+			name = Deployment;
+		};
+		088CC962149A494B00210C77 /* Default */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				FRAMEWORK_SEARCH_PATHS = (
+					/Users/brunomansoux/Programmes/PI4Mac/PI/build,
+					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+				);
+				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/build/Development\"";
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = __MACOSX__;
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				INFOPLIST_FILE = "Info-XP0__Upgraded_.plist";
+				INSTALL_PATH = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
+				OTHER_CFLAGS = "";
+				OTHER_LDFLAGS = "";
+				OTHER_REZFLAGS = "";
+				PREBINDING = NO;
+				PRODUCT_NAME = PIAQTest;
+				SECTORDER_FLAGS = "";
+				WARNING_CFLAGS = (
+					"-Wmost",
+					"-Wno-four-char-constants",
+					"-Wno-unknown-pragmas",
+				);
+				WRAPPER_EXTENSION = app;
+			};
+			name = Default;
+		};
+		088CC970149A494B00210C77 /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = NO;
+				FRAMEWORK_SEARCH_PATHS = (
+					/Users/brunomansoux/Programmes/PI4Mac/PI/build,
+					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+				);
+				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/build/Development\"";
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = __PIWQUARTZ__;
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_USE_GCC3_PFE_SUPPORT = NO;
+				INFOPLIST_FILE = "Info-XP1__Upgraded_.plist";
+				OTHER_CFLAGS = "";
+				OTHER_LDFLAGS = "";
+				OTHER_REZFLAGS = "";
+				PREBINDING = NO;
+				PRODUCT_NAME = XP1;
+				SECTORDER_FLAGS = "";
+				WARNING_CFLAGS = (
+					"-Wmost",
+					"-Wno-four-char-constants",
+					"-Wno-unknown-pragmas",
+				);
+				WRAPPER_EXTENSION = app;
+				ZERO_LINK = YES;
+			};
+			name = Development;
+		};
+		088CC971149A494B00210C77 /* Deployment */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = YES;
+				FRAMEWORK_SEARCH_PATHS = (
+					/Users/brunomansoux/Programmes/PI4Mac/PI/build,
+					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+				);
+				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/build/Development\"";
+				GCC_ENABLE_FIX_AND_CONTINUE = NO;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = __MACOSX__;
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				INFOPLIST_FILE = "Info-XP1__Upgraded_.plist";
+				INSTALL_PATH = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
+				OTHER_CFLAGS = "";
+				OTHER_LDFLAGS = "";
+				OTHER_REZFLAGS = "";
+				PREBINDING = NO;
+				PRODUCT_NAME = PIAQTest;
+				SECTORDER_FLAGS = "";
+				WARNING_CFLAGS = (
+					"-Wmost",
+					"-Wno-four-char-constants",
+					"-Wno-unknown-pragmas",
+				);
+				WRAPPER_EXTENSION = app;
+				ZERO_LINK = NO;
+			};
+			name = Deployment;
+		};
+		088CC972149A494B00210C77 /* Default */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				FRAMEWORK_SEARCH_PATHS = (
+					/Users/brunomansoux/Programmes/PI4Mac/PI/build,
+					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+				);
+				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/build/Development\"";
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = __MACOSX__;
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				INFOPLIST_FILE = "Info-XP1__Upgraded_.plist";
+				INSTALL_PATH = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
+				OTHER_CFLAGS = "";
+				OTHER_LDFLAGS = "";
+				OTHER_REZFLAGS = "";
+				PREBINDING = NO;
+				PRODUCT_NAME = PIAQTest;
+				SECTORDER_FLAGS = "";
+				WARNING_CFLAGS = (
+					"-Wmost",
+					"-Wno-four-char-constants",
+					"-Wno-unknown-pragmas",
+				);
+				WRAPPER_EXTENSION = app;
+			};
+			name = Default;
+		};
+		088CC980149A494B00210C77 /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = NO;
+				FRAMEWORK_SEARCH_PATHS = (
+					/Users/brunomansoux/Programmes/PI4Mac/PI/build,
+					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+				);
+				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/build/Development\"";
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					__MACOSX__,
+					__PIWQUARTZ__,
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_USE_GCC3_PFE_SUPPORT = NO;
+				INFOPLIST_FILE = "Info-PIT0__Upgraded_.plist";
+				OTHER_CFLAGS = "";
+				OTHER_LDFLAGS = "";
+				OTHER_REZFLAGS = "";
+				PREBINDING = NO;
+				PRODUCT_NAME = PIT0;
+				SECTORDER_FLAGS = "";
+				WARNING_CFLAGS = (
+					"-Wmost",
+					"-Wno-four-char-constants",
+					"-Wno-unknown-pragmas",
+				);
+				WRAPPER_EXTENSION = app;
+				ZERO_LINK = YES;
+			};
+			name = Development;
+		};
+		088CC981149A494B00210C77 /* Deployment */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = YES;
+				FRAMEWORK_SEARCH_PATHS = (
+					/Users/brunomansoux/Programmes/PI4Mac/PI/build,
+					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+				);
+				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/build/Development\"";
+				GCC_ENABLE_FIX_AND_CONTINUE = NO;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = __MACOSX__;
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				INFOPLIST_FILE = "Info-PIT0__Upgraded_.plist";
+				INSTALL_PATH = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
+				OTHER_CFLAGS = "";
+				OTHER_LDFLAGS = "";
+				OTHER_REZFLAGS = "";
+				PREBINDING = NO;
+				PRODUCT_NAME = PIAQTest;
+				SECTORDER_FLAGS = "";
+				WARNING_CFLAGS = (
+					"-Wmost",
+					"-Wno-four-char-constants",
+					"-Wno-unknown-pragmas",
+				);
+				WRAPPER_EXTENSION = app;
+				ZERO_LINK = NO;
+			};
+			name = Deployment;
+		};
+		088CC982149A494B00210C77 /* Default */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				FRAMEWORK_SEARCH_PATHS = (
+					/Users/brunomansoux/Programmes/PI4Mac/PI/build,
+					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+				);
+				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/build/Development\"";
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = __MACOSX__;
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				INFOPLIST_FILE = "Info-PIT0__Upgraded_.plist";
+				INSTALL_PATH = /Users/brunomansoux/Programmes/PI4Mac/PI/build;
+				OTHER_CFLAGS = "";
+				OTHER_LDFLAGS = "";
+				OTHER_REZFLAGS = "";
+				PREBINDING = NO;
+				PRODUCT_NAME = PIAQTest;
+				SECTORDER_FLAGS = "";
+				WARNING_CFLAGS = (
+					"-Wmost",
+					"-Wno-four-char-constants",
+					"-Wno-unknown-pragmas",
+				);
+				WRAPPER_EXTENSION = app;
+			};
+			name = Default;
+		};
+		088CC98C149A494B00210C77 /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = NO;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+				);
+				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/build/Development\"";
+				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+				GCC_MODEL_TUNING = G5;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
+				INFOPLIST_FILE = "BaoAdc-Info.plist";
+				INSTALL_PATH = "$(USER_APPS_DIR)";
+				LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../USB/LALUsb/build/Debug\"";
+				OTHER_CFLAGS = (
+					"-D__PIWQUARTZ__",
+					"-D_TEST245_CONSOLE_",
+				);
+				OTHER_CPLUSPLUSFLAGS = (
+					"-D__PIWQUARTZ__",
+					"-D_TEST245_CONSOLE_",
+				);
+				OTHER_LDFLAGS = (
+					"-framework",
+					Carbon,
+				);
+				OTHER_REZFLAGS = "";
+				PREBINDING = NO;
+				PRODUCT_NAME = BaoAdc;
+				SECTORDER_FLAGS = "";
+				WARNING_CFLAGS = (
+					"-Wmost",
+					"-Wno-four-char-constants",
+					"-Wno-unknown-pragmas",
+				);
+			};
+			name = Development;
+		};
+		088CC98D149A494B00210C77 /* Deployment */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = YES;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+				);
+				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/build/Development\"";
+				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+				GCC_MODEL_TUNING = G5;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
+				INFOPLIST_FILE = "BaoAdc-Info.plist";
+				INSTALL_PATH = "$(USER_APPS_DIR)";
+				LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../USB/LALUsb/build/Debug\"";
+				OTHER_CFLAGS = (
+					"-D__PIWQUARTZ__",
+					"-D_TEST245_CONSOLE_",
+				);
+				OTHER_CPLUSPLUSFLAGS = (
+					"-D__PIWQUARTZ__",
+					"-D_TEST245_CONSOLE_",
+				);
+				OTHER_LDFLAGS = (
+					"-framework",
+					Carbon,
+				);
+				OTHER_REZFLAGS = "";
+				PREBINDING = NO;
+				PRODUCT_NAME = BaoAdc;
+				SECTORDER_FLAGS = "";
+				WARNING_CFLAGS = (
+					"-Wmost",
+					"-Wno-four-char-constants",
+					"-Wno-unknown-pragmas",
+				);
+			};
+			name = Deployment;
+		};
+		088CC98E149A494B00210C77 /* Default */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+				);
+				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/build/Development\"";
+				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+				GCC_MODEL_TUNING = G5;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
+				INFOPLIST_FILE = "BaoAdc-Info.plist";
+				INSTALL_PATH = "$(USER_APPS_DIR)";
+				LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../USB/LALUsb/build/Debug\"";
+				OTHER_CFLAGS = (
+					"-D__PIWQUARTZ__",
+					"-D_TEST245_CONSOLE_",
+				);
+				OTHER_CPLUSPLUSFLAGS = (
+					"-D__PIWQUARTZ__",
+					"-D_TEST245_CONSOLE_",
+				);
+				OTHER_LDFLAGS = (
+					"-framework",
+					Carbon,
+				);
+				OTHER_REZFLAGS = "";
+				PREBINDING = NO;
+				PRODUCT_NAME = BaoAdc;
+				SECTORDER_FLAGS = "";
+				WARNING_CFLAGS = (
+					"-Wmost",
+					"-Wno-four-char-constants",
+					"-Wno-unknown-pragmas",
+				);
+			};
+			name = Default;
+		};
 		6DF29DE20B71EEB300F55B65 /* Development */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				HEADER_SEARCH_PATHS = Quartz;
+				MACOSX_DEPLOYMENT_TARGET = 10.4;
+				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 			};
 			name = Development;
@@ -1629,4 +1465,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				MACOSX_DEPLOYMENT_TARGET = 10.4;
+				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 			};
 			name = Deployment;
@@ -1635,4 +1473,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				MACOSX_DEPLOYMENT_TARGET = 10.4;
+				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 			};
 			name = Default;
@@ -1641,59 +1481,60 @@
 
 /* Begin XCConfigurationList section */
-		6D622CDF0D8ECB6400428D9A /* Build configuration list for PBXNativeTarget "BaoAdc" */ = {
+		088CC940149A494B00210C77 /* Build configuration list for PBXNativeTarget "PI (Upgraded)" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				6D622CE00D8ECB6400428D9A /* Development */,
-				6D622CE10D8ECB6400428D9A /* Deployment */,
-				6D622CE20D8ECB6400428D9A /* Default */,
+				088CC941149A494B00210C77 /* Development */,
+				088CC942149A494B00210C77 /* Deployment */,
+				088CC943149A494B00210C77 /* Default */,
 			);
 			defaultConfigurationIsVisible = 0;
-		};
-		6DE745E90C7C4F530051D656 /* Build configuration list for PBXApplicationTarget "XP0" */ = {
+			defaultConfigurationName = Default;
+		};
+		088CC94F149A494B00210C77 /* Build configuration list for PBXNativeTarget "PIAQTest (Upgraded)" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				6DE745EA0C7C4F530051D656 /* Development */,
-				6DE745EB0C7C4F530051D656 /* Deployment */,
-				6DE745EC0C7C4F530051D656 /* Default */,
+				088CC950149A494B00210C77 /* Development */,
+				088CC951149A494B00210C77 /* Deployment */,
+				088CC952149A494B00210C77 /* Default */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Default;
 		};
-		6DEA07DC0C88612B0016C028 /* Build configuration list for PBXApplicationTarget "PIT0" */ = {
+		088CC95F149A494B00210C77 /* Build configuration list for PBXNativeTarget "XP0 (Upgraded)" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				6DEA07DD0C88612B0016C028 /* Development */,
-				6DEA07DE0C88612B0016C028 /* Deployment */,
-				6DEA07DF0C88612B0016C028 /* Default */,
+				088CC960149A494B00210C77 /* Development */,
+				088CC961149A494B00210C77 /* Deployment */,
+				088CC962149A494B00210C77 /* Default */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Default;
 		};
-		6DEA826F0C7ED3A500B7D5DD /* Build configuration list for PBXApplicationTarget "XP1" */ = {
+		088CC96F149A494B00210C77 /* Build configuration list for PBXNativeTarget "XP1 (Upgraded)" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				6DEA82700C7ED3A500B7D5DD /* Development */,
-				6DEA82710C7ED3A500B7D5DD /* Deployment */,
-				6DEA82720C7ED3A500B7D5DD /* Default */,
+				088CC970149A494B00210C77 /* Development */,
+				088CC971149A494B00210C77 /* Deployment */,
+				088CC972149A494B00210C77 /* Default */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Default;
 		};
-		6DF29DD90B71EEB300F55B65 /* Build configuration list for PBXFrameworkTarget "PI" */ = {
+		088CC97F149A494B00210C77 /* Build configuration list for PBXNativeTarget "PIT0 (Upgraded)" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				6DF29DDA0B71EEB300F55B65 /* Development */,
-				6DF29DDB0B71EEB300F55B65 /* Deployment */,
-				6DF29DDC0B71EEB300F55B65 /* Default */,
+				088CC980149A494B00210C77 /* Development */,
+				088CC981149A494B00210C77 /* Deployment */,
+				088CC982149A494B00210C77 /* Default */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Default;
 		};
-		6DF29DDD0B71EEB300F55B65 /* Build configuration list for PBXApplicationTarget "PIAQTest" */ = {
+		088CC98B149A494B00210C77 /* Build configuration list for PBXNativeTarget "BaoAdc (Copied)" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				6DF29DDE0B71EEB300F55B65 /* Development */,
-				6DF29DDF0B71EEB300F55B65 /* Deployment */,
-				6DF29DE00B71EEB300F55B65 /* Default */,
+				088CC98C149A494B00210C77 /* Development */,
+				088CC98D149A494B00210C77 /* Deployment */,
+				088CC98E149A494B00210C77 /* Default */,
 			);
 			defaultConfigurationIsVisible = 0;
Index: /trunk/SophyaPI/PI/Quartz/PIContainerQuartz.h~
===================================================================
--- /trunk/SophyaPI/PI/Quartz/PIContainerQuartz.h~	(revision 4077)
+++ /trunk/SophyaPI/PI/Quartz/PIContainerQuartz.h~	(revision 4077)
@@ -0,0 +1,31 @@
+/*
+ *  PIContainerQuartz.h
+ *  PI
+ *
+ *  Created by Bruno MANSOUX on Tue May 04 2004.
+ *  Copyright (c) 2004 __MyCompanyName__. All rights reserved.
+ *
+ */
+#include  <Carbon/Carbon.h>
+
+#ifndef PICONTAINERQUARTZ_SEEN
+#define PICONTAINERQUARTZ_SEEN
+
+#include "picontainergen.h"
+
+
+class PIContainerQuartz : public PIContainerGen 
+{
+public:
+    PIContainerQuartz(PIContainerGen *par, const char *nom,
+        int sx=10, int sy=10, int px=0, int py=0);
+    virtual	~PIContainerQuartz();
+
+    virtual void Process(PIMessage msg, PIMsgHandler* sender, void* data=NULL);
+	
+	virtual WindowRef GetWindowRef();
+};
+
+typedef PIContainerQuartz PIContainer;
+
+#endif  /* PICONTAINERQUARTZ_SEEN */
Index: /trunk/SophyaPI/PI/Quartz/XP0-Info.plist
===================================================================
--- /trunk/SophyaPI/PI/Quartz/XP0-Info.plist	(revision 4077)
+++ /trunk/SophyaPI/PI/Quartz/XP0-Info.plist	(revision 4077)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>XP0</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.yourcompany.XP0</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+</dict>
+</plist>
Index: /trunk/SophyaPI/PI/Quartz/machdefs.h
===================================================================
--- /trunk/SophyaPI/PI/Quartz/machdefs.h	(revision 4077)
+++ /trunk/SophyaPI/PI/Quartz/machdefs.h	(revision 4077)
@@ -0,0 +1,401 @@
+#ifndef MACHDEFS_SEEN
+#define MACHDEFS_SEEN
+
+/***********************************************************************/
+/* Find hardware, OS and compiler combination                          */
+/***********************************************************************/
+
+#if defined(OSF1) 
+#define MACH_ALPHA
+#define OS_OSF1
+#endif
+
+#if defined(_AIX) || defined(AIX)
+#define MACH_IBMRS
+#define OS_AIX
+#endif
+
+#if defined(__hpux__) || defined(HPUX)
+#define MACH_HP
+#define OS_HPUX
+#endif
+
+#ifdef __MWERKS__
+#define MACH_POWERMAC
+#define OS_MACOS
+#endif
+
+#if defined(SunOS)  || defined ( sun )
+#define MACH_SUN
+#define OS_SOLARIS
+#endif
+
+#ifdef IRIX64
+#define MACH_SGI
+#define OS_IRIX64
+#endif
+
+#ifdef __APPLE__
+#ifdef __MACH__
+#define MACH_POWERPC
+#define OS_MACOSX
+#endif
+#endif
+
+#if defined(Linux)  || defined(linux)
+#if defined(__alpha__)
+#define MACH_ALPHA
+#elif defined(powerpc)
+#define MACH_POWERPC
+#elif defined(__i386__)
+#define MACH_INTEL
+#else
+#error Undefined Platform (machine) type with linux in machdefs.h
+#endif
+#define OS_LINUX
+#endif
+
+
+/***********************************************************************/
+/* Hardware/OS dependent stuff                                         */
+/***********************************************************************/
+
+#if defined(OS_OSF1)
+
+  typedef signed char int_1;
+  typedef unsigned char uint_1;
+  typedef int int_4;
+  typedef unsigned int uint_4;
+  typedef short int_2;
+  typedef unsigned short uint_2;
+  typedef float r_4;
+  typedef double r_8;
+  typedef long long int_8;
+  typedef unsigned long long uint_8;
+
+#define  SWAP 1
+#define  SWAPDEFAUT 1
+
+#elif  defined(OS_HPUX)
+
+  typedef signed char int_1;
+  typedef unsigned char uint_1;
+  typedef int int_4 ;
+  typedef unsigned int uint_4;
+  typedef short int_2;
+  typedef unsigned short uint_2;
+  typedef float r_4;
+  typedef double r_8;
+  typedef long long int_8;
+  typedef unsigned long long uint_8;
+
+#define  SWAP 0
+#define  SWAPDEFAUT   0
+
+
+#elif  defined( OS_AIX )
+
+  typedef signed char int_1;
+  typedef unsigned char uint_1;
+  typedef int int_4;
+  typedef unsigned int uint_4;
+  typedef short int_2;
+  typedef unsigned short uint_2;
+  typedef float r_4;
+  typedef double r_8;
+  typedef long long int_8;
+  typedef unsigned long long uint_8;
+
+#define  SWAP 0
+#define  SWAPDEFAUT   0
+
+/* Check for solaris on intel... */
+#elif  defined( OS_SOLARIS ) && defined( MACH_SUN )
+
+  typedef signed char int_1;
+  typedef unsigned char uint_1;
+  typedef int int_4;
+  typedef unsigned int uint_4;
+  typedef short int_2;
+  typedef unsigned short uint_2;
+  typedef float r_4;
+  typedef double r_8;
+  typedef long long int_8;
+  typedef unsigned long long uint_8;
+
+#define  SWAP 0
+#define  SWAPDEFAUT   0
+
+#elif  defined( OS_IRIX64 )
+
+  typedef signed char int_1;
+  typedef unsigned char uint_1;
+  typedef int int_4;
+  typedef unsigned int uint_4;
+  typedef short int_2;
+  typedef unsigned short uint_2;
+  typedef float r_4;
+  typedef double r_8;
+  typedef long long int_8;
+  typedef unsigned long long uint_8;
+
+#define  SWAP 0
+#define  SWAPDEFAUT   0
+
+/* Check linux on other machines than Intel */
+#elif defined(OS_LINUX)
+/* Sizes OK for PowerPC, Alpha, Intel    */
+/* On Alpha, long is 8 bytes             */
+  typedef signed char int_1;
+  typedef unsigned char uint_1;
+  typedef int int_4;
+  typedef unsigned int uint_4;
+  typedef short int_2;
+  typedef unsigned short uint_2;
+  typedef float r_4;
+  typedef double r_8;
+  typedef long long int_8;
+  typedef unsigned long long uint_8;
+
+#if defined(powerpc) || (__alpha__)
+#define SWAP 0
+#define SWAPDEFAUT 0
+#else
+#define  SWAP 1
+#define  SWAPDEFAUT   1
+#endif
+
+#elif defined(OS_MACOS)
+
+  typedef signed char int_1;
+  typedef unsigned char uint_1;
+  typedef long int_4;
+  typedef unsigned long uint_4;
+  typedef short int_2;
+  typedef unsigned short uint_2;
+  typedef float r_4;
+  typedef double r_8;
+  typedef long long int_8;
+  typedef unsigned long long uint_8;
+
+#define  SWAP 0
+#define  SWAPDEFAUT   0
+
+#elif defined(OS_MACOSX)
+
+  typedef signed char int_1;
+  typedef unsigned char uint_1;
+  typedef int int_4;
+  typedef unsigned int uint_4;
+  typedef short int_2;
+  typedef unsigned short uint_2;
+  typedef float r_4;
+  typedef double r_8;
+  typedef long long int_8;
+  typedef unsigned long long uint_8;
+  typedef unsigned char pistring[256];
+//  typedef void (*Callback)(void* userData);
+
+#define  SWAP 0
+#define  SWAPDEFAUT   0
+
+
+#else
+#error  Undefined Machine/OS type in machdefs.h
+#endif
+
+
+
+#if SWAP==1
+#define IS_BIG_ENDIAN 0
+#else
+#define IS_BIG_ENDIAN 1
+#endif
+
+
+/***********************************************************************/
+/* Find Compiler                                                       */
+/***********************************************************************/
+
+/*    __MWERKS__   : Metrowerks Codewarrior (>= PRO 4)                 */
+/*    __DECCXX     : DEC CXX, version >= 6 is required                 */
+/*    __GNUG__     : GNU C++ 2.8.1, egcs ??                            */
+/*    __aCC__      : aCC on HP                                         */
+/*    __KCC__      : KCC, version >= 3.3 is required                   */
+/*    __SGICC__    : SGI (IRIX64) CC compiler                          */
+
+/***********************************************************************/
+/* Compiler-specific stuff                                             */
+/***********************************************************************/
+
+/* Some features will be *required* for Planck. Which ones ?               */
+  
+/*   ANSI_TEMPLATES        : use ANSI syntax for explicit templates        */
+/*   GNUG_TEMPLATES        : use GNU syntax for explicit templates         */
+/*   PRAGMA_TEMPLATES      : use pragma template, a la cxx                 */
+/*   COMPILER_EXCEPTIONS   : knows about exceptions  --- required ?        */ 
+/*   STREAMPOS_IS_CLASS    : streampos is a real class                     */
+/*   ITER_TAG              : use iter_tag for iterator qualifiers in STL   */
+/*   NO_STRSTREAM          : does not have strstream                       */
+/*   NO_EXPLICIT           : does not know about explicit keyword          */
+/*   HAS_IOS_BIN                                                           */
+/*   HAS_IOS_NOCREATE                                                      */
+/*   HAS_VEC_NEW           : operator new[]                                */
+/*   CC_HAS_RTTI_SUPPORT     has Run Time Type Identification support      */
+/*   ANSI_IO               : rdbuf()->pubseekoff rather than seekg         */
+/*   HAS_STR_NPOS          : has string::npos and not a global NPOS        */
+/*   NO_IOS_COMPLEX        : does not have operator << defined for complex */
+
+
+/* The following is true for most compilers */
+
+#ifndef HAS_VEC_NEW
+#define HAS_VEC_NEW
+#endif
+
+#ifndef COMPILER_EXCEPTIONS
+#define COMPILER_EXCEPTIONS
+#endif
+
+#ifndef  CC_HAS_RTTI_SUPPORT 
+#define  CC_HAS_RTTI_SUPPORT 
+#endif
+
+/* now the specific things */
+
+#ifdef __MWERKS__
+#define ANSI_TEMPLATES
+#undef  HAS_VEC_NEW
+#define NO_STRSTREAM
+//#define STREAMPOS_IS_CLASS
+#define ITER_TAG
+#define HAS_IOS_BIN 
+#define HAS_IOS_NOCREATE 
+#define HAS_STR_NPOS
+#endif
+
+#ifdef __GNUG__
+#define ANSI_TEMPLATES
+// #define GNU_TEMPLATES
+#define HAS_STR_NPOS
+#define HAS_IOS_BIN
+#define HAS_IOS_NOCREATE
+#endif
+
+#ifdef __DECCXX
+#define HAS_STR_NPOS
+#define ITER_TAG
+#define __CXX_PRAGMA_TEMPLATES__
+#define PRAGMA_TEMPLATES
+#endif
+
+#if defined (__aCC__)  
+#ifndef ANSI_TEMPLATES
+#define ANSI_TEMPLATES
+#endif
+#endif
+
+#if defined(__KCC__)
+/* KCC V 3.2 ne compile pas  i/ostream s ; long p = s.tellg();  OK en  V 3.3 */
+#define HAS_STR_NPOS
+#ifndef ANSI_TEMPLATES
+#define ANSI_TEMPLATES
+#endif
+#endif
+
+#if defined(__SGICC__)
+#define HAS_STR_NPOS
+#ifndef ANSI_TEMPLATES
+#define ANSI_TEMPLATES
+#endif
+#endif
+
+/* Get things has homogeneous as possible between compilers */
+
+#ifdef HAS_STR_NPOS
+#define NPOS string::npos
+#else
+#define NPOS (size_t)-1
+#endif
+
+#ifndef __GNUG__
+#define __PRETTY_FUNCTION__ __FILE__ " __LINE__ "
+#ifndef __FUNCTION__
+#define __FUNCTION__ __FILE__ " __LINE__ "
+#endif
+#ifndef __KCC__
+#define __attribute__(_x_)
+#endif
+#endif
+
+#ifdef NO_EXPLICIT
+#define explicit
+#endif
+
+#ifdef HAS_IOS_BIN
+#define IOS_BIN ios::binary
+#else
+#define IOS_BIN 0
+#endif
+
+#ifdef ANSI_IO
+#define seekg(p_, m_) rdbuf()->pubseekoff(p_,m_)
+#define seekp(p_, m_) rdbuf()->pubseekoff(p_,m_)
+#endif
+
+#ifdef __MWERKS__
+//#define hypot(_x_,_y_) sqrt((_x_)*(_x_) + (_y_)*(_y_))
+#define random() (rand()*65538.0 + rand()*2. + rand())
+#define srandom srand
+#define initstate(seed, tab, n) srand(seed)
+#define nice(_x)
+
+#ifdef __cplusplus
+#include <string.h>
+#include <string>
+inline bool operator< (string const& s1, string const& s2)
+{ return (strcmp(s1.c_str(), s2.c_str()) < 0); }
+#endif
+#endif
+
+#ifdef OS_MACOSX
+#define NO_VALUES_H
+/* BMX */
+#include "PI_Prefix.h"
+/* #include "osx_values.h" */
+/* Faute de mieux pour le moment : */
+#define drand48() ((double)(random())/LONG_MAX)
+#endif
+
+
+/********************************************************/
+/* Outil d'impressions pour debug */
+#define PR(_data_)  {cout<<" "<<#_data_<<" "<<_data_;}
+#define CR {cout<<"\n"<<flush;}
+/* ********************************************************/
+
+/* ---- Activation des flags de debug/bound checking  ----- */
+#ifdef SOPHYA_DEBUG
+#define SO_BOUNDCHECKING
+#endif
+
+/* ---- La taille et les index des tableaux ---- */
+#ifdef SGI_ARCH64
+typedef int_8 sa_size_t ;
+#else
+typedef int_4 sa_size_t ;
+#endif
+
+/* Compatibilite, avant de migrer tout le code en "PLANCK" */
+
+#ifdef __cplusplus
+/* Standard C++ library classes are in the namespace std  */
+namespace std { }
+using namespace std;
+/*  SOPHYA classes are in namespace SOPHYA  */
+namespace SOPHYA {}
+using namespace SOPHYA;
+#define EXPLICIT explicit
+#endif
+
+#endif
Index: /trunk/SophyaPI/PI/Quartz/pibwdgquartz.cpp
===================================================================
--- /trunk/SophyaPI/PI/Quartz/pibwdgquartz.cpp	(revision 4076)
+++ /trunk/SophyaPI/PI/Quartz/pibwdgquartz.cpp	(revision 4077)
@@ -4,57 +4,109 @@
  *
  *  Created by Bruno MANSOUX on 19/09/08.
- *  Copyright 2008 __MyCompanyName__. All rights reserved.
  *
  */
 
 #include "pibwdgquartz.h"
+#include "PIContainerQuartz.h"
 
-PIBaseWdgQuartz::PIBaseWdgQuartz(PIContainerGen *par, const char *nom,int sx, int sy, int px, int py)
+OSStatus BaseWdgQuartzEventHandler (EventHandlerCallRef myHandler,EventRef event, void *userData);
+
+PIBaseWdgQuartz::PIBaseWdgQuartz(PIContainerGen *par, const char *nom, int sx, int sy, int px, int py)
 : PIBaseWdgGen(par,nom,sx,sy,px,py)
 {
+	HIRect localHIRect;
+	HIViewRef rootView;
+	HIViewRef contentView;
+	OSStatus err;
+	
+	rootView = ((PIWdg*)par)->GetHIViewRef();
+	err = HIViewGetBounds (rootView, &localHIRect);
+												
+	err = HIScrollViewCreate(kHIScrollViewOptionsVertScroll | kHIScrollViewOptionsHorizScroll, &wdgHIView);
+	err += HIViewSetVisible (wdgHIView, true);	
+	
+	err += HIViewFindByID(rootView, kHIViewWindowContentID, &contentView);
+	err += HIViewAddSubview (contentView, wdgHIView);
+
+	err += HIViewGetBounds (wdgHIView, &localHIRect);
+	
+	localHIRect.origin.x = (float)px;
+	localHIRect.origin.y	= (float)py;
+	localHIRect.size.width = (float)sx; 
+	localHIRect.size.height = (float)sy;
+	
+	err = HIViewSetFrame (wdgHIView, &localHIRect);
+	
+	err += HIViewGetFrame (wdgHIView, &localHIRect);
+	
+	printf("PIBaseWdgQuartz::PIBaseWdgQuartz Set Frame (%g %g) [%g %g] err : %d \n",
+											localHIRect.origin.x, localHIRect.origin.y,
+											localHIRect.size.width, localHIRect.size.height,
+											err);
+
+	err = InstallEventHandler (GetControlEventTarget (wdgHIView),
+								NewEventHandlerUPP (BaseWdgQuartzEventHandler),
+								GetEventTypeCount (basewdgSpec),
+								(const EventTypeSpec*)&basewdgSpec,
+								(void *) this,
+								NULL);
+
+	HIViewRender(wdgHIView);
+
+	mWGrC = new PIGraphicWin(this);
 }
 
+/* --Methode-- */
 PIBaseWdgQuartz::~PIBaseWdgQuartz()
 {
 }
 
+/* --Methode-- */
 void PIBaseWdgQuartz::FinishCreate()
 {
 }
 
+/* --Methode-- */
 void PIBaseWdgQuartz::ActivatePtrCross()
 {
 }
  
+/* --Methode-- */
 void PIBaseWdgQuartz::ActivateButton(int bid)
 {
 }
  
+/* --Methode-- */
 void PIBaseWdgQuartz::ActivateMove(int bid)
 {
 }
  
+/* --Methode-- */
 void PIBaseWdgQuartz::ActivateKeyboard()
 {
 }
  
+/* --Methode-- */
 void PIBaseWdgQuartz::SelPointerShape(PIPointer ptr)
 {
 }
  
+/* --Methode-- */
 PIPointer PIBaseWdgQuartz::GetPointerShape()
 {
+	return PI_ArrowPointer;
 }
  
+/* --Methode-- */
 void PIBaseWdgQuartz::AssignKeyboard()
 {
 }
 
-// Acces aux caracteristiques du dernier evenement 
+/* --Methode-- */
 void PIBaseWdgQuartz::GetLastEventInfo(PIKeyModifier& kmod, unsigned long& tm)
 {
 }
 
-// On redefinit IsVisible() pour tenir compte de l appel a FinsihCreate  
+/* --Methode-- */
 bool PIBaseWdgQuartz::IsVisible()
 {
@@ -62,14 +114,78 @@
 }
 
-//  Fonction qui doit etre appelee pour rafraichir la fenetre 
+/* --Methode-- */
 void PIBaseWdgQuartz::Refresh()
 {
+	printf("PIBaseWdgQuartz::Refresh ");
+	EventRef	rEvent;
+	OSStatus err;
+	
+	err = CreateEvent( NULL,  kEventClassControl, kEventControlDraw,
+				GetCurrentEventTime(), kEventAttributeNone, &rEvent );
+	SetEventParameter( rEvent, kEventParamCGContextRef, typeCGContextRef, sizeof (CGContextRef), mWGrC->GetCGContext());
+
+	SendEventToEventTarget(rEvent, GetControlEventTarget (wdgHIView));
+	
+	HIRect hiRect;
+	HIViewGetFrame(wdgHIView, &hiRect);
+
+	CGContextRestoreGState (mWGrC->GetCGContext());
+	printf(" cg : %lx ox : %g oy : %g width : %g height : %g \n",
+			mWGrC->GetCGContext(), hiRect.origin.x, hiRect.origin.y, hiRect.size.width, hiRect.size.height);
+	// mWGrC->SetGCRect(hiRect.origin.x, hiRect.origin.y, hiRect.size.width, hiRect.size.height);	
+	// Draw(mWGrC, 0, 0, XSize(), YSize());
+
 	return;
 }
 
-//  Appel depuis le PIXtBaseWidget uniquement (ExposeEvt de Xt )
-void PIBaseWdgQuartz::eXposeProcess(int x0, int y0, int dx, int dy)
+/* --Methode-- */
+void PIBaseWdgQuartz::eXposeProcess(CGContextRef cg, int x0, int y0, int dx, int dy)
 {
+	printf("PIBaseWdgQuartz::ExposeProcess \n");
+	CGContextSaveGState(cg);
+	mWGrC->SetCGContext(cg);
+	mWGrC->SetCTM(CGContextGetCTM(cg));
+	Draw(mWGrC, x0, y0, dx, dy);
+
 	return;
 }
  
+/* ============================================================================================================ */
+/* ============================================================================================================ */
+static int counterDraw = 0;
+// Handler
+OSStatus BaseWdgQuartzEventHandler (EventHandlerCallRef myHandler, EventRef event, void *userData)
+{
+	OSStatus status = noErr;
+	
+	counterDraw++;
+	printf(" BaseWdgQuartzEventHandler (%d) : ", counterDraw);
+	PIGetEventName(event);
+
+	PIBaseWdgQuartz* wdg = (PIBaseWdgQuartz*) userData;
+
+	CGContextRef cg;
+		
+    status = GetEventParameter (event, kEventParamCGContextRef, typeCGContextRef, NULL, sizeof (CGContextRef), NULL, &cg);
+
+	if (status != noErr)
+	{
+		printf(" err = %d \n",status);
+	}
+	else
+	{	
+		// wdg->SetQuartzCGContext(cg);
+		HIViewRef view = wdg->GetHIViewRef();
+		HIRect hiRect;
+		HIViewGetFrame(view, &hiRect);
+		// Pour le moment on rafraichit toute la vue
+		int ox = (int)(hiRect.origin.x);
+		int oy = (int)(hiRect.origin.x);
+		int dx = (int)(hiRect.size.width); 
+		int dy = (int)(hiRect.size.height);
+		printf(" BaseWdgQuartzEventHandler cg : %lx [%d %d] Frame [%d, %d] \n", (unsigned long)cg, ox, oy, dx, dy);
+		wdg->eXposeProcess(cg, 0 , 0, dx, dy);
+	}
+
+	return status;
+}
Index: /trunk/SophyaPI/PI/Quartz/pibwdgquartz.h
===================================================================
--- /trunk/SophyaPI/PI/Quartz/pibwdgquartz.h	(revision 4076)
+++ /trunk/SophyaPI/PI/Quartz/pibwdgquartz.h	(revision 4077)
@@ -15,4 +15,27 @@
 #include "pigraphquartz.h"
 #include "pigraphps.h"
+
+/*
+static const EventTypeSpec basewdgSpec[] = {
+ 											 { kEventClassWindow, kEventWindowClose},
+ 											 { kEventClassWindow, kEventWindowResizeCompleted},
+ 											 { kEventClassWindow, kEventWindowDrawContent},
+											 { kEventClassWindow, kEventWindowBoundsChanged },
+											 { kEventClassHIObject, kEventHIObjectConstruct },
+											 { kEventClassHIObject, kEventHIObjectInitialize },
+											 { kEventClassHIObject, kEventHIObjectDestruct },
+											  { kEventClassControl, kEventControlDraw},
+											  { kEventClassControl, kEventControlClick},
+											  { kEventClassControl, kEventControlBoundsChanged},
+											  { kEventClassControl, kEventControlOwningWindowChanged },
+											  { kEventClassControl, kEventControlInitialize },
+											  { kEventClassControl, kEventControlGetPartRegion },
+											  { kEventClassControl, kEventControlHitTest }
+											 };
+
+*/
+
+static const EventTypeSpec basewdgSpec[] = {{ kEventClassControl, kEventControlDraw}};
+
 
 class PIBaseWdgQuartz : public PIBaseWdgGen
@@ -49,9 +72,9 @@
 
 //  Appel depuis le PIXtBaseWidget uniquement (ExposeEvt de Xt )
-  virtual void       eXposeProcess(int x0, int y0, int dx, int dy);
+  virtual void       eXposeProcess(CGContextRef cg, int x0, int y0, int dx, int dy);
  
 protected:
   void               Init();
-  PIPointer mPtrS;
+  PIPointer          mPtrS;
 // pour s'assurer que le bon FinishCreate() est appele - pb lie aux tables de fonctions
 // virtuelles des classes qui sont remplies au fur et a mesure des constructeurs
Index: /trunk/SophyaPI/PI/Quartz/pieventquartz.cpp
===================================================================
--- /trunk/SophyaPI/PI/Quartz/pieventquartz.cpp	(revision 4077)
+++ /trunk/SophyaPI/PI/Quartz/pieventquartz.cpp	(revision 4077)
@@ -0,0 +1,90 @@
+/*
+ *  pieventquartz.cpp
+ *  PI
+ *
+ *  Created by Bruno MANSOUX on 02/03/10.
+ *
+ */
+
+#include "pieventquartz.h"
+
+void PIGetEventName (EventRef event)
+{
+    UInt32 eventClass = GetEventClass( event );
+    UInt32 eventKind = GetEventKind( event );
+
+	switch(eventClass)
+	{
+		case kEventClassControl:
+		{
+			switch (eventKind)
+			{
+			case kEventControlDraw:
+			printf(" kEventControlDraw \n");
+			break;
+			case kEventControlOwningWindowChanged:
+			printf(" kEventControlOwningWindowChanged\n");
+			break;
+			case kEventControlInitialize:
+			printf(" kEventControlInitialize\n");
+			break;
+			case kEventControlHitTest:
+			printf("kEventControlHitTest\n");
+			break;
+			case kEventControlGetPartRegion:
+			printf("kEventControlGetPartRegion\n");
+			break;
+			case kEventControlBoundsChanged:
+			printf(" kEventControlBoundsChanged \n");
+			break;
+			case kEventControlClick:
+			printf(" kEventControlClick \n");
+			break;
+			}
+		}
+		break;
+		
+		case kEventClassWindow:
+		{
+			switch (eventKind)
+			{
+			case kEventWindowClose:
+			printf(" kEventWindowClose \n");
+			break;
+			case kEventWindowDrawContent:
+			printf(" kEventWindowDrawContent \n");
+			break;
+			case kEventWindowBoundsChanged:
+			printf(" kEventWindowBoundsChanged \n");
+			break;
+			case kEventWindowResizeCompleted:
+			printf(" kEventWindowResizeCompleted \n");
+			break;
+			}
+		}
+		break;
+		
+		case kEventClassHIObject:
+		{
+			switch (eventKind)
+			{
+			case kEventHIObjectConstruct:
+			printf(" kEventHIObjectConstruct \n");
+			break;
+			case kEventHIObjectInitialize:
+			printf(" kEventHIObjectInitialize\n");
+			break;
+			case kEventHIObjectDestruct:
+			printf(" kEventHIObjectDestruct\n");
+			break;
+			}
+		}
+		break;
+		
+		default:
+		break;
+	}
+	
+	return;
+}
+
Index: /trunk/SophyaPI/PI/Quartz/pieventquartz.h
===================================================================
--- /trunk/SophyaPI/PI/Quartz/pieventquartz.h	(revision 4077)
+++ /trunk/SophyaPI/PI/Quartz/pieventquartz.h	(revision 4077)
@@ -0,0 +1,17 @@
+/*
+ *  pieventquartz.h
+ *  PI
+ *
+ *  Created by Bruno MANSOUX on 02/03/10.
+ *
+ */
+
+#ifndef PIEVENTQUARTZ_H_SEEN
+#define PIEVENTQUARTZ_H_SEEN
+
+#include  <Carbon/Carbon.h>
+
+void PIGetEventName (EventRef event);
+
+
+#endif
Index: /trunk/SophyaPI/PI/Quartz/pigraphquartz.cpp
===================================================================
--- /trunk/SophyaPI/PI/Quartz/pigraphquartz.cpp	(revision 4076)
+++ /trunk/SophyaPI/PI/Quartz/pigraphquartz.cpp	(revision 4077)
@@ -11,7 +11,4 @@
 #define NMAXCOL  32
 static  PIQuartzColor colpix[NMAXCOL];
-static const EventTypeSpec  gqHIViewSpec[] = {kEventClassControl,kEventControlDraw };
-
-OSStatus MyDrawEventHandler (EventHandlerCallRef myHandler,EventRef event, void *userData);
 
 /* --Methode-- */
@@ -20,25 +17,20 @@
 {
 	OSStatus err;
-	HIViewRef rootView;
-    HIRect      bounds;
-		
-	rootView = wdg->GetHIViewRef();
-	err = HIViewFindByID(rootView, kHIViewWindowContentID,&hiViewRef);
-	HIViewGetBounds (rootView, &bounds);
+    HIRect frame;
+	int value;
+			
+	hiViewRef = wdg->GetHIViewRef();
 	
-	printf("View Bounds (%g %g) [%g %g] \n",bounds.origin.x,bounds.origin.y,
-											bounds.size.width,bounds.size.height);
-
-	err = InstallEventHandler (GetControlEventTarget (hiViewRef),
-                            NewEventHandlerUPP (MyDrawEventHandler),
-                            GetEventTypeCount (gqHIViewSpec),
-                            (const EventTypeSpec*)&gqHIViewSpec,
-                            (void *) cgContext,
-                            NULL);
-	cgWindow =  HIViewGetWindow(rootView);
-	ShowWindow(cgWindow);
-	SetPortWindowPort(cgWindow);
-	QDBeginCGContext (GetWindowPort (cgWindow), &cgContext);
-	CGContextFlush(cgContext);
+	value = HIViewGetValue (hiViewRef);
+	
+	err = HIViewGetFrame (hiViewRef, &frame);
+	
+	printf("PIGraphicQuartz::PIGraphicQuartz View Frame (%g %g) [%g %g] err : %d value : %d \n",
+											frame.origin.x, frame.origin.y,
+											frame.size.width, frame.size.height, 
+											err, value);
+
+	cgWindow =  HIViewGetWindow(hiViewRef);
+	cgContext = NULL ;	
 }
 
@@ -50,9 +42,8 @@
 }
 
-
 /* --Methode-- */
 PIGraphicQuartz::~PIGraphicQuartz()
 {
-	QDEndCGContext (GetWindowPort(cgWindow), &cgContext);
+	// QDEndCGContext (GetWindowPort(cgWindow), &cgContext);
 }
 
@@ -281,5 +272,4 @@
 	return;
 }
-
 
 /* --Methode-- */
@@ -897,17 +887,46 @@
 }
 
-
-/* Methode Generale */
-OSStatus MyDrawEventHandler (EventHandlerCallRef myHandler, EventRef event, void *userData)
-{
-	OSStatus status = noErr;
- 
-    status = GetEventParameter (event, // 1
-                            kEventParamCGContextRef,
-                            typeCGContextRef,
-                            NULL,
-                            sizeof (CGContextRef),
-                            NULL,
-                            &userData);
-    return status;
-}
+/* --Methode-- */
+void PIGraphicQuartz::SetCGContext(CGContextRef cg)
+{
+	if (cgContext != NULL)
+	{
+		printf("PIGraphicQuartz::SetCGContext Release CGContext %lx \n", (unsigned long)cgContext);
+		CGContextRelease (cgContext);
+		cgContext = NULL;
+	}
+	
+	cgContext = CGContextRetain(cg);
+
+	HIRect hiRect;
+	HIViewGetFrame(hiViewRef, &hiRect);
+
+	printf("PIGraphicQuartz::SetCGContext Frame ox : %g oy : %g width : %g height : %g \n",
+			hiRect.origin.x, hiRect.origin.y, hiRect.size.width, hiRect.size.height);
+	// SetGCRect(hiRect.origin.x, hiRect.origin.y, hiRect.size.width, hiRect.size.height);
+	return;
+}
+
+/* --Methode-- */
+void PIGraphicQuartz::SetCTM(CGAffineTransform cat)
+{
+	cgAffineTransform.a = cat.a;
+	cgAffineTransform.b = cat.b;
+	cgAffineTransform.c = cat.c;
+	cgAffineTransform.d = cat.d;
+	cgAffineTransform.tx = cat.tx;
+	cgAffineTransform.ty = cat.ty;
+	return;
+}
+
+
+/* --Methode-- */
+void PIGraphicQuartz::SetGCRect(float x0, float y0, float dx, float dy)
+{
+	printf("PIGraphicQuartz::SetGCRect %g %g %g %g \n", x0, y0, dx, dy);
+//	CGAffineTransform cat;
+	CGContextScaleCTM (cgContext, 1., 1.);
+	CGContextTranslateCTM (cgContext, x0, y0 + dy);
+//	CGContextRotateCTM (cgContext, 0.);
+	return;
+}
Index: /trunk/SophyaPI/PI/Quartz/pigraphquartz.h
===================================================================
--- /trunk/SophyaPI/PI/Quartz/pigraphquartz.h	(revision 4076)
+++ /trunk/SophyaPI/PI/Quartz/pigraphquartz.h	(revision 4077)
@@ -20,4 +20,5 @@
 #include "pisysdep.h"
 #include "pigraphgen.h"
+#include "pieventquartz.h"
 
 class PIGraphicQuartz : public PIGraphicGen
@@ -91,4 +92,11 @@
   static PIQuartzColor    GetPixelValueforColor(PIColors col);
 
+// pour recuperer Quartz2D Drawing Context
+  inline CGContextRef GetCGContext() {return cgContext;}
+  void SetCGContext(CGContextRef cg);
+  void SetGCRect(float x0, float y0, float dx, float dy);
+  inline CGAffineTransform GetCTM() {return cgAffineTransform;}
+  void SetCTM(CGAffineTransform cat);
+
 protected:
   void           SelectFont(int isz, int jat);
@@ -115,4 +123,5 @@
   HIViewRef hiViewRef;
   CGContextRef cgContext;
+  CGAffineTransform cgAffineTransform;
   WindowRef cgWindow;
 };
Index: /trunk/SophyaPI/PI/Quartz/pistdwdgquartz.cpp
===================================================================
--- /trunk/SophyaPI/PI/Quartz/pistdwdgquartz.cpp	(revision 4076)
+++ /trunk/SophyaPI/PI/Quartz/pistdwdgquartz.cpp	(revision 4077)
@@ -44,5 +44,5 @@
     SetRect(&wdgRect,px,py,px+sx,py+sy);
 	cfsrLabel = CFStringCreateWithCString(kCFAllocatorDefault,nom,kCFStringEncodingMacRoman);
-	err = CreateStaticTextControl (wParent, &wdgRect, cfsrLabel, NULL, &viewH);
+	err = CreateStaticTextControl (wParent, &wdgRect, cfsrLabel, NULL, &wdgHIView);
 }
 
@@ -60,5 +60,5 @@
 	// SetPortWindowPort(wParent);
 
-	err = SetControlData (viewH,0,kControlEditTextCFStringTag,sizeof(cfsrLabel),(Ptr)&cfsrLabel);
+	err = SetControlData (wdgHIView,0,kControlEditTextCFStringTag,sizeof(cfsrLabel),(Ptr)&cfsrLabel);
 
 	return;
@@ -94,5 +94,5 @@
 
 	unicodeText = CFStringCreateWithCString (NULL,(char *)s.c_str(), kCFStringEncodingMacRoman);
-	err = CreateEditUnicodeTextControl (wParent,&wdgRect,unicodeText,false,NULL,&viewH);
+	err = CreateEditUnicodeTextControl (wParent,&wdgRect,unicodeText,false,NULL,&wdgHIView);
 
 	return;
@@ -105,5 +105,5 @@
 	char* cText;
 
-	GetControlData(viewH, kControlEditTextPart, kControlEditTextCFStringTag, sizeof(str),&str,NULL);
+	GetControlData(wdgHIView, kControlEditTextPart, kControlEditTextCFStringTag, sizeof(str),&str,NULL);
 	
 	cText = (char *)CFStringGetCStringPtr(str,kCFStringEncodingMacRoman);	
@@ -123,5 +123,5 @@
 {
 	if (te == false)
-		DeactivateControl (viewH);
+		DeactivateControl (wdgHIView);
 
 	return;
@@ -247,8 +247,8 @@
     SetRect(&wdgRect,px,py,px+sx,py+sy);
 
-    CreatePushButtonControl (par->GetWindowRef(),&wdgRect,title,&viewH);
-    SetControlTitleWithCFString (viewH, title);
+    CreatePushButtonControl (par->GetWindowRef(),&wdgRect,title,&wdgHIView);
+    SetControlTitleWithCFString (wdgHIView, title);
 	_actionProc = NewControlActionUPP (CommonControlActionCallback);
-	SetControlAction (viewH, _actionProc);
+	SetControlAction (wdgHIView, _actionProc);
 	vpiwdg.push_back(this);
 }
@@ -267,5 +267,5 @@
 {
     title = CFStringCreateWithCString (NULL, sText.c_str(), kCFStringEncodingMacRoman);
-	SetControlTitleWithCFString(viewH,title);
+	SetControlTitleWithCFString(wdgHIView,title);
 	return;
 }
@@ -281,9 +281,9 @@
 	SetPortWindowPort(wParent);
     SetRect(&wdgRect,px,py,px+sx,py+sy);
-    CreateCheckBoxControl (par->GetWindowRef(),&wdgRect,title,0,TRUE,&viewH);
-    SetControlTitleWithCFString (viewH, title);
+    CreateCheckBoxControl (par->GetWindowRef(),&wdgRect,title,0,TRUE,&wdgHIView);
+    SetControlTitleWithCFString (wdgHIView, title);
 	_actionProc = NewControlActionUPP (CommonControlActionCallback);
-	SetControlAction (viewH, _actionProc);
-	_state = GetControl32BitValue (viewH);
+	SetControlAction (wdgHIView, _actionProc);
+	_state = GetControl32BitValue (wdgHIView);
 
 	vpiwdg.push_back(this);
@@ -303,5 +303,5 @@
 bool PICheckBoxQuartz::GetState()
 {
-	_state = GetControl32BitValue (viewH);
+	_state = GetControl32BitValue (wdgHIView);
 	printf("GetState : %d ",_state);
 	return _state;
@@ -318,8 +318,8 @@
 	SetPortWindowPort(wParent);
     SetRect(&wdgRect,px,py,px+sx,py+sy);
-    CreateRadioButtonControl (par->GetWindowRef(),&wdgRect,title,initialValue,FALSE,&viewH);
-    SetControlTitleWithCFString (viewH, title);
+    CreateRadioButtonControl (par->GetWindowRef(),&wdgRect,title,initialValue,FALSE,&wdgHIView);
+    SetControlTitleWithCFString (wdgHIView, title);
 	_actionProc = NewControlActionUPP (CommonControlActionCallback);
-	SetControlAction (viewH, _actionProc);
+	SetControlAction (wdgHIView, _actionProc);
 	vpiwdg.push_back(this);
 }
@@ -339,5 +339,5 @@
     SetRect(&wdgRect,px,py,px+sx,py+sy);
     OSErr error;
-	error = CreateRadioGroupControl (par->GetWindowRef(),&wdgRect,&viewH);
+	error = CreateRadioGroupControl (par->GetWindowRef(),&wdgRect,&wdgHIView);
 	_state = 0;
 }
@@ -346,5 +346,5 @@
 {
 	OSErr error;
-	error = EmbedControl(piRadio->GetHIViewRef(),viewH);
+	error = EmbedControl(piRadio->GetHIViewRef(),wdgHIView);
 		
 	return;
Index: /trunk/SophyaPI/PI/Quartz/piwdgquartz.cpp
===================================================================
--- /trunk/SophyaPI/PI/Quartz/piwdgquartz.cpp	(revision 4076)
+++ /trunk/SophyaPI/PI/Quartz/piwdgquartz.cpp	(revision 4077)
@@ -16,6 +16,7 @@
     fflush (stdout);
     title = CFStringCreateWithCString (NULL, nom, kCFStringEncodingMacRoman);
-	viewH = NULL;
+	wdgHIView = NULL;
     mFCol = mBCol = PI_NotDefColor;
+//	wdgCGContext = NULL;
 }
 
@@ -243,6 +244,5 @@
     if (contH)
     {
-        InstallControlEventHandler (contH, 
-                                    NewEventHandlerUPP (drwh),
+        InstallControlEventHandler (contH, NewEventHandlerUPP (drwh),
                                     GetEventTypeCount(drawEvents),
                                     drawEvents,
@@ -252,6 +252,5 @@
     if(wPtr)
     {
-        InstallWindowEventHandler (wPtr, 
-                                    NewEventHandlerUPP (drwh),
+        InstallWindowEventHandler (wPtr, NewEventHandlerUPP (drwh),
                                     GetEventTypeCount(drawEvents),
                                     drawEvents,
Index: /trunk/SophyaPI/PI/Quartz/piwdgquartz.h
===================================================================
--- /trunk/SophyaPI/PI/Quartz/piwdgquartz.h	(revision 4076)
+++ /trunk/SophyaPI/PI/Quartz/piwdgquartz.h	(revision 4077)
@@ -101,12 +101,16 @@
 	*/
 	
-	HIViewRef GetHIViewRef() {return viewH;}
-
+  inline HIViewRef GetHIViewRef() {return wdgHIView;}
+// pour recuperer Quartz2D Drawing Context
+  // inline CGContextRef GetQuartzCGContext() {return wdgCGContext;}
+  // inline void SetQuartzCGContext(CGContextRef cg) { wdgCGContext = CGContextRetain(cg);}
+  
 protected:
     Rect	wdgRect;
     CFStringRef	title;
-	HIViewRef	viewH;
+	HIViewRef	wdgHIView;
 //  pas utilisable dans MOSX/Carbon
     PIColors mFCol, mBCol;
+//	CGContextRef wdgCGContext;
 };
 
Index: /trunk/SophyaPI/PI/Quartz/sopnamsp.h
===================================================================
--- /trunk/SophyaPI/PI/Quartz/sopnamsp.h	(revision 4077)
+++ /trunk/SophyaPI/PI/Quartz/sopnamsp.h	(revision 4077)
@@ -0,0 +1,23 @@
+#ifndef SOPNAMSP_SEEN
+#define SOPNAMSP_SEEN
+
+#ifdef __cplusplus
+
+/*  SOPHYA classes are in namespace SOPHYA:
+ sopnamsp.h :
+   1-/ DOIT etre mis dans les .cc de sophya
+   2-/ NE DOIT JAMAIS etre mis dans un .h de SOPHYA
+       disponible pour les utilisateur exterieurs
+ Dans un main programme:
+   1-/ Si on met sopnamsp.h les classes de SOPHYA
+       doivent etre instanciees: TArray<r_8>
+   2-/ Si on NE met PAS sopnamsp.h les classes de SOPHYA
+       doivent etre instanciees: SOPHYA::TArray<r_8>
+
+*/
+namespace SOPHYA {}
+using namespace SOPHYA;
+
+#endif
+
+#endif
Index: /trunk/SophyaPI/PI/Tests/xp1.cc
===================================================================
--- /trunk/SophyaPI/PI/Tests/xp1.cc	(revision 4076)
+++ /trunk/SophyaPI/PI/Tests/xp1.cc	(revision 4077)
@@ -10,5 +10,5 @@
 #include PISTDWDG_H 
 #include PIWIN_H
-//#include "PIButtonQuartz.h"
+#include "PIButtonQuartz.h"
 
 //  ----- Declaration de la classe ArgsWind : Fenetre de dialogue -------
Index: /trunk/SophyaPI/PI/lut.cc
===================================================================
--- /trunk/SophyaPI/PI/lut.cc	(revision 4076)
+++ /trunk/SophyaPI/PI/lut.cc	(revision 4077)
@@ -12,22 +12,13 @@
 #include "lut.h"
 
-//++
-// Class	LUT
-// Lib		PI
-// include	lut.h
-//
-//	Classe Look-Up table : transformation de valeurs (intensite/RGB) en index de couleur
-//--
-//++
-// Links	Voir aussi
-// PIColorMap
-// PIPixmap
-// PIImage
-//--
+
 /* --Methode-- */
 
-LUT::LUT(double min, double max, unsigned short ncol, int typ) 
+LUT::LUT(double min, double max, unsigned short ncol, int typ, int ntable) 
 {
-int nlev = ncol-2;
+int nlev;
+
+bornes=NULL;
+nlev = ncol-2;
 if (nlev < 1)  nlev = 1;
 bornes = new double[nlev+1];
@@ -35,12 +26,4 @@
 if (bornes == NULL)  return;
 type = typ;  nLevel = nlev;
-int qqq = 1;
-quantum = 1;
-for(quantum=2; quantum<=42; quantum++) {
-  qqq = quantum*quantum*quantum;
-  if (qqq > NCol())  break;
-}
-quantum--;
-
 table = NULL;  
 tablenbin = 0;
@@ -56,45 +39,22 @@
 delete[] table;
 }
-/* --Methode-- */
-void LUT::SetNCol(unsigned short ncol)
-{
-if (ncol == NCol())  return;
-double min = Min();
-double max = Max();
-if (bornes) delete[] bornes;
-int nlev = ncol-2;
-if (nlev < 1)  nlev = 1;
-bornes = new double[nlev+1];
-nLevel = nlev;
-int qqq = 1;
-quantum = 1;
-for(quantum=2; quantum<=42; quantum++) {
-  qqq = quantum*quantum*quantum;
-  if (qqq > NCol())  break;
-}
-quantum--;
-// printf("*DBG*LUT* quantum= %d \n", (int)quantum);
-SetLut(min, max, Type());
-}
 
 /* --Methode-- */
-void LUT::SetLut(double min, double max, int typ)
+void LUT::SetLut(double min, double max, int typ, int ntable)
 {
 
 if(  (typ != kLutType_Lin)  && (typ != kLutType_Log)
-  && (typ != kLutType_Sqrt) && (typ != kLutType_Square)  
-  && (typ != kLutType_RGB) )  typ = kLutType_Lin;
+  && (typ != kLutType_Sqrt) && (typ != kLutType_Square)
+  )  typ = kLutType_Lin;
 type = typ;
 if (max <= min)  max = min+1.;
-mMin = min;  mMax = max;
-mMinI = (int)(min+0.1);  mMaxI = (int)(max+0.1);
 if (nLevel > 0)
   {
   int i;
-  double dx, dlx, fmx;
+  double dx;
+  double dlx;
   switch (typ)
     {
     case kLutType_Lin :
-    case kLutType_RGB :
       dx = (max-min)/(double)nLevel;
       for(i=0; i<nLevel; i++)
@@ -102,13 +62,7 @@
       break;
     case kLutType_Log :
-      fmx = (max-min)/(exp(1.)-1.);
-      dlx = 1./(double)nLevel;
+      dlx = log(max-min) / (double)nLevel;
       for(i=0; i<nLevel; i++)
-        bornes[i] = min+((double)exp((double)i*dlx)-1.)*fmx;
-      break;
-    case kLutType_Exp :
-      dlx = (exp(1.)-1.)/(double)nLevel;
-      for(i=0; i<nLevel; i++)
-        bornes[i] = min+(double)log(1.+(double)i*dlx)*(max-min);
+        bornes[i] = min+(double)exp((double)i*dlx);
       break;
     case kLutType_Sqrt :
@@ -130,6 +84,5 @@
   }
 else  bornes[0] = 0.5*(min+max);
-// ComputeTable((ntable > nLevel) ? ntable : tablenbin);
-if (type != kLutType_RGB) ComputeTable(0);
+ComputeTable((ntable > nLevel) ? ntable : tablenbin);
 return; 
 }
@@ -148,5 +101,5 @@
 
 /* --Methode-- */
-unsigned short LUT::ApplyI(double x)
+unsigned short LUT::Apply(double x)
 {
 int i;
@@ -157,32 +110,12 @@
 
 /* --Methode-- */
-unsigned short LUT::ApplyRGB(double x)
-{
-  long lv = x+0.3;
-  int r = (lv%256);
-  lv /= 256;
-  int g = (lv%256);
-  lv /= 256;
-  int b = (lv%256);
-  return (unsigned short)((Contraste(b)*quantum+Contraste(g))*quantum+Contraste(r));
-}
-
-/* --Methode-- */
 void LUT::ComputeTable(int nt)
 {
-if (nt <= 0) { 
-  int fm = 16;
-  if ((nLevel+2)>4096) fm = 1;
-  else if ((nLevel+2)>2048) fm = 2;
-  else if ((nLevel+2)>1024) fm = 4;
-  else if ((nLevel+2)>512) fm = 8;
-  nt = fm*(nLevel+2);
-}
+if (nt <= 0) nt = 16*(nLevel+2);
 else if (nt < (nLevel+2))  nt = (nLevel+2);
 tablenbin = nt;
-if (table) delete[] table;
 table = new unsigned short [nt-2];
 tablebinwidth = (Max()-Min())/(nt-2);
 double x = Min()+0.5*tablebinwidth;
-for(int i=0; i<nt-2; i++)  { table[i] = ApplyI(x); x += tablebinwidth; }
+for(int i=0; i<nt-2; i++)  { table[i] = Apply(x); x += tablebinwidth; }
 }
Index: /trunk/SophyaPI/PI/lut.h
===================================================================
--- /trunk/SophyaPI/PI/lut.h	(revision 4076)
+++ /trunk/SophyaPI/PI/lut.h	(revision 4077)
@@ -13,5 +13,5 @@
 
 // Type de lut possibles 
-enum {kLutType_Lin=1, kLutType_Log=2, kLutType_Exp=3, kLutType_Sqrt=4, kLutType_Square=5, kLutType_RGB=11 };
+enum {kLutType_Lin=1, kLutType_Log=2, kLutType_Sqrt=3, kLutType_Square=4};
 
 class LUT 
@@ -19,36 +19,11 @@
 public:
   
-  LUT(double min, double max, unsigned short ncol=16, int typ=kLutType_Lin);
+  LUT(double min, double max, unsigned short ncol=16, int typ=kLutType_Lin, int ntable=0);
   ~LUT();
-  void SetNCol(unsigned short ncol);
-  void SetLut(double min, double max, int typ=kLutType_Lin);
+  void SetLut(double min, double max, int typ=kLutType_Lin, int ntable=0);
   void Print();
-
-  inline unsigned short Apply(double x)
-    { 
-    if (type == kLutType_RGB) return ApplyRGB(x); 
-    else return ApplyI(x);	
-    } 
-
+  unsigned short Apply(double x);
   inline unsigned short ApplyFast(double x)
     { 
-    if (type == kLutType_RGB) return ApplyRGB(x); 
-    else return AppFast(x);	
-    } 
-
-
-  inline double Min() { return(bornes[0]); };
-  inline double Max() { return(bornes[nLevel]); };
-  inline double Borne(int k) { return(bornes[k]); };
-  inline int Type() { return(type); };
-  inline int NCol() { return(nLevel+2); };
-
-
-protected:
-  void ComputeTable(int nt);
-  unsigned short ApplyI(double x);
-  unsigned short ApplyRGB(double x);
-  inline unsigned short AppFast(double x)
-    {
     if (x < Min())  return(0);
     if (x >= Max() )  return(nLevel+1);  
@@ -56,16 +31,16 @@
     return(table[k]); 
     } 
-  inline int  Contraste(int ii)   /* for ApplyRGB */
-    {
-    if (ii >= mMaxI) return quantum-1;
-    if (ii <= mMinI) return 0;
-    else return ((ii-mMinI)*(quantum-1)/mMaxI);
-    }	  
+
+  inline double Min() { return(bornes[0]); };
+  inline double Max() { return(bornes[nLevel]); };
+  inline int Type() { return(type); };
+  inline int NCol() { return(nLevel+2); };
+
+protected:
+  void ComputeTable(int nt);
+
   int type;
   int nLevel;
-  int quantum;
   double * bornes;
-  double mMin, mMax;
-  int mMinI, mMaxI;
   int tablenbin;
   unsigned short * table;
Index: /trunk/SophyaPI/PI/objlist.list
===================================================================
--- /trunk/SophyaPI/PI/objlist.list	(revision 4076)
+++ /trunk/SophyaPI/PI/objlist.list	(revision 4077)
@@ -48,5 +48,4 @@
 pipixmapgen.o
 pipixmapx.o
-pipixutils.o
 piscdrawwdg.o
 pistdwdggen.o
Index: /trunk/SophyaPI/PI/parradapter.cc
===================================================================
--- /trunk/SophyaPI/PI/parradapter.cc	(revision 4076)
+++ /trunk/SophyaPI/PI/parradapter.cc	(revision 4077)
@@ -174,19 +174,4 @@
 
 /* --Methode-- */
-double  P2DArrayAdapter::MeanVal(int ix1, int ix2, int jy1, int jy2)
-{
-int ec;
-if (ix1>ix2) { ec=ix1; ix1=ix2; ix2=ec; }
-if (jy1>jy2) { ec=jy1; jy1=jy2; jy2=ec; }    
-// On calcule la somme des pixels dans la zone
-double ss = 0.;
-for(int j=jy1; j<=jy2; j++) 
-  for(int i=ix1; i<=ix2; i++)  ss += Value(i,j);
-
-ss /= (double)((jy2-jy1+1)*(ix2-ix1+1));
-return ss;  
-}   
-
-/* --Methode-- */
 void P2DArrayAdapter::XYfromxy(int ix, int iy, double& x, double& y)
 {
@@ -202,5 +187,5 @@
   double x,y;
   this->Coord(ix, iy, x, y);
-  const char * isr = "";
+  char * isr = "";
   if (ISFunc != NULL)  isr = ISFunc(this, ix, iy);
   sprintf(ibuff,"X= %g Y= %g  Pix= %g %s   ", 
@@ -448,11 +433,13 @@
 
 /* --Methode-- */
-void P2DArrayAdapter::ComputePixmap(LUT* lut, int ofx, int ofy, int zm, 
-                                    int xwsz, int ywsz, PIPixColIdx & pixc)
+unsigned char * P2DArrayAdapter::ComputePixmap(LUT* lut, int ofx, int ofy, int zm, 
+                int xwsz, int ywsz, unsigned char * opix, int * oxsp, int * oysp)
 {
 // TIMEF ; 
+unsigned char *pix, *pp, ucp;
 int zmm=1;
-int npx, npy, nppx, nppy;
+int npx, npy, nppx, nppy, nszp, oszp;
 int i,j,k,l;
+double vpx;
 
 /*
@@ -461,7 +448,6 @@
 */
 
-if ( (XSize() <= 0) || (YSize() <= 0) || (lut == NULL) || (ofx < 0) || (ofy < 0) ) {
-  pixc.DeAlloc();  return; 
-}
+if ( (XSize() <= 0) || (YSize() <= 0) || (lut == NULL) || (ofx < 0) || (ofy < 0) ) 
+  { *oxsp = *oysp = 0; return(NULL); }
 
 npx = XSize()-ofx;
@@ -485,18 +471,21 @@
   }
 
-
-/* printf("Debug_ComputePixmap %d %d %d (%d-%d %d-%d)\n", 
-      ofx, ofy, zm, npx,nppx, npy,nppy); */
-if (lut->NCol() <= 256) {  // On fait un pixmap de type Byte/pixel 
+oszp = (*oxsp)*(*oysp);
+nszp = nppx*nppy;
+if ( oszp != nszp )
+  {
+  if (opix)  delete[] opix;
+  pix = new unsigned char[nppx*nppy];
+  if (pix == NULL)  { *oxsp = *oysp = 0; ; return(NULL); }
+  }
+else  pix = opix;
+*oxsp = nppx; *oysp = nppy;
+
 /*
-printf("Debug_ComputePixmap- pixc.AllocateByte() type=%d - %d %d %d - %d %d %d - %d %d %d \n",
-  lut->Type(), 
-  lut->ApplyFast(0.), lut->ApplyFast(1.), lut->ApplyFast(2.), 
-  lut->ApplyRGB(0.), lut->ApplyRGB(1.), lut->ApplyRGB(2.), 
-  lut->Apply(0.), lut->Apply(1.), lut->Apply(2.));
-*/  
-unsigned char *pp, ucp;
-pixc.AllocateByte(nppx, nppy);
-pp = pixc.BytePointer();
+printf("Debug_ComputePixmap %d %d %d (%d-%d %d-%d)\n", 
+      ofx, ofy, zm, npx,nppx, npy,nppy);
+*/
+
+pp = pix;
 if (eXY) { // Echange Axe X,Y 
   if (zm == 1)  {  // Pas de zoom  
@@ -508,10 +497,14 @@
     }
   else if (zm < -1) {       // Compression 
+    double fv = (double)(zmm*zmm); 
     for(j=ofy; j<ofy+npy; j+=zmm)
-      for(i=ofx; i<ofx+npx; i+=zmm) { 
-        *pp = lut->ApplyFast( MeanVal(j*sgnX+offX, (j+zmm-1)*sgnX+offX, 
-                                      i*sgnY+offY, (i+zmm-1)*sgnY+offY) );
+      for(i=ofx; i<ofx+npx; i+=zmm) {
+        vpx = 0;
+        for(l=0; l<zmm; l++)
+          for(k=0; k<zmm; k++)
+            vpx += this->Value( (j+l)*sgnX+offX, (i+k)*sgnY+offY);
+        *pp = (unsigned char) lut->ApplyFast(vpx/fv); 
         pp++;
-      }
+        }
     }
   else  {      // Agrandissement
@@ -520,5 +513,5 @@
         ucp = (unsigned char) lut->ApplyFast(this->Value(j*sgnX+offX, i*sgnY+offY));
         for(l=0; l<zm; l++)  {
-          pp = pixc.BytePointer()+((j-ofy)*zm+l)*nppx+((i-ofx)*zm);
+          pp = pix+((j-ofy)*zm+l)*nppx+((i-ofx)*zm);
           for(k=0; k<zm; k++)  { *pp = ucp; pp++; }  
 	  }
@@ -535,10 +528,14 @@
     }
   else if (zm < -1) {       // Compression 
+    double fv = (double)(zmm*zmm); 
     for(j=ofy; j<ofy+npy; j+=zmm)
       for(i=ofx; i<ofx+npx; i+=zmm) {
-        *pp = lut->ApplyFast( MeanVal(i*sgnX+offX, (i+zmm-1)*sgnX+offX, 
-                                      j*sgnY+offY, (j+zmm-1)*sgnY+offY) );
+        vpx = 0;
+        for(l=0; l<zmm; l++)
+          for(k=0; k<zmm; k++)
+            vpx += this->Value( (i+k)*sgnX+offX, (j+l)*sgnY+offY);
+        *pp = (unsigned char) lut->ApplyFast(vpx/fv); 
         pp++;
-      }
+        }
     }
   else  {      // Agrandissement
@@ -547,5 +544,5 @@
         ucp = (unsigned char) lut->ApplyFast(this->Value(i*sgnX+offX, j*sgnY+offY));
         for(l=0; l<zm; l++)  {
-          pp = pixc.BytePointer()+((j-ofy)*zm+l)*nppx+((i-ofx)*zm);
+          pp = pix+((j-ofy)*zm+l)*nppx+((i-ofx)*zm);
           for(k=0; k<zm; k++)  { *pp = ucp; pp++; }  
 	  }
@@ -553,65 +550,5 @@
     }
   }
-}  //  ---- Fin pixmap de type Byte
-else {  // On fait un pixmap de type short/pixel 
-// printf("Debug_ComputePixmap- pixc.AllocateShort() \n");
-unsigned short *pp, ucp;
-pixc.AllocateShort(nppx, nppy);
-pp = pixc.ShortPointer();
-if (eXY) { // Echange Axe X,Y 
-  if (zm == 1)  {  // Pas de zoom  
-    for(j=ofy; j<ofy+npy; j++)
-      for(i=ofx; i<ofx+npx; i++) {
-        *pp = lut->ApplyFast(this->Value(j*sgnX+offX, i*sgnY+offY));  pp++; 
-      }
-    }
-  else if (zm < -1) {       // Compression 
-    for(j=ofy; j<ofy+npy; j+=zmm)
-      for(i=ofx; i<ofx+npx; i+=zmm) { 
-        *pp = lut->ApplyFast( MeanVal(j*sgnX+offX, (j+zmm-1)*sgnX+offX, 
-                                      i*sgnY+offY, (i+zmm-1)*sgnY+offY) );
-        pp++;
-      }
-    }
-  else  {      // Agrandissement
-    for(j=ofy; j<ofy+npy; j++)
-      for(i=ofx; i<ofx+npx; i++)  {
-        ucp = lut->ApplyFast(this->Value(j*sgnX+offX, i*sgnY+offY));
-        for(l=0; l<zm; l++)  {
-          pp = pixc.ShortPointer()+((j-ofy)*zm+l)*nppx+((i-ofx)*zm);
-          for(k=0; k<zm; k++)  { *pp = ucp; pp++; }  
-	  }
-        }
-    }
-  }     // Fin du cas avec echange d'axe X/Y 
-else {
-  if (zm == 1)  {  // Pas de zoom  
-    for(j=ofy; j<ofy+npy; j++)
-      for(i=ofx; i<ofx+npx; i++) {
-        *pp = lut->ApplyFast(this->Value(i*sgnX+offX, j*sgnY+offY));  pp++; 
-      }
-    }
-  else if (zm < -1) {       // Compression 
-    for(j=ofy; j<ofy+npy; j+=zmm)
-      for(i=ofx; i<ofx+npx; i+=zmm) {
-        *pp = lut->ApplyFast( MeanVal(i*sgnX+offX, (i+zmm-1)*sgnX+offX, 
-                                      j*sgnY+offY, (j+zmm-1)*sgnY+offY) );
-        pp++;
-      }
-    }
-  else  {      // Agrandissement
-    for(j=ofy; j<ofy+npy; j++)
-      for(i=ofx; i<ofx+npx; i++)  {
-        ucp = lut->ApplyFast(this->Value(i*sgnX+offX, j*sgnY+offY));
-        for(l=0; l<zm; l++)  {
-          pp = pixc.ShortPointer()+((j-ofy)*zm+l)*nppx+((i-ofx)*zm);
-          for(k=0; k<zm; k++)  { *pp = ucp; pp++; }  
-	  }
-        }
-    }
-  }
-}  //  ---- Fin pixmap de type Byte
-
-return;
+return(pix);
 }
 
Index: /trunk/SophyaPI/PI/parradapter.h
===================================================================
--- /trunk/SophyaPI/PI/parradapter.h	(revision 4076)
+++ /trunk/SophyaPI/PI/parradapter.h	(revision 4077)
@@ -9,5 +9,4 @@
 #include "machdefs.h"
 #include "lut.h"
-#include "pipixutils.h"
 
 #include <string> 
@@ -55,7 +54,5 @@
   virtual void    DefineXYCoordinates(double x0, double y0, double dx, double dy);
 // Doit etre defini par les classes derivees
-  virtual double  Value(int ix, int iy) = 0;
-// Peut etre redefini pour les classes derivees, pour une optimisation par exemple     
-  virtual double  MeanVal(int ix1, int ix2, int jy1, int jy2);   
+  virtual double  Value(int ix, int iy) = 0;   
 
   virtual void    XYfromxy(int ix, int iy, double& x, double& y);
@@ -92,6 +89,7 @@
 
 //    Calcul pixmap avec un LUT
-  virtual void ComputePixmap(LUT* lut, int ofx, int ofy, int zm, 
-                             int xwsz, int ywsz, PIPixColIdx & pixc);
+  virtual unsigned char * ComputePixmap(LUT* lut, int ofx, int ofy, int zm, 
+                           int xwsz, int ywsz, unsigned char * opix, 
+                           int * oxsp, int * oysp);
 
 //   Methode de decodage des options - Implementation par defaut ne fait rien
@@ -110,6 +108,4 @@
 
 };
-
-//  Adaptateur de tableau 1D pour pointeur de type T *
 
 template <class T> 
@@ -130,5 +126,4 @@
 
 
-//  Adaptateur de tableau 2D pour pointeur de type T *
 template <class T> 
 class P2DAdapter : public P2DArrayAdapter {
@@ -139,19 +134,7 @@
 
   virtual 	  ~P2DAdapter() { if ( (aDel) && (mData) ) delete[] mData; }
-  virtual double  Value(int ix, int iy) 
+  virtual double   Value(int ix, int iy) 
                     {  if ( (ix < 0)  || (iy < 0) || (ix >= sX) || (iy >= sY) ) return(0.); 
                     return(mData[ix+iy*sX]); }
-  virtual double  MeanVal(int ix1, int ix2, int jy1, int jy2)  
-    {
-    int ec;
-    if (ix1>ix2) { ec=ix1; ix1=ix2; ix2=ec; }
-    if (jy1>jy2) { ec=jy1; jy1=jy2; jy2=ec; }    
-    double ss = 0.;
-    for(int j=jy1; j<=jy2; j++) 
-      for(int i=ix1; i<=ix2; i++)  ss += (double)(mData[i+j*sX]);
-    ss /= (double)((jy2-jy1+1)*(ix2-ix1+1));
-    return ss;  
-    }   
-
 protected :
   bool aDel;
@@ -159,42 +142,4 @@
 };
 
-//  Adaptateur de tableau 2D pour tableau RGB 
-
-class P2DPixRGBAdapter : public P2DArrayAdapter {
-public :
-          P2DPixRGBAdapter(PIPixRGBArray * rgbp, bool ad=false) :
-             P2DArrayAdapter(rgbp->XSize(), rgbp->YSize() )
-                { aDel = ad; mPix = rgbp; }
-  virtual ~P2DPixRGBAdapter() { if ( (aDel) && (mPix) ) delete mPix; }
-
-  virtual double  Value(int ix, int iy) 
-    {  
-    if ( (ix < 0)  || (iy < 0) || (ix >= sX) || (iy >= sY) ) return(0.); 
-    PIPixRGB rgb = (*mPix)(ix, iy);
-    return ( ((double)rgb.blue*256.+(double)rgb.green)*256.+(double)rgb.red );
-    }
-  virtual double  MeanVal(int ix1, int ix2, int jy1, int jy2)  
-    {
-    int ec;
-    if (ix1>ix2) { ec=ix1; ix1=ix2; ix2=ec; }
-    if (jy1>jy2) { ec=jy1; jy1=jy2; jy2=ec; }    
-    int r = 0;
-    int g = 0;
-    int b = 0;
-    for(int j=jy1; j<=jy2; j++) 
-      for(int i=ix1; i<=ix2; i++)  {
-      	PIPixRGB rgb = (*mPix)(i, j);
-      	r += rgb.red;  g += rgb.green;   b += rgb.blue; 
-      }
-    int n = (jy2-jy1+1)*(ix2-ix1+1);   
-    r /= n; g /= n; b /= n;
-    return ( ((double)b*256.+(double)g)*256.+(double)r );  
-    }   
-                    
-protected :
-  bool aDel;
-  PIPixRGBArray* mPix;
-};
-
 
 
Index: /trunk/SophyaPI/PI/pi3dwdg.cc
===================================================================
--- /trunk/SophyaPI/PI/pi3dwdg.cc	(revision 4076)
+++ /trunk/SophyaPI/PI/pi3dwdg.cc	(revision 4077)
@@ -224,6 +224,6 @@
   double ymin = mBDrw->ScaleY( mBDrw->YMin3() );
   double ymax = mBDrw->ScaleY( mBDrw->YMax3() );
-  double zmin = mBDrw->ScaleZ( mBDrw->ZMin3() );
-  double zmax = mBDrw->ScaleZ( mBDrw->ZMax3() );
+  double zmin = mBDrw->ScaleY( mBDrw->ZMin3() );
+  double zmax = mBDrw->ScaleY( mBDrw->ZMax3() );
   bool asxy = mBDrw->isAutoScaleXY();
   bool asz = mBDrw->isAutoScaleZ();
Index: /trunk/SophyaPI/PI/piapplgen.cc
===================================================================
--- /trunk/SophyaPI/PI/piapplgen.cc	(revision 4076)
+++ /trunk/SophyaPI/PI/piapplgen.cc	(revision 4077)
@@ -54,7 +54,4 @@
 #include "sopnamsp.h"
 #include "piapplgen.h"
-#include <stdlib.h>
-#include <iostream>
-#include "pidrawer.h"
 
 // Variable qui contient le pointeur de l'application courante
@@ -65,17 +62,5 @@
 :topcont(NULL), menubar(NULL), mState(0)
 {
-  curapp = this;   
-// Si la variable d'environnement PIDEFAFSZFRAC est definie, on modifie 
-// la taille par defaut de AutoFontSizeFrac
-  char *envafsz = getenv("PIDEFAFSZFRAC");
-  if (envafsz) {
-    double fsfr = atof(envafsz);
-    if ((fsfr>0.)&&(fsfr<1.)) {
-      PIDrawer::SetGlDefAutoFontSizeFrac(fsfr);
-      cout << " PIApplicationGen()/Info: getenv(PIDEFAFSZFRAC)=" << envafsz << endl;
-      cout << "  ... Set Global Default PIDrawer AutoFontSizeFrac to " 
-           << PIDrawer::GetGlDefAutoFontSizeFrac() << endl;
-      }
-  }
+curapp = this;   
 }
 
Index: /trunk/SophyaPI/PI/piapplx.cc
===================================================================
--- /trunk/SophyaPI/PI/piapplx.cc	(revision 4076)
+++ /trunk/SophyaPI/PI/piapplx.cc	(revision 4077)
@@ -1,2 +1,5 @@
+#ifndef __PIWQUARTZ__
+#ifndef __MWERKS__ 
+
 #include <stdio.h>
 #include <X11/cursorfont.h>
@@ -40,5 +43,5 @@
 class PITopContAppX : public PIContainer {
 public :
-	    	PITopContAppX(PIContainer *par, const char *nom, PIWdg* topw,
+	    	PITopContAppX(PIContainer *par, char *nom, PIWdg* topw,
                           int sx=10, int sy=10, int px=0, int py=0);
    virtual  	~PITopContAppX(); 
@@ -52,5 +55,5 @@
 
 /* --Methode-- */
-PITopContAppX::PITopContAppX(PIContainer *par, const char *nom, PIWdg* topw, int sx, int sy, int px, int py)
+PITopContAppX::PITopContAppX(PIContainer *par, 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,5 +144,6 @@
 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());
@@ -531,2 +535,5 @@
 }
 
+#endif
+#endif
+
Index: /trunk/SophyaPI/PI/piaxes.cc
===================================================================
--- /trunk/SophyaPI/PI/piaxes.cc	(revision 4076)
+++ /trunk/SophyaPI/PI/piaxes.cc	(revision 4077)
@@ -11,6 +11,4 @@
 #include <math.h>
 #include "piaxes.h"
-#include "pidrawer.h"
-#include "ucckprot.h"
 
 //++
@@ -20,5 +18,5 @@
 //
 //	Classe gestionnaire de tracé d'axes. A utiliser dans
-//	un objet PIDrawer. Ajout trace d'axes polaires en Mai 2012.
+//	un objet PIDrawer.
 //--
 //++
@@ -43,7 +41,6 @@
 {
   ConfigureTicks();
-  ConfigureAutoFontSize(true, PIDrawer::GetGlDefAutoFontSizeFrac());
+  ConfigureAutoFontSize();
   ConfigureAxesCenter();
-  ConfigurePolar();
   setupDone = false;
 }
@@ -56,5 +53,5 @@
 //++
 // void  DrawXYAxes(PIGraphicUC* g, PIGraphicAtt& gratt, \
-//                  unsigned int flags, bool afsz, double fszf)
+//                  unsigned int flags=kAxesDflt, bool afsz=true)
 //	Trace les axes en utilisant les limites de l'objet PIGraphicUC. 
 //	"flags" spécifie les attributs d'axes. Constantes prédéfinies: 
@@ -67,18 +64,10 @@
 //|	      kBoxAxes | kTicks | | kIntTicks | kLabels
 //|	kGridOn, kAxesNone
-//	Si "afsz == true", la taille de fonte est choisie automatiquement avec "fszf" 
-//	representant la taille de fonte en fraction de (ymax-ymin)
-//
-// void DrawXYAxes(PIGraphicUC* g, PIGraphicAtt& gratt, unsigned int flags=kAxesDflt)
-//        Appel de DrawXYAxes avec les parametres "axesAFSz. fontSz" de l'objet.
+//	Si "afsz == true", la taille de fonte est choisie automatiquement.
 //
 // void DrawXYAxes(PIGraphicUC* g, PIGraphicAtt& gratt, \
 //        double xmin, double xmax, double ymin, double ymax, \
-//        unsigned int flags, bool afsz, double )
+//        unsigned int flags=kAxesDflt, bool afsz=true)
 //	Tracé d'axes avec spécification des limites d'axes.
-//
-// void DrawXYAxes(PIGraphicUC* g, PIGraphicAtt& gratt, \
-//        double xmin, double xmax, double ymin, double ymax, unsigned int flags=kAxesDflt) 
-//        Appel de DrawXYAxes avec les parametres "axesAFSz. fontSz" de l'objet.
 //
 // void DrawXCaption(PIGraphicUC* g, string const& xLabel, PIGraphicAtt const& att)
@@ -90,10 +79,10 @@
 /* --Methode-- */
 void PIAxes::DrawXYAxes(PIGraphicUC* g, PIGraphicAtt& gratt, 
-			unsigned int flags, bool afsz, double fszf)
+			unsigned int flags, bool afsz)
 {
   PIGrCoord xmin, xmax, ymin, ymax;
   g->GetGrSpace(xmin, xmax, ymin, ymax);
   DrawXYAxes(g, gratt, (double)xmin, (double)xmax, 
-	     (double)ymin, (double)ymax, flags, afsz, fszf);
+	     (double)ymin, (double)ymax, flags, afsz);
 }
 
@@ -101,5 +90,5 @@
 void PIAxes::DrawXYAxes(PIGraphicUC* g, PIGraphicAtt& gratt, 
 			double xmin, double xmax, double ymin, double ymax,
-			unsigned int flags, bool afsz, double fszf)
+			unsigned int flags, bool afsz)
 
 {
@@ -118,51 +107,10 @@
 
   if(afsz) { 
-    double fsz = (yMax-yMin)*fszf;
+    double fsz = (yMax-yMin)*fontSz;
     g->SelFontSz(fsz);
   }
 
-  if (flags & kPolarAxes)  {  // axes polaires 
-    //    g->DrawLine(xMin, 0., xMax, 0.);
-    //    g->DrawLine(0., yMin, 0., yMax);
-    double rr=fabs(xMin); 
-    double rmin=0., rmax=rr;
-    rr=fabs(xMax);  if (rr>rmax) rmax=rr;   
-    rr=fabs(yMin);  if (rr>rmax) rmax=rr;   
-    rr=fabs(yMax);  if (rr>rmax) rmax=rr;
-    UC_CheckMinMaxDiff(rmin,rmax);
-    if (rmin<0.)  { rmax-=(2.*rmin);  rmin=0.; }
-    vector<double> lesradius,lesrad2; 
-    PIAxes::BestTicks(rmin,rmax,polNRadius,lesradius,lesrad2);
-    double delta_r=(rmax-rmin)/(double)polNRadius;
-    double delta_ang=M_PI/(double)polNAng;
-    double xa,ya,ang;
-    char sbuff[64];
-    for(size_t nn=0; nn<lesradius.size(); nn++) {
-      rr=lesradius[nn]; 
-      if (rr<1.e-3*rmax) continue;
-      //      cout << " *DBG*PIAxes* rmin,rmax=" << rmin << "," << rmax << " rr[" << nn << "]=" << rr << endl;
-      g->DrawCircle(0.,0.,rr);
-      sprintf(sbuff,"%g",rr);
-      rr+=0.1*delta_r;  
-      xa=cos(-1.2)*rr;  ya=sin(-1.2)*rr;
-      g->DrawString(xa,ya,sbuff,PI_HorizontalCenter|PI_VerticalCenter);
-      xa=cos(M_PI-0.2)*rr;  ya=sin(M_PI-0.2)*rr;
-      g->DrawString(xa,ya,sbuff,PI_HorizontalCenter|PI_VerticalCenter);
-    }
-    for(int nn=0; nn<polNAng; nn++) {
-      ang=(double)nn*delta_ang;
-      xa=cos(ang+polThetaOffset)*rmax*1.03;
-      ya=sin(ang+polThetaOffset)*rmax*1.03;
-      g->DrawLine(-xa, -ya, xa, ya);
-      sprintf(sbuff,"%g",ang*180./M_PI);
-      xa*=1.03;  ya*=1.03;
-      g->DrawString(xa,ya,sbuff,PI_HorizontalCenter|PI_VerticalCenter);
-      sprintf(sbuff,"%g",ang*180./M_PI+180.);
-      g->DrawString(-xa,-ya,sbuff,PI_HorizontalCenter|PI_VerticalCenter);
-    }
-    
-  }  // --- FIN trace d'axes polaires 
-
-  if (flags & kCentAxes)  {   // axes X-Y centres 
+  if (flags & kCentAxes) {
+
     // Les axes
     double x0axes = (xMin+xMax)/2.,  y0axes = (yMin+yMax)/2.;
@@ -183,17 +131,23 @@
     g->DrawArrowMarker(x0axes, yMax, x0axes, ym2, true);
     // La grille en pointilles
+
     if (flags & kGridOn) DrawGrid(g);
   
-    // Les ticks majeurs  
+    // Les ticks majeurs
+  
     if ((flags & kTicks) && (flags & kMajTicks)) {
         DrawHTicks(g, y0axes, xMajTickLen, xMajTickLen, xMajTicks);
         DrawVTicks(g, x0axes, yMajTickLen, yMajTickLen, yMajTicks);
     }
-    // Les ticks mineurs  
+    
+    // Les ticks mineurs
+  
     if ((flags & kTicks) && (flags & kMinTicks)) {
         DrawHTicks(g, y0axes, xMinTickLen, xMinTickLen, xMinTicks);
         DrawVTicks(g, x0axes, yMinTickLen, yMinTickLen, yMinTicks);
-    }    
-    // Les labels    
+    }
+    
+    // Les labels
+    
     if (flags & kLabelsH) {
       double declab = 2*xMajTickLen;
@@ -210,12 +164,16 @@
         DrawVLabels(g, x0axes+declab, yMajTicks, PI_HorizontalRight);
     }
-  }   //--- FIN trace axes X-Y centres 
-  
-  if (flags & kBoxAxes) {  
-    // La boite    
+    
+  }
+  
+  if (flags & kBoxAxes) {
+  
+    // La boite
+    
     g->DrawLine(xMin, yMin, xMax, yMin);
     g->DrawLine(xMax, yMin, xMax, yMax);
     g->DrawLine(xMax, yMax, xMin, yMax);
     g->DrawLine(xMin, yMax, xMin, yMin);
+
     // Longueur des ticks
     double extXMajTickLen = flags&kExtTicks ? xMajTickLen : 0;
@@ -227,7 +185,11 @@
     double extYMinTickLen = flags&kExtTicks ? yMinTickLen : 0;
     double intYMinTickLen = flags&kIntTicks ? yMinTickLen : 0;
+
     // La grille en pointilles
+
     if (flags & kGridOn) DrawGrid(g);
+
     // Les ticks majeurs
+  
     if ((flags & kTicks) && (flags & kMajTicks)) {
         DrawHTicks(g, yMin, intXMajTickLen, extXMajTickLen, xMajTicks);
@@ -236,5 +198,7 @@
         DrawVTicks(g, xMax, intYMajTickLen, extYMajTickLen, yMajTicks);
     }
-    // Les ticks mineurs  
+    
+    // Les ticks mineurs
+  
     if ((flags & kTicks) && (flags & kMinTicks)) {
         DrawHTicks(g, yMin, intXMinTickLen, extXMinTickLen, xMinTicks);
@@ -243,5 +207,8 @@
         DrawVTicks(g, xMax, intYMinTickLen, extYMinTickLen, yMinTicks);
     }
-    // Les labels    
+
+
+    // Les labels
+    
     if (flags & kLabelsH) {
       double declab = xMajTickLen;
@@ -264,6 +231,6 @@
       }
     }
-  }   // --- FIN trace BoxAxes 
-  //  g->Clip();
+  }
+  g->Clip();
   
 }
@@ -347,6 +314,6 @@
 //	(X/Y max-min). Les paramètres ne sont pas changés si des valeurs
 //	négatives ou nulles sont spécifiées.
-// void ConfigureAutoFontSize(bool afsz=true, double fszf=0.04)
-//	Configuration de la taille de fonte, en mode AutoFontSize ou FixedFontSize.
+// void ConfigureAutoFontSize(double fszf=0.0125)
+//	Configuration de la taille de fonte, en mode AutoFontSize.
 //	La taille est exprimée en fraction de la taille totale YMax-Min
 // void  ConfigureAxesCenter(bool fset,double x0,double y0)
@@ -365,7 +332,6 @@
 
 /* --Methode-- */
-void PIAxes::ConfigureAutoFontSize(bool afsz, double fszf)
-{
-  axesAFSz = afsz;
+void PIAxes::ConfigureAutoFontSize(double fszf)
+{
   if (fszf > 1.e-19) fontSz = fszf;
 }
@@ -454,10 +420,5 @@
     //Attention erreur d'arrondi x->0 (on code 5.1698e-26 au lieu de 0)
     double xx = (fabs(xticks[i]/xstep)<1.e-5) ? 0.: xticks[i];
-    double dog = fabs(xx/fac);
-    if ((dog<=1.e-5)||(dog>=1.e5))  
-      sprintf(label,"%le",xx/fac);
-    else 
-      sprintf(label,format.c_str(),xx/fac); 
-    Arrange_Label(label);
+    sprintf(label,format.c_str(),xx/fac); Arrange_Label(label);
     double largeur = g->CalcStringWidth(label);
     g->DUC2GrC(largeur,0.,largpix,dum);
@@ -502,10 +463,5 @@
     if(yticks[i]>yMax) break;
     double yy = (fabs(yticks[i]/ystep)<1.e-5) ? 0.: yticks[i];
-    double dog = fabs(yy/fac);
-    if ((dog<=1.e-5)||(dog>=1.e5))  
-      sprintf(label,"%le",yy/fac);
-    else 
-      sprintf(label,format.c_str(),yy/fac); 
-    Arrange_Label(label);
+    sprintf(label,format.c_str(),yy/fac); Arrange_Label(label);
     g->UC2GrC(x,yticks[i],dum,ypixdeb);   ypixdeb -= hautpix/2.;
     // -- Attention: ypix=0 est en haut de l'ecran
@@ -522,5 +478,5 @@
   if(npuiss!=0) {
     if(aYdir) hauteur = -hauteur; 
-    double ym = (aYdir)? yMin: yMax; ym = g->DeltaUCY(ym,0.25*hauteur);
+    double ym = (aYdir)? yMin: yMax; ym = g->DeltaUCY(ym,0.5*hauteur);
     sprintf(label,"%d",npuiss);
     g->DrawCompString(x,ym,"x 10",label,NULL,PI_VerticalBottom|just);
@@ -557,5 +513,4 @@
 //  Calcul du min et du max du display a partir des valeurs min et max a plotter
 {
-  //DBG  cout << "**DBG*PIAxes::ReSizeMinMax(" << vmin << "," << vmax << "," << garde << ")" << endl;
  if(garde<0. || garde>=1.) garde = 0.025;
  // cout<<"ReSizeMinMax[log="<<axelog<<",garde="<<garde<<"] vmin="<<vmin<<" vmax="<<vmax<<endl;
@@ -582,5 +537,5 @@
  }
 
- //DBG  cout<<"           vmin="<<vmin<<" vmax="<<vmax<<endl;
+ // cout<<"           vmin="<<vmin<<" vmax="<<vmax<<endl;
 }
 
Index: /trunk/SophyaPI/PI/piaxes.h
===================================================================
--- /trunk/SophyaPI/PI/piaxes.h	(revision 4076)
+++ /trunk/SophyaPI/PI/piaxes.h	(revision 4077)
@@ -14,12 +14,11 @@
   kCentAxes    = 0x0001,
   kBoxAxes     = 0x0002,
-  kPolarAxes   = 0x0004,
+  kTicks       = 0x0004,
+  kGridOn      = 0x0008,
 
-  kTicks       = 0x0010,
-  kGridOn      = 0x0020,
-  kIntTicks    = 0x0100,
-  kExtTicks    = 0x0200,
-  kMajTicks    = 0x0400,
-  kMinTicks    = 0x0800,
+  kIntTicks    = 0x0010,
+  kExtTicks    = 0x0020,
+  kMajTicks    = 0x0040,
+  kMinTicks    = 0x0080,
 
   kLabelsH     = 0x1000,
@@ -41,15 +40,10 @@
 
   virtual void      DrawXYAxes(PIGraphicUC* g, PIGraphicAtt& gratt, 
-			       unsigned int flags, bool afsz, double fszf);
-  inline  void      DrawXYAxes(PIGraphicUC* g, PIGraphicAtt& gratt, unsigned int flags=kAxesDflt)
-     { DrawXYAxes(g, gratt, flags, axesAFSz, fontSz); }
+			       unsigned int flags=kAxesDflt, bool afsz=true);
 
   virtual void      DrawXYAxes(PIGraphicUC* g, PIGraphicAtt& gratt, 
 			       double xmin, double xmax, 
 			       double ymin, double ymax,
-			       unsigned int flags, bool afsz, double fszf);
-  inline void       DrawXYAxes(PIGraphicUC* g, PIGraphicAtt& gratt, 
-			       double xmin, double xmax, double ymin, double ymax, unsigned int flags=kAxesDflt)
-    {   DrawXYAxes(g, gratt, xmin, xmax, ymin, ymax, flags, axesAFSz, fontSz); }
+			       unsigned int flags=kAxesDflt, bool afsz=true);
 
 
@@ -62,9 +56,5 @@
   void  ConfigureTicks(int ntickx=10, int nticky=12, 
 		       double majtl=0.016, double mintl=0.01);
-  //  Nb de cercles et nb de droites theta=Cte traces en coordonnees polaires
-  inline void  ConfigurePolar(int nradius=5, int nang=6, double thetaoffset=0.)
-    { polNRadius=nradius; polNAng=nang; polThetaOffset=thetaoffset; }
-  //  Choix de taille automatique de fontes 
-  void  ConfigureAutoFontSize(bool afsz=true, double fszf=0.04);
+  void  ConfigureAutoFontSize(double fszf=0.04);
   void  ConfigureAxesCenter(bool fset=false,double x0=0.,double y0=0.);
 
@@ -101,5 +91,5 @@
   bool   aXdir, aYdir;           // Sens des axes horiz, vertical 
   bool   aXlog, aYlog;           // Echelle log pour les axes horiz, vertical 
-  bool   axesAFSz;               // true -> AutoFontSize
+  bool   axesAFSz;
   
   int xNTicks, yNTicks;             // Nb de ticks en X, Y
@@ -112,9 +102,6 @@
   double xMajTickLen,  xMinTickLen;
   double yMajTickLen,  yMinTickLen;
-  bool axesCenter; 
-  double axesCentX0,axesCentY0;
-//--- PolarAxe   
-  int polNRadius, polNAng; // Nb de cercles et nb de droites theta=Cte
-  double polThetaOffset;   // Offset de l'angle 0 (en radian) par rapport au systeme de coordonnees x-y 
+  bool axesCenter; double axesCentX0,axesCentY0;
+
 };
 
Index: /trunk/SophyaPI/PI/piaxestools.cc
===================================================================
--- /trunk/SophyaPI/PI/piaxestools.cc	(revision 4076)
+++ /trunk/SophyaPI/PI/piaxestools.cc	(revision 4077)
@@ -131,14 +131,8 @@
 cpx = spx+0.25*bsx;
 cpy += spycb+bsycb;
-// mCkb[5] = new PICheckBox(this,"Centerd-Axes", 2005, bsx*1.5, bsycb, cpx, cpy);
-mCkb[5] = NULL;
-mOpt[0] = new PIOptMenu(this,"TypeAxes",1.5*bsx,bsycb,cpx,cpy);
-mOpt[0]->AppendItem("BoxAxes",2021);  
-mOpt[0]->AppendItem("CenteredAxes",2022);  
-mOpt[0]->AppendItem("PolarAxes",2023);   
-
+mCkb[5] = new PICheckBox(this,"Centerd-Axes", 2005, bsx*1.5, bsycb, cpx, cpy);
 cpx += bsx*1.5+3*spx;
 mCkb[2] = new PICheckBox(this,"Grid", 2002, bsx*1.5, bsycb, cpx, cpy);
-// mCkb[5]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
+mCkb[5]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
 mCkb[2]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
 
@@ -176,12 +170,12 @@
 mBut[5]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
  cpx += spx+0.5*bsx;
-mOpt[1] = new PIOptMenu(this,"choix-action",1.5*bsx,bsy,cpx,cpy);
-mOpt[1]->AppendItem("Transl X",2850);  // mTypAction=0
-mOpt[1]->AppendItem("Transl Y",2851);  // mTypAction=1
-mOpt[1]->AppendItem("Zoom X",2852);    // mTypAction=2
-mOpt[1]->AppendItem("Zoom Y",2853);    // mTypAction=3
-mOpt[1]->AppendItem("Zoom X-Y",2854);  // mTypAction=4
-mOpt[1]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
- string sdum="Transl X"; mOpt[1]->SetValueStr(sdum); mTypAction=0;
+mOpt = new PIOptMenu(this,"choix-action",1.5*bsx,bsy,cpx,cpy);
+mOpt->AppendItem("Transl X",2850);  // mTypAction=0
+mOpt->AppendItem("Transl Y",2851);  // mTypAction=1
+mOpt->AppendItem("Zoom X",2852);    // mTypAction=2
+mOpt->AppendItem("Zoom Y",2853);    // mTypAction=3
+mOpt->AppendItem("Zoom X-Y",2854);  // mTypAction=4
+mOpt->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
+ string sdum="Transl X"; mOpt->SetValueStr(sdum); mTypAction=0;
  cpx += spx+1.5*bsx;
 mBut[6] = new PIButton(this,">",2803,0.5*bsx,bsy,cpx,cpy);
@@ -202,7 +196,6 @@
 for(i=0;i<2;i++) delete mText[i];
 for(i=0;i<8;i++) delete mBut[i];
-for(i=0;i<7;i++) 
-  if (mCkb[i]) delete mCkb[i];
-for(i=0;i<2;i++) delete mOpt[i];
+for(i=0;i<8;i++) delete mCkb[i];
+delete mOpt;
 }
 
@@ -238,14 +231,11 @@
   if (scd->GetAxesFlags() & kGridOn) mCkb[2]->SetState(true);
   else mCkb[2]->SetState(false);
-  //  if (scd->GetAxesFlags() & kCentAxes) mCkb[5]->SetState(true);
-  //  else mCkb[5]->SetState(false);
-  if (scd->GetAxesFlags() & kCentAxes) mOpt[0]->SetValue(2022);
-  else if (scd->GetAxesFlags() & kPolarAxes)  mOpt[0]->SetValue(2023);
-  else mOpt[0]->SetValue(2021);
+  if (scd->GetAxesFlags() & kCentAxes) mCkb[5]->SetState(true);
+  else mCkb[5]->SetState(false);
   if (scd->GetAxesFlags() & kMinTicks) mCkb[6]->SetState(true);
   else mCkb[6]->SetState(false);
   mCkb[3]->SetState(scd->isLogScaleX());
   mCkb[4]->SetState(scd->isLogScaleY());
-  mCkb[7]->SetState(scd->BaseDrawer()->GetAutoFontSizeState());
+  mCkb[7]->SetState(scd->BaseDrawer()->isAxesAutoFontSize());
   }
 else {
@@ -257,6 +247,5 @@
   mCkb[3]->SetState(false);
   mCkb[4]->SetState(false);
-  //  mCkb[5]->SetState(false);
-  mOpt[0]->SetValue(2021);
+  mCkb[5]->SetState(false);
   mCkb[6]->SetState(false);
   mCkb[7]->SetState(true);
@@ -315,8 +304,6 @@
   if (mCkb[2]->GetState()) flags |= kGridOn;
   else  flags &= ~kGridOn;
-  PIMessage typax=mOpt[0]->GetValue();
-  if (typax==2022)   { flags |= kCentAxes;  flags &= ~(kBoxAxes|kPolarAxes); }
-  else if (typax==2023)  { flags |= kPolarAxes;  flags &= ~(kBoxAxes|kCentAxes); }
-  else { flags |= kBoxAxes; flags &= ~(kCentAxes|kPolarAxes);}
+  if (mCkb[5]->GetState()) { flags |= kCentAxes;  flags &= ~kBoxAxes; }
+  else { flags &= ~kCentAxes;  flags |= kBoxAxes; }
   if (mCkb[6]->GetState()) flags |= kMinTicks;
   else  flags &= ~kMinTicks;
@@ -325,5 +312,5 @@
 
   scd->SetLogScale(mCkb[3]->GetState(), mCkb[4]->GetState() );
-  scd->BaseDrawer()->ConfigureAutoFontSize(mCkb[7]->GetState(), -1);
+  scd->BaseDrawer()->SetAxesAutoFontSize(mCkb[7]->GetState() );
   if (refr) scd->Refresh();
   return;
Index: /trunk/SophyaPI/PI/piaxestools.h
===================================================================
--- /trunk/SophyaPI/PI/piaxestools.h	(revision 4076)
+++ /trunk/SophyaPI/PI/piaxestools.h	(revision 4077)
@@ -41,5 +41,5 @@
   PIText* mText[2];
   PICheckBox* mCkb[8];
-  PIOptMenu * mOpt[2];
+  PIOptMenu * mOpt;
   unsigned short mTypAction;
   double mSclAction;
Index: /trunk/SophyaPI/PI/pibwdgx.cc
===================================================================
--- /trunk/SophyaPI/PI/pibwdgx.cc	(revision 4076)
+++ /trunk/SophyaPI/PI/pibwdgx.cc	(revision 4077)
@@ -39,5 +39,5 @@
 CreateXtWdg(nom, piXtBaseWidgetClass, NULL, sx, sy, px, py);
 
-XtSetArg(wargs[0],const_cast<char*>(PIXNobject),this); 
+XtSetArg(wargs[0],PIXNobject,this); 
 XtSetArg(wargs[1],XtNbackground, colpixwhite);  
 XtSetArg(wargs[2],XtNborderWidth, (Dimension)0);  
@@ -72,5 +72,5 @@
 #endif
 Arg  wargs[2];
- XtSetArg(wargs[0],const_cast<char*>(PIXNobject),NULL); 
+XtSetArg(wargs[0],PIXNobject,NULL); 
 XtSetValues(XtWdg(), wargs, 1);
 }
Index: /trunk/SophyaPI/PI/picmap.cc
===================================================================
--- /trunk/SophyaPI/PI/picmap.cc	(revision 4076)
+++ /trunk/SophyaPI/PI/picmap.cc	(revision 4077)
@@ -6,5 +6,4 @@
 #include "picmap.h"
 #include <iostream>
-
 
 //++
@@ -25,10 +24,9 @@
 //--
 
-#define  MXMAPIDS   34
+#define  MXMAPIDS   30
 static   int    MapNCols[MXMAPIDS] = {
   256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
   256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 
-  256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
-  216, 512, 4096, 32768  };
+  256, 256, 256, 256, 256, 256, 256, 256, 256, 256  };
 
 // Tables de couleurs :
@@ -39,8 +37,4 @@
 // 1 Standard PI 64 couleurs differentes
 // 1 Standard PI 16 couleurs
-// 1 Standard PI , 216 couleurs RGB (6x6x6)
-// 1 Standard PI , 512 couleurs RGB (8x8x8)
-// 1 Standard PI , 4096 couleurs RGB (16x16x16)
-// 1 Standard PI , 32768 couleurs RGB (32x32x32)
 
 static   const char*  MapNoms[MXMAPIDS]  = {
@@ -53,6 +47,5 @@
                       "MIDAS_Stairs9","MIDAS_StairCase","MIDAS_Color",
                       "MIDAS_ManyCol","MIDAS_Idl14","MIDAS_Idl15",
- 		      "MultiCol16","MultiCol64",
-                      "RGB216CM","RGB512CM","RGB4096CM","RGB32768CM"};
+                      "MultiCol16","MultiCol64"};
 
 static   CMapId MapIds[MXMAPIDS] = { 
@@ -65,6 +58,5 @@
                       CMAP_MIDAS_Stairs9, CMAP_MIDAS_StairCase, CMAP_MIDAS_Color, 
                       CMAP_MIDAS_ManyCol, CMAP_MIDAS_Idl14, CMAP_MIDAS_Idl15, 
-                      CMAP_COL16, CMAP_COL64, 
-                      CMAP_RGB216, CMAP_RGB512, CMAP_RGB4096, CMAP_RGB32768} ;
+                      CMAP_COL16, CMAP_COL64 } ;
 
 static   int mColTNums[8192];   // Max 8192 tables differentes pour le moment  
@@ -78,6 +70,5 @@
                                   NULL, NULL, NULL, NULL, NULL,
                                   NULL, NULL, NULL, NULL, NULL, 
-                                  NULL, NULL, NULL, NULL, NULL,
-                                  NULL, NULL, NULL, NULL };
+                                  NULL, NULL, NULL, NULL, NULL };
 
 int  PIColorMap::NumberStandardColorMaps()
@@ -131,12 +122,6 @@
 //|	CMAP_COL64      :  64 Couleurs arcenciel 
 //|	CMAP_OTHER      :  Table non standard 
-//|	CMAP_RGB216     :  216 couleurs, 6x6x6 couleurs en composantes RGB
-//|	CMAP_RGB512     :  512 couleurs, 8x8x8 couleurs en composantes RGB
-//|	CMAP_RGB4096    :  4096 couleurs, 16x16x16 couleurs en composantes RGB
-//|	CMAP_RGB4096    :  32768 couleurs, 32x32x32 couleurs en composantes RGB
-
 //	Toutes les tables de couleurs standard possèdent 256 cellules de couleurs,
-//	contenant 16 ou 32 ou 128 (ou 216) couleurs distinctes, 
-//	sauf CMAP_RGB512 , CMAP_RGB4096 et CMAP_RGB32768.
+//	contenant 16 ou 32 ou 128 couleurs distinctes.
 //
 // PIColorMap(string const& nom, int nCol)
@@ -159,6 +144,5 @@
 
    if (NMaxTableAuto == 0) { //  Il faut allouer les tables de depart
-     if ( TotNbColors() >= 4096 ) NMaxTableAuto = MXMAPIDS-2;
-     if ( TotNbColors() >= 65536 ) NMaxTableAuto = MXMAPIDS-1;
+     if ( TotNbColors() > 4096 ) NMaxTableAuto = MXMAPIDS-1;
      else NMaxTableAuto = 3; 
      //     for(k=0; k<NMaxTableAuto; k++)  { 
@@ -174,5 +158,5 @@
    for(kdx=0; kdx<MXMAPIDS; kdx++)  if (id == MapIds[kdx])  break;
    if (kdx == MXMAPIDS)  { id = MapIds[0];  kdx = 0; }
-   for(k=0; k<=NMaxTableAuto; k++) {
+   for(k=0; k<NMaxTableAuto; k++) {
      if ((MapIds[k] == id) && (mMaps[k] == NULL))  { //  Table pas encore alloue 
        mnom = MapNoms[k]; 
@@ -192,12 +176,7 @@
        if ( mMaps[k] ) {  
          mColTNums[mMaps[k]->mCTId] = 1;  // Je force a liberer les couleurs 
-         delete mMaps[k] ;   mMaps[k] = NULL;
-         mnom = MapNoms[k]; 
-         cout << " PIColorMap::PIColorMap(CMapId id) Freeing colors for ColorMap " 
-	      << mnom << " ... " << endl;
+         delete mMaps[k] ;
        }
        mnom = MapNoms[kdx];
-       cout << " PIColorMap::PIColorMap(CMapId id) Allocating ColorMap " 
-	     << mnom << " ... " << endl;
        mMaps[k] = new PIColorMap(MapIds[kdx],  MapNCols[kdx], mnom); 
      }
@@ -584,44 +563,4 @@
       }
       break;
-
-    case CMAP_RGB216 :
-      i = 0;
-      for(int kb=0; kb<6; kb++) {
-        mycol.blue = (unsigned short)(kb*65535/5);
-        for(int jg=0; jg<6; jg++) { 
-          mycol.green = (unsigned short)(jg*65535/5);
-          for(int ir=0; ir<6; ir++) {
-            mycol.red = (unsigned short)(ir*65535/5);
-            AllocColor(mycol, i);   i++;
-          }
-        }            
-      }
-      mycol.blue = mycol.green =  mycol.red = 65535;
-      for(i=216; i<256; i++)
-        AllocColor(mycol, i);
-      break;
-
-    case CMAP_RGB512 :
-    case CMAP_RGB4096 :
-    case CMAP_RGB32768 :
-      {
-      int nlev = 8;
-      if (mType == CMAP_RGB4096)  nlev = 16;
-      else if (mType == CMAP_RGB32768)  nlev = 32;
-      int drgb = 65535/(nlev-1);
-      i = 0;
-      for(int kb=0; kb<nlev; kb++) {
-        mycol.blue = (unsigned short)(kb*drgb);
-        for(int jg=0; jg<nlev; jg++) { 
-          mycol.green = (unsigned short)(jg*drgb);
-          for(int ir=0; ir<nlev; ir++) {
-            mycol.red = (unsigned short)(ir*drgb);
-            AllocColor(mycol, i);   i++;
-          }
-        }            
-      }
-      }
-      break;
-
 //----------------------------------------------------------
 //----------------------------------------------------------
Index: /trunk/SophyaPI/PI/picmap.h
===================================================================
--- /trunk/SophyaPI/PI/picmap.h	(revision 4076)
+++ /trunk/SophyaPI/PI/picmap.h	(revision 4077)
@@ -47,11 +47,6 @@
 
  //  Table simple a 16/64 couleurs 
- CMAP_COL16       = 991,        // 16 Couleurs arcenciel
- CMAP_COL64       = 992,         // 64 Couleurs differentes
- // Table de couleurs RGB 6x6x6=216 couleurs
- CMAP_RGB216      = 993,        // 216 couleurs avec toutes les nuances RGB
- CMAP_RGB512      = 994,        // 512 couleurs avec toutes les nuances RGB
- CMAP_RGB4096     = 995,        // 4096 couleurs avec toutes les nuances RGB
- CMAP_RGB32768    = 996         // 32768 couleurs avec toutes les nuances RGB
+ CMAP_COL16       = 998,        // 16 Couleurs arcenciel
+ CMAP_COL64       = 999         // 64 Couleurs differentes
  };
 
Index: /trunk/SophyaPI/PI/picmapview.cc
===================================================================
--- /trunk/SophyaPI/PI/picmapview.cc	(revision 4076)
+++ /trunk/SophyaPI/PI/picmapview.cc	(revision 4077)
@@ -5,7 +5,5 @@
 #include "sopnamsp.h"
 #include "picmapview.h"
-#include "strutil.h"
 #include <math.h>
-#include <iostream>
 
 //++
@@ -81,8 +79,5 @@
   if ( cmap && (cmp->Type() == cmap->Type()) && (cmp->Type() != CMAP_OTHER)
        && (cmp->IsColorIndexReversed() == cmap->IsColorIndexReversed())
-       && (fabs(vmin-min) < 1.e-69)  && (fabs(vmax-max) > -1.e-69) )  { 
-    if (refr)  Refresh();      
-    return;
-  }
+       && (fabs(vmin-min) < 1.e-69)  && (fabs(vmax-max) > -1.e-69) )  return;
   if (cmap) delete cmap;
   cmap = new PIColorMap(*cmp);
@@ -98,8 +93,5 @@
        (cmap->IsColorIndexReversed() == revidx) &&
        ((vmin-min) < 1.e-69) &&  ((vmin-min) > -1.e-69) &&
-       ((vmax-max) < 1.e-69) &&  ((vmax-max) > -1.e-69) )  { 
-    if (refr)  Refresh();      
-    return;
-  }
+       ((vmax-max) < 1.e-69) &&  ((vmax-max) > -1.e-69) )  return;
   if (cmap) delete cmap;
   cmap = new PIColorMap(cmapid);
@@ -125,12 +117,9 @@
 
   int k;
-  // On limite le nombre de carres de couleurs traces, si trop de couleur ...
-  int dk = cmap->NCol()/128;
-  if (dk<1) dk=1;
   if (sx > sy) {    // horizontal
     int xc, dx;
     xc = 0;
-    for(k=0; k<cmap->NCol(); k+=dk) {
-      dx = dk*(sx-xc)/(cmap->NCol()-k);
+    for(k=0; k<cmap->NCol(); k++) {
+      dx = (sx-xc)/(cmap->NCol()-k);
       g->SelForeground((*cmap), k);
       g->DrawFBox(xc, 0, dx+1, sy);
@@ -141,6 +130,6 @@
     int yc, dy;
     yc = sy;
-    for(k=0; k<cmap->NCol(); k+=dk) {
-      dy = dk*yc/(cmap->NCol()-k);
+    for(k=0; k<cmap->NCol(); k++) {
+      dy = yc/(cmap->NCol()-k);
       yc -= dy;
       g->SelForeground((*cmap), k);
@@ -188,103 +177,7 @@
 }
 
-//++
-// Class        PICMapDrawer
-// Lib          PI
-// include      picmapview.h
-//
-//      Classe de traceur de colormap 
-//--
-//++
-// Links        Parents
-// PIDrawer
-//--
-//++
 
 
-/* --Methode-- */
-PICMapDrawer::PICMapDrawer(bool fgvert)
-  : fgvert_(fgvert), fgtext_(false), cmapp(NULL), bornes_(5)   
-{
-  SetLimits(0.,1.,0.,1., kAxeDirLtoR, kAxeDirDownUp);
-  SetColMapId(CMAP_GREY32);
-}
-
-/* --Methode-- */
-PICMapDrawer::~PICMapDrawer()
-{
-}
-
-/* --Methode-- */
-void PICMapDrawer::SetBornes(LUT& lut)
-{
-  fgtext_=true;  
-  bornes_[0]=lut.Min();   bornes_[4]=lut.Max(); 
-  bornes_[1]=lut.Borne((lut.NCol()-2)/4);
-  bornes_[2]=lut.Borne((lut.NCol()-2)/2);
-  bornes_[3]=lut.Borne(3*(lut.NCol()-2)/4);
-  return;
-}
-
-/* --Methode-- */
-void PICMapDrawer::SetBornes(double min, double max)
-{
-  fgtext_=true;  
-  bornes_[0]=min;   bornes_[4]=max; 
-  bornes_[1]=min+(max-min)*0.25; 
-  bornes_[2]=min+(max-min)*0.5; 
-  bornes_[3]=min+(max-min)*0.75; 
-  return;
-}
-
-/* --Methode-- */
-void PICMapDrawer::Draw(PIGraphicUC* g, double /*xmin*/, double /*ymin*/, 
-                        double /*xmax*/, double /*ymax*/)
-{
-  PIColorMap* cmp=cmapp;
-  PIColorMap cmapi(cmapid_);
-  if (cmp==NULL)  cmp=&cmapi;
-  PIColorMap& cmap=(*cmp);
-
-  //  cout << " *DBG*PICMapDrawer::Draw() Sz:" << BWdgXSize() << "," << BWdgYSize() 
-  //     << " Pos:" << BWdgXPos() << "," << BWdgYPos() << endl; 
-  // On limite le nombre de carres de couleurs traces, si trop de couleur ...
-  PIPixColIdx pixc;
-  if (fgvert_) {   // vertical
-    pixc.AllocateByte(0.25*BWdgXSize(), BWdgYSize());
-    for(int j=0; j<pixc.YSize(); j++)  {
-      int ci = j*cmap.NCol()/pixc.YSize();
-      int jrev=pixc.YSize()-j-1;
-      for(int i=0; i<pixc.XSize(); i++) pixc.GetByte(i,jrev)=(unsigned char)ci;
-    }
-    g->DrawPixmap(0.,1.,pixc, cmp);
-  }
-  else {    // horizontal
-    pixc.AllocateByte(BWdgXSize(), 0.25*BWdgYSize());
-    for(int i=0; i<pixc.XSize(); i++)  {
-      int ci = i*cmap.NCol()/pixc.XSize();
-      for(int j=0; j<pixc.YSize(); j++) pixc.GetByte(i,j)=(unsigned char)ci;
-    }
-    g->DrawPixmap(0.,0.25,pixc, cmp);
-  }
 
 
-  if (!fgtext_) return;
-  char buff[32];
-  double ps[5]={0.025,0.25,0.5,0.75,0.975};
-  //  g->SelForeground(PI_White);
-  for(int k=0; k<5; k++) {
-    sprintf(buff,"%6.2lg",bornes_[k]);
-    strip(buff,'B',' ');
-    if (fgvert_) {   // vertical
-      g->DrawLine(0.25,ps[k],0.35,ps[k]);
-      g->DrawString(0.7, ps[k], buff, PI_TextDirectionVerticalUp|PI_HorizontalCenter|PI_VerticalCenter);
-    }
-    else {   // horizontal 
-      g->DrawLine(ps[k],0.25,ps[k],0.35);
-      g->DrawString(ps[k], 0.7, buff, PI_VerticalCenter|PI_HorizontalCenter);
-    }
-  }
-  return;
-}
 
-
Index: /trunk/SophyaPI/PI/picmapview.h
===================================================================
--- /trunk/SophyaPI/PI/picmapview.h	(revision 4076)
+++ /trunk/SophyaPI/PI/picmapview.h	(revision 4077)
@@ -11,9 +11,4 @@
 #include PIBWDG_H
 #include PICMAP_H
-
-#include "pidrawer.h"
-#include "lut.h"
-#include <vector>
-
 
 class PICMapView : public PIBaseWdg
@@ -43,33 +38,4 @@
 };
 
-class PICMapDrawer : public PIDrawer
-{
-public:
-                     PICMapDrawer(bool fgvert=false);
-                     ~PICMapDrawer();
-
-  virtual void       Draw(PIGraphicUC* g, double xmin, double ymin, double xmax, double ymax);
-  inline void        SetHorizontal()  { fgvert_=false; }
-  inline void        SetVertical()  { fgvert_=true; }
-
-  inline void        SetColMapId(CMapId cmapid, bool revcidx=false) 
-                     { cmapid_=cmapid;  revcidx_=revcidx;  cmapp=NULL;  return; }
-
-  inline void        SetColMap(PIColorMap* cmp) 
-                     { cmapp=cmp;  return; }
-
-  void               SetBornes(LUT& lut);
-  void               SetBornes(double min, double max);
-
-protected:
-
-  bool fgvert_;  // true -> vertical 
-  bool fgtext_;  // true -> ecriture des valeurs des bornes
-  PIColorMap* cmapp;  
-  CMapId cmapid_;
-  bool revcidx_;  // true -> reverse color map index 
-  vector<double> bornes_;  
-};
-
 
 #endif 
Index: /trunk/SophyaPI/PI/picmapx.cc
===================================================================
--- /trunk/SophyaPI/PI/picmapx.cc	(revision 4076)
+++ /trunk/SophyaPI/PI/picmapx.cc	(revision 4077)
@@ -187,5 +187,4 @@
   mColRGB = new PIColor[mNCol];
   mNewCol = new bool[mNCol];
-  /*   Remplace par memcpy pour performances, Reza, Nov 2008
   for (int i=0; i<mNCol; i++)  
     { mColors[i] = ((PIColorMapX *)x)->mColors[i];
@@ -193,8 +192,3 @@
 // C'est la table de couleur originale qui est responsable de liberer les couleurs - Reza 8/2/98
     mNewCol[i] = false; }  
-  -> memcpy (Nov08) */
-  memcpy(mColors, ((PIColorMapX *)x)->mColors, sizeof(PIXColor)*mNCol);
-  memcpy(mColRGB, ((PIColorMapX *)x)->mColRGB, sizeof(PIColor)*mNCol);
-// C'est la table de couleur originale qui est responsable de liberer les couleurs - Reza 8/2/98
-  for (int i=0; i<mNCol; i++)   mNewCol[i] = false;
 }
Index: /trunk/SophyaPI/PI/picontainergen.h
===================================================================
--- /trunk/SophyaPI/PI/picontainergen.h	(revision 4076)
+++ /trunk/SophyaPI/PI/picontainergen.h	(revision 4077)
@@ -51,6 +51,6 @@
   inline  PILayoutMgr* GetLayoutMgr() { return(layout); }
 
-  virtual void         PSPrint(PSFile *psf, int ofx=0, int ofy=0,
-			       double scale_x=1., double scale_y=1.);
+   virtual void         PSPrint(PSFile *psf, int ofx=0, int ofy=0,
+ 			       double scale_x=1., double scale_y=1.);
 
   virtual void         Show();
Index: /trunk/SophyaPI/PI/pidrawer.cc
===================================================================
--- /trunk/SophyaPI/PI/pidrawer.cc	(revision 4076)
+++ /trunk/SophyaPI/PI/pidrawer.cc	(revision 4077)
@@ -52,15 +52,4 @@
 //--
 
-// Valeur par defaut global pour TailleFonteAuto 
-double PIDrawer::glDefAFSzFrac = 0.04;
-void PIDrawer::SetGlDefAutoFontSizeFrac(double fszf)
-{
-  if (fszf>1.e-6)  glDefAFSzFrac = fszf;
-}
-double PIDrawer::GetGlDefAutoFontSizeFrac()
-{
-  return glDefAFSzFrac;
-}
-
 PIDrawer::PIDrawer()
 {
@@ -76,5 +65,5 @@
   limitsFixed = false;
   SetAxesFlags(kAxesNone);   // Pas de trace d'axes par defaut 
-  ConfigureAutoFontSize(true, glDefAFSzFrac);
+  SetAxesAutoFontSize();
 
   mDndfg = false;  // Pour controle de l'appel de Detach() si delete
@@ -118,19 +107,11 @@
 
 //++
-// Titre	Gestion des axes, des limites et coordonnees fenetre
+// Titre	Gestion des axes et des limites
 //      Le tracé des axes 2D est pris en charge par la classe PIAxes.
 //--
 //++
-// double BWdgXPos()  BWdgYPos()
-//	Renvoient les positions (X,Y) du drawer dans l'objet PIBaseWdg. Ces positions ne sont 
-//	valables qu'apres appel a SetDrwWdg() - Ne peut donc etre utilise en pratique que dans 
-//	la methode Draw.
-// double  BWdgXSize()  BWdgYSize()
-//	Renvoient les tailles (X,Y) du drawer dans l'objet PIBaseWdg. Meme remarque que pour 
-//	BWdgXPos()  BWdgYPos(). 
-//
 // void  SetLimits(double xmin, double xmax, double ymin, double ymax, -
 //                 int axrl=kAxeDirSame, int ayud=kAxeDirSame)
-//	Définit les limites du système de coordonnées du Drawer.
+//	Définit les limites du système de coordonnées.
 //|	kAxeDirSame , kAxeDirAuto
 //|	kAxeDirLtoR , kAxeDirRtoL  (Axe X)
@@ -162,20 +143,12 @@
 //|	kMajTicks , kMinTicks , kLabels , kGridOn
 //|	kAxesDflt , kAxesNone
-// void ConfigureAutoFontSize(bool afsz=true, double fszf=0.05)
-//	Si "fg==true", la taille de la fonte par le drawer, est 
+// void SetAxesAutoFontSize(bool fg=true)
+//	Si "fg==true", la taille de la fonte pour les labels d'axes (chiffres) est 
 //	choisie automatiquement, en s'adaptant à la taille de la zone de tracé - 
-//	sinon, taille de la fonte de l'objet PIDrawer. Cette taille est donnée par
-//	FontSize=(YMax()-YMin())*(mFontSzF=fszf). "mFontSzF=fszf" n'est mis à jour
-//	que si fszf>0. Le décodage des attributs graphiques par DecodeOptionString() 
-//	("autofontsize=fszf" et "fixedfontsize")  permet de modifier ces attributs de 
-//	choix automtique de fonte. Utilisé en particulier par PIElDrawer pour 
-//	le tracé les labels d'axes (chiffres).
+//	sinon, taille de la fonte de l'objet PIDrawer.
 // unsigned int GetAxesFlags()
 //	Renvoie les attributs de tracé d'axes  
-// bool  GetAutoFontSizeState() 
-//	Renvoie la valeur du flag de choix automatique de taille de fonte.
-// double  GetAutoFontSizeFraction()
-//	Renvoie la valeur de la fraction de taille ("mFontSzF) pour lee 
-//	choix automatique de taille de fonte.
+// bool  isAxesAutoFontSize()
+//	Renvoie la valeur du flag de choix automatique de taille de fonte pour axes.
 // void  DrawAxes(PIGraphicUC* g)
 //	Méthode de tracé des axes (le tracé est pris en charge par la classe *PIAxes*)
@@ -210,7 +183,9 @@
   if (ayud == kAxeDirDownUp)  aYdir = false;
   else if (ayud == kAxeDirUpDown)  aYdir = true;
-  //cerr<<" DBG-SetLimits xmax-xmin= "<<xmax-xmin<<" xmin,max="<<xmin<<","<<xmax<<endl;
+  //  cerr << " DBG-SetLimits xmax-xmin= " << xmax-xmin << " xmin,max=" 
+  //     << xmin << "," << xmax << endl;
   UC_CheckMinMaxDiff(xmin, xmax);
-  //cerr<<" DBG-SetLimits ymax-ymin= "<<ymax-ymin<<" ymin,max="<<ymin<<","<<ymax<<endl;
+  //cerr << " DBG-SetLimits ymax-ymin= " << ymax-ymin << " ymin,max=" 
+  //     << ymin << "," << ymax << endl;
   UC_CheckMinMaxDiff(ymin, ymax);
   xMin = xmin;
@@ -420,30 +395,9 @@
 PIDrawer::DecodeOptionString(vector<string> & opt, bool rmdecop)
 {
-  int nopt0 = opt.size();
-  if (nopt0 < 1)  return(0);  
+  if (opt.size() < 1)  return(0);  
   PIGraphicAtt gratt;
-  int ndec1 = gratt.DecodeAttStrings(opt, rmdecop);
+  int ndec = gratt.DecodeAttStrings(opt, rmdecop);
   UpdateGraphicAtt(gratt);
-  if ((nopt0 - ndec1) < 1) return(ndec1);  // si tout a ete decode
-  vector<string> udopt;
-  unsigned int k = 0;
-  int ndec = opt.size();
-  string opts;
-  for( k=0; k<opt.size(); k++ ) {
-    opts = opt[k];
-    if (opts.substr(0,13) == "autofontsize=") {
-       double fszf = atof(opts.substr(13).c_str());
-       ConfigureAutoFontSize(true, fszf);
-    }
-    else if (opts == "fixedfontsize")
-       ConfigureAutoFontSize(false, -1.);  
-    else {
-      ndec--;
-      if (rmdecop)  udopt.push_back(opts);
-    }
-  }
-
-  if (rmdecop)  opt = udopt;
-  return(ndec+ndec1); 
+  return(ndec);
 }
 
@@ -470,7 +424,4 @@
   info += "   FontAtt: roman, bold, italic, bolditalic  \n";
   info += "   FontSize: 6,8,10,12... (pts) - integer \n";
-  info += ">>> Automatic font size selection : \n";
-  info += "    autofontsize=FontSizeFrac fixedfontsize \n";
-  info += ">>> ColorTables: defcmap  grey32  invgrey32  colrj32  colbr32 \n";
   info += ">>> marker=MarkerType,MarkerSize (MarkerSize: integer 3,5,7... \n";
   info += "   MarkerType: dot, plus, cross, circle, fcircle, box, fbox \n";
@@ -554,5 +505,5 @@
   PIAxes axes;
   axes.DrawXYAxes(g, mGrAtt, XMin(), XMax(), YMin(), YMax(),
-		  axesFlags, mAFSz, mFontSzF); 
+		  axesFlags, axesAFSz); 
   g->Clip();
 }
Index: /trunk/SophyaPI/PI/pidrawer.h
===================================================================
--- /trunk/SophyaPI/PI/pidrawer.h	(revision 4076)
+++ /trunk/SophyaPI/PI/pidrawer.h	(revision 4077)
@@ -30,12 +30,5 @@
 
   virtual void       SetAxesFlags(unsigned int flags=kAxesNone);
-
-//---- Choix automatique ou pas de taille de fonte
-  inline void        ConfigureAutoFontSize(bool afsz=true, double fszf=0.04)
-    { mAFSz = afsz;  if (fszf>1e-5)  mFontSzF = fszf; }
-//  Valeur par defaut global pour le AutoFontSizeFrac, utilise dans les constructeurs de PIDrawer
-  static  void       SetGlDefAutoFontSizeFrac(double fszf=0.04);
-//  Retourne la valeur globale par defaut de AutoFontSizeFrac
-  static  double     GetGlDefAutoFontSizeFrac();
+  inline  void       SetAxesAutoFontSize(bool fg=true) { axesAFSz = fg; }
 
   virtual void       DrawAxes(PIGraphicUC* g);
@@ -60,11 +53,4 @@
   virtual void	     HighLight(bool fgh);  
 
-  // Zone de trace/accrochage dans le BaseWidget 
-  inline int         BWdgXPos() const { return xW0; }
-  inline int         BWdgYPos() const { return yW0; }
-  inline int         BWdgXSize() const { return xWd; }
-  inline int         BWdgYSize() const { return yWd; }
-
-  // Limites et informations sur les coordonnees dans le systeme du Drawer
   inline double      XMin() const {return xMin;}
   inline double      XMax() const {return xMax;}
@@ -77,7 +63,5 @@
 
   inline unsigned int GetAxesFlags() { return(axesFlags); }
-
-  inline bool         GetAutoFontSizeState() { return mAFSz; }
-  inline double       GetAutoFontSizeFraction() { return mFontSzF; }
+  inline bool         isAxesAutoFontSize() { return axesAFSz; }
 
   inline PIGraphicUC*    GetGraphicUC() { return(mGrUC); }
@@ -143,9 +127,5 @@
   bool limitsFixed;
   unsigned int axesFlags;
-
-  bool mAFSz;  // true -> Choix automatique de taille de font en fraction (ymax-ymin)
-  double mFontSzF;   // TailleFonteAuto = mFontSzF*(ymax-ymin)
-  static double glDefAFSzFrac;   // Valeur globale par defaut pour mFontSzF, utilise ds le constructeur
-
+  bool axesAFSz;
   PIBaseWdgGen* mBWdg;
   PIGraphicUC* mGrUC;
Index: /trunk/SophyaPI/PI/pieldrw.cc
===================================================================
--- /trunk/SophyaPI/PI/pieldrw.cc	(revision 4076)
+++ /trunk/SophyaPI/PI/pieldrw.cc	(revision 4077)
@@ -552,14 +552,4 @@
     else if (opts == "finecenteredaxesgrid")
       SetAxesFlags(kCentAxes | kTicks | kMajTicks | kMinTicks | kLabels | kGridOn);
-    else if (opts == "polaraxes") 
-      SetAxesFlags(kPolarAxes);
-    else if (opts.substr(0,10) == "polaraxes=") {
-      SetAxesFlags(kPolarAxes);
-      int nradius=5,nang=6;
-      int thetaoffdeg=0;
-      sscanf(opts.substr(10).c_str(),"%d,%d,%d",&nradius,&nang,&thetaoffdeg);
-      double thetaoffset=(double)thetaoffdeg*M_PI/180.;
-      axeDr.ConfigurePolar(nradius,nang,thetaoffset);
-    }
     else if (opts == "axesnone")
       SetAxesFlags(kAxesNone);
@@ -585,7 +575,7 @@
       SetAxesFlags(GetAxesFlags() & ~kMinTicks);
     else if (opts == "extticks")
-      SetAxesFlags((GetAxesFlags() & ~kIntTicks) |  kExtTicks);
+      SetAxesFlags(GetAxesFlags() & ~kIntTicks |  kExtTicks);
     else if (opts == "intticks")
-      SetAxesFlags((GetAxesFlags() & ~kExtTicks) |  kIntTicks);
+      SetAxesFlags(GetAxesFlags() & ~kExtTicks |  kIntTicks);
     else if (opts == "extintticks")
       SetAxesFlags(GetAxesFlags() | kIntTicks |  kExtTicks);
@@ -603,5 +593,13 @@
       }
     }
- 
+
+    else if (opts.substr(0,13) == "autofontsize=") {
+      double fszf = atof(opts.substr(13).c_str());
+      ConfigureAxeAutoFontSize(fszf);
+      SetAxesAutoFontSize(true);
+    }
+    else if (opts == "fixedfontsize")
+      SetAxesAutoFontSize(false);
+
     else if (opts == "title" || opts == "tit") ShowTitles(true);
     else if (opts == "notitle" || opts == "notit") ShowTitles(false);
@@ -641,6 +639,6 @@
   info += "   ticks/noticks minorticks/nominorticks \n";
   info += "   extticks/intticks/extintticks nbticks=X_NbTicks,Y_NbTicks \n";
-  info += "   tickslen=MajorTickLenFrac,MinorTickLenFraC \n"; 
-  info += " >> Axe labels font size: \n";
+  info += "   tickslen=MajorTickLenFrac,MinorTickLenFraC \n";
+  info += " >> Axe label font size: \n";
   info += "    autofontsize=FontSizeFrac fixedfontsize \n";
   info += " >> Up/Down title: title tit notitle notit \n";
@@ -657,5 +655,5 @@
   //  g->NoClip();
   axeDr.DrawXYAxes(g, mGrAtt, XMin(), XMax(), YMin(), YMax(), 
-		   axesFlags, mAFSz, mFontSzF); 
+		   axesFlags, axesAFSz); 
   if (showAxesLabels) { 
     axeDr.DrawXCaption(g, labelAtt, axesFlags, xLabel);
Index: /trunk/SophyaPI/PI/pieldrw.h
===================================================================
--- /trunk/SophyaPI/PI/pieldrw.h	(revision 4076)
+++ /trunk/SophyaPI/PI/pieldrw.h	(revision 4077)
@@ -246,4 +246,6 @@
 				       double majtl=0., double mintl=0.)
      { axeDr.ConfigureTicks(ntickx, nticky, majtl, mintl); }
+  inline void        ConfigureAxeAutoFontSize(double fszf=0.)
+     { axeDr.ConfigureAutoFontSize(fszf); }
 
   inline PIElDrwMgr& ElDrwMgr()    { return eltsMgr; }
Index: /trunk/SophyaPI/PI/pifilechox.cc
===================================================================
--- /trunk/SophyaPI/PI/pifilechox.cc	(revision 4076)
+++ /trunk/SophyaPI/PI/pifilechox.cc	(revision 4077)
@@ -120,5 +120,5 @@
 {
 XmString xmstr;
-xmstr = XmStringLtoRCreate(const_cast<char*>(path.c_str()), const_cast<char*>(XmSTRING_DEFAULT_CHARSET));
+xmstr = XmStringLtoRCreate((char *)path.c_str(), XmSTRING_DEFAULT_CHARSET);
 Arg warg[2];
 XtSetArg(warg[0], XmNdirectory, xmstr); 
@@ -132,5 +132,5 @@
 {
 XmString xmstr;
-xmstr = XmStringLtoRCreate(const_cast<char*>(fname.c_str()),  const_cast<char*>(XmSTRING_DEFAULT_CHARSET));
+xmstr = XmStringLtoRCreate((char *)fname.c_str(), XmSTRING_DEFAULT_CHARSET);
 Arg warg[2];
 XtSetArg(warg[0], XmNtextString, xmstr); 
Index: /trunk/SophyaPI/PI/pifontx.cc
===================================================================
--- /trunk/SophyaPI/PI/pifontx.cc	(revision 4076)
+++ /trunk/SophyaPI/PI/pifontx.cc	(revision 4077)
@@ -263,24 +263,19 @@
 
 static XtResource resources[] = {
-  { const_cast<char *>("fontFamilyName"), const_cast<char *>("FontFamilyName"), 
-    XtRString, sizeof(String),
+  { "fontFamilyName", "FontFamilyName", XtRString, sizeof(String),
     /*XtOffset(apd, fntFam[0])*/ 0, XtRString, const_cast<char *>("*-courier") } ,
-  { const_cast<char *>("courierfontFamilyName"), const_cast<char *>("CourierfontFamilyName"), 
-    XtRString, sizeof(String),
+  { "courierfontFamilyName", "CourierfontFamilyName", XtRString, sizeof(String),
     sizeof(String) , XtRString, const_cast<char *>("*-courier") } ,
-  { const_cast<char *>("helveticafontFamilyName"), const_cast<char *>("HelveticafontFamilyName"), 
-    XtRString, sizeof(String),
+  { "helveticafontFamilyName", "HelveticafontFamilyName", XtRString, sizeof(String),
     2*sizeof(String) , XtRString, const_cast<char *>("*-helvetica") } ,
-  { const_cast<char *>("timesfontFamilyName"), const_cast<char *>("TimesfontFamilyName"), 
-    XtRString, sizeof(String),
+  { "timesfontFamilyName", "TimesfontFamilyName", XtRString, sizeof(String),
     3*sizeof(String) , XtRString, const_cast<char *>("*-times") } ,
-  { const_cast<char *>("symbolfontFamilyName"), const_cast<char *>("SymbolfontFamilyName"), 
-    XtRString, sizeof(String),
+  { "symbolfontFamilyName", "SymbolfontFamilyName", XtRString, sizeof(String),
     4*sizeof(String) , XtRString, const_cast<char *>("*-symbol") }
 };
  
-static const char * fnbi_b[4] = { "medium-r-normal", "bold-r-normal", 
+static char * fnbi_b[4] = { "medium-r-normal", "bold-r-normal", 
                           "medium-o-normal", "bold-o-normal" };
-static const char * fnbo_b[4] = { NULL, NULL, 
+static char * fnbo_b[4] = { NULL, NULL, 
                           "medium-i-normal", "bold-i-normal" };
 
@@ -294,44 +289,31 @@
   int count,k;
   Display * mdsp = PIXDisplay();
-  char **list = NULL;
+  char **list;
 
   for (k=0; k<5; k++)  {  // Recherche de la fonte pour tailles croissantes
     sprintf(buff,"-%s-%s-*-%d-*-*-*-*-*-*-*", apd.fntFam[kfn], fnbi_b[jat], fntsz[isz]+k);
     list = XListFonts(mdsp, buff, 10, &count);
+    XFreeFontNames(list);
     if ((count <= 0) && (fnbo_b[jat] != NULL)) {
-      if (list) XFreeFontNames(list);  
       sprintf(buff,"-%s-%s-*-%d-*-*-*-*-*-*-*", apd.fntFam[kfn], fnbo_b[jat], fntsz[isz]+k);
       list = XListFonts(mdsp, buff, 10, &count);
+      XFreeFontNames(list);
     }
     if (count > 0)  break;
-  }
+    }
   // certaines fontes n'ont pas de version  bold ou italique
   if ( (count == 0) && (jat > 0) ) {
     for (k=0; k<5; k++)  {  // Recherche de la fonte pour tailles croissantes
-      if (list) XFreeFontNames(list);  
       sprintf(buff,"-%s-%s-*-%d-*-*-*-*-*-*-*", apd.fntFam[kfn], fnbi_b[0], fntsz[isz]+k);
       list = XListFonts(mdsp, buff, 10, &count);
+      XFreeFontNames(list);
       if (count > 0)  break;
+      }
     }
-  }
-  if (count > 0) {
-    for (int kkk=0; kkk<count; kkk++) {
-      /*  pour debug 
-      printf("PIFontX::LoadFontSt/DBG - Call to XLoadFont(%s) \n", list[kkk]);
-      Font lfid=XLoadFont(mdsp,list[kkk]);
-      printf("PIFontX::LoadFontSt/DBG - Call to XQueryFont(FID=%ld) \n", (unsigned long)lfid); 
-      fntst[isz][jat][kfn] = XQueryFont(mdsp, lfid);   
-      printf("PIFontX::LoadFontSt/DBG - Call to XLoadQueryFont(%s) \n", list[kkk]); 
-      */
-      fntst[isz][jat][kfn] = XLoadQueryFont(mdsp, list[kkk]);
-      if (fntst[isz][jat][kfn] != NULL) break;
-    }
-    if (list) XFreeFontNames(list);  
-  }
-  else  { 
-    if (list) XFreeFontNames(list);  
-    printf("PIFontX::LoadFontSt/ Pb font %s - Using default \n", buff);    
-    fntst[isz][jat][kfn] = defnt; 
-    }
+  if (count > 0) 
+    fntst[isz][jat][kfn] = XLoadQueryFont(mdsp, buff);
+  else
+    { printf("PIFontX::LoadFontSt/ Pb font %s - Using default \n", buff);    
+    fntst[isz][jat][kfn] = defnt; }
   }
 
@@ -360,47 +342,37 @@
 XtGetApplicationResources(PIXtTopWdg(), &apd, resources, 
                           XtNumber(resources), NULL, 0);
-// printf("PIFontX::GlInit()-DBG- FontFamily = %s \n",apd.fntFam[0]);
-
 sprintf(buff,"-%s-*-*-*-*-*-*-*-*-*-*-*-*", apd.fntFam[0]);
-list = NULL;
 list = XListFonts(mdsp, buff, 15, &count);
+XFreeFontNames(list);
 if (count < 5)
   { 
   printf("PIFontX::Init %d fonts found for %s , switching to courier\n",
          count, apd.fntFam[0]);
-  apd.fntFam[0] = const_cast<char *>("*-courier");
-  if (list) XFreeFontNames(list);
+  apd.fntFam[0] = "*-courier";
   }
 sprintf(buff,"-%s-%s-*-*-*-*-12-*-*-*-*", apd.fntFam[0], fnbi_b[0]);
 list = XListFonts(mdsp, buff, 10, &count);
+XFreeFontNames(list);
 if (count < 1) {
-  if (list) XFreeFontNames(list);
   sprintf(buff,"-*-fixed-*-*-*-*-12-*-*-*-*-*-*-*");
   list = XListFonts(mdsp, buff, 10, &count);
+  XFreeFontNames(list);
   if (count < 1)   {  
-    if (list) XFreeFontNames(list);
     sprintf(buff,"fixed");
     list = XListFonts(mdsp, buff, 10, &count);
+    XFreeFontNames(list);
   }
   if (count < 1)   {  
-    if (list) XFreeFontNames(list);
     strcpy(buff,"");
     list = XListFonts(mdsp, buff, 10, &count);
+    XFreeFontNames(list);
   }
 }
 if (count < 1) {  
-  if (list) XFreeFontNames(list);
   printf("PIFontX::Init/ Erreur, no font found ... \n");
   defnt = NULL;
-  //Reza+Bruno, 17 Juin 2008 - Il faut lancer une exception 
-  }
-else { 
-  defnt = NULL;
-  for (int kkk=0; kkk<count; kkk++) {
-    defnt = XLoadQueryFont(mdsp, list[kkk]);
-    if (defnt != NULL) break;
-  }
-  if (list) XFreeFontNames(list);  
-}
+  }
+else defnt = XLoadQueryFont(mdsp, buff);
+
 for (i=0; i<NMAXFONTSZ; i++)
   for (j=0; j<NMAXFONTATT; j++)  
@@ -427,6 +399,6 @@
 // HugeFontIndex = NMAXFONTSZ-1;
 
-// printf("PIFontX::GlInit()-DBG- FontIndex= %d %d %d (SzF=%d) \n", 
-//       SmallFontIndex, NormalFontIndex, HugeFontIndex, szf);
+// printf("PIFontX::Init()-DBG- FontIndex= %d %d %d (SzF=%d) \n", 
+//       SmallFontIndex, NormalFontIndex, BigFontIndex, szf);
 
 return;
Index: /trunk/SophyaPI/PI/pigraphgen.h
===================================================================
--- /trunk/SophyaPI/PI/pigraphgen.h	(revision 4076)
+++ /trunk/SophyaPI/PI/pigraphgen.h	(revision 4077)
@@ -17,5 +17,4 @@
 
 #include "pilineatt.h"  // Class PILineAtt
-#include "pipixutils.h"  // classes utilitaires pour pixels/RGB ...
 
 
@@ -119,6 +118,6 @@
 				     bool fgline=true);
 
-  virtual void       DrawPixmap(PIGrCoord x, PIGrCoord y, PIPixColIdx & pix, 
-                                PIColorMap* cmap)                              = 0;
+  virtual void       DrawPixmap(PIGrCoord x, PIGrCoord y, unsigned char *pix, 
+                                int sx, int sy, PIColorMap* cmap)              = 0;
 
 // Modifications attributs graphiques
Index: /trunk/SophyaPI/PI/pigraphps.cc
===================================================================
--- /trunk/SophyaPI/PI/pigraphps.cc	(revision 4076)
+++ /trunk/SophyaPI/PI/pigraphps.cc	(revision 4077)
@@ -324,16 +324,11 @@
 
 /* --Methode-- */
-void PIGraphicPS::DrawPixmap(PIGrCoord x, PIGrCoord y, PIPixColIdx & pixc, PIColorMap* cmap) 
-{
-int sx = pixc.XSize();
-int sy = pixc.YSize();
+void PIGraphicPS::DrawPixmap(PIGrCoord x, PIGrCoord y, unsigned char *pix, 
+                            int sx, int sy, PIColorMap* cmap)
+{
 if ( (sx < 1) || (sy < 1) )  return;
-if (cmap == NULL) return;
-if(mPSOut) {
-  if (pixc.BytePointer()) 
-    mPSOut->Image((double)x, (double)y, (double)sx, (double)sy, sx, sy, pixc.BytePointer(), cmap);
-  else if (pixc.ShortPointer()) 
-    mPSOut->Image((double)x, (double)y, (double)sx, (double)sy, sx, sy, pixc.ShortPointer(), cmap);
-}
+if ((pix == NULL) || (cmap == NULL)) return;
+if(mPSOut) 
+  mPSOut->Image((double)x, (double)y, (double)sx, (double)sy, sx, sy, pix, cmap);
 return;
 }
Index: /trunk/SophyaPI/PI/pigraphps.h
===================================================================
--- /trunk/SophyaPI/PI/pigraphps.h	(revision 4076)
+++ /trunk/SophyaPI/PI/pigraphps.h	(revision 4077)
@@ -38,5 +38,6 @@
   virtual void       DrawMarker(PIGrCoord x0, PIGrCoord y0);
   virtual void       DrawMarkers(PIGrCoord *x, PIGrCoord *y, int n);
-  virtual void       DrawPixmap(PIGrCoord x, PIGrCoord y, PIPixColIdx & pix,  PIColorMap* cmap);
+  virtual void       DrawPixmap(PIGrCoord x, PIGrCoord y, unsigned char *pix, 
+                                int sx, int sy, PIColorMap* cmap);
 
 // Modifications attributs graphiques
Index: /trunk/SophyaPI/PI/pigraphuc.cc
===================================================================
--- /trunk/SophyaPI/PI/pigraphuc.cc	(revision 4076)
+++ /trunk/SophyaPI/PI/pigraphuc.cc	(revision 4077)
@@ -168,7 +168,5 @@
 
   UC_CheckMinMaxDiff(xmin, xmax);
-  //cerr<<" DBG-SetUCS xmax-xmin= "<<xmax-xmin<<" xmin,max="<<xmin<<","<<xmax<<endl;
   UC_CheckMinMaxDiff(ymin, ymax);
-  //cerr<<" DBG-SetUCS ymax-ymin= "<<ymax-ymin<<" ymin,max="<<ymin<<","<<ymax<<endl;
 
   if (!UC_CheckFinite(xmin, xmax) || !UC_CheckFinite(ymin, ymax)) {
@@ -731,12 +729,13 @@
 
 /* --Methode-- */
-void PIGraphicUC::DrawPixmap(PIGrCoord x, PIGrCoord y, PIPixColIdx & pix, PIColorMap* cmap)
-{
-  if (!mGrC) return;
-  if ( (pix.XSize() < 1) || (pix.YSize() < 1) )  return;
-  if (cmap == NULL) return; 
+void PIGraphicUC::DrawPixmap(PIGrCoord x, PIGrCoord y, unsigned char *pix,
+                        int sx, int sy, PIColorMap* cmap)
+{
+  if (!mGrC) return;
+  if ( (sx < 1) || (sy < 1) )  return;
+  if ((pix == NULL) || (cmap == NULL)) return; 
   double xf,yf;
   UC2GrC(x, y, xf, yf);
-  mGrC->DrawPixmap(xf, yf, pix, cmap);
+  mGrC->DrawPixmap(xf, yf, pix, sx, sy, cmap);
 }
 
Index: /trunk/SophyaPI/PI/pigraphuc.h
===================================================================
--- /trunk/SophyaPI/PI/pigraphuc.h	(revision 4076)
+++ /trunk/SophyaPI/PI/pigraphuc.h	(revision 4077)
@@ -78,5 +78,6 @@
 				     bool fgline=true);
 
-  virtual void       DrawPixmap(PIGrCoord x, PIGrCoord y, PIPixColIdx & pix, PIColorMap* cmap);
+  virtual void       DrawPixmap(PIGrCoord x, PIGrCoord y, unsigned char *pix, 
+                                int sx, int sy, PIColorMap* cmap);
 
 // Modifications attributs graphiques
Index: /trunk/SophyaPI/PI/pigraphx.cc
===================================================================
--- /trunk/SophyaPI/PI/pigraphx.cc	(revision 4076)
+++ /trunk/SophyaPI/PI/pigraphx.cc	(revision 4077)
@@ -384,5 +384,6 @@
 
 /* --Methode-- */
-void PIGraphicX::DrawPixmap(PIGrCoord x, PIGrCoord y, PIPixColIdx & pixc, PIColorMap* cmap) 
+void PIGraphicX::DrawPixmap(PIGrCoord x, PIGrCoord y, unsigned char *pix, 
+                            int sx, int sy, PIColorMap* cmap)
 {
 Window xw;
@@ -394,7 +395,6 @@
 XImage * ximg;
 
-int sx = pixc.XSize();
-int sy = pixc.YSize();
-if ((sx==0) || (sx==0) || (cmap == NULL)) return; 
+if ( (sx < 1) || (sy < 1) )  return;
+if ((pix == NULL) || (cmap == NULL)) return; 
 
   
@@ -406,5 +406,5 @@
 pad = (depth > 8) ? 32 : 8;
 ximg = XCreateImage (mdsp,DefaultVisual(mdsp,scr),
-                     depth,ZPixmap,0,NULL, sx,sy, pad,0);
+                     depth,ZPixmap,0,NULL, sx, sy, pad,0);
 if (ximg == NULL)  return;
 ximg->data = new char [sy*ximg->bytes_per_line];
@@ -412,20 +412,7 @@
   { XFree(ximg); return; }
 
-if (pixc.BytePointer()) {
-  unsigned char * pix = pixc.BytePointer();
-  for(j=0; j<sy; j++)
-    for(i=0; i<sx; i++)
-      { XPutPixel(ximg, i, j, cmap->Color(*pix) );  pix++; }
-}
-else if (pixc.ShortPointer()) {
-  unsigned short * pix = pixc.ShortPointer();
-  for(j=0; j<sy; j++)
-    for(i=0; i<sx; i++)
-      { XPutPixel(ximg, i, j, cmap->Color(*pix) );  pix++; }
-}
-else {
-  for(j=0; j<sy; j++)
-    for(i=0; i<sx; i++)  XPutPixel(ximg, i, j, 0 );  
-}
+for(j=0; j<sy; j++)
+  for(i=0; i<sx; i++)
+    { XPutPixel(ximg, i, j, cmap->Color(*pix) );  pix++; }
 
 XPutImage(mdsp, xw, DefGC(), ximg, 0, 0, (int)x, (int)y, sx, sy);
Index: /trunk/SophyaPI/PI/pigraphx.h
===================================================================
--- /trunk/SophyaPI/PI/pigraphx.h	(revision 4076)
+++ /trunk/SophyaPI/PI/pigraphx.h	(revision 4077)
@@ -38,5 +38,6 @@
   virtual void       DrawMarker(PIGrCoord x0, PIGrCoord y0);
   virtual void       DrawMarkers(PIGrCoord *x, PIGrCoord *y, int n);
-  virtual void       DrawPixmap(PIGrCoord x, PIGrCoord y,  PIPixColIdx & pix,  PIColorMap* cmap);
+  virtual void       DrawPixmap(PIGrCoord x, PIGrCoord y, unsigned char *pix, 
+                                int sx, int sy, PIColorMap* cmap);
 
 // Modifications attributs graphiques
Index: /trunk/SophyaPI/PI/piimage.cc
===================================================================
--- /trunk/SophyaPI/PI/piimage.cc	(revision 4076)
+++ /trunk/SophyaPI/PI/piimage.cc	(revision 4077)
@@ -111,6 +111,4 @@
 gvw = NULL;   // widget vue globale
 cmvw = NULL;  // widget ColorMapView
-fgshowcmap = 0;  // 0: Pas de vue ColMap, 1: top, 2:right,  3:bottom, 4:left
- cmdid = -1;
 // Fenetre transient et Label pour affichage de l'info (texte PixVal)
 int tx, ty;
@@ -130,4 +128,7 @@
 cutscw = NULL; 
 
+gpixm = zpixm = pixm = NULL;
+xsgpxm = xszpxm = xspxm = 0;
+ysgpxm = yszpxm = yspxm = 0;
 lut = NULL; 
 offx = offy = 0;
@@ -144,5 +145,5 @@
 
 mdrw = new PIElDrawer(false);
-mdrw->SetAxesFlags(kAxesNone);
+ mdrw->SetAxesFlags(kAxesNone);
 gvdrw = new PIElDrawer();
 AddDrawer(mdrw, true, false, false, false);
@@ -173,12 +174,15 @@
 PIImage::~PIImage()
 {
+if (pixm) delete pixm;
+if (zpixm) delete zpixm;
 if (zow) 
   {
-  zow->SetPixmap(NULL);
+  zow->SetPixmap(NULL,0,0);
   zow->EraseWindow();
   }
+if (gpixm) delete gpixm;
 if (gvw) 
   {
-  gvw->SetPixmap(NULL);
+  gvw->SetPixmap(NULL,0,0);
   gvw->EraseWindow();
   gvw->SetMsg(0); gvw->SetMsgParent(NULL); 
@@ -252,5 +256,7 @@
 xszpav = yszpav = 1;
 img = pim;
-gpixm.DeAlloc();
+if (gpixm) delete gpixm;
+gpixm = NULL;
+xsgpxm = ysgpxm = 0;
 zmgv = 1;
 
@@ -601,13 +607,7 @@
     // Position du centre d'image
     if (opts.substr(0,12) == "imagecenter=") {
-      /* Si on ecrit "imagecenter=34.5,55.5" ca ne marche pas CMV 29/01/2011
-      int xc = XPave(), yc = YPave();
+      int xc = XPave();  
+      int yc = YPave();
       sscanf(opts.substr(12).c_str(),"%d,%d",&xc, &yc);
-      SetPave(xc, yc, false, true);
-      */
-      int xc = XPave(), yc = YPave();
-      double ddxc = xc, ddyc = yc;
-      sscanf(opts.substr(12).c_str(),"%lf,%lf",&ddxc, &ddyc);
-      xc = int(ddxc+0.00001); yc = int(ddyc+0.00001); 
       SetPave(xc, yc, false, true);
       continue;
@@ -633,18 +633,12 @@
       double min = Lut()->Min();
       double max = Lut()->Max();
+      size_t q = opts.find(',');
+      if (q < opts.length()-1)
+	sscanf(opts.substr(q+1).c_str(),"%lg,%lg",&min, &max);
       int typlut=kLutType_Lin;      ;
       if (opts.substr(4,3) == "lin")  typlut=kLutType_Lin;
       else if (opts.substr(4,3) == "log")  typlut=kLutType_Log;
-      else if (opts.substr(4,3) == "exp")  typlut=kLutType_Exp;
       else if (opts.substr(4,4) == "sqrt")  typlut=kLutType_Sqrt;
       else if (opts.substr(4,6) == "square")  typlut=kLutType_Square;
-      else if (opts.substr(4,3) == "rgb")  { 
-        typlut=kLutType_RGB;
-        min = 0;  max = 255;
-      } 
-      size_t q = opts.find(',');
-      if (q < opts.length()-1)
-	sscanf(opts.substr(q+1).c_str(),"%lg,%lg",&min, &max);
-
       SetLut(AutoLut_No, min, max, typlut, 0, false);
       continue;
@@ -674,24 +668,9 @@
       continue;
     }
-    if (opts == "showcmap")  UpdateCMapDrawer(1);
-    else if (opts == "noshowcmap")  UpdateCMapDrawer(0);
-    else if (opts.substr(0,9) == "showcmap=") {
-      if (opts.substr(9,2) == "no")   UpdateCMapDrawer(0); 
-      else if (opts.substr(9,3) == "top")     UpdateCMapDrawer(1); 
-      else if (opts.substr(9,5) == "right")   UpdateCMapDrawer(2); 
-      else if (opts.substr(9,6) == "bottom")  UpdateCMapDrawer(3); 
-      else if (opts.substr(9,4) == "left")    UpdateCMapDrawer(4); 
-      else if (opts.substr(9,5) == "horiz")   UpdateCMapDrawer(1); 
-      else if (opts.substr(9,4) == "vert")    UpdateCMapDrawer(2); 
-      else UpdateCMapDrawer(0); 
-    }
-
     ndec--;
     udopt.push_back(opts);
   }
   // Set color map if requested
-  if(fgcmapid || revcmapid) 
-    SetColMapId(cmapid,revcmapid,false);  
-
+  if(fgcmapid || revcmapid) SetColMapId(cmapid,revcmapid,false);
   // Configure axes if requested 
   if (confaxes) ChangeAxesConfiguration(invx, invy, exchxy, false);
@@ -712,5 +691,4 @@
       SetLut(t_al, min_al, max_al, Lut()->Type(), ns_al, false);
   }
-
   return(ndec+ndec2);
 }
@@ -746,27 +724,13 @@
 {
 if (!cmp)  return;
-int ncolold = 0;
-if (cmap) ncolold = cmap->NCol();
-bool fgapp = false;
-if (refr && cmp->NCol() != ncolold) {
-  fgapp = true;  refr = false;
-}
 int cmapid = cmp->Type();
 if ( (cmapid == CMAP_GREY32) || (cmapid == CMAP_GREYINV32) || 
      (cmapid == CMAP_GREY128) || (cmapid == CMAP_GREYINV128))  mdrw->GetGraphicAtt().SetColAtt(PI_Red);
 else mdrw->GetGraphicAtt().SetColAtt(PI_Turquoise);
-if (lut) lut->SetNCol(cmp->NCol());
 PIPixmap::SetColMap(cmp, refr);
 if (refr) { xcurs =  ycurs = -1; }
 if (zow)  zow->SetColMap(cmp, refr);
-if (gvw)  { 
-    if (cmap->NCol() != ncolold) { 
-    ComputeGloVPixmap();
-    SetGloVPixmap();
-  }
-  else  gvw->SetColMap(cmp, refr);
-}
+if (gvw)  gvw->SetColMap(cmp, refr);
 if (cmvw) cmvw->SetColMap(cmap, Lut()->Min(), Lut()->Max(), refr);
-if (fgapp)  Apply();
 return;
 }
@@ -775,27 +739,11 @@
 void PIImage::SetColMapId(CMapId cmapid, bool revidx, bool refr)
 {
-int ncolold = 0;
-if (cmap) ncolold = cmap->NCol();
 if ( (cmapid == CMAP_GREY32) || (cmapid == CMAP_GREYINV32) || 
      (cmapid == CMAP_GREY128) || (cmapid == CMAP_GREYINV128))  mdrw->GetGraphicAtt().SetColAtt(PI_Red);
 else mdrw->GetGraphicAtt().SetColAtt(PI_Turquoise);
-PIPixmap::SetColMapId(cmapid, revidx, false);
-if (refr) { xcurs =  ycurs = -1; }
-bool fgapp = false;
-if (refr && cmap->NCol() != ncolold) {
-  fgapp = true;  refr = false;
-}
-if (lut) lut->SetNCol(GetColMap()->NCol());
-if (refr) Refresh();
+PIPixmap::SetColMapId(cmapid, revidx, refr);
 if (zow)  zow->SetColMapId(cmapid, revidx, refr);
-if (gvw)  { 
-    if (cmap->NCol() != ncolold) { 
-    ComputeGloVPixmap();
-    SetGloVPixmap();
-  }
-  else  gvw->SetColMapId(cmapid, revidx, refr);
-}
+if (gvw)  gvw->SetColMapId(cmapid, revidx, refr);
 if (cmvw) cmvw->SetColMapId(cmapid, revidx, Lut()->Min(), Lut()->Max(), refr);
-if (fgapp)  Apply();
 return;
 }
@@ -806,8 +754,4 @@
 {
 if (img == NULL)  return;
-if (fgshowcmap>0)  {
-  cmpd.SetColMap(GetColMap());
-  cmpd.SetBornes(*Lut());
-}
 if (mw)  {  
   ComputePixmap();
@@ -1167,14 +1111,14 @@
 ywsz = YSize();
 
-img->ComputePixmap(lut, offx, offy, zoom, xwsz, ywsz, pixm);
+pixm = img->ComputePixmap(lut, offx, offy, zoom, xwsz, ywsz, pixm, &xspxm, &yspxm);
 int xw1, yw1, xw2, yw2;
-xw1 = (xwsz-pixm.XSize())/2;
+xw1 = (xwsz-xspxm)/2;
 if (xw1 < 0) xw1 = 0;
-yw1 = (ywsz-pixm.YSize())/2;
+yw1 = (ywsz-yspxm)/2;
 if (yw1 < 0) yw1 = 0;
-xw2 = pixm.XSize()+xw1;
-yw2 = pixm.YSize()+yw1;
+xw2 = xspxm+xw1;
+yw2 = yspxm+yw1;
 SetDefaultDrawRectangle(xw1, yw1, xw2, yw2, false);
-// printf("--DBG-- ComputePixmap() %d %d $ %d %d :: %d %d , %d %d \n", xwsz, ywsz, pixm.XSize(), pixm.YSize(), xw1, yw1, xw2, yw2);
+// printf("--DBG-- ComputePixmap() %d %d $ %d %d :: %d %d , %d %d \n", xwsz, ywsz, xspxm, yspxm, xw1, yw1, xw2, yw2);
 int x1,y1, x2,y2;
 ofx = xw1;  ofy = yw1;
@@ -1187,5 +1131,5 @@
 // printf("--DBG2-- ComputePixmap() %g %g  %g %g  \n", fx1, fx2, fy1, fy2);
 xcurs = ycurs = -1;
-SetPixmap(&pixm, true, xw1, yw1); 
+SetPixmap(pixm, xspxm, yspxm, true, xw1, yw1); 
 // Refresh();
 return; 
@@ -1230,7 +1174,7 @@
 if (lofy < 0)  lofy = 0;
 
-img->ComputePixmap(lut, lofx, lofy, zm, xwsz, ywsz, zpixm);
+zpixm = img->ComputePixmap(lut, lofx, lofy, zm, xwsz, ywsz, zpixm, &xszpxm, &yszpxm);
 zow->SetColMap(cmap, false);
-zow->SetPixmap(&zpixm); 
+zow->SetPixmap(zpixm, xszpxm, yszpxm); 
 zow->SetUserData((void *)this, 0);
 // zow->Refresh();
@@ -1259,6 +1203,6 @@
 zmgv = zmx;
 if (zmx > 1)  zmx = -zmx;
-img->ComputePixmap(lut, 0, 0, zmx, xwsz, ywsz, gpixm);
-// printf("DEBUG-ComputeGloVPixmap()  %d-%d , (%d,%d) , %d-%d \n", xwsz, ywsz, zmx, zmy, gpixm.XSize(), gpixm.YSize());
+gpixm = img->ComputePixmap(lut, 0, 0, zmx, xwsz, ywsz, gpixm, &xsgpxm, &ysgpxm);
+// printf("DEBUG-ComputeGloVPixmap()  %d-%d , (%d,%d) , %d-%d \n", xwsz, ywsz, zmx, zmy, xsgpxm, ysgpxm);
 return;
 }
@@ -1271,10 +1215,10 @@
 
 int xw1, yw1, xw2, yw2;
-xw1 = (gvw->XSize()-gpixm.XSize())/2;
+xw1 = (gvw->XSize()-xsgpxm)/2;
 if (xw1 < 0) xw1 = 0;
-yw1 = (gvw->YSize()-gpixm.YSize())/2;
+yw1 = (gvw->YSize()-ysgpxm)/2;
 if (yw1 < 0) yw1 = 0;
-xw2 = gpixm.XSize()+xw1;
-yw2 = gpixm.YSize()+yw1;
+xw2 = xsgpxm+xw1;
+yw2 = ysgpxm+yw1;
 
 if (zoom > 0) zm = zmgv*zoom;
@@ -1298,5 +1242,5 @@
 gvw->AddDrawer(gvdrw, xw1, yw1, xw2, yw2, false); 
 gvw->SetColMap(cmap, false);
-gvw->SetPixmap(&gpixm, true, xw1, yw1); 
+gvw->SetPixmap(gpixm, xsgpxm, ysgpxm, true, xw1, yw1); 
 gvw->SetUserData((void *)this, 0);
 gvw->SetMsg(Msg()+626);
@@ -1404,34 +1348,4 @@
 //printf("UpdateCuts()-DBG X: %d  -> %g  , Y: %d -> %g \n", cutarrx->Size(), cutarrx->Value(0),
 //       cutarry->Size(), cutarry->Value(0));
-}
-
-/* --Methode-- */
-void PIImage::UpdateCMapDrawer(int fgshow)
-{
-  if ((fgshow<0)||(fgshow>4))  fgshow=0;
-  if (fgshow==fgshowcmap) return;
-  fgshowcmap=fgshow;
-  switch (fgshowcmap ) {
-  case 0 :
-    RemoveDrawer(cmdid); 
-    break;
-  case 1 :
-    cmpd.SetHorizontal();
-    cmdid=AddDrawer(&cmpd, 0.10, 0.02, 0.90, 0.10, true, false);
-    break;
-  case 2 :
-    cmpd.SetVertical();
-    cmdid=AddDrawer(&cmpd, 0.90, 0.1, 0.98, 0.9, true, false);
-    break;
-  case 3 :
-    cmpd.SetHorizontal();
-    cmdid=AddDrawer(&cmpd, 0.10, 0.90, 0.90, 0.98, true, false);
-    break;
-  case 4 :
-    cmpd.SetVertical();
-    cmdid=AddDrawer(&cmpd, 0.02, 0.1, 0.10, 0.9, true, false);
-    break;   
-  } 
-  if (fgshowcmap>0) cmpd.GetGraphicAtt().SetColAtt(PI_Turquoise);
 }
 
Index: /trunk/SophyaPI/PI/piimage.h
===================================================================
--- /trunk/SophyaPI/PI/piimage.h	(revision 4076)
+++ /trunk/SophyaPI/PI/piimage.h	(revision 4077)
@@ -135,5 +135,4 @@
   void SetGloVPixmap();
   void UpdateCuts();
-  void UpdateCMapDrawer(int fgshow);
 
   void DrawCursor(PIGraphic* g);
@@ -155,5 +154,6 @@
   bool winovis;   // $CHECK$ Reza A enlever si possible 17/6/96
 // Tableau des pixels principal  
-  PIPixColIdx pixm;
+  unsigned char * pixm;
+  int xspxm, yspxm;
   LUT * lut;
   AutoLutType t_al;   // Si AutoLut et le type lors du dernier appel a SetLut()
@@ -164,15 +164,14 @@
   int zoom;
   PIPixmap * zow;
-  PIPixColIdx zpixm;
-// Fenetre pour vue globale de l'image   
+  unsigned char * zpixm;
+  int xszpxm, yszpxm;
+// Fenetre pour l'image entiere  
   int zmgv;
   PIPixmap * gvw;
-  PIPixColIdx gpixm;
+  unsigned char * gpixm;
+  int xsgpxm, ysgpxm;
   PIElDrawer* gvdrw;
 // Fenetre d'affichage du ColMap
   PICMapView* cmvw;
-  int fgshowcmap;  // 0: Pas de vue ColMap, 1: top, 2:right, 3:bottom, 4:left
-  PICMapDrawer cmpd;
-  int cmdid;
 // Fenetre/champ de texte
   PILabel * trtlb;
Index: /trunk/SophyaPI/PI/piimgtools.cc
===================================================================
--- /trunk/SophyaPI/PI/piimgtools.cc	(revision 4076)
+++ /trunk/SophyaPI/PI/piimgtools.cc	(revision 4077)
@@ -99,9 +99,7 @@
 mOpt[0] = new PIOptMenu(this, "imglut-opt-1", 1.5*bsx, bsy, cpx, cpy);
 mOpt[0]->AppendItem("Linear", 1100);
-mOpt[0]->AppendItem("Log", 1101);
-mOpt[0]->AppendItem("Exp", 1102);
-mOpt[0]->AppendItem("Sqrt", 1103);
-mOpt[0]->AppendItem("Square", 1104);
-mOpt[0]->AppendItem("RGB", 1105);
+mOpt[0]->AppendItem("Log.", 1101);
+mOpt[0]->AppendItem("Sqrt", 1102);
+mOpt[0]->AppendItem("Square", 1103);
 mOpt[0]->SetValue(1100);
 mOpt[0]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
@@ -176,7 +174,6 @@
 mCasc[1] = new PIMenu(mOptzc[0]->Menu(), "PIUniCol32");
 mCasc[2] = new PIMenu(mOptzc[0]->Menu(), "MIDAS-CMap");
-mCasc[3] = new PIMenu(mOptzc[0]->Menu(), "RGB-CMap");
-
-int nsct1,nsct2,nsct3,nsct4,nsct5;
+
+int nsct1,nsct2,nsct3,nsct4;
 //  D'abord les tables standard de PI  32 couleurs
 nsct1 = 5;   // Les 5 premieres tables
@@ -193,16 +190,12 @@
 mOptzc[0]->AppendPDMenu(mCasc[1]);
 //  Apres les tables importees de MIDAS
-nsct4 = PIColorMap::NumberStandardColorMaps()-6; // Les reste jusqu'a l'avant derniere
+nsct4 = PIColorMap::NumberStandardColorMaps()-2; // Les reste jusqu'a l'avant derniere
 for(kcc=nsct3; kcc<nsct4; kcc++) 
   mCasc[2]->AppendItem(PIColorMap::GetStandardColorMapName(kcc).c_str(), 201+kcc);
 mOptzc[0]->AppendPDMenu(mCasc[2]);
-nsct5 = PIColorMap::NumberStandardColorMaps()-4; // Les reste jusqu'aux tables RGB
-for(kcc=nsct4; kcc<nsct5; kcc++) 
-  mOptzc[0]->AppendItem(PIColorMap::GetStandardColorMapName(kcc).c_str(), 201+kcc);
-// Les tables de couleur RGB  ( RGB216, RGB512 , ... )
-for(kcc=nsct5; kcc<PIColorMap::NumberStandardColorMaps(); kcc++) 
-  mCasc[3]->AppendItem(PIColorMap::GetStandardColorMapName(kcc).c_str(), 201+kcc);
-mOptzc[0]->AppendPDMenu(mCasc[3]);
-  // On ajoute un CheckItem pour inverser les index de table de couleur
+// Les tables qui restent ( Col16 , ... )
+for(kcc=nsct4; kcc<PIColorMap::NumberStandardColorMaps(); kcc++) 
+mOptzc[0]->AppendItem(PIColorMap::GetStandardColorMapName(kcc).c_str(), 201+kcc);
+// On ajoute un CheckItem pour inverser les index de table de couleur
 mOptzc[0]->Menu()->AppendSeparator();
 mOptzc[0]->Menu()->AppendCheckItem("Reverse CMap", 299);
@@ -317,5 +310,5 @@
 for(i=0; i<3; i++)  delete mBut[i];
 delete mButR;
-for(i=0; i<4; i++)  delete mCasc[i];
+for(i=0; i<2; i++)  delete mCasc[i];
 for(i=0; i<5; i++)  delete mButsz[i];
 for(i=0; i<3; i++)  delete mButcax[i];
@@ -378,8 +371,6 @@
   if     ( (mpii->Lut())->Type() == kLutType_Lin )    mOpt[0]->SetValue(1100);
   else if( (mpii->Lut())->Type() == kLutType_Log )    mOpt[0]->SetValue(1101);
-  else if( (mpii->Lut())->Type() == kLutType_Exp )    mOpt[0]->SetValue(1102);
-  else if( (mpii->Lut())->Type() == kLutType_Sqrt )   mOpt[0]->SetValue(1103);
-  else if( (mpii->Lut())->Type() == kLutType_Square ) mOpt[0]->SetValue(1104);
-  else if( (mpii->Lut())->Type() == kLutType_RGB )    mOpt[0]->SetValue(1105);
+  else if( (mpii->Lut())->Type() == kLutType_Sqrt )   mOpt[0]->SetValue(1102);
+  else if( (mpii->Lut())->Type() == kLutType_Square ) mOpt[0]->SetValue(1103);
   else                                                mOpt[0]->SetValue(1100);
 }
@@ -397,5 +388,5 @@
 double min, max, del;
 int lauto, typ;
-int typlut[6] = {kLutType_Lin, kLutType_Log,  kLutType_Exp, kLutType_Sqrt, kLutType_Square, kLutType_RGB } ; 
+int typlut[4] = {kLutType_Lin, kLutType_Log, kLutType_Sqrt, kLutType_Square} ; 
 AutoLutType alts[13] = { AutoLut_No, 
 			 AutoLut_MeanSigma, AutoLut_MeanSigma, AutoLut_MeanSigma,
@@ -455,5 +446,5 @@
     if ((lauto < 0) || (lauto > 12))  lauto = 12;
     typ = mOpt[0]->GetValue() - 1100;
-    if ( (typ < 0) || (typ > 5) )  typ = 0;
+    if ( (typ < 0) || (typ > 3) )  typ = 0;
     (PIImage::CurrentPIImage())->SetLut(alts[lauto], min, max, typlut[typ], nsas[lauto]);
     if (msg == 2500) { 
Index: /trunk/SophyaPI/PI/pilistx.cc
===================================================================
--- /trunk/SophyaPI/PI/pilistx.cc	(revision 4076)
+++ /trunk/SophyaPI/PI/pilistx.cc	(revision 4077)
@@ -116,5 +116,9 @@
 mNItem++;
 
-XmString xms = XmStringCreate(const_cast<char*>(item), const_cast<char*>(XmSTRING_DEFAULT_CHARSET));
+#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
 XmListAddItem(mlist, xms, 0);
 XmStringFree(xms);
Index: /trunk/SophyaPI/PI/pimenux.cc
===================================================================
--- /trunk/SophyaPI/PI/pimenux.cc	(revision 4076)
+++ /trunk/SophyaPI/PI/pimenux.cc	(revision 4077)
@@ -386,5 +386,5 @@
   n=0;
   sprintf(acc,"Ctrl/%c", sc[0]);
-  xmstr = XmStringLtoRCreate(acc, const_cast<char*>(XmSTRING_DEFAULT_CHARSET));
+  xmstr = XmStringLtoRCreate(acc, XmSTRING_DEFAULT_CHARSET);
   XtSetArg(warg[n], XmNacceleratorText, xmstr); n++;
   sprintf(acc,"Ctrl<Key>%c", sc[0]);
Index: /trunk/SophyaPI/PI/pipixmapgen.cc
===================================================================
--- /trunk/SophyaPI/PI/pipixmapgen.cc	(revision 4076)
+++ /trunk/SophyaPI/PI/pipixmapgen.cc	(revision 4077)
@@ -8,5 +8,4 @@
 #include "sopnamsp.h"
 #include "pipixmapgen.h"
-
 
 // --------- Methodes de la classe PIPixMap  ----------
@@ -44,6 +43,7 @@
 // long  kind() 
 //	Retourne le type ("=PIPixmap::ClassId")
-// void  SetPixmap(PIPixColIdx *pixidx, int sx, int sy, bool refr=true, int ox=0, int oy=0)
-//	Associe un tableau d'index de couleur "pixidx". (ox,oy)" définissent  l'offset d'affichage.
+// void  SetPixmap(unsigned char *pix, int sx, int sy, bool refr=true, int ox=0, int oy=0)
+//	Associe un tableau d'index "pix" de taille "sx * sy".
+//	(ox,oy)" définissent  l'offset d'affichage.
 //	Si "refr=true", la méthode "Refresh()" est appelée.
 //--
@@ -87,5 +87,5 @@
 {
 pixmap = NULL;
-fgownpmap = false;
+nx = ny = 0;
 ofx = ofy = 0;
 mPpos[0] = mPpos[0] = 0;
@@ -99,41 +99,21 @@
 {
 delete cmap;
-if (fgownpmap && pixmap) delete pixmap;
 }
 
 /* --Methode-- */
-void PIPixmapGen::SetPixmap(PIPixColIdx *pixidx, bool refr, int ox, int oy)
+void PIPixmapGen::SetPixmap(unsigned char *pix, int sx, int sy, bool refr, int ox, int oy)
 {
-if (fgownpmap && pixmap) delete pixmap;
-fgownpmap = false;
-pixmap = pixidx; 
-if (ox < 0)  ox = 0;
-if (oy < 0)  oy = 0;
-ofx = ox;  ofy = oy;
+pixmap = pix; 
+if (pixmap)
+  {
+  if (sx < 0)  sx = 0;
+  if (sy < 0)  sy = 0;
+  if (ox < 0)  ox = 0;
+  if (oy < 0)  oy = 0;
+  nx = sx; ny = sy;
+  ofx = ox;  ofy = oy;
+  }
+else { ofx = ofy = nx = ny = 0; }
 if (refr) Refresh();   
-}
-
-/* --Methode-- */
-void PIPixmapGen::SetRGBArray(PIPixRGBArray *rgba, CMapId cmapid, bool refr, int ox, int oy)
-{
-if (rgba == NULL) return;
-int quantum = 8;
-if (cmapid == CMAP_RGB216)  quantum = 6;
-else if (cmapid == CMAP_RGB4096) quantum = 16;
-else cmapid = CMAP_RGB512;
-SetColMapId(cmapid, false);
-PIPixColIdx * pixc = new PIPixColIdx;
-pixc->AllocateByte(rgba->XSize(), rgba->YSize());
-for(int j=0; j<rgba->YSize(); j++) 
-  for(int i=0; i<rgba->XSize(); i++) {
-  	PIPixRGB vv = (*rgba)(i,j);
-  	int r = (int)vv.red*quantum/256;
-  	int g = (int)vv.green*quantum/256;
-  	int b = (int)vv.blue*quantum/256;
-    pixc->GetShort(i,j) = (unsigned short)((b*quantum+g)*quantum+r);
-  }
-SetPixmap(pixc, refr, ox, oy);
-fgownpmap = true;
-return;  
 }
 
Index: /trunk/SophyaPI/PI/pipixmapgen.h
===================================================================
--- /trunk/SophyaPI/PI/pipixmapgen.h	(revision 4076)
+++ /trunk/SophyaPI/PI/pipixmapgen.h	(revision 4077)
@@ -9,8 +9,5 @@
 #include PICMAP_H
 
-#include "pipixutils.h"
-
 #include <list>
-
 
 class PIPixmapGen : public PIBaseWdg
@@ -25,7 +22,6 @@
   virtual long  kind() {return ClassId; }
 
-  virtual void  SetPixmap(PIPixColIdx *pixidx, bool refr=true, int ox=0, int oy=0);
-  virtual void  SetRGBArray(PIPixRGBArray *rgba, CMapId cmapid=CMAP_RGB512, 
-                            bool refr=true, int ox=0, int oy=0);
+  virtual void  SetPixmap(unsigned char *pix, int sx, int sy, 
+                          bool refr=true, int ox=0, int oy=0);
 
   virtual void  SetColMap(PIColorMap* cmp, bool refr=true);
@@ -43,7 +39,7 @@
 
 protected:
-  PIPixColIdx *pixmap;   // Pointeur d'objet PIPixCoIdx, tableau d'index de couleurs, peut etre NULL
-  bool fgownpmap;  // si true -> possede le pixmap et doit le deleter si besoin
-  int ofx, ofy;       // Offset d'affichage 
+  unsigned char *pixmap;
+  int nx, ny;
+  int ofx, ofy;
   PIColorMap* cmap;
 
Index: /trunk/SophyaPI/PI/pipixmapx.cc
===================================================================
--- /trunk/SophyaPI/PI/pipixmapx.cc	(revision 4076)
+++ /trunk/SophyaPI/PI/pipixmapx.cc	(revision 4077)
@@ -7,7 +7,4 @@
 #include "sopnamsp.h"
 #include "pipixmapx.h"
-#include <iostream>
-
-using namespace std;
 
 static  GC    mygc;
@@ -34,37 +31,20 @@
 {
 int i,j;
-int nx = 0;
-int ny = 0;
-if (pixmap!=NULL) {
-  nx = pixmap->XSize();
-  if (nx > XSize())  nx = XSize();
-  ny = pixmap->YSize();
-  if (ny > YSize())  ny = YSize();
-  if (pixmap->BytePointer()!=NULL) {
-    unsigned char *pp = pixmap->BytePointer();
-    for(j=0; j<ny; j++) {
-      pp = pixmap->BytePointer()+j*pixmap->XSize();
-      for(i=0; i<nx; i++)
-        { XPutPixel(myximg, i, j, cmap->Color(*pp) );  pp++; }
-      }
-  }
-  else if (pixmap->ShortPointer()!=NULL) {
-    unsigned short *pp = pixmap->ShortPointer();
-    for(j=0; j<ny; j++) {
-      pp = pixmap->ShortPointer()+j*pixmap->XSize();
-      for(i=0; i<nx; i++)  
-        { XPutPixel(myximg, i, j, cmap->Color(*pp) );  pp++; }
+unsigned char *pp;
+
+if (pixmap)
+  {
+  for(j=0; j<ny; j++)
+    {
+    pp = pixmap+j*nx;
+    for(i=0; i<nx; i++)
+      { XPutPixel(myximg, i, j, cmap->Color(*pp) );  pp++; }
     }
   }
-}
-/* ----- On peut laisser le reste - ce n'est pas utilise dans le Draw
-// On remplit le restant 
-for(j=0; j<YSize(); j++)
+
+for(j=ny; j<YSize(); j++)
   for(i=nx; i<XSize(); i++)
-       XPutPixel(myximg, i, j, 0 );
-for(j=ny; j<YSize(); j++)
-  for(i=0; i<XSize(); i++)
      XPutPixel(myximg, i, j, 0 );
-------- */
+
 PIBaseWdgX::Refresh();
 }
@@ -86,5 +66,5 @@
 if (!g) return; 
 if (g->kind() == PI_PSFileGraphics ) {
-    g->DrawPixmap(ofx, ofy, pixmap, cmap);
+    g->DrawPixmap(ofx, ofy, pixmap, nx, ny, cmap);
     //  Il faut faire quelque chose Sinon ??! 
   }
@@ -98,18 +78,13 @@
 
 if (!g) return; 
+if ((myximg == NULL) || (cmap == NULL)) return;
 
 if (g->kind() == PI_PSFileGraphics ) {
-  g->DrawPixmap(ofx, ofy, (*pixmap), cmap);
+  if (pixmap) g->DrawPixmap(ofx, ofy, pixmap, nx, ny, cmap);
   return;
   }
-  
 
 Window xw = XtWindow(XtWdg());
 Display * mdsp = PIXDisplay();
-
-if ((myximg == NULL) || (cmap == NULL) || (pixmap == NULL) ||
-    (pixmap->XSize()<=0) || (pixmap->YSize()<=0) ) {
-  XClearArea(mdsp, xw, x0, y0, dx, dy, False);  return; 
-}
 
 int mx, my, ox, oy;
@@ -117,7 +92,5 @@
 if (x0 < 0)  x0 = 0;
 if (y0 < 0)  y0 = 0;
-
-mx = pixmap->XSize()+ofx;   my = pixmap->YSize()+ofy;
-
+mx = nx+ofx;   my = ny+ofy;
 if (dx > (XSize()-x0)) dx = XSize()-x0;
 if (dy > (YSize()-y0)) dy = YSize()-y0;
@@ -128,4 +101,5 @@
 
 ox = oy = 0;  
+
 if (ofx > x0)
   { XClearArea(mdsp, xw, x0, y0, ofx-x0, dy, False);   
@@ -141,26 +115,5 @@
 if (my < (y0+dy))
   { XClearArea(mdsp, xw, x0, my, dx, y0+dy-my, False);  dy = my-y0; }
-
-/*
-if (ofx > x0)
-  XClearArea(mdsp, xw, x0, y0, ofx-x0, dy, False);   
-if (ofy > y0)
-  XClearArea(mdsp, xw, x0, y0, dx, ofy-y0, False);  
  
-if (mx < (x0+dx))
-  XClearArea(mdsp, xw, mx, y0, x0+dx-mx, dy, False); 
-if (my < (y0+dy))
-  XClearArea(mdsp, xw, x0, my, dx, y0+dy-my, False);  
-
-if (ofx > x0)
-  { dx -= (ofx-x0);  x0 = ofx;  ox = 0; }
-else  ox = x0-ofx;
-if (ofy > y0)
-  { dy -= (ofy-y0);  y0 = ofy;  oy = 0; }
-else  oy = y0-ofy;
-if (mx < (x0+dx))  dx = mx-x0;
-if (my < (y0+dy))  dy = my-y0;
-*/
-  
 XPutImage(mdsp, xw, mygc, myximg, ox, oy, x0, y0, dx, dy);
 XFlush(mdsp);
Index: /trunk/SophyaPI/PI/piscdrawwdg.cc
===================================================================
--- /trunk/SophyaPI/PI/piscdrawwdg.cc	(revision 4076)
+++ /trunk/SophyaPI/PI/piscdrawwdg.cc	(revision 4077)
@@ -13,5 +13,7 @@
 #include "piaxestools.h"
 
-#include "ucckprot.h"
+#define PETIT_DBLE 1.e-100
+#define PREC_DBLE  1.e-16
+
 
 //++
@@ -178,6 +180,13 @@
                        int axrl, int ayud, bool tmp)
 {
-  UC_CheckMinMaxDiff(xmin,xmax);
-  UC_CheckMinMaxDiff(ymin,ymax);
+//  if (xmax <= xmin || ymax <= ymin) {
+//    cerr << "PIScDrawWdg::SetLimits() Error - xmax <= xmin or ymax <= ymin !" << endl;
+//    return; 
+//    }
+  double xym;
+  xym = fabs(xmax+xmin); xym = (xym > PETIT_DBLE) ? xym : PETIT_DBLE;
+  if ((xmax-xmin)/xym < PREC_DBLE) { xmin = xmin - PREC_DBLE/2.*xym;  xmax = xmin + PREC_DBLE*xym; }
+  xym = fabs(ymax+ymin); xym = (xym > PETIT_DBLE) ? xym : PETIT_DBLE;
+  if ((ymax-ymin)/xym < PREC_DBLE) { ymin = ymin - PREC_DBLE/2.*xym;  ymax = ymin + PREC_DBLE*xym; }
 
   SetDefaultDrawerLimits(xmin, xmax, ymin, ymax, axrl, ayud);
@@ -239,18 +248,4 @@
   bool fglogy = isLogScaleY();
 
-  // Flag declenchant SetLimits
-  bool fgsaxel = false;
-  // Limites et sens d'axe
-  double xmin = XMin();
-  double ymin = YMin();
-  double xmax = XMax();
-  double ymax = YMax();
-  int axrl = kAxeDirLtoR;
-  int ayud = kAxeDirDownUp;
-  int xac, yac;
-  GetAxesConfig(xac, yac);
-  if (xac & kAxeDirRtoL) axrl = kAxeDirRtoL;
-  if (yac & kAxeDirUpDown) ayud = kAxeDirUpDown;
-
   for( k=0; k<opt.size(); k++ ) {
     string opts = opt[k];
@@ -264,6 +259,10 @@
     // Limites en x,y
     if (opts.substr(0,9) == "xylimits=") {
+      double xmin = XMin();
+      double ymin = YMin();
+      double xmax = XMax();
+      double ymax = YMax();
       sscanf(opts.substr(9).c_str(),"%lg,%lg,%lg,%lg",&xmin, &xmax,&ymin,&ymax);
-      fgsaxel = true;
+      SetLimits(xmin, xmax, ymin, ymax);
       continue;
     }
@@ -293,22 +292,6 @@
       continue;
     }
-    if ((opts == "revax") || (opts == "axerl") ) {
-      fgsaxel = true;  axrl = kAxeDirRtoL;
-      continue;
-    }
-    if ((opts == "revay") || (opts == "axeud") ) {
-      fgsaxel = true;  ayud = kAxeDirUpDown;
-      continue;
-    }
-    if (opts == "axelr") {
-      fgsaxel = true;  axrl = kAxeDirLtoR;
-      continue;
-    }
-    if (opts == "axedu") {
-      fgsaxel = true;  ayud = kAxeDirDownUp;
-      continue;
-    }
-
-// Les autres attributs d'axes (stdaxes boxaxesgrid ...) sont decodes par PIElDrawer
+
+// Les attributs d'axes (stdaxes boxaxesgrid ...) sont decodes par PIElDrawer
 
     ndec--;
@@ -316,5 +299,4 @@
   }  
 
-  if (fgsaxel)  SetLimits(xmin, xmax, ymin, ymax, axrl, ayud);
   if (fglinlog) SetLogScale(fglogx, fglogy);
 
Index: /trunk/SophyaPI/PI/pistdwdgx.cc
===================================================================
--- /trunk/SophyaPI/PI/pistdwdgx.cc	(revision 4076)
+++ /trunk/SophyaPI/PI/pistdwdgx.cc	(revision 4077)
@@ -51,5 +51,5 @@
 {
 XmString xmstr;
-xmstr = XmStringLtoRCreate(const_cast<char*>(lab.c_str()), const_cast<char*>(XmSTRING_DEFAULT_CHARSET));
+xmstr = XmStringLtoRCreate((char *)lab.c_str(), XmSTRING_DEFAULT_CHARSET);
 int n=0;
 Arg warg[2];
@@ -149,5 +149,5 @@
 {
 XmString xmstr;
-xmstr = XmStringLtoRCreate(const_cast<char*>(lab.c_str()), const_cast<char*>(XmSTRING_DEFAULT_CHARSET));
+xmstr = XmStringLtoRCreate((char *)lab.c_str(), XmSTRING_DEFAULT_CHARSET);
 int n=0;
 Arg warg[2];
Index: /trunk/SophyaPI/PI/pitherm.cc
===================================================================
--- /trunk/SophyaPI/PI/pitherm.cc	(revision 4076)
+++ /trunk/SophyaPI/PI/pitherm.cc	(revision 4077)
@@ -24,5 +24,5 @@
 //--
 //++
-//  PIThermometer(PIContainerGen *par, const char *nom, int sx=256, int sy=10, int px=0, int py=0)
+//  PIThermometer(PIContainerGen *par, 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,5 +31,5 @@
 
 /* --Methode-- */
-PIThermometer::PIThermometer(PIContainerGen *par, const char *nom,
+PIThermometer::PIThermometer(PIContainerGen *par, char *nom,
                        int sx, int sy, int px, int py) 
 : PIBaseWdg(par, nom, sx, sy, px, py)
@@ -139,5 +139,4 @@
 void PIThermometer::Draw(PIGraphicGen* g, int /*x0*/, int /*y0*/, int /*dx*/, int /*dy*/)
 {
-  if (!IsVisible())  return;
   double delta = (max_-min_);
   if (delta < 1.e-39) delta = 1.e-39;
Index: /trunk/SophyaPI/PI/pitherm.h
===================================================================
--- /trunk/SophyaPI/PI/pitherm.h	(revision 4076)
+++ /trunk/SophyaPI/PI/pitherm.h	(revision 4077)
@@ -16,5 +16,5 @@
   enum {ClassId = 5220};
 
-                  PIThermometer(PIContainerGen *par, const char *nom,
+                  PIThermometer(PIContainerGen *par, char *nom,
                                 int sx=256, int sy=10, int px=0, int py=0);
   virtual         ~PIThermometer();
Index: /trunk/SophyaPI/PI/piversion.h
===================================================================
--- /trunk/SophyaPI/PI/piversion.h	(revision 4076)
+++ /trunk/SophyaPI/PI/piversion.h	(revision 4077)
@@ -2,5 +2,5 @@
 #define PIVERSION_H_SEEN
 
-#define PI_VERSIONNUMBER  4.40
+#define PI_VERSIONNUMBER  4.11
 
 #endif
Index: /trunk/SophyaPI/PI/piwdggen.cc
===================================================================
--- /trunk/SophyaPI/PI/piwdggen.cc	(revision 4076)
+++ /trunk/SophyaPI/PI/piwdggen.cc	(revision 4077)
@@ -57,4 +57,7 @@
 //--
 //++
+// void  PSPrint(PSFile *psf, int ofx=0, int ofy=0)
+//	Méthode virtuelle qui doit être redéfinie pour chacune des classes filles.
+//	produit une représentation graphique de l'objet en Postscript.
 // SetSize(int sx, int sy)
 //	Modifie la taille de l'objet.
@@ -178,16 +181,4 @@
 // int  UserFlag()
 //	Renvoie la valeur "int" user de l'objet.
-//--
-
-//++
-// Titre	Export postscript et format RGB
-//--
-//++
-// void  PSPrint(PSFile *psf, int ofx=0, int ofy=0)
-//	Méthode virtuelle qui doit être redéfinie pour chacune des classes filles.
-//	produit une représentation graphique de l'objet en Postscript.
-// void  ExportToRGB(PIPixRGBArray & rgba)
-//	Méthode virtuelle qui doit être redéfinie pour chaque architecture.
-//	Remplit un tableau PIPixRGBArray le contenu pixels du widget en couleurs RGB. 
 //--
 
@@ -318,10 +309,4 @@
 }
 
-/* --Methode-- */
-void PIWdgGen::ExportToRGB(PIPixRGBArray & rgba)
-{
-return;
-}
-
 //++
 // Titre	Gestion des Draw/Event Handler
Index: /trunk/SophyaPI/PI/piwdggen.h
===================================================================
--- /trunk/SophyaPI/PI/piwdggen.h	(revision 4076)
+++ /trunk/SophyaPI/PI/piwdggen.h	(revision 4077)
@@ -10,5 +10,4 @@
 #include "pimsghandler.h"
 #include "picolist.h"
-#include "pipixutils.h"
 
 #include <string>
@@ -108,10 +107,6 @@
   virtual bool           IfSensitive()=0;
 
-//  Pour exporter le contenu d'un widget (dessin vectoriel) en postscript
   virtual void           PSPrint(PSFile *psf, int ofx=0, int ofy=0,
 				 double scale_x=1., double scale_y=1.);
-// Pour exporter le tableau des pixels du widget en classe  PIPixRGBArray
-// L'implementation par defaut ne fait rien 
-  virtual void           ExportToRGB(PIPixRGBArray & rgba);
 
 //  Gestion de copier-coller
Index: /trunk/SophyaPI/PI/piwdgx.cc
===================================================================
--- /trunk/SophyaPI/PI/piwdgx.cc	(revision 4076)
+++ /trunk/SophyaPI/PI/piwdgx.cc	(revision 4077)
@@ -20,5 +20,9 @@
 #include "pigraphx.h"
 
+#ifdef SANS_EVOLPLANCK
+#include "perrors.h"
+#else
 #include "pexceptions.h"
+#endif
 
 
@@ -623,30 +627,30 @@
 // Ressources X si non definis 
 static const String fallback_res[26] = {
-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"),
+"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",
 NULL
 };
@@ -677,10 +681,18 @@
 if (top == NULL) {
   fprintf(stderr, "PIWdgX::InitXt()/ Error XtVaAppInitialize()\n");
-  throw PError("PIWdgX::InitXt()/ Error XtVaAppInitialize()");
+#ifdef SANS_EVOLPLANCK
+  throw notFoundErr;
+#else
+  throw NotFoundExc("PIWdgX::InitXt()/ Error XtVaAppInitialize()");
+#endif
   }
 dpy = XtDisplay(top);
 if (dpy == NULL)  {
   fprintf(stderr, "PIWdgX::InitXt()/ Error XtVaAppInitialize()/DisplayConnection\n");
-  throw PError("PIWdgX::InitXt()/ Error XtVaAppInitialize()/DisplayConnection");
+#ifdef SANS_EVOLPLANCK
+  throw notFoundErr;
+#else
+  throw NotFoundExc("PIWdgX::InitXt()/ Error XtVaAppInitialize()/DisplayConnection");
+#endif
   }
 
@@ -722,5 +734,5 @@
   }
 stdfnt = XLoadQueryFont(dpy, buff);
-const char * myfntname = "???";
+char * myfntname = "???";
 // Recherche du champ taille en pixel de la fonte : apres le 7eme tiret
 int mySzFont = 12;
@@ -819,56 +831,4 @@
 }
 
-
-// Pour exporter le tableau des pixels du widget en classe  PIPixRGBArray
-inline void _col2_fcol_(unsigned long & col, unsigned long & fcol)
-{
-  if (col > 0x00FFFFFF)  fcol = 0x01000000;
-  else if  (col > 0x0000FFFF)  fcol = 0x000010000;
-  else if (col > 0x000000FF) fcol = 0x00000100;
-  else fcol = 1;  
-}   
-/* --Methode-- */
-void PIWdgX::ExportToRGB(PIPixRGBArray & rgba)
-{
-Display* mdsp = PIXDisplay();
-int scr = XDefaultScreen(mdsp);
-int depth = DefaultDepth(mdsp,scr);
-Window xw = XtWindow(XtWdg());
-unsigned long plane_mask = ~0;  // tous les bits a 1
-XImage * ximg = XGetImage(mdsp, xw, 0, 0, XSize(), YSize(), plane_mask, ZPixmap);
-//DBG  cout << " Resultat XGetImage -> " << hex << ximg << dec << endl;
-if (ximg == NULL)  return;	
-                            
-unsigned long red,green,blue;
-unsigned long fred,fgreen,fblue;
-XColor col;
-Colormap  cmap = XDefaultColormap (mdsp, scr);
-red = 0x000000FF; 
-green = 0x0000FF00;
-blue = 0x00FF0000;
-unsigned short maxrgb = ~0;
-col.red = maxrgb;  col.green = col.blue = 0;
-if (XAllocColor(mdsp, cmap, &col)) red = col.pixel; 
-col.green = maxrgb;  col.red = col.blue = 0;
-if (XAllocColor(mdsp, cmap, &col)) green = col.pixel;      
-col.blue = maxrgb;  col.red = col.green = 0;
-if (XAllocColor(mdsp, cmap, &col)) blue = col.pixel;      
-_col2_fcol_(red, fred);
-_col2_fcol_(green, fgreen);
-_col2_fcol_(blue, fblue);
-rgba.SetSize(XSize(), YSize());
-unsigned long pixel;
-PIPixRGB rgb;
-for(int j=0; j<YSize(); j++)
-  for(int i=0; i<XSize(); i++) {
-    pixel = XGetPixel(ximg, i, j);
-    rgb.red = (pixel&red)/fred;
-    rgb.green = (pixel&green)/fgreen;
-    rgb.blue = (pixel&blue)/fblue;
-    rgba(i,j) = rgb;
-  }
-  XDestroyImage(ximg);
-  return;  
-}
 
 
Index: /trunk/SophyaPI/PI/piwdgx.h
===================================================================
--- /trunk/SophyaPI/PI/piwdgx.h	(revision 4076)
+++ /trunk/SophyaPI/PI/piwdgx.h	(revision 4077)
@@ -63,7 +63,4 @@
   virtual void           SetUnSensitive();
   virtual bool           IfSensitive();
-
-// Pour exporter le tableau des pixels du widget en classe  PIPixRGBArray
-  virtual void           ExportToRGB(PIPixRGBArray & rgba);
 
 //  Gestion de copier-coller
Index: /trunk/SophyaPI/PI/piwindowgen.h
===================================================================
--- /trunk/SophyaPI/PI/piwindowgen.h	(revision 4076)
+++ /trunk/SophyaPI/PI/piwindowgen.h	(revision 4077)
@@ -22,6 +22,6 @@
   virtual long      kind() {return ClassId; }
 
-  virtual void      PSPrint(PSFile *psf, int ofx=0, int ofy=0,
-			    double scale_x=1., double scale_y=1.);
+   virtual void      PSPrint(PSFile *psf, int ofx=0, int ofy=0,
+ 			    double scale_x=1., double scale_y=1.);
 
   inline  void      AutoHideOnClose(bool ahc=true) { mAHC = ahc; }
Index: /trunk/SophyaPI/PI/piwindowx.cc
===================================================================
--- /trunk/SophyaPI/PI/piwindowx.cc	(revision 4076)
+++ /trunk/SophyaPI/PI/piwindowx.cc	(revision 4077)
@@ -152,9 +152,7 @@
 //if (mWtyp == PIWK_transient)  
   XRaiseWindow(mdsp, XtWindow(pwm->XtWdg()));
-  // cmv+rz Fevrier 2009 (retour Moriond) - Suppression de XFlush() / usleep  
-  // Probleme regle par gestion VisibilityChange event ds pixtbase.cc
   // cmv+rz 09/08/2007 Ajout XFlush() + usleep 
   // pour regler le probleme de  perte d'evenement expose a la creation
-  //  XFlush(mdsp);   usleep(5000);
+  XFlush(mdsp);   usleep(5000);
 return;
 }
Index: /trunk/SophyaPI/PI/pixtbase.cc
===================================================================
--- /trunk/SophyaPI/PI/pixtbase.cc	(revision 4076)
+++ /trunk/SophyaPI/PI/pixtbase.cc	(revision 4077)
@@ -46,5 +46,5 @@
 
 static XtResource resources[] ={
-  {const_cast<char*>(PIXNobject) ,const_cast<char*>("Object"), XtRPointer, sizeof(XtRPointer),
+  {PIXNobject ,(char *)"Object", XtRPointer, sizeof(XtRPointer),
    XtOffset(PIXtBaseWidget,  pixtbase.objet), XtRImmediate, (XtPointer)0},
 };
@@ -143,24 +143,4 @@
 }
 
-// Pour traiter les etats de changements de visibilite de la fenetre
-/* Nouvelle-Fonction */
-void visibchange_handler_pixtbase (Widget wdgp, XtPointer /*closure*/, 
-                             XEvent* evt, Boolean* cont)
-{
-#ifdef DEBUG_PIXTB
-printf("Debug_visibchange_handler_pixtbase: Wdg= %lx Object= %lx  fgvis_expose= %d (EvtType=%d VisSt=%d)\n", 
-  (long)wdgp, (long)(((PIXtBaseWidget)wdgp)->pixtbase.objet),
-  ((PIXtBaseWidget)wdgp)->pixtbase.vis_expose_fg, (int)evt->type,(int)evt->xvisibility.state);
-#endif
-PIXtBaseWidget bwdg = (PIXtBaseWidget)wdgp;
-if (bwdg->pixtbase.vis_expose_fg != 1) return;
-if (evt->xvisibility.state == VisibilityFullyObscured)  return;
-int x0, y0, dx, dy;
-x0 = y0 = 0;
-dx = wdgp->core.width;  dy = wdgp->core.height;
-(bwdg->pixtbase.objet)->eXposeProcess(x0, y0, dx, dy);
-bwdg->pixtbase.vis_expose_fg = 0;
-}
-
 /* Nouvelle-Fonction */
 static void init_pixtbase (Widget request, Widget wdg,
@@ -174,16 +154,12 @@
 // get_GCs (wdgp);
 #ifdef DEBUG_PIXTB
-printf("Debug_init_pixtbase: Wdg=%lx Object= %lx  \n", 
-(long)wdgp, (long)(wdgp->pixtbase.objet));
-#endif
-
-// Pour gerer les exposes event avec fenetre non visible ...
-wdgp->pixtbase.vis_expose_fg = 0;
-XtAddEventHandler(wdg, VisibilityChangeMask, FALSE, visibchange_handler_pixtbase, NULL);
-return;
-}
-
-/* Nouvelle-Fonction */
-static void destroy_pixtbase (Widget wdgp)
+printf("Debug_init_pixtbase: Wdg=%lx Object= %lx  narg=%d \n", 
+(long)wdgp, (long)(wdgp->pixtbase.objet), (int)(*narg));
+#endif
+return;
+}
+
+/* Nouvelle-Fonction */
+static void destroy_pixtbase (Widget /*wdgp*/)
 {
 #ifdef DEBUG_PIXTB
@@ -218,23 +194,14 @@
 (long)(((PIXtBaseWidget)wdgp)->pixtbase.objet) );
 #endif
-if (!(wdgp->core.visible))  { 
-  ((PIXtBaseWidget)wdgp)->pixtbase.vis_expose_fg = 1;
-  return;
-}
-if ( ((PIXtBaseWidget)wdgp)->pixtbase.objet ) {
+if (!(wdgp->core.visible))  return;
+if ( ((PIXtBaseWidget)wdgp)->pixtbase.objet ) 
+  {
   XRectangle  xrec;
   int x0, y0, dx, dy;
-  if (region) {
-    XClipBox(region, &xrec);
-    x0 = xrec.x;  y0 = xrec.y;
-    dx = xrec.width;  dy = xrec.height;
+  XClipBox(region, &xrec);
+  x0 = xrec.x;  y0 = xrec.y;
+  dx = xrec.width;  dy = xrec.height;
+  (((PIXtBaseWidget)wdgp)->pixtbase.objet)->eXposeProcess(x0, y0, dx, dy);
   }
-  else {
-    x0 = y0 = 0;
-    dx = wdgp->core.width;  dy = wdgp->core.height;
-  }
-  (((PIXtBaseWidget)wdgp)->pixtbase.objet)->eXposeProcess(x0, y0, dx, dy);
-  ((PIXtBaseWidget)wdgp)->pixtbase.vis_expose_fg = 0;
-}
 return;
 }
Index: /trunk/SophyaPI/PI/pixtbaseP.h
===================================================================
--- /trunk/SophyaPI/PI/pixtbaseP.h	(revision 4076)
+++ /trunk/SophyaPI/PI/pixtbaseP.h	(revision 4077)
@@ -24,5 +24,4 @@
 PIBaseWdgX  * objet; 
 unsigned long myeventmask;
-unsigned int vis_expose_fg;   // Gestion des expose_event avec fenetre non visible
 } PIXtBasePart;
 
Index: /trunk/SophyaPI/PI/psfile.cc
===================================================================
--- /trunk/SophyaPI/PI/psfile.cc	(revision 4076)
+++ /trunk/SophyaPI/PI/psfile.cc	(revision 4077)
@@ -433,4 +433,6 @@
       setFontDone(true)
 {
+    char*  date = new (char[64] ) ; 
+    time_t timer ; 
 
     /* Ouverture du fichier en mode w+ */
@@ -452,7 +454,7 @@
     fprintf(mPSFile, "                       \n");
 
-    time_t timer; time(&timer); 
-    string date = ctime(&timer); 
-    fprintf(mPSFile, HEADER, mPSFileName, date.c_str()) ; /* titre, date etc... */
+    time(&timer) ; 
+    date = ctime(&timer) ; 
+    fprintf(mPSFile, HEADER, mPSFileName, date) ; /* titre, date etc... */
     fprintf(mPSFile, PIDICT, PIDICT_PAR) ;        /* Dictionnaire */
     fprintf(mPSFile, PIMARKERS, PIMARKERS_PAR) ;  /* Fonte "PIMARKERS" */
@@ -494,4 +496,6 @@
     setFontDone(true)
 {
+    char * date = new(char[64]) ; 
+    time_t timer ; 
 
     /* Ouverture du fichier, en mode w+ (tout est ecrase) */
@@ -505,7 +509,7 @@
     /* Ecriture du Header  */
     fprintf(mPSFile, "%%!PS-Adobe-2.0\n") ;
-    time_t timer; time(&timer); 
-    string date = ctime(&timer); 
-    fprintf(mPSFile, HEADER, mPSFileName, date.c_str()) ; /* titre, date etc... */
+    time(&timer) ; 
+    date = ctime(&timer) ; 
+    fprintf(mPSFile, HEADER, mPSFileName, date) ; /* titre, date etc... */
     fprintf(mPSFile, PIDICT, PIDICT_PAR) ;        /* Dictionnaire */
     fprintf(mPSFile, PIMARKERS, PIMARKERS_PAR) ;  /* Fonte "PIMARKERS" */
@@ -678,5 +682,5 @@
 	}
 	/* Portrait ou Landscape ? */
-	if(orientation == PI_Auto)  {
+	if(orientation == PI_Auto) 
 	    if( ((tw < th) && (Dx < 1.2*Dy)) ||
 		((tw > th) && (Dx > Dy) )) 
@@ -684,5 +688,5 @@
 	    else 
 		currentPage->orientation = PI_Landscape ;
-	}
+
 	if(currentPage->orientation == PI_Portrait) {
 	  //	    if( (tw/Dx) < (th/Dy) ) 
@@ -1363,46 +1367,6 @@
     for(i = 0; i < Ny; i++) {
 	for(j = 0; j<Nx-1; j++ )
-	    fprintf(mPSFile, "%02X", (int)Pict[i*Nx+j]);
-    fprintf(mPSFile, "%02X\n", (int)Pict[i*Nx+j]);
-    }
-    /* Un petit grestore ...*/
-    fprintf(mPSFile, "gr\n");
-}
-
-void PSFile::Image(double x0, double y0, double Tx, double Ty,
-		   int Nx, int Ny,
-		   unsigned short *Pict, 
-		   PIColorMap *mMap) {
-
-    int i, j;
-
-    /* Buffers PostScript */
-    fprintf(mPSFile, "/Taille %d def\n", Nx);
-    fprintf(mPSFile, "/ImStr Taille string def\n");
-    fprintf(mPSFile, "/RGBStr Taille 3  mul string def\n");
-
-    /* Ecriture ColorMap */
-    fprintf(mPSFile, "/ColorMap %05d array def\n", mMap->NCol() );
-    for(i = 0; i < mMap->NCol(); i++) {
-	fprintf(mPSFile, "ColorMap %d [16#%02X 16#%02X 16#%02X] put\n",
-		i,
-		(int)(mMap->GetColor(i).red/256),
-		(int)(mMap->GetColor(i).green/256),
-		(int)(mMap->GetColor(i).blue/256));
-    }
-    /* Emplacement de l'image */
-    fprintf(mPSFile, "gs %.2f Ux %.2f Uy tr %.2f Ux %.2f Uy sc\n", x0, y0, Tx, Ty);
-    /* Nbr pix-X, Nbr pix-Y bits/pixels */
-    fprintf(mPSFile, "%d %d 16\n", Nx, Ny);
-    /* Matrice de passage */
-    fprintf(mPSFile, "[%d 0 0 %d 0 0]", Nx, Ny);
-    /* Fonction colorimage */
-    fprintf(mPSFile, "{currentfile ImStr readhexstring pop GetRGB}\
-false 3 colorimage\n\n");
-    /* Data */
-    for(i = 0; i < Ny; i++) {
-	for(j = 0; j<Nx-1; j++ )
-	    fprintf(mPSFile, "%04X", (int)Pict[i*Nx+j]);
-    fprintf(mPSFile, "%04X\n", (int)Pict[i*Nx+j]);
+	    fprintf(mPSFile, "%02X", Pict[i*Nx+j]);
+    fprintf(mPSFile, "%02X\n", Pict[i*Nx+j]);
     }
     /* Un petit grestore ...*/
Index: /trunk/SophyaPI/PI/psfile.h
===================================================================
--- /trunk/SophyaPI/PI/psfile.h	(revision 4076)
+++ /trunk/SophyaPI/PI/psfile.h	(revision 4077)
@@ -165,8 +165,4 @@
 			unsigned char *pict,
 			PIColorMap *mColorMap);
-    virtual void  Image(double x0, double y0, double Tx, double Ty,
-			int Nx, int Ny,
-			unsigned short *pict,
-			PIColorMap *mColorMap);
 
 // Declarations en public - sinon certains compilateurs cxx , aCC, xlC ont des problemes
Index: /trunk/SophyaPI/PI/smakefile
===================================================================
--- /trunk/SophyaPI/PI/smakefile	(revision 4076)
+++ /trunk/SophyaPI/PI/smakefile	(revision 4077)
@@ -1,610 +1,312 @@
-include $(SOPHYABASE)/include/sophyamake.inc
+MODULECXXREPNAME := PI
+MODULEDECCXXFLAGS := -msg_quiet
+include ../Mgr/Makefile.h
  
-all: $(SOPHYALIBP)libPI.a
+all: $(LIB)libPI.a
+$(LIB)libPI.a : $(OBJ)lut.o $(OBJ)parradapter.o $(OBJ)pi3ddrw.o $(OBJ)piapplgen.o $(OBJ)piapplx.o $(OBJ)pibwdggen.o $(OBJ)pibwdgx.o $(OBJ)picmap.o $(OBJ)picmapgen.o $(OBJ)picmapview.o $(OBJ)picmapx.o $(OBJ)picons.o $(OBJ)picontainergen.o $(OBJ)picontainerx.o $(OBJ)pidrawer.o $(OBJ)pidrawwin.o $(OBJ)pidrwtools.o $(OBJ)pievthandler.o $(OBJ)pifilechogen.o $(OBJ)pifilechox.o $(OBJ)pifontgen.o $(OBJ)pifontx.o $(OBJ)pigraph3d.o $(OBJ)pigraphgen.o $(OBJ)pigraphps.o $(OBJ)pigraphuc.o $(OBJ)pigraphx.o $(OBJ)piimage.o $(OBJ)piimgtools.o $(OBJ)pilistgen.o $(OBJ)pilistx.o $(OBJ)pimenubargen.o $(OBJ)pimenubarx.o $(OBJ)pimenugen.o $(OBJ)pimenux.o $(OBJ)pimsghandler.o $(OBJ)pioptmenugen.o $(OBJ)pioptmenux.o $(OBJ)piperiodx.o $(OBJ)pipixmapgen.o $(OBJ)pipixmapx.o $(OBJ)piscdrawwdg.o $(OBJ)pistdwdggen.o $(OBJ)pistdwdgx.o $(OBJ)pistzwin.o $(OBJ)pisurfdr.o $(OBJ)piwdggen.o $(OBJ)piwdgx.o $(OBJ)piwindowgen.o $(OBJ)piwindowx.o $(OBJ)pixtbase.o $(OBJ)psfile.o
+	$(AR) $(ARFLAGS)  $@ $? 
+ifeq ($(CXX),cxx)
+	$(CXX) $? $(CPPFLAGS) $(CXXFLAGS) -L$(LIB) -lPI -lSysTools -o $(OBJ)xx.x -Hf
+endif 
  
 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 $(SOPHYALIBP)libPI.a
+	rm -f $(OBJ)lut.o $(OBJ)parradapter.o $(OBJ)pi3ddrw.o $(OBJ)piapplgen.o $(OBJ)piapplx.o $(OBJ)pibwdggen.o $(OBJ)pibwdgx.o $(OBJ)picmap.o $(OBJ)picmapgen.o $(OBJ)picmapview.o $(OBJ)picmapx.o $(OBJ)picons.o $(OBJ)picontainergen.o $(OBJ)picontainerx.o $(OBJ)pidrawer.o $(OBJ)pidrawwin.o $(OBJ)pidrwtools.o $(OBJ)pievthandler.o $(OBJ)pifilechogen.o $(OBJ)pifilechox.o $(OBJ)pifontgen.o $(OBJ)pifontx.o $(OBJ)pigraph3d.o $(OBJ)pigraphgen.o $(OBJ)pigraphps.o $(OBJ)pigraphuc.o $(OBJ)pigraphx.o $(OBJ)piimage.o $(OBJ)piimgtools.o $(OBJ)pilistgen.o $(OBJ)pilistx.o $(OBJ)pimenubargen.o $(OBJ)pimenubarx.o $(OBJ)pimenugen.o $(OBJ)pimenux.o $(OBJ)pimsghandler.o $(OBJ)pioptmenugen.o $(OBJ)pioptmenux.o $(OBJ)piperiodx.o $(OBJ)pipixmapgen.o $(OBJ)pipixmapx.o $(OBJ)piscdrawwdg.o $(OBJ)pistdwdggen.o $(OBJ)pistdwdgx.o $(OBJ)pistzwin.o $(OBJ)pisurfdr.o $(OBJ)piwdggen.o $(OBJ)piwdgx.o $(OBJ)piwindowgen.o $(OBJ)piwindowx.o $(OBJ)pixtbase.o $(OBJ)psfile.o
+ifeq ($(CXX),cxx)
+	cd $(REPM); rm -f *.o
+endif 
  
-$(SOPHYALIBP)libPI.a : $(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)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)piscdrawwdg.o $(SOPHYAOBJP)pistdwdggen.o $(SOPHYAOBJP)pistdwdgx.o $(SOPHYAOBJP)pistzwin.o $(SOPHYAOBJP)pisurfdr.o $(SOPHYAOBJP)pitherm.o $(SOPHYAOBJP)pitxtdrw.o $(SOPHYAOBJP)piwdggen.o $(SOPHYAOBJP)piwdgx.o $(SOPHYAOBJP)piwindowgen.o $(SOPHYAOBJP)piwindowx.o $(SOPHYAOBJP)pixtbase.o $(SOPHYAOBJP)piyfxdrw.o $(SOPHYAOBJP)psfile.o
-	$(AR) $(ARFLAGS) $@ $? 
-	touch $(SOPHYAINCP)/SophyaConfInfo/libPI.objlist
- 
-$(SOPHYAOBJP)lut.o: lut.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  $(SOPHYAINCP)machdefs.h lut.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  lut.cc
- 
-$(SOPHYAOBJP)parradapter.o: parradapter.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  $(SOPHYAINCP)nbtri.h \
-  $(SOPHYAINCP)machdefs.h \
-  parradapter.h \
-  $(SOPHYAINCP)machdefs.h lut.h \
-  pipixutils.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  parradapter.cc
- 
-$(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 \
-  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 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 \
-  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 $@  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 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
- 
-$(SOPHYAOBJP)piapplx.o: piapplx.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  piapplx.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 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 pipixutils.h picmap.h picmapx.h picmapgen.h \
-  pifontx.h pifontgen.h pigrcoord.h pilineatt.h pigratt.h pidrawer.h \
-  ucckprot.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 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 picontainerx.h picontainergen.h piapplx.h piapplgen.h \
-  pimenubarx.h pimenubargen.h piconsenum.h piscdrawwdg.h pibwdgx.h \
-  pibwdggen.h pigraphx.h pievthandler.h psfile.h pigraphps.h pidrawer.h \
-  pieldrw.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piaxestools.cc
- 
-$(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 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 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 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 $@  pibwdgx.cc
- 
-$(SOPHYAOBJP)picmap.o: picmap.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  picmap.h pisysdep.h \
-  $(SOPHYAINCP)machdefs.h \
-  picmapx.h picmapgen.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  picmap.cc
- 
-$(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 \
-  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 pidrawer.h pigratt.h piaxes.h lut.h \
-  $(SOPHYAINCP)strutil.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 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 \
-  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 \
-  pigraphuc.h pievthandler.h psfile.h pigraphps.h piconsenum.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  picons.cc
- 
-$(SOPHYAOBJP)picontainergen.o: picontainergen.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  picontainergen.h pisysdep.h \
-  $(SOPHYAINCP)machdefs.h \
-  piwdgx.h piwdggen.h pimsghandler.h picolist.h pipixutils.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  picontainergen.cc
- 
-$(SOPHYAOBJP)picontainerx.o: picontainerx.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  picontainerx.h pisysdep.h \
-  $(SOPHYAINCP)machdefs.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 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 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 \
-  piwindowx.h piwindowgen.h picontainerx.h picontainergen.h piwdgx.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
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pidrawwin.cc
- 
-$(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 \
-  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
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pidrwtools.cc
- 
-$(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 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
- 
-$(SOPHYAOBJP)pievthandler.o: pievthandler.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  pievthandler.h pisysdep.h \
-  $(SOPHYAINCP)machdefs.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
- 
-$(SOPHYAOBJP)pifilechogen.o: pifilechogen.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  pifilechogen.h pisysdep.h \
-  $(SOPHYAINCP)machdefs.h \
-  piwdgx.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 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 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 \
-  pipixutils.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pifontx.cc
- 
-$(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 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 pipixutils.h picmap.h picmapx.h picmapgen.h pifontx.h \
-  pifontgen.h pigrcoord.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 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 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
-	$(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 \
-  pistdwdggen.h piwindowx.h piwindowgen.h picontainerx.h picontainergen.h \
-  picmapview.h piimgtools.h pioptmenux.h pioptmenugen.h pimenux.h \
-  pimenugen.h piapplx.h piapplgen.h pimenubarx.h pimenubargen.h \
-  piconsenum.h pidrwtools.h piscdrawwdg.h piyfxdrw.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piimage.cc
- 
-$(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 \
-  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 \
-  pipixmapx.h pipixmapgen.h pibwdgx.h pigraphps.h picmapview.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piimgtools.cc
- 
-$(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 pipixutils.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pilistgen.cc
- 
-$(SOPHYAOBJP)pilistx.o: pilistx.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  pilistx.h pilistgen.h pisysdep.h \
-  $(SOPHYAINCP)machdefs.h \
-  piwdgx.h piwdggen.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 \
-  pipixutils.h piapplx.h piapplgen.h picontainerx.h picontainergen.h \
-  pimenubarx.h piconsenum.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pimenubargen.cc
- 
-$(SOPHYAOBJP)pimenubarx.o: pimenubarx.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  pimenubarx.h pimenubargen.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 \
-  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 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 pipixutils.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pimenux.cc
- 
-$(SOPHYAOBJP)pimsghandler.o: pimsghandler.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  pimsghandler.h \
-  $(SOPHYAINCP)machdefs.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pimsghandler.cc
- 
-$(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 \
-  pipixutils.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pioptmenugen.cc
- 
-$(SOPHYAOBJP)pioptmenux.o: pioptmenux.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  pisysdep.h \
-  $(SOPHYAINCP)machdefs.h \
-  pioptmenux.h pioptmenugen.h pimenux.h pimenugen.h piwdgx.h piwdggen.h \
-  pimsghandler.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 pipixutils.h piperiodx.h \
-  $(SOPHYAINCP)periodic.h \
-  $(SOPHYAINCP)machdefs.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piperiodx.cc
- 
-$(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 \
-  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 $@  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 \
-  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 $@  pipixmapx.cc
- 
-$(SOPHYAOBJP)pipixutils.o: pipixutils.cc pipixutils.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pipixutils.cc
- 
-$(SOPHYAOBJP)piscdrawwdg.o: piscdrawwdg.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  $(SOPHYAINCP)machdefs.h \
-  piscdrawwdg.h pisysdep.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 pistdwdgx.h \
-  pistdwdggen.h piwindowx.h piwindowgen.h picontainerx.h picontainergen.h \
-  pidrawer.h pigratt.h piaxes.h pieldrw.h pidrwtools.h pimenux.h \
-  pimenugen.h pioptmenux.h pioptmenugen.h piapplx.h piapplgen.h \
-  pimenubarx.h pimenubargen.h piconsenum.h piaxestools.h ucckprot.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piscdrawwdg.cc
- 
-$(SOPHYAOBJP)pistdwdggen.o: pistdwdggen.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  pistdwdggen.h pisysdep.h \
-  $(SOPHYAINCP)machdefs.h \
-  piwdgx.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 pistdwdggen.h piwdgx.h piwdggen.h pimsghandler.h picolist.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 \
-  piwindowx.h piwindowgen.h picontainerx.h picontainergen.h piwdgx.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
-	$(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
-	$(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 \
-  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 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 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 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
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piwdgx.cc
- 
-$(SOPHYAOBJP)piwindowgen.o: piwindowgen.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  piwindowgen.h pisysdep.h \
-  $(SOPHYAINCP)machdefs.h \
-  picontainerx.h picontainergen.h piwdgx.h piwdggen.h pimsghandler.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 \
-  $(SOPHYAINCP)machdefs.h \
-  picontainerx.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 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
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piyfxdrw.cc
- 
-$(SOPHYAOBJP)psfile.o: psfile.cc \
-  $(SOPHYAINCP)sopnamsp.h \
-  psfile.h \
-  $(SOPHYAINCP)machdefs.h \
-  pisysdep.h pifontgen.h pigraphgen.h piwdgx.h piwdggen.h pimsghandler.h \
-  picolist.h pipixutils.h picmap.h picmapx.h picmapgen.h pifontx.h \
-  pigrcoord.h pilineatt.h
-	$(CXXCOMPILE) $(CXXTEMPFLG) -o $@  psfile.cc
- 
+$(OBJ)lut.o: lut.cc $(INC)machdefs.h \
+ $(INC)pclassids.h lut.h
+$(OBJ)parradapter.o: parradapter.cc parradapter.h \
+ $(INC)machdefs.h \
+ $(INC)pclassids.h lut.h
+$(OBJ)pi3ddrw.o: pi3ddrw.cc pi3ddrw.h pisysdep.h \
+ $(INC)machdefs.h \
+ $(INC)pclassids.h pidrawer.h pibwdggen.h \
+ piwdgx.h piwdggen.h pimsghandler.h picmap.h picmapx.h picmapgen.h \
+ pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigraphuc.h \
+ pievthandler.h psfile.h pigraph3d.h pibwdgx.h pigraphps.h \
+ pidrwtools.h pistdwdgx.h pistdwdggen.h pioptmenux.h pioptmenugen.h \
+ pimenux.h pimenugen.h piwindowx.h piwindowgen.h picontainerx.h \
+ picontainergen.h piapplx.h piapplgen.h pimenubarx.h pimenubargen.h \
+ picons.h
+$(OBJ)piapplgen.o: piapplgen.cc piapplgen.h pimsghandler.h \
+ $(INC)machdefs.h \
+ $(INC)pclassids.h pisysdep.h picontainerx.h \
+ picontainergen.h piwdgx.h piwdggen.h pimenubarx.h pimenubargen.h \
+ pimenux.h pimenugen.h picons.h pistdwdgx.h pistdwdggen.h pibwdgx.h \
+ pibwdggen.h picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h \
+ pifontx.h pifontgen.h pigraphuc.h pievthandler.h psfile.h pigraphps.h
+$(OBJ)piapplx.o: piapplx.cc piapplx.h piapplgen.h pimsghandler.h \
+ $(INC)machdefs.h \
+ $(INC)pclassids.h pisysdep.h picontainerx.h \
+ picontainergen.h piwdgx.h piwdggen.h pimenubarx.h pimenubargen.h \
+ pimenux.h pimenugen.h picons.h pistdwdgx.h pistdwdggen.h pibwdgx.h \
+ pibwdggen.h picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h \
+ pifontx.h pifontgen.h pigraphuc.h pievthandler.h psfile.h pigraphps.h
+$(OBJ)pibwdggen.o: pibwdggen.cc pibwdggen.h pisysdep.h \
+ $(INC)machdefs.h \
+ $(INC)pclassids.h piwdgx.h piwdggen.h \
+ pimsghandler.h picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h \
+ pifontx.h pifontgen.h pigraphuc.h pievthandler.h psfile.h pidrawer.h \
+ pigraphps.h pidrwtools.h pistdwdgx.h pistdwdggen.h pioptmenux.h \
+ pioptmenugen.h pimenux.h pimenugen.h piwindowx.h piwindowgen.h \
+ picontainerx.h picontainergen.h piapplx.h piapplgen.h pimenubarx.h \
+ pimenubargen.h picons.h pibwdgx.h
+$(OBJ)pibwdgx.o: pibwdgx.cc pixtbaseP.h pibwdgx.h pisysdep.h \
+ $(INC)machdefs.h \
+ $(INC)pclassids.h pibwdggen.h piwdgx.h \
+ piwdggen.h pimsghandler.h picmap.h picmapx.h picmapgen.h pigraphx.h \
+ pigraphgen.h pifontx.h pifontgen.h pigraphuc.h pievthandler.h \
+ psfile.h pigraphps.h pixtbase.h
+$(OBJ)picmap.o: picmap.cc picmap.h pisysdep.h \
+ $(INC)machdefs.h \
+ $(INC)pclassids.h picmapx.h picmapgen.h
+$(OBJ)picmapgen.o: picmapgen.cc picmapgen.h pisysdep.h \
+ $(INC)machdefs.h \
+ $(INC)pclassids.h picmapx.h picmap.h
+$(OBJ)picmapview.o: picmapview.cc picmapview.h pisysdep.h \
+ $(INC)machdefs.h \
+ $(INC)pclassids.h pibwdgx.h pibwdggen.h \
+ piwdgx.h piwdggen.h pimsghandler.h picmap.h picmapx.h picmapgen.h \
+ pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigraphuc.h \
+ pievthandler.h psfile.h pigraphps.h
+$(OBJ)picmapx.o: picmapx.cc piwdgx.h piwdggen.h \
+ $(INC)machdefs.h \
+ $(INC)pclassids.h pimsghandler.h picmapx.h \
+ picmapgen.h pisysdep.h
+$(OBJ)picons.o: picons.cc pisysdep.h \
+ $(INC)machdefs.h \
+ $(INC)pclassids.h pimenux.h pimenugen.h \
+ piwdgx.h piwdggen.h pimsghandler.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 \
+ pigraphuc.h pievthandler.h psfile.h pigraphps.h
+$(OBJ)picontainergen.o: picontainergen.cc picontainergen.h pisysdep.h \
+ $(INC)machdefs.h \
+ $(INC)pclassids.h piwdgx.h piwdggen.h \
+ pimsghandler.h
+$(OBJ)picontainerx.o: picontainerx.cc picontainerx.h pisysdep.h \
+ $(INC)machdefs.h \
+ $(INC)pclassids.h picontainergen.h piwdgx.h \
+ piwdggen.h pimsghandler.h
+$(OBJ)pidrawer.o: pidrawer.cc $(INC)machdefs.h \
+ $(INC)pclassids.h pidrawer.h pibwdggen.h \
+ pisysdep.h piwdgx.h piwdggen.h pimsghandler.h picmap.h picmapx.h \
+ picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigraphuc.h \
+ pievthandler.h psfile.h
+$(OBJ)pidrawwin.o: pidrawwin.cc pidrawwin.h pisysdep.h \
+ $(INC)machdefs.h \
+ $(INC)pclassids.h piwindowx.h piwindowgen.h \
+ picontainerx.h picontainergen.h piwdgx.h piwdggen.h pimsghandler.h \
+ piscdrawwdg.h pibwdgx.h pibwdggen.h picmap.h picmapx.h picmapgen.h \
+ pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigraphuc.h \
+ pievthandler.h psfile.h pigraphps.h pistdwdgx.h pistdwdggen.h \
+ pidrawer.h
+$(OBJ)pidrwtools.o: pidrwtools.cc pidrwtools.h pisysdep.h \
+ $(INC)machdefs.h \
+ $(INC)pclassids.h pistdwdgx.h pistdwdggen.h \
+ piwdgx.h piwdggen.h pimsghandler.h pioptmenux.h pioptmenugen.h \
+ pimenux.h pimenugen.h piwindowx.h piwindowgen.h picontainerx.h \
+ picontainergen.h piapplx.h piapplgen.h pimenubarx.h pimenubargen.h \
+ picons.h pibwdgx.h pibwdggen.h picmap.h picmapx.h picmapgen.h \
+ pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigraphuc.h \
+ pievthandler.h psfile.h pigraphps.h piscdrawwdg.h pidrawer.h \
+ pi3ddrw.h pigraph3d.h
+$(OBJ)pievthandler.o: pievthandler.cc pievthandler.h pisysdep.h \
+ $(INC)machdefs.h \
+ $(INC)pclassids.h pimsghandler.h piwdgx.h \
+ piwdggen.h pigraphx.h pigraphgen.h picmap.h picmapx.h picmapgen.h \
+ pifontx.h pifontgen.h
+$(OBJ)pifilechogen.o: pifilechogen.cc pifilechogen.h pisysdep.h \
+ $(INC)machdefs.h \
+ $(INC)pclassids.h piwdgx.h piwdggen.h \
+ pimsghandler.h
+$(OBJ)pifilechox.o: pifilechox.cc pisysdep.h \
+ $(INC)machdefs.h \
+ $(INC)pclassids.h piapplx.h piapplgen.h \
+ pimsghandler.h picontainerx.h picontainergen.h piwdgx.h piwdggen.h \
+ pimenubarx.h pimenubargen.h pimenux.h pimenugen.h picons.h \
+ pistdwdgx.h pistdwdggen.h pibwdgx.h pibwdggen.h picmap.h picmapx.h \
+ picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigraphuc.h \
+ pievthandler.h psfile.h pigraphps.h pifilechox.h pifilechogen.h \
+ piwindowx.h piwindowgen.h
+$(OBJ)pifontgen.o: pifontgen.cc pigraphgen.h pisysdep.h \
+ $(INC)machdefs.h \
+ $(INC)pclassids.h piwdgx.h piwdggen.h \
+ pimsghandler.h picmap.h picmapx.h picmapgen.h pifontx.h pifontgen.h
+$(OBJ)pifontx.o: pifontx.cc pisysdep.h \
+ $(INC)machdefs.h \
+ $(INC)pclassids.h pifontx.h pifontgen.h \
+ piwdgx.h piwdggen.h pimsghandler.h
+$(OBJ)pigraph3d.o: pigraph3d.cc pigraph3d.h pisysdep.h \
+ $(INC)machdefs.h \
+ $(INC)pclassids.h pigraphuc.h pigraphgen.h \
+ piwdgx.h piwdggen.h pimsghandler.h picmap.h picmapx.h picmapgen.h \
+ pifontx.h pifontgen.h
+$(OBJ)pigraphgen.o: pigraphgen.cc pigraphgen.h pisysdep.h \
+ $(INC)machdefs.h \
+ $(INC)pclassids.h piwdgx.h piwdggen.h \
+ pimsghandler.h picmap.h picmapx.h picmapgen.h pifontx.h pifontgen.h
+$(OBJ)pigraphps.o: pigraphps.cc pigraphps.h pisysdep.h \
+ $(INC)machdefs.h \
+ $(INC)pclassids.h pigraphgen.h piwdgx.h \
+ piwdggen.h pimsghandler.h picmap.h picmapx.h picmapgen.h pifontx.h \
+ pifontgen.h psfile.h
+$(OBJ)pigraphuc.o: pigraphuc.cc $(INC)machdefs.h \
+ $(INC)pclassids.h pigraphuc.h pisysdep.h \
+ pigraphgen.h piwdgx.h piwdggen.h pimsghandler.h picmap.h picmapx.h \
+ picmapgen.h pifontx.h pifontgen.h
+$(OBJ)pigraphx.o: pigraphx.cc pigraphx.h pisysdep.h \
+ $(INC)machdefs.h \
+ $(INC)pclassids.h pigraphgen.h piwdgx.h \
+ piwdggen.h pimsghandler.h picmap.h picmapx.h picmapgen.h pifontx.h \
+ pifontgen.h
+$(OBJ)piimage.o: piimage.cc piimage.h parradapter.h \
+ $(INC)machdefs.h \
+ $(INC)pclassids.h lut.h pisysdep.h \
+ pidrawer.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picmap.h \
+ picmapx.h picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h \
+ pigraphuc.h pievthandler.h psfile.h pipixmapx.h pipixmapgen.h \
+ pibwdgx.h pigraphps.h pistdwdgx.h pistdwdggen.h piwindowx.h \
+ piwindowgen.h picontainerx.h picontainergen.h picmapview.h \
+ piimgtools.h pioptmenux.h pioptmenugen.h pimenux.h pimenugen.h \
+ piapplx.h piapplgen.h pimenubarx.h pimenubargen.h picons.h \
+ pidrwtools.h piscdrawwdg.h
+$(OBJ)piimgtools.o: piimgtools.cc piimgtools.h pisysdep.h \
+ $(INC)machdefs.h \
+ $(INC)pclassids.h pistdwdgx.h pistdwdggen.h \
+ piwdgx.h piwdggen.h pimsghandler.h pioptmenux.h pioptmenugen.h \
+ pimenux.h pimenugen.h piwindowx.h piwindowgen.h picontainerx.h \
+ picontainergen.h piapplx.h piapplgen.h pimenubarx.h pimenubargen.h \
+ picons.h pibwdgx.h pibwdggen.h picmap.h picmapx.h picmapgen.h \
+ pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigraphuc.h \
+ pievthandler.h psfile.h pigraphps.h piimage.h parradapter.h lut.h \
+ pidrawer.h pipixmapx.h pipixmapgen.h picmapview.h
+$(OBJ)pilistgen.o: pilistgen.cc pilistgen.h pisysdep.h \
+ $(INC)machdefs.h \
+ $(INC)pclassids.h piwdgx.h piwdggen.h \
+ pimsghandler.h
+$(OBJ)pilistx.o: pilistx.cc pilistx.h pilistgen.h pisysdep.h \
+ $(INC)machdefs.h \
+ $(INC)pclassids.h piwdgx.h piwdggen.h \
+ pimsghandler.h picontainerx.h picontainergen.h
+$(OBJ)pimenubargen.o: pimenubargen.cc pimenubargen.h pisysdep.h \
+ $(INC)machdefs.h \
+ $(INC)pclassids.h pimenux.h pimenugen.h \
+ piwdgx.h piwdggen.h pimsghandler.h piapplx.h piapplgen.h \
+ picontainerx.h picontainergen.h pimenubarx.h picons.h pistdwdgx.h \
+ pistdwdggen.h pibwdgx.h pibwdggen.h picmap.h picmapx.h picmapgen.h \
+ pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigraphuc.h \
+ pievthandler.h psfile.h pigraphps.h
+$(OBJ)pimenubarx.o: pimenubarx.cc pimenubarx.h pimenubargen.h pisysdep.h \
+ $(INC)machdefs.h \
+ $(INC)pclassids.h pimenux.h pimenugen.h \
+ piwdgx.h piwdggen.h pimsghandler.h piapplx.h piapplgen.h \
+ picontainerx.h picontainergen.h picons.h pistdwdgx.h pistdwdggen.h \
+ pibwdgx.h pibwdggen.h picmap.h picmapx.h picmapgen.h pigraphx.h \
+ pigraphgen.h pifontx.h pifontgen.h pigraphuc.h pievthandler.h \
+ psfile.h pigraphps.h
+$(OBJ)pimenugen.o: pimenugen.cc pimenugen.h pisysdep.h \
+ $(INC)machdefs.h \
+ $(INC)pclassids.h piwdgx.h piwdggen.h \
+ pimsghandler.h
+$(OBJ)pimenux.o: pimenux.cc pisysdep.h \
+ $(INC)machdefs.h \
+ $(INC)pclassids.h pimenubarx.h \
+ pimenubargen.h pimenux.h pimenugen.h piwdgx.h piwdggen.h \
+ pimsghandler.h
+$(OBJ)pimsghandler.o: pimsghandler.cc pimsghandler.h \
+ $(INC)machdefs.h \
+ $(INC)pclassids.h
+$(OBJ)pioptmenugen.o: pioptmenugen.cc pioptmenugen.h pisysdep.h \
+ $(INC)machdefs.h \
+ $(INC)pclassids.h pimenux.h pimenugen.h \
+ piwdgx.h piwdggen.h pimsghandler.h
+$(OBJ)pioptmenux.o: pioptmenux.cc pisysdep.h \
+ $(INC)machdefs.h \
+ $(INC)pclassids.h pioptmenux.h \
+ pioptmenugen.h pimenux.h pimenugen.h piwdgx.h piwdggen.h \
+ pimsghandler.h pistdwdgx.h pistdwdggen.h piapplx.h piapplgen.h \
+ picontainerx.h picontainergen.h pimenubarx.h pimenubargen.h picons.h \
+ pibwdgx.h pibwdggen.h picmap.h picmapx.h picmapgen.h pigraphx.h \
+ pigraphgen.h pifontx.h pifontgen.h pigraphuc.h pievthandler.h \
+ psfile.h pigraphps.h
+$(OBJ)piperiodx.o: piperiodx.cc piwdgx.h piwdggen.h \
+ $(INC)machdefs.h \
+ $(INC)pclassids.h pimsghandler.h \
+ piperiodx.h $(INC)periodic.h
+$(OBJ)pipixmapgen.o: pipixmapgen.cc pipixmapgen.h pisysdep.h \
+ $(INC)machdefs.h \
+ $(INC)pclassids.h pibwdgx.h pibwdggen.h \
+ piwdgx.h piwdggen.h pimsghandler.h picmap.h picmapx.h picmapgen.h \
+ pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigraphuc.h \
+ pievthandler.h psfile.h pigraphps.h
+$(OBJ)pipixmapx.o: pipixmapx.cc pipixmapx.h pipixmapgen.h pisysdep.h \
+ $(INC)machdefs.h \
+ $(INC)pclassids.h pibwdgx.h pibwdggen.h \
+ piwdgx.h piwdggen.h pimsghandler.h picmap.h picmapx.h picmapgen.h \
+ pigraphx.h pigraphgen.h pifontx.h pifontgen.h pigraphuc.h \
+ pievthandler.h psfile.h pigraphps.h
+$(OBJ)piscdrawwdg.o: piscdrawwdg.cc \
+ $(INC)machdefs.h \
+ $(INC)pclassids.h piscdrawwdg.h pisysdep.h \
+ pibwdgx.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picmap.h \
+ picmapx.h picmapgen.h pigraphx.h pigraphgen.h pifontx.h pifontgen.h \
+ pigraphuc.h pievthandler.h psfile.h pigraphps.h pistdwdgx.h \
+ pistdwdggen.h piwindowx.h piwindowgen.h picontainerx.h \
+ picontainergen.h pidrawer.h pidrwtools.h pioptmenux.h pioptmenugen.h \
+ pimenux.h pimenugen.h piapplx.h piapplgen.h pimenubarx.h \
+ pimenubargen.h picons.h parradapter.h lut.h
+$(OBJ)pistdwdggen.o: pistdwdggen.cc pistdwdggen.h pisysdep.h \
+ $(INC)machdefs.h \
+ $(INC)pclassids.h piwdgx.h piwdggen.h \
+ pimsghandler.h
+$(OBJ)pistdwdgx.o: pistdwdgx.cc pisysdep.h \
+ $(INC)machdefs.h \
+ $(INC)pclassids.h pistdwdgx.h pistdwdggen.h \
+ piwdgx.h piwdggen.h pimsghandler.h picontainerx.h picontainergen.h
+$(OBJ)pistzwin.o: pistzwin.cc pistzwin.h pisysdep.h \
+ $(INC)machdefs.h \
+ $(INC)pclassids.h piwindowx.h piwindowgen.h \
+ picontainerx.h picontainergen.h piwdgx.h piwdggen.h pimsghandler.h \
+ piperiodx.h $(INC)periodic.h psfile.h \
+ pifontgen.h pigraphgen.h picmap.h picmapx.h picmapgen.h pifontx.h
+$(OBJ)pisurfdr.o: pisurfdr.cc pisurfdr.h parradapter.h \
+ $(INC)machdefs.h \
+ $(INC)pclassids.h lut.h pi3ddrw.h \
+ pisysdep.h pidrawer.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h \
+ picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h pifontx.h \
+ pifontgen.h pigraphuc.h pievthandler.h psfile.h pigraph3d.h pibwdgx.h \
+ pigraphps.h
+$(OBJ)piwdggen.o: piwdggen.cc piwdggen.h \
+ $(INC)machdefs.h \
+ $(INC)pclassids.h pimsghandler.h \
+ picontainergen.h pisysdep.h piwdgx.h pievthandler.h pigraphx.h \
+ pigraphgen.h picmap.h picmapx.h picmapgen.h pifontx.h pifontgen.h \
+ psfile.h
+$(OBJ)piwdgx.o: piwdgx.cc piwdgx.h piwdggen.h \
+ $(INC)machdefs.h \
+ $(INC)pclassids.h pimsghandler.h \
+ picontainerx.h pisysdep.h picontainergen.h pievthandler.h pigraphx.h \
+ pigraphgen.h picmap.h picmapx.h picmapgen.h pifontx.h pifontgen.h
+$(OBJ)piwindowgen.o: piwindowgen.cc piwindowgen.h pisysdep.h \
+ $(INC)machdefs.h \
+ $(INC)pclassids.h picontainerx.h \
+ picontainergen.h piwdgx.h piwdggen.h pimsghandler.h psfile.h \
+ pifontgen.h pigraphgen.h picmap.h picmapx.h picmapgen.h pifontx.h
+$(OBJ)piwindowx.o: piwindowx.cc piwindowx.h piwindowgen.h pisysdep.h \
+ $(INC)machdefs.h \
+ $(INC)pclassids.h picontainerx.h \
+ picontainergen.h piwdgx.h piwdggen.h pimsghandler.h
+$(OBJ)pixtbase.o: pixtbase.cc pixtbaseP.h pibwdgx.h pisysdep.h \
+ $(INC)machdefs.h \
+ $(INC)pclassids.h pibwdggen.h piwdgx.h \
+ piwdggen.h pimsghandler.h picmap.h picmapx.h picmapgen.h pigraphx.h \
+ pigraphgen.h pifontx.h pifontgen.h pigraphuc.h pievthandler.h \
+ psfile.h pigraphps.h pixtbase.h
+$(OBJ)psfile.o: psfile.cc psfile.h \
+ $(INC)machdefs.h \
+ $(INC)pclassids.h pisysdep.h pifontgen.h \
+ pigraphgen.h piwdgx.h piwdggen.h pimsghandler.h picmap.h picmapx.h \
+ picmapgen.h pifontx.h
Index: /trunk/SophyaPI/PI/ucckprot.h
===================================================================
--- /trunk/SophyaPI/PI/ucckprot.h	(revision 4076)
+++ /trunk/SophyaPI/PI/ucckprot.h	(revision 4077)
@@ -13,4 +13,7 @@
 #endif
 
+//define PETIT_DBLE 1.e-39
+//define PREC_DBLE  1.e-5
+//define PROT_DBLE  1.e-19
 #define PETIT_DBLE 1.e-85
 // qque probleme sur le trace - J'augmente les marges - Reza 14/5/2002 
@@ -18,7 +21,6 @@
 #define PREC_DBLE  1.e-14
 #define MINRAP_DBLE  1.e-12
-// Avril 2012 (cmv+reza) : on passe les limites de protection double de 1e+/-100 a 1e+/-250 
-#define PROT_DBLE_MIN  1.e-250
-#define PROT_DBLE_MAX  1.e+250
+#define PROT_DBLE_MIN  1.e-100
+#define PROT_DBLE_MAX  1.e+100
 
 inline double UC_LimitProtectDouble(double x)
@@ -40,5 +42,4 @@
   bool rc = false;
   double xym,xym2;
-  if (xmax<xmin) xmax=xmin;
   xym = fabs(xmax);
   xym2 = fabs(xmin);
@@ -46,7 +47,7 @@
   if (xym < PETIT_DBLE) xym = PETIT_DBLE;
   if ((xmax-xmin) < MINRAP_DBLE*xym) {
-    //    printf("UC_CheckMinMaxDiff_Debug: xmin=%.15e xmax=%.15e diff=%.15e \n",xmin,xmax,xmax-xmin); 
-    xmin -= MINRAP_DBLE*xym*0.5;  xmax += MINRAP_DBLE*xym*0.5;; // xmax = xmin+MINRAP_DBLE*xym;
-    //    printf(" ...Changed to --> xmin=%.15e xmax=%.15e diff=%.15e \n",xmin,xmax,xmax-xmin); 
+    xmin -= MINRAP_DBLE*xym*0.5;  xmax = xmin+MINRAP_DBLE*xym;
+    //    cerr << " DBG-CheckMinMaxDiff: xmin,max=" << xmin << "," << xmax 
+    //	 << " xym=" << xym << " diff=" << xmax-xmin << endl;
     rc = true;
   }
