Changeset 3305 for branches/nanovis2/packages/vizservers/vtkvis/RpMolecule.h

Timestamp:

Feb 18, 2013, 2:32:14 PM (11 years ago)

Author:

ldelgass

Message:

sync with trunk

Location:

branches/nanovis2

Files:

• . (modified) (1 prop)
• packages/vizservers/vtkvis/RpMolecule.h (modified) (5 diffs)

branches/nanovis2/packages/vizservers/vtkvis/RpMolecule.h

@@ -1 +1 @@
 /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- * Copyright (C) 2011, Purdue Research Foundation
+ * Copyright (C) 2004-2012  HUBzero Foundation, LLC
  *
  * Author: Leif Delgass <ldelgass@purdue.edu>
@@ -15 +15 @@
 #include <vtkActor2D.h>
 #include <vtkAssembly.h>
-#if ((VTK_MAJOR_VERSION > 5) || (VTK_MAJOR_VERSION == 5 && VTK_MINOR_VERSION >= 8))
-#define MOLECULE_USE_GLYPH3D_MAPPER
 #include <vtkGlyph3DMapper.h>
 #include <vtkTransformPolyDataFilter.h>
 #include <vtkCylinderSource.h>
 #include <vtkLineSource.h>
-#else
-#include <vtkGlyph3D.h>
-#include <vtkTubeFilter.h>
-#endif
 #include <vtkLabelPlacementMapper.h>
 
@@ -138 +132 @@
     virtual void update();
 
-#ifdef MOLECULE_USE_GLYPH3D_MAPPER
     void setupBondPolyData();
-#endif
 
     static void addLabelArray(vtkDataSet *dataSet);
@@ -163 +155 @@
     vtkSmartPointer<vtkActor> _bondProp;
     vtkSmartPointer<vtkActor2D> _labelProp;
-#ifndef MOLECULE_USE_GLYPH3D_MAPPER
-    vtkSmartPointer<vtkGlyph3D> _glypher;
-    vtkSmartPointer<vtkTubeFilter> _tuber;
-    vtkSmartPointer<vtkPolyDataMapper> _atomMapper;
-    vtkSmartPointer<vtkPolyDataMapper> _bondMapper;
-#else
     vtkSmartPointer<vtkPolyData> _bondPD;
     vtkSmartPointer<vtkCylinderSource> _cylinderSource;
@@ -175 +161 @@
     vtkSmartPointer<vtkGlyph3DMapper> _atomMapper;
     vtkSmartPointer<vtkGlyph3DMapper> _bondMapper;
-#endif
     vtkSmartPointer<vtkLabelPlacementMapper> _labelMapper;
 };