Changeset 3832 for trunk/packages

Timestamp:

Jul 24, 2013 12:54:31 PM (11 years ago)

Author:

ldelgass

Message:

When creating a polydata graphics object, colormap it if it has a scalar field
and is a PolyData? dataset. If the polydata is a boundary surface of another
mesh type (e.g. in streamlines), default will still be constant color. Also,
remove USE_VTK6 Makefile setting (now always sets the define, in the future,
the define will be removed along with the legacy code).

Location:

trunk/packages/vizservers/vtkvis

Files:

• Makefile.in (modified) (4 diffs)
• PolyData.cpp (modified) (1 diff)

trunk/packages/vizservers/vtkvis/Makefile.in

@@ -6 +6 @@
 USE_OFFSCREEN_RENDERING = #yes
 USE_THREADS             = yes
-USE_VTK6                = yes
 NEW_SCALAR_BAR          = yes
 
@@ -42 +41 @@
 
 VTK_LIB_DIR     = @VTK_LIB_DIR@
-VTK_LIB_SPEC    = -L$(VTK_LIB_DIR) \
-                -lvtkChemistry \
-                -lvtkIO \
-                -lvtkWidgets \
-                -lvtkFiltering \
-                -lvtkVolumeRendering \
-                -lvtkRendering \
-                -lvtkHybrid \
-                -lvtkGraphics \
-                -lvtkImaging \
-                -lvtkCommon
 VTK_INC_SPEC    = @VTK_INC_SPEC@
-VTK6_LIB_SPEC   = \
+VTK_LIB_SPEC    = \
                 -lvtkDomainsChemistry-6.0 \
                 -lvtkIOCore-6.0 \
@@ -87 +75 @@
                 -lvtksys-6.0
 
-ifdef USE_VTK6
-VTK_LIB_SPEC    = $(VTK6_LIB_SPEC)
-endif
-
-ifdef USE_VTK6
 LD_RUN_PATH     = $(libdir)
-else
-LD_RUN_PATH     = $(libdir):$(VTK_LIB_DIR)
-endif
 
 LIBS            = \
@@ -136 +116 @@
 DEFINES         += -DUSE_THREADS
 endif
-ifdef USE_VTK6
 VTK_MOD_DEFS    = -DvtkRenderingCore_AUTOINIT="5(vtkInteractionStyle,vtkRenderingFreeType,vtkRenderingFreeTypeFontConfig,vtkRenderingFreeTypeOpenGL,vtkRenderingOpenGL)" -DvtkRenderingVolume_AUTOINIT="1(vtkRenderingVolumeOpenGL)"
 DEFINES         += -DUSE_VTK6 $(VTK_MOD_DEFS)
-endif
 ifdef NEW_SCALAR_BAR
 DEFINES         += -DNEW_SCALAR_BAR

trunk/packages/vizservers/vtkvis/PolyData.cpp

@@ -260 +260 @@
                                    _dataSet->getActiveScalarsType(),
                                    &numComp);
-            if (numComp > 1) {
+            // If DataSet is a PolyData with a scalar field, or has color scalars
+            if (pd != NULL || numComp > 1) {
                 setColorMode(COLOR_BY_SCALAR);
             } else {