Changeset 1844 in Sophya for trunk/SophyaPI/PIGcont

Timestamp:

Dec 30, 2001, 11:09:35 PM (24 years ago)

Author:

ansari

Message:

changement de nom des fichiers (ajout de gp_ ou gpc_ ) pour eviter les confusions - Reza 30/12/2001

Location:

trunk/SophyaPI/PIGcont

Files:

• Makefile (modified) (8 diffs)
• contour.c (deleted)
• contour.h (deleted)
• dynarray.h (deleted)
• gp_alloc.c (added)
• gp_alloc.h (modified) (1 diff)
• gp_axis.c (added)
• gp_axis.h (added)
• gp_contour.c (added)
• gp_contour.h (added)
• gp_dynarray.h (added)
• gp_graph3d.h (added)
• gp_types.h (modified) (2 diffs)
• gpc_misc.h (added)
• gpc_set.c (added)
• gpc_set.h (added)
• graph3d.h (deleted)
• myalloc.c (deleted)
• myaxis.c (deleted)
• myaxis.h (deleted)
• mymisc.h (deleted)
• objlist.list (modified) (1 diff)
• pigncont.h (modified) (1 diff)
• set.c (deleted)
• set.h (deleted)

trunk/SophyaPI/PIGcont/Makefile

@@ -4 +4 @@
  
 all: $(LIB)libPIGcont.a
-$(LIB)libPIGcont.a : $(OBJ)contour.o $(OBJ)myalloc.o $(OBJ)myaxis.o $(OBJ)picntools.o $(OBJ)pigncont.o $(OBJ)set.o
+$(LIB)libPIGcont.a : $(OBJ)gp_alloc.o $(OBJ)gp_axis.o $(OBJ)gp_contour.o $(OBJ)gpc_set.o $(OBJ)picntools.o $(OBJ)pigncont.o
         $(AR) $(ARFLAGS)  $@ $($(ARARGS)) 
 ifeq ($(CXX),cxx)
@@ -11 +11 @@
  
 clean:
-        rm -f $(OBJ)contour.o $(OBJ)myalloc.o $(OBJ)myaxis.o $(OBJ)picntools.o $(OBJ)pigncont.o $(OBJ)set.o
+        rm -f $(OBJ)gp_alloc.o $(OBJ)gp_axis.o $(OBJ)gp_contour.o $(OBJ)gpc_set.o $(OBJ)picntools.o $(OBJ)pigncont.o
 ifeq ($(CXX),cxx)
         cd $(REPM); rm -f *.o
 endif 
  
-$(OBJ)contour.o: contour.c contour.h gp_types.h mymisc.h dynarray.h \
- graph3d.h gp_alloc.h myaxis.h
-$(OBJ)myalloc.o: myalloc.c gp_alloc.h graph3d.h gp_types.h mymisc.h
-$(OBJ)myaxis.o: myaxis.c myaxis.h mymisc.h
-$(OBJ)picntools.o: picntools.cc picntools.h \
- $(INC)pisysdep.h \
- $(INC)machdefs.h \
+$(OBJ)gp_alloc.o: gp_alloc.c gp_alloc.h gp_graph3d.h gp_types.h gpc_misc.h
+$(OBJ)gp_axis.o: gp_axis.c gp_axis.h gpc_misc.h
+$(OBJ)gp_contour.o: gp_contour.c gp_contour.h gp_types.h gpc_misc.h \
+ gp_dynarray.h gp_graph3d.h gp_alloc.h gp_axis.h
+$(OBJ)gpc_set.o: gpc_set.c gpc_set.h gp_contour.h gp_types.h gpc_misc.h \
+ gp_dynarray.h gp_graph3d.h
+$(OBJ)picntools.o: picntools.cc $(INC)machdefs.h \
+ picntools.h $(INC)pisysdep.h \
  $(INC)pistdwdgx.h \
  $(INC)pistdwdggen.h \
@@ -54 +55 @@
  $(INC)pievthandler.h \
  $(INC)psfile.h \
- $(INC)pigraphps.h pigncont.h \
+ $(INC)pigraphps.h \
+ $(INC)picmapview.h pigncont.h \
  $(INC)pistdimgapp.h \
  $(INC)pifilechox.h \
@@ -64 +66 @@
  $(INC)pipixmapx.h \
  $(INC)pipixmapgen.h \
- $(INC)picmapview.h \
  $(INC)pi3ddrw.h \
  $(INC)pigraph3d.h \
@@ -86 +87 @@
  $(INC)piscdrawwdg.h \
  $(INC)ntuple.h \
- $(INC)ntupintf.h contour.h gp_types.h \
- dynarray.h mymisc.h graph3d.h gp_alloc.h set.h
+ $(INC)ntupintf.h gp_contour.h gp_types.h \
+ gpc_misc.h gp_dynarray.h gp_graph3d.h gp_alloc.h gpc_set.h
 $(OBJ)pigncont.o: pigncont.cc $(INC)machdefs.h \
- $(INC)ctimer.h \
- $(INC)piacmd.h \
- $(INC)dlftypes.h \
- $(INC)pdlmgr.h \
- $(INC)nobjmgr.h \
+ $(INC)histos.h \
+ $(INC)objfio.h \
  $(INC)anydataobj.h \
  $(INC)ppersist.h \
  $(INC)pexceptions.h \
  $(INC)gnumd5.h \
