Skip to content

Commit 5a5ae00

Browse files
ktfktf
committed
Merge pull request cms-sw#578 from alja/devel_70
Move FWEveDigitSetScalableMarker delcaration in header file. Related to cms-sw#332
2 parents 739c2e6 + d2dc222 commit 5a5ae00

6 files changed

+66
-63
lines changed

‎Fireworks/Core/src/FWEveDigitSetScalableMarker.cc

+31-58
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,42 @@
1-
#ifndef Fireworks_Core_FWMarkerDigitSetGL_h
2-
#define Fireworks_Core_FWMarkerDigitSetGL_h
3-
4-
#include "TEveQuadSet.h"
5-
#include "TEveQuadSetGL.h"
61
#include "TGLIncludes.h"
7-
#include "TGLRnrCtx.h"
8-
#include "TAttMarker.h"
9-
10-
class FWEveDigitSetScalableMarker : public TEveQuadSet, public TAttMarker
11-
{
12-
public:
13-
FWEveDigitSetScalableMarker() {}
14-
virtual ~FWEveDigitSetScalableMarker() {}
15-
16-
ClassDef( FWEveDigitSetScalableMarker, 0);
17-
};
2+
#include "Fireworks/Core/src/FWEveDigitSetScalableMarker.h"
183

19-
//--------------------------------------------
20-
class FWEveDigitSetScalableMarkerGL : public TEveQuadSetGL
4+
void
5+
FWEveDigitSetScalableMarkerGL::DirectDraw(TGLRnrCtx & rnrCtx) const
216
{
22-
public:
23-
FWEveDigitSetScalableMarkerGL() {}
24-
virtual ~FWEveDigitSetScalableMarkerGL() {}
25-
26-
virtual void DirectDraw(TGLRnrCtx & rnrCtx) const
27-
{
28-
glPushAttrib(GL_ENABLE_BIT | GL_POLYGON_BIT | GL_POINT_BIT);
29-
glEnable(GL_POINT_SMOOTH);
30-
glDisable(GL_LIGHTING);
7+
glPushAttrib(GL_ENABLE_BIT | GL_POLYGON_BIT | GL_POINT_BIT);
8+
glEnable(GL_POINT_SMOOTH);
9+
glDisable(GL_LIGHTING);
3110

32-
TEveChunkManager::iterator qi(fM->GetPlex());
33-
if (rnrCtx.Highlight() && fHighlightSet)
34-
qi.fSelection = fHighlightSet;
11+
TEveChunkManager::iterator qi(fM->GetPlex());
12+
if (rnrCtx.Highlight() && fHighlightSet)
13+
qi.fSelection = fHighlightSet;
3514

36-
if (rnrCtx.SecSelection()) glPushName(0);
15+
if (rnrCtx.SecSelection()) glPushName(0);
3716

38-
glPointSize(((FWEveDigitSetScalableMarker*)fM)->GetMarkerSize());
39-
while (qi.next()) {
40-
TEveQuadSet::QFreeQuad_t* q = (TEveQuadSet::QFreeQuad_t*) qi();
41-
if (q->fValue < 0)
42-
continue;
43-
TGLUtil::ColorAlpha(Color_t(q->fValue));
44-
if (rnrCtx.SecSelection()) glLoadName(qi.index());
45-
float* p = &q->fVertices[0];
46-
glBegin(GL_LINES);
47-
float c[3] = {0.5f*(p[0]+p[6]), 0.5f*(p[1]+p[7]), 0.5f*(p[2]+p[8])};
17+
glPointSize(((FWEveDigitSetScalableMarker*)fM)->GetMarkerSize());
18+
while (qi.next()) {
19+
TEveQuadSet::QFreeQuad_t* q = (TEveQuadSet::QFreeQuad_t*) qi();
20+
if (q->fValue < 0)
21+
continue;
22+
TGLUtil::ColorAlpha(Color_t(q->fValue));
23+
if (rnrCtx.SecSelection()) glLoadName(qi.index());
24+
float* p = &q->fVertices[0];
25+
glBegin(GL_LINES);
26+
float c[3] = {0.5f*(p[0]+p[6]), 0.5f*(p[1]+p[7]), 0.5f*(p[2]+p[8])};
4827

49-
float d = p[6] - p[0];
50-
glVertex3f( c[0] -d, c[1], c[2]); glVertex3f(c[0] + d, c[1], c[2]);
51-
glVertex3f( c[0] , c[1] -d, c[2]); glVertex3f(c[0] , c[1] +d, c[2]);
52-
glVertex3f( c[0] , c[1], c[2]-d); glVertex3f(c[0] , c[1], c[2] +d);
28+
float d = p[6] - p[0];
29+
glVertex3f( c[0] -d, c[1], c[2]); glVertex3f(c[0] + d, c[1], c[2]);
30+
glVertex3f( c[0] , c[1] -d, c[2]); glVertex3f(c[0] , c[1] +d, c[2]);
31+
glVertex3f( c[0] , c[1], c[2]-d); glVertex3f(c[0] , c[1], c[2] +d);
5332

54-
glEnd();
33+
glEnd();
5534

56-
glBegin(GL_POINTS);
57-
glVertex3fv(&c[0]);
58-
glEnd();
35+
glBegin(GL_POINTS);
36+
glVertex3fv(&c[0]);
37+
glEnd();
5938

60-
}
61-
62-
glPopAttrib();
6339
}
64-
65-
ClassDef(FWEveDigitSetScalableMarkerGL, 0);
66-
};
67-
68-
69-
#endif
40+
41+
glPopAttrib();
42+
}

