Changeset 3621 for trunk/packages
- Timestamp:
- Apr 3, 2013, 10:46:28 AM (12 years ago)
- Location:
- trunk/packages/vizservers/vtkvis
- Files:
-
- 40 edited
- 12 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/packages/vizservers/vtkvis/Arc.h
r3616 r3621 15 15 16 16 #include "Shape.h" 17 #include " VtkDataSet.h"17 #include "DataSet.h" 18 18 19 19 namespace VtkVis { -
trunk/packages/vizservers/vtkvis/Arrow.h
r3616 r3621 15 15 16 16 #include "Shape.h" 17 #include " VtkDataSet.h"17 #include "DataSet.h" 18 18 19 19 namespace VtkVis { -
trunk/packages/vizservers/vtkvis/Box.h
r3616 r3621 15 15 16 16 #include "Shape.h" 17 #include " VtkDataSet.h"17 #include "DataSet.h" 18 18 19 19 namespace VtkVis { -
trunk/packages/vizservers/vtkvis/Cone.h
r3616 r3621 15 15 16 16 #include "Shape.h" 17 #include " VtkDataSet.h"17 #include "DataSet.h" 18 18 19 19 namespace VtkVis { -
trunk/packages/vizservers/vtkvis/Contour2D.cpp
r3616 r3621 24 24 25 25 #include "Contour2D.h" 26 #include " VtkRenderer.h"26 #include "Renderer.h" 27 27 #include "Trace.h" 28 28 … … 30 30 31 31 Contour2D::Contour2D(int numContours) : 32 VtkGraphicsObject(),32 GraphicsObject(), 33 33 _numContours(numContours), 34 34 _pipelineInitialized(false), … … 47 47 48 48 Contour2D::Contour2D(const std::vector<double>& contours) : 49 VtkGraphicsObject(),49 GraphicsObject(), 50 50 _numContours(contours.size()), 51 51 _contours(contours), -
trunk/packages/vizservers/vtkvis/Contour2D.h
r3616 r3621 19 19 20 20 #include "ColorMap.h" 21 #include " VtkGraphicsObject.h"21 #include "GraphicsObject.h" 22 22 23 23 namespace VtkVis { … … 26 26 * \brief 2D Contour lines (isolines) 27 27 */ 28 class Contour2D : public VtkGraphicsObject {28 class Contour2D : public GraphicsObject { 29 29 public: 30 30 enum ColorMode { … … 87 87 virtual void setColor(float color[3]) 88 88 { 89 VtkGraphicsObject::setColor(color);90 VtkGraphicsObject::setEdgeColor(color);89 GraphicsObject::setColor(color); 90 GraphicsObject::setEdgeColor(color); 91 91 } 92 92 -
trunk/packages/vizservers/vtkvis/Contour3D.cpp
r3616 r3621 22 22 23 23 #include "Contour3D.h" 24 #include " VtkRenderer.h"24 #include "Renderer.h" 25 25 #include "Trace.h" 26 26 … … 28 28 29 29 Contour3D::Contour3D(int numContours) : 30 VtkGraphicsObject(),30 GraphicsObject(), 31 31 _numContours(numContours), 32 32 _pipelineInitialized(false), … … 41 41 42 42 Contour3D::Contour3D(const std::vector<double>& contours) : 43 VtkGraphicsObject(),43 GraphicsObject(), 44 44 _numContours(contours.size()), 45 45 _contours(contours), -
trunk/packages/vizservers/vtkvis/Contour3D.h
r3616 r3621 20 20 21 21 #include "ColorMap.h" 22 #include " VtkGraphicsObject.h"22 #include "GraphicsObject.h" 23 23 24 24 namespace VtkVis { … … 27 27 * \brief 3D Contour isosurfaces (geometry) 28 28 */ 29 class Contour3D : public VtkGraphicsObject {29 class Contour3D : public GraphicsObject { 30 30 public: 31 31 enum ColorMode { -
trunk/packages/vizservers/vtkvis/Cutplane.cpp
r3616 r3621 27 27 28 28 #include "Cutplane.h" 29 #include " VtkRenderer.h"29 #include "Renderer.h" 30 30 #include "Trace.h" 31 31 … … 35 35 36 36 Cutplane::Cutplane() : 37 VtkGraphicsObject(),37 GraphicsObject(), 38 38 _pipelineInitialized(false), 39 39 _colorMap(NULL), -
trunk/packages/vizservers/vtkvis/Cutplane.h
r3616 r3621 22 22 #include "ColorMap.h" 23 23 #include "Types.h" 24 #include " VtkGraphicsObject.h"24 #include "GraphicsObject.h" 25 25 26 26 namespace VtkVis { … … 33 33 * Currently the DataSet must be image data (2D uniform grid) 34 34 */ 35 class Cutplane : public VtkGraphicsObject {35 class Cutplane : public GraphicsObject { 36 36 public: 37 37 enum ColorMode { -
trunk/packages/vizservers/vtkvis/Cylinder.h
r3616 r3621 15 15 16 16 #include "Shape.h" 17 #include " VtkDataSet.h"17 #include "DataSet.h" 18 18 19 19 namespace VtkVis { -
trunk/packages/vizservers/vtkvis/DataSet.cpp
r3618 r3621 25 25 #include <vtkLookupTable.h> 26 26 27 #include " VtkDataSet.h"27 #include "DataSet.h" 28 28 #include "Trace.h" 29 29 -
trunk/packages/vizservers/vtkvis/Disk.h
r3616 r3621 15 15 16 16 #include "Shape.h" 17 #include " VtkDataSet.h"17 #include "DataSet.h" 18 18 19 19 namespace VtkVis { -
trunk/packages/vizservers/vtkvis/Glyphs.cpp
r3616 r3621 28 28 29 29 #include "Glyphs.h" 30 #include " VtkRenderer.h"30 #include "Renderer.h" 31 31 #include "Trace.h" 32 32 … … 34 34 35 35 Glyphs::Glyphs(GlyphShape shape) : 36 VtkGraphicsObject(),36 GraphicsObject(), 37 37 _glyphShape(shape), 38 38 _scalingMode(SCALE_BY_VECTOR_MAGNITUDE), -
trunk/packages/vizservers/vtkvis/Glyphs.h
r3616 r3621 19 19 #include <vtkPlaneCollection.h> 20 20 21 #include " VtkGraphicsObject.h"21 #include "GraphicsObject.h" 22 22 #include "ColorMap.h" 23 23 … … 29 29 * The DataSet must have vectors and/or scalars 30 30 */ 31 class Glyphs : public VtkGraphicsObject {31 class Glyphs : public GraphicsObject { 32 32 public: 33 33 enum GlyphShape { -
trunk/packages/vizservers/vtkvis/GraphicsObject.cpp
r3618 r3621 6 6 */ 7 7 8 #include " VtkGraphicsObject.h"9 #include " VtkRenderer.h"8 #include "GraphicsObject.h" 9 #include "Renderer.h" 10 10 #include "Trace.h" 11 11 12 12 using namespace VtkVis; 13 13 14 void VtkGraphicsObject::setDataSet(DataSet *dataSet,14 void GraphicsObject::setDataSet(DataSet *dataSet, 15 15 Renderer *renderer) 16 16 { … … 32 32 } 33 33 34 void VtkGraphicsObject::updateRanges(Renderer *renderer)34 void GraphicsObject::updateRanges(Renderer *renderer) 35 35 { 36 36 if (_dataSet == NULL) { -
trunk/packages/vizservers/vtkvis/GraphicsObject.h
r3618 r3621 6 6 */ 7 7 8 #ifndef VTKVIS_ VTKGRAPHICSOBJECT_H9 #define VTKVIS_ VTKGRAPHICSOBJECT_H8 #ifndef VTKVIS_GRAPHICS_OBJECT_H 9 #define VTKVIS_GRAPHICS_OBJECT_H 10 10 11 11 #include <cmath> … … 25 25 #include <vtkPlaneCollection.h> 26 26 27 #include " VtkDataSet.h"27 #include "DataSet.h" 28 28 #include "Trace.h" 29 29 … … 35 35 * \brief Base class for graphics objects 36 36 */ 37 class VtkGraphicsObject {37 class GraphicsObject { 38 38 public: 39 39 enum CullFace { … … 43 43 }; 44 44 45 VtkGraphicsObject() :45 GraphicsObject() : 46 46 _dataSet(NULL), 47 47 _opacity(1.0), … … 62 62 } 63 63 64 virtual ~ VtkGraphicsObject()64 virtual ~GraphicsObject() 65 65 {} 66 66 67 67 /** 68 * \brief Return the name of the sublass of VtkGraphicsObject68 * \brief Return the name of the sublass of GraphicsObject 69 69 */ 70 70 virtual const char *getClassName() const = 0; … … 894 894 * \brief Convenience method to set culling state on a vtkProperty 895 895 * 896 * Note: Does not change the culling state flag of this VtkGraphicsObject896 * Note: Does not change the culling state flag of this GraphicsObject 897 897 */ 898 898 virtual void setCulling(vtkProperty *property, bool state) -
trunk/packages/vizservers/vtkvis/Group.cpp
r3616 r3621 34 34 } 35 35 36 void Group::addChild(const NodeId& name, VtkGraphicsObject *obj)36 void Group::addChild(const NodeId& name, GraphicsObject *obj) 37 37 { 38 38 if (obj == NULL) … … 44 44 } 45 45 46 VtkGraphicsObject *Group::getChild(const NodeId& name)46 GraphicsObject *Group::getChild(const NodeId& name) 47 47 { 48 48 NodeHashmap::iterator itr = _nodes.find(name); … … 61 61 return; 62 62 } 63 VtkGraphicsObject *obj = itr->second;63 GraphicsObject *obj = itr->second; 64 64 if (obj->getProp3D() != NULL) { 65 65 getAssembly()->RemovePart(obj->getProp3D()); -
trunk/packages/vizservers/vtkvis/Group.h
r3616 r3621 13 13 #include <vtkProp3D.h> 14 14 15 #include " VtkGraphicsObject.h"15 #include "GraphicsObject.h" 16 16 17 17 namespace VtkVis { … … 20 20 * \brief Collection of shapes with grouping 21 21 */ 22 class Group : public VtkGraphicsObject {22 class Group : public GraphicsObject { 23 23 public: 24 24 typedef std::string NodeId; 25 typedef std::tr1::unordered_map<NodeId, VtkGraphicsObject *> NodeHashmap;25 typedef std::tr1::unordered_map<NodeId, GraphicsObject *> NodeHashmap; 26 26 27 27 Group(); … … 42 42 virtual void setClippingPlanes(vtkPlaneCollection *planes); 43 43 44 void addChild(const NodeId& name, VtkGraphicsObject *obj);44 void addChild(const NodeId& name, GraphicsObject *obj); 45 45 46 VtkGraphicsObject *getChild(const NodeId& name);46 GraphicsObject *getChild(const NodeId& name); 47 47 48 void getChildren(std::vector< VtkGraphicsObject *>& children)48 void getChildren(std::vector<GraphicsObject *>& children) 49 49 { 50 50 for (NodeHashmap::iterator itr = _nodes.begin(); -
trunk/packages/vizservers/vtkvis/HeightMap.cpp
r3616 r3621 32 32 33 33 #include "HeightMap.h" 34 #include " VtkRenderer.h"34 #include "Renderer.h" 35 35 #include "Trace.h" 36 36 … … 41 41 42 42 HeightMap::HeightMap(int numContours, double heightScale) : 43 VtkGraphicsObject(),43 GraphicsObject(), 44 44 _numContours(numContours), 45 45 _contourColorMap(false), … … 61 61 62 62 HeightMap::HeightMap(const std::vector<double>& contours, double heightScale) : 63 VtkGraphicsObject(),63 GraphicsObject(), 64 64 _numContours(contours.size()), 65 65 _contours(contours), -
trunk/packages/vizservers/vtkvis/HeightMap.h
r3616 r3621 28 28 #include "ColorMap.h" 29 29 #include "Types.h" 30 #include " VtkGraphicsObject.h"30 #include "GraphicsObject.h" 31 31 32 32 namespace VtkVis { … … 35 35 * \brief Color-mapped plot of data set 36 36 */ 37 class HeightMap : public VtkGraphicsObject {37 class HeightMap : public GraphicsObject { 38 38 public: 39 39 enum ColorMode { -
trunk/packages/vizservers/vtkvis/LIC.cpp
r3616 r3621 28 28 29 29 LIC::LIC() : 30 VtkGraphicsObject(),30 GraphicsObject(), 31 31 _sliceAxis(Z_AXIS), 32 32 _colorMap(NULL) … … 441 441 void LIC::updateRanges(Renderer *renderer) 442 442 { 443 VtkGraphicsObject::updateRanges(renderer);443 GraphicsObject::updateRanges(renderer); 444 444 445 445 if (_lut != NULL) { -
trunk/packages/vizservers/vtkvis/LIC.h
r3616 r3621 22 22 #include "ColorMap.h" 23 23 #include "Types.h" 24 #include " VtkGraphicsObject.h"24 #include "GraphicsObject.h" 25 25 26 26 namespace VtkVis { … … 31 31 * The DataSet must contain vectors 32 32 */ 33 class LIC : public VtkGraphicsObject {33 class LIC : public GraphicsObject { 34 34 public: 35 35 LIC(); -
trunk/packages/vizservers/vtkvis/Line.h
r3616 r3621 15 15 16 16 #include "Shape.h" 17 #include " VtkDataSet.h"17 #include "DataSet.h" 18 18 19 19 namespace VtkVis { -
trunk/packages/vizservers/vtkvis/Makefile.in
r3616 r3621 147 147 Cutplane.cpp \ 148 148 Cylinder.cpp \ 149 DataSet.cpp \ 149 150 Disk.cpp \ 150 151 Glyphs.cpp \ 152 GraphicsObject.cpp \ 151 153 Group.cpp \ 152 154 HeightMap.cpp \ … … 160 162 PseudoColor.cpp \ 161 163 ReadBuffer.cpp \ 164 Renderer.cpp \ 165 RendererCmd.cpp \ 166 RendererGraphicsObjs.cpp \ 167 RenderServer.cpp \ 162 168 Shape.cpp \ 163 169 Sphere.cpp \ … … 166 172 Trace.cpp \ 167 173 Volume.cpp \ 168 VtkDataSet.cpp \169 VtkGraphicsObject.cpp \170 VtkRenderer.cpp \171 VtkRendererCmd.cpp \172 VtkRendererGraphicsObjs.cpp \173 VtkRenderServer.cpp \174 174 Warp.cpp 175 175 … … 217 217 $(RM) Makefile Doxyfile 218 218 219 Arc.o: Arc.h Shape.h VtkGraphicsObject.h VtkDataSet.h VtkRenderer.h Trace.h220 Arrow.o: Arrow.h Shape.h VtkGraphicsObject.h VtkDataSet.h VtkRenderer.h Trace.h221 Box.o: Box.h Shape.h VtkGraphicsObject.h VtkDataSet.h VtkRenderer.h Trace.h219 Arc.o: Arc.h Shape.h GraphicsObject.h DataSet.h Renderer.h Trace.h 220 Arrow.o: Arrow.h Shape.h GraphicsObject.h DataSet.h Renderer.h Trace.h 221 Box.o: Box.h Shape.h GraphicsObject.h DataSet.h Renderer.h Trace.h 222 222 CmdProc.o: CmdProc.h 223 223 ColorMap.o: ColorMap.h Molecule.h Trace.h 224 Cone.o: Cone.h Shape.h VtkGraphicsObject.h VtkDataSet.h VtkRenderer.h Trace.h 225 Contour2D.o: Contour2D.h VtkGraphicsObject.h VtkDataSet.h VtkRenderer.h Trace.h 226 Contour3D.o: Contour3D.h VtkGraphicsObject.h VtkDataSet.h VtkRenderer.h ColorMap.h Trace.h 227 Cutplane.o: Cutplane.h VtkGraphicsObject.h VtkDataSet.h VtkRenderer.h ColorMap.h Trace.h 228 Cylinder.o: Cylinder.h Shape.h VtkGraphicsObject.h VtkDataSet.h VtkRenderer.h Trace.h 229 Disk.o: Disk.h Shape.h VtkGraphicsObject.h VtkDataSet.h VtkRenderer.h Trace.h 230 Glyphs.o: Glyphs.h VtkGraphicsObject.h VtkDataSet.h VtkRenderer.h ColorMap.h Trace.h 231 Group.o: Group.h VtkGraphicsObject.h VtkDataSet.h VtkRenderer.h Trace.h 232 HeightMap.o: HeightMap.h VtkGraphicsObject.h VtkDataSet.h VtkRenderer.h ColorMap.h Trace.h 233 LIC.o: LIC.h VtkGraphicsObject.h VtkDataSet.h VtkRenderer.h ColorMap.h Trace.h VtkRenderServer.h 234 Line.o: Line.h Shape.h VtkGraphicsObject.h VtkDataSet.h VtkRenderer.h Trace.h 224 Cone.o: Cone.h Shape.h GraphicsObject.h DataSet.h Renderer.h Trace.h 225 Contour2D.o: Contour2D.h GraphicsObject.h DataSet.h Renderer.h Trace.h 226 Contour3D.o: Contour3D.h GraphicsObject.h DataSet.h Renderer.h ColorMap.h Trace.h 227 Cutplane.o: Cutplane.h GraphicsObject.h DataSet.h Renderer.h ColorMap.h Trace.h 228 Cylinder.o: Cylinder.h Shape.h GraphicsObject.h DataSet.h Renderer.h Trace.h 229 DataSet.o: DataSet.h Trace.h 230 Disk.o: Disk.h Shape.h GraphicsObject.h DataSet.h Renderer.h Trace.h 231 Glyphs.o: Glyphs.h GraphicsObject.h DataSet.h Renderer.h ColorMap.h Trace.h 232 GraphicsObject.o: GraphicsObject.h Renderer.h DataSet.h ColorMap.h Trace.h 233 Group.o: Group.h GraphicsObject.h DataSet.h Renderer.h Trace.h 234 HeightMap.o: HeightMap.h GraphicsObject.h DataSet.h Renderer.h ColorMap.h Trace.h 235 LIC.o: LIC.h GraphicsObject.h DataSet.h Renderer.h ColorMap.h Trace.h RenderServer.h 236 Line.o: Line.h Shape.h GraphicsObject.h DataSet.h Renderer.h Trace.h 235 237 md5.o: md5.h 236 Molecule.o: Molecule.h MoleculeData.h VtkGraphicsObject.h VtkDataSet.h VtkRenderer.h ColorMap.h Trace.h237 Outline.o: Outline.h VtkGraphicsObject.h VtkDataSet.h Trace.h238 PolyData.o: PolyData.h VtkGraphicsObject.h VtkDataSet.h VtkRenderer.h Trace.h239 Polygon.o: Polygon.h Shape.h VtkGraphicsObject.h VtkDataSet.h VtkRenderer.h Trace.h238 Molecule.o: Molecule.h MoleculeData.h GraphicsObject.h DataSet.h Renderer.h ColorMap.h Trace.h 239 Outline.o: Outline.h GraphicsObject.h DataSet.h Trace.h 240 PolyData.o: PolyData.h GraphicsObject.h DataSet.h Renderer.h Trace.h 241 Polygon.o: Polygon.h Shape.h GraphicsObject.h DataSet.h Renderer.h Trace.h 240 242 PPMWriter.o: PPMWriter.h ResponseQueue.h Trace.h 241 PseudoColor.o: PseudoColor.h VtkGraphicsObject.h VtkDataSet.h VtkRenderer.h ColorMap.h Trace.h243 PseudoColor.o: PseudoColor.h GraphicsObject.h DataSet.h Renderer.h ColorMap.h Trace.h 242 244 ReadBuffer.o: ReadBuffer.h Trace.h 245 Renderer.o: Renderer.h RendererGraphicsObjs.h vtkRpCubeAxesActor.h vtkRpAxisFollower.h vtkRpAxisActor.h Math.h DataSet.h Arc.h Arrow.h Box.h Cone.h Contour2D.h Contour3D.h Cutplane.h Cylinder.h Disk.h Glyphs.h Group.h HeightMap.h LIC.h Line.h Molecule.h Outline.h PolyData.h Polygon.h PseudoColor.h Sphere.h Streamlines.h Volume.h ColorMap.h Trace.h 246 RendererCmd.o: Renderer.h RendererGraphicsObjs.h vtkRpCubeAxesActor.h vtkRpAxisFollower.h vtkRpAxisActor.h DataSet.h Arc.h Arrow.h Box.h Cone.h Contour2D.h Contour3D.h Cutplane.h Cylinder.h Disk.h Glyphs.h Group.h HeightMap.h LIC.h Line.h Molecule.h Outline.h PolyData.h Polygon.h PseudoColor.h Sphere.h Streamlines.h Volume.h ColorMap.h ReadBuffer.h ResponseQueue.h Trace.h CmdProc.h PPMWriter.h TGAWriter.h 247 RendererGraphicsObjs.o: Renderer.h RendererGraphicsObjs.h DataSet.h Arc.h Arrow.h Box.h Cone.h Contour2D.h Contour3D.h Cutplane.h Cylinder.h Disk.h Glyphs.h Group.h HeightMap.h LIC.h Line.h Molecule.h Outline.h PolyData.h Polygon.h PseudoColor.h Sphere.h Streamlines.h Volume.h ColorMap.h Trace.h 248 RenderServer.o: RenderServer.h RendererCmd.h Renderer.h vtkRpCubeAxesActor.h vtkRpAxisFollower.h vtkRpAxisActor.h ReadBuffer.h ResponseQueue.h Trace.h PPMWriter.h TGAWriter.h 243 249 ResponseQueue.o: ResponseQueue.h Trace.h 244 Shape.o: Shape.h VtkGraphicsObject.h VtkDataSet.h VtkRenderer.h Trace.h245 Sphere.o: Sphere.h Shape.h VtkGraphicsObject.h VtkDataSet.h VtkRenderer.h Trace.h246 Streamlines.o: Streamlines.h VtkGraphicsObject.h VtkDataSet.h VtkRenderer.h ColorMap.h Trace.h250 Shape.o: Shape.h GraphicsObject.h DataSet.h Renderer.h Trace.h 251 Sphere.o: Sphere.h Shape.h GraphicsObject.h DataSet.h Renderer.h Trace.h 252 Streamlines.o: Streamlines.h GraphicsObject.h DataSet.h Renderer.h ColorMap.h Trace.h 247 253 TGAWriter.o: TGAWriter.h ResponseQueue.h Trace.h 248 254 Trace.o: Trace.h 249 Volume.o: Volume.h VtkGraphicsObject.h VtkDataSet.h VtkRenderer.h ColorMap.h Trace.h 250 VtkDataSet.o: VtkDataSet.h Trace.h 251 VtkGraphicsObject.o: VtkGraphicsObject.h VtkRenderer.h VtkDataSet.h ColorMap.h Trace.h 252 VtkRenderer.o: VtkRenderer.h VtkRendererGraphicsObjs.h vtkRpCubeAxesActor.h vtkRpAxisFollower.h vtkRpAxisActor.h Math.h VtkDataSet.h Arc.h Arrow.h Box.h Cone.h Contour2D.h Contour3D.h Cutplane.h Cylinder.h Disk.h Glyphs.h Group.h HeightMap.h LIC.h Line.h Molecule.h Outline.h PolyData.h Polygon.h PseudoColor.h Sphere.h Streamlines.h Volume.h ColorMap.h Trace.h 253 VtkRendererCmd.o: VtkRenderer.h VtkRendererGraphicsObjs.h vtkRpCubeAxesActor.h vtkRpAxisFollower.h vtkRpAxisActor.h VtkDataSet.h Arc.h Arrow.h Box.h Cone.h Contour2D.h Contour3D.h Cutplane.h Cylinder.h Disk.h Glyphs.h Group.h HeightMap.h LIC.h Line.h Molecule.h Outline.h PolyData.h Polygon.h PseudoColor.h Sphere.h Streamlines.h Volume.h ColorMap.h ReadBuffer.h ResponseQueue.h Trace.h CmdProc.h PPMWriter.h TGAWriter.h 254 VtkRendererGraphicsObjs.o: VtkRenderer.h VtkRendererGraphicsObjs.h VtkDataSet.h Arc.h Arrow.h Box.h Cone.h Contour2D.h Contour3D.h Cutplane.h Cylinder.h Disk.h Glyphs.h Group.h HeightMap.h LIC.h Line.h Molecule.h Outline.h PolyData.h Polygon.h PseudoColor.h Sphere.h Streamlines.h Volume.h ColorMap.h Trace.h 255 VtkRenderServer.o: VtkRenderServer.h VtkRendererCmd.h VtkRenderer.h vtkRpCubeAxesActor.h vtkRpAxisFollower.h vtkRpAxisActor.h ReadBuffer.h ResponseQueue.h Trace.h PPMWriter.h TGAWriter.h 255 Volume.o: Volume.h GraphicsObject.h DataSet.h Renderer.h ColorMap.h Trace.h 256 256 vtkRpAxisActor.o: vtkRpAxisActor.h 257 257 vtkRpAxisFollower.o: vtkRpAxisFollower.h vtkRpAxisActor.h 258 258 vtkRpCubeAxesActor.o: vtkRpCubeAxesActor.h vtkRpAxisFollower.h vtkRpAxisActor.h 259 Warp.o: Warp.h VtkGraphicsObject.h VtkDataSet.h VtkRenderer.h ColorMap.h Trace.h259 Warp.o: Warp.h GraphicsObject.h DataSet.h Renderer.h ColorMap.h Trace.h -
trunk/packages/vizservers/vtkvis/Molecule.cpp
r3616 r3621 32 32 #include "Molecule.h" 33 33 #include "MoleculeData.h" 34 #include " VtkRenderer.h"34 #include "Renderer.h" 35 35 #include "Trace.h" 36 36 … … 38 38 39 39 Molecule::Molecule() : 40 VtkGraphicsObject(),40 GraphicsObject(), 41 41 _radiusScale(0.3), 42 42 _atomScaling(COVALENT_RADIUS), … … 624 624 void Molecule::setVisibility(bool state) 625 625 { 626 VtkGraphicsObject::setVisibility(state);626 GraphicsObject::setVisibility(state); 627 627 if (_labelProp != NULL) { 628 628 if (!state) … … 638 638 void Molecule::setOpacity(double opacity) 639 639 { 640 VtkGraphicsObject::setOpacity(opacity);640 GraphicsObject::setOpacity(opacity); 641 641 if (_labelMapper != NULL) { 642 642 _labelMapper->SetBackgroundOpacity(opacity); -
trunk/packages/vizservers/vtkvis/Molecule.h
r3616 r3621 22 22 23 23 #include "ColorMap.h" 24 #include " VtkGraphicsObject.h"24 #include "GraphicsObject.h" 25 25 26 26 namespace VtkVis { … … 37 37 * "element," it will be color-mapped as a standard scalar field. 38 38 */ 39 class Molecule : public VtkGraphicsObject {39 class Molecule : public GraphicsObject { 40 40 public: 41 41 enum AtomScaling { -
trunk/packages/vizservers/vtkvis/Outline.cpp
r3616 r3621 20 20 21 21 Outline::Outline() : 22 VtkGraphicsObject()22 GraphicsObject() 23 23 { 24 24 } … … 39 39 void Outline::initProp() 40 40 { 41 VtkGraphicsObject::initProp();41 GraphicsObject::initProp(); 42 42 } 43 43 -
trunk/packages/vizservers/vtkvis/Outline.h
r3616 r3621 13 13 #include <vtkActor.h> 14 14 15 #include " VtkGraphicsObject.h"16 #include " VtkDataSet.h"15 #include "GraphicsObject.h" 16 #include "DataSet.h" 17 17 18 18 namespace VtkVis { … … 23 23 * This class creates a wireframe box around the DataSet bounds 24 24 */ 25 class Outline : public VtkGraphicsObject {25 class Outline : public GraphicsObject { 26 26 public: 27 27 Outline(); -
trunk/packages/vizservers/vtkvis/PolyData.cpp
r3616 r3621 25 25 26 26 PolyData::PolyData() : 27 VtkGraphicsObject()27 GraphicsObject() 28 28 { 29 29 } … … 44 44 void PolyData::initProp() 45 45 { 46 VtkGraphicsObject::initProp();46 GraphicsObject::initProp(); 47 47 } 48 48 -
trunk/packages/vizservers/vtkvis/PolyData.h
r3616 r3621 13 13 #include <vtkActor.h> 14 14 15 #include " VtkGraphicsObject.h"16 #include " VtkDataSet.h"15 #include "GraphicsObject.h" 16 #include "DataSet.h" 17 17 18 18 namespace VtkVis { … … 23 23 * This class creates a boundary mesh of a DataSet 24 24 */ 25 class PolyData : public VtkGraphicsObject {25 class PolyData : public GraphicsObject { 26 26 public: 27 27 PolyData(); -
trunk/packages/vizservers/vtkvis/Polygon.h
r3616 r3621 15 15 16 16 #include "Shape.h" 17 #include " VtkDataSet.h"17 #include "DataSet.h" 18 18 19 19 namespace VtkVis { -
trunk/packages/vizservers/vtkvis/PseudoColor.cpp
r3616 r3621 26 26 27 27 #include "PseudoColor.h" 28 #include " VtkRenderer.h"28 #include "Renderer.h" 29 29 #include "Trace.h" 30 30 … … 34 34 35 35 PseudoColor::PseudoColor() : 36 VtkGraphicsObject(),36 GraphicsObject(), 37 37 _colorMap(NULL), 38 38 _colorMode(COLOR_BY_SCALAR), -
trunk/packages/vizservers/vtkvis/PseudoColor.h
r3616 r3621 16 16 17 17 #include "ColorMap.h" 18 #include " VtkGraphicsObject.h"18 #include "GraphicsObject.h" 19 19 20 20 namespace VtkVis { … … 23 23 * \brief Color-mapped plot of data set 24 24 */ 25 class PseudoColor : public VtkGraphicsObject {25 class PseudoColor : public GraphicsObject { 26 26 public: 27 27 enum ColorMode { -
trunk/packages/vizservers/vtkvis/RenderServer.cpp
r3618 r3621 25 25 #include "Trace.h" 26 26 #include "ReadBuffer.h" 27 #include " VtkRenderServer.h"28 #include " VtkRendererCmd.h"29 #include " VtkRenderer.h"27 #include "RenderServer.h" 28 #include "RendererCmd.h" 29 #include "Renderer.h" 30 30 #include "PPMWriter.h" 31 31 #include "TGAWriter.h" -
trunk/packages/vizservers/vtkvis/Renderer.cpp
r3618 r3621 40 40 #include <vtkVersion.h> 41 41 42 #include " VtkRenderer.h"43 #include " VtkRendererGraphicsObjs.h"42 #include "Renderer.h" 43 #include "RendererGraphicsObjs.h" 44 44 #include "Math.h" 45 45 #include "ColorMap.h" -
trunk/packages/vizservers/vtkvis/Renderer.h
r3618 r3621 27 27 #include "ColorMap.h" 28 28 #include "Types.h" 29 #include " VtkDataSet.h"29 #include "DataSet.h" 30 30 #include "Arc.h" 31 31 #include "Arrow.h" … … 446 446 vtkUnsignedCharArray *imgData); 447 447 448 // Generic VtkGraphicsObject methods449 450 template<class GraphicsObject>451 GraphicsObject*getGraphicsObject(const DataSetId& id);452 453 template<class GraphicsObject>448 // Generic GraphicsObject methods 449 450 template<class T> 451 T *getGraphicsObject(const DataSetId& id); 452 453 template<class T> 454 454 bool addGraphicsObject(const DataSetId& id); 455 455 456 template<class GraphicsObject>456 template<class T> 457 457 void deleteGraphicsObject(const DataSetId& id); 458 458 459 template<class GraphicsObject>459 template<class T> 460 460 void deleteAllGraphicsObjects(); 461 461 462 template<class GraphicsObject>462 template<class T> 463 463 void mergeGraphicsObjectBounds(double *bounds, bool onlyVisible); 464 464 465 template<class GraphicsObject>465 template<class T> 466 466 void mergeGraphicsObjectUnscaledBounds(double *bounds, bool onlyVisible); 467 467 468 template<class GraphicsObject>468 template<class T> 469 469 void updateGraphicsObjectFieldRanges(); 470 470 471 template<class GraphicsObject>471 template<class T> 472 472 void setGraphicsObjectClippingPlanes(vtkPlaneCollection *planes); 473 473 474 template<class GraphicsObject>474 template<class T> 475 475 void setGraphicsObjectAspect(double aspectRatio); 476 476 477 template<class GraphicsObject>477 template<class T> 478 478 void setGraphicsObjectInterpolateBeforeMapping(const DataSetId& id, bool state); 479 479 480 template<class GraphicsObject>480 template<class T> 481 481 void setGraphicsObjectColorMap(const DataSetId& id, const ColorMapId& colorMapId); 482 482 483 template<class GraphicsObject>483 template<class T> 484 484 void updateGraphicsObjectColorMap(ColorMap *cmap); 485 485 486 template<class GraphicsObject>486 template<class T> 487 487 bool graphicsObjectColorMapUsed(ColorMap *cmap); 488 488 489 template<class GraphicsObject>489 template<class T> 490 490 void setGraphicsObjectVolumeSlice(const DataSetId& id, Axis axis, double ratio); 491 491 492 492 // Prop/Prop3D properties 493 493 494 template<class GraphicsObject>494 template<class T> 495 495 void setGraphicsObjectOrientation(const DataSetId& id, double quat[4]); 496 496 497 template<class GraphicsObject>497 template<class T> 498 498 void setGraphicsObjectOrientation(const DataSetId& id, double angle, double axis[3]); 499 499 500 template<class GraphicsObject>500 template<class T> 501 501 void setGraphicsObjectPosition(const DataSetId& id, double pos[3]); 502 502 503 template<class GraphicsObject>503 template<class T> 504 504 void setGraphicsObjectAspect(const DataSetId& id, double aspect); 505 505 506 template<class GraphicsObject>506 template<class T> 507 507 void setGraphicsObjectScale(const DataSetId& id, double scale[3]); 508 508 509 template<class GraphicsObject>509 template<class T> 510 510 void setGraphicsObjectTransform(const DataSetId& id, vtkMatrix4x4 *trans); 511 511 512 template<class GraphicsObject>512 template<class T> 513 513 void setGraphicsObjectVisibility(const DataSetId& id, bool state); 514 514 515 515 // Actor properties 516 516 517 template<class GraphicsObject>517 template<class T> 518 518 void setGraphicsObjectColor(const DataSetId& id, float color[3]); 519 519 520 template<class GraphicsObject>520 template<class T> 521 521 void setGraphicsObjectEdgeVisibility(const DataSetId& id, bool state); 522 522 523 template<class GraphicsObject>523 template<class T> 524 524 void setGraphicsObjectEdgeColor(const DataSetId& id, float color[3]); 525 525 526 template<class GraphicsObject>526 template<class T> 527 527 void setGraphicsObjectEdgeWidth(const DataSetId& id, float edgeWidth); 528 528 529 template<class GraphicsObject>529 template<class T> 530 530 void setGraphicsObjectAmbient(const DataSetId& id, double coeff); 531 531 532 template<class GraphicsObject>532 template<class T> 533 533 void setGraphicsObjectDiffuse(const DataSetId& id, double coeff); 534 534 535 template<class GraphicsObject>535 template<class T> 536 536 void setGraphicsObjectSpecular(const DataSetId& id, double coeff, double power); 537 537 538 template<class GraphicsObject>538 template<class T> 539 539 void setGraphicsObjectLighting(const DataSetId& id, bool state); 540 540 541 template<class GraphicsObject>541 template<class T> 542 542 void setGraphicsObjectOpacity(const DataSetId& id, double opacity); 543 543 544 template<class GraphicsObject>544 template<class T> 545 545 void setGraphicsObjectPointSize(const DataSetId& id, float size); 546 546 547 template<class GraphicsObject>547 template<class T> 548 548 void setGraphicsObjectWireframe(const DataSetId& id, bool state); 549 549 … … 856 856 static void mergeBounds(double *boundsDest, const double *bounds1, const double *bounds2); 857 857 858 template<class GraphicsObject>859 std::tr1::unordered_map<DataSetId, GraphicsObject *>&getGraphicsObjectHashmap();858 template<class T> 859 std::tr1::unordered_map<DataSetId, T *>& getGraphicsObjectHashmap(); 860 860 861 861 void setObjectAspects(double aspectRatio); -
trunk/packages/vizservers/vtkvis/RendererCmd.cpp
r3618 r3621 22 22 #include "ReadBuffer.h" 23 23 #include "Types.h" 24 #include " VtkRendererCmd.h"25 #include " VtkRenderServer.h"26 #include " VtkRenderer.h"27 #include " VtkRendererGraphicsObjs.h"24 #include "RendererCmd.h" 25 #include "RenderServer.h" 26 #include "Renderer.h" 27 #include "RendererGraphicsObjs.h" 28 28 #include "PPMWriter.h" 29 29 #include "TGAWriter.h" -
trunk/packages/vizservers/vtkvis/RendererGraphicsObjs.cpp
r3618 r3621 15 15 #include <vtkDataSetReader.h> 16 16 17 #include " VtkRendererGraphicsObjs.h"18 #include " VtkRenderer.h"19 #include " VtkDataSet.h"17 #include "RendererGraphicsObjs.h" 18 #include "Renderer.h" 19 #include "DataSet.h" 20 20 #include "Box.h" 21 21 #include "Contour2D.h" -
trunk/packages/vizservers/vtkvis/RendererGraphicsObjs.h
r3618 r3621 38 38 #endif 39 39 40 #include " VtkRenderer.h"40 #include "Renderer.h" 41 41 42 42 namespace VtkVis { … … 45 45 * \brief Look up graphics object by name 46 46 */ 47 template<class GraphicsObject>48 GraphicsObject*Renderer::getGraphicsObject(const DataSetId& id)49 { 50 std::tr1::unordered_map<DataSetId, GraphicsObject*>& hashmap =51 getGraphicsObjectHashmap< GraphicsObject>();52 typename std::tr1::unordered_map<DataSetId, GraphicsObject*>::iterator47 template<class T> 48 T *Renderer::getGraphicsObject(const DataSetId& id) 49 { 50 std::tr1::unordered_map<DataSetId, T *>& hashmap = 51 getGraphicsObjectHashmap<T>(); 52 typename std::tr1::unordered_map<DataSetId, T *>::iterator 53 53 itr = hashmap.find(id); 54 54 55 55 if (itr == hashmap.end()) { 56 56 #ifdef DEBUG 57 GO_TRACE( GraphicsObject, "not found: %s", id.c_str());57 GO_TRACE(T, "not found: %s", id.c_str()); 58 58 #endif 59 59 return NULL; … … 65 65 * \brief Delete graphics object by name 66 66 */ 67 template<class GraphicsObject>67 template<class T> 68 68 void Renderer::deleteGraphicsObject(const DataSetId& id) 69 69 { 70 std::tr1::unordered_map<DataSetId, GraphicsObject*>& hashmap =71 getGraphicsObjectHashmap< GraphicsObject>();72 typename std::tr1::unordered_map<DataSetId, GraphicsObject*>::iterator itr;73 74 bool doAll = false; 75 76 if (id.compare("all") == 0) { 77 itr = hashmap.begin(); 78 doAll = true; 79 } else { 80 itr = hashmap.find(id); 81 } 82 if (itr == hashmap.end()) { 83 GO_ERROR( GraphicsObject, "not found: %s", id.c_str());70 std::tr1::unordered_map<DataSetId, T *>& hashmap = 71 getGraphicsObjectHashmap<T>(); 72 typename std::tr1::unordered_map<DataSetId, T *>::iterator itr; 73 74 bool doAll = false; 75 76 if (id.compare("all") == 0) { 77 itr = hashmap.begin(); 78 doAll = true; 79 } else { 80 itr = hashmap.find(id); 81 } 82 if (itr == hashmap.end()) { 83 GO_ERROR(T, "not found: %s", id.c_str()); 84 84 return; 85 85 } … … 88 88 89 89 do { 90 GraphicsObject*gobj = itr->second;90 T *gobj = itr->second; 91 91 if (gobj->getProp()) 92 92 _renderer->RemoveViewProp(gobj->getProp()); … … 105 105 * \brief Delete all graphics objects from renderer 106 106 */ 107 template<class GraphicsObject>107 template<class T> 108 108 void Renderer::deleteAllGraphicsObjects() 109 109 { 110 std::tr1::unordered_map<DataSetId, GraphicsObject*>& hashmap =111 getGraphicsObjectHashmap< GraphicsObject>();112 typename std::tr1::unordered_map<DataSetId, GraphicsObject*>::iterator itr;110 std::tr1::unordered_map<DataSetId, T *>& hashmap = 111 getGraphicsObjectHashmap<T>(); 112 typename std::tr1::unordered_map<DataSetId, T *>::iterator itr; 113 113 114 114 itr = hashmap.begin(); … … 127 127 * \brief Add a graphics objects to the renderer's scene 128 128 */ 129 template<class GraphicsObject>129 template<class T> 130 130 bool Renderer::addGraphicsObject(const DataSetId& id) 131 131 { … … 148 148 const DataSetId& dsID = ds->getName(); 149 149 150 GraphicsObject*gobj;151 if ((gobj = getGraphicsObject< GraphicsObject>(dsID)) != NULL) {150 T *gobj; 151 if ((gobj = getGraphicsObject<T>(dsID)) != NULL) { 152 152 WARN("Replacing existing %s %s", gobj->getClassName(), dsID.c_str()); 153 deleteGraphicsObject< GraphicsObject>(dsID);153 deleteGraphicsObject<T>(dsID); 154 154 } 155 155 156 gobj = new GraphicsObject();156 gobj = new T(); 157 157 158 158 gobj->setDataSet(ds, this); … … 169 169 } 170 170 171 getGraphicsObjectHashmap< GraphicsObject>()[dsID] = gobj;171 getGraphicsObjectHashmap<T>()[dsID] = gobj; 172 172 } while (doAll && ++itr != _dataSets.end()); 173 173 … … 180 180 * \brief Set the prop orientation with a quaternion 181 181 */ 182 template<class GraphicsObject>182 template<class T> 183 183 void Renderer::setGraphicsObjectTransform(const DataSetId& id, vtkMatrix4x4 *trans) 184 184 { 185 std::tr1::unordered_map<DataSetId, GraphicsObject*>& hashmap =186 getGraphicsObjectHashmap< GraphicsObject>();187 typename std::tr1::unordered_map<DataSetId, GraphicsObject*>::iterator itr;188 189 bool doAll = false; 190 191 if (id.compare("all") == 0) { 192 itr = hashmap.begin(); 193 if (itr == hashmap.end()) 194 return; 195 doAll = true; 196 } else { 197 itr = hashmap.find(id); 198 } 199 if (itr == hashmap.end()) { 200 GO_ERROR( GraphicsObject, "not found: %s", id.c_str());185 std::tr1::unordered_map<DataSetId, T *>& hashmap = 186 getGraphicsObjectHashmap<T>(); 187 typename std::tr1::unordered_map<DataSetId, T *>::iterator itr; 188 189 bool doAll = false; 190 191 if (id.compare("all") == 0) { 192 itr = hashmap.begin(); 193 if (itr == hashmap.end()) 194 return; 195 doAll = true; 196 } else { 197 itr = hashmap.find(id); 198 } 199 if (itr == hashmap.end()) { 200 GO_ERROR(T, "not found: %s", id.c_str()); 201 201 return; 202 202 } … … 213 213 * \brief Set the prop orientation with a quaternion 214 214 */ 215 template<class GraphicsObject>215 template<class T> 216 216 void Renderer::setGraphicsObjectOrientation(const DataSetId& id, double quat[4]) 217 217 { 218 std::tr1::unordered_map<DataSetId, GraphicsObject*>& hashmap =219 getGraphicsObjectHashmap< GraphicsObject>();220 typename std::tr1::unordered_map<DataSetId, GraphicsObject*>::iterator itr;221 222 bool doAll = false; 223 224 if (id.compare("all") == 0) { 225 itr = hashmap.begin(); 226 if (itr == hashmap.end()) 227 return; 228 doAll = true; 229 } else { 230 itr = hashmap.find(id); 231 } 232 if (itr == hashmap.end()) { 233 GO_ERROR( GraphicsObject, "not found: %s", id.c_str());218 std::tr1::unordered_map<DataSetId, T *>& hashmap = 219 getGraphicsObjectHashmap<T>(); 220 typename std::tr1::unordered_map<DataSetId, T *>::iterator itr; 221 222 bool doAll = false; 223 224 if (id.compare("all") == 0) { 225 itr = hashmap.begin(); 226 if (itr == hashmap.end()) 227 return; 228 doAll = true; 229 } else { 230 itr = hashmap.find(id); 231 } 232 if (itr == hashmap.end()) { 233 GO_ERROR(T, "not found: %s", id.c_str()); 234 234 return; 235 235 } … … 246 246 * \brief Set the prop orientation with a rotation about an axis 247 247 */ 248 template<class GraphicsObject>248 template<class T> 249 249 void Renderer::setGraphicsObjectOrientation(const DataSetId& id, double angle, double axis[3]) 250 250 { 251 std::tr1::unordered_map<DataSetId, GraphicsObject*>& hashmap =252 getGraphicsObjectHashmap< GraphicsObject>();253 typename std::tr1::unordered_map<DataSetId, GraphicsObject*>::iterator itr;254 255 bool doAll = false; 256 257 if (id.compare("all") == 0) { 258 itr = hashmap.begin(); 259 if (itr == hashmap.end()) 260 return; 261 doAll = true; 262 } else { 263 itr = hashmap.find(id); 264 } 265 if (itr == hashmap.end()) { 266 GO_ERROR( GraphicsObject, "not found: %s", id.c_str());251 std::tr1::unordered_map<DataSetId, T *>& hashmap = 252 getGraphicsObjectHashmap<T>(); 253 typename std::tr1::unordered_map<DataSetId, T *>::iterator itr; 254 255 bool doAll = false; 256 257 if (id.compare("all") == 0) { 258 itr = hashmap.begin(); 259 if (itr == hashmap.end()) 260 return; 261 doAll = true; 262 } else { 263 itr = hashmap.find(id); 264 } 265 if (itr == hashmap.end()) { 266 GO_ERROR(T, "not found: %s", id.c_str()); 267 267 return; 268 268 } … … 279 279 * \brief Set the prop position in world coords 280 280 */ 281 template<class GraphicsObject>281 template<class T> 282 282 void Renderer::setGraphicsObjectPosition(const DataSetId& id, double pos[3]) 283 283 { 284 std::tr1::unordered_map<DataSetId, GraphicsObject*>& hashmap =285 getGraphicsObjectHashmap< GraphicsObject>();286 typename std::tr1::unordered_map<DataSetId, GraphicsObject*>::iterator itr;287 288 bool doAll = false; 289 290 if (id.compare("all") == 0) { 291 itr = hashmap.begin(); 292 if (itr == hashmap.end()) 293 return; 294 doAll = true; 295 } else { 296 itr = hashmap.find(id); 297 } 298 if (itr == hashmap.end()) { 299 GO_ERROR( GraphicsObject, "not found: %s", id.c_str());284 std::tr1::unordered_map<DataSetId, T *>& hashmap = 285 getGraphicsObjectHashmap<T>(); 286 typename std::tr1::unordered_map<DataSetId, T *>::iterator itr; 287 288 bool doAll = false; 289 290 if (id.compare("all") == 0) { 291 itr = hashmap.begin(); 292 if (itr == hashmap.end()) 293 return; 294 doAll = true; 295 } else { 296 itr = hashmap.find(id); 297 } 298 if (itr == hashmap.end()) { 299 GO_ERROR(T, "not found: %s", id.c_str()); 300 300 return; 301 301 } … … 315 315 * \param aspect The aspect ratio (width/height), zero means native aspect 316 316 */ 317 template<class GraphicsObject>317 template<class T> 318 318 void Renderer::setGraphicsObjectAspect(const DataSetId& id, double aspect) 319 319 { 320 std::tr1::unordered_map<DataSetId, GraphicsObject*>& hashmap =321 getGraphicsObjectHashmap< GraphicsObject>();322 typename std::tr1::unordered_map<DataSetId, GraphicsObject*>::iterator itr;323 324 bool doAll = false; 325 326 if (id.compare("all") == 0) { 327 itr = hashmap.begin(); 328 if (itr == hashmap.end()) 329 return; 330 doAll = true; 331 } else { 332 itr = hashmap.find(id); 333 } 334 if (itr == hashmap.end()) { 335 GO_ERROR( GraphicsObject, "not found: %s", id.c_str());320 std::tr1::unordered_map<DataSetId, T *>& hashmap = 321 getGraphicsObjectHashmap<T>(); 322 typename std::tr1::unordered_map<DataSetId, T *>::iterator itr; 323 324 bool doAll = false; 325 326 if (id.compare("all") == 0) { 327 itr = hashmap.begin(); 328 if (itr == hashmap.end()) 329 return; 330 doAll = true; 331 } else { 332 itr = hashmap.find(id); 333 } 334 if (itr == hashmap.end()) { 335 GO_ERROR(T, "not found: %s", id.c_str()); 336 336 return; 337 337 } … … 348 348 * \brief Set the prop scaling 349 349 */ 350 template<class GraphicsObject>350 template<class T> 351 351 void Renderer::setGraphicsObjectScale(const DataSetId& id, double scale[3]) 352 352 { 353 std::tr1::unordered_map<DataSetId, GraphicsObject*>& hashmap =354 getGraphicsObjectHashmap< GraphicsObject>();355 typename std::tr1::unordered_map<DataSetId, GraphicsObject*>::iterator itr;356 357 bool doAll = false; 358 359 if (id.compare("all") == 0) { 360 itr = hashmap.begin(); 361 if (itr == hashmap.end()) 362 return; 363 doAll = true; 364 } else { 365 itr = hashmap.find(id); 366 } 367 if (itr == hashmap.end()) { 368 GO_ERROR( GraphicsObject, "not found: %s", id.c_str());353 std::tr1::unordered_map<DataSetId, T *>& hashmap = 354 getGraphicsObjectHashmap<T>(); 355 typename std::tr1::unordered_map<DataSetId, T *>::iterator itr; 356 357 bool doAll = false; 358 359 if (id.compare("all") == 0) { 360 itr = hashmap.begin(); 361 if (itr == hashmap.end()) 362 return; 363 doAll = true; 364 } else { 365 itr = hashmap.find(id); 366 } 367 if (itr == hashmap.end()) { 368 GO_ERROR(T, "not found: %s", id.c_str()); 369 369 return; 370 370 } … … 379 379 380 380 /** 381 * \brief Set visibility of VtkGraphicsObject for the given DataSet382 */ 383 template<class GraphicsObject>381 * \brief Set visibility of GraphicsObject for the given DataSet 382 */ 383 template<class T> 384 384 void Renderer::setGraphicsObjectVisibility(const DataSetId& id, bool state) 385 385 { 386 std::tr1::unordered_map<DataSetId, GraphicsObject*>& hashmap =387 getGraphicsObjectHashmap< GraphicsObject>();388 typename std::tr1::unordered_map<DataSetId, GraphicsObject*>::iterator itr;389 390 bool doAll = false; 391 392 if (id.compare("all") == 0) { 393 itr = hashmap.begin(); 394 if (itr == hashmap.end()) 395 return; 396 doAll = true; 397 } else { 398 itr = hashmap.find(id); 399 } 400 if (itr == hashmap.end()) { 401 GO_ERROR( GraphicsObject, "not found: %s", id.c_str());386 std::tr1::unordered_map<DataSetId, T *>& hashmap = 387 getGraphicsObjectHashmap<T>(); 388 typename std::tr1::unordered_map<DataSetId, T *>::iterator itr; 389 390 bool doAll = false; 391 392 if (id.compare("all") == 0) { 393 itr = hashmap.begin(); 394 if (itr == hashmap.end()) 395 return; 396 doAll = true; 397 } else { 398 itr = hashmap.find(id); 399 } 400 if (itr == hashmap.end()) { 401 GO_ERROR(T, "not found: %s", id.c_str()); 402 402 return; 403 403 } … … 414 414 * \brief Set the volume slice 415 415 */ 416 template<class GraphicsObject>416 template<class T> 417 417 void Renderer::setGraphicsObjectVolumeSlice(const DataSetId& id, Axis axis, double ratio) 418 418 { 419 std::tr1::unordered_map<DataSetId, GraphicsObject*>& hashmap =420 getGraphicsObjectHashmap< GraphicsObject>();421 typename std::tr1::unordered_map<DataSetId, GraphicsObject*>::iterator itr;422 423 bool doAll = false; 424 425 if (id.compare("all") == 0) { 426 itr = hashmap.begin(); 427 if (itr == hashmap.end()) 428 return; 429 doAll = true; 430 } else { 431 itr = hashmap.find(id); 432 } 433 434 if (itr == hashmap.end()) { 435 GO_ERROR( GraphicsObject, "not found: %s", id.c_str());419 std::tr1::unordered_map<DataSetId, T *>& hashmap = 420 getGraphicsObjectHashmap<T>(); 421 typename std::tr1::unordered_map<DataSetId, T *>::iterator itr; 422 423 bool doAll = false; 424 425 if (id.compare("all") == 0) { 426 itr = hashmap.begin(); 427 if (itr == hashmap.end()) 428 return; 429 doAll = true; 430 } else { 431 itr = hashmap.find(id); 432 } 433 434 if (itr == hashmap.end()) { 435 GO_ERROR(T, "not found: %s", id.c_str()); 436 436 return; 437 437 } … … 449 449 * \brief Set the RGB actor color for the specified DataSet 450 450 */ 451 template<class GraphicsObject>451 template<class T> 452 452 void Renderer::setGraphicsObjectColor(const DataSetId& id, float color[3]) 453 453 { 454 std::tr1::unordered_map<DataSetId, GraphicsObject*>& hashmap =455 getGraphicsObjectHashmap< GraphicsObject>();456 typename std::tr1::unordered_map<DataSetId, GraphicsObject*>::iterator itr;457 458 bool doAll = false; 459 460 if (id.compare("all") == 0) { 461 itr = hashmap.begin(); 462 if (itr == hashmap.end()) 463 return; 464 doAll = true; 465 } else { 466 itr = hashmap.find(id); 467 } 468 if (itr == hashmap.end()) { 469 GO_ERROR( GraphicsObject, "not found: %s", id.c_str());454 std::tr1::unordered_map<DataSetId, T *>& hashmap = 455 getGraphicsObjectHashmap<T>(); 456 typename std::tr1::unordered_map<DataSetId, T *>::iterator itr; 457 458 bool doAll = false; 459 460 if (id.compare("all") == 0) { 461 itr = hashmap.begin(); 462 if (itr == hashmap.end()) 463 return; 464 doAll = true; 465 } else { 466 itr = hashmap.find(id); 467 } 468 if (itr == hashmap.end()) { 469 GO_ERROR(T, "not found: %s", id.c_str()); 470 470 return; 471 471 } … … 481 481 * \brief Turn on/off edges for the given DataSet 482 482 */ 483 template<class GraphicsObject>483 template<class T> 484 484 void Renderer::setGraphicsObjectEdgeVisibility(const DataSetId& id, bool state) 485 485 { 486 std::tr1::unordered_map<DataSetId, GraphicsObject*>& hashmap =487 getGraphicsObjectHashmap< GraphicsObject>();488 typename std::tr1::unordered_map<DataSetId, GraphicsObject*>::iterator itr;489 490 bool doAll = false; 491 492 if (id.compare("all") == 0) { 493 itr = hashmap.begin(); 494 if (itr == hashmap.end()) 495 return; 496 doAll = true; 497 } else { 498 itr = hashmap.find(id); 499 } 500 if (itr == hashmap.end()) { 501 GO_ERROR( GraphicsObject, "not found: %s", id.c_str());486 std::tr1::unordered_map<DataSetId, T *>& hashmap = 487 getGraphicsObjectHashmap<T>(); 488 typename std::tr1::unordered_map<DataSetId, T *>::iterator itr; 489 490 bool doAll = false; 491 492 if (id.compare("all") == 0) { 493 itr = hashmap.begin(); 494 if (itr == hashmap.end()) 495 return; 496 doAll = true; 497 } else { 498 itr = hashmap.find(id); 499 } 500 if (itr == hashmap.end()) { 501 GO_ERROR(T, "not found: %s", id.c_str()); 502 502 return; 503 503 } … … 514 514 * \brief Set the RGB isosurface edge color for the specified DataSet 515 515 */ 516 template<class GraphicsObject>516 template<class T> 517 517 void Renderer::setGraphicsObjectEdgeColor(const DataSetId& id, float color[3]) 518 518 { 519 std::tr1::unordered_map<DataSetId, GraphicsObject*>& hashmap =520 getGraphicsObjectHashmap< GraphicsObject>();521 typename std::tr1::unordered_map<DataSetId, GraphicsObject*>::iterator itr;522 523 bool doAll = false; 524 525 if (id.compare("all") == 0) { 526 itr = hashmap.begin(); 527 if (itr == hashmap.end()) 528 return; 529 doAll = true; 530 } else { 531 itr = hashmap.find(id); 532 } 533 if (itr == hashmap.end()) { 534 GO_ERROR( GraphicsObject, "not found: %s", id.c_str());519 std::tr1::unordered_map<DataSetId, T *>& hashmap = 520 getGraphicsObjectHashmap<T>(); 521 typename std::tr1::unordered_map<DataSetId, T *>::iterator itr; 522 523 bool doAll = false; 524 525 if (id.compare("all") == 0) { 526 itr = hashmap.begin(); 527 if (itr == hashmap.end()) 528 return; 529 doAll = true; 530 } else { 531 itr = hashmap.find(id); 532 } 533 if (itr == hashmap.end()) { 534 GO_ERROR(T, "not found: %s", id.c_str()); 535 535 return; 536 536 } … … 549 549 * this function may not have an effect. 550 550 */ 551 template<class GraphicsObject>551 template<class T> 552 552 void Renderer::setGraphicsObjectEdgeWidth(const DataSetId& id, float edgeWidth) 553 553 { 554 std::tr1::unordered_map<DataSetId, GraphicsObject*>& hashmap =555 getGraphicsObjectHashmap< GraphicsObject>();556 typename std::tr1::unordered_map<DataSetId, GraphicsObject*>::iterator itr;557 558 bool doAll = false; 559 560 if (id.compare("all") == 0) { 561 itr = hashmap.begin(); 562 if (itr == hashmap.end()) 563 return; 564 doAll = true; 565 } else { 566 itr = hashmap.find(id); 567 } 568 if (itr == hashmap.end()) { 569 GO_ERROR( GraphicsObject, "not found: %s", id.c_str());554 std::tr1::unordered_map<DataSetId, T *>& hashmap = 555 getGraphicsObjectHashmap<T>(); 556 typename std::tr1::unordered_map<DataSetId, T *>::iterator itr; 557 558 bool doAll = false; 559 560 if (id.compare("all") == 0) { 561 itr = hashmap.begin(); 562 if (itr == hashmap.end()) 563 return; 564 doAll = true; 565 } else { 566 itr = hashmap.find(id); 567 } 568 if (itr == hashmap.end()) { 569 GO_ERROR(T, "not found: %s", id.c_str()); 570 570 return; 571 571 } … … 582 582 * \brief Set ambient lighting/shading coefficient for the specified DataSet 583 583 */ 584 template<class GraphicsObject>584 template<class T> 585 585 void Renderer::setGraphicsObjectAmbient(const DataSetId& id, double coeff) 586 586 { 587 std::tr1::unordered_map<DataSetId, GraphicsObject*>& hashmap =588 getGraphicsObjectHashmap< GraphicsObject>();589 typename std::tr1::unordered_map<DataSetId, GraphicsObject*>::iterator itr;590 591 bool doAll = false; 592 593 if (id.compare("all") == 0) { 594 itr = hashmap.begin(); 595 if (itr == hashmap.end()) 596 return; 597 doAll = true; 598 } else { 599 itr = hashmap.find(id); 600 } 601 if (itr == hashmap.end()) { 602 GO_ERROR( GraphicsObject, "not found: %s", id.c_str());587 std::tr1::unordered_map<DataSetId, T *>& hashmap = 588 getGraphicsObjectHashmap<T>(); 589 typename std::tr1::unordered_map<DataSetId, T *>::iterator itr; 590 591 bool doAll = false; 592 593 if (id.compare("all") == 0) { 594 itr = hashmap.begin(); 595 if (itr == hashmap.end()) 596 return; 597 doAll = true; 598 } else { 599 itr = hashmap.find(id); 600 } 601 if (itr == hashmap.end()) { 602 GO_ERROR(T, "not found: %s", id.c_str()); 603 603 return; 604 604 } … … 614 614 * \brief Set diffuse lighting/shading coefficient for the specified DataSet 615 615 */ 616 template<class GraphicsObject>616 template<class T> 617 617 void Renderer::setGraphicsObjectDiffuse(const DataSetId& id, double coeff) 618 618 { 619 std::tr1::unordered_map<DataSetId, GraphicsObject*>& hashmap =620 getGraphicsObjectHashmap< GraphicsObject>();621 typename std::tr1::unordered_map<DataSetId, GraphicsObject*>::iterator itr;622 623 bool doAll = false; 624 625 if (id.compare("all") == 0) { 626 itr = hashmap.begin(); 627 if (itr == hashmap.end()) 628 return; 629 doAll = true; 630 } else { 631 itr = hashmap.find(id); 632 } 633 if (itr == hashmap.end()) { 634 GO_ERROR( GraphicsObject, "not found: %s", id.c_str());619 std::tr1::unordered_map<DataSetId, T *>& hashmap = 620 getGraphicsObjectHashmap<T>(); 621 typename std::tr1::unordered_map<DataSetId, T *>::iterator itr; 622 623 bool doAll = false; 624 625 if (id.compare("all") == 0) { 626 itr = hashmap.begin(); 627 if (itr == hashmap.end()) 628 return; 629 doAll = true; 630 } else { 631 itr = hashmap.find(id); 632 } 633 if (itr == hashmap.end()) { 634 GO_ERROR(T, "not found: %s", id.c_str()); 635 635 return; 636 636 } … … 646 646 * \brief Set specular lighting/shading coefficient and power for the specified DataSet 647 647 */ 648 template<class GraphicsObject>648 template<class T> 649 649 void Renderer::setGraphicsObjectSpecular(const DataSetId& id, double coeff, double power) 650 650 { 651 std::tr1::unordered_map<DataSetId, GraphicsObject*>& hashmap =652 getGraphicsObjectHashmap< GraphicsObject>();653 typename std::tr1::unordered_map<DataSetId, GraphicsObject*>::iterator itr;654 655 bool doAll = false; 656 657 if (id.compare("all") == 0) { 658 itr = hashmap.begin(); 659 if (itr == hashmap.end()) 660 return; 661 doAll = true; 662 } else { 663 itr = hashmap.find(id); 664 } 665 if (itr == hashmap.end()) { 666 GO_ERROR( GraphicsObject, "not found: %s", id.c_str());651 std::tr1::unordered_map<DataSetId, T *>& hashmap = 652 getGraphicsObjectHashmap<T>(); 653 typename std::tr1::unordered_map<DataSetId, T *>::iterator itr; 654 655 bool doAll = false; 656 657 if (id.compare("all") == 0) { 658 itr = hashmap.begin(); 659 if (itr == hashmap.end()) 660 return; 661 doAll = true; 662 } else { 663 itr = hashmap.find(id); 664 } 665 if (itr == hashmap.end()) { 666 GO_ERROR(T, "not found: %s", id.c_str()); 667 667 return; 668 668 } … … 678 678 * \brief Turn actor lighting on/off for the specified DataSet 679 679 */ 680 template<class GraphicsObject>680 template<class T> 681 681 void Renderer::setGraphicsObjectLighting(const DataSetId& id, bool state) 682 682 { 683 std::tr1::unordered_map<DataSetId, GraphicsObject*>& hashmap =684 getGraphicsObjectHashmap< GraphicsObject>();685 typename std::tr1::unordered_map<DataSetId, GraphicsObject*>::iterator itr;686 687 bool doAll = false; 688 689 if (id.compare("all") == 0) { 690 itr = hashmap.begin(); 691 if (itr == hashmap.end()) 692 return; 693 doAll = true; 694 } else { 695 itr = hashmap.find(id); 696 } 697 if (itr == hashmap.end()) { 698 GO_ERROR( GraphicsObject, "not found: %s", id.c_str());683 std::tr1::unordered_map<DataSetId, T *>& hashmap = 684 getGraphicsObjectHashmap<T>(); 685 typename std::tr1::unordered_map<DataSetId, T *>::iterator itr; 686 687 bool doAll = false; 688 689 if (id.compare("all") == 0) { 690 itr = hashmap.begin(); 691 if (itr == hashmap.end()) 692 return; 693 doAll = true; 694 } else { 695 itr = hashmap.find(id); 696 } 697 if (itr == hashmap.end()) { 698 GO_ERROR(T, "not found: %s", id.c_str()); 699 699 return; 700 700 } … … 708 708 709 709 /** 710 * \brief Set opacity of VtkGraphicsObject for the given DataSet711 */ 712 template<class GraphicsObject>710 * \brief Set opacity of GraphicsObject for the given DataSet 711 */ 712 template<class T> 713 713 void Renderer::setGraphicsObjectOpacity(const DataSetId& id, double opacity) 714 714 { 715 std::tr1::unordered_map<DataSetId, GraphicsObject*>& hashmap =716 getGraphicsObjectHashmap< GraphicsObject>();717 typename std::tr1::unordered_map<DataSetId, GraphicsObject*>::iterator itr;718 719 bool doAll = false; 720 721 if (id.compare("all") == 0) { 722 itr = hashmap.begin(); 723 if (itr == hashmap.end()) 724 return; 725 doAll = true; 726 } else { 727 itr = hashmap.find(id); 728 } 729 if (itr == hashmap.end()) { 730 GO_ERROR( GraphicsObject, "not found: %s", id.c_str());715 std::tr1::unordered_map<DataSetId, T *>& hashmap = 716 getGraphicsObjectHashmap<T>(); 717 typename std::tr1::unordered_map<DataSetId, T *>::iterator itr; 718 719 bool doAll = false; 720 721 if (id.compare("all") == 0) { 722 itr = hashmap.begin(); 723 if (itr == hashmap.end()) 724 return; 725 doAll = true; 726 } else { 727 itr = hashmap.find(id); 728 } 729 if (itr == hashmap.end()) { 730 GO_ERROR(T, "not found: %s", id.c_str()); 731 731 return; 732 732 } … … 745 745 * this function may not have an effect. 746 746 */ 747 template<class GraphicsObject>747 template<class T> 748 748 void Renderer::setGraphicsObjectPointSize(const DataSetId& id, float size) 749 749 { 750 std::tr1::unordered_map<DataSetId, GraphicsObject*>& hashmap =751 getGraphicsObjectHashmap< GraphicsObject>();752 typename std::tr1::unordered_map<DataSetId, GraphicsObject*>::iterator itr;753 754 bool doAll = false; 755 756 if (id.compare("all") == 0) { 757 itr = hashmap.begin(); 758 if (itr == hashmap.end()) 759 return; 760 doAll = true; 761 } else { 762 itr = hashmap.find(id); 763 } 764 if (itr == hashmap.end()) { 765 GO_ERROR( GraphicsObject, "not found: %s", id.c_str());750 std::tr1::unordered_map<DataSetId, T *>& hashmap = 751 getGraphicsObjectHashmap<T>(); 752 typename std::tr1::unordered_map<DataSetId, T *>::iterator itr; 753 754 bool doAll = false; 755 756 if (id.compare("all") == 0) { 757 itr = hashmap.begin(); 758 if (itr == hashmap.end()) 759 return; 760 doAll = true; 761 } else { 762 itr = hashmap.find(id); 763 } 764 if (itr == hashmap.end()) { 765 GO_ERROR(T, "not found: %s", id.c_str()); 766 766 return; 767 767 } … … 778 778 * \brief Set wireframe actor rendering for the specified DataSet 779 779 */ 780 template<class GraphicsObject>780 template<class T> 781 781 void Renderer::setGraphicsObjectWireframe(const DataSetId& id, bool state) 782 782 { 783 std::tr1::unordered_map<DataSetId, GraphicsObject*>& hashmap =784 getGraphicsObjectHashmap< GraphicsObject>();785 typename std::tr1::unordered_map<DataSetId, GraphicsObject*>::iterator itr;786 787 bool doAll = false; 788 789 if (id.compare("all") == 0) { 790 itr = hashmap.begin(); 791 if (itr == hashmap.end()) 792 return; 793 doAll = true; 794 } else { 795 itr = hashmap.find(id); 796 } 797 if (itr == hashmap.end()) { 798 GO_ERROR( GraphicsObject, "not found: %s", id.c_str());783 std::tr1::unordered_map<DataSetId, T *>& hashmap = 784 getGraphicsObjectHashmap<T>(); 785 typename std::tr1::unordered_map<DataSetId, T *>::iterator itr; 786 787 bool doAll = false; 788 789 if (id.compare("all") == 0) { 790 itr = hashmap.begin(); 791 if (itr == hashmap.end()) 792 return; 793 doAll = true; 794 } else { 795 itr = hashmap.find(id); 796 } 797 if (itr == hashmap.end()) { 798 GO_ERROR(T, "not found: %s", id.c_str()); 799 799 return; 800 800 } … … 810 810 * \brief Associate an existing named color map with a graphics object for the given DataSet 811 811 */ 812 template<class GraphicsObject>812 template<class T> 813 813 void Renderer::setGraphicsObjectInterpolateBeforeMapping(const DataSetId& id, bool state) 814 814 { 815 std::tr1::unordered_map<DataSetId, GraphicsObject*>& hashmap =816 getGraphicsObjectHashmap< GraphicsObject>();817 typename std::tr1::unordered_map<DataSetId, GraphicsObject*>::iterator itr;818 819 bool doAll = false; 820 821 if (id.compare("all") == 0) { 822 itr = hashmap.begin(); 823 if (itr == hashmap.end()) 824 return; 825 doAll = true; 826 } else { 827 itr = hashmap.find(id); 828 } 829 830 if (itr == hashmap.end()) { 831 GO_ERROR( GraphicsObject, "not found: %s", id.c_str());815 std::tr1::unordered_map<DataSetId, T *>& hashmap = 816 getGraphicsObjectHashmap<T>(); 817 typename std::tr1::unordered_map<DataSetId, T *>::iterator itr; 818 819 bool doAll = false; 820 821 if (id.compare("all") == 0) { 822 itr = hashmap.begin(); 823 if (itr == hashmap.end()) 824 return; 825 doAll = true; 826 } else { 827 itr = hashmap.find(id); 828 } 829 830 if (itr == hashmap.end()) { 831 GO_ERROR(T, "not found: %s", id.c_str()); 832 832 return; 833 833 } … … 843 843 * \brief Associate an existing named color map with a graphics object for the given DataSet 844 844 */ 845 template<class GraphicsObject>845 template<class T> 846 846 void Renderer::setGraphicsObjectColorMap(const DataSetId& id, const ColorMapId& colorMapId) 847 847 { 848 std::tr1::unordered_map<DataSetId, GraphicsObject*>& hashmap =849 getGraphicsObjectHashmap< GraphicsObject>();850 typename std::tr1::unordered_map<DataSetId, GraphicsObject*>::iterator itr;851 852 bool doAll = false; 853 854 if (id.compare("all") == 0) { 855 itr = hashmap.begin(); 856 if (itr == hashmap.end()) 857 return; 858 doAll = true; 859 } else { 860 itr = hashmap.find(id); 861 } 862 863 if (itr == hashmap.end()) { 864 GO_ERROR( GraphicsObject, "not found: %s", id.c_str());848 std::tr1::unordered_map<DataSetId, T *>& hashmap = 849 getGraphicsObjectHashmap<T>(); 850 typename std::tr1::unordered_map<DataSetId, T *>::iterator itr; 851 852 bool doAll = false; 853 854 if (id.compare("all") == 0) { 855 itr = hashmap.begin(); 856 if (itr == hashmap.end()) 857 return; 858 doAll = true; 859 } else { 860 itr = hashmap.find(id); 861 } 862 863 if (itr == hashmap.end()) { 864 GO_ERROR(T, "not found: %s", id.c_str()); 865 865 return; 866 866 } … … 873 873 874 874 do { 875 GO_TRACE( GraphicsObject, "Set color map: %s for dataset %s",875 GO_TRACE(T, "Set color map: %s for dataset %s", 876 876 colorMapId.c_str(), 877 877 itr->second->getDataSet()->getName().c_str()); … … 886 886 * \brief Notify graphics object that color map has changed 887 887 */ 888 template<class GraphicsObject>888 template<class T> 889 889 void Renderer::updateGraphicsObjectColorMap(ColorMap *cmap) 890 890 { 891 std::tr1::unordered_map<DataSetId, GraphicsObject*>& hashmap =892 getGraphicsObjectHashmap< GraphicsObject>();893 typename std::tr1::unordered_map<DataSetId, GraphicsObject*>::iterator itr;891 std::tr1::unordered_map<DataSetId, T *>& hashmap = 892 getGraphicsObjectHashmap<T>(); 893 typename std::tr1::unordered_map<DataSetId, T *>::iterator itr; 894 894 895 895 for (itr = hashmap.begin(); itr != hashmap.end(); ++itr) { … … 904 904 * \brief Check if a color map is in use by a graphics object 905 905 */ 906 template<class GraphicsObject>906 template<class T> 907 907 bool Renderer::graphicsObjectColorMapUsed(ColorMap *cmap) 908 908 { 909 std::tr1::unordered_map<DataSetId, GraphicsObject*>& hashmap =910 getGraphicsObjectHashmap< GraphicsObject>();911 typename std::tr1::unordered_map<DataSetId, GraphicsObject*>::iterator itr;909 std::tr1::unordered_map<DataSetId, T *>& hashmap = 910 getGraphicsObjectHashmap<T>(); 911 typename std::tr1::unordered_map<DataSetId, T *>::iterator itr; 912 912 913 913 for (itr = hashmap.begin(); itr != hashmap.end(); ++itr) { … … 921 921 * \brief Compute union of bounds and GO's bounds 922 922 */ 923 template<class GraphicsObject>923 template<class T> 924 924 void Renderer::mergeGraphicsObjectBounds(double *bounds, bool onlyVisible) 925 925 { 926 std::tr1::unordered_map<DataSetId, GraphicsObject*>& hashmap =927 getGraphicsObjectHashmap< GraphicsObject>();928 typename std::tr1::unordered_map<DataSetId, GraphicsObject*>::iterator itr;926 std::tr1::unordered_map<DataSetId, T *>& hashmap = 927 getGraphicsObjectHashmap<T>(); 928 typename std::tr1::unordered_map<DataSetId, T *>::iterator itr; 929 929 930 930 for (itr = hashmap.begin(); itr != hashmap.end(); ++itr) { … … 935 935 double *bPtr = itr->second->getBounds(); 936 936 assert(bPtr != NULL); 937 GO_TRACE( GraphicsObject,937 GO_TRACE(T, 938 938 "%s bounds: %g %g %g %g %g %g", 939 939 itr->first.c_str(), … … 949 949 * applied 950 950 */ 951 template<class GraphicsObject>951 template<class T> 952 952 void Renderer::mergeGraphicsObjectUnscaledBounds(double *bounds, bool onlyVisible) 953 953 { 954 std::tr1::unordered_map<DataSetId, GraphicsObject*>& hashmap =955 getGraphicsObjectHashmap< GraphicsObject>();956 typename std::tr1::unordered_map<DataSetId, GraphicsObject*>::iterator itr;954 std::tr1::unordered_map<DataSetId, T *>& hashmap = 955 getGraphicsObjectHashmap<T>(); 956 typename std::tr1::unordered_map<DataSetId, T *>::iterator itr; 957 957 958 958 for (itr = hashmap.begin(); itr != hashmap.end(); ++itr) { … … 963 963 double *bPtr = itr->second->getUnscaledBounds(); 964 964 assert(bPtr != NULL); 965 GO_TRACE( GraphicsObject,965 GO_TRACE(T, 966 966 "%s bounds: %g %g %g %g %g %g", 967 967 itr->first.c_str(), … … 974 974 * \brief Notify object that field value ranges have changed 975 975 */ 976 template<class GraphicsObject>976 template<class T> 977 977 void Renderer::updateGraphicsObjectFieldRanges() 978 978 { 979 std::tr1::unordered_map<DataSetId, GraphicsObject*>& hashmap =980 getGraphicsObjectHashmap< GraphicsObject>();981 typename std::tr1::unordered_map<DataSetId, GraphicsObject*>::iterator itr;979 std::tr1::unordered_map<DataSetId, T *>& hashmap = 980 getGraphicsObjectHashmap<T>(); 981 typename std::tr1::unordered_map<DataSetId, T *>::iterator itr; 982 982 983 983 for (itr = hashmap.begin(); itr != hashmap.end(); ++itr) { … … 989 989 * \brief Pass global clip planes to graphics object 990 990 */ 991 template<class GraphicsObject>991 template<class T> 992 992 void Renderer::setGraphicsObjectClippingPlanes(vtkPlaneCollection *planes) 993 993 { 994 std::tr1::unordered_map<DataSetId, GraphicsObject*>& hashmap =995 getGraphicsObjectHashmap< GraphicsObject>();996 typename std::tr1::unordered_map<DataSetId, GraphicsObject*>::iterator itr;994 std::tr1::unordered_map<DataSetId, T *>& hashmap = 995 getGraphicsObjectHashmap<T>(); 996 typename std::tr1::unordered_map<DataSetId, T *>::iterator itr; 997 997 998 998 for (itr = hashmap.begin(); itr != hashmap.end(); ++itr) { … … 1008 1008 * \param aspectRatio The aspect ratio (width/height), zero means native aspect 1009 1009 */ 1010 template<class GraphicsObject>1010 template<class T> 1011 1011 void Renderer::setGraphicsObjectAspect(double aspectRatio) 1012 1012 { 1013 std::tr1::unordered_map<DataSetId, GraphicsObject*>& hashmap =1014 getGraphicsObjectHashmap< GraphicsObject>();1015 typename std::tr1::unordered_map<DataSetId, GraphicsObject*>::iterator itr;1013 std::tr1::unordered_map<DataSetId, T *>& hashmap = 1014 getGraphicsObjectHashmap<T>(); 1015 typename std::tr1::unordered_map<DataSetId, T *>::iterator itr; 1016 1016 1017 1017 for (itr = hashmap.begin(); itr != hashmap.end(); ++itr) { -
trunk/packages/vizservers/vtkvis/Shape.cpp
r3616 r3621 21 21 22 22 Shape::Shape() : 23 VtkGraphicsObject()23 GraphicsObject() 24 24 { 25 25 } -
trunk/packages/vizservers/vtkvis/Shape.h
r3616 r3621 15 15 #include <vtkActor.h> 16 16 17 #include " VtkGraphicsObject.h"18 #include " VtkDataSet.h"17 #include "GraphicsObject.h" 18 #include "DataSet.h" 19 19 20 20 namespace VtkVis { … … 25 25 * This class creates a boundary mesh of a DataSet 26 26 */ 27 class Shape : public VtkGraphicsObject {27 class Shape : public GraphicsObject { 28 28 public: 29 29 Shape(); -
trunk/packages/vizservers/vtkvis/Sphere.h
r3616 r3621 15 15 16 16 #include "Shape.h" 17 #include " VtkDataSet.h"17 #include "DataSet.h" 18 18 19 19 namespace VtkVis { -
trunk/packages/vizservers/vtkvis/Streamlines.cpp
r3616 r3621 31 31 32 32 #include "Streamlines.h" 33 #include " VtkRenderer.h"33 #include "Renderer.h" 34 34 #include "Trace.h" 35 35 … … 37 37 38 38 Streamlines::Streamlines() : 39 VtkGraphicsObject(),39 GraphicsObject(), 40 40 _lineType(LINES), 41 41 _colorMap(NULL), -
trunk/packages/vizservers/vtkvis/Streamlines.h
r3616 r3621 19 19 20 20 #include "ColorMap.h" 21 #include " VtkGraphicsObject.h"22 #include " VtkDataSet.h"21 #include "GraphicsObject.h" 22 #include "DataSet.h" 23 23 24 24 namespace VtkVis { … … 29 29 * The DataSet must contain vectors 30 30 */ 31 class Streamlines : public VtkGraphicsObject {31 class Streamlines : public GraphicsObject { 32 32 public: 33 33 enum LineType { -
trunk/packages/vizservers/vtkvis/Volume.cpp
r3616 r3621 29 29 30 30 Volume::Volume() : 31 VtkGraphicsObject(),31 GraphicsObject(), 32 32 _colorMap(NULL) 33 33 { … … 200 200 void Volume::updateRanges(Renderer *renderer) 201 201 { 202 VtkGraphicsObject::updateRanges(renderer);202 GraphicsObject::updateRanges(renderer); 203 203 204 204 if (getVolume() != NULL) { -
trunk/packages/vizservers/vtkvis/Volume.h
r3616 r3621 15 15 #include <vtkPlaneCollection.h> 16 16 17 #include " VtkGraphicsObject.h"17 #include "GraphicsObject.h" 18 18 #include "ColorMap.h" 19 19 … … 26 26 * or an UnstructuredGrid 27 27 */ 28 class Volume : public VtkGraphicsObject {28 class Volume : public GraphicsObject { 29 29 public: 30 30 enum BlendMode { -
trunk/packages/vizservers/vtkvis/Warp.cpp
r3616 r3621 27 27 28 28 #include "Warp.h" 29 #include " VtkRenderer.h"29 #include "Renderer.h" 30 30 #include "Trace.h" 31 31 … … 35 35 36 36 Warp::Warp() : 37 VtkGraphicsObject(),37 GraphicsObject(), 38 38 _warpScale(1.0), 39 39 _colorMap(NULL), -
trunk/packages/vizservers/vtkvis/Warp.h
r3616 r3621 19 19 20 20 #include "ColorMap.h" 21 #include " VtkGraphicsObject.h"21 #include "GraphicsObject.h" 22 22 23 23 namespace VtkVis { … … 29 29 * to create flow profiles/surfaces 30 30 */ 31 class Warp : public VtkGraphicsObject {31 class Warp : public GraphicsObject { 32 32 public: 33 33 enum ColorMode {
Note: See TracChangeset
for help on using the changeset viewer.