Skip to content

Commit 81fcfd9

Browse files
from Matevz:
add the TEve classes to the svn trunk. Code compiles without warnings on MacOS X, Linux and Windows XP. Tutorials still don't work, as init code is still missing (coming later today). git-svn-id: http://root.cern.ch/svn/root/trunk@21044 27541ba8-7e3a-0410-8455-c3a389f83636
1 parent ab8dab9 commit 81fcfd9

File tree

146 files changed

+25831
-7
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

146 files changed

+25831
-7
lines changed

Diff for: Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ endif
7575
endif
7676
ifeq ($(BUILDGL),yes)
7777
ifeq ($(BUILDFTGL),yes)
78-
MODULES += ftgl
78+
MODULES += ftgl eve
7979
endif
8080
MODULES += gl
8181
endif
@@ -219,7 +219,7 @@ MODULES += unix winnt x11 x11ttf win32gdk gl ftgl rfio castor \
219219
ldap mlp krb5auth rpdutils globusauth pyroot ruby gfal \
220220
qt qtroot qtgsi xrootd netx proofx alien clarens peac oracle \
221221
xmlparser mathcore mathmore reflex cintex roofitcore roofit \
222-
minuit2 monalisa fftw odbc unuran gdml g4root cint7
222+
minuit2 monalisa fftw odbc unuran gdml eve g4root cint7
223223
MODULES := $(sort $(MODULES)) # removes duplicates
224224
endif
225225

@@ -1077,7 +1077,7 @@ showbuild:
10771077
showit:
10781078
@echo "Modules:$(word 1, $(MODULES))"
10791079
@$(foreach m, $(filter-out $(word 1, $(MODULES)), $(MODULES)), \
1080-
echo -e "\t$(m)" ;)
1080+
echo -e "\t$(m)" ;)
10811081
@echo "Libraries:$(word 1, $(ALLLIBS))"
10821082
@$(foreach l, $(filter-out $(word 1, $(ALLLIBS)), $(ALLLIBS)), \
1083-
echo -e "\t$(l)" ;)
1083+
echo -e "\t$(l)" ;)

Diff for: config/Makefile.depend

+17-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ASIMAGELIBDEPM = $(GRAFLIB)
1212
ASIMAGEGUILIBDEPM = $(GRAFLIB) $(HISTLIB) $(GUILIB) $(ASIMAGELIB) $(IOLIB)
1313
ASIMAGEGSLIBDEPM = $(GRAFLIB) $(ASIMAGELIB)
1414
GEDLIBDEPM = $(HISTLIB) $(GPADLIB) $(GRAFLIB) $(GUILIB) $(TREELIB) \
15-
$(TREEPLAYERLIB)
15+
$(TREEPLAYERLIB)
1616
POSTSCRIPTLIBDEPM = $(GRAFLIB)
1717
GUILIBDEPM = $(GPADLIB) $(GRAFLIB) $(IOLIB)
1818
GUIHTMLLIBDEPM = $(GUILIB) $(GRAFLIB) $(NETLIB)
@@ -31,7 +31,7 @@ PROOFLIBDEPM = $(NETLIB) $(TREELIB) $(THREADLIB) $(IOLIB)
3131
PROOFPLAYERLIBDEPM = $(PROOFLIB) $(HISTLIB) $(IOLIB) $(TREELIB) $(NETLIB) \
3232
$(THREADLIB)
3333
PROOFDRAWLIBDEPM = $(TREEPLAYERLIB) $(G3DLIB) $(GRAFLIB) $(GPADLIB) \
34-
$(PROOFPLAYERLIB) $(HISTLIB) $(TREELIB) $(PROOFLIB)
34+
$(PROOFPLAYERLIB) $(HISTLIB) $(TREELIB) $(PROOFLIB)
3535
PROOFXLIBDEPM = $(NETLIB) $(PROOFLIB) $(THREADLIB)
3636
SESSIONVIEWERLIBDEPM = $(PROOFLIB) $(GUILIB) $(GPADLIB) $(GRAFLIB) $(TREELIB)
3737
PEACLIBDEPM = $(PROOFLIB) $(CLARENSLIB)
@@ -93,6 +93,10 @@ X11TTFLIBDEPM = $(X11LIB) $(GRAFLIB)
9393
X3DLIBDEPM = $(G3DLIB) $(GUILIB)
9494
MONALISALIBDEPM = $(NETLIB) $(IOLIB)
9595
THREADLIBDEPM = $(IOLIB)
96+
EVELIBDEPM = $(GEOMLIB) $(GEOMPAINTERLIB) $(G3DLIB) $(GUILIB) \
97+
$(GPADLIB) $(GRAFLIB) $(HISTLIB) $(PHYSICSLIB) \
98+
$(GEDLIB) $(EGLIB) $(TREELIB) $(TREEPLAYERLIB) \
99+
$(GLLIB) $(FTGLLIB) $(IOLIB) $(RINTLIB)
96100