+ $(INC)peida.h \
+ $(INC)utils.h \
+ $(INC)perrors.h \
+ $(INC)fmath.h \
+ $(INC)tvector.h \
+ $(INC)tmatrix.h \
+ $(INC)tarray.h \
+ $(INC)basarr.h \
+ $(INC)mutyv.h \
  $(INC)dvlist.h \
- $(INC)objfio.h \
- $(INC)mutyv.h \
- $(INC)pistdimgapp.h \
+ $(INC)ndatablock.h \
+ $(INC)utilarr.h \
+ $(INC)ntuple.h \
+ $(INC)ntupintf.h \
+ $(INC)nbtri.h picntools.h \
  $(INC)pisysdep.h \
+ $(INC)pistdwdgx.h \
+ $(INC)pistdwdggen.h \
+ $(INC)piwdgx.h \
+ $(INC)piwdggen.h \
+ $(INC)pimsghandler.h \
+ $(INC)picolist.h \
+ $(INC)pioptmenux.h \
+ $(INC)pioptmenugen.h \
+ $(INC)pimenux.h \
+ $(INC)pimenugen.h \
+ $(INC)piwindowx.h \
+ $(INC)piwindowgen.h \
+ $(INC)picontainerx.h \
+ $(INC)picontainergen.h \
  $(INC)piapplx.h \
  $(INC)piapplgen.h \
- $(INC)pimsghandler.h \
- $(INC)picontainerx.h \
- $(INC)picontainergen.h \
- $(INC)piwdgx.h \
- $(INC)piwdggen.h \
- $(INC)picolist.h \
  $(INC)pimenubarx.h \
  $(INC)pimenubargen.h \
- $(INC)pimenux.h \
- $(INC)pimenugen.h \
  $(INC)picons.h \
- $(INC)pistdwdgx.h \
- $(INC)pistdwdggen.h \
  $(INC)pibwdgx.h \
  $(INC)pibwdggen.h \
@@ -131 +144 @@
  $(INC)psfile.h \
  $(INC)pigraphps.h \
- $(INC)piwindowx.h \
- $(INC)piwindowgen.h \
- $(INC)pioptmenux.h \
- $(INC)pioptmenugen.h \
+ $(INC)picmapview.h pigncont.h \
+ $(INC)pistdimgapp.h \
  $(INC)pifilechox.h \
  $(INC)pifilechogen.h \
@@ -143 +154 @@
  $(INC)pipixmapx.h \
  $(INC)pipixmapgen.h \
- $(INC)picmapview.h \
  $(INC)pi3ddrw.h \
  $(INC)pigraph3d.h \
+ $(INC)nobjmgr.h \
+ $(INC)dlftypes.h \
+ $(INC)piacmd.h \
+ $(INC)pdlmgr.h \
  $(INC)pisiadw.h \
  $(INC)pilistx.h \
@@ -152 +166 @@
  $(INC)piperiodx.h \
  $(INC)periodic.h \
- $(INC)nomgadapter.h \
- $(INC)ntupintf.h \
- $(INC)generalfit.h \
- $(INC)tvector.h \
- $(INC)tmatrix.h \
- $(INC)tarray.h \
- $(INC)basarr.h \
- $(INC)ndatablock.h \
- $(INC)utilarr.h \
- $(INC)generaldata.h \
- $(INC)poly.h \
- $(INC)peida.h \
- $(INC)utils.h \
- $(INC)perrors.h \
- $(INC)fmath.h \
- $(INC)histos.h \
- $(INC)histos2.h \
- $(INC)hisprof.h \
- $(INC)ntuple.h \
- $(INC)servnobjm.h picntools.h pigncont.h \
- $(INC)piscdrawwdg.h contour.h gp_types.h \
- dynarray.h mymisc.h graph3d.h gp_alloc.h set.h
-$(OBJ)set.o: set.c set.h contour.h gp_types.h mymisc.h dynarray.h graph3d.h
+ $(INC)piscdrawwdg.h gp_contour.h gp_types.h \
+ gpc_misc.h gp_dynarray.h gp_graph3d.h gp_alloc.h gpc_set.h

trunk/SophyaPI/PIGcont/gp_alloc.h

@@ -37 +37 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include "graph3d.h"
+#include "gp_graph3d.h"
 /****
 #ifdef HAVE_CONFIG_H

trunk/SophyaPI/PIGcont/gp_types.h

@@ -1 +1 @@
 /*
- * $Id: gp_types.h,v 1.1.1.1 2001-12-19 18:01:18 perderos Exp $
+ * $Id: gp_types.h,v 1.2 2001-12-30 22:09:34 ansari Exp $
  */
 
@@ -41 +41 @@
 #include "syscfg.h"
 ***/
-#include "mymisc.h"
+#include "gpc_misc.h"
 
 #define MAX_ID_LEN 50           /* max length of an identifier */

trunk/SophyaPI/PIGcont/objlist.list

@@ -1 @@
-contour.o
-myalloc.o
-myaxis.o
+gp_alloc.o
+gp_axis.o
+gp_contour.o
+gpc_set.o
 picntools.o
 pigncont.o
-set.o

trunk/SophyaPI/PIGcont/pigncont.h

@@ -13 +13 @@
 #include "ntuple.h"
 extern "C" { 
-#include "contour.h"
+#include "gp_contour.h"
 #include "gp_alloc.h"
-#include "set.h"
+#include "gpc_set.h"
 }