Changeset 3795 for trunk/packages/vizservers/vtkvis/Molecule.cpp

Timestamp:

Jul 13, 2013 2:28:43 AM (11 years ago)

Author:

ldelgass

Message:

Fix molecule labels when molecule actors have been transformed. Optimize
setting scales by reusing allocated array. Use specular lighting on molecule.

File:

• trunk/packages/vizservers/vtkvis/Molecule.cpp (modified) (9 diffs)

trunk/packages/vizservers/vtkvis/Molecule.cpp

@@ -29 +29 @@
 #include <vtkLabelPlacementMapper.h>
 #include <vtkTextProperty.h>
+#include <vtkTransformPolyDataFilter.h>
 
 #include "Molecule.h"
@@ -108 +109 @@
         _atomProp->GetProperty()->SetOpacity(_opacity);
         _atomProp->GetProperty()->SetAmbient(.2);
+        _atomProp->GetProperty()->SetSpecular(.2);
+        _atomProp->GetProperty()->SetSpecularPower(80.0);
         if (!_lighting)
             _atomProp->GetProperty()->LightingOff();
@@ -121 +124 @@
         _bondProp->GetProperty()->SetOpacity(_opacity);
         _bondProp->GetProperty()->SetAmbient(.2);
+        _bondProp->GetProperty()->SetSpecular(.2);
+        _bondProp->GetProperty()->SetSpecularPower(80.0);
         if (!_lighting)
             _bondProp->GetProperty()->LightingOff();
@@ -231 +236 @@
                 _labelHierarchy = vtkSmartPointer<vtkPointSetToLabelHierarchy>::New();
             }
-#ifdef USE_VTK6
-            _labelHierarchy->SetInputData(pd);
+            if (_labelTransform == NULL) {
+                _labelTransform = vtkSmartPointer<vtkTransform>::New();
+            }
+            vtkSmartPointer<vtkTransformPolyDataFilter> transformFilter = vtkSmartPointer<vtkTransformPolyDataFilter>::New();
+#ifdef USE_VTK6              
+            transformFilter->SetInputData(pd);
 #else
-            _labelHierarchy->SetInput(pd);
+            transformFilter->SetInput(pd);
 #endif
+            transformFilter->SetTransform(_labelTransform);
+            _labelHierarchy->SetInputConnection(transformFilter->GetOutputPort());
             _labelHierarchy->SetLabelArrayName("_atom_labels");
             _labelHierarchy->GetTextProperty()->SetColor(0, 0, 0);
@@ -255 +266 @@
             _atomMapper->SetInputConnection(pd->GetProducerPort());
 #endif
-            if (ds->GetPointData() != NULL &&
-                ds->GetPointData()->GetVectors() != NULL) {
-                _atomMapper->SetScaleArray(vtkDataSetAttributes::VECTORS);
-                _atomMapper->SetScaleModeToScaleByMagnitude();
-                _atomMapper->ScalingOn();
-            } else {
-                _atomMapper->SetScaleModeToNoDataScaling();
-                _atomMapper->ScalingOff();
-            }
+            _atomMapper->SetScaleArray("_radii");
+            _atomMapper->SetScaleModeToScaleByMagnitude();
+            _atomMapper->ScalingOn();
             _atomMapper->OrientOff();
 
@@ -283 +288 @@
     if (pd->GetNumberOfLines() > 0) {
         _bondMapper->Update();
+    }
+}
+
+void Molecule::updateLabelTransform()
+{
+    if (_labelTransform != NULL && getAssembly() != NULL) {
+        _labelTransform->SetMatrix(getAssembly()->GetMatrix());
     }
 }
@@ -797 +809 @@
         if (_atomMapper != NULL) {
              assert(ds->GetPointData() != NULL &&
-                    ds->GetPointData()->GetVectors() != NULL);
+                    ds->GetPointData()->GetArray("_radii") != NULL);
             _atomMapper->SetScaleModeToScaleByMagnitude();
-            _atomMapper->SetScaleArray(vtkDataSetAttributes::VECTORS);
+            _atomMapper->SetScaleArray("_radii");
             _atomMapper->ScalingOn();
         }
@@ -984 +996 @@
         ;
     }
-    vtkSmartPointer<vtkFloatArray> radii = vtkSmartPointer<vtkFloatArray>::New();
-    radii->SetName("_radii");
-    radii->SetNumberOfComponents(3);
     vtkPolyData *pd = vtkPolyData::SafeDownCast(dataSet);
     if (pd == NULL) {
@@ -992 +1001 @@
         return;
     }
+    vtkDataArray *array = dataSet->GetPointData()->GetArray("_radii");
+    vtkSmartPointer<vtkFloatArray> radii;
+    if (array == NULL) {
+        radii = vtkSmartPointer<vtkFloatArray>::New();
+        radii->SetName("_radii");
+        radii->SetNumberOfComponents(1);
+        radii->SetNumberOfValues(pd->GetNumberOfPoints());
+    } else {
+        radii = vtkFloatArray::SafeDownCast(array);
+        assert(radii != NULL);
+    }
     for (int i = 0; i < pd->GetNumberOfPoints(); i++) {
-        float tuple[3];
-        tuple[1] = tuple[2] = 0;
+        float value;
         if (elements != NULL && radiusSource != NULL) {
             int elt = (int)elements->GetComponent(i, 0);
-            tuple[0] = radiusSource[elt] * scaleFactor;
+            value = radiusSource[elt] * scaleFactor;
         } else {
-            tuple[0] = scaleFactor;
-        }
-        radii->InsertNextTupleValue(tuple);
-    }
-    dataSet->GetPointData()->SetVectors(radii);
+            value = scaleFactor;
+        }
+        radii->SetValue(i, value);
+    }
+    radii->Modified();
+    if (array == NULL) {
+        dataSet->GetPointData()->AddArray(radii);
+    }
 }