97101

98102
ifeq ($(EXPLICITLINK),yes)
@@ -173,6 +177,7 @@ X11TTFLIBDEP = $(X11TTFLIBDEPM)
173177
X3DLIBDEP = $(X3DLIBDEPM)
174178
MONALISALIBDEP = $(MONALISALIBDEPM)
175179
THREADLIBDEP = $(THREADLIBDEPM)
180+
EVELIBDEP = $(EVELIBDEPM)
176181

177182
ifeq ($(PLATFORM),win32)
178183

@@ -187,7 +192,7 @@ ASIMAGEGUILIBEXTRA = lib/libGraf.lib lib/libHist.lib lib/libGui.lib \
187192
lib/libASImage.lib lib/libRIO.lib
188193
ASIMAGEGSLIBEXTRA = lib/libGraf.lib lib/libASImage.lib
189194
GEDLIBEXTRA = lib/libHist.lib lib/libGpad.lib lib/libGraf.lib \
190-
lib/libTree.lib lib/libTreePlayer.lib lib/libGui.lib
195+
lib/libTree.lib lib/libTreePlayer.lib lib/libGui.lib
191196
POSTSCRIPTLIBEXTRA = lib/libGraf.lib
192197
GUILIBEXTRA = lib/libGpad.lib lib/libGraf.lib lib/libRIO.lib
193198
HISTPAINTERLIBEXTRA = lib/libGraf.lib lib/libHist.lib lib/libMatrix.lib \
@@ -276,6 +281,12 @@ GDMLLIBEXTRA = lib/libGeom.lib lib/libXMLIO.lib lib/libHist.lib \
276281
UNURANLIBEXTRA = lib/libHist.lib
277282
MONALISALIBEXTRA = lib/libNet.lib lib/libRIO.lib
278283
THREADLIBEXTRA = lib/libRIO.lib
284+
EVELIBEXTRA = lib/libGeom.lib lib/libGeomPainter.lib \
285+
lib/libGpad.lib lib/libGraf3d.lib lib/libGui.lib \
286+
lib/libGraf.lib lib/libHist.lib lib/libPhysics.lib \
287+
lib/libGed.lib lib/libEG.lib lib/libTree.lib \
288+
lib/libTreePlayer.lib lib/libRGL.lib lib/libRIO.lib \
289+
lib/libRint.lib
279290

280291
else
281292

@@ -358,6 +369,9 @@ GDMLLIBEXTRA = -Llib -lGeom -lXMLIO -lHist -lRIO
358369
UNURANLIBEXTRA = -Llib -lHist
359370
MONALISALIBEXTRA = -Llib -lNet -lRIO
360371
THREADLIBEXTRA = -Llib -lRIO
372+
EVELIBEXTRA = -Llib -lGeom -lGeomPainter -lGraf3d -lGui -lGpad \
373+
-lGraf -lHist -lPhysics -lGed -lEG -lTree \
374+
-lTreePlayer -lRGL -lRIO -lRint
361375

362376
endif
363377