‎Fireworks/Core/src/FWEveDigitSetScalableMarker.h

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
#ifndef Fireworks_Core_FWMarkerDigitSetGL_h
2+
#define Fireworks_Core_FWMarkerDigitSetGL_h
3+
4+
#include "TEveQuadSet.h"
5+
#include "TEveQuadSetGL.h"
6+
#include "TGLRnrCtx.h"
7+
#include "TAttMarker.h"
8+
9+
class FWEveDigitSetScalableMarker : public TEveQuadSet, public TAttMarker
10+
{
11+
public:
12+
FWEveDigitSetScalableMarker() {}
13+
virtual ~FWEveDigitSetScalableMarker() {}
14+
15+
ClassDef( FWEveDigitSetScalableMarker, 0);
16+
};
17+
18+
//--------------------------------------------
19+
class FWEveDigitSetScalableMarkerGL : public TEveQuadSetGL
20+
{
21+
public:
22+
FWEveDigitSetScalableMarkerGL() {}
23+
virtual ~FWEveDigitSetScalableMarkerGL() {}
24+
25+
void DirectDraw(TGLRnrCtx & rnrCtx) const;
26+
27+
ClassDef(FWEveDigitSetScalableMarkerGL, 0);
28+
};
29+
30+
31+
#endif

‎Fireworks/Core/src/FWGeometryTableViewBase.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "Fireworks/Core/src/FWColorSelect.h"
1515
#include "Fireworks/Core/src/FWPopupMenu.cc"
1616
#include "Fireworks/Core/src/FWGeoTopNodeScene.h"
17-
#include "Fireworks/Core/src/FWEveDigitSetScalableMarker.cc"
17+
#include "Fireworks/Core/src/FWEveDigitSetScalableMarker.h"
1818
#include "Fireworks/Core/interface/CmsShowViewPopup.h"
1919

2020

‎Fireworks/Core/src/FWOverlapTableManager.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
// user include files
1717
#include "Fireworks/Core/src/FWOverlapTableManager.h"
1818
#include "Fireworks/Core/src/FWOverlapTableView.h"
19-
#include "Fireworks/Core/src/FWEveDigitSetScalableMarker.cc"
19+
#include "Fireworks/Core/src/FWEveDigitSetScalableMarker.h"
2020
#include "Fireworks/Core/interface/FWGeometryTableViewManager.h"
2121
#include "Fireworks/Core/interface/fwLog.h"
2222

‎Fireworks/Core/src/FWOverlapTableView.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,12 @@
2121
#include "Fireworks/Core/src/FWEveOverlap.h"
2222
#include "Fireworks/Core/interface/FWGeometryTableViewManager.h"
2323
#include "Fireworks/Core/interface/CmsShowViewPopup.h"
24-
#include "Fireworks/Core/src/FWEveDigitSetScalableMarker.cc"
2524
#include "Fireworks/Core/src/FWPopupMenu.cc"
2625
#include "Fireworks/Core/interface/fwLog.h"
2726

2827
#include "Fireworks/Core/src/FWGUIValidatingTextEntry.h"
2928
#include "Fireworks/Core/src/FWValidatorBase.h"
30-
#include "Fireworks/Core/src/FWEveDigitSetScalableMarker.cc"
29+
#include "Fireworks/Core/src/FWEveDigitSetScalableMarker.h"
3130

3231
#include "TEveScene.h"
3332
#include "TEveSceneInfo.h"

‎Fireworks/Core/src/classes.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include "Fireworks/Core/interface/FWGUIEventSelector.h"
3030
#include "Fireworks/Core/interface/FWTEventList.h"
3131
#include "Fireworks/Core/interface/FWTSelectorToEventList.h"
32-
#include "Fireworks/Core/src/FWEveDigitSetScalableMarker.cc"
32+
#include "Fireworks/Core/src/FWEveDigitSetScalableMarker.h"
3333
#include "Fireworks/Core/src/FW3DViewDistanceMeasureTool.h"
3434
namespace {
3535
struct Fireworks_Core {

0 commit comments

Comments
 (0)