Changeset 140 in Sophya for trunk/SophyaPI


Ignore:
Timestamp:
Aug 26, 1998, 7:18:13 PM (27 years ago)
Author:
ercodmgr
Message:

Corrections bug et modifs diverses Reza 26/08/98

Location:
trunk/SophyaPI/PI
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/SophyaPI/PI/Makefile

    r138 r140  
    1 MODULENAME := PI
     1MODULECXXREPNAME := PI
    22MODULECXXFLAGS := -msg_quiet
    33include ../Mgr/Makefile.h
    … …  
    1717endif
    1818 
    19 $(OBJ)lut.o: lut.cc $(EROSDEVREP)/Include/defs.h lut.h
     19$(OBJ)lut.o: lut.cc $(INC)defs.h lut.h
    2020$(OBJ)parradapter.o: parradapter.cc parradapter.h \
    21  $(EROSDEVREP)/Include/defs.h $(EROSDEVREP)/Include/machine.h \
     21 $(INC)defs.h $(INC)machine.h \
    2222 lut.h
    2323$(OBJ)pi3ddrw.o: pi3ddrw.cc pi3ddrw.h pisysdep.h pidrawer.h pibwdggen.h \
    2424 piwdgx.h piwdggen.h pimsghandler.h picmap.h picmapx.h picmapgen.h \
    2525 pigraphx.h pigraphgen.h pigraphuc.h psfile.h \
    26  $(EROSDEVREP)/Include/defs.h pigraph3d.h pibwdgx.h pigraphps.h \
     26 $(INC)defs.h pigraph3d.h pibwdgx.h pigraphps.h \
    2727 pidrwtools.h pistdwdgx.h pistdwdggen.h pioptmenux.h pioptmenugen.h \
    2828 pimenux.h pimenugen.h piwindowx.h piwindowgen.h picontainerx.h \
    … …  
    3434 pistdwdggen.h pibwdgx.h pibwdggen.h picmap.h picmapx.h picmapgen.h \
    3535 pigraphx.h pigraphgen.h pigraphuc.h psfile.h \
    36  $(EROSDEVREP)/Include/defs.h pigraphps.h
     36 $(INC)defs.h pigraphps.h
    3737$(OBJ)piapplx.o: piapplx.cc piapplx.h piapplgen.h pimsghandler.h pisysdep.h \
    3838 picontainerx.h picontainergen.h piwdgx.h piwdggen.h pimenubarx.h \
    … …  
    4040 pistdwdggen.h pibwdgx.h pibwdggen.h picmap.h picmapx.h picmapgen.h \
    4141 pigraphx.h pigraphgen.h pigraphuc.h psfile.h \
    42  $(EROSDEVREP)/Include/defs.h pigraphps.h
     42 $(INC)defs.h pigraphps.h
    4343$(OBJ)pibwdggen.o: pibwdggen.cc pibwdggen.h pisysdep.h piwdgx.h piwdggen.h \
    4444 pimsghandler.h picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h \
    45  pigraphuc.h psfile.h $(EROSDEVREP)/Include/defs.h pidrawer.h \
     45 pigraphuc.h psfile.h $(INC)defs.h pidrawer.h \
    4646 pigraphps.h pidrwtools.h pistdwdgx.h pistdwdggen.h pioptmenux.h \
    4747 pioptmenugen.h pimenux.h pimenugen.h piwindowx.h piwindowgen.h \
    … …  
    5151 piwdgx.h piwdggen.h pimsghandler.h picmap.h picmapx.h picmapgen.h \
    5252 pigraphx.h pigraphgen.h pigraphuc.h psfile.h \
    53  $(EROSDEVREP)/Include/defs.h pigraphps.h pixtbase.h
     53 $(INC)defs.h pigraphps.h pixtbase.h
    5454$(OBJ)picmap.o: picmap.cc picmap.h pisysdep.h picmapx.h picmapgen.h
    5555$(OBJ)picmapgen.o: picmapgen.cc picmapgen.h pisysdep.h picmapx.h picmap.h
    … …  
    5757 pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picmap.h picmapx.h \
    5858 picmapgen.h pigraphx.h pigraphgen.h pigraphuc.h psfile.h \
    59  $(EROSDEVREP)/Include/defs.h pigraphps.h
     59 $(INC)defs.h pigraphps.h
    6060$(OBJ)picmapx.o: picmapx.cc piwdgx.h piwdggen.h pimsghandler.h picmapx.h \
    6161 picmapgen.h pisysdep.h
    … …  
    6464 picontainerx.h picontainergen.h pibwdgx.h pibwdggen.h picmap.h \
    6565 picmapx.h picmapgen.h pigraphx.h pigraphgen.h pigraphuc.h psfile.h \
    66  $(EROSDEVREP)/Include/defs.h pigraphps.h
     66 $(INC)defs.h pigraphps.h
    6767$(OBJ)picontainergen.o: picontainergen.cc picontainergen.h pisysdep.h \
    6868 piwdgx.h piwdggen.h pimsghandler.h
    … …  
    7171$(OBJ)pidrawer.o: pidrawer.cc pidrawer.h pibwdggen.h pisysdep.h piwdgx.h \
    7272 piwdggen.h pimsghandler.h picmap.h picmapx.h picmapgen.h pigraphx.h \
    73  pigraphgen.h pigraphuc.h psfile.h $(EROSDEVREP)/Include/defs.h
     73 pigraphgen.h pigraphuc.h psfile.h $(INC)defs.h
    7474$(OBJ)pidrawwin.o: pidrawwin.cc pidrawwin.h pisysdep.h piwindowx.h \
    7575 piwindowgen.h picontainerx.h picontainergen.h piwdgx.h piwdggen.h \
    7676 pimsghandler.h piscdrawwdg.h pibwdgx.h pibwdggen.h picmap.h picmapx.h \
    7777 picmapgen.h pigraphx.h pigraphgen.h pigraphuc.h psfile.h \
    78  $(EROSDEVREP)/Include/defs.h pigraphps.h pistdwdgx.h pistdwdggen.h \
    79  pidrawer.h
     78 $(INC)defs.h pigraphps.h pistdwdgx.h \
     79 pistdwdggen.h pidrawer.h
    8080$(OBJ)pidrwtools.o: pidrwtools.cc pidrwtools.h pisysdep.h pistdwdgx.h \
    8181 pistdwdggen.h piwdgx.h piwdggen.h pimsghandler.h pioptmenux.h \
    … …  
    8484 pimenubargen.h picons.h pibwdgx.h pibwdggen.h picmap.h picmapx.h \
    8585 picmapgen.h pigraphx.h pigraphgen.h pigraphuc.h psfile.h \
    86  $(EROSDEVREP)/Include/defs.h pigraphps.h piscdrawwdg.h pidrawer.h \
     86 $(INC)defs.h pigraphps.h piscdrawwdg.h pidrawer.h \
    8787 pi3ddrw.h pigraph3d.h
    8888$(OBJ)pifilechogen.o: pifilechogen.cc pifilechogen.h pisysdep.h piwdgx.h \
    … …  
    9393 pistdwdgx.h pistdwdggen.h pibwdgx.h pibwdggen.h picmap.h picmapx.h \
    9494 picmapgen.h pigraphx.h pigraphgen.h pigraphuc.h psfile.h \
    95  $(EROSDEVREP)/Include/defs.h pigraphps.h pifilechox.h \
     95 $(INC)defs.h pigraphps.h pifilechox.h \
    9696 pifilechogen.h piwindowx.h piwindowgen.h
    9797$(OBJ)pigraph3d.o: pigraph3d.cc pigraph3d.h pisysdep.h pigraphuc.h \
    … …  
    102102$(OBJ)pigraphps.o: pigraphps.cc pigraphps.h pisysdep.h pigraphgen.h piwdgx.h \
    103103 piwdggen.h pimsghandler.h picmap.h picmapx.h picmapgen.h psfile.h \
    104  $(EROSDEVREP)/Include/defs.h
     104 $(INC)defs.h
    105105$(OBJ)pigraphuc.o: pigraphuc.cc pigraphuc.h pisysdep.h pigraphgen.h piwdgx.h \
    106106 piwdggen.h pimsghandler.h picmap.h picmapx.h picmapgen.h
    107107$(OBJ)pigraphx.o: pigraphx.cc pigraphx.h pisysdep.h pigraphgen.h piwdgx.h \
    108108 piwdggen.h pimsghandler.h picmap.h picmapx.h picmapgen.h
    109 $(OBJ)pihisto.o: pihisto.cc pihisto.h $(EROSDEVREP)/Include/histos.h \
    110  $(EROSDEVREP)/Include/peida.h $(EROSDEVREP)/Include/defs.h \
    111  $(EROSDEVREP)/Include/utils.h $(EROSDEVREP)/Include/machine.h \
    112  $(EROSDEVREP)/Include/perrors.h \
    113  $(EROSDEVREP)/Include/exceptions.h \
    114  $(EROSDEVREP)/Include/peidainit.h $(EROSDEVREP)/Include/fmath.h \
    115  $(EROSDEVREP)/Include/cvector.h $(EROSDEVREP)/Include/matrix.h \
    116  $(EROSDEVREP)/Include/ppersist.h \
    117  $(EROSDEVREP)/Include/pclassids.h pidrawer.h pibwdggen.h \
     109$(OBJ)pihisto.o: pihisto.cc pihisto.h $(INC)histos.h \
     110 $(INC)peida.h $(INC)defs.h \
     111 $(INC)utils.h $(INC)machine.h \
     112 $(INC)perrors.h \
     113 $(INC)exceptions.h \
     114 $(INC)peidainit.h \
     115 $(INC)fmath.h $(INC)cvector.h \
     116 $(INC)matrix.h \
     117 $(INC)ppersist.h \
     118 $(INC)pclassids.h pidrawer.h pibwdggen.h \
    118119 pisysdep.h piwdgx.h piwdggen.h pimsghandler.h picmap.h picmapx.h \
    119120 picmapgen.h pigraphx.h pigraphgen.h pigraphuc.h psfile.h
    … …  
    121122 piwdgx.h piwdggen.h pimsghandler.h pimenubarx.h pimenubargen.h \
    122123 pioptmenux.h pioptmenugen.h pistdwdgx.h pistdwdggen.h \
    123  $(EROSDEVREP)/Include/histos2.h $(EROSDEVREP)/Include/peida.h \
    124  $(EROSDEVREP)/Include/defs.h $(EROSDEVREP)/Include/utils.h \
    125  $(EROSDEVREP)/Include/machine.h $(EROSDEVREP)/Include/perrors.h \
    126  $(EROSDEVREP)/Include/exceptions.h \
    127  $(EROSDEVREP)/Include/peidainit.h $(EROSDEVREP)/Include/fmath.h \
    128  $(EROSDEVREP)/Include/histos.h $(EROSDEVREP)/Include/cvector.h \
    129  $(EROSDEVREP)/Include/matrix.h $(EROSDEVREP)/Include/ppersist.h \
    130  $(EROSDEVREP)/Include/pclassids.h piscdrawwdg.h pibwdgx.h \
     124 $(INC)histos2.h $(INC)peida.h \
     125 $(INC)defs.h $(INC)utils.h \
     126 $(INC)machine.h \
     127 $(INC)perrors.h \
     128 $(INC)exceptions.h \
     129 $(INC)peidainit.h \
     130 $(INC)fmath.h $(INC)histos.h \
     131 $(INC)cvector.h \
     132 $(INC)matrix.h \
     133 $(INC)ppersist.h \
     134 $(INC)pclassids.h piscdrawwdg.h pibwdgx.h \
    131135 pibwdggen.h picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h \
    132136 pigraphuc.h psfile.h pigraphps.h piwindowx.h piwindowgen.h \
    133137 picontainerx.h picontainergen.h pidrawer.h \
    134  $(EROSDEVREP)/Include/nbrandom.h
     138 $(INC)nbrandom.h
    135139$(OBJ)piimage.o: piimage.cc piimage.h parradapter.h \
    136  $(EROSDEVREP)/Include/defs.h $(EROSDEVREP)/Include/machine.h \
     140 $(INC)defs.h $(INC)machine.h \
    137141 lut.h pisysdep.h pidrawer.h pibwdggen.h piwdgx.h piwdggen.h \
    138142 pimsghandler.h picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h \
    … …  
    148152 pimenubargen.h picons.h pibwdgx.h pibwdggen.h picmap.h picmapx.h \
    149153 picmapgen.h pigraphx.h pigraphgen.h pigraphuc.h psfile.h \
    150  $(EROSDEVREP)/Include/defs.h pigraphps.h piimage.h parradapter.h \
    151  $(EROSDEVREP)/Include/machine.h lut.h pidrawer.h pipixmapx.h \
     154 $(INC)defs.h pigraphps.h piimage.h parradapter.h \
     155 $(INC)machine.h lut.h pidrawer.h pipixmapx.h \
    152156 pipixmapgen.h picmapview.h
    153 $(OBJ)piinit.o: piinit.cc $(EROSDEVREP)/Include/defs.h piinit.h \
    154  $(EROSDEVREP)/Include/strecinit.h \
    155  $(EROSDEVREP)/Include/imaginit.h \
    156  $(EROSDEVREP)/Include/peidainit.h
     157$(OBJ)piinit.o: piinit.cc $(INC)defs.h piinit.h \
     158 $(INC)strecinit.h \
     159 $(INC)imaginit.h \
     160 $(INC)peidainit.h
    157161$(OBJ)pilistgen.o: pilistgen.cc pilistgen.h pisysdep.h piwdgx.h piwdggen.h \
    158162 pimsghandler.h
    … …  
    164168 pistdwdggen.h pibwdgx.h pibwdggen.h picmap.h picmapx.h picmapgen.h \
    165169 pigraphx.h pigraphgen.h pigraphuc.h psfile.h \
    166  $(EROSDEVREP)/Include/defs.h pigraphps.h
     170 $(INC)defs.h pigraphps.h
    167171$(OBJ)pimenubarx.o: pimenubarx.cc pimenubarx.h pimenubargen.h pisysdep.h \
    168172 pimenux.h pimenugen.h piwdgx.h piwdggen.h pimsghandler.h piapplx.h \
    … …  
    170174 pistdwdggen.h pibwdgx.h pibwdggen.h picmap.h picmapx.h picmapgen.h \
    171175 pigraphx.h pigraphgen.h pigraphuc.h psfile.h \
    172  $(EROSDEVREP)/Include/defs.h pigraphps.h
     176 $(INC)defs.h pigraphps.h
    173177$(OBJ)pimenugen.o: pimenugen.cc pimenugen.h pisysdep.h piwdgx.h piwdggen.h \
    174178 pimsghandler.h
    … …  
    176180 pimenugen.h piwdgx.h piwdggen.h pimsghandler.h
    177181$(OBJ)pimsghandler.o: pimsghandler.cc pimsghandler.h
    178 $(OBJ)pintup3d.o: pintup3d.cc pintup3d.h $(EROSDEVREP)/Include/ntuple.h \
    179  $(EROSDEVREP)/Include/ppersist.h $(EROSDEVREP)/Include/defs.h \
    180  $(EROSDEVREP)/Include/machine.h $(EROSDEVREP)/Include/perrors.h \
    181  $(EROSDEVREP)/Include/exceptions.h \
    182  $(EROSDEVREP)/Include/peidainit.h \
    183  $(EROSDEVREP)/Include/pclassids.h pi3ddrw.h pisysdep.h pidrawer.h \
     182$(OBJ)pintup3d.o: pintup3d.cc pintup3d.h $(INC)ntuple.h \
     183 $(INC)ppersist.h $(INC)defs.h \
     184 $(INC)machine.h \
     185 $(INC)perrors.h \
     186 $(INC)exceptions.h \
     187 $(INC)peidainit.h \
     188 $(INC)pclassids.h \
     189 $(INC)dvlist.h pi3ddrw.h pisysdep.h pidrawer.h \
    184190 pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picmap.h picmapx.h \
    185191 picmapgen.h pigraphx.h pigraphgen.h pigraphuc.h psfile.h pigraph3d.h \
    186192 pibwdgx.h pigraphps.h
    187 $(OBJ)pintuple.o: pintuple.cc pintuple.h $(EROSDEVREP)/Include/ntuple.h \
    188  $(EROSDEVREP)/Include/ppersist.h $(EROSDEVREP)/Include/defs.h \
    189  $(EROSDEVREP)/Include/machine.h $(EROSDEVREP)/Include/perrors.h \
    190  $(EROSDEVREP)/Include/exceptions.h \
    191  $(EROSDEVREP)/Include/peidainit.h \
    192  $(EROSDEVREP)/Include/pclassids.h pidrawer.h pibwdggen.h \
    193  pisysdep.h piwdgx.h piwdggen.h pimsghandler.h picmap.h picmapx.h \
    194  picmapgen.h pigraphx.h pigraphgen.h pigraphuc.h psfile.h
     193$(OBJ)pintuple.o: pintuple.cc pintuple.h $(INC)ntuple.h \
     194 $(INC)ppersist.h $(INC)defs.h \
     195 $(INC)machine.h \
     196 $(INC)perrors.h \
     197 $(INC)exceptions.h \
     198 $(INC)peidainit.h \
     199 $(INC)pclassids.h \
     200 $(INC)dvlist.h pidrawer.h pibwdggen.h pisysdep.h \
     201 piwdgx.h piwdggen.h pimsghandler.h picmap.h picmapx.h picmapgen.h \
     202 pigraphx.h pigraphgen.h pigraphuc.h psfile.h
    195203$(OBJ)pioptmenugen.o: pioptmenugen.cc pioptmenugen.h pisysdep.h pimenux.h \
    196204 pimenugen.h piwdgx.h piwdggen.h pimsghandler.h
    … …  
    200208 pimenubarx.h pimenubargen.h picons.h pibwdgx.h pibwdggen.h picmap.h \
    201209 picmapx.h picmapgen.h pigraphx.h pigraphgen.h pigraphuc.h psfile.h \
    202  $(EROSDEVREP)/Include/defs.h pigraphps.h
     210 $(INC)defs.h pigraphps.h
    203211$(OBJ)piperiodx.o: piperiodx.cc piwdgx.h piwdggen.h pimsghandler.h \
    204  piperiodx.h $(EROSDEVREP)/Include/periodic.h \
    205  $(EROSDEVREP)/Include/defs.h
     212 piperiodx.h $(INC)periodic.h \
     213 $(INC)defs.h
    206214$(OBJ)pipixmapgen.o: pipixmapgen.cc pipixmapgen.h pisysdep.h pibwdgx.h \
    207215 pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picmap.h picmapx.h \
    208216 picmapgen.h pigraphx.h pigraphgen.h pigraphuc.h psfile.h \
    209  $(EROSDEVREP)/Include/defs.h pigraphps.h
     217 $(INC)defs.h pigraphps.h
    210218$(OBJ)pipixmapx.o: pipixmapx.cc pipixmapx.h pipixmapgen.h pisysdep.h \
    211219 pibwdgx.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picmap.h \
    212220 picmapx.h picmapgen.h pigraphx.h pigraphgen.h pigraphuc.h psfile.h \
    213  $(EROSDEVREP)/Include/defs.h pigraphps.h
     221 $(INC)defs.h pigraphps.h
    214222$(OBJ)pipodrw.o: pipodrw.cc pipodrw.h pidrawer.h pibwdggen.h pisysdep.h \
    215223 piwdgx.h piwdggen.h pimsghandler.h picmap.h picmapx.h picmapgen.h \
    216224 pigraphx.h pigraphgen.h pigraphuc.h psfile.h \
    217  $(EROSDEVREP)/Include/defs.h parradapter.h \
    218  $(EROSDEVREP)/Include/machine.h lut.h \
    219  $(EROSDEVREP)/Include/cvector.h $(EROSDEVREP)/Include/matrix.h \
    220  $(EROSDEVREP)/Include/peida.h $(EROSDEVREP)/Include/utils.h \
    221  $(EROSDEVREP)/Include/perrors.h \
    222  $(EROSDEVREP)/Include/exceptions.h \
    223  $(EROSDEVREP)/Include/peidainit.h $(EROSDEVREP)/Include/fmath.h \
    224  $(EROSDEVREP)/Include/ppersist.h \
    225  $(EROSDEVREP)/Include/pclassids.h \
    226  $(EROSDEVREP)/Include/histos2.h $(EROSDEVREP)/Include/histos.h \
    227  $(EROSDEVREP)/Include/generalfit.h
     225 $(INC)defs.h parradapter.h \
     226 $(INC)machine.h lut.h \
     227 $(INC)cvector.h \
     228 $(INC)matrix.h $(INC)peida.h \
     229 $(INC)utils.h $(INC)perrors.h \
     230 $(INC)exceptions.h \
     231 $(INC)peidainit.h \
     232 $(INC)fmath.h \
     233 $(INC)ppersist.h \
     234 $(INC)pclassids.h \
     235 $(INC)histos2.h \
     236 $(INC)histos.h \
     237 $(INC)generalfit.h
    228238$(OBJ)piscdrawwdg.o: piscdrawwdg.cc piscdrawwdg.h pisysdep.h pibwdgx.h \
    229239 pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picmap.h picmapx.h \
    230240 picmapgen.h pigraphx.h pigraphgen.h pigraphuc.h psfile.h \
    231  $(EROSDEVREP)/Include/defs.h pigraphps.h pistdwdgx.h pistdwdggen.h \
    232  piwindowx.h piwindowgen.h picontainerx.h picontainergen.h pidrawer.h \
    233  pidrwtools.h pioptmenux.h pioptmenugen.h pimenux.h pimenugen.h \
    234  piapplx.h piapplgen.h pimenubarx.h pimenubargen.h picons.h \
    235  parradapter.h $(EROSDEVREP)/Include/machine.h lut.h
     241 $(INC)defs.h pigraphps.h pistdwdgx.h \
     242 pistdwdggen.h piwindowx.h piwindowgen.h picontainerx.h \
     243 picontainergen.h pidrawer.h pidrwtools.h pioptmenux.h pioptmenugen.h \
     244 pimenux.h pimenugen.h piapplx.h piapplgen.h pimenubarx.h \
     245 pimenubargen.h picons.h parradapter.h \
     246 $(INC)machine.h lut.h
    236247$(OBJ)pistdwdggen.o: pistdwdggen.cc pistdwdggen.h pisysdep.h piwdgx.h \
    237248 piwdggen.h pimsghandler.h
    238249$(OBJ)pistdwdgx.o: pistdwdgx.cc pisysdep.h pistdwdgx.h pistdwdggen.h \
    239250 piwdgx.h piwdggen.h pimsghandler.h
    240 $(OBJ)pistlist.o: pistlist.cc pistlist.h $(EROSDEVREP)/Include/stlist.h \
    241  $(EROSDEVREP)/Include/machine.h $(EROSDEVREP)/Include/defs.h \
    242  $(EROSDEVREP)/Include/exceptions.h \
    243  $(EROSDEVREP)/Include/peidainit.h \
    244  $(EROSDEVREP)/Include/perrors.h $(EROSDEVREP)/Include/dynccd.h \
    245  $(EROSDEVREP)/Include/ppersist.h \
    246  $(EROSDEVREP)/Include/pclassids.h \
    247  $(EROSDEVREP)/Include/imaginit.h $(EROSDEVREP)/Include/star.h \
    248  $(EROSDEVREP)/Include/strecinit.h \
    249  $(EROSDEVREP)/Include/starmacro.h $(EROSDEVREP)/Include/psf.h \
    250  $(EROSDEVREP)/Include/peida.h $(EROSDEVREP)/Include/utils.h \
    251  $(EROSDEVREP)/Include/fmath.h $(EROSDEVREP)/Include/cimage.h \
    252  $(EROSDEVREP)/Include/rzimage.h $(EROSDEVREP)/Include/rzvect.h \
    253  $(EROSDEVREP)/Include/datatypes.h \
    254  $(EROSDEVREP)/Include/dvlist.h $(EROSDEVREP)/Include/fct1dfit.h \
    255  $(EROSDEVREP)/Include/generalfit.h \
    256  $(EROSDEVREP)/Include/matrix.h $(EROSDEVREP)/Include/cvector.h \
    257  $(EROSDEVREP)/Include/fct2dfit.h \
    258  $(EROSDEVREP)/Include/pixelmap.h \
    259  $(EROSDEVREP)/Include/transfo.h $(EROSDEVREP)/Include/poly.h \
    260  $(EROSDEVREP)/Include/zfidu.h $(EROSDEVREP)/Include/imgalig.h \
    261  $(EROSDEVREP)/Include/fitsimage.h \
    262  $(EROSDEVREP)/Include/fitsheader.h \
    263  $(EROSDEVREP)/Include/erosio.h $(EROSDEVREP)/Include/fitskeys.h \
    264  $(EROSDEVREP)/Include/erostape.h \
    265  $(EROSDEVREP)/Include/strutil.h \
    266  $(EROSDEVREP)/Include/ptrarray.h \
    267  $(EROSDEVREP)/Include/voidptrarray.h \
    268  $(EROSDEVREP)/Include/basearray.h $(EROSDEVREP)/Include/array.h \
    269  $(EROSDEVREP)/Include/lockfile.h \
    270  $(EROSDEVREP)/Include/erostarfile.h \
    271  $(EROSDEVREP)/Include/xstrstream.h \
    272  $(EROSDEVREP)/Include/dates.h $(EROSDEVREP)/Include/tarlib.h \
     251$(OBJ)pistlist.o: pistlist.cc pistlist.h $(INC)stlist.h \
     252 $(INC)machine.h $(INC)defs.h \
     253 $(INC)exceptions.h \
     254 $(INC)peidainit.h \
     255 $(INC)perrors.h \
     256 $(INC)dynccd.h \
     257 $(INC)ppersist.h \
     258 $(INC)pclassids.h \
     259 $(INC)imaginit.h $(INC)star.h \
     260 $(INC)strecinit.h \
     261 $(INC)starmacro.h $(INC)psf.h \
     262 $(INC)peida.h $(INC)utils.h \
     263 $(INC)fmath.h $(INC)cimage.h \
     264 $(INC)rzimage.h \
     265 $(INC)rzvect.h \
     266 $(INC)datatypes.h \
     267 $(INC)dvlist.h \
     268 $(INC)fct1dfit.h \
     269 $(INC)generalfit.h \
     270 $(INC)matrix.h \
     271 $(INC)cvector.h \
     272 $(INC)fct2dfit.h \
     273 $(INC)pixelmap.h \
     274 $(INC)transfo.h $(INC)poly.h \
     275 $(INC)zfidu.h $(INC)imgalig.h \
     276 $(INC)fitsimage.h \
     277 $(INC)fitsheader.h \
     278 $(INC)erosio.h \
     279 $(INC)fitskeys.h \
     280 $(INC)erostape.h \
     281 $(INC)strutil.h \
     282 $(INC)ptrarray.h \
     283 $(INC)voidptrarray.h \
     284 $(INC)basearray.h \
     285 $(INC)array.h \
     286 $(INC)lockfile.h \
     287 $(INC)erostarfile.h \
     288 $(INC)xstrstream.h \
     289 $(INC)dates.h $(INC)tarlib.h \
    273290 pidrawer.h pibwdggen.h pisysdep.h piwdgx.h piwdggen.h pimsghandler.h \
    274291 picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h pigraphuc.h \
    275292 psfile.h
    276293$(OBJ)pistzwin.o: pistzwin.cc \
    277  /usr/local/lib/gcc-lib/alphaev56-dec-osf4.0d/2.8.1/include/stdio.h \
     294 /usr/local/lib/gcc-lib/alpha-dec-osf4.0/2.7.2.1/include/stdio.h \
    278295 pistzwin.h pisysdep.h piwindowx.h piwindowgen.h picontainerx.h \
    279296 picontainergen.h piwdgx.h piwdggen.h pimsghandler.h piperiodx.h \
    280  $(EROSDEVREP)/Include/periodic.h $(EROSDEVREP)/Include/defs.h \
     297 $(INC)periodic.h $(INC)defs.h \
    281298 psfile.h pigraphgen.h picmap.h picmapx.h picmapgen.h
    282299$(OBJ)pisurfdr.o: pisurfdr.cc pisurfdr.h parradapter.h \
    283  $(EROSDEVREP)/Include/defs.h $(EROSDEVREP)/Include/machine.h \
     300 $(INC)defs.h $(INC)machine.h \
    284301 lut.h pi3ddrw.h pisysdep.h pidrawer.h pibwdggen.h piwdgx.h piwdggen.h \
    285302 pimsghandler.h picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h \
    286303 pigraphuc.h psfile.h pigraph3d.h pibwdgx.h pigraphps.h
    287 $(OBJ)piup.o: piup.cc $(EROSDEVREP)/Include/ctimer.h \
    288  $(EROSDEVREP)/Include/peida.h $(EROSDEVREP)/Include/defs.h \
    289  $(EROSDEVREP)/Include/utils.h $(EROSDEVREP)/Include/machine.h \
    290  $(EROSDEVREP)/Include/perrors.h \
    291  $(EROSDEVREP)/Include/exceptions.h \
    292  $(EROSDEVREP)/Include/peidainit.h $(EROSDEVREP)/Include/fmath.h \
    293  $(EROSDEVREP)/Include/imageop.h $(EROSDEVREP)/Include/cimage.h \
    294  $(EROSDEVREP)/Include/rzimage.h $(EROSDEVREP)/Include/rzvect.h \
    295  $(EROSDEVREP)/Include/imaginit.h \
    296  $(EROSDEVREP)/Include/datatypes.h \
    297  $(EROSDEVREP)/Include/ppersist.h \
    298  $(EROSDEVREP)/Include/pclassids.h \
    299  $(EROSDEVREP)/Include/dvlist.h $(EROSDEVREP)/Include/cspline.h \
    300  $(EROSDEVREP)/Include/cvector.h $(EROSDEVREP)/Include/matrix.h \
    301  $(EROSDEVREP)/Include/fitsimage.h \
    302  $(EROSDEVREP)/Include/fitsheader.h \
    303  $(EROSDEVREP)/Include/erosio.h $(EROSDEVREP)/Include/fitskeys.h \
    304  $(EROSDEVREP)/Include/erostape.h \
    305  $(EROSDEVREP)/Include/strutil.h \
    306  $(EROSDEVREP)/Include/ptrarray.h \
    307  $(EROSDEVREP)/Include/voidptrarray.h \
    308  $(EROSDEVREP)/Include/basearray.h $(EROSDEVREP)/Include/array.h \
    309  $(EROSDEVREP)/Include/lockfile.h \
    310  $(EROSDEVREP)/Include/erostarfile.h \
    311  $(EROSDEVREP)/Include/xstrstream.h \
    312  $(EROSDEVREP)/Include/dates.h $(EROSDEVREP)/Include/tarlib.h \
     304$(OBJ)piup.o: piup.cc $(INC)ctimer.h \
     305 $(INC)peida.h $(INC)defs.h \
     306 $(INC)utils.h $(INC)machine.h \
     307 $(INC)perrors.h \
     308 $(INC)exceptions.h \
     309 $(INC)peidainit.h \
     310 $(INC)fmath.h $(INC)imageop.h \
     311 $(INC)cimage.h \
     312 $(INC)rzimage.h \
     313 $(INC)rzvect.h \
     314 $(INC)imaginit.h \
     315 $(INC)datatypes.h \
     316 $(INC)ppersist.h \
     317 $(INC)pclassids.h \
     318 $(INC)dvlist.h \
     319 $(INC)cspline.h \
     320 $(INC)cvector.h \
     321 $(INC)matrix.h \
     322 $(INC)fitsimage.h \
     323 $(INC)fitsheader.h \
     324 $(INC)erosio.h \
     325 $(INC)fitskeys.h \
     326 $(INC)erostape.h \
     327 $(INC)strutil.h \
     328 $(INC)ptrarray.h \
     329 $(INC)voidptrarray.h \
     330 $(INC)basearray.h \
     331 $(INC)array.h \
     332 $(INC)lockfile.h \
     333 $(INC)erostarfile.h \
     334 $(INC)xstrstream.h \
     335 $(INC)dates.h $(INC)tarlib.h \
    313336 piup.h
    314337$(OBJ)piwdggen.o: piwdggen.cc piwdggen.h pimsghandler.h picontainergen.h \
    315  pisysdep.h piwdgx.h psfile.h $(EROSDEVREP)/Include/defs.h \
     338 pisysdep.h piwdgx.h psfile.h $(INC)defs.h \
    316339 pigraphgen.h picmap.h picmapx.h picmapgen.h
    317340$(OBJ)piwdgx.o: piwdgx.cc piwdgx.h piwdggen.h pimsghandler.h picontainerx.h \
    … …  
    319342$(OBJ)piwindowgen.o: piwindowgen.cc piwindowgen.h pisysdep.h picontainerx.h \
    320343 picontainergen.h piwdgx.h piwdggen.h pimsghandler.h psfile.h \
    321  $(EROSDEVREP)/Include/defs.h pigraphgen.h picmap.h picmapx.h \
     344 $(INC)defs.h pigraphgen.h picmap.h picmapx.h \
    322345 picmapgen.h
    323346$(OBJ)piwindowx.o: piwindowx.cc piwindowx.h piwindowgen.h pisysdep.h \
    … …  
    326349 piwdgx.h piwdggen.h pimsghandler.h picmap.h picmapx.h picmapgen.h \
    327350 pigraphx.h pigraphgen.h pigraphuc.h psfile.h \
    328  $(EROSDEVREP)/Include/defs.h pigraphps.h pixtbase.h
    329 $(OBJ)psfile.o: psfile.cc psfile.h $(EROSDEVREP)/Include/defs.h \
     351 $(INC)defs.h pigraphps.h pixtbase.h
     352$(OBJ)psfile.o: psfile.cc psfile.h $(INC)defs.h \
    330353 pisysdep.h pigraphgen.h piwdgx.h piwdggen.h pimsghandler.h picmap.h \
    331354 picmapx.h picmapgen.h

  • trunk/SophyaPI/PI/parradapter.cc

    r138 r140  
    1313{
    1414mSize=sz;
    15 DefineYCoordinate(0, 1.);
     15DefineXCoordinate(0, 1.);
    1616}
    1717
    … …  
    2222
    2323/* --Methode-- */
    24 void P1DArrayAdapter::DefineYCoordinate(float x0, float dx)
     24void P1DArrayAdapter::DefineXCoordinate(float x0, float dx)
    2525{
    2626mOx = x0;  mDx = dx;

  • trunk/SophyaPI/PI/parradapter.h

    r129 r140  
    1818  virtual float   Value(int i) = 0;
    1919  inline  int     Size() { return (mSize) ; }
    20   virtual void    DefineYCoordinate(float x0, float dx);
     20  virtual void    DefineXCoordinate(float x0, float dx);
    2121  virtual float   X(int i);
    2222     

  • trunk/SophyaPI/PI/picontainergen.cc

    r132 r140  
    6464{
    6565mNCh = 0;
    66 mACSup = true;   // Suppression automatique des widgets fils au delete
     66mACSup = false;   // Suppression automatique des widgets fils au delete
    6767mPaSup = false;
    68 mChilds = new (PIWdgGen * [NCHALGRP]);
     68mChilds = new (PIWdg* [NCHALGRP]);
    6969mMxCh = NCHALGRP;
    7070}
    … …  
    113113
    114114/* --Methode-- */
    115 void PIContainerGen::ChildAdd(PIWdgGen* child)
     115void PIContainerGen::ChildAdd(PIWdg* child)
    116116{
    117117if (child == NULL)  return;
    118118if (mNCh == mMxCh)
    119119  {
    120   PIWdgGen ** och = mChilds;
    121   mChilds = new (PIWdgGen * [mMxCh+NCHALGRP]);
     120  PIWdg ** och = mChilds;
     121  mChilds = new (PIWdg * [mMxCh+NCHALGRP]);
    122122  for(int i=0; i<mNCh; i++)  mChilds[i] = och[i];
    123123  delete[] och;
    … …  
    129129
    130130/* --Methode-- */
    131 void PIContainerGen::ChildDel(PIWdgGen* child)
     131void PIContainerGen::ChildDel(PIWdg* child)
    132132{
    133133if (mPaSup) return;  // Ne rien faire si delete initie par Container-parent

  • trunk/SophyaPI/PI/picontainergen.h

    r128 r140  
    2424  virtual int          Visible();
    2525
    26   virtual void         ChildAdd(PIWdgGen * child);
    27   virtual void         ChildDel(PIWdgGen * child);
     26  virtual void         ChildAdd(PIWdg* child);
     27  virtual void         ChildDel(PIWdg* child);
    2828  virtual int          NbChilds();
    2929  virtual PIWdg*       GetChild(int n);
    … …  
    3232protected:
    3333  int                  stvis;
    34   PIWdgGen          ** mChilds;
     34  PIWdg                ** mChilds;
    3535  int                  mNCh, mMxCh;
    3636  bool                 mPaSup,mACSup;

  • trunk/SophyaPI/PI/pigraphx.cc

    r138 r140  
    1717static int SmallFontIndex = 1;
    1818static int NormalFontIndex = 3;
    19 static int BigFontIndex = 5;
     19static int BigFontIndex = 6;
    2020static  PIFontAtt fntatt[3] = { PI_RomanFont, PI_BoldFont, PI_ItalicFont };
    2121#define NMAXCOL  16
    … …  
    657657NormalFontIndex = kksel;
    658658SmallFontIndex = (kksel > 1) ? kksel-2 : 0 ;
    659 BigFontIndex = (kksel < NMAXFONTSZ-2) ? kksel+2 : NMAXFONTSZ-1 ;
     659BigFontIndex = (kksel < NMAXFONTSZ-3) ? kksel+3 : NMAXFONTSZ-1 ;
    660660
    661661//printf("PIGraphicX::Init()-DBG- FontIndex= %d %d %d (%d) \n",

  • trunk/SophyaPI/PI/piinit.cc

    r93 r140  
    2121}
    2222
     23// On met un objet initiator en statique, pour les loaders qui savent
     24// appeler le constructeur des objets statiques   Reza 08/98
     25static PeidaInteractiveInitiator  pinteractivexxinit;

  • trunk/SophyaPI/PI/pistzwin.cc

    r139 r140  
    3333
    3434/* --Methode-- */
    35 void PIStackWindow::ChildAdd(PIWdgGen* child)
     35void PIStackWindow::ChildAdd(PIWdg* child)
    3636{
    3737int k;
    … …  
    4444
    4545/* --Methode-- */
    46 void PIStackWindow::ChildDel(PIWdgGen* child)
     46void PIStackWindow::ChildDel(PIWdg* child)
    4747{
    4848int k;
    … …  
    6868  GetChild(k)->PSPrint(psf, ofx, ofy);
    6969  }
     70}
     71
     72/* --Methode-- */
     73PIWdg* PIStackWindow::CurrentWdg()
     74{
     75return(GetChild(mCurdisp));
    7076}
    7177
    … …  
    128134mZx = nzx;  mZy = nzy;   mZc = 0;
    129135
    130 mZWdg = new PIWdgGen*[nzx*nzy];
     136mZWdg = new PIWdg*[nzx*nzy];
    131137for(i=0; i<mZx*mZy; i++) mZWdg[i] = NULL;
    132138}
    … …  
    134140
    135141/* --Methode-- */
    136 void PIZoneWindow::ChildAdd(PIWdgGen * child)
     142void PIZoneWindow::ChildAdd(PIWdg * child)
    137143{
    138144if (!child) return;
    … …  
    156162
    157163/* --Methode-- */
    158 void PIZoneWindow::ChildDel(PIWdgGen * child)
     164void PIZoneWindow::ChildDel(PIWdg * child)
    159165{
    160166if (!child)  return;

  • trunk/SophyaPI/PI/pistzwin.h

    r139 r140  
    2020                ~PIStackWindow();
    2121
    22   virtual void  ChildAdd(PIWdgGen* child);
    23   virtual void  ChildDel(PIWdgGen* child);
     22  virtual void  ChildAdd(PIWdg* child);
     23  virtual void  ChildDel(PIWdg* child);
    2424
    2525  virtual void  PSPrint(PSFile *psf, int ofx=0, int ofy=0);
    2626
     27  virtual PIWdg*  CurrentWdg();
    2728  virtual void  DispNext();
    2829  virtual void  StartAutoDisp(int dt);
    … …  
    4445                ~PIZoneWindow();
    4546
    46   virtual void  ChildAdd(PIWdgGen * child);
    47   virtual void  ChildDel(PIWdgGen * child);
     47  virtual void  ChildAdd(PIWdg* child);
     48  virtual void  ChildDel(PIWdg* child);
    4849  virtual void  SetZone(int nzx, int nzy);
    4950  virtual void  NbZone(int& nzx, int& nzy);
    … …  
    5253protected:
    5354  int mZx, mZy, mZc;
    54   PIWdgGen** mZWdg;
     55  PIWdg** mZWdg;
    5556};
    5657#endif

  • trunk/SophyaPI/PI/pitestapp.cc

    r123 r140  
    247247    if (!fgpxm)  { wp3->Show();  fgpxm = true; }
    248248    for (int i=0; i<25000; i++)  pixels[i] = rand()%32;
    249     if ((x % 3) == 0)  pxm->SetColMap(CMAP_GREY32);
    250     if ((x % 3) == 1)  pxm->SetColMap(CMAP_COLRJ32);
    251     if ((x % 3) == 2)  pxm->SetColMap(CMAP_COLBR32);
     249    if ((x % 3) == 0)  pxm->SetColMapId(CMAP_GREY32);
     250    if ((x % 3) == 1)  pxm->SetColMapId(CMAP_COLRJ32);
     251    if ((x % 3) == 2)  pxm->SetColMapId(CMAP_COLBR32);
    252252//    pxm->Refresh();
    253253    if (cur)
    254254      {
    255255//      printf("Process: Setting ColMap for (%lx) \n", (long)cur);
    256       if ((x % 3) == 0)  cur->SetColMap(CMAP_GREY32);
    257       if ((x % 3) == 1)  cur->SetColMap(CMAP_COLRJ32);
    258       if ((x % 3) == 2)  cur->SetColMap(CMAP_COLBR32);
     256      if ((x % 3) == 0)  cur->SetColMapId(CMAP_GREY32);
     257      if ((x % 3) == 1)  cur->SetColMapId(CMAP_COLRJ32);
     258      if ((x % 3) == 2)  cur->SetColMapId(CMAP_COLBR32);
    259259      }
    260260    }
    … …  
    344344        pimg[nimg]->SetBinding(PIBK_fixed,PIBK_fixed,PIBK_fixed,PIBK_fixed );
    345345        pimg[nimg]->SetZoomWin(zoom);
    346         pimg[nimg]->SetTextWin(labimg);
    347346        pimg[nimg]->SetImage(new RzImageAdapter(img[nimg], true) );
    348347        pimg[nimg]->Apply();

  • trunk/SophyaPI/PI/piwdggen.h

    r132 r140  
    3939//  string               kindstr();
    4040
    41   inline PIWdgGen*       Parent() { return( (PIWdgGen*)parent ); }
     41  inline PIContainerGen* Parent() { return( parent ); }
    4242
    4343  inline void            SetUserData( void * p, int fg = 0) {pdata=p; flag=fg; }
Note: See TracChangeset for help on using the changeset viewer.