Changeset 163 in Sophya
- Timestamp:
- Dec 17, 1998, 1:58:04 AM (27 years ago)
- Location:
- trunk/SophyaPI/PI
- Files:
-
- 2 added
- 39 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/SophyaPI/PI/Makefile
r159 r163 4 4 5 5 all: $(LIB)libPI.a 6 $(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)pi evthandler.o $(OBJ)pifilechogen.o $(OBJ)pifilechox.o $(OBJ)pigfd1.o $(OBJ)pigfd2.o $(OBJ)pigraph3d.o $(OBJ)pigraphgen.o $(OBJ)pigraphps.o $(OBJ)pigraphuc.o $(OBJ)pigraphx.o $(OBJ)pihisto.o $(OBJ)pihisto2d.o $(OBJ)piimage.o $(OBJ)piimgtools.o $(OBJ)piinit.o $(OBJ)pilistgen.o $(OBJ)pilistx.o $(OBJ)pimenubargen.o $(OBJ)pimenubarx.o $(OBJ)pimenugen.o $(OBJ)pimenux.o $(OBJ)pimsghandler.o $(OBJ)pintup3d.o $(OBJ)pintuple.o $(OBJ)pioptmenugen.o $(OBJ)pioptmenux.o $(OBJ)piperiodx.o $(OBJ)pipixmapgen.o $(OBJ)pipixmapx.o $(OBJ)pipodrw.o $(OBJ)piscdrawwdg.o $(OBJ)pistdwdggen.o $(OBJ)pistdwdgx.o $(OBJ)pistlist.o $(OBJ)pistzwin.o $(OBJ)pisurfdr.o $(OBJ)piup.o $(OBJ)piwdggen.o $(OBJ)piwdgx.o $(OBJ)piwindowgen.o $(OBJ)piwindowx.o $(OBJ)pixtbase.o $(OBJ)psfile.o6 $(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)pifilechogen.o $(OBJ)pifilechox.o $(OBJ)pigfd1.o $(OBJ)pigfd2.o $(OBJ)pigraph3d.o $(OBJ)pigraphgen.o $(OBJ)pigraphps.o $(OBJ)pigraphuc.o $(OBJ)pigraphx.o $(OBJ)pihisto.o $(OBJ)pihisto2d.o $(OBJ)piimage.o $(OBJ)piimgtools.o $(OBJ)piinit.o $(OBJ)pilistgen.o $(OBJ)pilistx.o $(OBJ)pimenubargen.o $(OBJ)pimenubarx.o $(OBJ)pimenugen.o $(OBJ)pimenux.o $(OBJ)pimsghandler.o $(OBJ)pintup3d.o $(OBJ)pintuple.o $(OBJ)pioptmenugen.o $(OBJ)pioptmenux.o $(OBJ)piperiodx.o $(OBJ)pipixmapgen.o $(OBJ)pipixmapx.o $(OBJ)pipodrw.o $(OBJ)piscdrawwdg.o $(OBJ)pistdwdggen.o $(OBJ)pistdwdgx.o $(OBJ)pistlist.o $(OBJ)pistzwin.o $(OBJ)pisurfdr.o $(OBJ)piup.o $(OBJ)piwdggen.o $(OBJ)piwdgx.o $(OBJ)piwindowgen.o $(OBJ)piwindowx.o $(OBJ)pixtbase.o $(OBJ)psfile.o 7 7 $(AR) $(ARFLAGS) $@ $? 8 8 ifeq ($(CXX),cxx) … … 12 12 13 13 clean: 14 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)pi evthandler.o $(OBJ)pifilechogen.o $(OBJ)pifilechox.o $(OBJ)pigfd1.o $(OBJ)pigfd2.o $(OBJ)pigraph3d.o $(OBJ)pigraphgen.o $(OBJ)pigraphps.o $(OBJ)pigraphuc.o $(OBJ)pigraphx.o $(OBJ)pihisto.o $(OBJ)pihisto2d.o $(OBJ)piimage.o $(OBJ)piimgtools.o $(OBJ)piinit.o $(OBJ)pilistgen.o $(OBJ)pilistx.o $(OBJ)pimenubargen.o $(OBJ)pimenubarx.o $(OBJ)pimenugen.o $(OBJ)pimenux.o $(OBJ)pimsghandler.o $(OBJ)pintup3d.o $(OBJ)pintuple.o $(OBJ)pioptmenugen.o $(OBJ)pioptmenux.o $(OBJ)piperiodx.o $(OBJ)pipixmapgen.o $(OBJ)pipixmapx.o $(OBJ)pipodrw.o $(OBJ)piscdrawwdg.o $(OBJ)pistdwdggen.o $(OBJ)pistdwdgx.o $(OBJ)pistlist.o $(OBJ)pistzwin.o $(OBJ)pisurfdr.o $(OBJ)piup.o $(OBJ)piwdggen.o $(OBJ)piwdgx.o $(OBJ)piwindowgen.o $(OBJ)piwindowx.o $(OBJ)pixtbase.o $(OBJ)psfile.o14 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)pifilechogen.o $(OBJ)pifilechox.o $(OBJ)pigfd1.o $(OBJ)pigfd2.o $(OBJ)pigraph3d.o $(OBJ)pigraphgen.o $(OBJ)pigraphps.o $(OBJ)pigraphuc.o $(OBJ)pigraphx.o $(OBJ)pihisto.o $(OBJ)pihisto2d.o $(OBJ)piimage.o $(OBJ)piimgtools.o $(OBJ)piinit.o $(OBJ)pilistgen.o $(OBJ)pilistx.o $(OBJ)pimenubargen.o $(OBJ)pimenubarx.o $(OBJ)pimenugen.o $(OBJ)pimenux.o $(OBJ)pimsghandler.o $(OBJ)pintup3d.o $(OBJ)pintuple.o $(OBJ)pioptmenugen.o $(OBJ)pioptmenux.o $(OBJ)piperiodx.o $(OBJ)pipixmapgen.o $(OBJ)pipixmapx.o $(OBJ)pipodrw.o $(OBJ)piscdrawwdg.o $(OBJ)pistdwdggen.o $(OBJ)pistdwdgx.o $(OBJ)pistlist.o $(OBJ)pistzwin.o $(OBJ)pisurfdr.o $(OBJ)piup.o $(OBJ)piwdggen.o $(OBJ)piwdgx.o $(OBJ)piwindowgen.o $(OBJ)piwindowx.o $(OBJ)pixtbase.o $(OBJ)psfile.o 15 15 ifeq ($(CXX),cxx) 16 16 cd $(REPM); rm -f *.o … … 19 19 $(OBJ)lut.o: lut.cc $(INC)defs.h lut.h 20 20 $(OBJ)parradapter.o: parradapter.cc parradapter.h \ 21 $(INC)defs.h $(INC)machine.h\22 lut.h21 $(INC)defs.h \ 22 $(INC)machine.h lut.h 23 23 $(OBJ)pi3ddrw.o: pi3ddrw.cc pi3ddrw.h pisysdep.h pidrawer.h pibwdggen.h \ 24 24 piwdgx.h piwdggen.h pimsghandler.h picmap.h picmapx.h picmapgen.h \ 25 25 pigraphx.h pigraphgen.h pigraphuc.h psfile.h \ 26 $(INC)defs.h pigraph3d.h pibwdgx.h pigraphps.h\27 pi drwtools.h pistdwdgx.h pistdwdggen.h pioptmenux.h pioptmenugen.h \28 pi menux.h pimenugen.h piwindowx.h piwindowgen.h picontainerx.h \29 picontainer gen.h piapplx.h piapplgen.h pimenubarx.h pimenubargen.h \30 pi cons.h26 $(INC)defs.h pigraph3d.h pibwdgx.h \ 27 pigraphps.h pidrwtools.h pistdwdgx.h pistdwdggen.h pioptmenux.h \ 28 pioptmenugen.h pimenux.h pimenugen.h piwindowx.h piwindowgen.h \ 29 picontainerx.h picontainergen.h piapplx.h piapplgen.h pimenubarx.h \ 30 pimenubargen.h picons.h 31 31 $(OBJ)piapplgen.o: piapplgen.cc piapplgen.h pimsghandler.h pisysdep.h \ 32 32 picontainerx.h picontainergen.h piwdgx.h piwdggen.h pimenubarx.h \ … … 71 71 $(OBJ)pidrawer.o: pidrawer.cc pidrawer.h pibwdggen.h pisysdep.h piwdgx.h \ 72 72 piwdggen.h pimsghandler.h picmap.h picmapx.h picmapgen.h pigraphx.h \ 73 pigraphgen.h pigraphuc.h psfile.h $(INC)defs.h 73 pigraphgen.h pigraphuc.h psfile.h \ 74 $(INC)defs.h 74 75 $(OBJ)pidrawwin.o: pidrawwin.cc pidrawwin.h pisysdep.h piwindowx.h \ 75 76 piwindowgen.h picontainerx.h picontainergen.h piwdgx.h piwdggen.h \ … … 84 85 pimenubargen.h picons.h pibwdgx.h pibwdggen.h picmap.h picmapx.h \ 85 86 picmapgen.h pigraphx.h pigraphgen.h pigraphuc.h psfile.h \ 86 $(INC)defs.h pigraphps.h piscdrawwdg.h pidrawer.h \ 87 pi3ddrw.h pigraph3d.h 88 $(OBJ)pievthandler.o: pievthandler.cc 87 $(INC)defs.h pigraphps.h piscdrawwdg.h \ 88 pidrawer.h pi3ddrw.h pigraph3d.h 89 89 $(OBJ)pifilechogen.o: pifilechogen.cc pifilechogen.h pisysdep.h piwdgx.h \ 90 90 piwdggen.h pimsghandler.h … … 96 96 $(INC)defs.h pigraphps.h pifilechox.h \ 97 97 pifilechogen.h piwindowx.h piwindowgen.h 98 $(OBJ)pigfd1.o: pigfd1.cc pigfd1.h $(INC)generaldata.h \ 99 $(INC)exceptions.h \ 100 $(INC)defs.h \ 101 $(INC)peidainit.h \ 102 $(INC)ppersist.h \ 103 $(INC)machine.h \ 104 $(INC)perrors.h \ 105 $(INC)pclassids.h \ 106 $(INC)poly.h $(INC)peida.h \ 107 $(INC)utils.h $(INC)fmath.h \ 108 $(INC)cvector.h \ 109 $(INC)matrix.h pidrawer.h pibwdggen.h pisysdep.h \ 110 piwdgx.h piwdggen.h pimsghandler.h picmap.h picmapx.h picmapgen.h \ 111 pigraphx.h pigraphgen.h pigraphuc.h psfile.h 112 $(OBJ)pigfd2.o: pigfd2.cc pigfd2.h $(INC)generaldata.h \ 113 $(INC)exceptions.h \ 114 $(INC)defs.h \ 115 $(INC)peidainit.h \ 116 $(INC)ppersist.h \ 117 $(INC)machine.h \ 118 $(INC)perrors.h \ 119 $(INC)pclassids.h \ 120 $(INC)poly.h $(INC)peida.h \ 121 $(INC)utils.h $(INC)fmath.h \ 122 $(INC)cvector.h \ 123 $(INC)matrix.h pi3ddrw.h pisysdep.h pidrawer.h \ 124 pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picmap.h picmapx.h \ 125 picmapgen.h pigraphx.h pigraphgen.h pigraphuc.h psfile.h pigraph3d.h \ 126 pibwdgx.h pigraphps.h 98 $(OBJ)pigfd1.o: pigfd1.cc pigfd1.h \ 99 $(INC)generaldata.h \ 100 $(INC)exceptions.h \ 101 $(INC)defs.h \ 102 $(INC)peidainit.h \ 103 $(INC)ppersist.h \ 104 $(INC)machine.h \ 105 $(INC)perrors.h \ 106 $(INC)pclassids.h \ 107 $(INC)poly.h \ 108 $(INC)peida.h \ 109 $(INC)utils.h \ 110 $(INC)fmath.h \ 111 $(INC)cvector.h \ 112 $(INC)matrix.h pidrawer.h pibwdggen.h \ 113 pisysdep.h piwdgx.h piwdggen.h pimsghandler.h picmap.h picmapx.h \ 114 picmapgen.h pigraphx.h pigraphgen.h pigraphuc.h psfile.h 115 $(OBJ)pigfd2.o: pigfd2.cc pigfd2.h \ 116 $(INC)generaldata.h \ 117 $(INC)exceptions.h \ 118 $(INC)defs.h \ 119 $(INC)peidainit.h \ 120 $(INC)ppersist.h \ 121 $(INC)machine.h \ 122 $(INC)perrors.h \ 123 $(INC)pclassids.h \ 124 $(INC)poly.h \ 125 $(INC)peida.h \ 126 $(INC)utils.h \ 127 $(INC)fmath.h \ 128 $(INC)cvector.h \ 129 $(INC)matrix.h pi3ddrw.h pisysdep.h \ 130 pidrawer.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picmap.h \ 131 picmapx.h picmapgen.h pigraphx.h pigraphgen.h pigraphuc.h psfile.h \ 132 pigraph3d.h pibwdgx.h pigraphps.h 127 133 $(OBJ)pigraph3d.o: pigraph3d.cc pigraph3d.h pisysdep.h pigraphuc.h \ 128 134 pigraphgen.h piwdgx.h piwdggen.h pimsghandler.h picmap.h picmapx.h \ … … 138 144 piwdggen.h pimsghandler.h picmap.h picmapx.h picmapgen.h 139 145 $(OBJ)pihisto.o: pihisto.cc pihisto.h $(INC)histos.h \ 140 $(INC)peida.h $(INC)defs.h \ 141 $(INC)utils.h $(INC)machine.h \ 142 $(INC)perrors.h \ 143 $(INC)exceptions.h \ 144 $(INC)peidainit.h \ 145 $(INC)fmath.h $(INC)cvector.h \ 146 $(INC)peida.h \ 147 $(INC)defs.h \ 148 $(INC)utils.h \ 149 $(INC)machine.h \ 150 $(INC)perrors.h \ 151 $(INC)exceptions.h \ 152 $(INC)peidainit.h \ 153 $(INC)fmath.h \ 154 $(INC)cvector.h \ 146 155 $(INC)matrix.h \ 147 156 $(INC)ppersist.h \ … … 155 164 pistdwdggen.h pibwdgx.h pibwdggen.h picmap.h picmapx.h picmapgen.h \ 156 165 pigraphx.h pigraphgen.h pigraphuc.h psfile.h \ 157 $(INC)defs.h pigraphps.h pihisto2d.h pioptmenux.h \ 158 pioptmenugen.h $(INC)histos2.h \ 159 $(INC)peida.h $(INC)utils.h \ 160 $(INC)machine.h \ 161 $(INC)perrors.h \ 162 $(INC)exceptions.h \ 163 $(INC)peidainit.h \ 164 $(INC)fmath.h $(INC)histos.h \ 166 $(INC)defs.h pigraphps.h pihisto2d.h \ 167 pioptmenux.h pioptmenugen.h $(INC)histos2.h \ 168 $(INC)peida.h \ 169 $(INC)utils.h \ 170 $(INC)machine.h \ 171 $(INC)perrors.h \ 172 $(INC)exceptions.h \ 173 $(INC)peidainit.h \ 174 $(INC)fmath.h \ 175 $(INC)histos.h \ 165 176 $(INC)cvector.h \ 166 177 $(INC)matrix.h \ … … 169 180 piwindowgen.h pidrawer.h $(INC)nbrandom.h 170 181 $(OBJ)piimage.o: piimage.cc piimage.h parradapter.h \ 171 $(INC)defs.h $(INC)machine.h \ 172 lut.h pisysdep.h pidrawer.h pibwdggen.h piwdgx.h piwdggen.h \ 173 pimsghandler.h picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h \ 174 pigraphuc.h psfile.h pipixmapx.h pipixmapgen.h pibwdgx.h pigraphps.h \ 175 pistdwdgx.h pistdwdggen.h piwindowx.h piwindowgen.h picontainerx.h \ 176 picontainergen.h picmapview.h piimgtools.h pioptmenux.h \ 177 pioptmenugen.h pimenux.h pimenugen.h piapplx.h piapplgen.h \ 178 pimenubarx.h pimenubargen.h picons.h pidrwtools.h 182 $(INC)defs.h \ 183 $(INC)machine.h lut.h pisysdep.h pidrawer.h \ 184 pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picmap.h picmapx.h \ 185 picmapgen.h pigraphx.h pigraphgen.h pigraphuc.h psfile.h pipixmapx.h \ 186 pipixmapgen.h pibwdgx.h pigraphps.h pistdwdgx.h pistdwdggen.h \ 187 piwindowx.h piwindowgen.h picontainerx.h picontainergen.h \ 188 picmapview.h piimgtools.h pioptmenux.h pioptmenugen.h pimenux.h \ 189 pimenugen.h piapplx.h piapplgen.h pimenubarx.h pimenubargen.h \ 190 picons.h pidrwtools.h 179 191 $(OBJ)piimgtools.o: piimgtools.cc piimgtools.h pisysdep.h pistdwdgx.h \ 180 192 pistdwdggen.h piwdgx.h piwdggen.h pimsghandler.h pioptmenux.h \ … … 183 195 pimenubargen.h picons.h pibwdgx.h pibwdggen.h picmap.h picmapx.h \ 184 196 picmapgen.h pigraphx.h pigraphgen.h pigraphuc.h psfile.h \ 185 $(INC)defs.h pigraphps.h piimage.h parradapter.h\186 $(INC)machine.h lut.h pidrawer.h pipixmapx.h \187 pi pixmapgen.h picmapview.h197 $(INC)defs.h pigraphps.h piimage.h \ 198 parradapter.h $(INC)machine.h lut.h \ 199 pidrawer.h pipixmapx.h pipixmapgen.h picmapview.h 188 200 $(OBJ)piinit.o: piinit.cc $(INC)defs.h piinit.h \ 189 $(INC)strecinit.h \190 201 $(INC)imaginit.h \ 191 202 $(INC)outilsinit.h \ … … 212 223 pimenugen.h piwdgx.h piwdggen.h pimsghandler.h 213 224 $(OBJ)pimsghandler.o: pimsghandler.cc pimsghandler.h 214 $(OBJ)pintup3d.o: pintup3d.cc pintup3d.h $(INC)ntuple.h \ 215 $(INC)ppersist.h $(INC)defs.h \ 216 $(INC)machine.h \ 217 $(INC)perrors.h \ 218 $(INC)exceptions.h \ 219 $(INC)peidainit.h \ 220 $(INC)pclassids.h \ 221 $(INC)dvlist.h pi3ddrw.h pisysdep.h pidrawer.h \ 222 pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picmap.h picmapx.h \ 223 picmapgen.h pigraphx.h pigraphgen.h pigraphuc.h psfile.h pigraph3d.h \ 224 pibwdgx.h pigraphps.h 225 $(OBJ)pintuple.o: pintuple.cc pintuple.h $(INC)ntuple.h \ 226 $(INC)ppersist.h $(INC)defs.h \ 227 $(INC)machine.h \ 228 $(INC)perrors.h \ 229 $(INC)exceptions.h \ 230 $(INC)peidainit.h \ 231 $(INC)pclassids.h \ 232 $(INC)dvlist.h pidrawer.h pibwdggen.h pisysdep.h \ 233 piwdgx.h piwdggen.h pimsghandler.h picmap.h picmapx.h picmapgen.h \ 234 pigraphx.h pigraphgen.h pigraphuc.h psfile.h 225 $(OBJ)pintup3d.o: pintup3d.cc pintup3d.h \ 226 $(INC)ntuple.h \ 227 $(INC)ppersist.h \ 228 $(INC)defs.h \ 229 $(INC)machine.h \ 230 $(INC)perrors.h \ 231 $(INC)exceptions.h \ 232 $(INC)peidainit.h \ 233 $(INC)pclassids.h \ 234 $(INC)dvlist.h pi3ddrw.h pisysdep.h \ 235 pidrawer.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picmap.h \ 236 picmapx.h picmapgen.h pigraphx.h pigraphgen.h pigraphuc.h psfile.h \ 237 pigraph3d.h pibwdgx.h pigraphps.h 238 $(OBJ)pintuple.o: pintuple.cc pintuple.h \ 239 $(INC)ntuple.h \ 240 $(INC)ppersist.h \ 241 $(INC)defs.h \ 242 $(INC)machine.h \ 243 $(INC)perrors.h \ 244 $(INC)exceptions.h \ 245 $(INC)peidainit.h \ 246 $(INC)pclassids.h \ 247 $(INC)dvlist.h pidrawer.h pibwdggen.h \ 248 pisysdep.h piwdgx.h piwdggen.h pimsghandler.h picmap.h picmapx.h \ 249 picmapgen.h pigraphx.h pigraphgen.h pigraphuc.h psfile.h 235 250 $(OBJ)pioptmenugen.o: pioptmenugen.cc pioptmenugen.h pisysdep.h pimenux.h \ 236 251 pimenugen.h piwdgx.h piwdggen.h pimsghandler.h … … 258 273 $(INC)machine.h lut.h \ 259 274 $(INC)cvector.h \ 260 $(INC)matrix.h $(INC)peida.h \ 261 $(INC)utils.h $(INC)perrors.h \ 275 $(INC)matrix.h \ 276 $(INC)peida.h \ 277 $(INC)utils.h \ 278 $(INC)perrors.h \ 262 279 $(INC)exceptions.h \ 263 280 $(INC)peidainit.h \ … … 283 300 $(OBJ)pistdwdgx.o: pistdwdgx.cc pisysdep.h pistdwdgx.h pistdwdggen.h \ 284 301 piwdgx.h piwdggen.h pimsghandler.h 285 $(OBJ)pistlist.o: pistlist.cc pistlist.h $(INC)stlist.h \ 286 $(INC)machine.h $(INC)defs.h \ 302 $(OBJ)pistlist.o: pistlist.cc pistlist.h \ 303 $(INC)stlist.h \ 304 $(INC)machine.h \ 305 $(INC)defs.h \ 287 306 $(INC)exceptions.h \ 288 307 $(INC)peidainit.h \ … … 292 311 $(INC)pclassids.h \ 293 312 $(INC)star.h \ 294 $(INC)starmacro.h $(INC)psf.h \ 295 $(INC)peida.h $(INC)utils.h \ 296 $(INC)fmath.h $(INC)cimage.h \ 313 $(INC)starmacro.h \ 314 $(INC)psf.h \ 315 $(INC)peida.h \ 316 $(INC)utils.h \ 317 $(INC)fmath.h \ 318 $(INC)cimage.h \ 297 319 $(INC)rzimage.h \ 298 320 $(INC)rzvect.h \ … … 304 326 $(INC)cvector.h \ 305 327 $(INC)generaldata.h \ 306 $(INC)poly.h $(INC)fct2dfit.h \ 328 $(INC)poly.h \ 329 $(INC)fct2dfit.h \ 307 330 $(INC)pixelmap.h \ 308 $(INC)transfo.h $(INC)zfidu.h \ 331 $(INC)transfo.h \ 332 $(INC)zfidu.h \ 309 333 $(INC)imgalig.h \ 310 334 $(INC)fitsimage.h \ … … 321 345 $(INC)erostarfile.h \ 322 346 $(INC)xstrstream.h \ 323 $(INC)dates.h $(INC)tarlib.h\324 pidrawer.h pibwdggen.h pisysdep.h piwdgx.h piwdggen.h pimsghandler.h \325 pi cmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h pigraphuc.h \326 p sfile.h347 $(INC)dates.h \ 348 $(INC)tarlib.h pidrawer.h pibwdggen.h \ 349 pisysdep.h piwdgx.h piwdggen.h pimsghandler.h picmap.h picmapx.h \ 350 picmapgen.h pigraphx.h pigraphgen.h pigraphuc.h psfile.h 327 351 $(OBJ)pistzwin.o: pistzwin.cc pistzwin.h pisysdep.h piwindowx.h \ 328 352 piwindowgen.h picontainerx.h picontainergen.h piwdgx.h piwdggen.h \ … … 331 355 picmapx.h picmapgen.h 332 356 $(OBJ)pisurfdr.o: pisurfdr.cc pisurfdr.h parradapter.h \ 333 $(INC)defs.h $(INC)machine.h \ 334 lut.h pi3ddrw.h pisysdep.h pidrawer.h pibwdggen.h piwdgx.h piwdggen.h \ 335 pimsghandler.h picmap.h picmapx.h picmapgen.h pigraphx.h pigraphgen.h \ 336 pigraphuc.h psfile.h pigraph3d.h pibwdgx.h pigraphps.h 357 $(INC)defs.h \ 358 $(INC)machine.h lut.h pi3ddrw.h pisysdep.h \ 359 pidrawer.h pibwdggen.h piwdgx.h piwdggen.h pimsghandler.h picmap.h \ 360 picmapx.h picmapgen.h pigraphx.h pigraphgen.h pigraphuc.h psfile.h \ 361 pigraph3d.h pibwdgx.h pigraphps.h 337 362 $(OBJ)piup.o: piup.cc $(INC)ctimer.h \ 338 $(INC)peida.h $(INC)defs.h \ 339 $(INC)utils.h $(INC)machine.h \ 340 $(INC)perrors.h \ 341 $(INC)exceptions.h \ 342 $(INC)peidainit.h \ 343 $(INC)fmath.h $(INC)imageop.h \ 363 $(INC)peida.h \ 364 $(INC)defs.h \ 365 $(INC)utils.h \ 366 $(INC)machine.h \ 367 $(INC)perrors.h \ 368 $(INC)exceptions.h \ 369 $(INC)peidainit.h \ 370 $(INC)fmath.h \ 371 $(INC)imageop.h \ 344 372 $(INC)cimage.h \ 345 373 $(INC)rzimage.h \ … … 365 393 $(INC)erostarfile.h \ 366 394 $(INC)xstrstream.h \ 367 $(INC)dates.h $(INC)tarlib.h\368 piup.h395 $(INC)dates.h \ 396 $(INC)tarlib.h piup.h 369 397 $(OBJ)piwdggen.o: piwdggen.cc piwdggen.h pimsghandler.h picontainergen.h \ 370 398 pisysdep.h piwdgx.h psfile.h $(INC)defs.h \ -
trunk/SophyaPI/PI/exclude
r113 r163 29 29 pitestapp.cc 30 30 piup_def.cc 31 xdispim.c 32 piup.c -
trunk/SophyaPI/PI/pi3ddrw.cc
r158 r163 129 129 list<int>::iterator it; 130 130 for(it = m3DrIl.begin(); it != m3DrIl.end(); it++) 131 #if defined(__GNUC__) && !defined(GCCV28) 131 #if defined(__DECCXX) || defined(__KCC__) 132 (dynamic_cast<PIDrawer3D*>(GetDrawerId(*it)))->Set3DView_Obs(xo, yo, zo, teta, phi, psi, dax, day, co, dco); 133 #else 132 134 ((PIDrawer3D*)(GetDrawerId(*it)))->Set3DView_Obs(xo, yo, zo, teta, phi, psi, dax, day, co, dco); 133 #else134 (dynamic_cast<PIDrawer3D*>(GetDrawerId(*it)))->Set3DView_Obs(xo, yo, zo, teta, phi, psi, dax, day, co, dco);135 135 #endif 136 136 vfixed = true; … … 144 144 list<int>::iterator it; 145 145 for(it = m3DrIl.begin(); it != m3DrIl.end(); it++) 146 #if defined(__GNUC__) && !defined(GCCV28) 146 #if defined(__DECCXX) || defined(__KCC__) 147 (dynamic_cast<PIDrawer3D*>(GetDrawerId(*it)))->Set3DView(xc, yc, zc, xo, yo, zo, dax, day, dco, psi); 148 #else 147 149 ((PIDrawer3D*)(GetDrawerId(*it)))->Set3DView(xc, yc, zc, xo, yo, zo, dax, day, dco, psi); 148 #else149 (dynamic_cast<PIDrawer3D*>(GetDrawerId(*it)))->Set3DView(xc, yc, zc, xo, yo, zo, dax, day, dco, psi);150 150 #endif 151 151 vfixed = true; … … 165 165 list<int>::iterator it = m3DrIl.begin(); 166 166 if (it == m3DrIl.end()) return; 167 #if defined(__GNUC__) && !defined(GCCV28) 167 #if defined(__DECCXX) || defined(__KCC__) 168 PIDrawer3D* dr3 = dynamic_cast<PIDrawer3D*>(GetDrawerId(*it)); 169 #else 168 170 PIDrawer3D* dr3 = (PIDrawer3D*)(GetDrawerId(*it)); 169 #else170 PIDrawer3D* dr3 = dynamic_cast<PIDrawer3D*>(GetDrawerId(*it));171 171 #endif 172 172 if (dr3 == NULL) return; … … 191 191 vo = mGr3d->Get3DCS( xc, yc, zc, xo, yo, zo, teta, phi, psi, dax, day, co, dco); 192 192 list<int>::iterator it; 193 #if defined(__GNUC__) && !defined(GCCV28) 193 194 #if defined(__DECCXX) || defined(__KCC__) 195 if (vo) for(it = m3DrIl.begin(); it != m3DrIl.end(); it++) 196 (dynamic_cast<PIDrawer3D*>(GetDrawerId(*it)))->Set3DView_Obs(xo, yo, zo, teta, phi, psi, dax, day, co, dco); 197 else for(it = m3DrIl.begin(); it != m3DrIl.end(); it++) 198 (dynamic_cast<PIDrawer3D*>(GetDrawerId(*it)))->Set3DView(xc, yc, zc, xo, yo, zo, dax, day, dco, psi); 199 #else 194 200 if (vo) for(it = m3DrIl.begin(); it != m3DrIl.end(); it++) 195 201 ((PIDrawer3D*)(GetDrawerId(*it)))->Set3DView_Obs(xo, yo, zo, teta, phi, psi, dax, day, co, dco); 196 202 else for(it = m3DrIl.begin(); it != m3DrIl.end(); it++) 197 203 ((PIDrawer3D*)(GetDrawerId(*it)))->Set3DView(xc, yc, zc, xo, yo, zo, dax, day, dco, psi); 198 #else199 if (vo) for(it = m3DrIl.begin(); it != m3DrIl.end(); it++)200 (dynamic_cast<PIDrawer3D*>(GetDrawerId(*it)))->Set3DView_Obs(xo, yo, zo, teta, phi, psi, dax, day, co, dco);201 else for(it = m3DrIl.begin(); it != m3DrIl.end(); it++)202 (dynamic_cast<PIDrawer3D*>(GetDrawerId(*it)))->Set3DView(xc, yc, zc, xo, yo, zo, dax, day, dco, psi);203 204 #endif 204 205 -
trunk/SophyaPI/PI/pi3ddrw.h
r158 r163 13 13 #include PIBWDG_H 14 14 15 #include <list>16 15 17 16 // ----------------- Traceur (Drawer) 3D ------------------- -
trunk/SophyaPI/PI/piapplx.cc
r141 r163 91 91 sx, sy, 0, msy); 92 92 topcont->Show(); 93 94 93 MBCont()->Show(); 94 95 95 topwdg->Manage(); 96 96 … … 258 258 fcntl(p[0], F_SETFL, O_NONBLOCK); 259 259 260 #if (!defined(__GNUG__) && !defined(__aCC__)) 260 261 setlinebuf(stdout); 262 #endif 261 263 ios::sync_with_stdio(); 262 264 … … 290 292 fcntl(p[0], F_SETFL, O_NONBLOCK); 291 293 294 #if (!defined(__GNUG__) && !defined(__aCC__)) 292 295 setlinebuf(stderr); 296 #endif 293 297 ios::sync_with_stdio(); 294 298 -
trunk/SophyaPI/PI/pibwdggen.cc
r158 r163 10 10 #include "pidrwtools.h" 11 11 12 static inline void fl_swap(float& a, float& b) { float tmp = a; a = b; b = tmp; } 12 13 13 14 //++ … … 536 537 guc->GrC2UC(XSize(), YSize(), xmax, ymax); 537 538 } 538 if (xmin > xmax) swap(xmin,xmax);539 if (ymin > ymax) swap(ymin,ymax);539 if (xmin > xmax) fl_swap(xmin,xmax); 540 if (ymin > ymax) fl_swap(ymin,ymax); 540 541 (*it).drw->Draw(guc, xmin, ymin, xmax, ymax); 541 542 g->RestoreGraphicAtt(); … … 592 593 guc->GrC2UC(0, 0, xmin, ymin); 593 594 guc->GrC2UC(XSize(), YSize(), xmax, ymax); 594 if (xmin > xmax) swap(xmin,xmax);595 if (ymin > ymax) swap(ymin,ymax);595 if (xmin > xmax) fl_swap(xmin,xmax); 596 if (ymin > ymax) fl_swap(ymin,ymax); 596 597 (*it).drw->Draw(guc, xmin, ymin, xmax, ymax); 597 598 g->RestoreGraphicAtt(); -
trunk/SophyaPI/PI/pibwdggen.h
r158 r163 12 12 // Mettre dans cet ordre, sinon g++ a des problemes 13 13 #include <vector> 14 #if defined(__KCC__) 15 #include <vector.h> 16 #endif 14 17 15 18 enum PIKeyModifier { PIKM_Blank = 0, PIKM_Shift = 1, PIKM_Alt = 2, PIKM_Cntl = 4 } ; -
trunk/SophyaPI/PI/picmap.cc
r72 r163 3 3 #define MXMAPIDS 10 4 4 static int MapNCols[MXMAPIDS] = {256, 256, 256, 256, 256, 256, 256, 256, 256, 256}; 5 static c har* MapNoms[MXMAPIDS] = {"Grey32","InvGrey32","ColRJ32","ColBR32",5 static const char* MapNoms[MXMAPIDS] = {"Grey32","InvGrey32","ColRJ32","ColBR32", 6 6 "ColRV32", "Grey128", "InvGrey128", "ColRJ128", 7 7 "ColBR128", "Col16"}; -
trunk/SophyaPI/PI/picmapgen.cc
r63 r163 2 2 #include <list> 3 3 #include <algorithm> 4 #if defined(__KCC__) 5 #include <list.h> 6 #include <algorithm.h> 7 #endif 4 8 #include "pisysdep.h" 5 9 #include PICMAPNTV_H -
trunk/SophyaPI/PI/picmapgen.h
r64 r163 5 5 #include <string> 6 6 #include <string.h> 7 #if defined(__KCC__) 8 using std::string ; 9 #endif 7 10 8 11 -
trunk/SophyaPI/PI/picmapx.cc
r112 r163 47 47 PIColor PIColorMapX::GetColor(int n) 48 48 { 49 PIColor picr;50 picr.red = picr.green = picr.blue = 0;51 52 49 if ((n<0) || (n >= NCol())) 53 50 { … … 60 57 61 58 static Colormap defxcmap; 62 static xinicmap = 0;59 static int xinicmap = 0; 63 60 static int NTotColors = 0; 64 61 static int NTotAllocCol = 0; -
trunk/SophyaPI/PI/pidrawer.cc
r158 r163 5 5 6 6 #include "pidrawer.h" 7 #include "psfile.h"8 7 9 8 //++ -
trunk/SophyaPI/PI/pidrawer.h
r158 r163 8 8 #include "pibwdggen.h" 9 9 #include "pigraphuc.h" 10 10 11 #include <list> 12 #if defined(__KCC__) 13 #include <list.h> 14 #endif 11 15 12 16 enum { -
trunk/SophyaPI/PI/pidrwtools.cc
r158 r163 236 236 { 237 237 if (cwdrwt == this) cwdrwt = NULL; 238 for(int i=0; i<2; i++) 238 int i; 239 for(i=0; i<2; i++) 239 240 { 240 241 delete mLab[i]; … … 245 246 } 246 247 delete mBut[2]; 247 for(i nt i=0; i<6; i++) delete mOpt[i];248 for(i=0; i<6; i++) delete mOpt[i]; 248 249 delete mNlb; 249 250 } -
trunk/SophyaPI/PI/pierrdisp.h
r23 r163 8 8 #include PICONT_H 9 9 #include PIPERIOD_H 10 #include <string>11 10 12 11 #include "errorhandlerc.h" -
trunk/SophyaPI/PI/pifilechogen.h
r23 r163 2 2 #define PIFILCHOGEN_H_SEEN 3 3 4 #include <string>5 4 #include "pisysdep.h" 6 5 #include PIWDG_H -
trunk/SophyaPI/PI/pifilechox.h
r23 r163 2 2 #define PIFILCHOX_H_SEEN 3 3 4 #include <string>5 4 #include "pisysdep.h" 6 5 #include "pifilechogen.h" -
trunk/SophyaPI/PI/pigfd2.cc
r151 r163 64 64 if(mLAtt!=PI_NotDefLineAtt) SelectErrBar(true,true,true); 65 65 66 #if defined(__GNUC__) && !defined(GCCV28) 66 #if defined(__DECCXX) || defined(__KCC__) 67 PIGraphic3D* g3 = dynamic_cast<PIGraphic3D*>(g); 68 #else 67 69 PIGraphic3D* g3 = (PIGraphic3D*)(g); 68 #else69 PIGraphic3D* g3 = dynamic_cast<PIGraphic3D*>(g);70 70 #endif 71 71 -
trunk/SophyaPI/PI/pigfname.h
r2 r163 3 3 4 4 #include <string> 5 #if defined(__KCC__) 6 using std::string ; 7 #endif 5 8 6 9 string PIGetFileName(string = ""); -
trunk/SophyaPI/PI/pigraph3d.cc
r158 r163 96 96 //| psi : rotation du plan image 97 97 //-- 98 99 #if defined(__KCC__) 100 #ifndef M_PI 101 #define M_PI 3.14159265358979323846 /* pi */ 102 #define M_PI_2 1.57079632679489661923 /* pi/2 */ 103 #endif 104 #endif 98 105 99 106 static float deuxpi = 2*M_PI; -
trunk/SophyaPI/PI/pigraphps.cc
r158 r163 188 188 xtmp = new float[n]; 189 189 ytmp = new float[n]; 190 for(i nt i= 0 ; i < n ; i++) {xtmp[i] = (float)x[i] ; ytmp[i] = (float)y[i] ; }190 for(i = 0 ; i < n ; i++) {xtmp[i] = (float)x[i] ; ytmp[i] = (float)y[i] ; } 191 191 //float xoff,yoff; 192 192 //if (cinc) { xoff=yoff=0.; } // Coord en mode incremental … … 217 217 xtmp = new float[n]; 218 218 ytmp = new float[n]; 219 for(i nt i= 0 ; i < n ; i++) {xtmp[i] = (float)x[i] ; ytmp[i] = (float)y[i] ; }219 for(i = 0 ; i < n ; i++) {xtmp[i] = (float)x[i] ; ytmp[i] = (float)y[i] ; } 220 220 //float xoff,yoff; 221 221 //if (cinc) { xoff=yoff=0.; } // Coord en mode incremental -
trunk/SophyaPI/PI/piimage.cc
r138 r163 7 7 #include <stdlib.h> 8 8 #include <stdio.h> 9 #include <string>10 9 #include <string.h> 11 10 -
trunk/SophyaPI/PI/piimgtools.cc
r157 r163 199 199 { 200 200 if (curlutw == this) curlutw = NULL; 201 for(int i=0; i<2; i++) 201 int i; 202 for(i=0; i<2; i++) 202 203 { 203 204 delete mLab[i]; … … 209 210 delete mOptzc[i]; 210 211 } 211 for(i nt i=0; i<5; i++) delete mButsz[i];212 for(i nt i=0; i<3; i++) delete mButcax[i];213 for(i nt i=0; i<5; i++) delete mButoa[i];212 for(i=0; i<5; i++) delete mButsz[i]; 213 for(i=0; i<3; i++) delete mButcax[i]; 214 for(i=0; i<5; i++) delete mButoa[i]; 214 215 215 216 } -
trunk/SophyaPI/PI/piinit.cc
r140 r163 6 6 7 7 PeidaInteractiveInitiator::PeidaInteractiveInitiator() 8 : Peida StarRecoInitiator()8 : PeidaImagesInitiator() 9 9 { 10 10 FgInit++; -
trunk/SophyaPI/PI/piinit.h
r162 r163 2 2 #define PIINIT_H_SEEN 3 3 4 #include " strecinit.h"4 #include "imaginit.h" 5 5 6 6 // Classe d'initialisation pour le module PI de PEIDA 7 7 8 class PeidaInteractiveInitiator : public Peida StarRecoInitiator{8 class PeidaInteractiveInitiator : public PeidaImagesInitiator{ 9 9 private: 10 10 static int FgInit; -
trunk/SophyaPI/PI/pilistx.cc
r113 r163 107 107 mNItem++; 108 108 109 #if defined(__xlC) 110 XmString xms = XmStringCreate((char *)(item), XmSTRING_DEFAULT_CHARSET); 111 #else 109 112 XmString xms = XmStringCreate(const_cast<char *>(item), XmSTRING_DEFAULT_CHARSET); 113 #endif 110 114 XmListAddItem(mlist, xms, 0); 111 115 XmStringFree(xms); -
trunk/SophyaPI/PI/pintup3d.cc
r138 r163 84 84 if ( (xK < 0) || (yK < 0) || (zK < 0) ) return; 85 85 86 #if defined(__GNUC__) && !defined(GCCV28) 86 #if defined(__DECCXX) || defined(__KCC__) 87 PIGraphic3D* g3 = dynamic_cast<PIGraphic3D*>(g); 88 #else 87 89 PIGraphic3D* g3 = (PIGraphic3D*)(g); 88 #else89 PIGraphic3D* g3 = dynamic_cast<PIGraphic3D*>(g);90 90 #endif 91 91 -
trunk/SophyaPI/PI/pioptmenugen.h
r110 r163 2 2 #define PIOPTMENGEN_H_SEEN 3 3 4 #include <string>5 4 #include "pisysdep.h" 6 5 #include PIMENU_H -
trunk/SophyaPI/PI/pipixmapgen.h
r128 r163 10 10 11 11 #include <list> 12 #if defined(__KCC__) 13 #include <list.h> 14 #endif 12 15 13 16 class PIPixmapGen : public PIBaseWdg -
trunk/SophyaPI/PI/pipixmapx.cc
r127 r163 6 6 7 7 #include "pipixmapx.h" 8 #include "psfile.h"9 8 10 9 static GC mygc; … … 130 129 XGCValues values; 131 130 XtGCMask mask; 132 Display *mdsp;133 int scr;134 131 135 132 if (fgxpxm) return; 136 133 fgxpxm = true; 137 134 138 mdsp = XtDisplay(XtWdg());139 scr = XDefaultScreen(mdsp);140 135 141 136 mask = GCFunction | GCPlaneMask; … … 154 149 void PIPixmapX::AllocXImg() 155 150 { 156 Window xw;157 151 Display * mdsp; 158 152 int scr; … … 161 155 int i,j; 162 156 163 xw = XtWindow(XtWdg());164 157 mdsp = PIXDisplay(); 165 158 scr = PIXScreen(); -
trunk/SophyaPI/PI/piscdrawwdg.cc
r162 r163 6 6 #include "pidrwtools.h" 7 7 #include "parradapter.h" 8 9 static inline void fl_swap(float& a, float& b) { float tmp = a; a = b; b = tmp; } 8 10 9 11 PIScDrawWdg::PIScDrawWdg(PIContainerGen *par, char *nom, … … 224 226 mBDrw->GetGraphicUC()->GrC2UC(xBegDrag, yBegDrag, xl, yl); 225 227 mBDrw->GetGraphicUC()->GrC2UC(xEndDrag, yEndDrag, xh, yh); 226 if (xl > xh) swap(xl, xh);227 if (yl > yh) swap(yl, yh);228 if (xl > xh) fl_swap(xl, xh); 229 if (yl > yh) fl_swap(yl, yh); 228 230 SetLimits(xl,xh,yl,yh, kAxeDirSame, kAxeDirSame, true); 229 231 } -
trunk/SophyaPI/PI/pistdwdggen.h
r126 r163 2 2 #define PISTDWDGGEN_H_SEEN 3 3 4 #include <string> 4 5 5 #include "pisysdep.h" 6 6 #include PIWDG_H … … 84 84 kSDirRtoL = 2, 85 85 kSDirDownUp = 4, 86 kSDirUpDown = 8 ,86 kSDirUpDown = 8 87 87 }; 88 88 -
trunk/SophyaPI/PI/pisurfdr.cc
r154 r163 82 82 if (mArr == NULL) return; 83 83 84 #if defined(__GNUC__) && !defined(GCCV28) 84 #if defined(__DECCXX) || defined(__KCC__) 85 PIGraphic3D* g3 = dynamic_cast<PIGraphic3D*>(g); 86 #else 85 87 PIGraphic3D* g3 = (PIGraphic3D*)(g); 86 #else87 PIGraphic3D* g3 = dynamic_cast<PIGraphic3D*>(g);88 88 #endif 89 89 -
trunk/SophyaPI/PI/piwdggen.h
r158 r163 8 8 9 9 #include <string> 10 #if defined(__KCC__) 11 using std::string ; 12 #endif 10 13 11 14 #include "pimsghandler.h" -
trunk/SophyaPI/PI/piwdgx.cc
r138 r163 123 123 int n=0; 124 124 125 #ifdef DEBUG_PIWdgX 126 printf("Debug_PIWdgX::CreateXtWdg(%s) Getting in \n"); 127 #endif 128 125 129 if (pwdg == NULL) 126 130 { … … 503 507 504 508 // Ressources X si non definis 505 static String fallback_res[22] = {509 static const String fallback_res[22] = { 506 510 "PeidaInt*default*background: LightGrey" , 507 511 "PeidaInt*background: LightGrey" , … … 537 541 // Initialisation ... 538 542 int n; 539 c har *pc ="PIWdgX";543 const char *pc = (const char *)"PIWdgX"; 540 544 char **ppc; 541 545 if (narg > 0) { n = narg, ppc = arg; } 542 else { ppc = &pc; n = 1; } 546 #if defined(__xlC) 547 else { ppc = (char **)(&pc); n = 1; } 548 #else 549 else { ppc = const_cast<char **>(&pc); n = 1; } 550 #endif 543 551 // strncpy(appname, ppc[0], 63); appname[63] = '\0'; 544 552 strncpy(appclass,"PeidaInt",63); appclass[63] = '\0'; 545 553 // top = XtAppInitialize(&appctx, appclass, NULL, 0, &n, ppc); 546 top = XtVaAppInitialize(&appctx, appclass, NULL, 0, &n, ppc, fallback_res, NULL); 554 #if defined(__xlC) 555 top = XtVaAppInitialize(&appctx, appclass, NULL, 0, &n, ppc, (String*)(fallback_res), NULL); 556 #else 557 top = XtVaAppInitialize(&appctx, appclass, NULL, 0, &n, ppc, const_cast<String*>(fallback_res), NULL); 558 #endif 547 559 dpy = XtDisplay(top); 548 560 549 561 // On va recuperer la fonte par defaut des composantes Motif 550 562 XtResource res[] = { 551 { "fontList","FontList", XtRString, sizeof(String),563 { (char *)"fontList", (char *)"FontList", XtRString, sizeof(String), 552 564 0, XtRString, "-*-courier-bold-*-*-*-*-*-*-*-*-*-*-*" } 553 565 }; -
trunk/SophyaPI/PI/piwindowx.cc
r154 r163 78 78 if (fgactl == 0) 79 79 { 80 XtActionsRec desact = { "CloseWindow" ,CloseWindow};80 XtActionsRec desact = {(char *)"CloseWindow" ,CloseWindow}; 81 81 int szx, szy, szf; 82 82 XtAppContext * appctx = PIXtAppCtx(szx, szy, szf); -
trunk/SophyaPI/PI/pixtbase.cc
r158 r163 43 43 44 44 static XtResource resources[] ={ 45 {PIXNobject , "Object", XtRPointer, sizeof(XtRPointer),45 {PIXNobject ,(char *)"Object", XtRPointer, sizeof(XtRPointer), 46 46 XtOffset(PIXtBaseWidget, pixtbase.objet), XtRImmediate, (XtPointer)0}, 47 47 }; … … 53 53 54 54 (WidgetClass) &coreClassRec, /* pointer to superclass ClassRec */ 55 "PIXtBase",/* widget resource class name */55 (char*)"PIXtBase", /* widget resource class name */ 56 56 sizeof(PIXtBaseRec), /* size in bytes of widget record */ 57 57 init_class_pixtbase, /* class_initialize */ -
trunk/SophyaPI/PI/psfile.cc
r158 r163 295 295 */ 296 296 PSFile::PSFile(const char * FileName, float sc) 297 #if defined(__xlC) 298 : mPSFileName(FileName==NULL? "unnamed.eps" : (char *)(FileName)), 299 #else 297 300 : mPSFileName(FileName==NULL? "unnamed.eps" : const_cast<char *>(FileName)), 301 #endif 298 302 Tw (-1.), Th(-1.), /* Non specifies pour du eps */ 299 303 WMargin (-1), HMargin(-1), /* Non specifiees en eps */ … … 356 360 PIPaperSize paperSize, 357 361 float marginX, float marginY) 362 #if defined(__xlC) 363 : mPSFileName (FileName == NULL ? "unnamed.ps" : (char *)(FileName)), 364 #else 358 365 : mPSFileName (FileName == NULL ? "unnamed.ps" : const_cast<char *>(FileName)), 359 366 #endif 360 367 Tw(PaperSizeTable[paperSize].width), /* Format papier utilise */ 361 368 Th(PaperSizeTable[paperSize].height), /* */ … … 429 436 430 437 431 c har* PSFile::GetFileName() {438 const char* PSFile::GetFileName() { 432 439 433 440 return(mPSFileName); … … 884 891 fprintf(mPSFile, "%.2f Ux %.2f Uy m\n", x[0], y[0]); 885 892 886 c har* cmd ;893 const char* cmd ; 887 894 if(cinc == true) cmd = "%.2f Ux %.2f Uy rl\n" ; 888 895 else cmd = "%.2f Ux %.2f Uy l\n" ; … … 905 912 } 906 913 907 c har* cmd ;914 const char* cmd ; 908 915 if(cinc == true) cmd = "%.2f Ux %.2f Uy rl\n" ; 909 916 else cmd = "%.2f Ux %.2f Uy l\n" ; -
trunk/SophyaPI/PI/psfile.h
r158 r163 31 31 32 32 #include <list> 33 #if defined(__KCC__) 34 #include <list.h> 35 #endif 33 36 34 37 enum PIPaperSize { PI_A4 = 1, PI_A3 = 2, PI_A5 = 3, PI_NotDefPaperSize = 0}; … … 81 84 82 85 virtual int IsEPS(); 83 virtual c har* GetFileName();86 virtual const char* GetFileName(); 84 87 85 88 … … 147 150 PIColorMap *mColorMap); 148 151 149 #if ndef __DECCXX152 #if !defined(__DECCXX) && !defined(__aCC__) 150 153 private: 151 154 #endif … … 175 178 typedef list<Page> PageList; /* STL */ 176 179 177 #if def __DECCXX180 #if defined(__DECCXX) || defined(__aCC__) 178 181 private: 179 182 #endif … … 181 184 /* Fichier ps/eps */ 182 185 FILE * mPSFile; 183 c har * mPSFileName;186 const char * mPSFileName; 184 187 float Tw,Th ; /* Format, en cm */ 185 188 float WMargin,HMargin ; /* Marges minimales */
Note:
See TracChangeset
for help on using the changeset viewer.