Diff for: eve/Module.mk

+71
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
# Module.mk for eve module
2+
# Copyright (c) 2007 Rene Brun and Fons Rademakers
3+
#
4+
# Author: Fons Rademakers 26/11/2007
5+
6+
MODDIR := eve
7+
MODDIRS := $(MODDIR)/src
8+
MODDIRI := $(MODDIR)/inc
9+
10+
EVEDIR := $(MODDIR)
11+
EVEDIRS := $(EVEDIR)/src
12+
EVEDIRI := $(EVEDIR)/inc
13+
14+
##### libEve #####
15+
EVEL := $(MODDIRI)/LinkDef.h
16+
EVEDS := $(MODDIRS)/G__Eve.cxx
17+
EVEDO := $(EVEDS:.cxx=.o)
18+
EVEDH := $(EVEDS:.cxx=.h)
19+
20+
EVEH := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
21+
EVES := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
22+
EVEO := $(EVES:.cxx=.o)
23+
24+
EVEDEP := $(EVEO:.o=.d) $(EVEDO:.o=.d)
25+
26+
EVELIB := $(LPATH)/libEve.$(SOEXT)
27+
EVEMAP := $(EVELIB:.$(SOEXT)=.rootmap)
28+
29+
# used in the main Makefile
30+
ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(EVEH))
31+
ALLLIBS += $(EVELIB)
32+
ALLMAPS += $(EVEMAP)
33+
34+
# include all dependency files
35+
INCLUDEFILES += $(EVEDEP)
36+
37+
##### local rules #####
38+
include/%.h: $(EVEDIRI)/%.h
39+
cp $< $@
40+
41+
$(EVELIB): $(EVEO) $(EVEDO) $(ORDER_) $(MAINLIBS) $(EVELIBDEP)
42+
@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
43+
"$(SOFLAGS)" libEve.$(SOEXT) $@ "$(EVEO) $(EVEDO)" \
44+
"$(EVELIBEXTRA) $(FTGLLIBDIR) $(FTGLLIBS) $(GLLIBS)"
45+
46+
$(EVEDS): $(EVEH) $(EVEL) $(ROOTCINTTMPEXE)
47+
@echo "Generating dictionary $@..."
48+
$(ROOTCINTTMP) -f $@ -c $(EVEH) $(EVEL)
49+
50+
$(EVEMAP): $(RLIBMAP) $(MAKEFILEDEP) $(EVEL)
51+
$(RLIBMAP) -o $(EVEMAP) -l $(EVELIB) \
52+
-d $(EVELIBDEPM) -c $(EVEL)
53+
54+
all-eve: $(EVELIB) $(EVEMAP)
55+
56+
clean-eve:
57+
@rm -f $(EVEO) $(EVEDO)
58+
59+
clean:: clean-eve
60+
61+
distclean-eve: clean-eve
62+
@rm -f $(EVEDEP) $(EVEDS) $(EVEDH) $(EVELIB) $(EVEMAP)
63+
64+
distclean:: distclean-eve
65+
66+
##### extra rules ######
67+
ifeq ($(ARCH),win32)
68+
$(EVEO) $(EVEDO): CXXFLAGS += $(OPENGLINCDIR:%=-I%) $(FTGLINCDIR:%=-I%)
69+
else
70+
$(EVEO) $(EVEDO): CXXFLAGS += $(OPENGLINCDIR:%=-I%) $(FTGLINCDIR:%=-I%)
71+
endif

Diff for: eve/inc/LinkDef.h

