Changeset 1838 in Sophya


Ignore:
Timestamp:
Dec 21, 2001, 11:49:27 PM (24 years ago)
Author:
ansari
Message:

Nettoyage des .h en trop, compil avec g++ sous LinuxPPC (rename alloc.h gp_alloc.h) - Reza 21/12/2001

Location:
trunk/SophyaPI/PIGcont
Files:
1 added
1 deleted
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/SophyaPI/PIGcont/Makefile

    r1837 r1838  
    1717 
    1818$(OBJ)contour.o: contour.c contour.h gp_types.h mymisc.h dynarray.h \
    19  graph3d.h alloc.h myaxis.h
    20 $(OBJ)myalloc.o: myalloc.c alloc.h graph3d.h gp_types.h mymisc.h
     19 graph3d.h gp_alloc.h myaxis.h
     20$(OBJ)myalloc.o: myalloc.c gp_alloc.h graph3d.h gp_types.h mymisc.h
    2121$(OBJ)myaxis.o: myaxis.c myaxis.h mymisc.h
    2222$(OBJ)picntools.o: picntools.cc picntools.h \
    … …  
    8787 $(INC)ntuple.h \
    8888 $(INC)ntupintf.h contour.h gp_types.h \
    89  dynarray.h mymisc.h graph3d.h alloc.h set.h
     89 dynarray.h mymisc.h graph3d.h gp_alloc.h set.h
    9090$(OBJ)pigncont.o: pigncont.cc $(INC)machdefs.h \
    9191 $(INC)ctimer.h \
    … …  
    173173 $(INC)servnobjm.h picntools.h pigncont.h \
    174174 $(INC)piscdrawwdg.h contour.h gp_types.h \
    175  dynarray.h mymisc.h graph3d.h alloc.h set.h
     175 dynarray.h mymisc.h graph3d.h gp_alloc.h set.h
    176176$(OBJ)set.o: set.c set.h contour.h gp_types.h mymisc.h dynarray.h graph3d.h

  • trunk/SophyaPI/PIGcont/contour.c

    r1829 r1838  
    11#ifndef lint
    2 static char *RCSid() { return RCSid("$Id: contour.c,v 1.1.1.1 2001-12-19 18:01:18 perderos Exp $"); }
     2static char *RCSid() { return RCSid("$Id: contour.c,v 1.2 2001-12-21 22:49:27 ansari Exp $"); }
    33#endif
    44
    … …  
    4949#include "contour.h"
    5050
    51 #include "alloc.h"
     51#include "gp_alloc.h"
    5252#include "myaxis.h"
    5353/*  #include "setshow.h" */
    … …  
    7373
    7474
     75/* Valeur de zero - Reza 21/12/2001 - Pourquoi zero = 0. ??? */
     76static double zero = 0.;
     77
    7578/* FIXME HBB 2000052: yet another local copy of 'epsilon'. Why? */
    7679#define EPSILON  1e-5           /* Used to decide if two float are equal. */
     80
    7781
    7882#ifndef TRUE
    … …  
    8084#define FALSE    0
    8185#endif
     86
    8287
    8388#define MAX_POINTS_PER_CNTR     100

  • trunk/SophyaPI/PIGcont/myalloc.c

    r1829 r1838  
    1 #include "alloc.h"
     1#include "gp_alloc.h"
    22#include "graph3d.h"
    33#include <math.h>

  • trunk/SophyaPI/PIGcont/myaxis.h

    r1829 r1838  
    11/*
    2  * $Id: myaxis.h,v 1.1.1.1 2001-12-19 18:01:18 perderos Exp $
     2 * $Id: myaxis.h,v 1.2 2001-12-21 22:49:27 ansari Exp $
    33 *
    44 */
    … …  
    4848
    4949/* typedefs / #defines */
     50#ifndef TRUE
     51#define TRUE     -1
     52#define FALSE    0
     53#endif
    5054
    5155/* give some names to some array elements used in command.c and grap*.c
    … …  
    606610/*void axis_set_graphical_range __PROTO((AXIS_INDEX, unsigned int lower, unsigned int upper));*/
    607611/*TBOOLEAN axis_position_zeroaxis __PROTO((AXIS_INDEX));*/
    608 /*void axis_draw_2d_zeroaxis __PROTO((AXIS_INDEX, AXIS_INDEX));
     612/*void axis_draw_2d_zeroaxis __PROTO((AXIS_INDEX, AXIS_INDEX)); */
    609613
    610614/*double get_writeback_min __PROTO((AXIS_INDEX));*/

  • trunk/SophyaPI/PIGcont/picntools.cc

    r1832 r1838  
    33// LAL (Orsay) / IN2P3-CNRS  DAPNIA/SPP (Saclay) / CEA
    44
    5 #include <stdlib.h>
    6 
     5// #include <stdlib.h>
     6
     7#include "machdefs.h"
     8#include <string>
     9#include <iostream.h>
    710
    811#include "picntools.h"
    9 #include <iostream.h>
    10 #include "piscdrawwdg.h"
    11 #include "pi3ddrw.h"
    1212#include "pigncont.h"
    1313

  • trunk/SophyaPI/PIGcont/picntools.h

    r1829 r1838  
    1212#include PIWIN_H
    1313#include PIAPP_H
    14 #include "pibwdggen.h"
    15 #include "pigncont.h"
     14#include "picmapview.h"
    1615
    1716// --------- fenetre de dialogue pour modifs  options de trace des contours  ----------
    1817// --------------------------------------------------------------------------------
    1918
     19class PIContourDrawer;
     20class PIBaseWdgGen;
    2021
    2122class PICnTools : public PIWindow

  • trunk/SophyaPI/PIGcont/pigncont.cc

    r1829 r1838  
    55#include <math.h>
    66
    7 #include <typeinfo>
    8 
    9 #include <vector>
    10 #include <string>
    11 
    12 #include "ctimer.h"
    13 #include "piacmd.h"
    14 #include "nobjmgr.h"
    15 #include "pistdimgapp.h"
    16 
    17 #include "pidrawer.h"
    18 #include "nomgadapter.h"
    19 
    207#include "histos.h"
    21 #include "histos2.h"
    22 #include "hisprof.h"
    238#include "ntuple.h"
    249
    25 #include "servnobjm.h"
    26 #include <nbtri.h>
     10#include "nbtri.h"
    2711
    2812#include "picntools.h"
    2913#include "pigncont.h"
    30 //A-Virer #include "pidrwtools.h"
    31 //A-Virer #include "piaxestools.h"
    32 
    33 extern "C" {
    34 #include "contour.h"
    35 #include "alloc.h"
    36 #include "set.h"
    37 }
    38 
    39 TBOOLEAN multiplot;
    40 double zero =0;
    41 TBOOLEAN polar;
    42 int xleft, xright, ybot, ytop;
    43 float xsize;
    44 float ysize;
    45 float xoffset, yoffset;
    46 
     14
     15/*  A virer ?? Reza 21/12/2001
     16static TBOOLEAN multiplot;
     17static double zero =0;
     18static TBOOLEAN fg_polar;
     19static int xleft, xright, ybot, ytop;
     20static float xsize;
     21static float ysize;
     22static float xoffset, yoffset;
     23*/
    4724
    4825GNUPlotContour::GNUPlotContour(struct iso_curve * iso){

  • trunk/SophyaPI/PIGcont/pigncont.h

    r1829 r1838  
    1414extern "C" {
    1515#include "contour.h"
    16 #include "alloc.h"
     16#include "gp_alloc.h"
    1717#include "set.h"
    1818}
Note: See TracChangeset for help on using the changeset viewer.