Changeset 24 in Sophya

Timestamp:

Oct 22, 1996, 2:06:42 PM (29 years ago)

Author:

aubourg

Message:

Remise en place de modifs piqualmon ecrasees en r1.3

Location:

trunk/SophyaPI/PI

Files:

• pimak (modified) (3 diffs)
• piqualmon.cc (modified) (1 diff)
• pistatmon.cc (modified) (2 diffs)

trunk/SophyaPI/PI/pimak

@@ -6 +6 @@
 # 
 # Makefile variables set are:
-# - Path to Exec, Include, Libs, Objs directories (from EROSBASEREP env. var.)
+# - Path to Exec, Include, Libs, Obj directories (from EROSBASEREP env. var.)
 #     i.e. variables LIB, OBJ, EXE, INC 
 #---------------------------------------------------------------------------
@@ -33 +33 @@
  CCI := ${INC}/CInc/
  CXI := ${INC}/CxxInc/
+ GLB := ${GNU}/${MACHEROS}/lib/
 #--
 
@@ -76 +77 @@
 
 #------------------------------------------------- End of Makefile.h ------- 
-all : piapp piapp_nosh
+all : piup.so
 
-piapp : $(EXE)piapp $(SLB)piup.so 
- 
-piapp_nosh : $(EXE)piapp_nosh
- 
+clean:
+        rm -f piup.o piup.so
 
-$(EXE)piapp  : $(OBJ)pidemo.o $(SLB)libPI.so $(SLB)libOuIm.so \
-               $(SLB)liberosc.so $(SLB)libStarReco.so 
-        cc -call_shared -o $(EXE)piapp $(OBJ)pidemo.o \
-              -L$(SLB) -lPI -lOuIm -lerosc -lStarReco \
-              -lgcxx -lXm -lXt -lX11 -lm  
 
-$(EXE)piapp_nosh  : $(OBJ)pidemo_nosh.o $(LIB)libPI.a $(LIB)libStarReco.a  \
-               $(LIB)libOutils.a $(LIB)libImages.a $(LIB)libmath.a $(LIB)libdiv.a 
-        g++ -o $(EXE)piapp_nosh $(OBJ)pidemo_nosh.o \
-              -L$(LIB) -lPI -lStarReco -lImages -lOutils -lmath -ldiv \
-              -lXm -lXt -lX11 -lm 
- 
-$(SLB)piup.so : $(OBJ)piup_def.o \
-                $(SLB)libOuIm.so $(SLB)liberosc.so 
-        ld -shared -o $(SLB)piup.so -all $(OBJ)piup_def.o \
-        -none -L$(SLB) -lOuIm -lerosc -lgcxx -lm -lc
+piup.so : piup.o \
+          $(SLB)libpeida.so $(SLB)liberosc.so 
+        ld -shared -o piup.so -all piup.o \
+        -none -L$(SLB) -lPI -lpeida -lerosc -L$(GLB) -lg++ -lstdc++ -lm -lc
 
-$(OBJ)pidemo_nosh.o: pidemo.cc pidemo.h
-        g++ -g -O -c -Wall -Wpointer-arith \
-            -Wmissing-prototypes -Wsynth -I$(INC) -I$(CXI) \
-            -D C_NO_SHLIBS -o $(OBJ)pidemo_nosh.o pidemo.cc
+#        -none -L$(SLB) -lPI -lOuIm -lerosc -lStarReco \
+#       -L$(GLB) -lg++ -lstdc++ -lm -lc
 
-$(OBJ)pidemo.o: ./pidemo.cc \
- $(INC)perrors.h \
- $(INC)exceptions.h \
- $(INC)defs.h \
- $(INC)fitsimage.h \
- $(INC)cimage.h \
- $(INC)rzimage.h \
- $(INC)rzvect.h \
- $(INC)machine.h \
- $(INC)datatypes.h \
- $(INC)fitsheader.h \
- $(INC)fitskeys.h pidemo.h \
- pisysdep.h piapplx.h piapplgen.h pimsghandler.h picontainerx.h \
- picontainergen.h piwdgx.h piwdggen.h pimenubarx.h pimenubargen.h \
- pimenux.h pimenugen.h piwindowx.h piwindowgen.h pioptmenux.h \
- pioptmenugen.h pistdwdgx.h pistdwdggen.h pifilechox.h pifilechogen.h \
- piimage.h $(INC)lut.h \
- pipixmapx.h pipixmapgen.h pibwdgx.h pibwdggen.h picmap.h picmapx.h \
- picmapgen.h pihisto.h piscdrawwdg.h \
- $(INC)histos.h \
- $(INC)peida.h \
- $(INC)utils.h pidrawwin.h \
- $(INC)piup.h
-$(OBJ)piup_def.o: piup_def.cc  piup.h \
+
+piup.o: piup.cc  piup.h \
  $(INC)perrors.h \
  $(INC)exceptions.h \

trunk/SophyaPI/PI/piqualmon.cc

@@ -88 +88 @@
 
 void 
-PIQualiteWin::Process(PIMessage msg, PIMsgHandler *, void *)
+PIQualiteWin::Process(PIMessage msg, PIMsgHandler * sender, void * data)
 {
   msg = UserMsg(msg);  // Reza 17/10/96 $CHECK$

trunk/SophyaPI/PI/pistatmon.cc

@@ -69 +69 @@
 }
 
-void PIStatWin::Process(PIMessage msg, PIMsgHandler *, void *)
+void PIStatWin::Process(PIMessage msg, PIMsgHandler * sender, void * data)
 {
   msg = UserMsg(msg);  // Reza 17/10/96 $CHECK$
@@ -79 +79 @@
 
   default:
-    cout << "Message " << msg << " non interprete" << endl;
+    // cout << "Message " << msg << " non interprete" << endl;
+    ReSend(msg, sender, data);
   }
 }