+187
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,187 @@
1+
// @(#)root/eve:$Id$
2+
// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007
3+
4+
/*************************************************************************
5+
* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
6+
* All rights reserved. *
7+
* *
8+
* For the licensing terms see $ROOTSYS/LICENSE. *
9+
* For the list of contributors see $ROOTSYS/README/CREDITS. *
10+
*************************************************************************/
11+
12+
#pragma link off all functions;
13+
#pragma link off all globals;
14+
#pragma link off all classes;
15+
16+
17+
// Utilities
18+
#pragma link C++ class TEveUtil+;
19+
#pragma link C++ class TEveGLUtil+;
20+
21+
// TEveManager
22+
#pragma link C++ class TEveManager+;
23+
#pragma link C++ global gEve;
24+
25+
// Basic helper classes
26+
#pragma link C++ class TEveException+;
27+
#pragma link C++ class TEvePadHolder+;
28+
#pragma link C++ class TEveGeoManagerHolder+;
29+
#pragma link C++ class TEveRefCnt+;
30+
#pragma link C++ class TEveRefBackPtr+;
31+
32+
// TEveVSD structs
33+
#pragma link C++ class TEveVector+;
34+
#pragma link C++ class TEvePathMark+;
35+
#pragma link C++ class TEveMCTrack+;
36+
#pragma link C++ class TEveHit+;
37+
#pragma link C++ class TEveCluster+;
38+
#pragma link C++ class TEveRecTrack+;
39+
#pragma link C++ class TEveRecKink+;
40+
#pragma link C++ class TEveRecV0+;
41+
#pragma link C++ class TEveMCRecCrossRef+;
42+
43+
// TEveTrans
44+
#pragma link C++ class TEveTrans-;
45+
#pragma link C++ class TEveTransSubEditor+;
46+
#pragma link C++ class TEveTransEditor+;
47+
48+
// Stepper
49+
#pragma link C++ class TEveGridStepper+;
50+
#pragma link C++ class TEveGridStepperSubEditor+;
51+
#pragma link C++ class TEveGridStepperEditor+;
52+
53+
// TEveRGBAPalette
54+
#pragma link C++ class TEveRGBAPalette+;
55+
#pragma link C++ class TEveRGBAPaletteEditor+;
56+
#pragma link C++ class TEveRGBAPaletteSubEditor+;
57+
58+
// Plexes
59+
#pragma link C++ class TEveChunkManager+;
60+
#pragma link C++ class TEveChunkManager::iterator-;
61+
62+
// TEveEventManager, VSDEvent, TEveVSD
63+
#pragma link C++ class TEveEventManager+;
64+
#pragma link C++ class TEveVSD+;
65+
66+
// TTreeTools
67+
#pragma link C++ class TEveSelectorToEventList+;
68+
#pragma link C++ class TEvePointSelectorConsumer+;
69+
#pragma link C++ class TEvePointSelector+;
70+
71+
// TEveElement
72+
#pragma link C++ class TEveElement+;
73+
#pragma link C++ class TEveElement::TEveListTreeInfo+;
74+
#pragma link C++ class TEveElementObjectPtr+;
75+
#pragma link C++ class TEveElementList+;
76+
#pragma link C++ class TEveElementEditor+;
77+
78+
#pragma link C++ class std::list<TEveElement*>;
79+
#pragma link C++ class std::list<TEveElement*>::iterator;
80+
#pragma link C++ typedef TEveElement::List_t;
81+
#pragma link C++ typedef TEveElement::List_i;
82+
83+
// GL-interface
84+
#pragma link C++ class TEveScene+;
85+
#pragma link C++ class TEveSceneList+;
86+
#pragma link C++ class TEveSceneInfo+;
87+
#pragma link C++ class TEveViewer+;
88+
#pragma link C++ class TEveViewerList+;
89+
90+
// TEvePad
91+
#pragma link C++ class TEvePad+;
92+
93+
// TEveBrowser
94+
#pragma link C++ class TEveGListTreeEditorFrame+;
95+
#pragma link C++ class TEveBrowser+;
96+
97+
// TEveGedEditor
98+
#pragma link C++ class TEveGedEditor+;
99+
100+
// TEveMacro
101+
#pragma link C++ class TEveMacro+;
102+
103+
// RGValuators
104+
#pragma link C++ class TEveGValuatorBase+;
105+
#pragma link C++ class TEveGValuator+;
106+
#pragma link C++ class TEveGDoubleValuator+;
107+
#pragma link C++ class TEveGTriVecValuator+;
108+
109+
// TEveTrack
110+
#pragma link C++ class TEveTrack+;
111+
#pragma link C++ class TEveTrackGL+;
112+
#pragma link C++ class TEveTrackEditor+;
113+
#pragma link C++ class TEveTrackList+;
114+
#pragma link C++ class TEveTrackListEditor+;
115+
#pragma link C++ class TEveTrackPropagatorSubEditor+;
116+
#pragma link C++ class TEveTrackPropagatorEditor+;
117+
#pragma link C++ class TEveTrackPropagator+;
118+
#pragma link C++ class TEveTrackCounter+;
119+
#pragma link C++ class TEveTrackCounterEditor+;
120+
121+
// TEvePointSet
122+
#pragma link C++ class TEvePointSet+;
123+
#pragma link C++ class TEvePointSetArray+;
124+
#pragma link C++ class TEvePointSetArrayEditor+;
125+
126+
// TEveLine
127+
#pragma link C++ class TEveLine+;
128+
#pragma link C++ class TEveLineEditor+;
129+
#pragma link C++ class TEveLineGL+;
130+
131+
// TEveFrameBox
132+
#pragma link C++ class TEveFrameBox+;
133+
#pragma link C++ class TEveFrameBoxGL+;
134+
135+
// TEveDigitSet
136+
#pragma link C++ class TEveDigitSet+;
137+
#pragma link C++ class TEveDigitSetEditor+;
138+
139+
// TEveQuadSet
140+
#pragma link C++ class TEveQuadSet+;
141+
#pragma link C++ class TEveQuadSetGL+;
142+
143+
// TEveBoxSet
144+
#pragma link C++ class TEveBoxSet+;
145+
#pragma link C++ class TEveBoxSetGL+;
146+
147+
// GeoNode
148+
#pragma link C++ class TEveGeoNode+;
149+
#pragma link C++ class TEveGeoTopNode+;
150+
#pragma link C++ class TEveGeoNodeEditor+;
151+
#pragma link C++ class TEveGeoTopNodeEditor+;
152+
153+
#pragma link C++ class TEveGeoShapeExtract+;
154+
#pragma link C++ class TEveGeoShape+;
155+
156+
// TrianlgeSet
157+
#pragma link C++ class TEveTriangleSet+;
158+
#pragma link C++ class TEveTriangleSetEditor+;
159+
#pragma link C++ class TEveTriangleSetGL+;
160+
161+
// TEveStraightLineSet
162+
#pragma link C++ class TEveStraightLineSet+;
163+
#pragma link C++ class TEveStraightLineSetGL+;
164+
#pragma link C++ class TEveStraightLineSetEditor+;
165+
#pragma link C++ class TEveStraightLineSetProjected+;
166+
167+
// Projections / non-linear transformations
168+
#pragma link C++ class TEveProjectable+;
169+
#pragma link C++ class TEveProjected+;
170+
#pragma link C++ class TEveProjection+;
171+
#pragma link C++ class TEveRhoZProjection+;
172+
#pragma link C++ class TEveCircularFishEyeProjection+;
173+
174+
#pragma link C++ class TEveProjectionManager+;
175+
#pragma link C++ class TEveProjectionManagerEditor+;
176+
#pragma link C++ class TEveProjectionManagerGL+;
177+
178+
#pragma link C++ class TEveTrackProjected+;
179+
#pragma link C++ class TEveTrackProjectedGL+;
180+
#pragma link C++ class TEveTrackListProjected+;
181+
182+
#pragma link C++ class TEvePolygonSetProjected+;
183+
#pragma link C++ class TEvePolygonSetProjectedEditor+;
184+
#pragma link C++ class TEvePolygonSetProjectedGL+;
185+
186+
#pragma link C++ class TEvePointSetProjected+;
187+
#pragma link C++ class TEvePointSetProjectedGL+;

0 commit comments

Comments
 (0)