Changeset 6425 for vtkvis/branches

Timestamp:

Jul 18, 2016, 12:00:15 PM (8 years ago)

Author:

ldelgass

Message:

Merge from vtkvis trunk, bump version

Location:

vtkvis/branches/1.8

Files:

• . (modified) (1 prop)
• Molecule.cpp (modified) (3 diffs)
• RenderServer.h (modified) (1 diff)

vtkvis/branches/1.8/Molecule.cpp

@@ -105 +105 @@
             setCulling(_atomProp->GetProperty(), true);
         _atomProp->GetProperty()->EdgeVisibilityOff();
+        _atomProp->GetProperty()->SetColor(_color[0], _color[1], _color[2]);
         _atomProp->GetProperty()->SetEdgeColor(_edgeColor[0], _edgeColor[1], _edgeColor[2]);
         _atomProp->GetProperty()->SetLineWidth(_edgeWidth);
@@ -170 +171 @@
             strcmp(ds->GetPointData()->GetScalars()->GetName(), "element") != 0) {
             WARN("No element array in dataset %s", _dataSet->getName().c_str());
+            if (ds->GetPointData()->GetScalars() == NULL) {
+                _colorMode = COLOR_CONSTANT;
+            } else {
+                _colorMode = COLOR_BY_SCALAR;
+            }
+            _atomScaling = NO_ATOM_SCALING;
             setColorMap(ColorMap::getDefault());
-            if (_atomScaling != NO_ATOM_SCALING)
-                _atomScaling = NO_ATOM_SCALING;
         } else {
             TRACE("Using element default colormap");
@@ -463 +468 @@
             }
             _lut->SetRange(r);
+        } else {
+            switch (mode) {
+            case COLOR_CONSTANT:
+            case COLOR_BY_SCALAR:
+                _lut->SetRange(_dataRange);
+                break;
+            case COLOR_BY_VECTOR_MAGNITUDE:
+                _lut->SetRange(_vectorMagnitudeRange);
+                break;
+            case COLOR_BY_VECTOR_X:
+                _lut->SetRange(_vectorComponentRange[0]);
+                break;
+            case COLOR_BY_VECTOR_Y:
+                _lut->SetRange(_vectorComponentRange[1]);
+                break;
+            case COLOR_BY_VECTOR_Z:
+                _lut->SetRange(_vectorComponentRange[2]);
+                break;
+            default:
+                break;
+            }
         }
     }

vtkvis/branches/1.8/RenderServer.h

@@ -16 +16 @@
 class Renderer;
 
-#define VTKVIS_VERSION_STRING "1.8.5"
+#define VTKVIS_VERSION_STRING "1.8.6"
 
 #define MSECS_ELAPSED(t1, t2) \