Changeset 2542 for branches/blt4

Timestamp:

Sep 21, 2011, 2:27:44 PM (13 years ago)

Author:

gah

Message:

update from trunk

Location:

branches/blt4/packages/vizservers

Files:

• configure.in (modified) (7 diffs)
• nanoscale/config.h.in (modified) (6 diffs)
• nanoscale/renderservers.tcl.in (modified) (4 diffs)
• nanoscale/server2.c (modified) (5 diffs)
• nanovis/Makefile.in (modified) (15 diffs)
• nanovis/nvconf.h.in (modified) (5 diffs)
• pymolproxy/Makefile.in (modified) (2 diffs)
• pymolproxy/pymolproxy.c (modified) (50 diffs)
• vtkvis/CmdProc.cpp (modified) (6 diffs)
• vtkvis/CmdProc.h (modified) (4 diffs)
• vtkvis/ColorMap.cpp (modified) (5 diffs)
• vtkvis/ColorMap.h (modified) (2 diffs)
• vtkvis/Makefile.in (modified) (4 diffs)
• vtkvis/PPMWriter.cpp (modified) (6 diffs)
• vtkvis/PPMWriter.h (modified) (2 diffs)
• vtkvis/RpContour2D.cpp (modified) (6 diffs)
• vtkvis/RpContour2D.h (modified) (3 diffs)
• vtkvis/RpContour3D.cpp (modified) (6 diffs)
• vtkvis/RpContour3D.h (modified) (4 diffs)
• vtkvis/RpGlyphs.cpp (modified) (13 diffs)
• vtkvis/RpGlyphs.h (modified) (6 diffs)
• vtkvis/RpHeightMap.cpp (modified) (25 diffs)
• vtkvis/RpHeightMap.h (modified) (9 diffs)
• vtkvis/RpLIC.cpp (modified) (14 diffs)
• vtkvis/RpLIC.h (modified) (3 diffs)
• vtkvis/RpMolecule.cpp (modified) (9 diffs)
• vtkvis/RpMolecule.h (modified) (2 diffs)
• vtkvis/RpPolyData.cpp (modified) (6 diffs)
• vtkvis/RpPolyData.h (modified) (1 diff)
• vtkvis/RpPseudoColor.cpp (modified) (9 diffs)
• vtkvis/RpPseudoColor.h (modified) (3 diffs)
• vtkvis/RpStreamlines.cpp (modified) (16 diffs)
• vtkvis/RpStreamlines.h (modified) (4 diffs)
• vtkvis/RpVolume.cpp (modified) (3 diffs)
• vtkvis/RpVolume.h (modified) (1 diff)
• vtkvis/RpVtkDataSet.cpp (modified) (18 diffs)
• vtkvis/RpVtkDataSet.h (modified) (5 diffs)
• vtkvis/RpVtkGraphicsObject.h (modified) (9 diffs)
• vtkvis/RpVtkRenderServer.cpp (modified) (14 diffs)
• vtkvis/RpVtkRenderer.cpp (modified) (134 diffs)
• vtkvis/RpVtkRenderer.h (modified) (26 diffs)
• vtkvis/RpVtkRendererCmd.cpp (modified) (59 diffs)
• vtkvis/RpVtkRendererCmd.h (modified) (1 diff)
• vtkvis/TGAWriter.cpp (modified) (2 diffs)
• vtkvis/TGAWriter.h (modified) (1 diff)
• vtkvis/Trace.cpp (modified) (3 diffs)
• vtkvis/Trace.h (modified) (1 diff)
• vtkvis/protocol.txt (modified) (12 diffs)
• vtkvis/vtkRpCubeAxesActor2D.cpp (modified) (2 diffs)

branches/blt4/packages/vizservers/configure.in

@@ -1 +1 @@
 AC_PREREQ([2.60])
 AC_INIT(vizservers, 0.1, rappture@nanohub.org)
-AC_CONFIG_HEADER(nanovis/nvconf.h nanoscale/config.h)
-
-with_vtk="yes"
-with_vtk_libs=""
-with_vtk_includes=""
-with_rappture=""
-with_tcllib=""
-with_rappture="yes"
+AC_CONFIG_HEADERS([nanovis/nvconf.h nanoscale/config.h])
 
 AC_ARG_WITH(
@@ -29 +22 @@
         [VTK include files are in DIR])],
     [with_vtk_includes=$withval],
-    [with_vtk_includes=/usr/include/vtk-5.6])
+    [with_vtk_includes=""])
 
 AC_ARG_WITH(
@@ -36 +29 @@
         [VTK libraries are in DIR])],
     [with_vtk_libs=$withval],
-    [with_vtk_libs=/usr/lib/vtk-5.6])
+    [with_vtk_libs=""])
 
 AC_ARG_WITH(
@@ -154 +147 @@
   done
 else
-  if test -d "$with_rappture" ; then 
+  if test ! -d "$with_rappture" ; then 
     AC_MSG_ERROR([--with-rappture: no such directory $with_rappture])
   fi
@@ -193 +186 @@
 if test "x$with_vtk_libs" != "x"; then
    VTK_LIB_DIR=$with_vtk_libs
+   VTK_LIB_SPEC="-L$with_vtk_libs"
 fi
 
@@ -290 +284 @@
     AC_CHECK_LIB([avformat], [av_alloc_format_context], [], 
         [AC_MSG_WARN([libavformat not usable])]))
+AC_CHECK_FUNCS([avformat_alloc_context])
 AC_CHECK_LIB([avutil], [av_free])
 AC_CHECK_FUNCS([img_convert])
@@ -311 +306 @@
 CG_LIB_DIR="$dir/lib"
 
-echo CGDIR=$CG_DIR
 save_CPPFLAGS=$CPPFLAGS
 CPPFLAGS="-I${CG_INC_DIR} $CPPFLAGS"

branches/blt4/packages/vizservers/nanoscale/config.h.in

@@ -3 +3 @@
 /* Define if building universal (internal helper macro) */
 #undef AC_APPLE_UNIVERSAL_BUILD
+
+/* Define to 1 if you have the `accept4' function. */
+#undef HAVE_ACCEPT4
 
 /* Define to 1 if you have the <arpa/inet.h> header file. */
@@ -9 +12 @@
 /* Define to 1 if you have the `avformat_alloc_context' function. */
 #undef HAVE_AVFORMAT_ALLOC_CONTEXT
+
+/* Define to 1 if you have the <Cg/cgGL.h> header file. */
+#undef HAVE_CG_CGGL_H
 
 /* Define to 1 if you have the <ffmpeg/avcodec.h> header file. */
@@ -25 +31 @@
 #undef HAVE_INTTYPES_H
 
+/* Define to 1 if you have the `avcodec' library (-lavcodec). */
+#undef HAVE_LIBAVCODEC
+
 /* Define to 1 if you have the <libavcodec/avcodec.h> header file. */
 #undef HAVE_LIBAVCODEC_AVCODEC_H
+
+/* Define to 1 if you have the `avformat' library (-lavformat). */
+#undef HAVE_LIBAVFORMAT
 
 /* Define to 1 if you have the <libavformat/avformat.h> header file. */
 #undef HAVE_LIBAVFORMAT_AVFORMAT_H
 
+/* Define to 1 if you have the `avutil' library (-lavutil). */
+#undef HAVE_LIBAVUTIL
+
 /* Define to 1 if you have the <libavutil/avutil.h> header file. */
 #undef HAVE_LIBAVUTIL_AVUTIL_H
+
+/* Define to 1 if you have the `highgui' library (-lhighgui). */
+#undef HAVE_LIBHIGHGUI
 
 /* Define to 1 if you have the <memory.h> header file. */
@@ -43 +61 @@
 #undef HAVE_NETINET_IN_H
 
-/* Define to 1 if you have the <rappture.h> header file. */
-#undef HAVE_RAPPTURE_H
+/* Define to 1 if you have the <opencv/cv.h> header file. */
+#undef HAVE_OPENCV_CV_H
+
+/* Define to 1 if you have the <opencv/highgui.h> header file. */
+#undef HAVE_OPENCV_HIGHGUI_H
 
 /* Define to 1 if you have the <stdint.h> header file. */
@@ -76 +97 @@
 #undef HAVE_UNISTD_H
 
+/* Define to 1 if you have the <vtkSmartPointer.h> header file. */
+#undef HAVE_VTKSMARTPOINTER_H
+
 /* Define to the address where bug reports for this package should be sent. */
 #undef PACKAGE_BUGREPORT
@@ -91 +115 @@
 #undef PACKAGE_VERSION
 
+/* The size of `float', as computed by sizeof. */
+#undef SIZEOF_FLOAT
+
+/* The size of `int', as computed by sizeof. */
+#undef SIZEOF_INT
+
+/* The size of `long', as computed by sizeof. */
+#undef SIZEOF_LONG
+
+/* The size of `long long', as computed by sizeof. */
+#undef SIZEOF_LONG_LONG
+
+/* The size of `void *', as computed by sizeof. */
+#undef SIZEOF_VOID_P
+
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS

branches/blt4/packages/vizservers/nanoscale/renderservers.tcl.in

@@ -10 +10 @@
     ${bindir}/nanovis -p ${libdir}/shaders:${libdir}/resources
 } {
-  LD_LIBRARY_PATH ${libdir}
+    LD_LIBRARY_PATH ${libdir}
 }
 
@@ -18 +18 @@
     ${bindir}/nanovis -p ${libdir}/shaders:${libdir}/resources
 } {
-  LD_LIBRARY_PATH ${libdir}
+    LD_LIBRARY_PATH ${libdir}
 }
 
@@ -27 +27 @@
     ${bindir}/vtkvis
 } {
-  LD_LIBRARY_PATH ${libdir}:${vtkdir}
+    LD_LIBRARY_PATH ${libdir}:${vtkdir}
 }
 
@@ -36 +36 @@
     ${bindir}/pymolproxy ${bindir}/pymol -p -q -i -x -X 0 -Y 0
 } {
-   PYMOL_PATH ${libdir}/pymol
+    LD_LIBRARY_PATH ${libdir}
+    PYMOL_PATH ${libdir}/pymol
 }

branches/blt4/packages/vizservers/nanoscale/server2.c

@@ +1 @@
+
+#define _GNU_SOURCE
+#include <sys/socket.h>
 
 #include <stdio.h>
@@ -12 +15 @@
 #include <syslog.h>
 #include <unistd.h>
+#include <fcntl.h>
 
 #include <tcl.h>
+
+#include "config.h"
 
 #define TRUE    1
@@ -378 +384 @@
             /* Accept the new connection. */
             length = sizeof(newaddr);
+#ifdef HAVE_ACCEPT4
+            f = accept4(serverPtr->listenerFd, (struct sockaddr *)&newaddr, 
+                        &length, SOCK_CLOEXEC);
+#else
             f = accept(serverPtr->listenerFd, (struct sockaddr *)&newaddr, 
                        &length);
+#endif
             if (f < 0) {
                 ERROR("Can't accept server \"%s\": %s", serverPtr->name, 
@@ -385 +396 @@
                 exit(1);
             }
+#ifndef HAVE_ACCEPT4
+            int flags = fcntl(f, F_GETFD);
+            flags |= FD_CLOEXEC;
+            if (fcntl(f, F_SETFD, flags) < 0) {
+                ERROR("Can't set FD_CLOEXEC on socket \"%s\": %s", serverPtr->name, 
+                      strerror(errno));
+                exit(1);
+            }
+#endif
             INFO("Connecting \"%s\" to %s\n", serverPtr->name, 
                  inet_ntoa(newaddr.sin_addr));
@@ -413 +433 @@
                 /* Dup the descriptors and start the server.  */
 
-                dup2(f, 0);             /* Stdin */
-                dup2(f, 1);             /* Stdout */
+                if (dup2(f, 0) < 0)  {  /* Stdin */
+                    ERROR("%s: can't dup stdin: %s", serverPtr->name, 
+                        strerror(errno));
+                    exit(1);
+                }
+                if (dup2(f, 1) < 0) {   /* Stdout */
+                    ERROR("%s: can't dup stdout: %s", serverPtr->name, 
+                          strerror(errno));
+                    exit(1);
+                }
                 errFd = open("/dev/null", O_WRONLY, 0600);
-                dup2(errFd, 2);         /* Stderr */
+                if (errFd < 0) {
+                    ERROR("%s: can't open /dev/null for read/write: %s", 
+                          serverPtr->name, strerror(errno));
+                    exit(1);
+                }
+                if (dup2(errFd, 2) < 0) { /* Stderr */
+                    ERROR("%s: can't change to root directory for \"%s\": %s", 
+                          serverPtr->name, strerror(errno));
+                    exit(1);
+                }
                 for(i = 3; i <= FD_SETSIZE; i++) {
                     close(i);           /* Close all the other descriptors. */

branches/blt4/packages/vizservers/nanovis/Makefile.in

@@ -1 +1 @@
 
 SHELL = /bin/sh
-
-#.SUFFIX:
-#SUFFIX: .c .o .cpp
-
-.PHONY: all install clean distclean
 
 bindir          = @bindir@
@@ -23 +18 @@
 
 #Why are these files installed owner writable?
-INSTALL_PROGRAM = ${INSTALL} -m 555
-INSTALL_DATA    = ${INSTALL} -m 444
-INSTALL_SCRIPT  = ${INSTALL} -m 444
+INSTALL_PROGRAM = ${INSTALL} -m 0555
+INSTALL_DATA    = ${INSTALL} -m 0444
+INSTALL_SCRIPT  = ${INSTALL} -m 0444
 RM              = rm -f
 
@@ -33 +28 @@
 CG_INC_SPEC     = -I$(CG_DIR)/include
 CG_LIB_SPEC     = -L$(CG_DIR)/lib -lCg -lCgGL
-DX_INC_SPEC      = @DX_INC_SPEC@
-DX_LIB_SPEC      = @DX_LIB_SPEC@ -lDXcallm
+DX_INC_SPEC     = @DX_INC_SPEC@
+DX_LIB_SPEC     = @DX_LIB_SPEC@ -lDXcallm
 FF_LIB_SPEC     = @LIBS@
 FF_INC_SPEC     = @FF_INC_SPEC@
@@ -73 +68 @@
 TCL_INC_SPEC    = @TCL_INC_SPEC@
 
-LD_RUN_PATH     = @LD_RPATH@
+LD_RUN_PATH     = $(libdir):@LD_RPATH@
 
 LIBS            = \
@@ -104 +99 @@
                 $(CG_INC_SPEC) \
                 $(GL_INC_SPEC) \
-                $(RP_INC_SPEC) \
+                $(RP_INC_SPEC)
 
 CC              = @CC@
@@ -111 +106 @@
 EXTRA_CFLAGS    = -Wall
 DEFINES         = 
-CXX_SWITCHES     = $(CFLAGS) $(EXTRA_CFLAGS) $(DEFINES) $(INCLUDES)
+CXX_SWITCHES    = $(CFLAGS) $(EXTRA_CFLAGS) $(DEFINES) $(INCLUDES)
 
 OBJS            = \
@@ -124 +119 @@
                 DataLoader.o \
                 Event.o \
-                Unirect.o \
                 FlowCmd.o \
-                Switch.o \
                 GradientFilter.o \
                 Grid.o \
@@ -137 +130 @@
                 NvDefaultTFData.o \
                 NvEventLog.o \
+                NvFlowVisRenderer.o \
                 NvLIC.o \
                 NvLoadFile.o \
                 NvParticleAdvectionShader.o \
                 NvParticleRenderer.o \
-                NvFlowVisRenderer.o \
-                NvVectorField.o \
                 NvRegularVolumeShader.o \
                 NvShader.o \
                 NvStdVertexShader.o \
+                NvVectorField.o \
                 NvVolumeShader.o \
                 NvZincBlendeReconstructor.o \
                 NvZincBlendeVolumeShader.o \
+                ParticleEmitter.o \
                 ParticleSystem.o \
-                ParticleEmitter.o \
                 ParticleSystemFactory.o \
                 PCASplit.o \
@@ -159 +152 @@
                 PointSetRenderer.o \
                 PointShader.o \
+                Renderable.o \
                 RenderContext.o \
                 RenderVertexArray.o \
-                Renderable.o \
                 RpAVTranslate.o \
                 RpDX.o \
                 ScreenSnapper.o \
                 Sphere.o \
+                Switch.o \
                 Texture1D.o \
                 Texture2D.o \
@@ -171 +165 @@
                 Trace.o \
                 TransferFunction.o \
+                Unirect.o \
                 Util.o \
-                VelocityArrowsSlice.o \
+                VelocityArrowsSlice.o \
                 Volume.o \
                 VolumeInterpolator.o \
@@ -220 +215 @@
                 $(srcdir)/shaders/velocity.cg
 
-.PHONY: newmat11 R2 imgloaders vrmath vrutil vr3d transfer-function 
+.PHONY: all install install-resources install-shaders install-nanovis clean distclean newmat11 R2 imgloaders vrmath vrutil vr3d transfer-function 
 
 all: newmat11 R2 imgloaders vrmath vrutil vr3d transfer-function nanovis 
@@ -258 +253 @@
 
 dxReader2.o: $(srcdir)/dxReader2.cpp
-        $(CXX) -c $(CXX_SWITCHES) $(DX_INC_SPEC) $?
+        $(CXX) -c $(CXX_SWITCHES) $(DX_INC_SPEC) $<
 RpDX.o: $(srcdir)/RpDX.cpp
-        $(CXX) -c $(CXX_SWITCHES) $(DX_INC_SPEC) $?
+        $(CXX) -c $(CXX_SWITCHES) $(DX_INC_SPEC) $<
 RpAVTranslate.o: $(srcdir)/RpAVTranslate.cpp
-        $(CXX) -c $(CXX_SWITCHES) $(FF_INC_SPEC) $?
+        $(CXX) -c $(CXX_SWITCHES) $(FF_INC_SPEC) $<
 
 client: Socket.o ClientSocket.o RenderClient.o Event.o
@@ -278 +273 @@
         @for i in $(resources) ; do \
             echo "installing $$i..." ; \
-            $(INSTALL_DATA) -m 0444 $$i $(libdir)/resources ; \
+            $(INSTALL_DATA) $$i $(libdir)/resources ; \
         done
 
@@ -285 +280 @@
         @for i in $(shaders) ; do \
             echo "installing $$i..." ; \
-            $(INSTALL_DATA) -m 0444 $$i $(libdir)/shaders ; \
+            $(INSTALL_DATA) $$i $(libdir)/shaders ; \
         done
 
 install-nanovis: nanovis
-        $(INSTALL) -m 0555 nanovis $(bindir)
+        $(INSTALL_PROGRAM) nanovis $(bindir)
 
 clean:
@@ -301 +296 @@
 
 distclean: clean
-        $(RM) Makefile *~
-
-NvStdVertexShader.o: NvStdVertexShader.cpp NvStdVertexShader.h
+        $(MAKE) -C $(MAT_DIR) distclean
+        $(MAKE) -C $(VRMATH_DIR) distclean
+        $(MAKE) -C $(VRUTIL_DIR) distclean
+        $(MAKE) -C $(VR3D_DIR) distclean
+        $(MAKE) -C $(R2_DIR)/src distclean
+        $(MAKE) -C $(IMG_DIR) distclean
+        $(RM) Makefile nvconf.h *~
+
+Axis.o: Axis.cpp Axis.h Chain.h
+BucketSort.o: BucketSort.cpp BucketSort.h Vector3.h Vector4.h Mat4x4.h PCASplit.h
+Chain.o: Chain.cpp Chain.h
+CmdProc.o: CmdProc.cpp CmdProc.h
+Color.o: Color.cpp Color.h
+Command.o: Command.cpp Command.h
 ContourLineFilter.o: ContourLineFilter.cpp ContourLineFilter.h
+ConvexPolygon.o: ConvexPolygon.cpp ConvexPolygon.h
 DataLoader.o: DataLoader.cpp 
+Event.o: Event.cpp Event.h
+FlowCmd.o: FlowCmd.cpp FlowCmd.h Switch.h Trace.h TransferFunction.h nanovis.h Command.h CmdProc.h Nv.h NvLIC.h Unirect.h
+GradientFilter.o: GradientFilter.cpp GradientFilter.h
+Grid.o: Grid.cpp Grid.h
 HeightMap.o: HeightMap.cpp HeightMap.h
-Grid.o: Grid.cpp Grid.h
+Mat4x4.o: Mat4x4.cpp Mat4x4.h
+Nv.o: Nv.cpp Nv.h NvShader.h NvParticleRenderer.h NvColorTableRenderer.h NvEventLog.h VolumeRenderer.h PointSetRenderer.h
+NvCamera.o: NvCamera.cpp NvCamera.h
+NvColorTableRenderer.o: NvColorTableRenderer.cpp NvColorTableRenderer.h
+NvColorTableShader.o: NvColorTableShader.cpp NvColorTableShader.h
+NvDefaultTFData.o: NvDefaultTFData.cpp
+NvEventLog.o: NvEventLog.cpp NvEventLog.h
+NvFlowVisRenderer.o: NvFlowVisRenderer.cpp NvFlowVisRenderer.h
+NvLIC.o: NvLIC.cpp NvLIC.h
 NvLoadFile.o: NvLoadFile.cpp NvLoadFile.h
 NvParticleAdvectionShader.o: NvParticleAdvectionShader.cpp NvParticleAdvectionShader.h
-NvFlowVisRenderer.o: NvFlowVisRenderer.cpp NvFlowVisRenderer.h
+NvParticleRenderer.o: NvParticleRenderer.cpp NvParticleRenderer.h
+NvRegularVolumeShader.o: NvRegularVolumeShader.cpp NvRegularVolumeShader.h
+NvShader.o: NvShader.cpp NvShader.h
+NvStdVertexShader.o: NvStdVertexShader.cpp NvStdVertexShader.h
 NvVectorField.o: NvVectorField.cpp NvVectorField.h
-NvParticleRenderer.o: NvParticleRenderer.cpp NvParticleRenderer.h
-NvColorTableShader.o: NvColorTableShader.cpp NvColorTableShader.h
-NvLIC.o: NvLIC.cpp NvLIC.h
-NvColorTableRenderer.o: NvColorTableRenderer.cpp NvColorTableRenderer.h
-NvEventLog.o: NvEventLog.cpp NvEventLog.h
-NvShader.o: NvShader.cpp NvShader.h
 NvVolumeShader.o: NvVolumeShader.cpp NvVolumeShader.h
-NvDefaultTFData.o: NvDefaultTFData.cpp
-NvRegularVolumeShader.o: NvRegularVolumeShader.cpp NvRegularVolumeShader.h
+NvZincBlendeReconstructor.o: NvZincBlendeReconstructor.cpp NvZincBlendeReconstructor.h ZincBlendeVolume.h Volume.h Vector3.h
 NvZincBlendeVolumeShader.o: NvZincBlendeVolumeShader.cpp NvZincBlendeVolumeShader.h
+ParticleEmitter.o: ParticleEmitter.cpp ParticleEmitter.h
 ParticleSystem.o: ParticleSystem.cpp ParticleSystem.h
 ParticleSystemFactory.o: ParticleSystemFactory.cpp ParticleSystemFactory.h
-ParticleEmitter.o: ParticleEmitter.cpp ParticleEmitter.h
+PCASplit.o: PCASplit.cpp PCASplit.h
+PerfQuery.o: PerfQuery.cpp PerfQuery.h
+Plane.o: Plane.cpp Plane.h
+PlaneRenderer.o: PlaneRenderer.cpp PlaneRenderer.h
+PointSet.o: PointSet.cpp PointSet.h
+PointSetRenderer.o: PointSetRenderer.cpp PointSetRenderer.h
+PointShader.o: PointShader.cpp PointShader.h
+Renderable.o: Renderable.cpp Renderable.h
+RenderContext.o: RenderContext.cpp RenderContext.h
 RenderVertexArray.o: RenderVertexArray.cpp RenderVertexArray.h
-Color.o: Color.cpp Color.h
-Event.o: Event.cpp Event.h
+RpAVTranslate.o: RpAVTranslate.cpp RpAVTranslate.h nvconf.h
+RpDX.o: RpDX.cpp RpDX.h Trace.h
+ScreenSnapper.o: ScreenSnapper.cpp ScreenSnapper.h define.h
 Sphere.o: Sphere.cpp Sphere.h
-TransferFunction.o: TransferFunction.cpp
+Switch.o: Switch.cpp Switch.h
 Texture1D.o: Texture1D.cpp Texture1D.h
 Texture2D.o: Texture2D.cpp Texture2D.h $(AUXSRC)
 Texture3D.o: Texture3D.cpp Texture3D.h $(AUXSRC)
-Renderable.o: Renderable.cpp Renderable.h
-NvCamera.o: NvCamera.cpp NvCamera.h
-ScreenSnapper.o: ScreenSnapper.cpp ScreenSnapper.h define.h
+Trace.o: Trace.cpp Trace.h
+TransferFunction.o: TransferFunction.cpp
+Unirect.o: Unirect.cpp Unirect.h Trace.h
+Util.o: Util.cpp Util.h
+VelocityArrowsSlice.o: VelocityArrowsSlice.cpp VelocityArrowsSlice.h
 Volume.o: Volume.cpp Volume.h $(AUXSRC)
+VolumeInterpolator.o: VolumeInterpolator.cpp VolumeInterpolator.h
+VolumeRenderer.o: VolumeRenderer.cpp VolumeRenderer.h
 ZincBlendeVolume.o: ZincBlendeVolume.cpp ZincBlendeVolume.h $(AUXSRC)
-VolumeRenderer.o: VolumeRenderer.cpp VolumeRenderer.h
-PlaneRenderer.o: PlaneRenderer.cpp PlaneRenderer.h
-Mat4x4.o: Mat4x4.cpp Mat4x4.h
-Plane.o: Plane.cpp Plane.h
-ConvexPolygon.o: ConvexPolygon.cpp ConvexPolygon.h
-PerfQuery.o: PerfQuery.cpp PerfQuery.h
-PointShader.o: PointShader.cpp PointShader.h
-PCASplit.o: PCASplit.cpp PCASplit.h
-BucketSort.o: BucketSort.cpp BucketSort.h
-PointSetRenderer.o: PointSetRenderer.cpp PointSetRenderer.h
-PointSet.o: PointSet.cpp PointSet.h
-RenderContext.o: RenderContext.cpp RenderContext.h
-VolumeInterpolator.o: VolumeInterpolator.cpp VolumeInterpolator.h
-GradientFilter.o: GradientFilter.cpp GradientFilter.h
-VelocityArrowsSlice.o: VelocityArrowsSlice.cpp VelocityArrowsSlice.h
-
-Util.o: Util.cpp Util.h
-Command.o: Command.cpp Command.h
-Trace.o: Trace.cpp Trace.h
-
+dxReader.o: dxReader.cpp dxReaderCommon.h Nv.h nanovis.h Unirect.h ZincBlendeVolume.h NvZincBlendeReconstructor.h
+dxReader2.o: dxReader2.cpp dxReaderCommon.h RpDX.h Nv.h nanovis.h
+dxReaderCommon.o: dxReaderCommon.cpp dxReaderCommon.h GradientFilter.h Vector3.h
 nanovis.o: nanovis.cpp nanovis.h $(AUXSRC)

branches/blt4/packages/vizservers/nanovis/nvconf.h.in

@@ -4 +4 @@
 #undef AC_APPLE_UNIVERSAL_BUILD
 
+/* Define to 1 if you have the `accept4' function. */
+#undef HAVE_ACCEPT4
+
 /* Define to 1 if you have the <arpa/inet.h> header file. */
 #undef HAVE_ARPA_INET_H
+
+/* Define to 1 if you have the `avformat_alloc_context' function. */
+#undef HAVE_AVFORMAT_ALLOC_CONTEXT
+
+/* Define to 1 if you have the <Cg/cgGL.h> header file. */
+#undef HAVE_CG_CGGL_H
 
 /* Define to 1 if you have the <ffmpeg/avcodec.h> header file. */
@@ -40 +49 @@
 #undef HAVE_LIBAVUTIL_AVUTIL_H
 
-/* Define to 1 if you have the `cv' library (-lcv). */
-#undef HAVE_LIBCV
+/* Define to 1 if you have the `highgui' library (-lhighgui). */
+#undef HAVE_LIBHIGHGUI
 
 /* Define to 1 if you have the <memory.h> header file. */
@@ -57 +66 @@
 /* Define to 1 if you have the <opencv/highgui.h> header file. */
 #undef HAVE_OPENCV_HIGHGUI_H
-
-/* Define to 1 if you have the <rappture.h> header file. */
-#undef HAVE_RAPPTURE_H
 
 /* Define to 1 if you have the <stdint.h> header file. */
@@ -91 +97 @@
 #undef HAVE_UNISTD_H
 
+/* Define to 1 if you have the <vtkSmartPointer.h> header file. */
+#undef HAVE_VTKSMARTPOINTER_H
+
 /* Define to the address where bug reports for this package should be sent. */
 #undef PACKAGE_BUGREPORT
@@ -102 +111 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
 
 /* Define to the version of this package. */

branches/blt4/packages/vizservers/pymolproxy/Makefile.in

@@ -2 +2 @@
 TARGETS         = pymolproxy
 
+CC              = @CC@
+CC_SWITCHES     = $(CFLAGS) $(EXTRA_CFLAGS) $(DEFINES) $(INCLUDES)
+CFLAGS          = @CFLAGS@ 
+DEFINES         = -DSTANDALONE
+EXTRA_CFLAGS    = -Wall 
+INCLUDES        = $(TCL_INC_SPEC)
 TCL_INC_SPEC    = @TCL_INC_SPEC@
 TCL_LIB_SPEC    = @TCL_LIB_SPEC@
-CC              = @CC@
-INCLUDES        = $(TCL_INC_SPEC)
-CFLAGS          = @CFLAGS@ 
-EXTRA_CFLAGS    = -Wall 
-DEFINES         = -DSTANDALONE
-CC_SWITCHES     = $(CFLAGS) $(EXTRA_CFLAGS) $(DEFINES) $(INCLUDES)
+RP_LIB_DIR      = @RP_LIB_DIR@
 
 bindir          = @bindir@
@@ -29 +30 @@
 
 OBJS            = pymolproxy.o
-LIBS            = $(TCL_LIB_SPEC)
+LIBS            = $(TCL_LIB_SPEC) \
+                  -Wl,-rpath,$(RP_LIB_DIR)
 
 SCRIPTS         = $(srcdir)/scripts/box.py

branches/blt4/packages/vizservers/pymolproxy/pymolproxy.c

@@ -107 +107 @@
 
 typedef struct Image {
-    struct Image *nextPtr;      /* Next image in chain of images. The list is
-                                 * ordered by the most recently received image
-                                 * from the pymol server to the least. */
-    struct Image *prevPtr;      /* Previous image in chain of images. The list
-                                 * is ordered by the most recently received
-                                 * image from the pymol server to the
-                                 * least. */
-    ssize_t nWritten;           /* Number of bytes of image data already
-                                 * delivered.*/
-    size_t bytesLeft;           /* Number of bytes of image data left to
-                                 * delivered to the client. */
-    char data[1];               /* Start of image data. We allocate the size
-                                 * of the Image structure plus the size of the
-                                 * image data. */
+    struct Image *nextPtr;              /* Next image in chain of images. The
+                                         * list is ordered by the most
+                                         * recently received image from the
+                                         * pymol server to the least. */
+    struct Image *prevPtr;              /* Previous image in chain of
+                                         * images. The list is ordered by the
+                                         * most recently received image from
+                                         * the pymol server to the least. */
+    ssize_t nWritten;                   /* Number of bytes of image data
+                                         * already delivered.*/
+    size_t bytesLeft;                   /* Number of bytes of image data left
+                                         * to delivered to the client. */
+    char data[1];                       /* Start of image data. We allocate
+                                         * the size of the Image structure
+                                         * plus the size of the image data. */
 } Image;
 
@@ -126 +127 @@
 
 typedef struct {
+    const char *ident;
     char bytes[BUFFER_SIZE];
     int fill;
@@ -135 +137 @@
 #define BUFFER_ERROR            -1
 #define BUFFER_CONTINUE         -2
-#define BUFFER_SHORT_READ       -3
 
 #define FORCE_UPDATE            (1<<0)
@@ -155 +156 @@
                                          * are in the front of the list. */
 
-    int sin, sout, serr;                /* Server file descriptors. */
+    int sin, sout;                      /* Server file descriptors. */
     int cin, cout;                      /* Client file descriptors. */
     ReadBuffer client;                  /* Read buffer for client input. */
@@ -247 +248 @@
 
 static void
-InitBuffer(ReadBuffer *readPtr, int f)
-{
+InitBuffer(ReadBuffer *readPtr, const char *ident, int f)
+{
+    readPtr->ident = ident;
     readPtr->fd = f;
     readPtr->fill = 0;
@@ -261 +263 @@
 }
 
+/*  
+ * FillBuffer --
+ *
+ *      Fills the buffer with available data.  Any existing data
+ *      in the buffer is slide to the front of the buffer, then
+ *      the channel is read to fill the rest of the buffer.
+ *
+ *      If EOF or an error occur when reading the channel, then 
+ *      BUFFER_ERROR is returned. If the buffer can't be filled, 
+ *      then BUFFER_CONTINUE is returned.  
+ *
+ */
 static int
 FillBuffer(ReadBuffer *readPtr)
@@ -272 +286 @@
 #endif
     if (readPtr->mark >= readPtr->fill) {
+        INFO("tossing full buffer mark=%d, fill=%d", readPtr->mark, 
+             readPtr->fill);
         readPtr->mark = readPtr->fill = 0;
     }
@@ -277 +293 @@
         size_t i, j;
 
+        /* Some data has been consumed. Move the unconsumed data to the front
+         * of the buffer. */
         for (i = 0, j = readPtr->mark; j < readPtr->fill; i++, j++) {
             readPtr->bytes[i] = readPtr->bytes[j];
@@ -286 +304 @@
     nRead = read(readPtr->fd, readPtr->bytes + readPtr->fill, bytesLeft);
     if (nRead == 0) {
-        return BUFFER_ERROR;
-    }
-    if (nRead <= 0) {
+        INFO("EOF found reading \"%s\" buffer", readPtr->ident);
+        return BUFFER_ERROR;            /* EOF, treat as an error. */
+    }
+    if (nRead < 0) {
         if (errno != EAGAIN) {
 #if READTRACE
@@ -295 +314 @@
                   nRead, readPtr->mark, readPtr->fill);
 #endif
+            ERROR("error reading \"%s\" buffer: %s", readPtr->ident, 
+                  strerror(errno));
             return BUFFER_ERROR;
         }
-        return BUFFER_SHORT_READ;
+        INFO("Short read for \"%s\" buffer", readPtr->ident);
+        return BUFFER_CONTINUE;
     }
     readPtr->fill += nRead;
@@ -304 +326 @@
           nRead, readPtr->mark, readPtr->fill);
 #endif
-    return (nRead == bytesLeft) ? BUFFER_OK : BUFFER_SHORT_READ;
-}
-
+    return (nRead == bytesLeft) ? BUFFER_OK : BUFFER_CONTINUE;
+}
+
+/* 
+ * NextLine --
+ *
+ *      Returns the next available line (terminated by a newline).
+ *      If insufficient data is in the buffer, then the channel is
+ *      read for more data.  If reading the channel results in a
+ *      short read, NULL is returned and *nBytesPtr is set to
+ *      BUFFER_CONTINUE.
+ */
 static char *
-GetLine(ReadBuffer *readPtr, int *nBytesPtr)
+NextLine(ReadBuffer *readPtr, int *nBytesPtr)
 {
     int i;
@@ -314 +345 @@
 
 #if READTRACE
-    Debug("Entering GetLine (mark=%d, fill=%d)\n",readPtr->mark, readPtr->fill);
+    Debug("Entering NextLine (mark=%d, fill=%d)\n",readPtr->mark, readPtr->fill);
 #endif
     status = BUFFER_OK;
     for (;;) {
-        /* Look for the next newline (the next full line). */
 #if READTRACE
-        Debug("in GetLine: mark=%d fill=%d\n", readPtr->mark, readPtr->fill);
+        Debug("in NextLine: mark=%d fill=%d\n", readPtr->mark, readPtr->fill);
 #endif
+        /* Check for a newline in the current buffer (it's the next 
+         * full line). */
         for (i = readPtr->mark; i < readPtr->fill; i++) {
             if (readPtr->bytes[i] == '\n') {
@@ -328 +360 @@
                 /* Save the start of the line. */
                 p = readPtr->bytes + readPtr->mark;
-                i++;
+                i++;                    /* Include the newline. */
                 *nBytesPtr = i - readPtr->mark;
                 readPtr->mark = i;
 #if READTRACE
-                Debug("Leaving GetLine(%.*s)\n", *nBytesPtr, p);
+                Debug("Leaving NextLine(%.*s)\n", *nBytesPtr, p);
 #endif
                 return p;
@@ -339 +371 @@
         /* Couldn't find a newline, so it may be that we need to read some
          * more. Check first that last read wasn't a short read. */
-        if (status == BUFFER_SHORT_READ) {
-            break;
-        }
+        if (status == BUFFER_CONTINUE) {
+            *nBytesPtr = BUFFER_CONTINUE;  /* No complete line just yet. */
+            return NULL;
+        }
+        /* Try to add more data to the buffer. */
         status = FillBuffer(readPtr);
         if (status == BUFFER_ERROR) {
@@ -347 +381 @@
             return NULL;        /* EOF or error on read. */
         }
+        /* BUFFER_OK or BUFFER_CONTINUE */
     }
 #if READTRACE
-    Debug("Leaving GetLine failed to read line\n");
+    Debug("Leaving NextLine failed to read line\n");
 #endif
     *nBytesPtr = BUFFER_CONTINUE;
@@ -355 +390 @@
 }
 
+/* 
+ * ReadFollowingData --
+ *
+ *      Read the requested number of bytes from the buffer.  Fails if
+ *      the requested number of bytes are not immediately available.
+ *      Never should be short. 
+ */
 static int 
-GetBytes(ReadBuffer *readPtr, char *out, int nBytes)
+ReadFollowingData(ReadBuffer *readPtr, char *out, int nBytes)
 {
 #if READTRACE
-    Debug("Entering GetBytes(%d)\n", nBytes);
+    Debug("Entering ReadFollowingData(%d)\n", nBytes);
 #endif
     while (nBytes > 0) {
@@ -369 +411 @@
             int size;
 
+            /* Pull bytes out of the buffer, updating the mark. */
             size = (bytesLeft >  nBytes) ? nBytes : bytesLeft;
             memcpy(out, readPtr->bytes + readPtr->mark, size);
@@ -378 +421 @@
             /* Received requested # bytes. */
 #if READTRACE
-            Debug("Leaving GetBytes(%d)\n", nBytes);
+            Debug("Leaving ReadFollowingData(%d)\n", nBytes);
 #endif
             return BUFFER_OK;
@@ -388 +431 @@
         }
 #if READTRACE
-        Debug("in GetBytes: mark=%d fill=%d\n", readPtr->mark, readPtr->fill);
+        Debug("in ReadFollowingData: after fill: mark=%d fill=%d status=%d\n", 
+              readPtr->mark, readPtr->fill, status);
 #endif
     }
 #if READTRACE
-    Debug("Leaving GetBytes(%d)\n", nBytes);
+    Debug("Leaving ReadFollowingData(%d)\n", nBytes);
 #endif
     return BUFFER_OK;
@@ -435 +479 @@
 
     if (proxyPtr->status != TCL_OK) {
-        return proxyPtr->status;
+        return TCL_ERROR;
     }
 #if EXPECTTRACE
@@ -446 +490 @@
         char *line;
 
-        line = GetLine(&proxyPtr->server, &nBytes);
+        line = NextLine(&proxyPtr->server, &nBytes);
         if (line != NULL) {
 #if EXPECTTRACE
@@ -460 +504 @@
                 Debug("Leaving Expect: got (%.*s)\n", nBytes, out);
 #endif
-                return BUFFER_OK;
+                return TCL_OK;
             }
             continue;
         }
-        if (nBytes != BUFFER_CONTINUE) {
-            return BUFFER_ERROR;
-        }
-    }
-    ERROR("Leaving Expect: failed to find (%s)\n", match);
+        if (nBytes == BUFFER_ERROR) {
+            Tcl_AppendResult(proxyPtr->interp, 
+                "error reading server to find match for \"", match, "\": ", 
+                Tcl_PosixError(proxyPtr->interp), (char *)NULL);
+            return TCL_ERROR;
+        }
+    }
+    Tcl_AppendResult(proxyPtr->interp, "failed to find match for \"", match, 
+        "\"", (char *)NULL);
     proxyPtr->error = 2;
     proxyPtr->status = TCL_ERROR;
-    return BUFFER_ERROR;
+    return TCL_ERROR;
 }
 
@@ -674 +722 @@
 #endif
             if (nWritten < 0) {
-                ERROR("Error writing fd(%d), %d/%s.", fd, errno, 
-                      strerror(errno));
+                ERROR("Error writing fd=%d, %s", fd, strerror(errno));
                 return;
             }
@@ -724 +771 @@
     nWritten = write(proxyPtr->sin, buffer, length);
     if (nWritten != length) {
-        ERROR("short write to pymol (wrote=%d, should have been %d)",
-              nWritten, length);
+        ERROR("short write to pymol (wrote=%d, should have been %d): %s",
+              nWritten, length, strerror(errno));
     }
     for (p = buffer; *p != '\0'; p++) {
@@ -735 +782 @@
     sprintf(expect, "PyMOL>%s", buffer);
     /* Now wait for the "PyMOL>" prompt. */
-    result = Expect(proxyPtr, expect, buffer, BUFSIZ);
-    if (result == BUFFER_ERROR) {
-        ERROR("timeout reading data (buffer=%s)", buffer);
+    if (Expect(proxyPtr, expect, buffer, BUFSIZ) != TCL_OK) {
         proxyPtr->error = 1;
         proxyPtr->status = TCL_ERROR;
-        return proxyPtr->status;
+        return TCL_ERROR;
     }
     return  proxyPtr->status;
@@ -848 +893 @@
     Pymol(proxyPtr, "refresh\n");
     Pymol(proxyPtr, "bmp -\n");
-    if (Expect(proxyPtr, "bmp image follows: ", buffer, BUFSIZ) != BUFFER_OK) {
-        ERROR("can't find image follows line (%s)", buffer);
+    if (Expect(proxyPtr, "bmp image follows: ", buffer, BUFSIZ) != TCL_OK) {
+        return TCL_ERROR;
     }
     if (sscanf(buffer, "bmp image follows: %d\n", &nBytes) != 1) {
@@ -862 +907 @@
     imgPtr = NewImage(proxyPtr, nBytes + length);
     strcpy(imgPtr->data, buffer);
-    if (GetBytes(&proxyPtr->server, imgPtr->data + length, nBytes)!=BUFFER_OK){
-        ERROR("can't read %d bytes for \"image follows\" buffer", nBytes);
+    if (ReadFollowingData(&proxyPtr->server, imgPtr->data + length, nBytes)
+        != BUFFER_OK) {
+        ERROR("can't read %d bytes for \"image follows\" buffer: %s", nBytes, 
+              strerror(errno));
         return  TCL_ERROR;
     }
@@ -1186 +1233 @@
             return TCL_ERROR;
         }
-        if (GetBytes(&proxyPtr->client, allocated, nBytes) != BUFFER_OK) {
+        if (ReadFollowingData(&proxyPtr->client, allocated, nBytes) 
+            != BUFFER_OK) {
             Tcl_AppendResult(interp, "can't read pdbdata from client.",
                              (char *)NULL);
@@ -1318 +1366 @@
 PngCmd(ClientData clientData, Tcl_Interp *interp, int argc, const char *argv[])
 {
-    char buffer[800];
+    char buffer[BUFSIZ];
     int nBytes=0;
     PymolProxy *proxyPtr = clientData;
@@ -1330 +1378 @@
     Pymol(proxyPtr, "png -\n");
 
-    Expect(proxyPtr, "png image follows: ", buffer, 800);
-
+    if (Expect(proxyPtr, "png image follows: ", buffer, BUFSIZ-1) != TCL_OK) {
+        return TCL_ERROR;
+    }
     if (sscanf(buffer, "png image follows: %d\n", &nBytes) != 1) {
         Tcl_AppendResult(interp, "can't get # bytes from \"", buffer, "\"",
@@ -1342 +1391 @@
     imgPtr = NewImage(proxyPtr, nBytes + length);
     strcpy(imgPtr->data, buffer);
-    if (GetBytes(&proxyPtr->server, imgPtr->data + length, nBytes)!=BUFFER_OK){
-        ERROR("can't read %d bytes for \"image follows\" buffer", nBytes);
+    if (ReadFollowingData(&proxyPtr->server, imgPtr->data + length, nBytes)
+        != BUFFER_OK) {
+        ERROR("can't read %d bytes for \"image follows\" buffer: %s", nBytes, 
+              strerror(errno));
         return  TCL_ERROR;
     }
-    Expect(proxyPtr, " ScenePNG", buffer, 800);
-
+    if (Expect(proxyPtr, " ScenePNG", buffer, BUFSIZ-1) != TCL_OK) {
+        return TCL_ERROR;
+    }
     stats.nFrames++;
     stats.nBytes += nBytes;
@@ -1390 +1442 @@
     }
     Pymol(proxyPtr, "ray %d,%d\n", width, height);
-    Expect(proxyPtr, " Ray:", buffer, 800);
+    if (Expect(proxyPtr, " Ray:", buffer, BUFSIZ-1) != TCL_OK) {
+        return TCL_ERROR;
+    }
 
     Pymol(proxyPtr, "png -,dpi=300\nbg_color black\n");
-    Expect(proxyPtr, "png image follows: ", buffer, 800);
+    if (Expect(proxyPtr, "png image follows: ", buffer, BUFSIZ-1) != TCL_OK) {
+        return TCL_ERROR;
+    }
 
     if (sscanf(buffer, "png image follows: %d\n", &nBytes) != 1) {
@@ -1406 +1462 @@
     imgPtr = NewImage(proxyPtr, nBytes + length);
     strcpy(imgPtr->data, buffer);
-    if (GetBytes(&proxyPtr->server, imgPtr->data + length, nBytes)!=BUFFER_OK){
-        ERROR("can't read %d bytes for \"image follows\" buffer", nBytes);
+    if (ReadFollowingData(&proxyPtr->server, imgPtr->data + length, nBytes)
+        != BUFFER_OK) {
+        ERROR("can't read %d bytes for \"image follows\" buffer: %s", nBytes,
+              strerror(errno));
         return  TCL_ERROR;
     }
-    Expect(proxyPtr, " ScenePNG", buffer, 800);
+    if (Expect(proxyPtr, " ScenePNG", buffer, BUFSIZ-1) != TCL_OK) {
+        return TCL_ERROR;
+    }
 
     stats.nFrames++;
@@ -1936 +1996 @@
 
         
+static void
+ChildHandler(int sigNum) 
+{
+    ERROR("pymol (%d) died unexpectedly", stats.child);
+    exit(1);
+}
+
 static int 
 ProxyInit(int cin, int cout, char *const *argv)
@@ -1942 +2009 @@
     int sin[2];
     int sout[2];
-    int serr[2];
     Tcl_Interp *interp;
-    int child;
+    pid_t child, parent;
     PymolProxy proxy;
     struct timeval end;
@@ -1960 +2026 @@
     }
 
-    if (pipe(serr) == -1) {
-        close(sin[0]);
-        close(sin[1]);
-        close(sout[0]);
-        close(sout[1]);
-        return -1;
-    }
-
-    /* Fork the new process.  Connect i/o to the new socket.  */
+    parent = getpid();
+
+    /* Fork the new process.  Connect I/O to the new socket.  */
 
     child = fork();
@@ -1975 +2035 @@
         return -3;
     }
+
+    interp = Tcl_CreateInterp();
+    if (CreateTmpDir(interp) != TCL_OK) {
+        ERROR(Tcl_GetStringResult(interp));
+    }
+    Tcl_MakeSafe(interp);
+
     if (child == 0) {
         int f;
+        char path[200];
 
         /* Child process */
@@ -1989 +2057 @@
         /* Redirect stdin, stdout, and stderr to pipes before execing */ 
 
-        dup2(sin[0], 0);  // stdin
-        dup2(sout[1],1);  // stdout
-        dup2(serr[1],2);  // stderr
+        dup2(sin[0],  0);               // stdin
+        dup2(sout[1], 1);               // stdout
+        sprintf(path, "/tmp/pymol%d/stderr", parent);
+        f = open(path, O_WRONLY | O_CREAT | O_TRUNC, 0600);
+        if (f < 0) {
+            ERROR("can't open server error file `%s': %s", path, 
+                  strerror(errno));
+            exit(1);
+        }
+        dup2(f, 2);                     /* Redirect stderr to a file */
         
         /* Close all other descriptors  */        
@@ -1997 +2072 @@
             close(f);
         }
+        INFO("attempting to start \"%s\"", argv[0]);
         
         execvp(argv[0], argv);
-        ERROR("Failed to start pymol `%s'", argv[0]);
+        ERROR("can't exec `%s': %s", argv[0], strerror(errno));
         exit(-1);
+    } else {
+        signal(SIGCHLD, ChildHandler);
     }
     stats.child = child;
@@ -2009 +2087 @@
     close(sin[0]);
     close(sout[1]);
-    close(serr[1]);
-
-#ifdef notdef
-    signal(SIGPIPE, SIG_IGN); /* ignore SIGPIPE (e.g. nanoscale terminates)*/
-#endif
 
     memset(&proxy, 0, sizeof(PymolProxy));
     proxy.sin  = sin[1];
     proxy.sout = sout[0];
-    proxy.serr = serr[0];
     proxy.cin  = cin;
     proxy.cout = cout;
     proxy.flags = CAN_UPDATE;
     proxy.frame = 1;
-    interp = Tcl_CreateInterp();
-    if (CreateTmpDir(interp) != TCL_OK) {
-        ERROR(Tcl_GetStringResult(interp));
-    }
-    Tcl_MakeSafe(interp);
     proxy.interp = interp;
 
@@ -2059 +2126 @@
     stats.start = end;
 
-    if (write(cout, "PyMol 1.0\n", 10) != 10) {
-        ERROR("short write of signature");
-    }
-    
     // Main Proxy Loop
     //  accept tcl commands from socket
     //  translate them into pyMol commands, and issue them to child proccess
     //  send images back
+
     PollForEvents(&proxy);
 
     close(proxy.cout);
     close(proxy.sout);
-    close(proxy.serr);
     close(proxy.cin);
     close(proxy.sin);
 
-    status = waitpid(child, &result, WNOHANG);
-    if (status == -1) {
+    if (waitpid(child, &result, 0) < 0) {
         ERROR("error waiting on pymol server to exit: %s", strerror(errno));
-    } else if (status == 0) {
-        ERROR("attempting to signal (SIGTERM) pymol server.");
-        kill(-child, SIGTERM);          // Kill process group
-        alarm(5);
-        status = waitpid(child, &result, 0);
-        alarm(0);
-        
-        while ((status == -1) && (errno == EINTR)) {
-            ERROR("Attempting to signal (SIGKILL) pymol server.");
-            kill(-child, SIGKILL);      // Kill process group
-            alarm(10);
-            status = waitpid(child, &result, 0);
-            alarm(0); 
-        }
-    }
+    }
+    INFO("attempting to signal (SIGTERM) pymol server.");
+    kill(-child, SIGTERM);              // Kill process group
+    alarm(5);
     
-    ERROR("pymol server process ended (result=%d)", result);
+    if (waitpid(child, &result, 0) < 0) {
+        ERROR("error waiting on pymol server to exit after SIGTERM: %s", 
+              strerror(errno));
+    }
+    status = -1;
+    while ((status == -1) && (errno == EINTR)) {
+        ERROR("Attempting to signal (SIGKILL) pymol server.");
+        kill(-child, SIGKILL);  // Kill process group
+        alarm(10);
+        status = waitpid(child, &result, 0);
+        alarm(0); 
+    }
+    INFO("pymol server process ended (result=%d)", result);
+
     DestroyTmpDir();
-
     Tcl_DeleteInterp(interp);
     
@@ -2111 +2174 @@
 {
     Tcl_DString clientCmds;
-    struct pollfd pollResults[4];
+    struct pollfd pollFd[3];
     int flags;
+
+    if (write(proxyPtr->cout, "PyMol 1.0\n", 10) != 10) {
+        ERROR("short write of signature");
+    }
 
     flags = fcntl(proxyPtr->cin, F_GETFL);
     fcntl(proxyPtr->cin, F_SETFL, flags|O_NONBLOCK);
 
-    pollResults[0].fd = proxyPtr->cout;
-    pollResults[1].fd = proxyPtr->sout;
-    pollResults[2].fd = proxyPtr->serr;
-    pollResults[0].events = pollResults[1].events = 
-        pollResults[2].events = POLLIN;
-
-    pollResults[3].fd = proxyPtr->cin;
-    pollResults[3].events = POLLOUT;
-
-    InitBuffer(&proxyPtr->client, proxyPtr->cout);
-    InitBuffer(&proxyPtr->server, proxyPtr->sout);
+#ifdef notdef
+    flags = fcntl(proxyPtr->sout, F_GETFL);
+    fcntl(proxyPtr->sout, F_SETFL, flags|O_NONBLOCK);
+
+    flags = fcntl(proxyPtr->cout, F_GETFL);
+    fcntl(proxyPtr->cout, F_SETFL, flags|O_NONBLOCK);
+#endif
+
+    /* Read file descriptors. */
+    pollFd[0].fd = proxyPtr->cout;      /* Client standard output  */
+    pollFd[1].fd = proxyPtr->sout;      /* Server standard error.  */
+    pollFd[0].events = pollFd[1].events = POLLIN;
+
+    /* Write file descriptors. */
+    pollFd[2].fd = proxyPtr->cin;       /* Client standard input. */
+    pollFd[2].events = POLLOUT;
+
+    InitBuffer(&proxyPtr->client, "client", proxyPtr->cout);
+    InitBuffer(&proxyPtr->server, "server", proxyPtr->sout);
 
     Tcl_DStringInit(&clientCmds);
@@ -2133 +2208 @@
         int timeout, nChannels;
 
-        nChannels =  (proxyPtr->headPtr != NULL) ? 4 : 3;
-
+        nChannels =  (proxyPtr->headPtr != NULL) ? 3 : 2;
 #define PENDING_TIMEOUT         10  /* milliseconds. */
         timeout = (proxyPtr->flags & UPDATE_PENDING) ? PENDING_TIMEOUT : -1;
-        nChannels = poll(pollResults, nChannels, timeout);
+        nChannels = poll(pollFd, nChannels, timeout);
         if (nChannels < 0) {
             ERROR("POLL ERROR: %s", strerror(errno));
@@ -2148 +2222 @@
          * the pymol server to block writing to stderr or stdout.
          */
-        if (pollResults[1].revents & POLLIN) { 
+        if (pollFd[1].revents & POLLIN) { /* Server stdout */
             int nBytes;
             char *line;
@@ -2155 +2229 @@
             /* Don't care what's in the server output buffer. */
             FlushBuffer(&proxyPtr->server);
-            line = GetLine(&proxyPtr->server, &nBytes);
+            line = NextLine(&proxyPtr->server, &nBytes);
             if (line != NULL) {
                 Debug("STDOUT>%.*s", nBytes, line);
@@ -2161 +2235 @@
             } else if (nBytes == BUFFER_CONTINUE) {
                 Debug("Done with pymol stdout\n");
+                goto error;             /* Pymol server died unexpectedly. */
             } else {
-                ERROR("Failed reading pymol stdout (nBytes=%d)\n", nBytes);
-                goto error;     /* Get out on EOF or error. */
+                ERROR("can't read pymol stdout (nBytes=%d): %s\n", nBytes,
+                      strerror(errno));
+                goto error;             /* Get out on EOF or error. */
             }
         }
 
-        if (pollResults[2].revents & POLLIN) { 
-            ssize_t nRead;
-            char buf[BUFSIZ];
-            
-            Debug("Reading pymol stderr\n");
-            /* pyMol Stderr Connection: pymol standard error output */
-            
-            nRead = read(pollResults[2].fd, buf, BUFSIZ-1);
-            if (nRead <= 0) {
-                ERROR("unexpected read error from server (stderr): %s",
-                      strerror(errno));
-                if (errno != EINTR) { 
-                    ERROR("lost connection (stderr) to pymol server.");
-                    return;
-                }
-            }
-            buf[nRead] = '\0';
-            Debug("stderr>%s", buf);
-            Debug("Done reading pymol stderr\n");
-        }
-
         /* We have some descriptors ready. */
-        if (pollResults[0].revents & POLLIN) { 
+        if (pollFd[0].revents & POLLIN) { /* Client stdout */
             Debug("Reading client stdout\n");
             for (;;) {
@@ -2195 +2250 @@
                 char *line;
                 
-                line = GetLine(&proxyPtr->client, &nBytes);
+                line = NextLine(&proxyPtr->client, &nBytes);
                 if (line != NULL) {
                     const char *cmd;
@@ -2202 +2257 @@
                     cmd = Tcl_DStringValue(&clientCmds);
                     if (Tcl_CommandComplete(cmd)) {
+                        int result;
+
                         /* May execute more than one command. */
-                        ExecuteCommand(proxyPtr->interp, cmd);
+                        result = ExecuteCommand(proxyPtr->interp, cmd);
+                        if (result != TCL_OK) {
+                            Tcl_Obj *objPtr;
+
+                            objPtr = Tcl_GetObjResult(proxyPtr->interp);
+                            ERROR(Tcl_GetString(objPtr));
+                            goto error;
+                        }
                         Tcl_DStringSetLength(&clientCmds, 0);
                     }
@@ -2211 +2275 @@
                     break;
                 }
-                ERROR("Failed reading client stdout (nBytes=%d)\n", nBytes);
+                ERROR("can't read client stdout (nBytes=%d): %s\n", nBytes,
+                      strerror(errno));
                 goto error;             /* Get out on EOF or error. */
             }
@@ -2243 +2308 @@
             }
         }
-        if ((proxyPtr->headPtr != NULL) && 
-            (pollResults[3].revents & POLLOUT)) { 
-            WriteImage(proxyPtr, pollResults[3].fd);
+        if ((proxyPtr->headPtr != NULL) && (pollFd[2].revents & POLLOUT)) { 
+            WriteImage(proxyPtr, pollFd[2].fd);
         }
     }

branches/blt4/packages/vizservers/vtkvis/CmdProc.cpp

@@ -3 +3 @@
  * Copyright (C) 2011, Purdue Research Foundation
  *
- * Author: ?
+ * Author: George A. Howlett <gah@purdue.edu>
  */
 
@@ -10 +10 @@
 
 #include "CmdProc.h"
+
+using namespace Rappture;
 
 /**
@@ -22 +24 @@
  */
 static int
-BinaryOpSearch(Rappture::CmdSpec *specs, 
+BinaryOpSearch(CmdSpec *specs, 
                int nSpecs, 
                char *string)       /* Name of minor operation to search for */
@@ -35 +37 @@
     length = strlen(string);
     while (low <= high) {
-        Rappture::CmdSpec *specPtr;
+        CmdSpec *specPtr;
         int compare;
         int median;
@@ -76 +78 @@
  */
 static int
-LinearOpSearch(Rappture::CmdSpec *specs,
+LinearOpSearch(CmdSpec *specs,
                int nSpecs,
                char *string)       /* Name of minor operation to search for */
 {
-    Rappture::CmdSpec *specPtr;
+    CmdSpec *specPtr;
     char c;
     size_t length;
@@ -120 +122 @@
  */
 Tcl_ObjCmdProc *
-Rappture::GetOpFromObj(Tcl_Interp *interp,              /* Interpreter to report errors to */
-                       int nSpecs,                      /* Number of specifications in array */
-                       Rappture::CmdSpec *specs,        /* Op specification array */
-                       int operPos,                     /* Position of operation in argument
-                                                         * list. */
-                       int objc,                        /* Number of arguments in the argument
-                                                         * vector.  This includes any prefixed
-                                                         * arguments */ 
-                       Tcl_Obj *const *objv,            /* Argument vector */
+Rappture::GetOpFromObj(Tcl_Interp *interp,      /* Interpreter to report errors to */
+                       int nSpecs,              /* Number of specifications in array */
+                       CmdSpec *specs,          /* Op specification array */
+                       int operPos,             /* Position of operation in argument
+                                                 * list. */
+                       int objc,                /* Number of arguments in the argument
+                                                 * vector.  This includes any prefixed
+                                                 * arguments */ 
+                       Tcl_Obj *const *objv,    /* Argument vector */
                        int flags)
 {

branches/blt4/packages/vizservers/vtkvis/CmdProc.h

@@ -3 +3 @@
  * Copyright (C) 2011, Purdue Research Foundation
  *
- * Author: ?
+ * Author: George A. Howlett <gah@purdue.edu>
  */
 
@@ -19 +19 @@
  * for a function pointer associated with the operation name.
  */
-typedef struct {
+struct CmdSpec {
     const char *name;           /**< Name of operation */
     int minChars;               /**< Minimum # characters to disambiguate */
@@ -26 +26 @@
     int maxArgs;                /**< Maximum # args required */
     const char *usage;          /**< Usage message */
-} CmdSpec;
+};
 
-typedef enum {
+enum CmdSpecIndex {
     CMDSPEC_ARG0,               /**< Op is the first argument. */
     CMDSPEC_ARG1,               /**< Op is the second argument. */
@@ -34 +34 @@
     CMDSPEC_ARG3,               /**< Op is the fourth argument. */
     CMDSPEC_ARG4                /**< Op is the fifth argument. */
-} CmdSpecIndex;
+};
 
 #define CMDSPEC_LINEAR_SEARCH   1

branches/blt4/packages/vizservers/vtkvis/ColorMap.cpp

@@ -21 +21 @@
 
 ColorMap *ColorMap::_default = NULL;
+ColorMap *ColorMap::_grayDefault = NULL;
 ColorMap *ColorMap::_volumeDefault = NULL;
 ColorMap *ColorMap::_elementDefault = NULL;
@@ -219 +220 @@
         }
         if (itr2 == _controlPoints.end()) {
+#ifdef DEBUG
             TRACE("val: %g Range: %g - 1 Color: %g %g %g", value, itr->value,
                   itr->color[0], itr->color[1], itr->color[2]);
+#endif
             memcpy(color, itr->color, sizeof(double)*3);
         } else {
@@ -226 +229 @@
             assert(value >= itr->value && value <= itr2->value);
             lerp(color, *itr, *itr2, value);
+#ifdef DEBUG
             TRACE("val: %g Range: %g - %g Color: %g %g %g", value, itr->value, itr2->value,
                   color[0], color[1], color[2]);
+#endif
         }
         if (oitr2 == _opacityControlPoints.end()) {
+#ifdef DEBUG
             TRACE("val: %g Range: %g - 1 Alpha %g", value, oitr->value,
                   oitr->alpha);
+#endif
             color[3] = oitr->alpha;
         } else {
@@ -237 +244 @@
             assert(value >= oitr->value && value <= oitr2->value);
             lerp(&color[3], *oitr, *oitr2, value);
+#ifdef DEBUG
             TRACE("val: %g Range: %g - %g Alpha: %g", value, oitr->value, oitr2->value,
                   color[3]);
+#endif
         }
         _lookupTable->SetTableValue(i, color);
@@ -329 +338 @@
 
 /**
+ * \brief Create a default ColorMap with a black-white grayscale ramp
+ */
+ColorMap *ColorMap::getGrayDefault()
+{
+    if (_grayDefault != NULL) {
+        return _grayDefault;
+    }
+
+    _grayDefault = new ColorMap("grayDefault");
+    ControlPoint cp[2];
+    cp[0].value = 0.0;
+    cp[0].color[0] = 0.0;
+    cp[0].color[1] = 0.0;
+    cp[0].color[2] = 0.0;
+    _grayDefault->addControlPoint(cp[0]);
+    cp[1].value = 1.0;
+    cp[1].color[0] = 1.0;
+    cp[1].color[1] = 1.0;
+    cp[1].color[2] = 1.0;
+    _grayDefault->addControlPoint(cp[1]);
+    OpacityControlPoint ocp[2];
+    ocp[0].value = 0.0;
+    ocp[0].alpha = 1.0;
+    ocp[1].value = 1.0;
+    ocp[1].alpha = 1.0;
+    _grayDefault->addOpacityControlPoint(ocp[0]);
+    _grayDefault->addOpacityControlPoint(ocp[1]);
+    _grayDefault->build();
+    return _grayDefault;
+}
+
+/**
  * \brief Create a default ColorMap with a blue-cyan-green-yellow-red ramp
  * and transparent to opaque ramp

branches/blt4/packages/vizservers/vtkvis/ColorMap.h

@@ -104 +104 @@
 
     static ColorMap *getDefault();
+    static ColorMap *getGrayDefault();
     static ColorMap *getVolumeDefault();
     static ColorMap *getElementDefault();
@@ -109 +110 @@
 private:
     static ColorMap *_default;
+    static ColorMap *_grayDefault;
     static ColorMap *_volumeDefault;
     static ColorMap *_elementDefault;

branches/blt4/packages/vizservers/vtkvis/Makefile.in

@@ -47 +47 @@
 DEBUG                   = #yes
 TRACE                   = #yes
-USE_CUSTOM_AXES         = #yes
+USE_CUSTOM_AXES         = yes
 USE_GPU_RAYCASTING      = yes
-USE_OFFSCREEN_RENDERING = #yes
+USE_OFFSCREEN_RENDERING = yes
+USE_THREADS             = yes
 
 #vtk uses deprecated strstream header (instead of sstream)
@@ -69 +70 @@
 ifdef USE_GPU_RAYCASTING
 DEFINES         += -DUSE_GPU_RAYCAST_MAPPER
+endif
+ifdef USE_THREADS
+DEFINES         += -DUSE_THREADS
 endif
 CXX_SWITCHES    = $(CXXFLAGS) $(EXTRA_CFLAGS) $(DEFINES) $(INCLUDES)
@@ -95 +99 @@
 ifdef USE_CUSTOM_AXES
 SERVER_SRCS+=vtkRpCubeAxesActor2D.cpp
+endif
+ifdef USE_THREADS
+SERVER_SRCS+=ResponseQueue.cpp
 endif
 
@@ -129 +136 @@
 CmdProc.o: CmdProc.h
 ColorMap.o: ColorMap.h RpMolecule.h Trace.h
-PPMWriter.o: PPMWriter.h Trace.h
+PPMWriter.o: PPMWriter.h ResponseQueue.h Trace.h
+ResponseQueue.o: ResponseQueue.h Trace.h
 RpContour2D.o: RpContour2D.h RpVtkGraphicsObject.h RpVtkDataSet.h Trace.h
-RpContour3D.o: RpContour3D.h RpVtkGraphicsObject.h RpVtkDataSet.h Trace.h
+RpContour3D.o: RpContour3D.h RpVtkGraphicsObject.h RpVtkDataSet.h ColorMap.h Trace.h
 RpGlyphs.o: RpGlyphs.h RpVtkGraphicsObject.h RpVtkDataSet.h ColorMap.h Trace.h
-RpHeightMap.o: RpHeightMap.h RpVtkGraphicsObject.h RpVtkDataSet.h Trace.h
-RpLIC.o: RpLIC.h RpVtkGraphicsObject.h RpVtkDataSet.h Trace.h RpVtkRenderServer.h
+RpHeightMap.o: RpHeightMap.h RpVtkGraphicsObject.h RpVtkDataSet.h ColorMap.h Trace.h
+RpLIC.o: RpLIC.h RpVtkGraphicsObject.h RpVtkDataSet.h ColorMap.h Trace.h RpVtkRenderServer.h
 RpMolecule.o: RpMolecule.h RpMoleculeData.h RpVtkGraphicsObject.h RpVtkDataSet.h ColorMap.h Trace.h
 RpPolyData.o: RpPolyData.h RpVtkGraphicsObject.h RpVtkDataSet.h Trace.h
-RpPseudoColor.o: RpPseudoColor.h RpVtkGraphicsObject.h RpVtkDataSet.h Trace.h
-RpStreamlines.o: RpStreamlines.h RpVtkGraphicsObject.h RpVtkDataSet.h Trace.h
+RpPseudoColor.o: RpPseudoColor.h RpVtkGraphicsObject.h RpVtkDataSet.h ColorMap.h Trace.h
+RpStreamlines.o: RpStreamlines.h RpVtkGraphicsObject.h RpVtkDataSet.h ColorMap.h Trace.h
 RpVolume.o: RpVolume.h RpVtkGraphicsObject.h RpVtkDataSet.h ColorMap.h Trace.h
 RpVtkDataSet.o: RpVtkDataSet.h Trace.h
 RpVtkRenderer.o: RpVtkRenderer.h RpVtkDataSet.h RpContour2D.h RpContour3D.h RpGlyphs.h RpHeightMap.h RpLIC.h RpMolecule.h RpPolyData.h RpPseudoColor.h RpStreamlines.h RpVolume.h ColorMap.h Trace.h
-RpVtkRendererCmd.o: RpVtkRenderer.h RpVtkDataSet.h RpContour2D.h RpContour3D.h RpGlyphs.h RpHeightMap.h RpLIC.h RpMolecule.h RpPolyData.h RpPseudoColor.h RpStreamlines.h RpVolume.h ColorMap.h Trace.h CmdProc.h PPMWriter.h TGAWriter.h
-RpVtkRenderServer.o: RpVtkRenderServer.h RpVtkRendererCmd.h RpVtkRenderer.h Trace.h PPMWriter.h TGAWriter.h
+RpVtkRendererCmd.o: RpVtkRenderer.h RpVtkDataSet.h RpContour2D.h RpContour3D.h RpGlyphs.h RpHeightMap.h RpLIC.h RpMolecule.h RpPolyData.h RpPseudoColor.h RpStreamlines.h RpVolume.h ColorMap.h ResponseQueue.h Trace.h CmdProc.h PPMWriter.h TGAWriter.h
+RpVtkRenderServer.o: RpVtkRenderServer.h RpVtkRendererCmd.h RpVtkRenderer.h ResponseQueue.h Trace.h PPMWriter.h TGAWriter.h
 Trace.o: Trace.h
-TGAWriter.o: TGAWriter.h Trace.h
+TGAWriter.o: TGAWriter.h ResponseQueue.h Trace.h
 vtkRpCubeAxesActor2D.o: vtkRpCubeAxesActor2D.h

branches/blt4/packages/vizservers/vtkvis/PPMWriter.cpp

@@ -3 +3 @@
  * Copyright (C) 2011, Purdue Research Foundation
  *
- * Author: ?
+ * Author: George A. Howlett <gah@purdue.edu>
  */
 
@@ -12 +12 @@
 #include <sys/uio.h>
 
+#include "Trace.h"
 #include "PPMWriter.h"
-#include "Trace.h"
+#ifdef USE_THREADS
+#include "ResponseQueue.h"
+#endif
 
 using namespace Rappture::VtkVis;
+
+#ifdef USE_THREADS
+
+/**
+ * \brief Writes image data as PPM binary data to the client.
+ *
+ * The PPM binary format is very simple.
+ *
+ *     P6 w h 255\n
+ *     3-byte RGB pixel data.
+ *
+ * The client (using the TkImg library) will do less work to unpack this 
+ * format, as opposed to BMP or PNG.
+ *
+ * Note that currently the image data has bottom to top scanlines.  This 
+ * routine could be made even simpler (faster) if the image data had top 
+ * to bottom scanlines.
+ *
+ * \param[in] queue Pointer to ResponseQueue to write to
+ * \param[in] cmdName Command name to send (byte length will be appended)
+ * \param[in] data Image data
+ * \param[in] width Width of image in pixels
+ * \param[in] height Height of image in pixels
+ */
+void
+Rappture::VtkVis::queuePPM(ResponseQueue *queue, const char *cmdName, 
+                           const unsigned char *data, int width, int height)
+{
+#define PPM_MAXVAL 255
+    char header[200];
+
+    TRACE("Entering (%dx%d)\n", width, height);
+    // Generate the PPM binary file header
+    snprintf(header, sizeof(header), "P6 %d %d %d\n", width, height, 
+             PPM_MAXVAL);
+
+    size_t headerLength = strlen(header);
+    size_t dataLength = width * height * 3;
+
+    char command[200];
+    snprintf(command, sizeof(command), "%s %lu\n", cmdName, 
+             (unsigned long)headerLength + dataLength);
+
+    size_t cmdLength;
+    cmdLength = strlen(command);
+
+    size_t length;
+    unsigned char *mesg;
+
+    length = headerLength + dataLength + cmdLength;
+    mesg = (unsigned char *)malloc(length);
+    if (mesg == NULL) {
+        ERROR("can't allocate %ld bytes for the image message", length);
+        return;
+    }
+    memcpy(mesg, command, cmdLength);
+    memcpy(mesg + cmdLength, header, headerLength);
+
+    size_t bytesPerRow = width * 3;
+    unsigned char *destRowPtr = mesg + length - bytesPerRow;
+    int y;
+    unsigned char *srcRowPtr = const_cast<unsigned char *>(data);
+    for (y = 0; y < height; y++) {
+        memcpy(destRowPtr, srcRowPtr, bytesPerRow);
+        srcRowPtr += bytesPerRow;
+        destRowPtr -= bytesPerRow;
+    }
+
+    Response *response;
+    if (strncmp(cmdName, "nv>legend", 9) == 0) {
+        response = new Response(Response::LEGEND);
+    } else {
+        response = new Response(Response::IMAGE);
+    }
+    response->setMessage(mesg, length, Response::DYNAMIC);
+    queue->enqueue(response);
+    TRACE("Leaving (%dx%d)\n", width, height);
+}
+#else
 
 /**
@@ -39 +121 @@
  */
 void
-Rappture::VtkVis::writePPM(int fd, const char *cmdName, const unsigned char *data,
-                           int width, int height)
+Rappture::VtkVis::writePPM(int fd, const char *cmdName, 
+                           const unsigned char *data, int width, int height)
 {
 #define PPM_MAXVAL 255
@@ -47 +129 @@
     TRACE("Entering (%dx%d)\n", width, height);
     // Generate the PPM binary file header
-    snprintf(header, sizeof(header), "P6 %d %d %d\n", width, height, PPM_MAXVAL);
+    snprintf(header, sizeof(header), "P6 %d %d %d\n", width, height,
+             PPM_MAXVAL);
 
     size_t headerLength = strlen(header);
@@ -79 +162 @@
     }
     if (writev(fd, iov, nRecs) < 0) {
-        ERROR("write failed: %s\n", strerror(errno));
+        ERROR("write failed: %s\n", strerror(errno));
     }
     free(iov);
@@ -85 +168 @@
     TRACE("Leaving (%dx%d)\n", width, height);
 }
+
+#endif /*USE_THREADS*/

branches/blt4/packages/vizservers/vtkvis/PPMWriter.h

@@ -3 +3 @@
  * Copyright (C) 2011, Purdue Research Foundation
  *
- * Author: ?
+ * Author: George A. Howlett <gah@purdue.edu>
  */
 
@@ -9 +9 @@
 #define __RAPPTURE_VTKVIS_PPMWRITER_H__
 
+#ifdef USE_THREADS
+#include "ResponseQueue.h"
+#endif
+
 namespace Rappture {
 namespace VtkVis {
-
+#ifdef USE_THREADS
 extern
-void writePPM(int fd, const char *cmdName, const unsigned char *data, int width, int height);
-
+void queuePPM(ResponseQueue *queue, const char *cmdName, 
+              const unsigned char *data, int width, int height);
+#else
+extern
+void writePPM(int fd, const char *cmdName, 
+              const unsigned char *data, int width, int height);
+#endif
 }
 }
-
 #endif

branches/blt4/packages/vizservers/vtkvis/RpContour2D.cpp

@@ -13 +13 @@
 #include <vtkCellDataToPointData.h>
 #include <vtkContourFilter.h>
+#include <vtkStripper.h>
 #include <vtkPolyDataMapper.h>
 #include <vtkUnstructuredGrid.h>
 #include <vtkProperty.h>
+#include <vtkTransform.h>
 #include <vtkDelaunay2D.h>
 #include <vtkDelaunay3D.h>
@@ -25 +27 @@
 using namespace Rappture::VtkVis;
 
-Contour2D::Contour2D() :
+Contour2D::Contour2D(int numContours) :
     VtkGraphicsObject(),
-    _numContours(0)
-{
-    _dataRange[0] = 0;
-    _dataRange[1] = 1;
+    _numContours(numContours)
+{
+    _edgeColor[0] = _color[0];
+    _edgeColor[1] = _color[0];
+    _edgeColor[2] = _color[0];
+    _lighting = false;
+}
+
+Contour2D::Contour2D(const std::vector<double>& contours) :
+    VtkGraphicsObject(),
+    _numContours(contours.size()),
+    _contours(contours)
+{
+    _edgeColor[0] = _color[0];
+    _edgeColor[1] = _color[0];
+    _edgeColor[2] = _color[0];
+    _lighting = false;
 }
 
@@ -41 +56 @@
         TRACE("Deleting Contour2D with NULL DataSet");
 #endif
-}
-
-/**
- * \brief Specify input DataSet used to extract contours
- */
-void Contour2D::setDataSet(DataSet *dataSet)
-{
-    if (_dataSet != dataSet) {
-        _dataSet = dataSet;
-
-        if (_dataSet != NULL) {
-            double dataRange[2];
-            _dataSet->getDataRange(dataRange);
-            _dataRange[0] = dataRange[0];
-            _dataRange[1] = dataRange[1];
-        }
-
-        update();
-    }
-}
-
-/**
- * \brief Create and initialize a VTK Prop to render isolines
- */
-void Contour2D::initProp()
-{
-    if (_prop == NULL) {
-        _prop = vtkSmartPointer<vtkActor>::New();
-        vtkProperty *property = getActor()->GetProperty();
-        property->EdgeVisibilityOn();
-        property->SetEdgeColor(_edgeColor[0], _edgeColor[1], _edgeColor[2]);
-        property->SetLineWidth(_edgeWidth);
-        property->SetOpacity(_opacity);
-        property->SetAmbient(.2);
-        property->LightingOff();
-    }
 }
 
@@ -121 +100 @@
             pd->GetNumberOfStrips() == 0) {
             // DataSet is a point cloud
-            if (_dataSet->is2D()) {
+            DataSet::PrincipalPlane plane;
+            double offset;
+            if (_dataSet->is2D(&plane, &offset)) {
                 vtkSmartPointer<vtkDelaunay2D> mesher = vtkSmartPointer<vtkDelaunay2D>::New();
+                if (plane == DataSet::PLANE_ZY) {
+                    vtkSmartPointer<vtkTransform> trans = vtkSmartPointer<vtkTransform>::New();
+                    trans->RotateWXYZ(90, 0, 1, 0);
+                    if (offset != 0.0) {
+                        trans->Translate(-offset, 0, 0);
+                    }
+                    mesher->SetTransform(trans);
+                } else if (plane == DataSet::PLANE_XZ) {
+                    vtkSmartPointer<vtkTransform> trans = vtkSmartPointer<vtkTransform>::New();
+                    trans->RotateWXYZ(-90, 1, 0, 0);
+                    if (offset != 0.0) {
+                        trans->Translate(0, -offset, 0);
+                    }
+                    mesher->SetTransform(trans);
+                } else if (offset != 0.0) {
+                    // XY with Z offset
+                    vtkSmartPointer<vtkTransform> trans = vtkSmartPointer<vtkTransform>::New();
+                    trans->Translate(0, 0, -offset);
+                    mesher->SetTransform(trans);
+                }
                 mesher->SetInput(pd);
                 _contourFilter->SetInputConnection(mesher->GetOutputPort());
@@ -168 +169 @@
         _contourMapper = vtkSmartPointer<vtkPolyDataMapper>::New();
         _contourMapper->SetResolveCoincidentTopologyToPolygonOffset();
-        _contourMapper->SetInputConnection(_contourFilter->GetOutputPort());
+        _contourMapper->ScalarVisibilityOff();
+        vtkSmartPointer<vtkStripper> stripper = vtkSmartPointer<vtkStripper>::New();
+        stripper->SetInputConnection(_contourFilter->GetOutputPort());
+        _contourMapper->SetInputConnection(stripper->GetOutputPort());
         getActor()->SetMapper(_contourMapper);
     }
 
     _contourMapper->Update();
+}
+
+void Contour2D::updateRanges(bool useCumulative,
+                             double scalarRange[2],
+                             double vectorMagnitudeRange[2],
+                             double vectorComponentRange[3][2])
+{
+    if (useCumulative) {
+        _dataRange[0] = scalarRange[0];
+        _dataRange[1] = scalarRange[1];
+    } else if (_dataSet != NULL) {
+        _dataSet->getScalarRange(_dataRange);
+    } else {
+        WARN("updateRanges called before setDataSet");
+    }
+
+    if (_contours.empty() && _numContours > 0) {
+        // Contour isovalues need to be recomputed
+        update();
+    }
 }
 
@@ -185 +209 @@
     _numContours = numContours;
 
-    if (_dataSet != NULL) {
-        double dataRange[2];
-        _dataSet->getDataRange(dataRange);
-        _dataRange[0] = dataRange[0];
-        _dataRange[1] = dataRange[1];
-    }
-
-    update();
-}
-
-/**
- * \brief Specify number of evenly spaced contour lines to render
- * between the given range (including range endpoints)
- *
- * Will override any existing contours
- */
-void Contour2D::setContours(int numContours, double range[2])
-{
-    _contours.clear();
-    _numContours = numContours;
-
-    _dataRange[0] = range[0];
-    _dataRange[1] = range[1];
-
     update();
 }

branches/blt4/packages/vizservers/vtkvis/RpContour2D.h

@@ -27 +27 @@
 class Contour2D : public VtkGraphicsObject {
 public:
-    Contour2D();
+    Contour2D(int numContours);
+
+    Contour2D(const std::vector<double>& contours);
+
     virtual ~Contour2D();
 
@@ -35 +38 @@
     }
 
-    virtual void setDataSet(DataSet *dataset);
-
     virtual void setClippingPlanes(vtkPlaneCollection *planes);
 
     void setContours(int numContours);
-
-    void setContours(int numContours, double range[2]);
 
     void setContourList(const std::vector<double>& contours);
@@ -49 +48 @@
     const std::vector<double>& getContourList() const;
 
+    virtual void updateRanges(bool useCumulative,
+                              double scalarRange[2],
+                              double vectorMagnitudeRange[2],
+                              double vectorComponentRange[3][2]);
+
+    virtual void setColor(float color[3])
+    {
+        VtkGraphicsObject::setColor(color);
+        VtkGraphicsObject::setEdgeColor(color);
+    }
+
+    virtual void setEdgeColor(float color[3])
+    {
+        setColor(color);
+    }
+
 private:
-    virtual void initProp();
+    Contour2D();
+
     virtual void update();
 
     int _numContours;
     std::vector<double> _contours;
-    double _dataRange[2];
 
     vtkSmartPointer<vtkContourFilter> _contourFilter;

branches/blt4/packages/vizservers/vtkvis/RpContour3D.cpp

@@ -25 +25 @@
 using namespace Rappture::VtkVis;
 
-Contour3D::Contour3D() :
+Contour3D::Contour3D(int numContours) :
     VtkGraphicsObject(),
-    _numContours(0)
-{
-    _dataRange[0] = 0;
-    _dataRange[1] = 1;
+    _numContours(numContours),
+    _colorMap(NULL)
+{
+    _color[0] = 0.0f;
+    _color[1] = 0.0f;
+    _color[2] = 1.0f;
+}
+
+Contour3D::Contour3D(const std::vector<double>& contours) :
+    VtkGraphicsObject(),
+    _numContours(contours.size()),
+    _contours(contours),
+    _colorMap(NULL)
+{
     _color[0] = 0.0f;
     _color[1] = 0.0f;
@@ -47 +57 @@
 
 /**
- * \brief Specify input DataSet used to extract contours
- */
-void Contour3D::setDataSet(DataSet *dataSet)
-{
-    if (_dataSet != dataSet) {
-        _dataSet = dataSet;
-
-        if (_dataSet != NULL) {
-            double dataRange[2];
-            _dataSet->getDataRange(dataRange);
-            _dataRange[0] = dataRange[0];
-            _dataRange[1] = dataRange[1];
-        }
-
-        update();
-    }
-}
-
-/**
- * \brief Create and initialize a VTK Prop to render isosurfaces
- */
-void Contour3D::initProp()
-{
-    if (_prop == NULL) {
-        _prop = vtkSmartPointer<vtkActor>::New();
-        vtkProperty *property = getActor()->GetProperty();
-        property->EdgeVisibilityOff();
-        property->SetColor(_color[0], _color[1], _color[2]);
-        property->SetEdgeColor(_edgeColor[0], _edgeColor[1], _edgeColor[2]);
-        property->SetLineWidth(_edgeWidth);
-        property->SetOpacity(_opacity);
-        property->SetAmbient(.2);
-        if (!_lighting)
-            property->LightingOff();
-    }
-}
-
-/**
- * \brief Get the VTK colormap lookup table in use
- */
-vtkLookupTable *Contour3D::getLookupTable()
-{ 
-    return _lut;
+ * \brief Called when the color map has been edited
+ */
+void Contour3D::updateColorMap()
+{
+    setColorMap(_colorMap);
 }
 
@@ -95 +67 @@
  * \brief Associate a colormap lookup table with the DataSet
  */
-void Contour3D::setLookupTable(vtkLookupTable *lut)
-{
-    if (lut == NULL) {
+void Contour3D::setColorMap(ColorMap *cmap)
+{
+    if (cmap == NULL)
+        return;
+
+    _colorMap = cmap;
+ 
+    if (_lut == NULL) {
         _lut = vtkSmartPointer<vtkLookupTable>::New();
-    } else {
-        _lut = lut;
-    }
-
-    if (_contourMapper != NULL) {
-        _contourMapper->UseLookupTableScalarRangeOn();
-        _contourMapper->SetLookupTable(_lut);
-    }
+        if (_contourMapper != NULL) {
+            _contourMapper->UseLookupTableScalarRangeOn();
+            _contourMapper->SetLookupTable(_lut);
+        }
+    }
+
+    _lut->DeepCopy(cmap->getLookupTable());
+    _lut->SetRange(_dataRange);
 }
 
@@ -198 +175 @@
     }
 
-    if (ds->GetPointData() == NULL ||
-        ds->GetPointData()->GetScalars() == NULL) {
-        if (_lut == NULL) {
-            _lut = vtkSmartPointer<vtkLookupTable>::New();
-        }
-    } else {
-        vtkLookupTable *lut = ds->GetPointData()->GetScalars()->GetLookupTable();
-        TRACE("Data set scalars lookup table: %p\n", lut);
-        if (_lut == NULL) {
-            if (lut)
-                _lut = lut;
-            else
-                _lut = vtkSmartPointer<vtkLookupTable>::New();
-        }
-    }
-
-    if (_lut != NULL) {
-        _lut->SetRange(_dataRange);
-
-        _contourMapper->SetColorModeToMapScalars();
-        _contourMapper->UseLookupTableScalarRangeOn();
-        _contourMapper->SetLookupTable(_lut);
+    if (_lut == NULL) {
+        setColorMap(ColorMap::getDefault());
     }
 
@@ -228 +185 @@
 }
 
+void Contour3D::updateRanges(bool useCumulative,
+                             double scalarRange[2],
+                             double vectorMagnitudeRange[2],
+                             double vectorComponentRange[3][2])
+{
+    if (useCumulative) {
+        _dataRange[0] = scalarRange[0];
+        _dataRange[1] = scalarRange[1];
+    } else if (_dataSet != NULL) {
+        _dataSet->getScalarRange(_dataRange);
+    }
+
+    if (_lut != NULL) {
+        _lut->SetRange(_dataRange);
+    }
+
+    if (_contours.empty() && _numContours > 0) {
+        // Need to recompute isovalues
+        update();
+    }
+}
+
 /**
  * \brief Specify number of evenly spaced isosurfaces to render
@@ -238 +217 @@
     _numContours = numContours;
 
-    if (_dataSet != NULL) {
-        double dataRange[2];
-        _dataSet->getDataRange(dataRange);
-        _dataRange[0] = dataRange[0];
-        _dataRange[1] = dataRange[1];
-    }
-
-    update();
-}
-
-/**
- * \brief Specify number of evenly spaced isosurfaces to render
- * between the given range (including range endpoints)
- *
- * Will override any existing contours
- */
-void Contour3D::setContours(int numContours, double range[2])
-{
-    _contours.clear();
-    _numContours = numContours;
-
-    _dataRange[0] = range[0];
-    _dataRange[1] = range[1];
-
     update();
 }

branches/blt4/packages/vizservers/vtkvis/RpContour3D.h

@@ -18 +18 @@
 #include <vector>
 
+#include "ColorMap.h"
 #include "RpVtkGraphicsObject.h"
 
@@ -28 +29 @@
 class Contour3D : public VtkGraphicsObject {
 public:
-    Contour3D();
+    Contour3D(int numContours);
+
+    Contour3D(const std::vector<double>& contours);
+
     virtual ~Contour3D();
 
@@ -36 +40 @@
     }
 
-    virtual void setDataSet(DataSet *dataset);
-
     virtual void setClippingPlanes(vtkPlaneCollection *planes);
 
     void setContours(int numContours);
-
-    void setContours(int numContours, double range[2]);
 
     void setContourList(const std::vector<double>& contours);
@@ -50 +50 @@
     const std::vector<double>& getContourList() const;
 
-    void setLookupTable(vtkLookupTable *lut);
+    void setColorMap(ColorMap *colorMap);
 
-    vtkLookupTable *getLookupTable();
+    /**
+     * \brief Return the ColorMap in use
+     */
+    ColorMap *getColorMap()
+    {
+        return _colorMap;
+    }
+
+    void updateColorMap();
+
+    virtual void updateRanges(bool useCumulative,
+                              double scalarRange[2],
+                              double vectorMagnitudeRange[2],
+                              double vectorComponentRange[3][2]);
 
 private:
-    virtual void initProp();
+    Contour3D();
+
     virtual void update();
 
     int _numContours;
     std::vector<double> _contours;
-    double _dataRange[2];
+    ColorMap *_colorMap;
 
     vtkSmartPointer<vtkContourFilter> _contourFilter;

branches/blt4/packages/vizservers/vtkvis/RpGlyphs.cpp

@@ -14 +14 @@
 #include <vtkProperty.h>
 #include <vtkGlyph3D.h>
+#include <vtkLineSource.h>
 #include <vtkArrowSource.h>
 #include <vtkConeSource.h>
@@ -19 +20 @@
 #include <vtkPlatonicSolidSource.h>
 #include <vtkSphereSource.h>
+#include <vtkTransform.h>
 #include <vtkPolyDataMapper.h>
+#include <vtkTransformPolyDataFilter.h>
 
 #include "RpGlyphs.h"
@@ -26 +29 @@
 using namespace Rappture::VtkVis;
 
-Glyphs::Glyphs() :
+Glyphs::Glyphs(GlyphShape shape) :
     VtkGraphicsObject(),
-    _glyphShape(ARROW),
+    _glyphShape(shape),
+    _scalingMode(SCALE_BY_VECTOR_MAGNITUDE),
+    _dataScale(1.0),
     _scaleFactor(1.0),
-    _colorMode(COLOR_BY_SCALAR)
+    _normalizeScale(true),
+    _colorMode(COLOR_BY_SCALAR),
+    _colorMap(NULL)
 {
     _faceCulling = true;
@@ -39 +46 @@
 }
 
+void Glyphs::setDataSet(DataSet *dataSet,
+                        bool useCumulative,
+                        double scalarRange[2],
+                        double vectorMagnitudeRange[2],
+                        double vectorComponentRange[3][2])
+{
+    if (_dataSet != dataSet) {
+        _dataSet = dataSet;
+
+        if (useCumulative) {
+            _dataRange[0] = scalarRange[0];
+            _dataRange[1] = scalarRange[1];
+            _vectorMagnitudeRange[0] = vectorMagnitudeRange[0];
+            _vectorMagnitudeRange[1] = vectorMagnitudeRange[1];
+            for (int i = 0; i < 3; i++) {
+                _vectorComponentRange[i][0] = vectorComponentRange[i][0];
+                _vectorComponentRange[i][1] = vectorComponentRange[i][1];
+            }
+        } else {
+            _dataSet->getScalarRange(_dataRange);
+            _dataSet->getVectorRange(_vectorMagnitudeRange);
+            for (int i = 0; i < 3; i++) {
+                _dataSet->getVectorRange(_vectorComponentRange[i], i);
+            }
+        }
+
+        update();
+    }
+}
+
 /**
  * \brief Set the shape of the glyphs
@@ -45 +82 @@
 {
     _glyphShape = shape;
+
+    // Note: using vtkTransformPolyDataFilter instead of the vtkGlyph3D's 
+    // SourceTransform because of a bug: vtkGlyph3D doesn't transform normals
+    // by the SourceTransform, so the lighting would be wrong
+
     switch (_glyphShape) {
+    case LINE:
+        _glyphSource = vtkSmartPointer<vtkLineSource>::New();
+        break;
     case ARROW:
-        _glyphSource = vtkSmartPointer<vtkArrowSource>::New();
-        break;
+        _glyphSource = vtkSmartPointer<vtkArrowSource>::New();
+        break;
     case CONE:
-        _glyphSource = vtkSmartPointer<vtkConeSource>::New();
-        break;
+        _glyphSource = vtkSmartPointer<vtkConeSource>::New();
+        break;
     case CUBE:
-        _glyphSource = vtkSmartPointer<vtkPlatonicSolidSource>::New();
-        vtkPlatonicSolidSource::SafeDownCast(_glyphSource)->SetSolidTypeToCube();
-        break;
-    case CYLINDER:
-        _glyphSource = vtkSmartPointer<vtkCylinderSource>::New();
-        break;
+        _glyphSource = vtkSmartPointer<vtkPlatonicSolidSource>::New();
+        vtkPlatonicSolidSource::SafeDownCast(_glyphSource)->SetSolidTypeToCube();
+        break;
+    case CYLINDER: {
+        vtkSmartPointer<vtkCylinderSource> csource = vtkSmartPointer<vtkCylinderSource>::New();
+        vtkCylinderSource::SafeDownCast(csource)->SetResolution(6);
+        _glyphSource = vtkSmartPointer<vtkTransformPolyDataFilter>::New();
+        _glyphSource->SetInputConnection(csource->GetOutputPort());
+        vtkSmartPointer<vtkTransform> trans = vtkSmartPointer<vtkTransform>::New();
+        trans->RotateZ(-90.0);
+        vtkTransformPolyDataFilter::SafeDownCast(_glyphSource)->SetTransform(trans);
+      }
+        break;
     case DODECAHEDRON:
-        _glyphSource = vtkSmartPointer<vtkPlatonicSolidSource>::New();
-        vtkPlatonicSolidSource::SafeDownCast(_glyphSource)->SetSolidTypeToDodecahedron();
-        break;
+        _glyphSource = vtkSmartPointer<vtkPlatonicSolidSource>::New();
+        vtkPlatonicSolidSource::SafeDownCast(_glyphSource)->SetSolidTypeToDodecahedron();
+        break;
     case ICOSAHEDRON:
-        _glyphSource = vtkSmartPointer<vtkPlatonicSolidSource>::New();
-        vtkPlatonicSolidSource::SafeDownCast(_glyphSource)->SetSolidTypeToIcosahedron();
-        break;
+        _glyphSource = vtkSmartPointer<vtkPlatonicSolidSource>::New();
+        vtkPlatonicSolidSource::SafeDownCast(_glyphSource)->SetSolidTypeToIcosahedron();
+        break;
     case OCTAHEDRON:
-        _glyphSource = vtkSmartPointer<vtkPlatonicSolidSource>::New();
-        vtkPlatonicSolidSource::SafeDownCast(_glyphSource)->SetSolidTypeToOctahedron();
-        break;
+        _glyphSource = vtkSmartPointer<vtkPlatonicSolidSource>::New();
+        vtkPlatonicSolidSource::SafeDownCast(_glyphSource)->SetSolidTypeToOctahedron();
+        break;
     case SPHERE:
-        _glyphSource = vtkSmartPointer<vtkSphereSource>::New();
-        break;
+        _glyphSource = vtkSmartPointer<vtkSphereSource>::New();
+        break;
     case TETRAHEDRON:
-        _glyphSource = vtkSmartPointer<vtkPlatonicSolidSource>::New();
-        vtkPlatonicSolidSource::SafeDownCast(_glyphSource)->SetSolidTypeToTetrahedron();
-        break;
+        // FIXME: need to rotate inital orientation
+        _glyphSource = vtkSmartPointer<vtkPlatonicSolidSource>::New();
+        vtkPlatonicSolidSource::SafeDownCast(_glyphSource)->SetSolidTypeToTetrahedron();
+        break;
     default:
-        ERROR("Unknown glyph shape: %d", _glyphShape);
-        return;
+        ERROR("Unknown glyph shape: %d", _glyphShape);
+        return;
     }
 
@@ -91 +144 @@
     }
 
+#ifdef HAVE_GLYPH3D_MAPPER
+    if (_glyphMapper != NULL) {
+        _glyphMapper->SetSourceConnection(_glyphSource->GetOutputPort());
+    }
+#else
     if (_glyphGenerator != NULL) {
-        _glyphGenerator->SetSourceConnection(_glyphSource->GetOutputPort());
-    }
+        _glyphGenerator->SetSourceConnection(_glyphSource->GetOutputPort());
+    }
+#endif
 }
 
@@ -107 +166 @@
     vtkDataSet *ds = _dataSet->getVtkDataSet();
 
+#ifdef HAVE_GLYPH3D_MAPPER
+    if (_glyphMapper == NULL) {
+        _glyphMapper = vtkSmartPointer<vtkGlyph3DMapper>::New();
+        _glyphMapper->SetResolveCoincidentTopologyToPolygonOffset();
+        _glyphMapper->ScalarVisibilityOn();
+    }
+#else
     if (_glyphGenerator == NULL) {
-        _glyphGenerator = vtkSmartPointer<vtkGlyph3D>::New();
-    }
+        _glyphGenerator = vtkSmartPointer<vtkGlyph3D>::New();
+    }
+    if (_pdMapper == NULL) {
+        _pdMapper = vtkSmartPointer<vtkPolyDataMapper>::New();
+        _pdMapper->SetResolveCoincidentTopologyToPolygonOffset();
+        _pdMapper->ScalarVisibilityOn();
+        _pdMapper->SetInputConnection(_glyphGenerator->GetOutputPort());
+    }
+#endif
 
     initProp();
@@ -133 +206 @@
     }
 
+#ifdef HAVE_GLYPH3D_MAPPER
+    _glyphMapper->SetInputConnection(ds->GetProducerPort());
+#else
     _glyphGenerator->SetInput(ds);
+#endif
 
     if (ds->GetPointData()->GetVectors() != NULL) {
-        _glyphGenerator->SetScaleModeToScaleByVector();
+        TRACE("Setting scale mode to vector magnitude");
+        setScalingMode(SCALE_BY_VECTOR_MAGNITUDE);
     } else {
-        _glyphGenerator->SetScaleModeToScaleByScalar();
-    }
-    _glyphGenerator->SetScaleFactor(_scaleFactor);
+        TRACE("Setting scale mode to scalar");
+        setScalingMode(SCALE_BY_SCALAR);
+    }
+
+    double cellSizeRange[2];
+    double avgSize;
+    _dataSet->getCellSizeRange(cellSizeRange, &avgSize);
+    //_dataScale = cellSizeRange[0] + (cellSizeRange[1] - cellSizeRange[0])/2.;
+    _dataScale = avgSize;
+
+    TRACE("Cell size range: %g,%g, Data scale factor: %g",
+          cellSizeRange[0], cellSizeRange[1], _dataScale);
+
+    // Normalize sizes to [0,1] * ScaleFactor
+#ifdef HAVE_GLYPH3D_MAPPER
+    _glyphMapper->SetClamping(_normalizeScale ? 1 : 0);
+    _glyphMapper->SetScaleFactor(_scaleFactor * _dataScale);
+    _glyphMapper->ScalingOn();
+#else
+    _glyphGenerator->SetClamping(_normalizeScale ? 1 : 0);
+    _glyphGenerator->SetScaleFactor(_scaleFactor * _dataScale);
     _glyphGenerator->ScalingOn();
+#endif
 
     if (ds->GetPointData()->GetScalars() == NULL) {
         TRACE("Setting color mode to vector magnitude");
-        _glyphGenerator->SetColorModeToColorByVector();
-        _colorMode = COLOR_BY_VECTOR;
+        setColorMode(COLOR_BY_VECTOR_MAGNITUDE);
     } else {
         TRACE("Setting color mode to scalar");
-        _glyphGenerator->SetColorModeToColorByScalar();
-        _colorMode = COLOR_BY_SCALAR;
-    }
-    if (_glyphShape == SPHERE) {
-        _glyphGenerator->OrientOff();
-    }
-
-    if (_pdMapper == NULL) {
-        _pdMapper = vtkSmartPointer<vtkPolyDataMapper>::New();
-        _pdMapper->SetResolveCoincidentTopologyToPolygonOffset();
-        _pdMapper->ScalarVisibilityOn();
-    }
-    _pdMapper->SetInputConnection(_glyphGenerator->GetOutputPort());
-
-    if (ds->GetPointData() == NULL ||
-        ds->GetPointData()->GetScalars() == NULL) {
-        if (_lut == NULL) {
-            _lut = vtkSmartPointer<vtkLookupTable>::New();
-        }
-    } else {
-        vtkLookupTable *lut = ds->GetPointData()->GetScalars()->GetLookupTable();
-        TRACE("Data set scalars lookup table: %p\n", lut);
-        if (_lut == NULL) {
-            if (lut)
-                _lut = lut;
-            else
-                _lut = vtkSmartPointer<vtkLookupTable>::New();
-        }
-    }
-
-    if (ds->GetPointData()->GetScalars() == NULL) {
-        double dataRange[2];
-        _dataSet->getVectorMagnitudeRange(dataRange);
-        _lut->SetRange(dataRange);
-        //_pdMapper->SetScalarModeToUsePointFieldData();
-        //_pdMapper->SelectColorArray(ds->GetPointData()->GetVectors()->GetName());
-    } else {
-        double dataRange[2];
-        _dataSet->getDataRange(dataRange);
-        _lut->SetRange(dataRange);
-        //_pdMapper->SetScalarModeToDefault();
-    }
-
-    //_lut->SetVectorModeToMagnitude();
-    _pdMapper->SetLookupTable(_lut);
-    _pdMapper->UseLookupTableScalarRangeOn();
-
+        setColorMode(COLOR_BY_SCALAR);
+    }
+
+    if (_lut == NULL) {
+        setColorMap(ColorMap::getDefault());
+    }
+
+#ifdef HAVE_GLYPH3D_MAPPER
+    getActor()->SetMapper(_glyphMapper);
+    _glyphMapper->Update();
+#else
     getActor()->SetMapper(_pdMapper);
     _pdMapper->Update();
+#endif
+}
+
+/** 
+ * \brief Control if field data range is normalized to [0,1] before
+ * applying scale factor
+ */
+void Glyphs::setNormalizeScale(bool normalize)
+{
+    if (_normalizeScale != normalize) {
+        _normalizeScale = normalize;
+#ifdef HAVE_GLYPH3D_MAPPER
+        if (_glyphMapper != NULL) {
+            _glyphMapper->SetClamping(_normalizeScale ? 1 : 0);
+        }
+#else
+        if (_glyphGenerator != NULL) {
+            _glyphGenerator->SetClamping(_normalizeScale ? 1 : 0);
+        }
+#endif
+    }
 }
 
@@ -205 +286 @@
 void Glyphs::setScalingMode(ScalingMode mode)
 {
+    _scalingMode = mode;
+#ifdef HAVE_GLYPH3D_MAPPER
+    if (_glyphMapper != NULL) {
+#else
     if (_glyphGenerator != NULL) {
+#endif
         switch (mode) {
-        case SCALE_BY_SCALAR:
+        case SCALE_BY_SCALAR: {
+#ifdef HAVE_GLYPH3D_MAPPER
+            _glyphMapper->SetRange(_dataRange);
+            _glyphMapper->SetScaleModeToScaleByMagnitude();
+            _glyphMapper->SetScaleArray(vtkDataSetAttributes::SCALARS);
+#else
+            _glyphGenerator->SetRange(_dataRange);
             _glyphGenerator->SetScaleModeToScaleByScalar();
-            _glyphGenerator->ScalingOn();
+#endif
+        }
             break;
-        case SCALE_BY_VECTOR:
+        case SCALE_BY_VECTOR_MAGNITUDE: {
+#ifdef HAVE_GLYPH3D_MAPPER
+            _glyphMapper->SetRange(_dataRange);
+            _glyphMapper->SetScaleModeToScaleByMagnitude();
+            _glyphMapper->SetScaleArray(vtkDataSetAttributes::VECTORS);
+#else
+            _glyphGenerator->SetRange(_vectorMagnitudeRange);
             _glyphGenerator->SetScaleModeToScaleByVector();
-            _glyphGenerator->ScalingOn();
+#endif
+        }
             break;
-        case SCALE_BY_VECTOR_COMPONENTS:
+        case SCALE_BY_VECTOR_COMPONENTS: {
+            double sizeRange[2];
+            sizeRange[0] = _vectorComponentRange[0][0];
+            sizeRange[1] = _vectorComponentRange[0][1];
+            sizeRange[0] = min2(sizeRange[0], _vectorComponentRange[1][0]);
+            sizeRange[1] = max2(sizeRange[1], _vectorComponentRange[1][1]);
+            sizeRange[0] = min2(sizeRange[0], _vectorComponentRange[2][0]);
+            sizeRange[1] = max2(sizeRange[1], _vectorComponentRange[2][1]);
+#ifdef HAVE_GLYPH3D_MAPPER
+            _glyphMapper->SetRange(sizeRange);
+            _glyphMapper->SetScaleModeToScaleByVectorComponents();
+            _glyphMapper->SetScaleArray(vtkDataSetAttributes::VECTORS);
+#else
+            _glyphGenerator->SetRange(sizeRange);
             _glyphGenerator->SetScaleModeToScaleByVectorComponents();
-            _glyphGenerator->ScalingOn();
+#endif
+        }
             break;
         case SCALING_OFF:
         default:
+#ifdef HAVE_GLYPH3D_MAPPER
+            _glyphMapper->SetScaleModeToNoDataScaling();
+#else
             _glyphGenerator->SetScaleModeToDataScalingOff();
-            _glyphGenerator->ScalingOff();
-        }
-        _pdMapper->Update();
+#endif
+        }
     }
 }
@@ -234 +350 @@
 {
     _colorMode = mode;
+#ifdef HAVE_GLYPH3D_MAPPER
+    if (_glyphMapper != NULL) {
+#else
     if (_glyphGenerator != NULL) {
+#endif
         switch (mode) {
-        case COLOR_BY_SCALE:
-            _glyphGenerator->SetColorModeToColorByScale();
+        case COLOR_BY_VECTOR_MAGNITUDE: {
+#ifdef HAVE_GLYPH3D_MAPPER
+            _glyphMapper->ScalarVisibilityOn();
+            _glyphMapper->SetScalarModeToUsePointFieldData();
+            vtkDataSet *ds = _dataSet->getVtkDataSet();
+            if (ds->GetPointData() != NULL &&
+                ds->GetPointData()->GetVectors() != NULL) {
+                _glyphMapper->SelectColorArray(ds->GetPointData()->GetVectors()->GetName());
+            }
+#else
+            _glyphGenerator->SetColorModeToColorByVector();
             _pdMapper->ScalarVisibilityOn();
-            break;
-        case COLOR_BY_VECTOR: {
-            _glyphGenerator->SetColorModeToColorByVector();
-           _pdMapper->ScalarVisibilityOn();
-            double dataRange[2];
-            _dataSet->getVectorMagnitudeRange(dataRange);
-            _lut->SetRange(dataRange);
+#endif
+            if (_lut != NULL) {
+                _lut->SetVectorModeToMagnitude();
+                _lut->SetRange(_vectorMagnitudeRange);
+            }
         }
             break;
         case COLOR_BY_SCALAR: {
+#ifdef HAVE_GLYPH3D_MAPPER
+            _glyphMapper->ScalarVisibilityOn();
+            _glyphMapper->SetScalarModeToDefault();
+#else
             _glyphGenerator->SetColorModeToColorByScalar();
-           _pdMapper->ScalarVisibilityOn();
-            double dataRange[2];
-            _dataSet->getDataRange(dataRange);
-            _lut->SetRange(dataRange);
+            _pdMapper->ScalarVisibilityOn();
+#endif
+            if (_lut != NULL) {
+                _lut->SetRange(_dataRange);
+            }
         }
             break;
         case COLOR_CONSTANT:
         default:
+#ifdef HAVE_GLYPH3D_MAPPER
+            _glyphMapper->ScalarVisibilityOff();
+#else
             _pdMapper->ScalarVisibilityOff();
-        }
-        _pdMapper->Update();
-    }
+#endif
+        }
+     }
 }
 
@@ -270 +405 @@
 {
     _scaleFactor = scale;
+#ifdef HAVE_GLYPH3D_MAPPER
+    if (_glyphMapper != NULL) {
+        _glyphMapper->SetScaleFactor(_scaleFactor * _dataScale);
+    }
+#else
     if (_glyphGenerator != NULL) {
-        _glyphGenerator->SetScaleFactor(scale);
-        _pdMapper->Update();
-    }
-}
-
-/**
- * \brief Get the VTK colormap lookup table in use
- */
-vtkLookupTable *Glyphs::getLookupTable()
-{ 
-    return _lut;
+        _glyphGenerator->SetScaleFactor(_scaleFactor * _dataScale);
+    }
+#endif
+}
+
+void Glyphs::updateRanges(bool useCumulative,
+                          double scalarRange[2],
+                          double vectorMagnitudeRange[2],
+                          double vectorComponentRange[3][2])
+{
+    if (useCumulative) {
+        _dataRange[0] = scalarRange[0];
+        _dataRange[1] = scalarRange[1];
+        _vectorMagnitudeRange[0] = vectorMagnitudeRange[0];
+        _vectorMagnitudeRange[1] = vectorMagnitudeRange[1];
+        for (int i = 0; i < 3; i++) {
+            _vectorComponentRange[i][0] = vectorComponentRange[i][0];
+            _vectorComponentRange[i][1] = vectorComponentRange[i][1];
+        }
+    } else {
+        _dataSet->getScalarRange(_dataRange);
+        _dataSet->getVectorRange(_vectorMagnitudeRange);
+        for (int i = 0; i < 3; i++) {
+            _dataSet->getVectorRange(_vectorComponentRange[i], i);
+        }
+    }
+
+    // Need to update color map ranges and/or active vector field
+    setColorMode(_colorMode);
+    setScalingMode(_scalingMode);
+}
+
+/**
+ * \brief Called when the color map has been edited
+ */
+void Glyphs::updateColorMap()
+{
+    setColorMap(_colorMap);
 }
 
@@ -287 +454 @@
  * \brief Associate a colormap lookup table with the DataSet
  */
-void Glyphs::setLookupTable(vtkLookupTable *lut)
-{
-    if (lut == NULL) {
+void Glyphs::setColorMap(ColorMap *cmap)
+{
+    if (cmap == NULL)
+        return;
+
+    _colorMap = cmap;
+ 
+    if (_lut == NULL) {
         _lut = vtkSmartPointer<vtkLookupTable>::New();
-    } else {
-        _lut = lut;
-    }
+#ifdef HAVE_GLYPH3D_MAPPER
+        if (_glyphMapper != NULL) {
+            _glyphMapper->UseLookupTableScalarRangeOn();
+            _glyphMapper->SetLookupTable(_lut);
+        }
+#else
+        if (_pdMapper != NULL) {
+            _pdMapper->UseLookupTableScalarRangeOn();
+            _pdMapper->SetLookupTable(_lut);
+        }
+#endif
+    }
+
+    _lut->DeepCopy(cmap->getLookupTable());
 
     switch (_colorMode) {
-    case COLOR_BY_VECTOR: {
-        double dataRange[2];
-        _dataSet->getVectorMagnitudeRange(dataRange);
-        _lut->SetRange(dataRange);
-    }
+    case COLOR_BY_VECTOR_MAGNITUDE:
+        _lut->SetRange(_vectorMagnitudeRange);
+        _lut->SetVectorModeToMagnitude();
         break;
     case COLOR_BY_SCALAR:
-    default: {
-        double dataRange[2];
-        _dataSet->getDataRange(dataRange);
-        _lut->SetRange(dataRange);
-    }
-        break;
-    }
-
-    if (_pdMapper != NULL) {
-        _pdMapper->SetLookupTable(_lut);
+    default:
+        _lut->SetRange(_dataRange);
+        break;
     }
 }
@@ -323 +497 @@
 void Glyphs::setClippingPlanes(vtkPlaneCollection *planes)
 {
+#ifdef HAVE_GLYPH3D_MAPPER
+    if (_glyphMapper != NULL) {
+        _glyphMapper->SetClippingPlanes(planes);
+    }
+#else
     if (_pdMapper != NULL) {
         _pdMapper->SetClippingPlanes(planes);
     }
-}
+#endif
+}

branches/blt4/packages/vizservers/vtkvis/RpGlyphs.h

@@ -14 +14 @@
 #include <vtkProp.h>
 #include <vtkActor.h>
+#ifdef HAVE_GLYPH3D_MAPPER
+#include <vtkGlyph3DMapper.h>
+#else
 #include <vtkGlyph3D.h>
+#endif
 #include <vtkLookupTable.h>
 #include <vtkPlaneCollection.h>
@@ -27 +31 @@
  * \brief Oriented and scaled 3D glyph shapes
  *
- * The DataSet must be a PolyData point set
- * with vectors and/or scalars
+ * The DataSet must have vectors and/or scalars
  */
 class Glyphs : public VtkGraphicsObject {
@@ -39 +42 @@
         DODECAHEDRON,
         ICOSAHEDRON,
+        LINE,
         OCTAHEDRON,
         SPHERE,
@@ -45 +49 @@
     enum ScalingMode {
         SCALE_BY_SCALAR,
-        SCALE_BY_VECTOR,
+        SCALE_BY_VECTOR_MAGNITUDE,
         SCALE_BY_VECTOR_COMPONENTS,
         SCALING_OFF
     };
     enum ColorMode {
-        COLOR_BY_SCALE,
         COLOR_BY_SCALAR,
-        COLOR_BY_VECTOR,
+        COLOR_BY_VECTOR_MAGNITUDE,
         COLOR_CONSTANT
     };
 
-    Glyphs();
+    Glyphs(GlyphShape shape);
     virtual ~Glyphs();
 
@@ -64 +67 @@
     }
 
+    virtual void setDataSet(DataSet *dataSet,
+                            bool useCumulative,
+                            double scalarRange[2],
+                            double vectorMagnitudeRange[2],
+                            double vectorComponentRange[3][2]);
+
     virtual void setClippingPlanes(vtkPlaneCollection *planes);
 
     void setScalingMode(ScalingMode mode);
+
+    void setNormalizeScale(bool normalize);
 
     void setColorMode(ColorMode mode);
@@ -74 +85 @@
     void setScaleFactor(double scale);
 
-    void setLookupTable(vtkLookupTable *lut);
+    void setColorMap(ColorMap *colorMap);
 
-    vtkLookupTable *getLookupTable();
+    /**
+     * \brief Return the ColorMap in use
+     */
+    ColorMap *getColorMap()
+    {
+        return _colorMap;
+    }
+
+    void updateColorMap();
+
+    virtual void updateRanges(bool useCumulative,
+                              double scalarRange[2],
+                              double vectorMagnitudeRange[2],
+                              double vectorComponentRange[3][2]);
 
 private:
+    Glyphs();
     virtual void update();
+    static inline double min2(double a, double b)
+    {
+        return ((a < b) ? a : b);
+    }
+    static inline double max2(double a, double b)
+    {
+        return ((a > b) ? a : b);
+    }
 
     GlyphShape _glyphShape;
+    ScalingMode _scalingMode;
+    double _dataScale;
     double _scaleFactor;
+    bool _normalizeScale;
     ColorMode _colorMode;
+    ColorMap *_colorMap;
+    double _vectorMagnitudeRange[2];
+    double _vectorComponentRange[3][2];
 
     vtkSmartPointer<vtkLookupTable> _lut;
+    vtkSmartPointer<vtkPolyDataAlgorithm> _glyphSource;
+#ifdef HAVE_GLYPH3D_MAPPER
+    vtkSmartPointer<vtkGlyph3DMapper> _glyphMapper;
+#else
     vtkSmartPointer<vtkGlyph3D> _glyphGenerator;
-    vtkSmartPointer<vtkPolyDataAlgorithm> _glyphSource;
     vtkSmartPointer<vtkPolyDataMapper> _pdMapper;
+#endif
 };
 

branches/blt4/packages/vizservers/vtkvis/RpHeightMap.cpp

@@ -18 +18 @@
 #include <vtkImageData.h>
 #include <vtkLookupTable.h>
+#include <vtkTransform.h>
 #include <vtkDelaunay2D.h>
 #include <vtkDelaunay3D.h>
-#include <vtkProbeFilter.h>
 #include <vtkGaussianSplatter.h>
 #include <vtkExtractVOI.h>
 #include <vtkDataSetSurfaceFilter.h>
 #include <vtkContourFilter.h>
+#include <vtkStripper.h>
 #include <vtkWarpScalar.h>
 #include <vtkPropAssembly.h>
+#include <vtkCutter.h>
+#include <vtkPlane.h>
 
 #include "RpHeightMap.h"
@@ -35 +38 @@
 #define MESH_POINT_CLOUDS
 
-HeightMap::HeightMap() :
+HeightMap::HeightMap(int numContours, double heightScale) :
     VtkGraphicsObject(),
-    _numContours(0),
+    _numContours(numContours),
+    _colorMap(NULL),
     _contourEdgeWidth(1.0),
-    _warpScale(1.0),
+    _warpScale(heightScale),
     _sliceAxis(Z_AXIS),
     _pipelineInitialized(false)
 {
-    _dataRange[0] = 0.0;
-    _dataRange[1] = 1.0;
+    _contourEdgeColor[0] = 1.0f;
+    _contourEdgeColor[1] = 0.0f;
+    _contourEdgeColor[2] = 0.0f;
+}
+
+HeightMap::HeightMap(const std::vector<double>& contours, double heightScale) :
+    VtkGraphicsObject(),
+    _numContours(contours.size()),
+    _contours(contours),
+    _colorMap(NULL),
+    _contourEdgeWidth(1.0),
+    _warpScale(heightScale),
+    _sliceAxis(Z_AXIS),
+    _pipelineInitialized(false)
+{
     _contourEdgeColor[0] = 1.0f;
     _contourEdgeColor[1] = 0.0f;
@@ -60 +77 @@
 }
 
-/**
- * \brief Specify input DataSet with scalars to colormap
- *
- * Currently the DataSet must be image data (2D uniform grid)
- */
-void HeightMap::setDataSet(DataSet *dataSet)
+void HeightMap::setDataSet(DataSet *dataSet,
+                           bool useCumulative,
+                           double scalarRange[2],
+                           double vectorMagnitudeRange[2],
+                           double vectorComponentRange[3][2])
 {
     if (_dataSet != dataSet) {
@@ -71 +87 @@
 
         if (_dataSet != NULL) {
-            double dataRange[2];
-            _dataSet->getDataRange(dataRange);
-            _dataRange[0] = dataRange[0];
-            _dataRange[1] = dataRange[1];
+            if (useCumulative) {
+                _dataRange[0] = scalarRange[0];
+                _dataRange[1] = scalarRange[1];
+            } else {
+                dataSet->getScalarRange(_dataRange);
+            }
 
             // Compute a data scaling factor to make maximum
@@ -120 +138 @@
         _contourActor = vtkSmartPointer<vtkActor>::New();
         _contourActor->GetProperty()->SetOpacity(_opacity);
+        _contourActor->GetProperty()->SetColor(_contourEdgeColor[0],
+                                               _contourEdgeColor[1],
+                                               _contourEdgeColor[2]);
         _contourActor->GetProperty()->SetEdgeColor(_contourEdgeColor[0],
                                                    _contourEdgeColor[1],
                                                    _contourEdgeColor[2]);
         _contourActor->GetProperty()->SetLineWidth(_contourEdgeWidth);
-        _contourActor->GetProperty()->EdgeVisibilityOn();
+        _contourActor->GetProperty()->EdgeVisibilityOff();
         _contourActor->GetProperty()->SetAmbient(.2);
         _contourActor->GetProperty()->LightingOff();
+    }
+    if (_prop == NULL) {
+        _prop = vtkSmartPointer<vtkAssembly>::New();
+        getAssembly()->AddPart(_dsActor);
+        getAssembly()->AddPart(_contourActor);
     }
 }
@@ -150 +176 @@
     if (_dsMapper == NULL) {
         _dsMapper = vtkSmartPointer<vtkDataSetMapper>::New();
+        // Map scalars through lookup table regardless of type
+        _dsMapper->SetColorModeToMapScalars();
     }
 
@@ -179 +207 @@
                 pd->GetNumberOfStrips() == 0) {
                 // DataSet is a point cloud
-                if (_dataSet->is2D()) {
+                DataSet::PrincipalPlane plane;
+                double offset;
+                if (_dataSet->is2D(&plane, &offset)) {
 #ifdef MESH_POINT_CLOUDS
                     // Result of Delaunay2D is a PolyData
                     vtkSmartPointer<vtkDelaunay2D> mesher = vtkSmartPointer<vtkDelaunay2D>::New();
+                    if (plane == DataSet::PLANE_ZY) {
+                        vtkSmartPointer<vtkTransform> trans = vtkSmartPointer<vtkTransform>::New();
+                        trans->RotateWXYZ(90, 0, 1, 0);
+                        if (offset != 0.0) {
+                            trans->Translate(-offset, 0, 0);
+                        }
+                        mesher->SetTransform(trans);
+                        _sliceAxis = X_AXIS;
+                    } else if (plane == DataSet::PLANE_XZ) {
+                        vtkSmartPointer<vtkTransform> trans = vtkSmartPointer<vtkTransform>::New();
+                        trans->RotateWXYZ(-90, 1, 0, 0);
+                        if (offset != 0.0) {
+                            trans->Translate(0, -offset, 0);
+                        }
+                        mesher->SetTransform(trans);
+                        _sliceAxis = Y_AXIS;
+                    } else if (offset != 0.0) {
+                        // XY with Z offset
+                        vtkSmartPointer<vtkTransform> trans = vtkSmartPointer<vtkTransform>::New();
+                        trans->Translate(0, 0, -offset);
+                        mesher->SetTransform(trans);
+                    }
                     mesher->SetInput(pd);
                     vtkAlgorithmOutput *warpOutput = initWarp(mesher->GetOutputPort());
@@ -190 +242 @@
                     if (_pointSplatter == NULL)
                         _pointSplatter = vtkSmartPointer<vtkGaussianSplatter>::New();
+                    if (_volumeSlicer == NULL)
+                        _volumeSlicer = vtkSmartPointer<vtkExtractVOI>::New();
                     _pointSplatter->SetInput(pd);
                     int dims[3];
                     _pointSplatter->GetSampleDimensions(dims);
                     TRACE("Sample dims: %d %d %d", dims[0], dims[1], dims[2]);
-                    dims[2] = 3;
+                    if (plane == DataSet::PLANE_ZY) {
+                        dims[0] = 3;
+                        _volumeSlicer->SetVOI(1, 1, 0, dims[1]-1, 0, dims[1]-1);
+                        _sliceAxis = X_AXIS;
+                    } else if (plane == DataSet::PLANE_XZ) {
+                        dims[1] = 3;
+                        _volumeSlicer->SetVOI(0, dims[0]-1, 1, 1, 0, dims[2]-1);
+                        _sliceAxis = Y_AXIS;
+                    } else {
+                        dims[2] = 3;
+                        _volumeSlicer->SetVOI(0, dims[0]-1, 0, dims[1]-1, 1, 1);
+                    }
                     _pointSplatter->SetSampleDimensions(dims);
                     double bounds[6];
@@ -203 +268 @@
                           bounds[2], bounds[3],
                           bounds[4], bounds[5]);
-                    if (_volumeSlicer == NULL)
-                        _volumeSlicer = vtkSmartPointer<vtkExtractVOI>::New();
                     _volumeSlicer->SetInputConnection(_pointSplatter->GetOutputPort());
-                    _volumeSlicer->SetVOI(0, dims[0]-1, 0, dims[1]-1, 1, 1);
                     _volumeSlicer->SetSampleRate(1, 1, 1);
                     vtkSmartPointer<vtkDataSetSurfaceFilter> gf = vtkSmartPointer<vtkDataSetSurfaceFilter>::New();
@@ -227 +289 @@
                     mesher->GetOutput()->GetBounds(bounds);
                     // Sample a plane within the grid bounding box
-                    if (_probeFilter == NULL)
-                        _probeFilter = vtkSmartPointer<vtkProbeFilter>::New();
-                    _probeFilter->SetSourceConnection(mesher->GetOutputPort());
-                    vtkSmartPointer<vtkImageData> imageData = vtkSmartPointer<vtkImageData>::New();
-                    int xdim = 256;
-                    int ydim = 256;
-                    int zdim = 1;
-                    imageData->SetDimensions(xdim, ydim, zdim);
-                    imageData->SetOrigin(bounds[0], bounds[2], bounds[4] + (bounds[5]-bounds[4])/2.);
-                    imageData->SetSpacing((bounds[1]-bounds[0])/((double)(xdim-1)), 
-                                          (bounds[3]-bounds[2])/((double)(ydim-1)),
-                                          0);
-                    _probeFilter->SetInput(imageData);
+                    vtkSmartPointer<vtkCutter> cutter = vtkSmartPointer<vtkCutter>::New();
+                    cutter->SetInputConnection(mesher->GetOutputPort());
+                    if (_cutPlane == NULL) {
+                        _cutPlane = vtkSmartPointer<vtkPlane>::New();
+                    }
+                    _cutPlane->SetNormal(0, 0, 1);
+                    _cutPlane->SetOrigin(0,
+                                         0,
+                                         bounds[4] + (bounds[5]-bounds[4])/2.);
+                    cutter->SetCutFunction(_cutPlane);
                     vtkSmartPointer<vtkDataSetSurfaceFilter> gf = vtkSmartPointer<vtkDataSetSurfaceFilter>::New();
                     gf->UseStripsOn();
-                    gf->SetInputConnection(_probeFilter->GetOutputPort());
+                    gf->SetInputConnection(cutter->GetOutputPort());
 #else
                     if (_pointSplatter == NULL)
@@ -300 +359 @@
                 _volumeSlicer->SetSampleRate(1, 1, 1);
                 gf->SetInputConnection(_volumeSlicer->GetOutputPort());
-            } else if (imageData == NULL) {
-                // structured grid, unstructured grid, or rectilinear grid
+            } else if (!_dataSet->is2D() && imageData == NULL) {
+                // 3D structured grid, unstructured grid, or rectilinear grid
                 double bounds[6];
                 ds->GetBounds(bounds);
                 // Sample a plane within the grid bounding box
-                if (_probeFilter == NULL)
-                    _probeFilter = vtkSmartPointer<vtkProbeFilter>::New();
-                _probeFilter->SetSource(ds);
-                vtkSmartPointer<vtkImageData> imageData = vtkSmartPointer<vtkImageData>::New();
-                int xdim = 256;
-                int ydim = 256;
-                int zdim = 1;
-                imageData->SetDimensions(xdim, ydim, zdim);
-                imageData->SetOrigin(bounds[0], bounds[2], bounds[4] + (bounds[5]-bounds[4])/2.);
-                imageData->SetSpacing((bounds[1]-bounds[0])/((double)(xdim-1)), 
-                                      (bounds[3]-bounds[2])/((double)(ydim-1)),
-                                      0);
-                _probeFilter->SetInput(imageData);
-                gf->SetInputConnection(_probeFilter->GetOutputPort());
+                vtkSmartPointer<vtkCutter> cutter = vtkSmartPointer<vtkCutter>::New();
+                cutter->SetInput(ds);
+                if (_cutPlane == NULL) {
+                    _cutPlane = vtkSmartPointer<vtkPlane>::New();
+                }
+                _cutPlane->SetNormal(0, 0, 1);
+                _cutPlane->SetOrigin(0,
+                                     0,
+                                     bounds[4] + (bounds[5]-bounds[4])/2.);
+                cutter->SetCutFunction(_cutPlane);
+                gf->SetInputConnection(cutter->GetOutputPort());
             } else {
-                // 2D image data
+                // 2D data
                 gf->SetInput(ds);
             }
@@ -331 +387 @@
     _pipelineInitialized = true;
 
-    if (ds->GetPointData() == NULL ||
-        ds->GetPointData()->GetScalars() == NULL) {
-        ERROR("No scalar point data in dataset %s", _dataSet->getName().c_str());
-        if (_lut == NULL) {
-            _lut = vtkSmartPointer<vtkLookupTable>::New();
-        }
-    } else {
-        vtkLookupTable *lut = ds->GetPointData()->GetScalars()->GetLookupTable();
-        TRACE("Data set scalars lookup table: %p\n", lut);
-        if (_lut == NULL) {
-            if (lut)
-                _lut = lut;
-            else {
-                _lut = vtkSmartPointer<vtkLookupTable>::New();
-            }
-        }
-    }
-
-    _lut->SetRange(_dataRange);
+    if (_lut == NULL) {
+        setColorMap(ColorMap::getDefault());
+    }
+    //_dsMapper->InterpolateScalarsBeforeMappingOn();
 
     initProp();
-
-    _dsMapper->SetColorModeToMapScalars();
-    _dsMapper->UseLookupTableScalarRangeOn();
-    _dsMapper->SetLookupTable(_lut);
-    //_dsMapper->InterpolateScalarsBeforeMappingOn();
 
     _contourFilter->ComputeNormalsOff();
@@ -381 +417 @@
     if (_contourMapper == NULL) {
         _contourMapper = vtkSmartPointer<vtkPolyDataMapper>::New();
+        _contourMapper->ScalarVisibilityOff();
         _contourMapper->SetResolveCoincidentTopologyToPolygonOffset();
-        _contourMapper->SetInputConnection(_contourFilter->GetOutputPort());
+        vtkSmartPointer<vtkStripper> stripper = vtkSmartPointer<vtkStripper>::New();
+        stripper->SetInputConnection(_contourFilter->GetOutputPort());
+        _contourMapper->SetInputConnection(stripper->GetOutputPort());
         _contourActor->SetMapper(_contourMapper);
     }
 
     _dsActor->SetMapper(_dsMapper);
-
-    if (_prop == NULL) {
-        _prop = vtkSmartPointer<vtkAssembly>::New();
-        getAssembly()->AddPart(_dsActor);
-        getAssembly()->AddPart(_contourActor);
-    }
 
     _dsMapper->Update();
@@ -498 +531 @@
 
     if (_volumeSlicer == NULL &&
-        _probeFilter == NULL) {
+        _cutPlane == NULL) {
         WARN("Called before update() or DataSet is not a volume");
         return;
-    }
-
-    int dims[3];
-
-    if (_pointSplatter != NULL) {
-        _pointSplatter->GetSampleDimensions(dims);
-    } else {
-        vtkImageData *imageData = vtkImageData::SafeDownCast(_dataSet->getVtkDataSet());
-        if (imageData == NULL) {
-            if (_probeFilter != NULL) {
-                imageData = vtkImageData::SafeDownCast(_probeFilter->GetInput());
-                if (imageData == NULL) {
-                    ERROR("Couldn't get probe filter input image");
-                    return;
-                }
-            } else {
-                ERROR("Not a volume data set");
-                return;
-            }
-        }
-        imageData->GetDimensions(dims);
     }
 
@@ -542 +554 @@
     }
 
-    if (_probeFilter != NULL) {
-        vtkImageData *imageData = vtkImageData::SafeDownCast(_probeFilter->GetInput());
+    if (_cutPlane != NULL) {
         double bounds[6];
-        assert(vtkDataSet::SafeDownCast(_probeFilter->GetSource()) != NULL);
-        vtkDataSet::SafeDownCast(_probeFilter->GetSource())->GetBounds(bounds);
-        int dim = 256;
-
+        _dataSet->getBounds(bounds);
         switch (axis) {
         case X_AXIS:
-            imageData->SetDimensions(1, dim, dim);
-            imageData->SetOrigin(bounds[0] + (bounds[1]-bounds[0])*ratio, bounds[2], bounds[4]);
-            imageData->SetSpacing(0,
-                                  (bounds[3]-bounds[2])/((double)(dim-1)), 
-                                  (bounds[5]-bounds[4])/((double)(dim-1)));
+            _cutPlane->SetNormal(1, 0, 0);
+            _cutPlane->SetOrigin(bounds[0] + (bounds[1]-bounds[0]) * ratio,
+                                 0,
+                                 0);
             break;
         case Y_AXIS:
-            imageData->SetDimensions(dim, 1, dim);
-            imageData->SetOrigin(bounds[0], bounds[2] + (bounds[3]-bounds[2])*ratio, bounds[4]);
-            imageData->SetSpacing((bounds[1]-bounds[0])/((double)(dim-1)), 
-                                  0,
-                                  (bounds[5]-bounds[4])/((double)(dim-1)));
+            _cutPlane->SetNormal(0, 1, 0);
+            _cutPlane->SetOrigin(0,
+                                 bounds[2] + (bounds[3]-bounds[2]) * ratio,
+                                 0);
             break;
         case Z_AXIS:
-            imageData->SetDimensions(dim, dim, 1);
-            imageData->SetOrigin(bounds[0], bounds[2], bounds[4] + (bounds[5]-bounds[4])*ratio);
-            imageData->SetSpacing((bounds[1]-bounds[0])/((double)(dim-1)), 
-                                  (bounds[3]-bounds[2])/((double)(dim-1)),
-                                  0);
+            _cutPlane->SetNormal(0, 0, 1);
+            _cutPlane->SetOrigin(0,
+                                 0,
+                                 bounds[4] + (bounds[5]-bounds[4]) * ratio);
             break;
         default:
@@ -576 +581 @@
         }
     } else {
+        int dims[3];
+        if (_pointSplatter != NULL) {
+            _pointSplatter->GetSampleDimensions(dims);
+        } else {
+            vtkImageData *imageData = vtkImageData::SafeDownCast(_dataSet->getVtkDataSet());
+            if (imageData == NULL) {
+                ERROR("Not a volume data set");
+                return;
+            }
+            imageData->GetDimensions(dims);
+        }
         int voi[6];
 
@@ -587 +603 @@
             break;
         case Y_AXIS:
-            voi[2] = voi[3] = (int)((dims[1]-1) * ratio);
             voi[0] = 0;
             voi[1] = dims[0]-1;
+            voi[2] = voi[3] = (int)((dims[1]-1) * ratio);
             voi[4] = 0;
             voi[5] = dims[2]-1;
             break;
         case Z_AXIS:
-            voi[4] = voi[5] = (int)((dims[2]-1) * ratio);
             voi[0] = 0;
             voi[1] = dims[0]-1;
             voi[2] = 0;
             voi[3] = dims[1]-1;
+            voi[4] = voi[5] = (int)((dims[2]-1) * ratio);
             break;
         default:
@@ -615 +631 @@
 
 /**
- * \brief Get the VTK colormap lookup table in use
- */
-vtkLookupTable *HeightMap::getLookupTable()
-{ 
-    return _lut;
+ * \brief Called when the color map has been edited
+ */
+void HeightMap::updateColorMap()
+{
+    setColorMap(_colorMap);
 }
 
@@ -625 +641 @@
  * \brief Associate a colormap lookup table with the DataSet
  */
-void HeightMap::setLookupTable(vtkLookupTable *lut)
-{
-    if (lut == NULL) {
+void HeightMap::setColorMap(ColorMap *cmap)
+{
+    if (cmap == NULL)
+        return;
+
+    _colorMap = cmap;
+ 
+    if (_lut == NULL) {
         _lut = vtkSmartPointer<vtkLookupTable>::New();
-    } else {
-        _lut = lut;
-    }
-
-    if (_dsMapper != NULL) {
-        _dsMapper->UseLookupTableScalarRangeOn();
-        _dsMapper->SetLookupTable(_lut);
+        if (_dsMapper != NULL) {
+            _dsMapper->UseLookupTableScalarRangeOn();
+            _dsMapper->SetLookupTable(_lut);
+        }
+    }
+
+    _lut->DeepCopy(cmap->getLookupTable());
+    _lut->SetRange(_dataRange);
+}
+
+void HeightMap::updateRanges(bool useCumulative,
+                             double scalarRange[2],
+                             double vectorMagnitudeRange[2],
+                             double vectorComponentRange[3][2])
+{
+    if (useCumulative) {
+        _dataRange[0] = scalarRange[0];
+        _dataRange[1] = scalarRange[1];
+    } else if (_dataSet != NULL) {
+        _dataSet->getScalarRange(_dataRange);
+    }
+
+    if (_lut != NULL) {
+        _lut->SetRange(_dataRange);
+    }
+
+    if (_contours.empty() && _numContours > 0) {
+        // Need to recompute isovalues
+        update();
     }
 }
@@ -644 +687 @@
  * Will override any existing contours
  */
-void  HeightMap::setContours(int numContours)
+void HeightMap::setNumContours(int numContours)
 {
     _contours.clear();
     _numContours = numContours;
-
-    if (_dataSet != NULL) {
-        double dataRange[2];
-        _dataSet->getDataRange(dataRange);
-        _dataRange[0] = dataRange[0];
-        _dataRange[1] = dataRange[1];
-    }
-
-    update();
-}
-
-/**
- * \brief Specify number of evenly spaced contour lines to render
- * between the given range (including range endpoints)
- *
- * Will override any existing contours
- */
-void  HeightMap::setContours(int numContours, double range[2])
-{
-    _contours.clear();
-    _numContours = numContours;
-
-    _dataRange[0] = range[0];
-    _dataRange[1] = range[1];
 
     update();
@@ -681 +700 @@
  * Will override any existing contours
  */
-void  HeightMap::setContourList(const std::vector<double>& contours)
+void HeightMap::setContourList(const std::vector<double>& contours)
 {
     _contours = contours;
@@ -692 +711 @@
  * \brief Get the number of contours
  */
-int  HeightMap::getNumContours() const
+int HeightMap::getNumContours() const
 {
     return _numContours;
@@ -701 +720 @@
  * was specified in place of a list)
  */
-const std::vector<double>&  HeightMap::getContourList() const
+const std::vector<double>& HeightMap::getContourList() const
 {
     return _contours;
@@ -726 +745 @@
 
 /**
+ * \brief Turn on/off rendering of colormaped surface
+ */
+void HeightMap::setContourSurfaceVisibility(bool state)
+{
+    if (_dsActor != NULL) {
+        _dsActor->SetVisibility((state ? 1 : 0));
+    }
+}
+
+/**
  * \brief Turn on/off rendering of contour isolines
  */
-void HeightMap::setContourVisibility(bool state)
+void HeightMap::setContourLineVisibility(bool state)
 {
     if (_contourActor != NULL) {
@@ -765 +794 @@
     _contourEdgeColor[1] = color[1];
     _contourEdgeColor[2] = color[2];
-    if (_contourActor != NULL)
+    if (_contourActor != NULL) {
+        _contourActor->GetProperty()->SetColor(_contourEdgeColor[0],
+                                               _contourEdgeColor[1],
+                                               _contourEdgeColor[2]);
         _contourActor->GetProperty()->SetEdgeColor(_contourEdgeColor[0],
                                                    _contourEdgeColor[1],
                                                    _contourEdgeColor[2]);
+    }
 }
 

branches/blt4/packages/vizservers/vtkvis/RpHeightMap.h

@@ -12 +12 @@
 #include <vtkAlgorithmOutput.h>
 #include <vtkContourFilter.h>
-#include <vtkProbeFilter.h>
 #include <vtkLookupTable.h>
 #include <vtkDataSetMapper.h>
@@ -22 +21 @@
 #include <vtkAssembly.h>
 #include <vtkPolyData.h>
+#include <vtkPlane.h>
 
 #include <vector>
 
+#include "ColorMap.h"
 #include "RpVtkGraphicsObject.h"
 
@@ -41 +42 @@
     };
 
-    HeightMap();
+    HeightMap(int numContours, double heightScale = 1.0);
+
+    HeightMap(const std::vector<double>& contours, double heightScale = 1.0);
+
     virtual ~HeightMap();
 
@@ -49 +53 @@
     }
 
-    virtual void setDataSet(DataSet *dataset);
+    virtual void setDataSet(DataSet *dataset,
+                            bool useCumulative,
+                            double scalarRange[2],
+                            double vectorMagnitudeRange[2],
+                            double vectorComponentRange[3][2]);
 
     virtual void setLighting(bool state);
@@ -65 +73 @@
     void setHeightScale(double scale);
 
-    void setContours(int numContours);
-
-    void setContours(int numContours, double range[2]);
+    void setNumContours(int numContours);
 
     void setContourList(const std::vector<double>& contours);
@@ -75 +81 @@
     const std::vector<double>& getContourList() const;
 
-    void setLookupTable(vtkLookupTable *lut);
+    void setColorMap(ColorMap *colorMap);
 
-    vtkLookupTable *getLookupTable();
+    /**
+     * \brief Return the ColorMap in use
+     */
+    ColorMap *getColorMap()
+    {
+        return _colorMap;
+    }
 
-    void setContourVisibility(bool state);
+    void updateColorMap();
+
+    virtual void updateRanges(bool useCumulative,
+                              double scalarRange[2],
+                              double vectorMagnitudeRange[2],
+                              double vectorComponentRange[3][2]);
+
+    void setContourLineVisibility(bool state);
+
+    void setContourSurfaceVisibility(bool state);
 
     void setContourEdgeColor(float color[3]);
@@ -86 +107 @@
 
 private:
+    HeightMap();
+
     virtual void initProp();
     virtual void update();
@@ -94 +117 @@
     int _numContours;
     std::vector<double> _contours;
-    double _dataRange[2];
+    ColorMap *_colorMap;
 
-    float _edgeColor[3];
     float _contourEdgeColor[3];
-    float _edgeWidth;
     float _contourEdgeWidth;
     double _warpScale;
@@ -110 +131 @@
     vtkSmartPointer<vtkPolyDataMapper> _contourMapper;
     vtkSmartPointer<vtkGaussianSplatter> _pointSplatter;
-    vtkSmartPointer<vtkProbeFilter> _probeFilter;
     vtkSmartPointer<vtkExtractVOI> _volumeSlicer;
+    vtkSmartPointer<vtkPlane> _cutPlane;
     vtkSmartPointer<vtkWarpScalar> _warp;
     vtkSmartPointer<vtkActor> _dsActor;

branches/blt4/packages/vizservers/vtkvis/RpLIC.cpp

@@ -18 +18 @@
 #include <vtkPainterPolyDataMapper.h>
 #include <vtkDataSetSurfaceFilter.h>
+#include <vtkCutter.h>
+#include <vtkImageMask.h>
+#include <vtkImageCast.h>
 
 #include "RpLIC.h"
@@ -27 +30 @@
 LIC::LIC() :
     VtkGraphicsObject(),
-    _sliceAxis(Z_AXIS)
+    _sliceAxis(Z_AXIS),
+    _colorMap(NULL)
 {
 }
@@ -56 +60 @@
 
     vtkDataSet *ds = _dataSet->getVtkDataSet();
-
-    double dataRange[2];
-    _dataSet->getDataRange(dataRange);
-
-    TRACE("DataSet type: %s, range: %g - %g", _dataSet->getVtkType(),
-          dataRange[0], dataRange[1]);
 
     vtkSmartPointer<vtkCellDataToPointData> cellToPtData;
@@ -111 +109 @@
         }
 
+        // Need to convert to vtkImageData
         double bounds[6];
         ds->GetBounds(bounds);
@@ -121 +120 @@
         if (ySize < xSize && ySize < zSize)
             minDir = 1;
-        // Sample a plane within the grid bounding box
         if (_probeFilter == NULL)
             _probeFilter = vtkSmartPointer<vtkProbeFilter>::New();
-        _probeFilter->SetSource(ds);
+
+        if (!_dataSet->is2D()) {
+            // Sample a plane within the grid bounding box
+            vtkSmartPointer<vtkCutter> cutter = vtkSmartPointer<vtkCutter>::New();
+            if (_cutPlane == NULL) {
+                _cutPlane = vtkSmartPointer<vtkPlane>::New();
+            }
+            if (minDir == 0) {
+                _cutPlane->SetNormal(1, 0, 0);
+                _cutPlane->SetOrigin(bounds[0] + (bounds[1]-bounds[0])/2.,
+                                     0,
+                                     0);
+            } else if (minDir == 1) {
+                _cutPlane->SetNormal(0, 1, 0);
+                _cutPlane->SetOrigin(0,
+                                     bounds[2] + (bounds[3]-bounds[2])/2.,
+                                     0);
+            } else {
+                _cutPlane->SetNormal(0, 0, 1);
+                _cutPlane->SetOrigin(0,
+                                     0,
+                                     bounds[4] + (bounds[5]-bounds[4])/2.);
+            }
+            cutter->SetInput(ds);
+            cutter->SetCutFunction(_cutPlane);
+            _probeFilter->SetSourceConnection(cutter->GetOutputPort());
+        } else {
+            _probeFilter->SetSource(ds);
+        }
+
         vtkSmartPointer<vtkImageData> imageData = vtkSmartPointer<vtkImageData>::New();
         int xdim, ydim, zdim;
@@ -170 +197 @@
         if (_mapper == NULL) {
             _mapper = vtkSmartPointer<vtkDataSetMapper>::New();
-        }
-        _mapper->SetInputConnection(_lic->GetOutputPort());
+            _mapper->SetColorModeToMapScalars();
+        }
+        _lic->Update();
+        vtkSmartPointer<vtkImageCast> cast = vtkSmartPointer<vtkImageCast>::New();
+        cast->SetInputConnection(_probeFilter->GetOutputPort());
+        cast->SetInputArrayToProcess(0, 0, 0, vtkDataObject::FIELD_ASSOCIATION_POINTS,
+                                     _probeFilter->GetValidPointMaskArrayName());
+        cast->SetOutputScalarTypeToUnsignedChar();
+        vtkSmartPointer<vtkImageMask> mask = vtkSmartPointer<vtkImageMask>::New();
+        mask->SetInputConnection(0, _lic->GetOutputPort());
+        mask->SetInputConnection(1, cast->GetOutputPort());
+        _mapper->SetInputConnection(mask->GetOutputPort());
     } else {
         // DataSet is a PolyData
@@ -189 +226 @@
     }
 
+    if (_lut == NULL) {
+        setColorMap(ColorMap::getGrayDefault());
+    }
+
     initProp();
     getActor()->SetMapper(_mapper);
@@ -244 +285 @@
         double bounds[6];
         assert(vtkDataSet::SafeDownCast(_probeFilter->GetSource()) != NULL);
-        vtkDataSet::SafeDownCast(_probeFilter->GetSource())->GetBounds(bounds);
+        _dataSet->getBounds(bounds);
         int dim = 128;
 
@@ -254 +295 @@
                                   (bounds[3]-bounds[2])/((double)(dim-1)), 
                                   (bounds[5]-bounds[4])/((double)(dim-1)));
+            if (_cutPlane != NULL) {
+                _cutPlane->SetNormal(1, 0, 0);
+                _cutPlane->SetOrigin(bounds[0] + (bounds[1]-bounds[0])*ratio, 0, 0);
+            }
             break;
         case Y_AXIS:
@@ -261 +306 @@
                                   0,
                                   (bounds[5]-bounds[4])/((double)(dim-1)));
+            if (_cutPlane != NULL) {
+                _cutPlane->SetNormal(0, 1, 0);
+                _cutPlane->SetOrigin(0, bounds[2] + (bounds[3]-bounds[2])*ratio, 0);
+            }
             break;
         case Z_AXIS:
@@ -268 +317 @@
                                   (bounds[3]-bounds[2])/((double)(dim-1)),
                                   0);
+            if (_cutPlane != NULL) {
+                _cutPlane->SetNormal(0, 0, 1);
+                _cutPlane->SetOrigin(0, 0, bounds[4] + (bounds[5]-bounds[4])*ratio);
+            }
             break;
         default:
@@ -306 +359 @@
     }
 
+    if (_lic != NULL)
+        _lic->Update();
+
     if (_mapper != NULL)
         _mapper->Update();
@@ -311 +367 @@
 
 /**
- * \brief Get the VTK colormap lookup table in use
+ * \brief Called when the color map has been edited
  */
-vtkLookupTable *LIC::getLookupTable()
-{ 
-    return _lut;
+void LIC::updateColorMap()
+{
+    setColorMap(_colorMap);
 }
 
@@ -321 +377 @@
  * \brief Associate a colormap lookup table with the DataSet
  */
-void LIC::setLookupTable(vtkLookupTable *lut)
-{
-    if (lut == NULL) {
+void LIC::setColorMap(ColorMap *cmap)
+{
+    if (cmap == NULL)
+        return;
+
+    _colorMap = cmap;
+ 
+    if (_lut == NULL) {
         _lut = vtkSmartPointer<vtkLookupTable>::New();
-    } else {
-        _lut = lut;
-    }
-
-    if (_mapper != NULL) {
-        _mapper->SetLookupTable(_lut);
+        if (_mapper != NULL) {
+            _mapper->UseLookupTableScalarRangeOff();
+            _mapper->SetLookupTable(_lut);
+        }
+    }
+
+    _lut->DeepCopy(cmap->getLookupTable());
+    _lut->SetRange(_dataRange);
+}
+
+void LIC::updateRanges(bool useCumulative,
+                       double scalarRange[2],
+                       double vectorMagnitudeRange[2],
+                       double vectorComponentRange[3][2])
+{
+    if (useCumulative) {
+        _dataRange[0] = scalarRange[0];
+        _dataRange[1] = scalarRange[1];
+    } else if (_dataSet != NULL) {
+        _dataSet->getScalarRange(_dataRange);
+    }
+
+    if (_lut != NULL) {
+        _lut->SetRange(_dataRange);
     }
 }

branches/blt4/packages/vizservers/vtkvis/RpLIC.h

@@ -18 +18 @@
 #include <vtkMapper.h>
 #include <vtkLookupTable.h>
+#include <vtkPlane.h>
 
+#include "ColorMap.h"
 #include "RpVtkGraphicsObject.h"
 
@@ -49 +51 @@
     void selectVolumeSlice(Axis axis, double ratio);
 
-    void setLookupTable(vtkLookupTable *lut);
+    void setColorMap(ColorMap *colorMap);
 
-    vtkLookupTable *getLookupTable();
+    /**
+     * \brief Return the ColorMap in use
+     */
+    ColorMap *getColorMap()
+    {
+        return _colorMap;
+    }
+
+    void updateColorMap();
+
+    virtual void updateRanges(bool useCumulative,
+                              double scalarRange[2],
+                              double vectorMagnitudeRange[2],
+                              double vectorComponentRange[3][2]);
 
 private:
@@ -58 +73 @@
 
     Axis _sliceAxis;
+    ColorMap *_colorMap;
 
     vtkSmartPointer<vtkLookupTable> _lut;
     vtkSmartPointer<vtkExtractVOI> _volumeSlicer;
     vtkSmartPointer<vtkProbeFilter> _probeFilter;
+    vtkSmartPointer<vtkPlane> _cutPlane;
     vtkSmartPointer<vtkImageDataLIC2D> _lic;
     vtkSmartPointer<vtkSurfaceLICPainter> _painter;

branches/blt4/packages/vizservers/vtkvis/RpMolecule.cpp

@@ -27 +27 @@
 Molecule::Molecule() :
     VtkGraphicsObject(),
-    _atomScaling(NO_ATOM_SCALING)
+    _atomScaling(NO_ATOM_SCALING),
+    _colorMap(NULL)
 {
     _faceCulling = true;
@@ -86 +87 @@
     vtkDataSet *ds = _dataSet->getVtkDataSet();
 
-    double dataRange[2];
-    _dataSet->getDataRange(dataRange);
-
-    if (ds->GetPointData() == NULL ||
-        ds->GetPointData()->GetScalars() == NULL) {
-        WARN("No scalar point data in dataset %s", _dataSet->getName().c_str());
-        if (_lut == NULL) {
-            _lut = vtkSmartPointer<vtkLookupTable>::New();
-            _lut->DeepCopy(ColorMap::getDefault()->getLookupTable());
-            _lut->SetRange(dataRange);
-        }
-    } else {
-        vtkLookupTable *lut = ds->GetPointData()->GetScalars()->GetLookupTable();
-        TRACE("Data set scalars lookup table: %p\n", lut);
-        if (_lut == NULL) {
-            if (lut) {
-                _lut = lut;
-                if (strcmp(ds->GetPointData()->GetScalars()->GetName(), "element") == 0) {
-                    double range[2];
-                    range[0] = 0;
-                    range[1] = NUM_ELEMENTS+1;
-                    _lut->SetRange(range);
-                } else {
-                    _lut->SetRange(dataRange);
-                }
-            } else {
-                if (strcmp(ds->GetPointData()->GetScalars()->GetName(), "element") == 0) {
-                    _lut = ColorMap::getElementDefault()->getLookupTable();
-                } else {
-                    _lut = vtkSmartPointer<vtkLookupTable>::New();
-                    _lut->DeepCopy(ColorMap::getDefault()->getLookupTable());
-                    _lut->SetRange(dataRange);
-                }
-            }
-        }
-    }
-
     if (_atomMapper == NULL) {
         _atomMapper = vtkSmartPointer<vtkPolyDataMapper>::New();
         _atomMapper->SetResolveCoincidentTopologyToPolygonOffset();
         _atomMapper->ScalarVisibilityOn();
-        _atomMapper->SetColorModeToMapScalars();
-        _atomMapper->UseLookupTableScalarRangeOn();
-        _atomMapper->SetLookupTable(_lut);
     }
     if (_bondMapper == NULL) {
@@ -135 +96 @@
         _bondMapper->SetResolveCoincidentTopologyToPolygonOffset();
         _bondMapper->ScalarVisibilityOn();
-        _bondMapper->SetColorModeToMapScalars();
-        _bondMapper->UseLookupTableScalarRangeOn();
-        _bondMapper->SetLookupTable(_lut);
+    }
+
+    if (_lut == NULL) {
+        if (ds->GetPointData() == NULL ||
+            ds->GetPointData()->GetScalars() == NULL ||
+            strcmp(ds->GetPointData()->GetScalars()->GetName(), "element") != 0) {
+            WARN("No element array in dataset %s", _dataSet->getName().c_str());
+            setColorMap(ColorMap::getDefault());
+        } else {
+            TRACE("Using element default colormap");
+            setColorMap(ColorMap::getElementDefault());
+        }
     }
 
@@ -197 +167 @@
 }
 
-/**
- * \brief Get the VTK colormap lookup table in use
- */
-vtkLookupTable *Molecule::getLookupTable()
-{ 
-    return _lut;
+void Molecule::updateRanges(bool useCumulative,
+                            double scalarRange[2],
+                            double vectorMagnitudeRange[2],
+                            double vectorComponentRange[3][2])
+{
+    if (useCumulative) {
+        _dataRange[0] = scalarRange[0];
+        _dataRange[1] = scalarRange[1];
+    } else if (_dataSet != NULL) {
+        _dataSet->getScalarRange(_dataRange);
+    }
+
+    if (_lut != NULL) {
+        vtkDataSet *ds = _dataSet->getVtkDataSet();
+        if (ds == NULL)
+            return;
+        if (ds->GetPointData() == NULL ||
+            ds->GetPointData()->GetScalars() == NULL ||
+            strcmp(ds->GetPointData()->GetScalars()->GetName(), "element") != 0) {
+            _lut->SetRange(_dataRange);
+        }
+    }
+}
+
+/**
+ * \brief Called when the color map has been edited
+ */
+void Molecule::updateColorMap()
+{
+    setColorMap(_colorMap);
 }
 
@@ -208 +202 @@
  * \brief Associate a colormap lookup table with the DataSet
  */
-void Molecule::setLookupTable(vtkLookupTable *lut)
-{
-    if (lut == NULL) {
+void Molecule::setColorMap(ColorMap *cmap)
+{
+    if (cmap == NULL)
+        return;
+
+    _colorMap = cmap;
+ 
+    if (_lut == NULL) {
         _lut = vtkSmartPointer<vtkLookupTable>::New();
-    } else {
-        _lut = lut;
-    }
-
-    if (_atomMapper != NULL) {
-        _atomMapper->UseLookupTableScalarRangeOn();
-        _atomMapper->SetLookupTable(_lut);
-    }
-    if (_bondMapper != NULL) {
-        _bondMapper->UseLookupTableScalarRangeOn();
-        _bondMapper->SetLookupTable(_lut);
+        if (_atomMapper != NULL) {
+            _atomMapper->UseLookupTableScalarRangeOn();
+            _atomMapper->SetLookupTable(_lut);
+        }
+        if (_bondMapper != NULL) {
+            _bondMapper->UseLookupTableScalarRangeOn();
+            _bondMapper->SetLookupTable(_lut);
+        }
+    }
+
+    _lut->DeepCopy(cmap->getLookupTable());
+    _lut->Modified();
+
+    // Element color maps need to retain their range
+    // Only set LUT range if we are not coloring by element
+    vtkDataSet *ds = _dataSet->getVtkDataSet();
+    if (ds == NULL)
+        return;
+    if (ds->GetPointData() == NULL ||
+        ds->GetPointData()->GetScalars() == NULL ||
+        strcmp(ds->GetPointData()->GetScalars()->GetName(), "element") != 0) {
+        _lut->SetRange(_dataRange);
     }
 }
@@ -284 +294 @@
 }
 
+/**
+ * \brief Add a scalar array to dataSet with sizes for the elements
+ * specified in the "element" scalar array
+ */
 void Molecule::addRadiusArray(vtkDataSet *dataSet, AtomScaling scaling)
 {
@@ -323 +337 @@
 }
 
+/**
+ * \brief Create a color map to map atomic numbers to element colors
+ */
 ColorMap *Molecule::createElementColorMap()
 {
-    ColorMap *elementLUT = new ColorMap("elementDefault");
+    ColorMap *elementCmap = new ColorMap("elementDefault");
     ColorMap::ControlPoint cp[NUM_ELEMENTS+1];
 
-    elementLUT->setNumberOfTableEntries(NUM_ELEMENTS+1);
+    elementCmap->setNumberOfTableEntries(NUM_ELEMENTS+1);
     for (int i = 0; i <= NUM_ELEMENTS; i++) {
         cp[i].value = i/((double)(NUM_ELEMENTS+1));
@@ -334 +351 @@
             cp[i].color[c] = ((double)g_elementColors[i][c])/255.;
         }
-        elementLUT->addControlPoint(cp[i]);
+        elementCmap->addControlPoint(cp[i]);
     }
     ColorMap::OpacityControlPoint ocp[2];
@@ -341 +358 @@
     ocp[1].value = 1.0;
     ocp[1].alpha = 1.0;
-    elementLUT->addOpacityControlPoint(ocp[0]);
-    elementLUT->addOpacityControlPoint(ocp[1]);
-    elementLUT->build();
+    elementCmap->addOpacityControlPoint(ocp[0]);
+    elementCmap->addOpacityControlPoint(ocp[1]);
+    elementCmap->build();
     double range[2];
     range[0] = 0;
     range[1] = NUM_ELEMENTS+1;
-    elementLUT->getLookupTable()->SetRange(range);
-
-    return elementLUT;
-}
+    elementCmap->getLookupTable()->SetRange(range);
+
+    return elementCmap;
+}

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

@@ -52 +52 @@
     virtual void setClippingPlanes(vtkPlaneCollection *planes);
 
-    void setLookupTable(vtkLookupTable *lut);
+    void setColorMap(ColorMap *colorMap);
 
-    vtkLookupTable *getLookupTable();
+    /**
+     * \brief Return the ColorMap in use
+     */
+    ColorMap *getColorMap()
+    {
+        return _colorMap;
+    }
+
+    void updateColorMap();
+
+    virtual void updateRanges(bool useCumulative,
+                              double scalarRange[2],
+                              double vectorMagnitudeRange[2],
+                              double vectorComponentRange[3][2]);
 
     void setAtomScaling(AtomScaling state);
@@ -71 +84 @@
 
     AtomScaling _atomScaling;
+    ColorMap *_colorMap;
 
     vtkSmartPointer<vtkLookupTable> _lut;

branches/blt4/packages/vizservers/vtkvis/RpPolyData.cpp

@@ -14 +14 @@
 #include <vtkActor.h>
 #include <vtkProperty.h>
+#include <vtkTransform.h>
 #include <vtkDelaunay2D.h>
 #include <vtkDelaunay3D.h>
@@ -46 +47 @@
 void PolyData::initProp()
 {
-    if (_prop == NULL) {
-        _prop = vtkSmartPointer<vtkActor>::New();
-        vtkProperty *property = getActor()->GetProperty();
-        property->EdgeVisibilityOn();
-        property->SetColor(_color[0], _color[1], _color[2]);
-        property->SetEdgeColor(_edgeColor[0], _edgeColor[1], _edgeColor[2]);
-        property->SetLineWidth(_edgeWidth);
-        property->SetOpacity(_opacity);
-        property->SetAmbient(.2);
-        if (!_lighting)
-            property->LightingOff();
-    }
+    VtkGraphicsObject::initProp();
+    getActor()->GetProperty()->EdgeVisibilityOn();
 }
 
@@ -78 +69 @@
     vtkPolyData *pd = vtkPolyData::SafeDownCast(ds);
     if (pd) {
-        TRACE("Verts: %d Lines: %d Polys: %d Strips: %d",
-                  pd->GetNumberOfVerts(),
-                  pd->GetNumberOfLines(),
-                  pd->GetNumberOfPolys(),
-                  pd->GetNumberOfStrips());
+        TRACE("Points: %d Verts: %d Lines: %d Polys: %d Strips: %d",
+              pd->GetNumberOfPoints(),
+              pd->GetNumberOfVerts(),
+              pd->GetNumberOfLines(),
+              pd->GetNumberOfPolys(),
+              pd->GetNumberOfStrips());
         // DataSet is a vtkPolyData
         if (pd->GetNumberOfLines() == 0 &&
@@ -88 +80 @@
             pd->GetNumberOfStrips() == 0) {
             // DataSet is a point cloud
-            if (_dataSet->is2D()) {
+            DataSet::PrincipalPlane plane;
+            double offset;
+            if (_dataSet->numDimensions() < 2 || pd->GetNumberOfPoints() < 3) {
+                // 0D or 1D or not enough points to mesh
+                _pdMapper->SetInput(pd);
+            } else if (_dataSet->is2D(&plane, &offset)) {
                 vtkSmartPointer<vtkDelaunay2D> mesher = vtkSmartPointer<vtkDelaunay2D>::New();
+                if (plane == DataSet::PLANE_ZY) {
+                    vtkSmartPointer<vtkTransform> trans = vtkSmartPointer<vtkTransform>::New();
+                    trans->RotateWXYZ(90, 0, 1, 0);
+                    if (offset != 0.0) {
+                        trans->Translate(-offset, 0, 0);
+                    }
+                    mesher->SetTransform(trans);
+                } else if (plane == DataSet::PLANE_XZ) {
+                     vtkSmartPointer<vtkTransform> trans = vtkSmartPointer<vtkTransform>::New();
+                    trans->RotateWXYZ(-90, 1, 0, 0);
+                    if (offset != 0.0) {
+                        trans->Translate(0, -offset, 0);
+                    }
+                    mesher->SetTransform(trans);
+                } else if (offset != 0.0) {
+                    // XY with Z offset
+                    vtkSmartPointer<vtkTransform> trans = vtkSmartPointer<vtkTransform>::New();
+                    trans->Translate(0, 0, -offset);
+                    mesher->SetTransform(trans);
+                }
                 mesher->SetInput(pd);
                 mesher->ReleaseDataFlagOn();
-                _pdMapper->SetInputConnection(mesher->GetOutputPort());
-#if defined(DEBUG) && defined(WANT_TRACE)
                 mesher->Update();
                 vtkPolyData *outpd = mesher->GetOutput();
@@ -101 +116 @@
                       outpd->GetNumberOfPolys(),
                       outpd->GetNumberOfStrips());
-#endif
+                if (outpd->GetNumberOfPolys() == 0) {
+                    WARN("Delaunay2D mesher failed");
+                    _pdMapper->SetInput(pd);
+                } else {
+                    _pdMapper->SetInputConnection(mesher->GetOutputPort());
+                }
             } else {
                 vtkSmartPointer<vtkDelaunay3D> mesher = vtkSmartPointer<vtkDelaunay3D>::New();
                 mesher->SetInput(pd);
                 mesher->ReleaseDataFlagOn();
-                // Delaunay3D returns an UnstructuredGrid, so feed it through a surface filter
-                // to get the grid boundary as a PolyData
-                vtkSmartPointer<vtkDataSetSurfaceFilter> gf = vtkSmartPointer<vtkDataSetSurfaceFilter>::New();
-                gf->SetInputConnection(mesher->GetOutputPort());
-                gf->ReleaseDataFlagOn();
-                _pdMapper->SetInputConnection(gf->GetOutputPort());
-            }
+                mesher->Update();
+                vtkUnstructuredGrid *grid = mesher->GetOutput();
+                TRACE("Delaunay3D Cells: %d",
+                      grid->GetNumberOfCells());
+                if (grid->GetNumberOfCells() == 0) {
+                    WARN("Delaunay3D mesher failed");
+                    _pdMapper->SetInput(pd);
+                } else {
+                    // Delaunay3D returns an UnstructuredGrid, so feed it 
+                    // through a surface filter to get the grid boundary 
+                    // as a PolyData
+                    vtkSmartPointer<vtkDataSetSurfaceFilter> gf = vtkSmartPointer<vtkDataSetSurfaceFilter>::New();
+                    gf->UseStripsOn();
+                    gf->SetInputConnection(mesher->GetOutputPort());
+                    gf->ReleaseDataFlagOn();
+                    _pdMapper->SetInputConnection(gf->GetOutputPort());
+                }
+             }
         } else {
             // DataSet is a vtkPolyData with lines and/or polygons
@@ -121 +152 @@
         TRACE("DataSet is not a PolyData");
         vtkSmartPointer<vtkDataSetSurfaceFilter> gf = vtkSmartPointer<vtkDataSetSurfaceFilter>::New();
+        gf->UseStripsOn();
         gf->SetInput(ds);
         gf->ReleaseDataFlagOn();

branches/blt4/packages/vizservers/vtkvis/RpPolyData.h

@@ -22 +22 @@
  * \brief VTK Mesh (Polygon data)
  *
- * The DataSet must be a PolyData object
+ * This class creates a boundary mesh of a DataSet
  */
 class PolyData : public VtkGraphicsObject {

branches/blt4/packages/vizservers/vtkvis/RpPseudoColor.cpp

@@ -15 +15 @@
 #include <vtkImageData.h>
 #include <vtkLookupTable.h>
+#include <vtkTransform.h>
 #include <vtkDelaunay2D.h>
 #include <vtkDelaunay3D.h>
@@ -29 +30 @@
 
 PseudoColor::PseudoColor() :
-    VtkGraphicsObject()
+    VtkGraphicsObject(),
+    _colorMode(COLOR_BY_SCALAR),
+    _colorMap(NULL)
 {
 }
@@ -43 +46 @@
 }
 
-/**
- * \brief Create and initialize a VTK Prop to render the colormapped dataset
- */
-void PseudoColor::initProp()
-{
-    if (_prop == NULL) {
-        _prop = vtkSmartPointer<vtkActor>::New();
-        vtkProperty *property = getActor()->GetProperty();
-        property->SetOpacity(_opacity);
-        property->SetEdgeColor(_edgeColor[0], _edgeColor[1], _edgeColor[2]);
-        property->SetLineWidth(_edgeWidth);
-        property->EdgeVisibilityOff();
-        property->SetAmbient(.2);
-        if (!_lighting)
-            property->LightingOff();
+void PseudoColor::setDataSet(DataSet *dataSet,
+                             bool useCumulative,
+                             double scalarRange[2],
+                             double vectorMagnitudeRange[2],
+                             double vectorComponentRange[3][2])
+{
+    if (_dataSet != dataSet) {
+        _dataSet = dataSet;
+
+        if (useCumulative) {
+            _dataRange[0] = scalarRange[0];
+            _dataRange[1] = scalarRange[1];
+            _vectorMagnitudeRange[0] = vectorMagnitudeRange[0];
+            _vectorMagnitudeRange[1] = vectorMagnitudeRange[1];
+            for (int i = 0; i < 3; i++) {
+                _vectorComponentRange[i][0] = vectorComponentRange[i][0];
+                _vectorComponentRange[i][1] = vectorComponentRange[i][1];
+            }
+        } else {
+            _dataSet->getScalarRange(_dataRange);
+            _dataSet->getVectorRange(_vectorMagnitudeRange);
+            for (int i = 0; i < 3; i++) {
+                _dataSet->getVectorRange(_vectorComponentRange[i], i);
+            }
+        }
+
+        update();
     }
 }
@@ -70 +85 @@
 
     vtkDataSet *ds = _dataSet->getVtkDataSet();
-
-    double dataRange[2];
-    _dataSet->getDataRange(dataRange);
 
     // Mapper, actor to render color-mapped data set
     if (_dsMapper == NULL) {
         _dsMapper = vtkSmartPointer<vtkDataSetMapper>::New();
+        // Map scalars through lookup table regardless of type
+        _dsMapper->SetColorModeToMapScalars();
+        //_dsMapper->InterpolateScalarsBeforeMappingOn();
     }
 
@@ -86 +101 @@
             pd->GetNumberOfStrips() == 0) {
             // DataSet is a point cloud
-            if (_dataSet->is2D()) {
+            DataSet::PrincipalPlane plane;
+            double offset;
+            if (_dataSet->is2D(&plane, &offset)) {
 #ifdef MESH_POINT_CLOUDS
                 vtkSmartPointer<vtkDelaunay2D> mesher = vtkSmartPointer<vtkDelaunay2D>::New();
+                if (plane == DataSet::PLANE_ZY) {
+                    vtkSmartPointer<vtkTransform> trans = vtkSmartPointer<vtkTransform>::New();
+                    trans->RotateWXYZ(90, 0, 1, 0);
+                    if (offset != 0.0) {
+                        trans->Translate(-offset, 0, 0);
+                    }
+                    mesher->SetTransform(trans);
+                } else if (plane == DataSet::PLANE_XZ) {
+                    vtkSmartPointer<vtkTransform> trans = vtkSmartPointer<vtkTransform>::New();
+                    trans->RotateWXYZ(-90, 1, 0, 0);
+                    if (offset != 0.0) {
+                        trans->Translate(0, -offset, 0);
+                    }
+                    mesher->SetTransform(trans);
+                } else if (offset != 0.0) {
+                    // XY with Z offset
+                    vtkSmartPointer<vtkTransform> trans = vtkSmartPointer<vtkTransform>::New();
+                    trans->Translate(0, 0, -offset);
+                    mesher->SetTransform(trans);
+                }
                 mesher->SetInput(pd);
-                vtkSmartPointer<vtkDataSetSurfaceFilter> gf = vtkSmartPointer<vtkDataSetSurfaceFilter>::New();
-                gf->SetInputConnection(mesher->GetOutputPort());
-                _dsMapper->SetInputConnection(gf->GetOutputPort());
+                _dsMapper->SetInputConnection(mesher->GetOutputPort());
 #else
                 vtkSmartPointer<vtkGaussianSplatter> splatter = vtkSmartPointer<vtkGaussianSplatter>::New();
+                vtkSmartPointer<vtkExtractVOI> slicer = vtkSmartPointer<vtkExtractVOI>::New();
                 splatter->SetInput(pd);
                 int dims[3];
                 splatter->GetSampleDimensions(dims);
                 TRACE("Sample dims: %d %d %d", dims[0], dims[1], dims[2]);
-                dims[2] = 3;
+                if (plane == DataSet::PLANE_ZY) {
+                    dims[0] = 3;
+                    slicer->SetVOI(1, 1, 0, dims[1]-1, 0, dims[1]-1);
+                } else if (plane == DataSet::PLANE_XZ) {
+                    dims[1] = 3;
+                    slicer->SetVOI(0, dims[0]-1, 1, 1, 0, dims[2]-1);
+                } else {
+                    dims[2] = 3;
+                    slicer->SetVOI(0, dims[0]-1, 0, dims[1]-1, 1, 1);
+                }
                 splatter->SetSampleDimensions(dims);
                 double bounds[6];
@@ -108 +153 @@
                       bounds[2], bounds[3],
                       bounds[4], bounds[5]);
-                vtkSmartPointer<vtkExtractVOI> slicer = vtkSmartPointer<vtkExtractVOI>::New();
                 slicer->SetInputConnection(splatter->GetOutputPort());
-                slicer->SetVOI(0, dims[0]-1, 0, dims[1]-1, 1, 1);
                 slicer->SetSampleRate(1, 1, 1);
                 vtkSmartPointer<vtkDataSetSurfaceFilter> gf = vtkSmartPointer<vtkDataSetSurfaceFilter>::New();
@@ -136 +179 @@
     }
 
-    if (ds->GetPointData() == NULL ||
-        ds->GetPointData()->GetScalars() == NULL) {
-        WARN("No scalar point data in dataset %s", _dataSet->getName().c_str());
-        if (_lut == NULL) {
-            _lut = vtkSmartPointer<vtkLookupTable>::New();
-        }
-    } else {
-        vtkLookupTable *lut = ds->GetPointData()->GetScalars()->GetLookupTable();
-        TRACE("Data set scalars lookup table: %p\n", lut);
-        if (_lut == NULL) {
-            if (lut)
-                _lut = lut;
-            else
-                _lut = vtkSmartPointer<vtkLookupTable>::New();
-        }
-    }
-
-    _lut->SetRange(dataRange);
-
-    _dsMapper->SetColorModeToMapScalars();
-    _dsMapper->UseLookupTableScalarRangeOn();
-    _dsMapper->SetLookupTable(_lut);
-    //_dsMapper->InterpolateScalarsBeforeMappingOn();
+    if (_lut == NULL) {
+        setColorMap(ColorMap::getDefault());
+    }
+
+    setColorMode(_colorMode);
 
     initProp();
@@ -165 +190 @@
 }
 
+void PseudoColor::updateRanges(bool useCumulative,
+                               double scalarRange[2],
+                               double vectorMagnitudeRange[2],
+                               double vectorComponentRange[3][2])
+{
+    if (useCumulative) {
+        _dataRange[0] = scalarRange[0];
+        _dataRange[1] = scalarRange[1];
+        _vectorMagnitudeRange[0] = vectorMagnitudeRange[0];
+        _vectorMagnitudeRange[1] = vectorMagnitudeRange[1];
+        for (int i = 0; i < 3; i++) {
+            _vectorComponentRange[i][0] = vectorComponentRange[i][0];
+            _vectorComponentRange[i][1] = vectorComponentRange[i][1];
+        }
+    } else if (_dataSet != NULL) {
+        _dataSet->getScalarRange(_dataRange);
+        _dataSet->getVectorRange(_vectorMagnitudeRange);
+        for (int i = 0; i < 3; i++) {
+            _dataSet->getVectorRange(_vectorComponentRange[i], i);
+        }
+    }
+
+    // Need to update color map ranges and/or active vector field
+    setColorMode(_colorMode);
+}
+
+void PseudoColor::setColorMode(ColorMode mode)
+{
+    _colorMode = mode;
+    if (_dataSet == NULL || _dsMapper == NULL)
+        return;
+
+    vtkDataSet *ds = _dataSet->getVtkDataSet();
+
+    switch (mode) {
+    case COLOR_BY_SCALAR: {
+        _dsMapper->ScalarVisibilityOn();
+        _dsMapper->SetScalarModeToDefault();
+        if (_lut != NULL) {
+            _lut->SetRange(_dataRange);
+        }
+    }
+        break;
+    case COLOR_BY_VECTOR_MAGNITUDE: {
+        _dsMapper->ScalarVisibilityOn();
+        _dsMapper->SetScalarModeToUsePointFieldData();
+        if (ds->GetPointData() != NULL &&
+            ds->GetPointData()->GetVectors() != NULL) {
+            _dsMapper->SelectColorArray(ds->GetPointData()->GetVectors()->GetName());
+        }
+        if (_lut != NULL) {
+            _lut->SetRange(_vectorMagnitudeRange);
+            _lut->SetVectorModeToMagnitude();
+        }
+    }
+        break;
+    case COLOR_BY_VECTOR_X:
+        _dsMapper->ScalarVisibilityOn();
+        _dsMapper->SetScalarModeToUsePointFieldData();
+        if (ds->GetPointData() != NULL &&
+            ds->GetPointData()->GetVectors() != NULL) {
+            _dsMapper->SelectColorArray(ds->GetPointData()->GetVectors()->GetName());
+        }
+        if (_lut != NULL) {
+            _lut->SetRange(_vectorComponentRange[0]);
+            _lut->SetVectorModeToComponent();
+            _lut->SetVectorComponent(0);
+        }
+        break;
+    case COLOR_BY_VECTOR_Y:
+        _dsMapper->ScalarVisibilityOn();
+        _dsMapper->SetScalarModeToUsePointFieldData();
+        if (ds->GetPointData() != NULL &&
+            ds->GetPointData()->GetVectors() != NULL) {
+            _dsMapper->SelectColorArray(ds->GetPointData()->GetVectors()->GetName());
+        }
+        if (_lut != NULL) {
+            _lut->SetRange(_vectorComponentRange[1]);
+            _lut->SetVectorModeToComponent();
+            _lut->SetVectorComponent(1);
+        }
+        break;
+    case COLOR_BY_VECTOR_Z:
+        _dsMapper->ScalarVisibilityOn();
+        _dsMapper->SetScalarModeToUsePointFieldData();
+        if (ds->GetPointData() != NULL &&
+            ds->GetPointData()->GetVectors() != NULL) {
+            _dsMapper->SelectColorArray(ds->GetPointData()->GetVectors()->GetName());
+        }
+        if (_lut != NULL) {
+            _lut->SetRange(_vectorComponentRange[2]);
+            _lut->SetVectorModeToComponent();
+            _lut->SetVectorComponent(2);
+        }
+        break;
+    case COLOR_CONSTANT:
+    default:
+        _dsMapper->ScalarVisibilityOff();
+        break;
+    }
+}
+
 /**
- * \brief Get the VTK colormap lookup table in use
- */
-vtkLookupTable *PseudoColor::getLookupTable()
-{ 
-    return _lut;
+ * \brief Called when the color map has been edited
+ */
+void PseudoColor::updateColorMap()
+{
+    setColorMap(_colorMap);
 }
 
@@ -176 +303 @@
  * \brief Associate a colormap lookup table with the DataSet
  */
-void PseudoColor::setLookupTable(vtkLookupTable *lut)
-{
-    if (lut == NULL) {
+void PseudoColor::setColorMap(ColorMap *cmap)
+{
+    if (cmap == NULL)
+        return;
+
+    _colorMap = cmap;
+ 
+    if (_lut == NULL) {
         _lut = vtkSmartPointer<vtkLookupTable>::New();
-    } else {
-        _lut = lut;
-    }
-
-    if (_dsMapper != NULL) {
-        _dsMapper->UseLookupTableScalarRangeOn();
-        _dsMapper->SetLookupTable(_lut);
+        if (_dsMapper != NULL) {
+            _dsMapper->UseLookupTableScalarRangeOn();
+            _dsMapper->SetLookupTable(_lut);
+        }
+    }
+
+    _lut->DeepCopy(cmap->getLookupTable());
+
+    switch (_colorMode) {
+    case COLOR_CONSTANT:
+    case COLOR_BY_SCALAR:
+        _lut->SetRange(_dataRange);
+        break;
+    case COLOR_BY_VECTOR_MAGNITUDE:
+        _lut->SetVectorModeToMagnitude();
+        _lut->SetRange(_vectorMagnitudeRange);
+        break;
+    case COLOR_BY_VECTOR_X:
+        _lut->SetVectorModeToComponent();
+        _lut->SetVectorComponent(0);
+        _lut->SetRange(_vectorComponentRange[0]);
+        break;
+    case COLOR_BY_VECTOR_Y:
+        _lut->SetVectorModeToComponent();
+        _lut->SetVectorComponent(1);
+        _lut->SetRange(_vectorComponentRange[1]);
+        break;
+    case COLOR_BY_VECTOR_Z:
+        _lut->SetVectorModeToComponent();
+        _lut->SetVectorComponent(2);
+        _lut->SetRange(_vectorComponentRange[2]);
+        break;
+    default:
+         break;
     }
 }

branches/blt4/packages/vizservers/vtkvis/RpPseudoColor.h

@@ -15 +15 @@
 #include <vtkPlaneCollection.h>
 
+#include "ColorMap.h"
 #include "RpVtkGraphicsObject.h"
-#include "RpVtkDataSet.h"
 
 namespace Rappture {
@@ -23 +23 @@
 /**
  * \brief Color-mapped plot of data set
- * 
- * Currently the DataSet must be image data (2D uniform grid)
  */
 class PseudoColor : public VtkGraphicsObject {
 public:
+    enum ColorMode {
+        COLOR_BY_SCALAR,
+        COLOR_BY_VECTOR_MAGNITUDE,
+        COLOR_BY_VECTOR_X,
+        COLOR_BY_VECTOR_Y,
+        COLOR_BY_VECTOR_Z,
+        COLOR_CONSTANT
+    };
+
     PseudoColor();
     virtual ~PseudoColor();
@@ -36 +43 @@
     }
 
+    virtual void setDataSet(DataSet *dataSet,
+                            bool useCumulative,
+                            double scalarRange[2],
+                            double vectorMagnitudeRange[2],
+                            double vectorComponentRange[3][2]);
+
     virtual void setClippingPlanes(vtkPlaneCollection *planes);
 
-    void setLookupTable(vtkLookupTable *lut);
+    void setColorMode(ColorMode mode);
 
-    vtkLookupTable *getLookupTable();
+    void setColorMap(ColorMap *colorMap);
+
+    /**
+     * \brief Return the ColorMap in use
+     */
+    ColorMap *getColorMap()
+    {
+        return _colorMap;
+    }
+
+    void updateColorMap();
+
+    virtual void updateRanges(bool useCumulative,
+                              double scalarRange[2],
+                              double vectorMagnitudeRange[2],
+                              double vectorComponentRange[3][2]);
 
 private:
-    virtual void initProp();
     virtual void update();
+
+    ColorMode _colorMode;
+    ColorMap *_colorMap;
+    double _vectorMagnitudeRange[2];
+    double _vectorComponentRange[3][2];
 
     vtkSmartPointer<vtkLookupTable> _lut;

branches/blt4/packages/vizservers/vtkvis/RpStreamlines.cpp

@@ -36 +36 @@
     _lineType(LINES),
     _colorMode(COLOR_BY_VECTOR_MAGNITUDE),
-    _seedVisible(true)
+    _colorMap(NULL),
+    _seedVisible(true),
+    _dataScale(1)
 {
     _faceCulling = true;
@@ -51 +53 @@
 Streamlines::~Streamlines()
 {
+}
+
+void Streamlines::setDataSet(DataSet *dataSet,
+                             bool useCumulative,
+                             double scalarRange[2],
+                             double vectorMagnitudeRange[2],
+                             double vectorComponentRange[3][2])
+{
+    if (_dataSet != dataSet) {
+        _dataSet = dataSet;
+
+        if (useCumulative) {
+            _dataRange[0] = scalarRange[0];
+            _dataRange[1] = scalarRange[1];
+            _vectorMagnitudeRange[0] = vectorMagnitudeRange[0];
+            _vectorMagnitudeRange[1] = vectorMagnitudeRange[1];
+            for (int i = 0; i < 3; i++) {
+                _vectorComponentRange[i][0] = vectorComponentRange[i][0];
+                _vectorComponentRange[i][1] = vectorComponentRange[i][1];
+            }
+        } else {
+            _dataSet->getScalarRange(_dataRange);
+            _dataSet->getVectorRange(_vectorMagnitudeRange);
+            for (int i = 0; i < 3; i++) {
+                _dataSet->getVectorRange(_vectorComponentRange[i], i);
+            }
+        }
+
+        update();
+    }
 }
 
@@ -96 +128 @@
         _seedActor->GetProperty()->SetRepresentationToWireframe();
         _seedActor->GetProperty()->LightingOff();
+        setSeedVisibility(_seedVisible);
     }
     if (_prop == NULL) {
@@ -201 +234 @@
 
     vtkDataSet *ds = _dataSet->getVtkDataSet();
-    double dataRange[2];
-    _dataSet->getVectorMagnitudeRange(dataRange);
+
     double bounds[6];
     _dataSet->getBounds(bounds);
@@ -215 +247 @@
         maxBound = bounds[5] - bounds[4];
     }
+
+    double cellSizeRange[2];
+    double avgSize;
+    _dataSet->getCellSizeRange(cellSizeRange, &avgSize);
+    _dataScale = avgSize / 8.;
 
     vtkSmartPointer<vtkCellDataToPointData> cellToPtData;
@@ -294 +331 @@
     _seedActor->SetMapper(_seedMapper);
 
-    _lut = vtkSmartPointer<vtkLookupTable>::New();
-    _lut->SetRange(dataRange);
-    _lut->SetVectorModeToMagnitude();
-
-    _pdMapper->SetScalarModeToUsePointFieldData();
-    if (ds->GetPointData() != NULL &&
-        ds->GetPointData()->GetVectors() != NULL) {
-        TRACE("Vector name: '%s'", ds->GetPointData()->GetVectors()->GetName());
-        _pdMapper->SelectColorArray(ds->GetPointData()->GetVectors()->GetName());
-    }
-    _pdMapper->SetColorModeToMapScalars();
-    _pdMapper->UseLookupTableScalarRangeOn();
-    _pdMapper->SetLookupTable(_lut);
+    if (_lut == NULL) {
+        setColorMap(ColorMap::getDefault());
+    }
+
+    setColorMode(_colorMode);
 
     _linesActor->SetMapper(_pdMapper);
@@ -724 +753 @@
             numSides = 3;
         tubeFilter->SetNumberOfSides(numSides);
-        tubeFilter->SetRadius(radius);
+        tubeFilter->SetRadius(_dataScale * radius);
         _pdMapper->SetInputConnection(_lineFilter->GetOutputPort());
         if (_faceCulling && _opacity == 1.0)
@@ -749 +778 @@
         }
         vtkRibbonFilter *ribbonFilter = vtkRibbonFilter::SafeDownCast(_lineFilter);
-        ribbonFilter->SetWidth(width);
+        ribbonFilter->SetWidth(_dataScale * width);
         ribbonFilter->SetAngle(angle);
         ribbonFilter->UseDefaultNormalOn();
@@ -759 +788 @@
 }
 
+void Streamlines::updateRanges(bool useCumulative,
+                               double scalarRange[2],
+                               double vectorMagnitudeRange[2],
+                               double vectorComponentRange[3][2])
+{
+    if (useCumulative) {
+        _dataRange[0] = scalarRange[0];
+        _dataRange[1] = scalarRange[1];
+        _vectorMagnitudeRange[0] = vectorMagnitudeRange[0];
+        _vectorMagnitudeRange[1] = vectorMagnitudeRange[1];
+        for (int i = 0; i < 3; i++) {
+            _vectorComponentRange[i][0] = vectorComponentRange[i][0];
+            _vectorComponentRange[i][1] = vectorComponentRange[i][1];
+        }
+    } else {
+        _dataSet->getScalarRange(_dataRange);
+        _dataSet->getVectorRange(_vectorMagnitudeRange);
+        for (int i = 0; i < 3; i++) {
+            _dataSet->getVectorRange(_vectorComponentRange[i], i);
+        }
+    }
+
+    // Need to update color map ranges and/or active vector field
+    setColorMode(_colorMode);
+}
+
 void Streamlines::setColorMode(ColorMode mode)
 {
@@ -772 +827 @@
         _pdMapper->SetScalarModeToDefault();
         if (_lut != NULL) {
-            double dataRange[2];
-            _dataSet->getDataRange(dataRange);
-            _lut->SetRange(dataRange);
+            _lut->SetRange(_dataRange);
         }
     }
@@ -786 +839 @@
         }
         if (_lut != NULL) {
-            double dataRange[2];
-            _dataSet->getVectorMagnitudeRange(dataRange);
-            TRACE("vmag range: %g %g", dataRange[0], dataRange[1]);
-            _lut->SetRange(dataRange);
+            _lut->SetRange(_vectorMagnitudeRange);
             _lut->SetVectorModeToMagnitude();
         }
@@ -802 +852 @@
         }
         if (_lut != NULL) {
-            double dataRange[2];
-            _dataSet->getVectorComponentRange(dataRange, 0);
-            _lut->SetRange(dataRange);
+            _lut->SetRange(_vectorComponentRange[0]);
             _lut->SetVectorModeToComponent();
             _lut->SetVectorComponent(0);
@@ -817 +865 @@
         }
         if (_lut != NULL) {
-            double dataRange[2];
-            _dataSet->getVectorComponentRange(dataRange, 1);
-            _lut->SetRange(dataRange);
+            _lut->SetRange(_vectorComponentRange[1]);
             _lut->SetVectorModeToComponent();
             _lut->SetVectorComponent(1);
@@ -832 +878 @@
         }
         if (_lut != NULL) {
-            double dataRange[2];
-            _dataSet->getVectorComponentRange(dataRange, 2);
-            TRACE("vz range: %g %g", dataRange[0], dataRange[1]);
-            _lut->SetRange(dataRange);
+            _lut->SetRange(_vectorComponentRange[2]);
             _lut->SetVectorModeToComponent();
             _lut->SetVectorComponent(2);
@@ -848 +891 @@
 
 /**
- * \brief Get the VTK colormap lookup table in use
- */
-vtkLookupTable *Streamlines::getLookupTable()
-{ 
-    return _lut;
+ * \brief Called when the color map has been edited
+ */
+void Streamlines::updateColorMap()
+{
+    setColorMap(_colorMap);
 }
 
@@ -858 +901 @@
  * \brief Associate a colormap lookup table with the DataSet
  */
-void Streamlines::setLookupTable(vtkLookupTable *lut)
-{
-    if (lut == NULL) {
+void Streamlines::setColorMap(ColorMap *cmap)
+{
+    if (cmap == NULL)
+        return;
+
+    _colorMap = cmap;
+ 
+    if (_lut == NULL) {
         _lut = vtkSmartPointer<vtkLookupTable>::New();
-    } else {
-        _lut = lut;
-    }
+        if (_pdMapper != NULL) {
+            _pdMapper->UseLookupTableScalarRangeOn();
+            _pdMapper->SetLookupTable(_lut);
+        }
+    }
+
+    _lut->DeepCopy(cmap->getLookupTable());
 
     switch (_colorMode) {
-    case COLOR_BY_VECTOR_MAGNITUDE: {
-        double dataRange[2];
-        _dataSet->getVectorMagnitudeRange(dataRange);
+    case COLOR_CONSTANT:
+    case COLOR_BY_SCALAR:
+        _lut->SetRange(_dataRange);
+        break;
+    case COLOR_BY_VECTOR_MAGNITUDE:
         _lut->SetVectorModeToMagnitude();
-        _lut->SetRange(dataRange);
-    }
-        break;
-    case COLOR_BY_VECTOR_X: {
-        double dataRange[2];
-        _dataSet->getVectorComponentRange(dataRange, 0);
+        _lut->SetRange(_vectorMagnitudeRange);
+        break;
+    case COLOR_BY_VECTOR_X:
         _lut->SetVectorModeToComponent();
         _lut->SetVectorComponent(0);
-        _lut->SetRange(dataRange);
-    }
-        break;
-    case COLOR_BY_VECTOR_Y: {
-        double dataRange[2];
-        _dataSet->getVectorComponentRange(dataRange, 1);
+        _lut->SetRange(_vectorComponentRange[0]);
+        break;
+    case COLOR_BY_VECTOR_Y:
         _lut->SetVectorModeToComponent();
         _lut->SetVectorComponent(1);
-        _lut->SetRange(dataRange);
-    }
-        break;
-    case COLOR_BY_VECTOR_Z: {
-        double dataRange[2];
-        _dataSet->getVectorComponentRange(dataRange, 2);
+        _lut->SetRange(_vectorComponentRange[1]);
+        break;
+    case COLOR_BY_VECTOR_Z:
         _lut->SetVectorModeToComponent();
         _lut->SetVectorComponent(2);
-        _lut->SetRange(dataRange);
-    }
+        _lut->SetRange(_vectorComponentRange[2]);
         break;
     default:
          break;
-    }
-
-    if (_pdMapper != NULL) {
-        _pdMapper->SetLookupTable(_lut);
     }
 }

branches/blt4/packages/vizservers/vtkvis/RpStreamlines.h

@@ -18 +18 @@
 #include <vtkAssembly.h>
 
+#include "ColorMap.h"
 #include "RpVtkGraphicsObject.h"
 
@@ -51 +52 @@
         return "Streamlines";
     }
+
+    virtual void setDataSet(DataSet *dataSet,
+                            bool useCumulative,
+                            double scalarRange[2],
+                            double vectorMagnitudeRange[2],
+                            double vectorComponentRange[3][2]);
 
     virtual void setLighting(bool state);
@@ -95 +102 @@
     void setColorMode(ColorMode mode);
 
-    void setLookupTable(vtkLookupTable *lut);
+    void setColorMap(ColorMap *colorMap);
 
-    vtkLookupTable *getLookupTable();
+    /**
+     * \brief Return the ColorMap in use
+     */
+    ColorMap *getColorMap()
+    {
+        return _colorMap;
+    }
+
+    void updateColorMap();
+
+    virtual void updateRanges(bool useCumulative,
+                              double scalarRange[2],
+                              double vectorMagnitudeRange[2],
+                              double vectorComponentRange[3][2]);
 
     void setSeedVisibility(bool state);
@@ -120 +140 @@
     LineType _lineType;
     ColorMode _colorMode;
-    float _color[3];
+    ColorMap *_colorMap;
     float _seedColor[3];
     bool _seedVisible;
+    double _vectorMagnitudeRange[2];
+    double _vectorComponentRange[3][2];
+    double _dataScale;
 
     vtkSmartPointer<vtkLookupTable> _lut;

branches/blt4/packages/vizservers/vtkvis/RpVolume.cpp

@@ -63 +63 @@
     vtkDataSet *ds = _dataSet->getVtkDataSet();
 
-    double dataRange[2];
-    _dataSet->getDataRange(dataRange);
-
-    TRACE("DataSet type: %s, range: %g - %g", _dataSet->getVtkType(),
-          dataRange[0], dataRange[1]);
-
     if (vtkImageData::SafeDownCast(ds) != NULL) {
         // Image data required for these mappers
@@ -113 +107 @@
         WARN("No scalar point data in dataset %s", _dataSet->getName().c_str());
     }
+
     if (_colorMap == NULL) {
-        _colorMap = ColorMap::getVolumeDefault();
+        setColorMap(ColorMap::getVolumeDefault());
     }
-
-    vtkVolumeProperty *volProperty = getVolume()->GetProperty();
-    volProperty->SetColor(_colorMap->getColorTransferFunction(dataRange));
-    volProperty->SetScalarOpacity(_colorMap->getOpacityTransferFunction(dataRange));
 
     getVolume()->SetMapper(_volumeMapper);
     _volumeMapper->Update();
+}
+
+void Volume::updateRanges(bool useCumulative,
+                          double scalarRange[2],
+                          double vectorMagnitudeRange[2],
+                          double vectorComponentRange[3][2])
+{
+    if (useCumulative) {
+        _dataRange[0] = scalarRange[0];
+        _dataRange[1] = scalarRange[1];
+    } else if (_dataSet != NULL) {
+        _dataSet->getScalarRange(_dataRange);
+    }
+
+    if (getVolume() != NULL) {
+        getVolume()->GetProperty()->SetColor(_colorMap->getColorTransferFunction(_dataRange));
+        getVolume()->GetProperty()->SetScalarOpacity(_colorMap->getOpacityTransferFunction(_dataRange));
+    }
+}
+void Volume::updateColorMap()
+{
+    setColorMap(_colorMap);
 }
 
@@ -131 +144 @@
 {
     _colorMap = cmap;
+
     if (getVolume() != NULL) {
-        double dataRange[2];
-        _dataSet->getDataRange(dataRange);
-        getVolume()->GetProperty()->SetColor(_colorMap->getColorTransferFunction(dataRange));
-        getVolume()->GetProperty()->SetScalarOpacity(_colorMap->getOpacityTransferFunction(dataRange));
-    }
-}
-
-/**
- * \brief Assign a color map (transfer function) to use in rendering the Volume and
- * specify a scalar range for the map
- */
-void Volume::setColorMap(ColorMap *cmap, double dataRange[2])
-{
-    _colorMap = cmap;
-    if (getVolume() != NULL) {
-        getVolume()->GetProperty()->SetColor(_colorMap->getColorTransferFunction(dataRange));
-        getVolume()->GetProperty()->SetScalarOpacity(_colorMap->getOpacityTransferFunction(dataRange));
+        getVolume()->GetProperty()->SetColor(_colorMap->getColorTransferFunction(_dataRange));
+        getVolume()->GetProperty()->SetScalarOpacity(_colorMap->getOpacityTransferFunction(_dataRange));
     }
 }

branches/blt4/packages/vizservers/vtkvis/RpVolume.h

@@ -49 +49 @@
     void setColorMap(ColorMap *cmap);
 
-    void setColorMap(ColorMap *cmap, double dataRange[2]);
+    ColorMap *getColorMap();
 
-    ColorMap *getColorMap();
+    void updateColorMap();
+
+    virtual void updateRanges(bool useCumulative,
+                              double scalarRange[2],
+                              double vectorMagnitudeRange[2],
+                              double vectorComponentRange[3][2]);
 
 private:

branches/blt4/packages/vizservers/vtkvis/RpVtkDataSet.cpp

@@ -6 +6 @@
  */
 
+#include <cassert>
 #include <cstring>
+#include <cfloat>
+#include <cmath>
 
 #include <vtkCharArray.h>
@@ -18 +21 @@
 #include <vtkPointData.h>
 #include <vtkCellData.h>
+#include <vtkCell.h>
 #include <vtkLookupTable.h>
 
@@ -27 +31 @@
 DataSet::DataSet(const std::string& name) :
     _name(name),
-    _visible(true)
-{
+    _visible(true),
+    _opacity(1),
+    _cellSizeAverage(0)
+{
+    _cellSizeRange[0] = -1;
+    _cellSizeRange[1] = -1;
 }
 
@@ -36 +44 @@
 
 /**
+ * \brief Create and initialize a VTK Prop to render the outline
+ */
+void DataSet::initProp()
+{
+    if (_prop == NULL) {
+        _prop = vtkSmartPointer<vtkActor>::New();
+        vtkProperty *property = _prop->GetProperty();
+        property->EdgeVisibilityOff();
+        property->SetOpacity(_opacity);
+        property->SetAmbient(.2);
+        property->LightingOff();
+        _prop->SetVisibility((_visible ? 1 : 0));
+    }
+}
+
+/**
+ * \brief Create and initialize a wireframe outline
+ */
+void DataSet::showOutline(bool state)
+{
+    if (state) {
+        if (_outlineFilter == NULL) {
+            _outlineFilter = vtkSmartPointer<vtkOutlineFilter>::New();
+            _outlineFilter->SetInput(_dataSet);
+        }
+        if (_outlineMapper == NULL) {
+            _outlineMapper = vtkSmartPointer<vtkPolyDataMapper>::New();
+            _outlineMapper->SetInputConnection(_outlineFilter->GetOutputPort());
+        }
+        initProp();
+        _prop->SetMapper(_outlineMapper);
+    } else {
+        if (_prop != NULL) {
+            _prop->SetMapper(NULL);
+        }
+        if (_outlineMapper != NULL) {
+            _outlineMapper = NULL;
+        }
+        if (_outlineFilter != NULL) {
+            _outlineFilter = NULL;
+        }
+    }
+}
+
+/**
+ * \brief Set color of outline bounding box
+ */
+void DataSet::setOutlineColor(float color[3])
+{
+    if (_prop == NULL) {
+        initProp();
+    }
+    _prop->GetProperty()->SetColor(color[0], color[1], color[2]);
+}
+
+/**
+ * \brief Set opacity of DataSet outline
+ *
+ * This method is used for record-keeping and opacity of the
+ * DataSet bounds outline.  The renderer controls opacity 
+ * of other related graphics objects.
+ */
+void DataSet::setOpacity(double opacity)
+{
+    _opacity = opacity;
+    if (_prop != NULL) {
+        _prop->GetProperty()->SetOpacity(opacity);
+    }
+}
+
+/**
  * \brief Set visibility flag in DataSet
  *
- * This method is used for record-keeping.  The renderer controls
- * the visibility of related graphics objects.
+ * This method is used for record-keeping and visibility of the
+ * DataSet bounds outline.  The renderer controls visibility 
+ * of other related graphics objects.
  */
 void DataSet::setVisibility(bool state)
 {
     _visible = state;
+    if (_prop != NULL) {
+        _prop->SetVisibility((state ? 1 : 0));
+    }
 }
 
@@ -69 +152 @@
 
     reader->SetFileName(filename);
+    reader->ReadAllNormalsOn();
+    //reader->ReadAllTCoordsOn();
     reader->ReadAllScalarsOn();
+    //reader->ReadAllColorScalarsOn();
     reader->ReadAllVectorsOn();
+    //reader->ReadAllTensorsOn();
     reader->ReadAllFieldsOn();
+
     return setData(reader);
 }
@@ -80 +168 @@
 bool DataSet::setData(char *data, int nbytes)
 {
-    TRACE("Entering");
-
     vtkSmartPointer<vtkDataSetReader> reader = vtkSmartPointer<vtkDataSetReader>::New();
     vtkSmartPointer<vtkCharArray> dataSetString = vtkSmartPointer<vtkCharArray>::New();
@@ -93 +179 @@
     reader->SetInputArray(dataSetString);
     reader->ReadFromInputStringOn();
+    reader->ReadAllNormalsOn();
+    //reader->ReadAllTCoordsOn();
     reader->ReadAllScalarsOn();
+    //reader->ReadAllColorScalarsOn();
     reader->ReadAllVectorsOn();
+    //reader->ReadAllTensorsOn();
     reader->ReadAllFieldsOn();
 
-    bool status = setData(reader);
-
-    TRACE("Leaving");
-    return status;
-}
-
-/**
- * \brief Read dataset using supplied reader
- *
- * Pipeline information is removed from the resulting 
- * vtkDataSet, so that the reader and its data can be 
- * released
- */
-bool DataSet::setData(vtkDataSetReader *reader)
-{
-    // Force reading data set
-    reader->SetLookupTableName("");
-    reader->Update();
-
-    _dataSet = reader->GetOutput();
-    _dataSet->SetPipelineInformation(NULL);
-
+    return setData(reader);
+}
+
+void DataSet::print() const
+{
     TRACE("DataSet class: %s", _dataSet->GetClassName());
-#ifdef WANT_TRACE
-    double dataRange[2];
-    getDataRange(dataRange);
+
+    TRACE("DataSet memory: %g MiB", _dataSet->GetActualMemorySize()/1024.);
+
     double bounds[6];
     getBounds(bounds);
-#endif
-    TRACE("Scalar Range: %.12e, %.12e", dataRange[0], dataRange[1]);
+
+    // Topology
     TRACE("DataSet bounds: %g %g %g %g %g %g",
           bounds[0], bounds[1],
@@ -132 +205 @@
           bounds[4], bounds[5]);
     TRACE("Points: %d Cells: %d", _dataSet->GetNumberOfPoints(), _dataSet->GetNumberOfCells());
+
+    double dataRange[2];
+    if (_dataSet->GetPointData() != NULL) {
+        TRACE("PointData arrays: %d", _dataSet->GetPointData()->GetNumberOfArrays());
+        for (int i = 0; i < _dataSet->GetPointData()->GetNumberOfArrays(); i++) {
+            _dataSet->GetPointData()->GetArray(i)->GetRange(dataRange, -1);
+            TRACE("PointData[%d]: '%s' comp:%d, (%g,%g)", i,
+                  _dataSet->GetPointData()->GetArrayName(i),
+                  _dataSet->GetPointData()->GetArray(i)->GetNumberOfComponents(),
+                  dataRange[0], dataRange[1]);
+        }
+    }
+    if (_dataSet->GetCellData() != NULL) {
+        TRACE("CellData arrays: %d", _dataSet->GetCellData()->GetNumberOfArrays());
+        for (int i = 0; i < _dataSet->GetCellData()->GetNumberOfArrays(); i++) {
+            _dataSet->GetCellData()->GetArray(i)->GetRange(dataRange, -1);
+            TRACE("CellData[%d]: '%s' comp:%d, (%g,%g)", i,
+                  _dataSet->GetCellData()->GetArrayName(i),
+                  _dataSet->GetCellData()->GetArray(i)->GetNumberOfComponents(),
+                  dataRange[0], dataRange[1]);
+        }
+    }
+    if (_dataSet->GetFieldData() != NULL) {
+        TRACE("FieldData arrays: %d", _dataSet->GetFieldData()->GetNumberOfArrays());
+        for (int i = 0; i < _dataSet->GetFieldData()->GetNumberOfArrays(); i++) {
+            _dataSet->GetFieldData()->GetArray(i)->GetRange(dataRange, -1);
+            TRACE("FieldData[%d]: '%s' comp:%d, tuples:%d (%g,%g)", i,
+                  _dataSet->GetFieldData()->GetArrayName(i),
+                  _dataSet->GetFieldData()->GetArray(i)->GetNumberOfComponents(),
+                  _dataSet->GetFieldData()->GetArray(i)->GetNumberOfTuples(),
+                  dataRange[0], dataRange[1]);
+        }
+    }
+}
+
+void DataSet::setDefaultArrays()
+{
+    if (_dataSet->GetPointData() != NULL &&
+        _dataSet->GetPointData()->GetScalars() == NULL &&
+        _dataSet->GetPointData()->GetNumberOfArrays() > 0) {
+        for (int i = 0; i < _dataSet->GetPointData()->GetNumberOfArrays(); i++) {
+            if (_dataSet->GetPointData()->GetArray(i)->GetNumberOfComponents() == 1) {
+                TRACE("Setting point scalars to '%s'", _dataSet->GetPointData()->GetArrayName(i));
+                _dataSet->GetPointData()->SetActiveScalars(_dataSet->GetPointData()->GetArrayName(i));
+                break;
+            }
+        }
+    }
+    if (_dataSet->GetPointData() != NULL &&
+        _dataSet->GetPointData()->GetVectors() == NULL &&
+        _dataSet->GetPointData()->GetNumberOfArrays() > 0) {
+        for (int i = 0; i < _dataSet->GetPointData()->GetNumberOfArrays(); i++) {
+            if (_dataSet->GetPointData()->GetArray(i)->GetNumberOfComponents() == 3) {
+                TRACE("Setting point vectors to '%s'", _dataSet->GetPointData()->GetArrayName(i));
+                _dataSet->GetPointData()->SetActiveVectors(_dataSet->GetPointData()->GetArrayName(i));
+                break;
+            }
+        }
+    }
+    if (_dataSet->GetCellData() != NULL &&
+        _dataSet->GetCellData()->GetScalars() == NULL &&
+        _dataSet->GetCellData()->GetNumberOfArrays() > 0) {
+        for (int i = 0; i < _dataSet->GetCellData()->GetNumberOfArrays(); i++) {
+            if (_dataSet->GetCellData()->GetArray(i)->GetNumberOfComponents() == 1) {
+                TRACE("Setting cell scalars to '%s'", _dataSet->GetCellData()->GetArrayName(i));
+                _dataSet->GetCellData()->SetActiveScalars(_dataSet->GetCellData()->GetArrayName(i));
+                break;
+            }
+        }
+    }
+    if (_dataSet->GetCellData() != NULL &&
+        _dataSet->GetCellData()->GetVectors() == NULL &&
+        _dataSet->GetCellData()->GetNumberOfArrays() > 0) {
+        for (int i = 0; i < _dataSet->GetCellData()->GetNumberOfArrays(); i++) {
+            if (_dataSet->GetCellData()->GetArray(i)->GetNumberOfComponents() == 3) {
+                TRACE("Setting cell vectors to '%s'", _dataSet->GetCellData()->GetArrayName(i));
+                _dataSet->GetCellData()->SetActiveVectors(_dataSet->GetCellData()->GetArrayName(i));
+                break;
+            }
+        }
+    }
+}
+
+/**
+ * \brief Read dataset using supplied reader
+ *
+ * Pipeline information is removed from the resulting 
+ * vtkDataSet, so that the reader and its data can be 
+ * released
+ */
+bool DataSet::setData(vtkDataSetReader *reader)
+{
+    TRACE("Enter");
+    // Force reading data set
+    reader->SetLookupTableName("");
+    reader->Update();
+
+    _dataSet = reader->GetOutput();
+    _dataSet->SetPipelineInformation(NULL);
+
+    if (_dataSet->GetPointData() != NULL &&
+        _dataSet->GetPointData()->GetScalars() != NULL &&
+        _dataSet->GetPointData()->GetScalars()->GetLookupTable() != NULL) {
+        ERROR("No lookup table should be specified in DataSets");
+    }
+
+    setDefaultArrays();
+
+#ifdef WANT_TRACE
+    print();
+#endif
+    TRACE("Leave");
     return true;
 }
@@ -145 +330 @@
     _dataSet->SetPipelineInformation(NULL);
 
-    TRACE("DataSet class: %s", _dataSet->GetClassName());
+    if (_dataSet->GetPointData() != NULL &&
+        _dataSet->GetPointData()->GetScalars() != NULL &&
+        _dataSet->GetPointData()->GetScalars()->GetLookupTable() != NULL) {
+        ERROR("No lookup table should be specified in DataSets");
+    }
+
+    setDefaultArrays();
+
 #ifdef WANT_TRACE
-    double dataRange[2];
-    getDataRange(dataRange);
-    double bounds[6];
-    getBounds(bounds);
+    print();
 #endif
-    TRACE("Scalar Range: %.12e, %.12e", dataRange[0], dataRange[1]);
-    TRACE("DataSet bounds: %g %g %g %g %g %g",
-          bounds[0], bounds[1],
-          bounds[2], bounds[3],
-          bounds[4], bounds[5]);
-    TRACE("Points: %d Cells: %d", _dataSet->GetNumberOfPoints(), _dataSet->GetNumberOfCells());
     return true;
 }
@@ -190 +373 @@
     }
 
-    TRACE("DataSet class: %s", _dataSet->GetClassName());
 #ifdef WANT_TRACE
-    double dataRange[2];
-    getDataRange(dataRange);
-    double bounds[6];
-    getBounds(bounds);
+    print();
 #endif    
-    TRACE("Scalar Range: %.12e, %.12e", dataRange[0], dataRange[1]);
-    TRACE("DataSet bounds: %g %g %g %g %g %g",
-          bounds[0], bounds[1],
-          bounds[2], bounds[3],
-          bounds[4], bounds[5]);
     return _dataSet;
 }
@@ -208 +382 @@
  * \brief Does DataSet lie in the XY plane (z = 0)
  */
-bool DataSet::is2D() const
+bool DataSet::isXY() const
 {
     double bounds[6];
@@ -216 +390 @@
 
 /**
+ * \brief Returns the dimensionality of the AABB
+ */
+int DataSet::numDimensions() const
+{
+    double bounds[6];
+    getBounds(bounds);
+    int numDims = 0;
+    if (bounds[0] != bounds[1])
+        numDims++;
+    if (bounds[2] != bounds[3])
+        numDims++;
+    if (bounds[4] != bounds[5])
+        numDims++;
+
+    return numDims;
+}
+
+/**
+ * \brief Determines if DataSet lies in a principal axis plane
+ * and if so, returns the plane normal and offset from origin
+ */
+bool DataSet::is2D(DataSet::PrincipalPlane *plane, double *offset) const
+{
+    double bounds[6];
+    getBounds(bounds);
+    if (bounds[4] == bounds[5]) {
+        // Z = 0, XY plane
+        if (plane != NULL) {
+            *plane = PLANE_XY;
+        }
+        if (offset != NULL)
+            *offset = bounds[4];
+        return true;
+    } else if (bounds[0] == bounds[1]) {
+        // X = 0, ZY plane
+        if (plane != NULL) {
+            *plane = PLANE_ZY;
+        }
+        if (offset != NULL)
+            *offset = bounds[0];
+        return true;
+    } else if (bounds[2] == bounds[3]) {
+        // Y = 0, XZ plane
+        if (plane != NULL) {
+            *plane = PLANE_XZ;
+         }
+        if (offset != NULL)
+            *offset = bounds[2];
+        return true;
+    }
+    return false;
+}
+
+/**
+ * \brief Determines a principal plane with the
+ * largest two dimensions of the AABB
+ */
+DataSet::PrincipalPlane DataSet::principalPlane() const
+{
+    double bounds[6];
+    getBounds(bounds);
+    double xlen = bounds[1] - bounds[0];
+    double ylen = bounds[3] - bounds[2];
+    double zlen = bounds[5] - bounds[4];
+    if (zlen <= xlen && zlen <= ylen) {
+        return PLANE_XY;
+    } else if (xlen <= ylen && xlen <= zlen) {
+        return PLANE_ZY;
+    } else {
+        return PLANE_XZ;
+    }
+}
+
+/**
  * \brief Get the name/id of this dataset
  */
@@ -247 +495 @@
     if (_dataSet != NULL) {
         if (_dataSet->GetPointData() != NULL) {
-            if (_dataSet->GetPointData()->SetActiveScalars(name) >= 0)
+            if (_dataSet->GetPointData()->SetActiveScalars(name) >= 0) {
+                TRACE("Set active point data scalars to %s", name);
                 found = true;
+            }
         }
         if (_dataSet->GetCellData() != NULL) {
-            if (_dataSet->GetCellData()->SetActiveScalars(name) >= 0)
+            if (_dataSet->GetCellData()->SetActiveScalars(name) >= 0) {
+                TRACE("Set active cell data scalars to %s", name);
                 found = true;
-        }
-    }
+            }
+        }
+    }
+#ifdef WANT_TRACE
+    if (_dataSet->GetPointData() != NULL) {
+        if (_dataSet->GetPointData()->GetScalars() != NULL) {
+            TRACE("Point data scalars: %s", _dataSet->GetPointData()->GetScalars()->GetName());
+        } else {
+            TRACE("NULL point data scalars");
+        }
+    }
+    if (_dataSet->GetCellData() != NULL) {
+        if (_dataSet->GetCellData()->GetScalars() != NULL) {
+            TRACE("Cell data scalars: %s", _dataSet->GetCellData()->GetScalars()->GetName());
+        } else {
+            TRACE("NULL cell data scalars");
+        }
+    }
+#endif
     return found;
+}
+
+/**
+ * \brief Get the active scalar array field name
+ */
+const char *DataSet::getActiveScalarsName()
+{
+    if (_dataSet != NULL) {
+         if (_dataSet->GetPointData() != NULL &&
+             _dataSet->GetPointData()->GetScalars() != NULL) {
+            return _dataSet->GetPointData()->GetScalars()->GetName();
+        }
+        TRACE("No point scalars");
+        if (_dataSet->GetCellData() != NULL &&
+            _dataSet->GetCellData()->GetScalars() != NULL) {
+            return _dataSet->GetCellData()->GetScalars()->GetName();
+        }
+        TRACE("No cell scalars");
+    }
+    return NULL;
 }
 
@@ -266 +554 @@
     if (_dataSet != NULL) {
         if (_dataSet->GetPointData() != NULL) {
-            if (_dataSet->GetPointData()->SetActiveVectors(name) >= 0)
+            if (_dataSet->GetPointData()->SetActiveVectors(name) >= 0) {
+                TRACE("Set active point data vectors to %s", name);
                 found = true;
+            }
         }
         if (_dataSet->GetCellData() != NULL) {
-            if (_dataSet->GetCellData()->SetActiveVectors(name) >= 0)
+            if (_dataSet->GetCellData()->SetActiveVectors(name) >= 0) {
+                TRACE("Set active cell data vectors to %s", name);
                 found = true;
-        }
-    }
+            }
+        }
+    }
+
     return found;
 }
 
 /**
+ * \brief Get the active vector array field name
+ */
+const char *DataSet::getActiveVectorsName()
+{
+    if (_dataSet != NULL) {
+        if (_dataSet->GetPointData() != NULL &&
+            _dataSet->GetPointData()->GetVectors() != NULL) {
+            return _dataSet->GetPointData()->GetVectors()->GetName();
+        }
+        TRACE("No point vectors");
+        if (_dataSet->GetCellData() != NULL &&
+            _dataSet->GetCellData()->GetVectors() != NULL) {
+            return _dataSet->GetCellData()->GetVectors()->GetName();
+        }
+        TRACE("No cell vectors");
+    }
+    return NULL;
+}
+
+/**
  * \brief Get the range of scalar values in the DataSet
  */
-void DataSet::getDataRange(double minmax[2]) const
-{
-    _dataSet->GetScalarRange(minmax);
-}
-
-/**
- * \brief Get the range of scalar values (or vector magnitudes) for
- * the named field in the DataSet
- */
-void DataSet::getDataRange(double minmax[2], const char *fieldName) const
+void DataSet::getScalarRange(double minmax[2]) const
 {
     if (_dataSet == NULL)
         return;
     if (_dataSet->GetPointData() != NULL &&
-        _dataSet->GetPointData()->GetArray(fieldName) != NULL) {
-        _dataSet->GetPointData()->GetArray(fieldName)->GetRange(minmax, -1);
+        _dataSet->GetPointData()->GetScalars() != NULL) {
+        _dataSet->GetPointData()->GetScalars()->GetRange(minmax, -1);
     } else if (_dataSet->GetCellData() != NULL &&
-        _dataSet->GetCellData()->GetArray(fieldName) != NULL) {
-        _dataSet->GetCellData()->GetArray(fieldName)->GetRange(minmax, -1);
-    } else if (_dataSet->GetFieldData() != NULL &&
-        _dataSet->GetFieldData()->GetArray(fieldName) != NULL) {
-        _dataSet->GetFieldData()->GetArray(fieldName)->GetRange(minmax, -1);
-    }
-}
-
-/**
- * \brief Get the range of vector magnitudes in the DataSet
- */
-void DataSet::getVectorMagnitudeRange(double minmax[2]) const
-{
-    if (_dataSet == NULL) 
-        return;
-    if (_dataSet->GetPointData() != NULL &&
-        _dataSet->GetPointData()->GetVectors() != NULL) {
-        _dataSet->GetPointData()->GetVectors()->GetRange(minmax, -1);
-    } else if (_dataSet->GetCellData() != NULL &&
-               _dataSet->GetCellData()->GetVectors() != NULL) {
-        _dataSet->GetCellData()->GetVectors()->GetRange(minmax, -1);
+               _dataSet->GetCellData()->GetScalars() != NULL) {
+        _dataSet->GetCellData()->GetScalars()->GetRange(minmax, -1);
     }
 }
@@ -323 +608 @@
 /**
  * \brief Get the range of a vector component in the DataSet
- */
-void DataSet::getVectorComponentRange(double minmax[2], int component) const
+ *
+ * \param[out] minmax The data range
+ * \param[in] component The field component, -1 means magnitude
+ */
+void DataSet::getVectorRange(double minmax[2], int component) const
 {
     if (_dataSet == NULL)
@@ -338 +626 @@
 
 /**
+ * \brief Get the range of values for the named field in the DataSet
+ *
+ * \param[out] minmax The data range
+ * \param[in] fieldName The array name
+ * \param[in] component The field component, -1 means magnitude
+ */
+void DataSet::getDataRange(double minmax[2], const char *fieldName, int component) const
+{
+    if (_dataSet == NULL)
+        return;
+    if (_dataSet->GetPointData() != NULL &&
+        _dataSet->GetPointData()->GetArray(fieldName) != NULL) {
+        _dataSet->GetPointData()->GetArray(fieldName)->GetRange(minmax, component);
+    } else if (_dataSet->GetCellData() != NULL &&
+        _dataSet->GetCellData()->GetArray(fieldName) != NULL) {
+        _dataSet->GetCellData()->GetArray(fieldName)->GetRange(minmax, component);
+    } else if (_dataSet->GetFieldData() != NULL &&
+        _dataSet->GetFieldData()->GetArray(fieldName) != NULL) {
+        _dataSet->GetFieldData()->GetArray(fieldName)->GetRange(minmax, component);
+    }
+}
+
+/**
  * \brief Get the bounds the DataSet
  */
@@ -346 +657 @@
 
 /**
+ * \brief Get the range of cell AABB diagonal lengths in the DataSet
+ */
+void DataSet::getCellSizeRange(double minmax[2], double *average)
+{
+    if (_dataSet == NULL ||
+        _dataSet->GetNumberOfCells() < 1) {
+        minmax[0] = 1;
+        minmax[1] = 1;
+        *average = 1;
+        return;
+    }
+
+    if (_cellSizeRange[0] >= 0.0) {
+        minmax[0] = _cellSizeRange[0];
+        minmax[1] = _cellSizeRange[1];
+        *average = _cellSizeAverage;
+        return;
+    }
+
+    minmax[0] = DBL_MAX;
+    minmax[1] = -DBL_MAX;
+
+    *average = 0;
+    for (int i = 0; i < _dataSet->GetNumberOfCells(); i++) {
+        double length2 = _dataSet->GetCell(i)->GetLength2();
+        if (length2 < minmax[0])
+            minmax[0] = length2;
+        if (length2 > minmax[1])
+            minmax[1] = length2;
+        *average += length2;
+    }
+    if (minmax[0] == DBL_MAX)
+        minmax[0] = 1;
+    if (minmax[1] == -DBL_MAX)
+        minmax[1] = 1;
+
+    minmax[0] = sqrt(minmax[0]);
+    minmax[1] = sqrt(minmax[1]);
+    *average = sqrt(*average/((double)_dataSet->GetNumberOfCells()));
+    _cellSizeRange[0] = minmax[0];
+    _cellSizeRange[1] = minmax[1];
+    _cellSizeAverage = *average;
+}
+
+/**
  * \brief Get nearest data value given world coordinates x,y,z
  *
@@ -352 +708 @@
  * \return the value of the nearest point or 0 if no scalar data available
  */
-double DataSet::getDataValue(double x, double y, double z) const
+bool DataSet::getScalarValue(double x, double y, double z, double *value) const
 {
     if (_dataSet == NULL)
-        return 0;
+        return false;
     if (_dataSet->GetPointData() == NULL ||
         _dataSet->GetPointData()->GetScalars() == NULL) {
-        return 0.0;
+        return false;
     }
     vtkIdType pt = _dataSet->FindPoint(x, y, z);
-    return _dataSet->GetPointData()->GetScalars()->GetComponent(pt, 0);
-}
+    if (pt < 0)
+        return false;
+    *value = _dataSet->GetPointData()->GetScalars()->GetComponent(pt, 0);
+    return true;
+}
+
+/**
+ * \brief Get nearest vector data value given world coordinates x,y,z
+ *
+ * Note: no interpolation is performed on data
+ *
+ * \param[in] x World x coordinate to probe
+ * \param[in] y World y coordinate to probe
+ * \param[in] z World z coordinate to probe
+ * \param[out] vector On success, contains the data values
+ * \return boolean indicating success or failure
+ */
+bool DataSet::getVectorValue(double x, double y, double z, double vector[3]) const
+{
+    if (_dataSet == NULL)
+        return false;
+    if (_dataSet->GetPointData() == NULL ||
+        _dataSet->GetPointData()->GetVectors() == NULL) {
+        return false;
+    }
+    vtkIdType pt = _dataSet->FindPoint(x, y, z);
+    if (pt < 0)
+        return false;
+    assert(_dataSet->GetPointData()->GetVectors()->GetNumberOfComponents() == 3);
+    _dataSet->GetPointData()->GetVectors()->GetTuple(pt, vector);
+    return true;
+}

branches/blt4/packages/vizservers/vtkvis/RpVtkDataSet.h

@@ -12 +12 @@
 #include <vtkDataSet.h>
 #include <vtkDataSetReader.h>
+#include <vtkProp.h>
+#include <vtkActor.h>
+#include <vtkOutlineFilter.h>
+#include <vtkPolyDataMapper.h>
 
 #include <string>
@@ -24 +28 @@
 class DataSet {
 public:
+    enum PrincipalPlane {
+        PLANE_XY,
+        PLANE_ZY,
+        PLANE_XZ
+    };
     DataSet(const std::string& name);
     virtual ~DataSet();
@@ -37 +46 @@
     vtkDataSet *copyData(vtkDataSet *ds);
 
-    bool is2D() const;
+    bool isXY() const;
+
+    int numDimensions() const;
+
+    bool is2D(PrincipalPlane *plane = NULL, double *offset = NULL) const;
+
+    PrincipalPlane principalPlane() const;
 
     const std::string& getName() const;
@@ -47 +62 @@
     bool setActiveScalars(const char *name);
 
+    const char *getActiveScalarsName();
+
     bool setActiveVectors(const char *name);
 
-    void getDataRange(double minmax[2]) const;
+    const char *getActiveVectorsName();
 
-    void getDataRange(double minmax[2], const char *fieldName) const;
+    void getScalarRange(double minmax[2]) const;
 
-    void getVectorMagnitudeRange(double minmax[2]) const;
+    void getDataRange(double minmax[2], const char *fieldName, int component = -1) const;
 
-    void getVectorComponentRange(double minmax[2], int component) const;
+    void getVectorRange(double minmax[2], int component = -1) const;
 
     void getBounds(double bounds[6]) const;
 
-    double getDataValue(double x, double y, double z) const;
+    void getCellSizeRange(double minmax[2], double *average);
+
+    bool getScalarValue(double x, double y, double z, double *value) const;
+
+    bool getVectorValue(double x, double y, double z, double vector[3]) const;
+
+    void setOpacity(double opacity);
+
+    /**
+     * \brief Get the opacity setting for the DataSet
+     *
+     * This method is used for record-keeping.  The renderer controls
+     * the visibility of related graphics objects.
+     */
+    inline double getOpacity()
+    {
+        return _opacity;
+    }
 
     void setVisibility(bool state);
@@ -65 +99 @@
     bool getVisibility() const;
 
+    void showOutline(bool state);
+
+    void setOutlineColor(float color[3]);
+
+    /**
+     * \brief Return the VTK prop object for the outline
+     */
+    inline vtkProp *getProp()
+    {
+        return _prop;
+    }
+
 private:
     DataSet();
+
+    void setDefaultArrays();
+    void print() const;
+
+    void initProp();
 
     std::string _name;
     vtkSmartPointer<vtkDataSet> _dataSet;
     bool _visible;
+    double _opacity;
+    double _cellSizeRange[2];
+    double _cellSizeAverage;
+    vtkSmartPointer<vtkOutlineFilter> _outlineFilter;
+    vtkSmartPointer<vtkActor> _prop;
+    vtkSmartPointer<vtkPolyDataMapper> _outlineMapper;
 };
 

branches/blt4/packages/vizservers/vtkvis/RpVtkGraphicsObject.h

@@ -46 +46 @@
         _opacity(1.0),
         _edgeWidth(1.0f),
+        _pointSize(1.0f),
         _lighting(true),
         _cullFace(CULL_BACK),
         _faceCulling(false)
     {
+        _dataRange[0] = 0;
+        _dataRange[1] = 1;
         _color[0] = 1.0f;
         _color[1] = 1.0f;
@@ -70 +73 @@
      *
      * Default implementation calls update()
+     *
+     * \param[in] dataSet DataSet to use in rendering
      */
     virtual void setDataSet(DataSet *dataSet)
@@ -75 +80 @@
         if (_dataSet != dataSet) {
             _dataSet = dataSet;
+
             update();
+        }
+    }
+
+    /**
+     * \brief Specify input DataSet and information on cumulative data ranges
+     *
+     * Default implementation calls update() and stores scalarRange to
+     * _dataRange based on cumulative range settings
+     *
+     * \param[in] dataSet DataSet to use in rendering
+     * \param[in] useCumulative Whether the cumulative data ranges should be 
+     * used in place of the dataSet's ranges
+     * \param[in] scalarRange Current cumulative scalar data range
+     * \param[in] vectorMagnitudeRange Current cumulative vector magnitude data range
+     * \param[in] vectorComponentRange Current cumulative vector component data ranges
+     */
+    virtual void setDataSet(DataSet *dataSet,
+                            bool useCumulative,
+                            double scalarRange[2],
+                            double vectorMagnitudeRange[2],
+                            double vectorComponentRange[3][2])
+    {
+        if (_dataSet != dataSet) {
+            _dataSet = dataSet;
+
+            if (useCumulative) {
+                _dataRange[0] = scalarRange[0];
+                _dataRange[1] = scalarRange[1];
+            } else {
+                _dataSet->getScalarRange(_dataRange);
+            }
+
+            update();
+        }
+    }
+
+    /**
+     * \brief Called when scalar or vector field changes (e.g. active field) or 
+     * cumulative ranges or settings change
+     *
+     * \param[in] useCumulative Whether the cumulative data ranges should be 
+     * used in place of the dataSet's ranges
+     * \param[in] scalarRange Current cumulative scalar data range
+     * \param[in] vectorMagnitudeRange Current cumulative vector magnitude data range
+     * \param[in] vectorComponentRange Current cumulative vector component data ranges
+     */
+    virtual void updateRanges(bool useCumulative,
+                              double scalarRange[2],
+                              double vectorMagnitudeRange[2],
+                              double vectorComponentRange[3][2])
+    {
+        if (useCumulative) {
+            _dataRange[0] = scalarRange[0];
+            _dataRange[1] = scalarRange[1];
+        } else {
+            _dataSet->getScalarRange(_dataRange);
         }
     }
@@ -171 +233 @@
             double angle = vtkMath::DegreesFromRadians(2.0 * acos(quat[0]));
             double axis[3];
-            double denom = sqrt(1. - quat[0] * quat[0]);
-            axis[0] = quat[1] / denom;
-            axis[1] = quat[2] / denom;
-            axis[2] = quat[3] / denom;
+            if (angle < 1.0e-6) {
+                axis[0] = 1;
+                axis[1] = 0;
+                axis[2] = 0;
+            } else {
+                double denom = sqrt(1. - quat[0] * quat[0]);
+                axis[0] = quat[1] / denom;
+                axis[1] = quat[2] / denom;
+                axis[2] = quat[3] / denom;
+             }
             setOrientation(angle, axis);
         }
@@ -522 +590 @@
     {
         for (int i = 0; i < 3; i++)
-            _color[i] = color[i];
+            _edgeColor[i] = color[i];
         if (getActor() != NULL) {
             getActor()->GetProperty()->SetEdgeColor(color[0], color[1], color[2]);
@@ -540 +608 @@
      * \brief Set pixel width of edges
      *
-     * NOTE: May be a no-op if OpenGL implementation doesn't support fat lines
+     * NOTE: May be a no-op if OpenGL implementation doesn't support wide lines
      */
     virtual void setEdgeWidth(float width)
@@ -554 +622 @@
                 if (vtkActor::SafeDownCast(prop) != NULL) {
                     vtkActor::SafeDownCast(prop)->GetProperty()->SetLineWidth(width);
+                }
+            }
+        }
+    }
+
+    /**
+     * \brief Set point size
+     *
+     * NOTE: May be a no-op if OpenGL implementation doesn't support wide points
+     */
+    virtual void setPointSize(float size)
+    {
+        _pointSize = size;
+        if (getActor() != NULL) {
+            getActor()->GetProperty()->SetPointSize(size);
+        } else if (getAssembly() != NULL) {
+            vtkProp3DCollection *props = getAssembly()->GetParts();
+            vtkProp3D *prop;
+            props->InitTraversal();
+            while ((prop = props->GetNextProp3D()) != NULL) {
+                if (vtkActor::SafeDownCast(prop) != NULL) {
+                    vtkActor::SafeDownCast(prop)->GetProperty()->SetPointSize(size);
                 }
             }
@@ -589 +679 @@
         }
     }
+
+    /**
+     * \brief Toggle culling of selected CullFace
+     */
+    virtual void setCulling(bool state)
+    {
+        _faceCulling = state;
+        if (state && _opacity < 1.0)
+            return;
+        if (getActor() != NULL) {
+            setCulling(getActor()->GetProperty(), state);
+         } else if (getAssembly() != NULL) {
+            vtkProp3DCollection *props = getAssembly()->GetParts();
+            vtkProp3D *prop;
+            props->InitTraversal();
+            while ((prop = props->GetNextProp3D()) != NULL) {
+                if (vtkActor::SafeDownCast(prop) != NULL) {
+                    setCulling(vtkActor::SafeDownCast(prop)->GetProperty(), state);
+                }
+            }
+        }
+    }
+
+    /**
+     * \brief Specify which face(s) to cull when culling is enabled
+     */
+    virtual void setCullFace(CullFace cull)
+    {
+        _cullFace = cull;
+        setCulling(_faceCulling);
+    }
+
+    /**
+     * \brief Subclasses need to implement setting clipping planes in their mappers
+     */
+    virtual void setClippingPlanes(vtkPlaneCollection *planes) = 0;
+
+protected:
+    /**
+     * \brief Create and initialize a VTK Prop to render the object
+     */
+    virtual void initProp()
+    {
+        if (_prop == NULL) {
+            _prop = vtkSmartPointer<vtkActor>::New();
+            vtkProperty *property = getActor()->GetProperty();
+            property->SetColor(_color[0], _color[1], _color[2]);
+            property->SetEdgeColor(_edgeColor[0], _edgeColor[1], _edgeColor[2]);
+            property->SetLineWidth(_edgeWidth);
+            property->SetPointSize(_pointSize);
+            property->EdgeVisibilityOff();
+            property->SetOpacity(_opacity);
+            property->SetAmbient(.2);
+            if (!_lighting)
+                property->LightingOff();
+            if (_faceCulling && _opacity == 1.0) {
+                setCulling(property, true);
+            }
+        }
+    }
+
+    /**
+     * \brief Subclasses implement this to create the VTK pipeline
+     * on a state change (e.g. new DataSet)
+     */
+    virtual void update() = 0;
 
     /**
@@ -613 +769 @@
     }
 
-    /**
-     * \brief Toggle culling of selected CullFace
-     */
-    virtual void setCulling(bool state)
-    {
-        _faceCulling = state;
-        if (state && _opacity < 1.0)
-            return;
-        if (getActor() != NULL) {
-            setCulling(getActor()->GetProperty(), state);
-         } else if (getAssembly() != NULL) {
-            vtkProp3DCollection *props = getAssembly()->GetParts();
-            vtkProp3D *prop;
-            props->InitTraversal();
-            while ((prop = props->GetNextProp3D()) != NULL) {
-                if (vtkActor::SafeDownCast(prop) != NULL) {
-                    setCulling(vtkActor::SafeDownCast(prop)->GetProperty(), state);
-                }
-            }
-        }
-    }
-
-    virtual void setCullFace(CullFace cull)
-    {
-        _cullFace = cull;
-        setCulling(_faceCulling);
-    }
-
-    /**
-     * \brief Subclasses need to implement setting clipping planes in their mappers
-     */
-    virtual void setClippingPlanes(vtkPlaneCollection *planes) = 0;
-
-protected:
-    /**
-     * \brief Create and initialize a VTK Prop to render the object
-     */
-    virtual void initProp()
-    {
-        if (_prop == NULL) {
-            _prop = vtkSmartPointer<vtkActor>::New();
-            vtkProperty *property = getActor()->GetProperty();
-            property->EdgeVisibilityOff();
-            property->SetOpacity(_opacity);
-            property->SetAmbient(.2);
-            if (!_lighting)
-                property->LightingOff();
-            if (_faceCulling && _opacity == 1.0) {
-                setCulling(property, true);
-            }
-        }
-    }
-
-    /**
-     * \brief Subclasses implement this to create the VTK pipeline
-     * on a state change (e.g. new DataSet)
-     */
-    virtual void update() = 0;
-
     DataSet *_dataSet;
+    double _dataRange[2];
     double _opacity;
     float _color[3];
     float _edgeColor[3];
     float _edgeWidth;
+    float _pointSize;
     bool _lighting;
     CullFace _cullFace;

branches/blt4/packages/vizservers/vtkvis/RpVtkRenderServer.cpp

@@ +1 @@
+
 /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
@@ -9 +10 @@
 #include <cstring>
 #include <cstdlib>
-#include <string>
-#include <sstream>
+#include <cerrno>
 #include <unistd.h>
 #include <signal.h>
@@ -17 +17 @@
 #include <sys/time.h>
 #endif
+
+#include <string>
+#include <sstream>
 
 #include "Trace.h"
@@ -24 +27 @@
 #include "PPMWriter.h"
 #include "TGAWriter.h"
+#ifdef USE_THREADS
+#include <pthread.h>
+#include "ResponseQueue.h"
+#endif 
 
 using namespace Rappture::VtkVis;
@@ -38 +45 @@
      (((t2).tv_sec - (t1).tv_sec))*1.0e+3f + (float)((t2).tv_usec - (t1).tv_usec)/1.0e+3f)
 
+#ifdef USE_THREADS
 static void
-writeFrame(int fd, vtkUnsignedCharArray *imgData)
+queueFrame(ResponseQueue *queue, vtkUnsignedCharArray *imgData)
 {
 #ifdef DEBUG
@@ -65 +73 @@
                  TARGA_BYTES_PER_PIXEL,
                  true);
-#endif
+#endif  /*RENDER_TARGA*/
 
 #else
     if (g_renderer->getCameraMode() == Renderer::IMAGE) {
         double xywh[4];
-        g_renderer->getScreenWorldCoords(xywh);
+        g_renderer->getCameraZoomRegion(xywh);
         std::ostringstream oss;
         oss.precision(12);
@@ -77 +85 @@
             << std::scientific
             << xywh[0] << " "
-            << (xywh[1] + xywh[3]) << " "
-            << (xywh[0] + xywh[2]) << " "
-            << xywh[1] << "} -bytes";
+            << xywh[1] << " "
+            << xywh[2] << " "
+            << xywh[3] << "} -bytes";
+
+#ifdef RENDER_TARGA
+        queueTGA(queue, oss.str().c_str(),
+                 imgData->GetPointer(0),
+                 g_renderer->getWindowWidth(),
+                 g_renderer->getWindowHeight(),
+                 TARGA_BYTES_PER_PIXEL);
+#else
+        queuePPM(queue, oss.str().c_str(),
+                 imgData->GetPointer(0),
+                 g_renderer->getWindowWidth(),
+                 g_renderer->getWindowHeight());
+#endif  /*RENDER_TARGA*/
+    } else {
+#ifdef RENDER_TARGA
+        queueTGA(queue, "nv>image -type image -bytes",
+                 imgData->GetPointer(0),
+                 g_renderer->getWindowWidth(),
+                 g_renderer->getWindowHeight(),
+                 TARGA_BYTES_PER_PIXEL);
+#else
+        queuePPM(queue, "nv>image -type image -bytes",
+                 imgData->GetPointer(0),
+                 g_renderer->getWindowWidth(),
+                 g_renderer->getWindowHeight());
+#endif  /*RENDER_TARGA*/
+    }
+#endif  /*DEBUG*/
+}
+
+#else
+
+static void
+writeFrame(int fd, vtkUnsignedCharArray *imgData)
+{
+#ifdef DEBUG
+    if (g_renderer->getCameraMode() == Renderer::IMAGE) {
+        double xywh[4];
+        g_renderer->getScreenWorldCoords(xywh);
+        TRACE("Image bbox: %g %g %g %g", 
+              xywh[0], 
+              (xywh[1] + xywh[3]), 
+              (xywh[0] + xywh[2]), 
+              xywh[1]);
+    }
+
+#ifdef RENDER_TARGA
+    writeTGAFile("/tmp/frame.tga",
+                 imgData->GetPointer(0),
+                 g_renderer->getWindowWidth(),
+                 g_renderer->getWindowHeight(),
+                 TARGA_BYTES_PER_PIXEL);
+#else
+    writeTGAFile("/tmp/frame.tga",
+                 imgData->GetPointer(0),
+                 g_renderer->getWindowWidth(),
+                 g_renderer->getWindowHeight(),
+                 TARGA_BYTES_PER_PIXEL,
+                 true);
+#endif  /*RENDER_TARGA*/
+
+#else
+    if (g_renderer->getCameraMode() == Renderer::IMAGE) {
+        double xywh[4];
+        g_renderer->getCameraZoomRegion(xywh);
+        std::ostringstream oss;
+        oss.precision(12);
+        // Send upper left and lower right corners as bbox
+        oss << "nv>image -type image -bbox {"
+            << std::scientific
+            << xywh[0] << " "
+            << xywh[1] << " "
+            << xywh[2] << " "
+            << xywh[3] << "} -bytes";
 
 #ifdef RENDER_TARGA
@@ -92 +174 @@
                  g_renderer->getWindowWidth(),
                  g_renderer->getWindowHeight());
-#endif
+#endif  /*RENDER_TARGA*/
     } else {
 #ifdef RENDER_TARGA
@@ -105 +187 @@
                  g_renderer->getWindowWidth(),
                  g_renderer->getWindowHeight());
-#endif
-    }
-#endif
-}
+#endif  /*RENDER_TARGA*/
+    }
+#endif  /*DEBUG*/
+}
+#endif /*USE_THREADS*/
 
 static void
@@ -153 +236 @@
 }
 
+#ifdef USE_THREADS
+static void *
+readerThread(void *clientData)
+{
+    ResponseQueue *queue = (ResponseQueue *)clientData;
+    Tcl_Interp *interp;
+
+    TRACE("starting reader thread");
+    interp = (Tcl_Interp *)queue->clientData();
+    vtkSmartPointer<vtkUnsignedCharArray> imgData = 
+        vtkSmartPointer<vtkUnsignedCharArray>::New();
+    for (;;) {
+        int ret;
+
+        ret = processCommands(interp, g_fIn, g_fOut);
+        if (ret < 0)
+            break;
+        if (g_renderer->render()) {
+            TRACE("Rendering new frame");
+            g_renderer->getRenderedFrame(imgData);
+            queueFrame(queue, imgData);
+        } else {
+            TRACE("No render required");
+        }
+        if (feof(g_fIn))
+            break;
+    }    
+    return NULL;
+}
+
+static void *
+writerThread(void *clientData)
+{
+    ResponseQueue *queue = (ResponseQueue *)clientData;
+
+    TRACE("starting writer thread");
+    for (;;) {
+        Response *response;
+
+        response = queue->dequeue(); 
+        if (fwrite(response->message(), sizeof(char), response->length(),
+                   g_fOut) != response->length()) {
+            ERROR("short write while trying to write %ld bytes", 
+                  response->length());
+        }
+        fflush(g_fOut);
+        delete response;
+        if (feof(g_fOut))
+            break;
+    }    
+    return NULL;
+}
+
+#endif  /*USE_THREADS*/
+
 int
 main(int argc, char *argv[])
@@ -159 +297 @@
     signal(SIGPIPE, SIG_IGN);
     initService();
-    InitLog();
+    initLog();
 
     TRACE("Starting VTKVis Server");
@@ -176 +314 @@
 
     g_renderer = new Renderer();
+
+    Tcl_Interp *interp = Tcl_CreateInterp();
+
+#ifdef USE_THREADS
+    ResponseQueue queue((void *)interp);
+    initTcl(interp, (ClientData)&queue);
+
+    pthread_t readerThreadId, writerThreadId;
+    if (pthread_create(&readerThreadId, NULL, &readerThread, &queue) < 0) {
+        ERROR("can't create reader thread: %s", strerror(errno));
+    }
+    if (pthread_create(&writerThreadId, NULL, &writerThread, &queue) < 0) {
+        ERROR("can't create writer thread: %s", strerror(errno));
+    }
+    if (pthread_join(readerThreadId, NULL) < 0) {
+        ERROR("can't join reader thread: %s", strerror(errno));
+    }
+    if (pthread_join(writerThreadId, NULL) < 0) {
+        ERROR("can't join writer thread: %s", strerror(errno));
+    }
+#else 
+    initTcl(interp, (ClientData)NULL);
+    int ret = 0;
+
     vtkSmartPointer<vtkUnsignedCharArray> imgData = 
         vtkSmartPointer<vtkUnsignedCharArray>::New();
-
-    Tcl_Interp *interp = initTcl();
-
-    int ret = 0;
-
     while (1) {
         ret = processCommands(interp, g_fIn, g_fOut);
@@ -199 +356 @@
             break;
     }
-
+#endif
+    INFO("exiting vtkvis");
     exitTcl(interp);
     interp = NULL;
@@ -208 +366 @@
     TRACE("Exiting VTKVis Server");
 
-    CloseLog();
+    closeLog();
     exitService();
 
-    return ret;
-}
-
+    return 0;
+}
+

branches/blt4/packages/vizservers/vtkvis/RpVtkRenderer.cpp

@@ -24 +24 @@
 #include <vtkCharArray.h>
 #include <vtkAxisActor2D.h>
+#include <vtkCubeAxesActor.h>
 #ifdef USE_CUSTOM_AXES
-#include <vtkRpCubeAxesActor2D.h>
+#include "vtkRpCubeAxesActor2D.h"
 #else
-#include <vtkCubeAxesActor.h>
 #include <vtkCubeAxesActor2D.h>
 #endif
@@ -53 +53 @@
 Renderer::Renderer() :
     _needsRedraw(true),
-    _windowWidth(320),
-    _windowHeight(320),
+    _windowWidth(500),
+    _windowHeight(500),
+    _imgCameraPlane(PLANE_XY),
+    _imgCameraOffset(0),
     _cameraZoomRatio(1),
     _useCumulativeRange(true),
@@ -69 +71 @@
     _cameraOrientation[2] = 0.0;
     _cameraOrientation[3] = 0.0;
-    _cumulativeDataRange[0] = 0.0;
-    _cumulativeDataRange[1] = 1.0;
+    _cumulativeScalarRange[0] = 0.0;
+    _cumulativeScalarRange[1] = 1.0;
+    _cumulativeVectorMagnitudeRange[0] = 0.0;
+    _cumulativeVectorMagnitudeRange[1] = 1.0;
+    for (int i = 0; i < 3; i++) {
+        _cumulativeVectorComponentRange[i][0] = 0.0;
+        _cumulativeVectorComponentRange[i][1] = 1.0;
+    }
     // clipping planes to prevent overdrawing axes
     _activeClipPlanes = vtkSmartPointer<vtkPlaneCollection>::New();
@@ -130 +138 @@
     initCamera();
     addColorMap("default", ColorMap::getDefault());
+    addColorMap("grayDefault", ColorMap::getGrayDefault());
     addColorMap("volumeDefault", ColorMap::getVolumeDefault());
     addColorMap("elementDefault", ColorMap::getElementDefault());
@@ -263 +272 @@
     } while (doAll && itr != _contour2Ds.end());
 
+    initCamera();
     _needsRedraw = true;
 }
@@ -299 +309 @@
     } while (doAll && itr != _contour3Ds.end());
 
+    initCamera();
     _needsRedraw = true;
 }
@@ -335 +346 @@
     } while (doAll && itr != _glyphs.end());
 
+    initCamera();
     _needsRedraw = true;
 }
@@ -371 +383 @@
     } while (doAll && itr != _heightMaps.end());
 
+    initCamera();
     _needsRedraw = true;
 }
@@ -407 +420 @@
     } while (doAll && itr != _lics.end());
 
+    initCamera();
     _needsRedraw = true;
 }
@@ -443 +457 @@
     } while (doAll && itr != _molecules.end());
 
+    initCamera();
     _needsRedraw = true;
 }
@@ -479 +494 @@
     } while (doAll && itr != _polyDatas.end());
 
+    initCamera();
     _needsRedraw = true;
 }
@@ -515 +531 @@
     } while (doAll && itr != _pseudoColors.end());
 
+    initCamera();
     _needsRedraw = true;
 }
@@ -551 +568 @@
     } while (doAll && itr != _streamlines.end());
 
+    initCamera();
     _needsRedraw = true;
 }
@@ -587 +605 @@
     } while (doAll && itr != _volumes.end());
 
+    initCamera();
     _needsRedraw = true;
 }
@@ -627 +646 @@
         deleteVolume(itr->second->getName());
  
+        if (itr->second->getProp() != NULL) {
+            _renderer->RemoveViewProp(itr->second->getProp());
+        }
+
         TRACE("After deleting graphics objects");
 
@@ -634 +657 @@
 
     // Update cumulative data range
-    collectDataRanges(_cumulativeDataRange, _cumulativeRangeOnlyVisible);
-    updateRanges(_useCumulativeRange);
-
-    _needsRedraw = true;
+    updateRanges();
+
+    initCamera();
+    _needsRedraw = true;
+}
+
+void Renderer::getDataSetNames(std::vector<std::string>& names)
+{
+    names.clear();
+    for (DataSetHashmap::iterator itr = _dataSets.begin();
+         itr != _dataSets.end(); ++itr) {
+        names.push_back(itr->second->getName());
+    }
 }
 
@@ -649 +681 @@
     DataSetHashmap::iterator itr = _dataSets.find(id);
     if (itr == _dataSets.end()) {
+#ifdef DEBUG
         TRACE("DataSet not found: %s", id.c_str());
+#endif
         return NULL;
     } else
@@ -663 +697 @@
     if (ds) {
         bool ret = ds->setDataFile(filename);
-        collectDataRanges(_cumulativeDataRange, _cumulativeRangeOnlyVisible);
-        updateRanges(_useCumulativeRange);
+        updateRanges();
         _needsRedraw = true;
         return ret;
@@ -679 +712 @@
     if (ds) {
         bool ret = ds->setData(data, nbytes);
-        collectDataRanges(_cumulativeDataRange, _cumulativeRangeOnlyVisible);
-        updateRanges(_useCumulativeRange);
+        updateRanges();
         _needsRedraw = true;
         return ret;
@@ -712 +744 @@
 
     if (ret) {
-        collectDataRanges(_cumulativeDataRange, _cumulativeRangeOnlyVisible);
-        updateRanges(_useCumulativeRange);
+         updateRanges();
         _needsRedraw = true;
     } 
@@ -745 +776 @@
 
     if (ret) {
-        collectDataRanges(_cumulativeDataRange, _cumulativeRangeOnlyVisible);
-        updateRanges(_useCumulativeRange);
+        updateRanges();
         _needsRedraw = true;
     } 
@@ -762 +792 @@
         _useCumulativeRange = state;
         _cumulativeRangeOnlyVisible = onlyVisible;
-        collectDataRanges(_cumulativeDataRange, _cumulativeRangeOnlyVisible);
-        updateRanges(_useCumulativeRange);
+        updateRanges();
         _needsRedraw = true;
     }
 }
 
-void Renderer::resetAxes()
+void Renderer::resetAxes(double bounds[6])
 {
     TRACE("Resetting axes");
@@ -793 +822 @@
             _renderer->AddViewProp(_cubeAxesActor);
         }
-        double bounds[6];
-        collectBounds(bounds, false);
-        _cubeAxesActor->SetBounds(bounds);
+        if (bounds == NULL) {
+            double newBounds[6];
+            collectBounds(newBounds, false);
+            _cubeAxesActor->SetBounds(newBounds);
+            TRACE("Bounds (computed): %g %g %g %g %g %g",
+                  newBounds[0],
+                  newBounds[1],
+                  newBounds[2],
+                  newBounds[3],
+                  newBounds[4],
+                  newBounds[5]);
+        } else {
+            _cubeAxesActor->SetBounds(bounds);
+            TRACE("Bounds (supplied): %g %g %g %g %g %g",
+                  bounds[0],
+                  bounds[1],
+                  bounds[2],
+                  bounds[3],
+                  bounds[4],
+                  bounds[5]);
+        }
     }
 }
@@ -832 +879 @@
     _cubeAxesActor2D->GetXAxisActor2D()->AdjustLabelsOn();
     _cubeAxesActor2D->GetYAxisActor2D()->AdjustLabelsOn();
+    _cubeAxesActor2D->GetZAxisActor2D()->AdjustLabelsOn();
 
 #ifdef USE_CUSTOM_AXES
@@ -851 +899 @@
     _cubeAxesActor2D->GetYAxisActor2D()->GetLabelTextProperty()->ItalicOff();
     _cubeAxesActor2D->GetYAxisActor2D()->GetLabelTextProperty()->ShadowOff();
+
+    //_cubeAxesActor2D->GetZAxisActor2D()->SizeFontRelativeToAxisOn();
+    _cubeAxesActor2D->GetZAxisActor2D()->GetTitleTextProperty()->BoldOn();
+    _cubeAxesActor2D->GetZAxisActor2D()->GetTitleTextProperty()->ItalicOff();
+    _cubeAxesActor2D->GetZAxisActor2D()->GetTitleTextProperty()->ShadowOn();
+    _cubeAxesActor2D->GetZAxisActor2D()->GetLabelTextProperty()->BoldOff();
+    _cubeAxesActor2D->GetZAxisActor2D()->GetLabelTextProperty()->ItalicOff();
+    _cubeAxesActor2D->GetZAxisActor2D()->GetLabelTextProperty()->ShadowOff();
 #else
     _cubeAxesActor2D->GetAxisTitleTextProperty()->BoldOn();
@@ -913 +969 @@
         _cubeAxesActor2D->GetYAxisActor2D()->GetTitleTextProperty()->SetColor(color);
         _cubeAxesActor2D->GetYAxisActor2D()->GetLabelTextProperty()->SetColor(color);
+        _cubeAxesActor2D->GetZAxisActor2D()->GetTitleTextProperty()->SetColor(color);
+        _cubeAxesActor2D->GetZAxisActor2D()->GetLabelTextProperty()->SetColor(color);
 #else
         _cubeAxesActor2D->GetAxisTitleTextProperty()->SetColor(color);
@@ -922 +980 @@
 
 /**
- * \brief Turn on/off rendering of all axes
+ * \brief Turn on/off rendering of all enabled axes
  */
 void Renderer::setAxesVisibility(bool state)
@@ -934 +992 @@
         _needsRedraw = true;
     }
-    setAxisVisibility(X_AXIS, state);
-    setAxisVisibility(Y_AXIS, state);
-    setAxisVisibility(Z_AXIS, state);
 }
 
@@ -1012 +1067 @@
         } else if (axis == Y_AXIS) {
             _cubeAxesActor2D->SetYAxisVisibility((state ? 1 : 0));
+        } else if (axis == Z_AXIS) {
+            _cubeAxesActor2D->SetZAxisVisibility((state ? 1 : 0));
         }
         _needsRedraw = true;
@@ -1054 +1111 @@
         } else if (axis == Y_AXIS) {
             _cubeAxesActor2D->GetYAxisActor2D()->SetLabelVisibility((state ? 1 : 0));
+        } else if (axis == Z_AXIS) {
+            _cubeAxesActor2D->GetZAxisActor2D()->SetLabelVisibility((state ? 1 : 0));
         }
         _needsRedraw = true;
@@ -1079 +1138 @@
         } else if (axis == Y_AXIS) {
             _cubeAxesActor2D->GetYAxisActor2D()->SetTickVisibility((state ? 1 : 0));
+        } else if (axis == Z_AXIS) {
+            _cubeAxesActor2D->GetZAxisActor2D()->SetTickVisibility((state ? 1 : 0));
         }
         _needsRedraw = true;
@@ -1104 +1165 @@
         } else if (axis == Y_AXIS) {
             _cubeAxesActor2D->SetYLabel(title);
+        } else if (axis == Z_AXIS) {
+            _cubeAxesActor2D->SetZLabel(title);
         }
         _needsRedraw = true;
@@ -1130 +1193 @@
         } else if (axis == Y_AXIS) {
             _cubeAxesActor2D->SetYUnits(units);
+        } else if (axis == Z_AXIS) {
+            _cubeAxesActor2D->SetZUnits(units);
         }
         _needsRedraw = true;
@@ -1137 +1202 @@
 
 /**
- * \brief Add a color map for use in the Renderer
+ * \brief Notify graphics objects that color map has changed
+ */
+void Renderer::updateColorMap(ColorMap *cmap)
+{
+    for (Contour3DHashmap::iterator itr = _contour3Ds.begin();
+         itr != _contour3Ds.end(); ++itr) {
+        if (itr->second->getColorMap() == cmap) {
+            itr->second->updateColorMap();
+            _needsRedraw = true;
+        }
+    }
+    for (GlyphsHashmap::iterator itr = _glyphs.begin();
+         itr != _glyphs.end(); ++itr) {
+        if (itr->second->getColorMap() == cmap) {
+            itr->second->updateColorMap();
+            _needsRedraw = true;
+        }
+    }
+    for (HeightMapHashmap::iterator itr = _heightMaps.begin();
+         itr != _heightMaps.end(); ++itr) {
+        if (itr->second->getColorMap() == cmap) {
+            itr->second->updateColorMap();
+            _needsRedraw = true;
+        }
+    }
+    for (LICHashmap::iterator itr = _lics.begin();
+         itr != _lics.end(); ++itr) {
+        if (itr->second->getColorMap() == cmap) {
+            itr->second->updateColorMap();
+            _needsRedraw = true;
+        }
+    }
+    for (MoleculeHashmap::iterator itr = _molecules.begin();
+         itr != _molecules.end(); ++itr) {
+        if (itr->second->getColorMap() == cmap) {
+            itr->second->updateColorMap();
+            _needsRedraw = true;
+        }
+    }
+    for (PseudoColorHashmap::iterator itr = _pseudoColors.begin();
+         itr != _pseudoColors.end(); ++itr) {
+        if (itr->second->getColorMap() == cmap) {
+            itr->second->updateColorMap();
+            _needsRedraw = true;
+        }
+    }
+    for (StreamlinesHashmap::iterator itr = _streamlines.begin();
+         itr != _streamlines.end(); ++itr) {
+        if (itr->second->getColorMap() == cmap) {
+            itr->second->updateColorMap();
+            _needsRedraw = true;
+        }
+    }
+    for (VolumeHashmap::iterator itr = _volumes.begin();
+         itr != _volumes.end(); ++itr) {
+        if (itr->second->getColorMap() == cmap) {
+            itr->second->updateColorMap();
+            _needsRedraw = true;
+        }
+    }
+}
+
+/**
+ * \brief Check if a ColorMap is in use by graphics objects
+ */
+bool Renderer::colorMapUsed(ColorMap *cmap)
+{
+    for (Contour3DHashmap::iterator itr = _contour3Ds.begin();
+         itr != _contour3Ds.end(); ++itr) {
+        if (itr->second->getColorMap() == cmap)
+            return true;
+    }
+    for (GlyphsHashmap::iterator itr = _glyphs.begin();
+         itr != _glyphs.end(); ++itr) {
+        if (itr->second->getColorMap() == cmap)
+            return true;
+    }
+    for (HeightMapHashmap::iterator itr = _heightMaps.begin();
+         itr != _heightMaps.end(); ++itr) {
+        if (itr->second->getColorMap() == cmap)
+            return true;
+    }
+    for (LICHashmap::iterator itr = _lics.begin();
+         itr != _lics.end(); ++itr) {
+        if (itr->second->getColorMap() == cmap)
+            return true;
+    }
+    for (MoleculeHashmap::iterator itr = _molecules.begin();
+         itr != _molecules.end(); ++itr) {
+        if (itr->second->getColorMap() == cmap)
+            return true;
+    }
+    for (PseudoColorHashmap::iterator itr = _pseudoColors.begin();
+         itr != _pseudoColors.end(); ++itr) {
+        if (itr->second->getColorMap() == cmap)
+            return true;
+    }
+    for (StreamlinesHashmap::iterator itr = _streamlines.begin();
+         itr != _streamlines.end(); ++itr) {
+        if (itr->second->getColorMap() == cmap)
+            return true;
+    }
+    for (VolumeHashmap::iterator itr = _volumes.begin();
+         itr != _volumes.end(); ++itr) {
+        if (itr->second->getColorMap() == cmap)
+            return true;
+    }
+    return false;
+}
+
+/**
+ * \brief Add/replace a ColorMap for use in the Renderer
  */
 void Renderer::addColorMap(const ColorMapId& id, ColorMap *colorMap)
@@ -1144 +1320 @@
         colorMap->build();
         if (getColorMap(id) != NULL) {
-            WARN("Replacing existing ColorMap %s", id.c_str());
-            deleteColorMap(id);
-        }
-        _colorMaps[id] = colorMap;
+            TRACE("Replacing existing ColorMap %s", id.c_str());
+            // Copy to current colormap to avoid invalidating 
+            // pointers in graphics objects using the color map
+            *_colorMaps[id] = *colorMap;
+            delete colorMap;
+            // Notify graphics objects of change
+            updateColorMap(_colorMaps[id]);
+        } else
+            _colorMaps[id] = colorMap;
     } else {
         ERROR("NULL ColorMap");
@@ -1191 +1372 @@
 
     do {
+        if (itr->second->getName().compare("default") == 0 ||
+            itr->second->getName().compare("grayDefault") == 0 ||
+            itr->second->getName().compare("volumeDefault") == 0 ||
+            itr->second->getName().compare("elementDefault") == 0) {
+            if (id.compare("all") != 0) {
+                WARN("Cannot delete a default color map");
+            }
+            continue;
+        } else if (colorMapUsed(itr->second)) {
+            WARN("Cannot delete color map '%s', it is in use", itr->second->getName().c_str());
+            continue;
+        }
+
         TRACE("Deleting ColorMap %s", itr->second->getName().c_str());
 
-        // TODO: Check if color map is used in PseudoColors?
         delete itr->second;
         itr = _colorMaps.erase(itr);
@@ -1202 +1395 @@
  * \brief Render a labelled legend image for the given colormap
  *
+ * \param[in] id ColorMap name
+ * \param[in] dataSetID DataSet name
+ * \param[in] legendType scalar or vector field legend
+ * \param[in,out] title If supplied, draw title ("#auto" means to
+ * fill in field name and draw).  If blank, do not draw title.  
+ * If title was blank or "#auto", will be filled with field name on
+ * return
+ * \param[out] range Filled with min and max values
+ * \param[in] width Pixel width of legend (aspect controls orientation)
+ * \param[in] height Pixel height of legend (aspect controls orientation)
+ * \param[in] numLabels Number of labels to render (includes min/max)
+ * \param[in,out] imgData Pointer to array to fill with image bytes. Array
+ * will be resized if needed.
  * \return The image is rendered into the supplied array, false is 
  * returned if the color map is not found
@@ -1207 +1413 @@
 bool Renderer::renderColorMap(const ColorMapId& id, 
                               const DataSetId& dataSetID,
-                              const char *title,
+                              Renderer::LegendType legendType,
+                              std::string& title,
+                              double range[2],
                               int width, int height,
+                              int numLabels,
                               vtkUnsignedCharArray *imgData)
 {
+    TRACE("Enter");
     ColorMap *colorMap = getColorMap(id);
     if (colorMap == NULL)
@@ -1220 +1430 @@
         _legendRenderWindow->DoubleBufferOff();
         _legendRenderWindow->OffScreenRenderingOn();
+#else
+        _legendRenderWindow->DoubleBufferOn();
+        _legendRenderWindow->SwapBuffersOff();
 #endif
     }
@@ -1237 +1450 @@
     }
 
+    if (width > height) {
+        _scalarBarActor->SetOrientationToHorizontal();
+    } else {
+        _scalarBarActor->SetOrientationToVertical();
+    }
+
+    // Set viewport-relative width/height/pos
+    if (title.empty() && numLabels == 0) {
+        _scalarBarActor->SetPosition(0, 0);
+        if (width > height) {
+            // horizontal
+            _scalarBarActor->SetHeight(2.5); // VTK: floor(actorHeight * .4)
+            _scalarBarActor->SetWidth(1);
+        } else {
+            // vertical
+            _scalarBarActor->SetHeight((double)height/(.86*height)); // VTK: floor(actorHeight * .86)
+            _scalarBarActor->SetWidth(((double)(width+5))/((double)width)); // VTK: actorWidth - 4 pixels
+        }
+    } else {
+        if (width > height) {
+            // horizontal
+            _scalarBarActor->SetPosition(.075, .1);
+            _scalarBarActor->SetHeight(0.8);
+            _scalarBarActor->SetWidth(0.85);
+        } else {
+            // vertical
+            _scalarBarActor->SetPosition(.1, .05);
+            _scalarBarActor->SetHeight(0.9);
+            _scalarBarActor->SetWidth(0.8);
+        }
+    }
+
     vtkSmartPointer<vtkLookupTable> lut = colorMap->getLookupTable();
+    DataSet *dataSet = NULL;
+    bool cumulative = _useCumulativeRange;
     if (dataSetID.compare("all") == 0) {
-        lut->SetRange(_cumulativeDataRange);
-    } else {
-        DataSet *dataSet = getDataSet(dataSetID);
+        if (_dataSets.empty()) {
+            WARN("No DataSets exist, can't fill title or range");
+        } else {
+            dataSet = _dataSets.begin()->second;
+        }
+        cumulative = true;
+    } else {
+        dataSet = getDataSet(dataSetID);
         if (dataSet == NULL) {
-            lut->SetRange(_cumulativeDataRange);
-        } else {
-            double range[2];
-            dataSet->getDataRange(range);
+            ERROR("DataSet '%s' not found", dataSetID.c_str());
+            return false;
+        }
+    }
+
+    bool drawTitle = false;
+    if (!title.empty()) {
+        drawTitle = true;
+        if (title.compare("#auto") == 0) {
+            title.clear();
+        }
+    }
+
+    range[0] = 0.0;
+    range[1] = 1.0;
+
+    switch (legendType) {
+    case ACTIVE_VECTOR_MAGNITUDE:
+        if (cumulative) {
+            lut->SetRange(_cumulativeVectorMagnitudeRange);
+            range[0] = _cumulativeVectorMagnitudeRange[0];
+            range[1] = _cumulativeVectorMagnitudeRange[1];
+        } else if (dataSet != NULL) {
+            dataSet->getVectorRange(range);
             lut->SetRange(range);
         }
-    }
+        if (title.empty() && dataSet != NULL) {
+            const char *name = dataSet->getActiveVectorsName();
+            if (name != NULL) {
+                title = name;
+                title.append("(mag)");
+            }
+        }
+        break;
+    case ACTIVE_VECTOR_X:
+        if (cumulative) {
+            lut->SetRange(_cumulativeVectorComponentRange[0]);
+            range[0] = _cumulativeVectorComponentRange[0][0];
+            range[1] = _cumulativeVectorComponentRange[0][1];
+        } else if (dataSet != NULL) {
+            dataSet->getVectorRange(range, 0);
+            lut->SetRange(range);
+        }
+        if (title.empty() && dataSet != NULL) {
+            const char *name = dataSet->getActiveVectorsName();
+            if (name != NULL) {
+                title = name;
+                title.append("(x)");
+            }
+        }
+        break;
+    case ACTIVE_VECTOR_Y:
+        if (cumulative) {
+            lut->SetRange(_cumulativeVectorComponentRange[1]);
+            range[0] = _cumulativeVectorComponentRange[1][0];
+            range[1] = _cumulativeVectorComponentRange[1][1];
+        } else if (dataSet != NULL) {
+            dataSet->getVectorRange(range, 1);
+            lut->SetRange(range);
+        }
+        if (title.empty() && dataSet != NULL) {
+            const char *name = dataSet->getActiveVectorsName();
+            if (name != NULL) {
+                title = name;
+                title.append("(y)");
+            }
+        }
+        break;
+    case ACTIVE_VECTOR_Z:
+        if (cumulative) {
+            lut->SetRange(_cumulativeVectorComponentRange[2]);
+            range[0] = _cumulativeVectorComponentRange[2][0];
+            range[1] = _cumulativeVectorComponentRange[2][1];
+        } else if (dataSet != NULL) {
+            dataSet->getVectorRange(range, 1);
+            lut->SetRange(range);
+        }
+        if (title.empty() && dataSet != NULL) {
+            const char *name = dataSet->getActiveVectorsName();
+            if (name != NULL) {
+                title = name;
+                title.append("(z)");
+            }
+        }
+        break;
+    case ACTIVE_SCALAR:
+    default:
+        if (cumulative) {
+            lut->SetRange(_cumulativeScalarRange);
+            range[0] = _cumulativeScalarRange[0];
+            range[1] = _cumulativeScalarRange[1];
+        } else if (dataSet != NULL) {
+            dataSet->getScalarRange(range);
+            lut->SetRange(range);
+        }
+        if (title.empty() && dataSet != NULL) {
+            const char *name = dataSet->getActiveScalarsName();
+            if (name != NULL)
+                title = name;
+        }
+        break;
+    }
+
     _scalarBarActor->SetLookupTable(lut);
 
-    // Set viewport-relative width/height/pos
-    if (width > height) {
-        _scalarBarActor->SetOrientationToHorizontal();
-        _scalarBarActor->SetHeight(0.8);
-        _scalarBarActor->SetWidth(0.85);
-        _scalarBarActor->SetPosition(.075, .1);
-    } else {
-        _scalarBarActor->SetOrientationToVertical();
-        _scalarBarActor->SetHeight(0.9);
-        _scalarBarActor->SetWidth(0.8);
-        _scalarBarActor->SetPosition(.1, .05);
-    }
-    _scalarBarActor->SetTitle(title);
+    if (drawTitle) {
+        _scalarBarActor->SetTitle(title.c_str());
+    } else {
+        _scalarBarActor->SetTitle("");
+    }
     _scalarBarActor->GetTitleTextProperty()->ItalicOff();
+    _scalarBarActor->SetNumberOfLabels(numLabels);
     _scalarBarActor->GetLabelTextProperty()->BoldOff();
     _scalarBarActor->GetLabelTextProperty()->ItalicOff();
@@ -1304 +1645 @@
                                       imgData);
 #endif
+    TRACE("Leave");
     return true;
 }
@@ -1310 +1652 @@
  * \brief Create a new Contour2D and associate it with the named DataSet
  */
-void Renderer::addContour2D(const DataSetId& id)
+bool Renderer::addContour2D(const DataSetId& id, int numContours)
 {
     DataSetHashmap::iterator itr;
@@ -1323 +1665 @@
     if (itr == _dataSets.end()) {
         ERROR("Unknown dataset %s", id.c_str());
-        return;
+        return false;
     }
 
@@ -1335 +1677 @@
         }
 
-        Contour2D *contour = new Contour2D();
+        Contour2D *contour = new Contour2D(numContours);
+ 
+        contour->setDataSet(ds,
+                            _useCumulativeRange, 
+                            _cumulativeScalarRange,
+                            _cumulativeVectorMagnitudeRange,
+                            _cumulativeVectorComponentRange);
+
+        if (contour->getProp() == NULL) {
+            delete contour;
+            return false;
+        } else {
+            _renderer->AddViewProp(contour->getProp());
+        }
+
         _contour2Ds[dsID] = contour;
-
-        contour->setDataSet(ds);
-
-        _renderer->AddViewProp(contour->getProp());
     } while (doAll && ++itr != _dataSets.end());
 
     initCamera();
     _needsRedraw = true;
+    return true;
+}
+
+/**
+ * \brief Create a new Contour2D and associate it with the named DataSet
+ */
+bool Renderer::addContour2D(const DataSetId& id, const std::vector<double>& contours)
+{
+    DataSetHashmap::iterator itr;
+
+    bool doAll = false;
+
+    if (id.compare("all") == 0) {
+        itr = _dataSets.begin();
+    } else {
+        itr = _dataSets.find(id);
+    }
+    if (itr == _dataSets.end()) {
+        ERROR("Unknown dataset %s", id.c_str());
+        return false;
+    }
+
+    do {
+        DataSet *ds = itr->second;
+        const DataSetId& dsID = ds->getName();
+
+        if (getContour2D(dsID)) {
+            WARN("Replacing existing Contour2D %s", dsID.c_str());
+            deleteContour2D(dsID);
+        }
+
+        Contour2D *contour = new Contour2D(contours);
+
+        contour->setDataSet(ds,
+                            _useCumulativeRange, 
+                            _cumulativeScalarRange,
+                            _cumulativeVectorMagnitudeRange,
+                            _cumulativeVectorComponentRange);
+
+        if (contour->getProp() == NULL) {
+            delete contour;
+            return false;
+        } else {
+            _renderer->AddViewProp(contour->getProp());
+        }
+
+        _contour2Ds[dsID] = contour;
+    } while (doAll && ++itr != _dataSets.end());
+
+    initCamera();
+    _needsRedraw = true;
+    return true;
 }
 
@@ -1355 +1759 @@
 
     if (itr == _contour2Ds.end()) {
+#ifdef DEBUG
         TRACE("Contour2D not found: %s", id.c_str());
+#endif
         return NULL;
     } else
@@ -1522 +1928 @@
 
     do {
-        if (_useCumulativeRange) {
-            itr->second->setContours(numContours, _cumulativeDataRange);
-        } else {
-            itr->second->setContours(numContours);
-        }
+        itr->second->setContours(numContours);
     } while (doAll && ++itr != _contour2Ds.end());
 
@@ -1616 +2018 @@
  * \brief Set the RGB isoline color for the specified DataSet
  */
-void Renderer::setContour2DEdgeColor(const DataSetId& id, float color[3])
+void Renderer::setContour2DColor(const DataSetId& id, float color[3])
 {
     Contour2DHashmap::iterator itr;
@@ -1634 +2036 @@
 
     do {
-        itr->second->setEdgeColor(color);
+        itr->second->setColor(color);
     } while (doAll && ++itr != _contour2Ds.end());
 
@@ -1699 +2101 @@
  * \brief Create a new Contour3D and associate it with the named DataSet
  */
-void Renderer::addContour3D(const DataSetId& id)
+bool Renderer::addContour3D(const DataSetId& id, int numContours)
 {
     DataSetHashmap::iterator itr;
@@ -1712 +2114 @@
     if (itr == _dataSets.end()) {
         ERROR("Unknown dataset %s", id.c_str());
-        return;
+        return false;
     }
 
@@ -1724 +2126 @@
         }
 
-        Contour3D *contour = new Contour3D();
+        Contour3D *contour = new Contour3D(numContours);
+
+        contour->setDataSet(ds,
+                            _useCumulativeRange,
+                            _cumulativeScalarRange,
+                            _cumulativeVectorMagnitudeRange,
+                            _cumulativeVectorComponentRange);
+
+        if (contour->getProp() == NULL) {
+            delete contour;
+            return false;
+        } else {
+            _renderer->AddViewProp(contour->getProp());
+        }
+
         _contour3Ds[dsID] = contour;
-
-        contour->setDataSet(ds);
-
-        // Use the default color map
-        vtkSmartPointer<vtkLookupTable> lut = vtkSmartPointer<vtkLookupTable>::New();
-        ColorMap *cmap = getColorMap("default");
-        lut->DeepCopy(cmap->getLookupTable());
-        if (_useCumulativeRange) {
-            lut->SetRange(_cumulativeDataRange);
-        } else {
-            double range[2];
-            ds->getDataRange(range);
-            lut->SetRange(range);
-        }
-
-        contour->setLookupTable(lut);
-
-        _renderer->AddViewProp(contour->getProp());
     } while (doAll && ++itr != _dataSets.end());
 
@@ -1750 +2148 @@
     initCamera();
     _needsRedraw = true;
+    return true;
+}
+
+/**
+ * \brief Create a new Contour3D and associate it with the named DataSet
+ */
+bool Renderer::addContour3D(const DataSetId& id,const std::vector<double>& contours)
+{
+    DataSetHashmap::iterator itr;
+
+    bool doAll = false;
+
+    if (id.compare("all") == 0) {
+        itr = _dataSets.begin();
+    } else {
+        itr = _dataSets.find(id);
+    }
+    if (itr == _dataSets.end()) {
+        ERROR("Unknown dataset %s", id.c_str());
+        return false;
+    }
+
+    do {
+        DataSet *ds = itr->second;
+        const DataSetId& dsID = ds->getName();
+
+        if (getContour3D(dsID)) {
+            WARN("Replacing existing Contour3D %s", dsID.c_str());
+            deleteContour3D(dsID);
+        }
+
+        Contour3D *contour = new Contour3D(contours);
+
+        contour->setDataSet(ds,
+                            _useCumulativeRange, 
+                            _cumulativeScalarRange,
+                            _cumulativeVectorMagnitudeRange,
+                            _cumulativeVectorComponentRange);
+
+        if (contour->getProp() == NULL) {
+            delete contour;
+            return false;
+        } else {
+            _renderer->AddViewProp(contour->getProp());
+        }
+
+        _contour3Ds[dsID] = contour;
+    } while (doAll && ++itr != _dataSets.end());
+
+    if (_cameraMode == IMAGE)
+        setCameraMode(PERSPECTIVE);
+    initCamera();
+    _needsRedraw = true;
+    return true;
 }
 
@@ -1760 +2212 @@
 
     if (itr == _contour3Ds.end()) {
+#ifdef DEBUG
         TRACE("Contour3D not found: %s", id.c_str());
+#endif
         return NULL;
     } else
@@ -1927 +2381 @@
 
     do {
-        if (_useCumulativeRange) {
-            itr->second->setContours(numContours, _cumulativeDataRange);
-        } else {
-            itr->second->setContours(numContours);
-        }
-    } while (doAll && ++itr != _contour3Ds.end());
+        itr->second->setContours(numContours);
+     } while (doAll && ++itr != _contour3Ds.end());
 
     initCamera();
@@ -2052 +2502 @@
               itr->second->getDataSet()->getName().c_str());
 
-        // Make a copy of the generic colormap lookup table, so 
-        // data range can be set in the copy table to match the 
-        // dataset being plotted
-        vtkSmartPointer<vtkLookupTable> lut = vtkSmartPointer<vtkLookupTable>::New();
-        lut->DeepCopy(cmap->getLookupTable());
-
-        if (_useCumulativeRange) {
-            lut->SetRange(_cumulativeDataRange);
-        } else {
-            if (itr->second->getDataSet() != NULL) {
-                double range[2];
-                itr->second->getDataSet()->getDataRange(range);
-                lut->SetRange(range);
-            }
-        }
-
-        itr->second->setLookupTable(lut);
+        itr->second->setColorMap(cmap);
     } while (doAll && ++itr != _contour3Ds.end());
 
@@ -2240 +2674 @@
  * \brief Create a new Glyphs and associate it with the named DataSet
  */
-void Renderer::addGlyphs(const DataSetId& id)
+bool Renderer::addGlyphs(const DataSetId& id, Glyphs::GlyphShape shape)
 {
     DataSetHashmap::iterator itr;
@@ -2253 +2687 @@
     if (itr == _dataSets.end()) {
         ERROR("Unknown dataset %s", id.c_str());
-        return;
+        return false;
     }
 
@@ -2265 +2699 @@
         }
 
-        Glyphs *glyphs = new Glyphs();
+        Glyphs *glyphs = new Glyphs(shape);
+
+        glyphs->setDataSet(ds,
+                           _useCumulativeRange, 
+                           _cumulativeScalarRange,
+                           _cumulativeVectorMagnitudeRange,
+                           _cumulativeVectorComponentRange);
+
+        if (glyphs->getProp() == NULL) {
+            delete glyphs;
+            return false;
+        } else {
+            _renderer->AddViewProp(glyphs->getProp());
+        }
+
         _glyphs[dsID] = glyphs;
-
-        glyphs->setDataSet(ds);
-
-        // Use the default color map
-        vtkSmartPointer<vtkLookupTable> lut = vtkSmartPointer<vtkLookupTable>::New();
-        ColorMap *cmap = getColorMap("default");
-        lut->DeepCopy(cmap->getLookupTable());
-        if (_useCumulativeRange) {
-            lut->SetRange(_cumulativeDataRange);
-        } else {
-            double range[2];
-            ds->getDataRange(range);
-            lut->SetRange(range);
-        }
-
-        glyphs->setLookupTable(lut);
-
-        _renderer->AddViewProp(glyphs->getProp());
     } while (doAll && ++itr != _dataSets.end());
 
@@ -2292 +2722 @@
 
     _needsRedraw = true;
+    return true;
 }
 
@@ -2302 +2733 @@
 
     if (itr == _glyphs.end()) {
+#ifdef DEBUG
         TRACE("Glyphs not found: %s", id.c_str());
+#endif
         return NULL;
     } else
@@ -2506 +2939 @@
               itr->second->getDataSet()->getName().c_str());
 
-        // Make a copy of the generic colormap lookup table, so 
-        // data range can be set in the copy table to match the 
-        // dataset being plotted
-        vtkSmartPointer<vtkLookupTable> lut = vtkSmartPointer<vtkLookupTable>::New();
-        lut->DeepCopy(cmap->getLookupTable());
-
-        if (_useCumulativeRange) {
-            lut->SetRange(_cumulativeDataRange);
-        } else {
-            if (itr->second->getDataSet() != NULL) {
-                double range[2];
-                itr->second->getDataSet()->getDataRange(range);
-                lut->SetRange(range);
-            }
-        }
-
-        itr->second->setLookupTable(lut);
+        itr->second->setColorMap(cmap);
     } while (doAll && ++itr != _glyphs.end());
 
@@ -2577 +2994 @@
     do {
         itr->second->setScalingMode(mode);
+    } while (doAll && ++itr != _glyphs.end());
+
+    _renderer->ResetCameraClippingRange();
+    _needsRedraw = true;
+}
+
+/**
+ * \brief Controls if field data range is normalized to [0,1] before
+ * applying scale factor for the given DataSet
+ */
+void Renderer::setGlyphsNormalizeScale(const DataSetId& id, bool normalize)
+{
+    GlyphsHashmap::iterator itr;
+
+    bool doAll = false;
+
+    if (id.compare("all") == 0) {
+        itr = _glyphs.begin();
+        doAll = true;
+    } else {
+        itr = _glyphs.find(id);
+    }
+    if (itr == _glyphs.end()) {
+        ERROR("Glyphs not found: %s", id.c_str());
+        return;
+    }
+
+    do {
+        itr->second->setNormalizeScale(normalize);
     } while (doAll && ++itr != _glyphs.end());
 
@@ -2833 +3279 @@
  * \brief Create a new HeightMap and associate it with the named DataSet
  */
-void Renderer::addHeightMap(const DataSetId& id)
+bool Renderer::addHeightMap(const DataSetId& id, int numContours, double heightScale)
 {
     DataSetHashmap::iterator itr;
@@ -2846 +3292 @@
     if (itr == _dataSets.end()) {
         ERROR("Unknown dataset %s", id.c_str());
-        return;
+        return false;
     }
 
@@ -2858 +3304 @@
         }
 
-        HeightMap *hmap = new HeightMap();
+        HeightMap *hmap = new HeightMap(numContours, heightScale);
+
+        hmap->setDataSet(ds,
+                         _useCumulativeRange, 
+                         _cumulativeScalarRange,
+                         _cumulativeVectorMagnitudeRange,
+                         _cumulativeVectorComponentRange);
+
+        if (hmap->getProp() == NULL) {
+            delete hmap;
+            return false;
+        } else {
+            _renderer->AddViewProp(hmap->getProp());
+        }
+
         _heightMaps[dsID] = hmap;
-
-        hmap->setDataSet(ds);
-
-        // Use the default color map
-        vtkSmartPointer<vtkLookupTable> lut = vtkSmartPointer<vtkLookupTable>::New();
-        ColorMap *cmap = getColorMap("default");
-        lut->DeepCopy(cmap->getLookupTable());
-        if (_useCumulativeRange) {
-            lut->SetRange(_cumulativeDataRange);
-        } else {
-            double range[2];
-            ds->getDataRange(range);
-            lut->SetRange(range);
-        }
-
-        hmap->setLookupTable(lut);
-
-        _renderer->AddViewProp(hmap->getProp());
     } while (doAll && ++itr != _dataSets.end());
 
@@ -2885 +3327 @@
 
     _needsRedraw = true;
+    return true;
+}
+
+/**
+ * \brief Create a new HeightMap and associate it with the named DataSet
+ */
+bool Renderer::addHeightMap(const DataSetId& id, const std::vector<double>& contours, double heightScale)
+{
+    DataSetHashmap::iterator itr;
+
+    bool doAll = false;
+
+    if (id.compare("all") == 0) {
+        itr = _dataSets.begin();
+    } else {
+        itr = _dataSets.find(id);
+    }
+    if (itr == _dataSets.end()) {
+        ERROR("Unknown dataset %s", id.c_str());
+        return false;
+    }
+
+    do {
+        DataSet *ds = itr->second;
+        const DataSetId& dsID = ds->getName();
+
+        if (getHeightMap(dsID)) {
+            WARN("Replacing existing HeightMap %s", dsID.c_str());
+            deleteHeightMap(dsID);
+        }
+
+        HeightMap *hmap = new HeightMap(contours, heightScale);
+
+        hmap->setDataSet(ds,
+                         _useCumulativeRange, 
+                         _cumulativeScalarRange,
+                         _cumulativeVectorMagnitudeRange,
+                         _cumulativeVectorComponentRange);
+
+        if (hmap->getProp() == NULL) {
+            delete hmap;
+            return false;
+        } else {
+            _renderer->AddViewProp(hmap->getProp());
+        }
+
+        _heightMaps[dsID] = hmap;
+    } while (doAll && ++itr != _dataSets.end());
+
+    if (_cameraMode == IMAGE)
+        setCameraMode(PERSPECTIVE);
+    initCamera();
+
+    _needsRedraw = true;
+    return true;
 }
 
@@ -2895 +3392 @@
 
     if (itr == _heightMaps.end()) {
+#ifdef DEBUG
         TRACE("HeightMap not found: %s", id.c_str());
+#endif
         return NULL;
     } else
@@ -3131 +3630 @@
               itr->second->getDataSet()->getName().c_str());
 
-        // Make a copy of the generic colormap lookup table, so 
-        // data range can be set in the copy table to match the 
-        // dataset being plotted
-        vtkSmartPointer<vtkLookupTable> lut = vtkSmartPointer<vtkLookupTable>::New();
-        lut->DeepCopy(cmap->getLookupTable());
-
-        if (_useCumulativeRange) {
-            lut->SetRange(_cumulativeDataRange);
-        } else {
-            if (itr->second->getDataSet() != NULL) {
-                double range[2];
-                itr->second->getDataSet()->getDataRange(range);
-                lut->SetRange(range);
-            }
-        }
-
-        itr->second->setLookupTable(lut);
+        itr->second->setColorMap(cmap);
     } while (doAll && ++itr != _heightMaps.end());
 
@@ -3156 +3639 @@
  * \brief Set the number of equally spaced contour isolines for the given DataSet
  */
-void Renderer::setHeightMapContours(const DataSetId& id, int numContours)
+void Renderer::setHeightMapNumContours(const DataSetId& id, int numContours)
 {
     HeightMapHashmap::iterator itr;
@@ -3174 +3657 @@
 
     do {
-        if (_useCumulativeRange) {
-            itr->second->setContours(numContours, _cumulativeDataRange);
-        } else {
-            itr->second->setContours(numContours);
-        }
+        itr->second->setNumContours(numContours);
     } while (doAll && ++itr != _heightMaps.end());
 
@@ -3260 +3739 @@
     do {
         itr->second->setVisibility(state);
+    } while (doAll && ++itr != _heightMaps.end());
+
+    _needsRedraw = true;
+}
+
+/**
+ * \brief Set wireframe rendering for the specified DataSet
+ */
+void Renderer::setHeightMapWireframe(const DataSetId& id, bool state)
+{
+    HeightMapHashmap::iterator itr;
+
+    bool doAll = false;
+
+    if (id.compare("all") == 0) {
+        itr = _heightMaps.begin();
+        doAll = true;
+    } else {
+        itr = _heightMaps.find(id);
+    }
+    if (itr == _heightMaps.end()) {
+        ERROR("HeightMap not found: %s", id.c_str());
+        return;
+    }
+
+    do {
+        itr->second->setWireframe(state);
     } while (doAll && ++itr != _heightMaps.end());
 
@@ -3352 +3858 @@
  * \brief Turn on/off rendering height map contour lines for the given DataSet
  */
-void Renderer::setHeightMapContourVisibility(const DataSetId& id, bool state)
+void Renderer::setHeightMapContourLineVisibility(const DataSetId& id, bool state)
 {
     HeightMapHashmap::iterator itr;
@@ -3370 +3876 @@
 
     do {
-        itr->second->setContourVisibility(state);
+        itr->second->setContourLineVisibility(state);
+    } while (doAll && ++itr != _heightMaps.end());
+
+    _needsRedraw = true;
+}
+
+/**
+ * \brief Turn on/off rendering height map colormap surface for the given DataSet
+ */
+void Renderer::setHeightMapContourSurfaceVisibility(const DataSetId& id, bool state)
+{
+    HeightMapHashmap::iterator itr;
+
+    bool doAll = false;
+
+    if (id.compare("all") == 0) {
+        itr = _heightMaps.begin();
+        doAll = true;
+    } else {
+        itr = _heightMaps.find(id);
+    }
+    if (itr == _heightMaps.end()) {
+        ERROR("HeightMap not found: %s", id.c_str());
+        return;
+    }
+
+    do {
+        itr->second->setContourSurfaceVisibility(state);
     } while (doAll && ++itr != _heightMaps.end());
 
@@ -3462 +3995 @@
  * \brief Create a new LIC and associate it with the named DataSet
  */
-void Renderer::addLIC(const DataSetId& id)
+bool Renderer::addLIC(const DataSetId& id)
 {
     DataSetHashmap::iterator itr;
@@ -3475 +4008 @@
     if (itr == _dataSets.end()) {
         ERROR("Unknown dataset %s", id.c_str());
-        return;
+        return false;
     }
 
@@ -3490 +4023 @@
         _lics[dsID] = lic;
 
-        lic->setDataSet(ds);
+        lic->setDataSet(ds,
+                        _useCumulativeRange, 
+                        _cumulativeScalarRange,
+                        _cumulativeVectorMagnitudeRange,
+                        _cumulativeVectorComponentRange);
 
         _renderer->AddViewProp(lic->getProp());
@@ -3499 +4036 @@
     initCamera();
     _needsRedraw = true;
+    return true;
 }
 
@@ -3509 +4047 @@
 
     if (itr == _lics.end()) {
+#ifdef DEBUG
         TRACE("LIC not found: %s", id.c_str());
+#endif
         return NULL;
     } else
@@ -3715 +4255 @@
               itr->second->getDataSet()->getName().c_str());
 
-        // Make a copy of the generic colormap lookup table, so 
-        // data range can be set in the copy table to match the 
-        // dataset being plotted
-        vtkSmartPointer<vtkLookupTable> lut = vtkSmartPointer<vtkLookupTable>::New();
-        lut->DeepCopy(cmap->getLookupTable());
-
-        if (_useCumulativeRange) {
-            lut->SetRange(_cumulativeDataRange);
-        } else {
-            if (itr->second->getDataSet() != NULL) {
-                double range[2];
-                itr->second->getDataSet()->getDataRange(range);
-                lut->SetRange(range);
-            }
-        }
-
-        itr->second->setLookupTable(lut);
+        itr->second->setColorMap(cmap);
     } while (doAll && ++itr != _lics.end());
 
@@ -3905 +4429 @@
  * \brief Create a new Molecule and associate it with the named DataSet
  */
-void Renderer::addMolecule(const DataSetId& id)
+bool Renderer::addMolecule(const DataSetId& id)
 {
     DataSetHashmap::iterator itr;
@@ -3918 +4442 @@
     if (itr == _dataSets.end()) {
         ERROR("Unknown dataset %s", id.c_str());
-        return;
+        return false;
     }
 
@@ -3942 +4466 @@
     initCamera();
     _needsRedraw = true;
+    return true;
 }
 
@@ -3952 +4477 @@
 
     if (itr == _molecules.end()) {
+#ifdef DEBUG
         TRACE("Molecule not found: %s", id.c_str());
+#endif
         return NULL;
     } else
@@ -4129 +4656 @@
               itr->second->getDataSet()->getName().c_str());
 
-        // Make a copy of the generic colormap lookup table, so 
-        // data range can be set in the copy table to match the 
-        // dataset being plotted
-        vtkSmartPointer<vtkLookupTable> lut = vtkSmartPointer<vtkLookupTable>::New();
-        lut->DeepCopy(cmap->getLookupTable());
-
-        if (_useCumulativeRange) {
-            lut->SetRange(_cumulativeDataRange);
-        } else {
-            if (itr->second->getDataSet() != NULL) {
-                double range[2];
-                itr->second->getDataSet()->getDataRange(range);
-                lut->SetRange(range);
-            }
-        }
-
-        itr->second->setLookupTable(lut);
+        itr->second->setColorMap(cmap);
     } while (doAll && ++itr != _molecules.end());
 
@@ -4427 +4938 @@
  * \brief Create a new PolyData and associate it with the named DataSet
  */
-void Renderer::addPolyData(const DataSetId& id)
+bool Renderer::addPolyData(const DataSetId& id)
 {
     DataSetHashmap::iterator itr;
@@ -4440 +4951 @@
     if (itr == _dataSets.end()) {
         ERROR("Unknown dataset %s", id.c_str());
-        return;
+        return false;
     }
 
@@ -4464 +4975 @@
     initCamera();
     _needsRedraw = true;
+    return true;
 }
 
@@ -4474 +4986 @@
 
     if (itr == _polyDatas.end()) {
+#ifdef DEBUG
         TRACE("PolyData not found: %s", id.c_str());
+#endif
         return NULL;
     } else
@@ -4785 +5299 @@
 
 /**
- * \brief Set wireframe rendering for the specified DataSet
- */
-void Renderer::setPolyDataWireframe(const DataSetId& id, bool state)
+ * \brief Set the point size for the specified DataSet (may be a no-op)
+ *
+ * If the OpenGL implementation/hardware does not support wide points, 
+ * this function may not have an effect.
+ */
+void Renderer::setPolyDataPointSize(const DataSetId& id, float size)
 {
     PolyDataHashmap::iterator itr;
@@ -4805 +5322 @@
 
     do {
+        itr->second->setPointSize(size);
+    } while (doAll && ++itr != _polyDatas.end());
+
+    _needsRedraw = true;
+}
+
+/**
+ * \brief Set wireframe rendering for the specified DataSet
+ */
+void Renderer::setPolyDataWireframe(const DataSetId& id, bool state)
+{
+    PolyDataHashmap::iterator itr;
+
+    bool doAll = false;
+
+    if (id.compare("all") == 0) {
+        itr = _polyDatas.begin();
+        doAll = true;
+    } else {
+        itr = _polyDatas.find(id);
+    }
+    if (itr == _polyDatas.end()) {
+        ERROR("PolyData not found: %s", id.c_str());
+        return;
+    }
+
+    do {
         itr->second->setWireframe(state);
     } while (doAll && ++itr != _polyDatas.end());
@@ -4841 +5385 @@
  * \brief Create a new PseudoColor rendering for the specified DataSet
  */
-void Renderer::addPseudoColor(const DataSetId& id)
+bool Renderer::addPseudoColor(const DataSetId& id)
 {
     DataSetHashmap::iterator itr;
@@ -4854 +5398 @@
     if (itr == _dataSets.end()) {
         ERROR("Unknown dataset %s", id.c_str());
-        return;
+        return false;
     }
 
@@ -4868 +5412 @@
         _pseudoColors[dsID] = pc;
 
-        pc->setDataSet(ds);
-
-        // Use the default color map
-        vtkSmartPointer<vtkLookupTable> lut = vtkSmartPointer<vtkLookupTable>::New();
-        ColorMap *cmap = getColorMap("default");
-        lut->DeepCopy(cmap->getLookupTable());
-        if (_useCumulativeRange) {
-            lut->SetRange(_cumulativeDataRange);
-        } else {
-            double range[2];
-            ds->getDataRange(range);
-            lut->SetRange(range);
-        }
-
-        pc->setLookupTable(lut);
+        pc->setDataSet(ds,
+                       _useCumulativeRange, 
+                       _cumulativeScalarRange,
+                       _cumulativeVectorMagnitudeRange,
+                       _cumulativeVectorComponentRange);
 
         _renderer->AddViewProp(pc->getProp());
@@ -4889 +5423 @@
     initCamera();
     _needsRedraw = true;
+    return true;
 }
 
@@ -4899 +5434 @@
 
     if (itr == _pseudoColors.end()) {
+#ifdef DEBUG
         TRACE("PseudoColor not found: %s", id.c_str());
+#endif
         return NULL;
     } else
@@ -5046 +5583 @@
 
 /**
+ * \brief Set the RGB color for the specified DataSet
+ */
+void Renderer::setPseudoColorColor(const DataSetId& id, float color[3])
+{
+    PseudoColorHashmap::iterator itr;
+
+    bool doAll = false;
+
+    if (id.compare("all") == 0) {
+        itr = _pseudoColors.begin();
+        doAll = true;
+    } else {
+        itr = _pseudoColors.find(id);
+    }
+    if (itr == _pseudoColors.end()) {
+        ERROR("PseudoColor not found: %s", id.c_str());
+        return;
+    }
+
+    do {
+        itr->second->setColor(color);
+    } while (doAll && ++itr != _pseudoColors.end());
+
+    _needsRedraw = true;
+}
+
+/**
  * \brief Associate an existing named color map with a PseudoColor for the given DataSet
  */
@@ -5076 +5640 @@
               itr->second->getDataSet()->getName().c_str());
 
-        // Make a copy of the generic colormap lookup table, so 
-        // data range can be set in the copy table to match the 
-        // dataset being plotted
-        vtkSmartPointer<vtkLookupTable> lut = vtkSmartPointer<vtkLookupTable>::New();
-        lut->DeepCopy(cmap->getLookupTable());
-
-        if (_useCumulativeRange) {
-            lut->SetRange(_cumulativeDataRange);
-        } else {
-            if (itr->second->getDataSet() != NULL) {
-                double range[2];
-                itr->second->getDataSet()->getDataRange(range);
-                lut->SetRange(range);
-            }
-        }
-
-        itr->second->setLookupTable(lut);
+        itr->second->setColorMap(cmap);
+    } while (doAll && ++itr != _pseudoColors.end());
+
+    _needsRedraw = true;
+}
+
+/**
+ * \brief Set the color mode for the specified DataSet
+ */
+void Renderer::setPseudoColorColorMode(const DataSetId& id, PseudoColor::ColorMode mode)
+{
+    PseudoColorHashmap::iterator itr;
+
+    bool doAll = false;
+
+    if (id.compare("all") == 0) {
+        itr = _pseudoColors.begin();
+        doAll = true;
+    } else {
+        itr = _pseudoColors.find(id);
+    }
+    if (itr == _pseudoColors.end()) {
+        ERROR("PseudoColor not found: %s", id.c_str());
+        return;
+    }
+
+    do {
+        itr->second->setColorMode(mode);
     } while (doAll && ++itr != _pseudoColors.end());
 
@@ -5299 +5874 @@
  * \brief Create a new Streamlines and associate it with the named DataSet
  */
-void Renderer::addStreamlines(const DataSetId& id)
+bool Renderer::addStreamlines(const DataSetId& id)
 {
     DataSetHashmap::iterator itr;
@@ -5312 +5887 @@
     if (itr == _dataSets.end()) {
         ERROR("Unknown dataset %s", id.c_str());
-        return;
+        return false;
     }
 
@@ -5327 +5902 @@
         _streamlines[dsID] = streamlines;
 
-        streamlines->setDataSet(ds);
-
-        // Use the default color map
-        vtkSmartPointer<vtkLookupTable> lut = vtkSmartPointer<vtkLookupTable>::New();
-        ColorMap *cmap = getColorMap("default");
-        lut->DeepCopy(cmap->getLookupTable());
-
-        if (_useCumulativeRange) {
-            lut->SetRange(_cumulativeDataRange);
-        } else {
-            double range[2];
-            ds->getDataRange(range);
-            lut->SetRange(range);
-        }
-        streamlines->setLookupTable(lut);
+        streamlines->setDataSet(ds,
+                                _useCumulativeRange, 
+                                _cumulativeScalarRange,
+                                _cumulativeVectorMagnitudeRange,
+                                _cumulativeVectorComponentRange);
 
         _renderer->AddViewProp(streamlines->getProp());
@@ -5348 +5913 @@
     initCamera();
     _needsRedraw = true;
+    return true;
 }
 
@@ -5358 +5924 @@
 
     if (itr == _streamlines.end()) {
+#ifdef DEBUG
         TRACE("Streamlines not found: %s", id.c_str());
+#endif
         return NULL;
     } else
@@ -5901 +6469 @@
               itr->second->getDataSet()->getName().c_str());
 
-        // Make a copy of the generic colormap lookup table, so 
-        // data range can be set in the copy table to match the 
-        // dataset being plotted
-        vtkSmartPointer<vtkLookupTable> lut = vtkSmartPointer<vtkLookupTable>::New();
-        lut->DeepCopy(cmap->getLookupTable());
-
-        if (_useCumulativeRange) {
-            lut->SetRange(_cumulativeDataRange);
-        } else {
-            if (itr->second->getDataSet() != NULL) {
-                double range[2];
-                itr->second->getDataSet()->getDataRange(range);
-                lut->SetRange(range);
-            }
-        }
-
-        itr->second->setLookupTable(lut);
+        itr->second->setColorMap(cmap);
     } while (doAll && ++itr != _streamlines.end());
 
@@ -6092 +6644 @@
  * \brief Create a new Volume and associate it with the named DataSet
  */
-void Renderer::addVolume(const DataSetId& id)
+bool Renderer::addVolume(const DataSetId& id)
 {
     DataSetHashmap::iterator itr;
@@ -6105 +6657 @@
     if (itr == _dataSets.end()) {
         ERROR("Unknown dataset %s", id.c_str());
-        return;
+        return false;
     }
 
@@ -6120 +6672 @@
         _volumes[dsID] = volume;
 
-        volume->setDataSet(ds);
-
-        if (_useCumulativeRange) {
-            ColorMap *cmap = volume->getColorMap();
-            volume->setColorMap(cmap, _cumulativeDataRange);
-        }
+        volume->setDataSet(ds,
+                           _useCumulativeRange, 
+                           _cumulativeScalarRange,
+                           _cumulativeVectorMagnitudeRange,
+                           _cumulativeVectorComponentRange );
 
         _renderer->AddViewProp(volume->getProp());
@@ -6134 +6685 @@
     initCamera();
     _needsRedraw = true;
+    return true;
 }
 
@@ -6144 +6696 @@
 
     if (itr == _volumes.end()) {
+#ifdef DEBUG
         TRACE("Volume not found: %s", id.c_str());
+#endif
         return NULL;
     } else
@@ -6321 +6875 @@
               itr->second->getDataSet()->getName().c_str());
 
-        if (_useCumulativeRange) {
-            itr->second->setColorMap(cmap, _cumulativeDataRange);
-        } else {
-            itr->second->setColorMap(cmap);
-        }
+        itr->second->setColorMap(cmap);
     } while (doAll && ++itr != _volumes.end());
 
@@ -6517 +7067 @@
 void Renderer::setWindowSize(int width, int height)
 {
-    setViewAngle(height);
+    if (_windowWidth == width &&
+        _windowHeight == height)
+        return;
+
+    //setViewAngle(height);
 
     // FIXME: Fix up panning on aspect change
@@ -6556 +7110 @@
     CameraMode origMode = _cameraMode;
     _cameraMode = mode;
+    resetAxes();
+
     vtkSmartPointer<vtkCamera> camera = _renderer->GetActiveCamera();
     switch (mode) {
@@ -6584 +7140 @@
         ERROR("Unkown camera mode: %d", mode);
     }
-    resetAxes();
-
     _needsRedraw = true;
 }
@@ -7038 +7592 @@
         setCameraZoomRegion(_imgWorldOrigin[0], _imgWorldOrigin[1],
                             _imgWorldDims[0], _imgWorldDims[1]);
-    } else if (_cameraMode == ORTHO) {
-        camera->Zoom(z); // Change ortho parallel scale (Dolly has no effect in ortho)
-        _renderer->ResetCameraClippingRange();
-    } else {
-        camera->Dolly(z); // Move camera forward/back
+    } else {
+        // Keep ortho and perspective modes in sync
+        // Move camera forward/back for perspective camera
+        camera->Dolly(z);
+        // Change ortho parallel scale
+        camera->SetParallelScale(camera->GetParallelScale()/z);
         _renderer->ResetCameraClippingRange();
         //computeScreenWorldCoords();
@@ -7051 +7606 @@
 
     _needsRedraw = true;
+}
+
+/**
+ * \brief Set the pan/zoom using a corner and dimensions in pixel coordinates
+ * 
+ * \param[in] x left pixel coordinate
+ * \param[in] y bottom  pixel coordinate (with y=0 at top of window)
+ * \param[in] width Width of zoom region in pixel coordinates
+ * \param[in] height Height of zoom region in pixel coordinates
+ */
+void Renderer::setCameraZoomRegionPixels(int x, int y, int width, int height)
+{
+    double wx, wy, ww, wh;
+
+    y = _windowHeight - y;
+    double pxToWorldX = _screenWorldCoords[2] / (double)_windowWidth;
+    double pxToWorldY = _screenWorldCoords[3] / (double)_windowHeight;
+
+    wx = _screenWorldCoords[0] + x * pxToWorldX;
+    wy = _screenWorldCoords[1] + y * pxToWorldY;
+    ww = abs(width) *  pxToWorldX;
+    wh = abs(height) * pxToWorldY;
+    setCameraZoomRegion(wx, wy, ww, wh);
+
+    TRACE("\npx: %d %d %d %d\nworld: %g %g %g %g",
+          x, y, width, height,
+          wx, wy, ww, wh);
 }
 
@@ -7065 +7647 @@
     double camPos[2];
 
-    int pxOffsetX = 85;
-    int pxOffsetY = 75;
-    int outerGutter = 15;
+    int pxOffsetX = (int)(0.17 * (double)_windowWidth);
+    pxOffsetX = (pxOffsetX > 100 ? 100 : pxOffsetX);
+    int pxOffsetY = (int)(0.15 * (double)_windowHeight);
+    pxOffsetY = (pxOffsetY > 75 ? 75 : pxOffsetY);
+    int outerGutter = (int)(0.03 * (double)_windowWidth);
+    outerGutter = (outerGutter > 15 ? 15 : outerGutter);
 
     int imgHeightPx = _windowHeight - pxOffsetY - outerGutter;
@@ -7103 +7688 @@
     vtkSmartPointer<vtkCamera> camera = _renderer->GetActiveCamera();
     camera->ParallelProjectionOn();
-    camera->SetPosition(camPos[0], camPos[1], 1);
-    camera->SetFocalPoint(camPos[0], camPos[1], 0);
-    camera->SetViewUp(0, 1, 0);
     camera->SetClippingRange(1, 2);
     // Half of world coordinate height of viewport (Documentation is wrong)
     camera->SetParallelScale(_windowHeight * pxToWorld / 2.0);
 
-    // bottom
-    _cameraClipPlanes[0]->SetOrigin(0, _imgWorldOrigin[1], 0);
-    // left
-    _cameraClipPlanes[1]->SetOrigin(_imgWorldOrigin[0], 0, 0);
-    // top
-    _cameraClipPlanes[2]->SetOrigin(0, _imgWorldOrigin[1] + _imgWorldDims[1], 0);
-    // right
-    _cameraClipPlanes[3]->SetOrigin(_imgWorldOrigin[0] + _imgWorldDims[0], 0, 0);
-
-    _cubeAxesActor2D->SetBounds(_imgWorldOrigin[0], _imgWorldOrigin[0] + _imgWorldDims[0],
-                                _imgWorldOrigin[1], _imgWorldOrigin[1] + _imgWorldDims[1], 0, 0);
+    if (_imgCameraPlane == PLANE_XY) {
+        // XY plane
+        camera->SetPosition(camPos[0], camPos[1], _imgCameraOffset + 1.);
+        camera->SetFocalPoint(camPos[0], camPos[1], _imgCameraOffset);
+        camera->SetViewUp(0, 1, 0);
+        // bottom
+        _cameraClipPlanes[0]->SetOrigin(0, _imgWorldOrigin[1], 0);
+        _cameraClipPlanes[0]->SetNormal(0, 1, 0);
+        // left
+        _cameraClipPlanes[1]->SetOrigin(_imgWorldOrigin[0], 0, 0);
+        _cameraClipPlanes[1]->SetNormal(1, 0, 0);
+        // top
+        _cameraClipPlanes[2]->SetOrigin(0, _imgWorldOrigin[1] + _imgWorldDims[1], 0);
+        _cameraClipPlanes[2]->SetNormal(0, -1, 0);
+        // right
+        _cameraClipPlanes[3]->SetOrigin(_imgWorldOrigin[0] + _imgWorldDims[0], 0, 0);
+        _cameraClipPlanes[3]->SetNormal(-1, 0, 0);
+        _cubeAxesActor2D->SetBounds(_imgWorldOrigin[0], _imgWorldOrigin[0] + _imgWorldDims[0],
+                                    _imgWorldOrigin[1], _imgWorldOrigin[1] + _imgWorldDims[1],
+                                    _imgCameraOffset, _imgCameraOffset);
+        _cubeAxesActor2D->XAxisVisibilityOn();
+        _cubeAxesActor2D->YAxisVisibilityOn();
+        _cubeAxesActor2D->ZAxisVisibilityOff();
+    } else if (_imgCameraPlane == PLANE_ZY) {
+        // ZY plane
+        camera->SetPosition(_imgCameraOffset - 1., camPos[1], camPos[0]);
+        camera->SetFocalPoint(_imgCameraOffset, camPos[1], camPos[0]);
+        camera->SetViewUp(0, 1, 0);
+        // bottom
+        _cameraClipPlanes[0]->SetOrigin(0, _imgWorldOrigin[1], 0);
+        _cameraClipPlanes[0]->SetNormal(0, 1, 0);
+        // left
+        _cameraClipPlanes[1]->SetOrigin(0, 0, _imgWorldOrigin[0]);
+        _cameraClipPlanes[1]->SetNormal(0, 0, 1);
+        // top
+        _cameraClipPlanes[2]->SetOrigin(0, _imgWorldOrigin[1] + _imgWorldDims[1], 0);
+        _cameraClipPlanes[2]->SetNormal(0, -1, 0);
+        // right
+        _cameraClipPlanes[3]->SetOrigin(0, 0, _imgWorldOrigin[0] + _imgWorldDims[0]);
+        _cameraClipPlanes[3]->SetNormal(0, 0, -1);
+        _cubeAxesActor2D->SetBounds(_imgCameraOffset, _imgCameraOffset, 
+                                    _imgWorldOrigin[1], _imgWorldOrigin[1] + _imgWorldDims[1],
+                                    _imgWorldOrigin[0], _imgWorldOrigin[0] + _imgWorldDims[0]);
+        _cubeAxesActor2D->XAxisVisibilityOff();
+        _cubeAxesActor2D->YAxisVisibilityOn();
+        _cubeAxesActor2D->ZAxisVisibilityOn();
+    } else {
+        // XZ plane
+        camera->SetPosition(camPos[0], _imgCameraOffset - 1., camPos[1]);
+        camera->SetFocalPoint(camPos[0], _imgCameraOffset, camPos[1]);
+        camera->SetViewUp(0, 0, 1);
+        // bottom
+        _cameraClipPlanes[0]->SetOrigin(0, 0, _imgWorldOrigin[1]);
+        _cameraClipPlanes[0]->SetNormal(0, 0, 1);
+        // left
+        _cameraClipPlanes[1]->SetOrigin(_imgWorldOrigin[0], 0, 0);
+        _cameraClipPlanes[1]->SetNormal(1, 0, 0);
+        // top
+        _cameraClipPlanes[2]->SetOrigin(0, 0, _imgWorldOrigin[1] + _imgWorldDims[1]);
+        _cameraClipPlanes[2]->SetNormal(0, 0, -1);
+        // right
+        _cameraClipPlanes[3]->SetOrigin(_imgWorldOrigin[0] + _imgWorldDims[0], 0, 0);
+        _cameraClipPlanes[3]->SetNormal(-1, 0, 0);
+        _cubeAxesActor2D->SetBounds(_imgWorldOrigin[0], _imgWorldOrigin[0] + _imgWorldDims[0],
+                                    _imgCameraOffset, _imgCameraOffset,
+                                    _imgWorldOrigin[1], _imgWorldOrigin[1] + _imgWorldDims[1]);
+        _cubeAxesActor2D->XAxisVisibilityOn();
+        _cubeAxesActor2D->YAxisVisibilityOff();
+        _cubeAxesActor2D->ZAxisVisibilityOn();
+    }
 
     // Compute screen world coordinates
@@ -7212 +7853 @@
     mat->Delete();
 
-    _screenWorldCoords[0] = x0;
-    _screenWorldCoords[1] = y0;
-    _screenWorldCoords[2] = x1 - x0;
-    _screenWorldCoords[3] = y1 - y0;
+    if (_imgCameraPlane == PLANE_XZ) {
+        _screenWorldCoords[0] = x0;
+        _screenWorldCoords[1] = z0;
+        _screenWorldCoords[2] = x1 - x0;
+        _screenWorldCoords[3] = z1 - z0;
+    } else if (_imgCameraPlane == PLANE_ZY) {
+        _screenWorldCoords[0] = z0;
+        _screenWorldCoords[1] = y0;
+        _screenWorldCoords[2] = z1 - z0;
+        _screenWorldCoords[3] = y1 - y0;
+    } else {
+        // XY
+        _screenWorldCoords[0] = x0;
+        _screenWorldCoords[1] = y0;
+        _screenWorldCoords[2] = x1 - x0;
+        _screenWorldCoords[3] = y1 - y0;
+    }
 }
 
@@ -7280 +7934 @@
     bounds[5] = -DBL_MAX;
 
+    for (DataSetHashmap::iterator itr = _dataSets.begin();
+             itr != _dataSets.end(); ++itr) {
+        if ((!onlyVisible || itr->second->getVisibility()) &&
+            itr->second->getProp() != NULL)
+            mergeBounds(bounds, bounds, itr->second->getProp()->GetBounds());
+    }
     for (Contour2DHashmap::iterator itr = _contour2Ds.begin();
              itr != _contour2Ds.end(); ++itr) {
-        if (!onlyVisible || itr->second->getVisibility())
+        if ((!onlyVisible || itr->second->getVisibility()) &&
+            itr->second->getProp() != NULL)
             mergeBounds(bounds, bounds, itr->second->getProp()->GetBounds());
     }
     for (Contour3DHashmap::iterator itr = _contour3Ds.begin();
              itr != _contour3Ds.end(); ++itr) {
-        if (!onlyVisible || itr->second->getVisibility())
+        if ((!onlyVisible || itr->second->getVisibility()) &&
+            itr->second->getProp() != NULL)
             mergeBounds(bounds, bounds, itr->second->getProp()->GetBounds());
     }
     for (GlyphsHashmap::iterator itr = _glyphs.begin();
              itr != _glyphs.end(); ++itr) {
-        if (!onlyVisible || itr->second->getVisibility())
+        if ((!onlyVisible || itr->second->getVisibility()) &&
+            itr->second->getProp() != NULL)
             mergeBounds(bounds, bounds, itr->second->getProp()->GetBounds());
     }
     for (HeightMapHashmap::iterator itr = _heightMaps.begin();
              itr != _heightMaps.end(); ++itr) {
-        if (!onlyVisible || itr->second->getVisibility())
+        if ((!onlyVisible || itr->second->getVisibility()) &&
+            itr->second->getProp() != NULL)
             mergeBounds(bounds, bounds, itr->second->getProp()->GetBounds());
     }
     for (LICHashmap::iterator itr = _lics.begin();
              itr != _lics.end(); ++itr) {
-        if (!onlyVisible || itr->second->getVisibility())
+        if ((!onlyVisible || itr->second->getVisibility()) &&
+            itr->second->getProp() != NULL)
             mergeBounds(bounds, bounds, itr->second->getProp()->GetBounds());
     }
     for (MoleculeHashmap::iterator itr = _molecules.begin();
              itr != _molecules.end(); ++itr) {
-        if (!onlyVisible || itr->second->getVisibility())
+        if ((!onlyVisible || itr->second->getVisibility()) &&
+            itr->second->getProp() != NULL)
             mergeBounds(bounds, bounds, itr->second->getProp()->GetBounds());
     }
     for (PolyDataHashmap::iterator itr = _polyDatas.begin();
              itr != _polyDatas.end(); ++itr) {
-        if (!onlyVisible || itr->second->getVisibility())
+        if ((!onlyVisible || itr->second->getVisibility()) &&
+            itr->second->getProp() != NULL)
             mergeBounds(bounds, bounds, itr->second->getProp()->GetBounds());
     }
     for (PseudoColorHashmap::iterator itr = _pseudoColors.begin();
              itr != _pseudoColors.end(); ++itr) {
-        if (!onlyVisible || itr->second->getVisibility())
+        if ((!onlyVisible || itr->second->getVisibility()) &&
+            itr->second->getProp() != NULL)
             mergeBounds(bounds, bounds, itr->second->getProp()->GetBounds());
     }
     for (StreamlinesHashmap::iterator itr = _streamlines.begin();
              itr != _streamlines.end(); ++itr) {
-        if (!onlyVisible || itr->second->getVisibility())
+        if ((!onlyVisible || itr->second->getVisibility()) &&
+            itr->second->getProp() != NULL)
             mergeBounds(bounds, bounds, itr->second->getProp()->GetBounds());
     }
     for (VolumeHashmap::iterator itr = _volumes.begin();
              itr != _volumes.end(); ++itr) {
-        if (!onlyVisible || itr->second->getVisibility())
+        if ((!onlyVisible || itr->second->getVisibility()) &&
+            itr->second->getProp() != NULL)
             mergeBounds(bounds, bounds, itr->second->getProp()->GetBounds());
     }
-    for (int i = 0; i < 6; i++) {
-        if (i % 2 == 0) {
-            if (bounds[i] == DBL_MAX)
-                bounds[i] = 0;
-        } else {
-            if (bounds[i] == -DBL_MAX)
-                bounds[i] = 1;
+
+    for (int i = 0; i < 6; i += 2) {
+        if (bounds[i+1] < bounds[i]) {
+            bounds[i] = -0.5;
+            bounds[i+1] = 0.5;
         }
     }
+
+    int numDims = 0;
+    if (bounds[0] != bounds[1])
+        numDims++;
+    if (bounds[2] != bounds[3])
+        numDims++;
+    if (bounds[4] != bounds[5])
+        numDims++;
+
+    if (numDims == 0) {
+        bounds[0] -= .5;
+        bounds[1] += .5;
+        bounds[2] -= .5;
+        bounds[3] += .5;
+    }
+
     TRACE("Bounds: %g %g %g %g %g %g",
           bounds[0],
@@ -7350 +8034 @@
 /**
  * \brief Update data ranges for color-mapping and contours
- *
- * \param[in] useCumulative Use cumulative range of all DataSets
- */
-void Renderer::updateRanges(bool useCumulative)
-{
+ */
+void Renderer::updateRanges()
+{
+    collectDataRanges();
+
     for (Contour2DHashmap::iterator itr = _contour2Ds.begin();
          itr != _contour2Ds.end(); ++itr) {
-        // Only need to update range if using evenly spaced contours
-        if (itr->second->getContourList().empty()) {
-            if (useCumulative) {
-                itr->second->setContours(itr->second->getNumContours(), _cumulativeDataRange);
-            } else {
-                itr->second->setContours(itr->second->getNumContours());
-            }
-        }
+        itr->second->updateRanges(_useCumulativeRange, 
+                                  _cumulativeScalarRange,
+                                  _cumulativeVectorMagnitudeRange,
+                                  _cumulativeVectorComponentRange);
     }
     for (Contour3DHashmap::iterator itr = _contour3Ds.begin();
          itr != _contour3Ds.end(); ++itr) {
-        // Only need to update range if using evenly spaced contours
-        if (itr->second->getContourList().empty()) {
-            if (useCumulative) {
-                itr->second->setContours(itr->second->getNumContours(), _cumulativeDataRange);
-            } else {
-                itr->second->setContours(itr->second->getNumContours());
-            }
-        }
+        itr->second->updateRanges(_useCumulativeRange, 
+                                  _cumulativeScalarRange,
+                                  _cumulativeVectorMagnitudeRange,
+                                  _cumulativeVectorComponentRange);
     }
     for (GlyphsHashmap::iterator itr = _glyphs.begin();
          itr != _glyphs.end(); ++itr) {
-        vtkLookupTable *lut = itr->second->getLookupTable();
-        if (lut) {
-            if (useCumulative) {
-                lut->SetRange(_cumulativeDataRange);
-            } else {
-                double range[2];
-                if (itr->second->getDataSet()) {
-                    itr->second->getDataSet()->getDataRange(range);
-                    lut->SetRange(range);
-                }
-            }
-        }
+        itr->second->updateRanges(_useCumulativeRange, 
+                                  _cumulativeScalarRange,
+                                  _cumulativeVectorMagnitudeRange,
+                                  _cumulativeVectorComponentRange);
     }
     for (HeightMapHashmap::iterator itr = _heightMaps.begin();
          itr != _heightMaps.end(); ++itr) {
-        vtkLookupTable *lut = itr->second->getLookupTable();
-        if (lut) {
-            if (useCumulative) {
-                lut->SetRange(_cumulativeDataRange);
-            } else {
-                double range[2];
-                if (itr->second->getDataSet()) {
-                    itr->second->getDataSet()->getDataRange(range);
-                    lut->SetRange(range);
-                }
-            }
-        }
-        // Only need to update contour range if using evenly spaced contours
-        if (itr->second->getContourList().empty()) {
-            if (useCumulative) {
-                itr->second->setContours(itr->second->getNumContours(), _cumulativeDataRange);
-            } else {
-                itr->second->setContours(itr->second->getNumContours());
-            }
-        }
+        itr->second->updateRanges(_useCumulativeRange, 
+                                  _cumulativeScalarRange,
+                                  _cumulativeVectorMagnitudeRange,
+                                  _cumulativeVectorComponentRange);
     }
     for (LICHashmap::iterator itr = _lics.begin();
          itr != _lics.end(); ++itr) {
-        vtkLookupTable *lut = itr->second->getLookupTable();
-        if (lut) {
-            if (useCumulative) {
-                lut->SetRange(_cumulativeDataRange);
-            } else {
-                double range[2];
-                if (itr->second->getDataSet()) {
-                    itr->second->getDataSet()->getDataRange(range);
-                    lut->SetRange(range);
-                }
-            }
-        }
+        itr->second->updateRanges(_useCumulativeRange, 
+                                  _cumulativeScalarRange,
+                                  _cumulativeVectorMagnitudeRange,
+                                  _cumulativeVectorComponentRange);
+    }
+    for (MoleculeHashmap::iterator itr = _molecules.begin();
+         itr != _molecules.end(); ++itr) {
+        itr->second->updateRanges(_useCumulativeRange, 
+                                  _cumulativeScalarRange,
+                                  _cumulativeVectorMagnitudeRange,
+                                  _cumulativeVectorComponentRange);
     }
     for (PseudoColorHashmap::iterator itr = _pseudoColors.begin();
          itr != _pseudoColors.end(); ++itr) {
-        vtkLookupTable *lut = itr->second->getLookupTable();
-        if (lut) {
-            if (useCumulative) {
-                lut->SetRange(_cumulativeDataRange);
-            } else {
-                double range[2];
-                if (itr->second->getDataSet()) {
-                    itr->second->getDataSet()->getDataRange(range);
-                    lut->SetRange(range);
-                }
-            }
-        }
+        itr->second->updateRanges(_useCumulativeRange, 
+                                  _cumulativeScalarRange,
+                                  _cumulativeVectorMagnitudeRange,
+                                  _cumulativeVectorComponentRange);
     }
     for (StreamlinesHashmap::iterator itr = _streamlines.begin();
          itr != _streamlines.end(); ++itr) {
-        vtkLookupTable *lut = itr->second->getLookupTable();
-        if (lut) {
-            if (useCumulative) {
-                lut->SetRange(_cumulativeDataRange);
-            } else {
-                double range[2];
-                if (itr->second->getDataSet()) {
-                    itr->second->getDataSet()->getDataRange(range);
-                    lut->SetRange(range);
-                }
-            }
-        }
+        itr->second->updateRanges(_useCumulativeRange, 
+                                  _cumulativeScalarRange,
+                                  _cumulativeVectorMagnitudeRange,
+                                  _cumulativeVectorComponentRange);
     }
     for (VolumeHashmap::iterator itr = _volumes.begin();
          itr != _volumes.end(); ++itr) {
-        ColorMap *cmap = itr->second->getColorMap();
-        if (cmap) {
-            if (useCumulative) {
-                itr->second->setColorMap(cmap, _cumulativeDataRange);
-            } else {
-                itr->second->setColorMap(cmap);
-            }
-        }
+        itr->second->updateRanges(_useCumulativeRange, 
+                                  _cumulativeScalarRange,
+                                  _cumulativeVectorMagnitudeRange,
+                                  _cumulativeVectorComponentRange);
+    }
+}
+
+void Renderer::collectDataRanges()
+{
+    collectScalarRanges(_cumulativeScalarRange,
+                        _cumulativeRangeOnlyVisible);
+    collectVectorMagnitudeRanges(_cumulativeVectorMagnitudeRange,
+                                 _cumulativeRangeOnlyVisible);
+    for (int i = 0; i < 3; i++) {
+        collectVectorComponentRanges(_cumulativeVectorComponentRange[i], i,
+                                     _cumulativeRangeOnlyVisible);
+    }
+
+    TRACE("Cumulative scalar range: %g, %g",
+          _cumulativeScalarRange[0],
+          _cumulativeScalarRange[1]);
+    TRACE("Cumulative vmag range: %g, %g",
+          _cumulativeVectorMagnitudeRange[0],
+          _cumulativeVectorMagnitudeRange[1]);
+    for (int i = 0; i < 3; i++) {
+        TRACE("Cumulative v[%d] range: %g, %g", i,
+              _cumulativeVectorComponentRange[i][0],
+              _cumulativeVectorComponentRange[i][1]);
     }
 }
@@ -7476 +8131 @@
  * \brief Collect cumulative data range of all DataSets
  *
- * \param[inout] range Data range of all DataSets
+ * \param[in,out] range Data range of all DataSets
  * \param[in] onlyVisible Only collect range of visible DataSets
  */
-void Renderer::collectDataRanges(double *range, bool onlyVisible)
+void Renderer::collectScalarRanges(double *range, bool onlyVisible)
 {
     range[0] = DBL_MAX;
@@ -7488 +8143 @@
         if (!onlyVisible || itr->second->getVisibility()) {
             double r[2];
-            itr->second->getDataRange(r);
+            itr->second->getScalarRange(r);
             range[0] = min2(range[0], r[0]);
             range[1] = max2(range[1], r[1]);
@@ -7497 +8152 @@
     if (range[1] == -DBL_MAX)
         range[1] = 1;
+}
+
+/**
+ * \brief Collect cumulative data range of all DataSets
+ *
+ * \param[in,out] range Data range of all DataSets
+ * \param[in] onlyVisible Only collect range of visible DataSets
+ */
+void Renderer::collectVectorMagnitudeRanges(double *range, bool onlyVisible)
+{
+    range[0] = DBL_MAX;
+    range[1] = -DBL_MAX;
+
+    for (DataSetHashmap::iterator itr = _dataSets.begin();
+         itr != _dataSets.end(); ++itr) {
+        if (!onlyVisible || itr->second->getVisibility()) {
+            double r[2];
+            itr->second->getVectorRange(r);
+            range[0] = min2(range[0], r[0]);
+            range[1] = max2(range[1], r[1]);
+        }
+    }
+    if (range[0] == DBL_MAX)
+        range[0] = 0;
+    if (range[1] == -DBL_MAX)
+        range[1] = 1;
+}
+
+/**
+ * \brief Collect cumulative data range of all DataSets
+ *
+ * \param[in,out] range Data range of all DataSets
+ * \param[in] onlyVisible Only collect range of visible DataSets
+ */
+void Renderer::collectVectorComponentRanges(double *range, int component, bool onlyVisible)
+{
+    range[0] = DBL_MAX;
+    range[1] = -DBL_MAX;
+
+    for (DataSetHashmap::iterator itr = _dataSets.begin();
+         itr != _dataSets.end(); ++itr) {
+        if (!onlyVisible || itr->second->getVisibility()) {
+            double r[2];
+            itr->second->getVectorRange(r, component);
+            range[0] = min2(range[0], r[0]);
+            range[1] = max2(range[1], r[1]);
+        }
+    }
+    if (range[0] == DBL_MAX)
+        range[0] = 0;
+    if (range[1] == -DBL_MAX)
+        range[1] = 1;
+ }
+
+/**
+ * \brief Determines if AABB lies in a principal axis plane
+ * and if so, returns the plane normal
+ */
+bool Renderer::is2D(const double bounds[6],
+                    Renderer::PrincipalPlane *plane,
+                    double *offset) const
+{
+    if (bounds[4] == bounds[5]) {
+        // Z = 0, XY plane
+        if (plane)
+            *plane = PLANE_XY;
+        if (offset)
+            *offset = bounds[4];
+        return true;
+    } else if (bounds[0] == bounds[1]) {
+        // X = 0, ZY plane
+        if (plane)
+            *plane = PLANE_ZY;
+        if (offset)
+            *offset = bounds[0];
+        return true;
+    } else if (bounds[2] == bounds[3]) {
+        // Y = 0, XZ plane
+        if (plane)
+            *plane = PLANE_XZ;
+        if (offset)
+            *offset = bounds[2];
+        return true;
+    }
+    *plane = PLANE_XY;
+    *offset = 0;
+    return false;
 }
 
@@ -7521 +8263 @@
     double bounds[6];
     collectBounds(bounds, false);
-    _imgWorldOrigin[0] = bounds[0];
-    _imgWorldOrigin[1] = bounds[2];
-    _imgWorldDims[0] = bounds[1] - bounds[0];
-    _imgWorldDims[1] = bounds[3] - bounds[2];
+    bool twod = is2D(bounds, &_imgCameraPlane, &_imgCameraOffset);
+    if (twod) {
+        _cameraMode = IMAGE;
+        if (_imgCameraPlane == PLANE_ZY) {
+            _imgWorldOrigin[0] = bounds[4];
+            _imgWorldOrigin[1] = bounds[2];
+            _imgWorldDims[0] = bounds[5] - bounds[4];
+            _imgWorldDims[1] = bounds[3] - bounds[2];
+        } else if (_imgCameraPlane == PLANE_XZ) {
+            _imgWorldOrigin[0] = bounds[0];
+            _imgWorldOrigin[1] = bounds[4];
+            _imgWorldDims[0] = bounds[1] - bounds[0];
+            _imgWorldDims[1] = bounds[5] - bounds[4];
+        } else {
+            _imgWorldOrigin[0] = bounds[0];
+            _imgWorldOrigin[1] = bounds[2];
+            _imgWorldDims[0] = bounds[1] - bounds[0];
+            _imgWorldDims[1] = bounds[3] - bounds[2];
+        }
+    } else {
+        _imgWorldOrigin[0] = bounds[0];
+        _imgWorldOrigin[1] = bounds[2];
+        _imgWorldDims[0] = bounds[1] - bounds[0];
+        _imgWorldDims[1] = bounds[3] - bounds[2];
+    }
+
     _cameraPan[0] = 0;
     _cameraPan[1] = 0;
@@ -7538 +8302 @@
     case ORTHO:
         _renderer->GetActiveCamera()->ParallelProjectionOn();
-        resetAxes();
+        resetAxes(bounds);
         _renderer->ResetCamera(bounds);
         //computeScreenWorldCoords();
@@ -7544 +8308 @@
     case PERSPECTIVE:
         _renderer->GetActiveCamera()->ParallelProjectionOff();
-        resetAxes();
+        resetAxes(bounds);
         _renderer->ResetCamera(bounds);
         //computeScreenWorldCoords();
@@ -7551 +8315 @@
         ERROR("Unknown camera mode");
     }
+
 #ifdef WANT_TRACE
     printCameraInfo(_renderer->GetActiveCamera());
@@ -7561 +8326 @@
 void Renderer::printCameraInfo(vtkCamera *camera)
 {
-    TRACE("Parallel Scale: %g, View angle: %g, Cam pos: %g %g %g, focal pt: %g %g %g, view up: %g %g %g, Clipping range: %g %g",
+    TRACE("pscale: %g, angle: %g, d: %g pos: %g %g %g, fpt: %g %g %g, vup: %g %g %g, clip: %g %g",
           camera->GetParallelScale(),
           camera->GetViewAngle(),
+          camera->GetDistance(),
           camera->GetPosition()[0],
           camera->GetPosition()[1],
@@ -7592 +8358 @@
  * \brief Set the opacity of the specified DataSet's associated graphics objects
  */
-void Renderer::setOpacity(const DataSetId& id, double opacity)
-{
+void Renderer::setDataSetOpacity(const DataSetId& id, double opacity)
+{
+    DataSetHashmap::iterator itr;
+
+    bool doAll = false;
+
+    if (id.compare("all") == 0) {
+        itr = _dataSets.begin();
+        doAll = true;
+    } else {
+        itr = _dataSets.find(id);
+    }
+    if (itr == _dataSets.end()) {
+        ERROR("Unknown dataset %s", id.c_str());
+        return;
+    }
+
+    do {
+        itr->second->setOpacity(opacity);
+    } while (doAll && ++itr != _dataSets.end());
+
     if (id.compare("all") == 0 || getContour2D(id) != NULL)
         setContour2DOpacity(id, opacity);
@@ -7614 +8399 @@
     if (id.compare("all") == 0 || getVolume(id) != NULL)
         setVolumeOpacity(id, opacity);
+
+    _needsRedraw = true;
 }
 
@@ -7619 +8406 @@
  * \brief Turn on/off rendering of the specified DataSet's associated graphics objects
  */
-void Renderer::setVisibility(const DataSetId& id, bool state)
+void Renderer::setDataSetVisibility(const DataSetId& id, bool state)
 {
     DataSetHashmap::iterator itr;
@@ -7660 +8447 @@
     if (id.compare("all") == 0 || getVolume(id) != NULL)
         setVolumeVisibility(id, state);
+
+    _needsRedraw = true;
 }
 
@@ -7665 +8454 @@
  * \brief Toggle rendering of actors' bounding box
  */
-void Renderer::showBounds(bool state)
-{
-    if (state) {
-        ; // TODO: Add bounding box actor/mapper
-    } else {
-        ; // TODO: Remove bounding box actor/mapper
-    }
+void Renderer::setDataSetShowBounds(const DataSetId& id, bool state)
+{
+    DataSetHashmap::iterator itr;
+
+    bool doAll = false;
+
+    if (id.compare("all") == 0) {
+        itr = _dataSets.begin();
+        doAll = true;
+    } else {
+        itr = _dataSets.find(id);
+    }
+    if (itr == _dataSets.end()) {
+        ERROR("Unknown dataset %s", id.c_str());
+        return;
+    }
+
+    do {
+        if (!state && itr->second->getProp()) {
+            _renderer->RemoveViewProp(itr->second->getProp());
+        }
+
+        itr->second->showOutline(state);
+
+        if (state && !_renderer->HasViewProp(itr->second->getProp())) {
+            _renderer->AddViewProp(itr->second->getProp());
+        }
+    } while (doAll && ++itr != _dataSets.end());
+
+    initCamera();
+    _needsRedraw = true;
+}
+
+/**
+ * \brief Set color of outline bounding box
+ */
+void Renderer::setDataSetOutlineColor(const DataSetId& id, float color[3])
+{
+    DataSetHashmap::iterator itr;
+
+    bool doAll = false;
+
+    if (id.compare("all") == 0) {
+        itr = _dataSets.begin();
+        doAll = true;
+    } else {
+        itr = _dataSets.find(id);
+    }
+    if (itr == _dataSets.end()) {
+        ERROR("Unknown dataset %s", id.c_str());
+        return;
+    }
+
+    do {
+        itr->second->setOutlineColor(color);
+    } while (doAll && ++itr != _dataSets.end());
+
+    _needsRedraw = true;
 }
 
@@ -7950 +8790 @@
  * Note: no interpolation is performed on data
  */
-double Renderer::getDataValueAtPixel(const DataSetId& id, int x, int y)
+bool Renderer::getScalarValueAtPixel(const DataSetId& id, int x, int y, double *value)
 {
     vtkSmartPointer<vtkCoordinate> coord = vtkSmartPointer<vtkCoordinate>::New();
     coord->SetCoordinateSystemToDisplay();
-    coord->SetValue(x, y, 0);
+    coord->SetValue(x, _windowHeight - y, 0);
     double *worldCoords = coord->GetComputedWorldValue(_renderer);
 
-    TRACE("Pixel coords: %d, %d\nWorld coords: %.12e, %.12e, %12e", x, y,
+    TRACE("Pixel coords: %d, %d\nWorld coords: %g, %g, %g", x, y,
           worldCoords[0], 
           worldCoords[1], 
           worldCoords[2]);
 
-    return getDataValue(id, worldCoords[0], worldCoords[1], worldCoords[2]);
+    return getScalarValue(id, worldCoords[0], worldCoords[1], worldCoords[2], value);
 }
 
@@ -7970 +8810 @@
  * Note: no interpolation is performed on data
  */
-double Renderer::getDataValue(const DataSetId& id, double x, double y, double z)
+bool Renderer::getScalarValue(const DataSetId& id, double x, double y, double z, double *value)
 {
     DataSet *ds = getDataSet(id);
     if (ds == NULL)
-        return 0;
-    vtkDataSet *vtkds = ds->getVtkDataSet(); 
-    vtkIdType pt = vtkds->FindPoint(x, y, z);
-    return vtkds->GetPointData()->GetScalars()->GetComponent(pt, 0);
-}
+        return false;
+
+    return ds->getScalarValue(x, y, z, value);
+}
+
+/**
+ * \brief Get nearest data value given display coordinates x,y
+ *
+ * Note: no interpolation is performed on data
+ */
+bool Renderer::getVectorValueAtPixel(const DataSetId& id, int x, int y, double vector[3])
+{
+    vtkSmartPointer<vtkCoordinate> coord = vtkSmartPointer<vtkCoordinate>::New();
+    coord->SetCoordinateSystemToDisplay();
+    coord->SetValue(x, _windowHeight - y, 0);
+    double *worldCoords = coord->GetComputedWorldValue(_renderer);
+
+    TRACE("Pixel coords: %d, %d\nWorld coords: %g, %g, %g", x, y,
+          worldCoords[0], 
+          worldCoords[1], 
+          worldCoords[2]);
+
+    return getVectorValue(id, worldCoords[0], worldCoords[1], worldCoords[2], vector);
+}
+
+/**
+ * \brief Get nearest data value given world coordinates x,y,z
+ *
+ * Note: no interpolation is performed on data
+ */
+bool Renderer::getVectorValue(const DataSetId& id, double x, double y, double z, double vector[3])
+{
+    DataSet *ds = getDataSet(id);
+    if (ds == NULL)
+        return false;
+
+    return ds->getVectorValue(x, y, z, vector);
+}

branches/blt4/packages/vizservers/vtkvis/RpVtkRenderer.h

@@ -12 +12 @@
 #include <vtkCubeAxesActor.h>
 #ifdef USE_CUSTOM_AXES
-#include <vtkRpCubeAxesActor2D.h>
+#include "vtkRpCubeAxesActor2D.h"
 #else
 #include <vtkCubeAxesActor2D.h>
@@ -61 +61 @@
     };
 
+    enum PrincipalPlane {
+        PLANE_XY,
+        PLANE_ZY,
+        PLANE_XZ
+    };
+
     enum AxesFlyMode {
         FLY_OUTER_EDGES = 0,
@@ -79 +85 @@
         ORTHO,
         IMAGE
+    };
+
+    enum LegendType {
+        ACTIVE_SCALAR,
+        ACTIVE_VECTOR_MAGNITUDE,
+        ACTIVE_VECTOR_X,
+        ACTIVE_VECTOR_Y,
+        ACTIVE_VECTOR_Z
     };
 
@@ -104 +118 @@
     DataSet *getDataSet(const DataSetId& id);
 
+    void getDataSetNames(std::vector<std::string>& names);
+
     bool setData(const DataSetId& id, char *data, int nbytes);
 
@@ -112 +128 @@
     bool setDataSetActiveVectors(const DataSetId& id, const char *vectorName);
 
-    double getDataValueAtPixel(const DataSetId& id, int x, int y);
-
-    double getDataValue(const DataSetId& id, double x, double y, double z);
-
-    void setOpacity(const DataSetId& id, double opacity);
-
-    void setVisibility(const DataSetId& id, bool state);
+    bool getScalarValueAtPixel(const DataSetId& id, int x, int y, double *value);
+
+    bool getScalarValue(const DataSetId& id, double x, double y, double z, double *value);
+
+    bool getVectorValueAtPixel(const DataSetId& id, int x, int y, double vector[3]);
+
+    bool getVectorValue(const DataSetId& id, double x, double y, double z, double vector[3]);
+
+    void setDataSetShowBounds(const DataSetId& id, bool state);
+
+    void setDataSetOutlineColor(const DataSetId& id, float color[3]);
+
+    void setDataSetOpacity(const DataSetId& id, double opacity);
+
+    void setDataSetVisibility(const DataSetId& id, bool state);
 
     void setUseCumulativeDataRange(bool state, bool onlyVisible = false);
@@ -148 +172 @@
     void resetCameraClippingRange();
 
+    void setCameraZoomRegionPixels(int x, int y, int width, int height);
+
     void setCameraZoomRegion(double x, double y, double width, double height);
 
@@ -174 +200 @@
     void setBackgroundColor(float color[3]);
 
-    void showBounds(bool state);
-
     void setClipPlane(Axis axis, double ratio, int direction);
 
@@ -226 +250 @@
     bool renderColorMap(const ColorMapId& id, 
                         const DataSetId& dataSetID,
-                        const char *title,
+                        LegendType legendType,
+                        std::string& title,
+                        double range[2],
                         int width, int height,
+                        int numLabels,
                         vtkUnsignedCharArray *imgData);
 
     // 2D Contour plots
 
-    void addContour2D(const DataSetId& id);
+    bool addContour2D(const DataSetId& id, int numContours);
+
+    bool addContour2D(const DataSetId& id, const std::vector<double>& contours);
 
     void deleteContour2D(const DataSetId& id);
@@ -248 +277 @@
     void setContour2DScale(const DataSetId& id, double scale[3]);
 
-    void setContour2DEdgeColor(const DataSetId& id, float color[3]);
+    void setContour2DColor(const DataSetId& id, float color[3]);
 
     void setContour2DEdgeWidth(const DataSetId& id, float edgeWidth);
@@ -264 +293 @@
     // 3D Contour (isosurface) plots
 
-    void addContour3D(const DataSetId& id);
+    bool addContour3D(const DataSetId& id, int numContours);
+
+    bool addContour3D(const DataSetId& id, const std::vector<double>& contours);
 
     void deleteContour3D(const DataSetId& id);
@@ -304 +335 @@
     // Glyphs
 
-    void addGlyphs(const DataSetId& id);
+    bool addGlyphs(const DataSetId& id, Glyphs::GlyphShape shape);
 
     void deleteGlyphs(const DataSetId& id);
@@ -344 +375 @@
     void setGlyphsScalingMode(const DataSetId& id, Glyphs::ScalingMode mode);
 
+    void setGlyphsNormalizeScale(const DataSetId& id, bool normalize);
+
     void setGlyphsScaleFactor(const DataSetId& id, double scale);
 
     // Height maps
 
-    void addHeightMap(const DataSetId& id);
+    bool addHeightMap(const DataSetId& id, int numContours, double heightScale);
+
+    bool addHeightMap(const DataSetId& id, const std::vector<double>& contours, double heightScale);
 
     void deleteHeightMap(const DataSetId& id);
@@ -376 +411 @@
     void setHeightMapVisibility(const DataSetId& id, bool state);
 
+    void setHeightMapWireframe(const DataSetId& id, bool state);
+
     void setHeightMapVolumeSlice(const DataSetId& id, HeightMap::Axis axis, double ratio);
 
@@ -382 +419 @@
     void setHeightMapColorMap(const DataSetId& id, const ColorMapId& colorMapId);
 
-    void setHeightMapContours(const DataSetId& id, int numContours);
+    void setHeightMapNumContours(const DataSetId& id, int numContours);
 
     void setHeightMapContourList(const DataSetId& id, const std::vector<double>& contours);
 
-    void setHeightMapContourVisibility(const DataSetId& id, bool state);
+    void setHeightMapContourSurfaceVisibility(const DataSetId& id, bool state);
+
+    void setHeightMapContourLineVisibility(const DataSetId& id, bool state);
 
     void setHeightMapContourEdgeColor(const DataSetId& id, float color[3]);
@@ -394 +433 @@
     // LIC plots
 
-    void addLIC(const DataSetId& id);
+    bool addLIC(const DataSetId& id);
     
     void deleteLIC(const DataSetId& id);
@@ -428 +467 @@
     // Molecules
 
-    void addMolecule(const DataSetId& id);
+    bool addMolecule(const DataSetId& id);
     
     void deleteMolecule(const DataSetId& id);
@@ -468 +507 @@
     // PolyData Meshes
 
-    void addPolyData(const DataSetId& id);
+    bool addPolyData(const DataSetId& id);
     
     void deletePolyData(const DataSetId& id);
@@ -492 +531 @@
     void setPolyDataEdgeWidth(const DataSetId& id, float edgeWidth);
 
+    void setPolyDataPointSize(const DataSetId& id, float size);
+
     void setPolyDataLighting(const DataSetId& id, bool state);
 
@@ -500 +541 @@
     void setPolyDataWireframe(const DataSetId& id, bool state);
 
-
     // Color-mapped surfaces
 
-    void addPseudoColor(const DataSetId& id);
+    bool addPseudoColor(const DataSetId& id);
 
     void deletePseudoColor(const DataSetId& id);
@@ -519 +559 @@
     void setPseudoColorScale(const DataSetId& id, double scale[3]);
 
+    void setPseudoColorColor(const DataSetId& id, float color[3]);
+
     void setPseudoColorEdgeVisibility(const DataSetId& id, bool state);
 
@@ -535 +577 @@
     void setPseudoColorColorMap(const DataSetId& id, const ColorMapId& colorMapId);
 
+    void setPseudoColorColorMode(const DataSetId& id, PseudoColor::ColorMode mode);
+
     // Streamlines
 
-    void addStreamlines(const DataSetId& id);
+    bool addStreamlines(const DataSetId& id);
 
     void deleteStreamlines(const DataSetId& id);
@@ -606 +650 @@
     // Volumes
 
-    void addVolume(const DataSetId& id);
+    bool addVolume(const DataSetId& id);
 
     void deleteVolume(const DataSetId& id);
@@ -650 +694 @@
     void collectBounds(double *bounds, bool onlyVisible);
 
-    void collectDataRanges(double *range, bool onlyVisible);
-
-    void updateRanges(bool useCumulative);
+    void collectDataRanges();
+
+    void collectScalarRanges(double *range, bool onlyVisible);
+
+    void collectVectorMagnitudeRanges(double *range, bool onlyVisible);
+
+    void collectVectorComponentRanges(double *range, int component, bool onlyVisible);
+
+    void updateRanges();
+
+    void updateColorMap(ColorMap *cmap);
+
+    bool colorMapUsed(ColorMap *cmap);
 
     void setCameraFromMatrix(vtkCamera *camera, vtkMatrix4x4 &mat);
@@ -662 +716 @@
     void computeScreenWorldCoords();
 
+    bool is2D(const double bounds[6],
+              PrincipalPlane *plane,
+              double *offset) const;
     void initCamera();
     void initAxes();
-    void resetAxes();
+    void resetAxes(double bounds[6] = NULL);
     void setCameraClippingPlanes();
 
@@ -671 +728 @@
     double _imgWorldOrigin[2];
     double _imgWorldDims[2];
+    PrincipalPlane _imgCameraPlane;
+    double _imgCameraOffset;
     double _screenWorldCoords[4];
     double _cameraOrientation[4];
@@ -678 +737 @@
     bool _useCumulativeRange;
     bool _cumulativeRangeOnlyVisible;
-    double _cumulativeDataRange[2];
+    double _cumulativeScalarRange[2];
+    double _cumulativeVectorMagnitudeRange[2];
+    double _cumulativeVectorComponentRange[3][2];
 
     ColorMapHashmap _colorMaps;

branches/blt4/packages/vizservers/vtkvis/RpVtkRendererCmd.cpp

@@ -10 +10 @@
 #include <cstring>
 #include <cerrno>
+#include <string>
+#include <sstream>
 #include <unistd.h>
 #include <sys/uio.h>
@@ -21 +23 @@
 #include "PPMWriter.h"
 #include "TGAWriter.h"
+#ifdef USE_THREADS
+#include "ResponseQueue.h"
+#endif
 
 using namespace Rappture::VtkVis;
 
+static int lastCmdStatus;
+
+#ifdef USE_THREADS
+static void
+QueueResponse(ClientData clientData, const void *bytes, size_t len, 
+              Response::AllocationType allocType)
+{
+    ResponseQueue *queue = (ResponseQueue *)clientData;
+
+    Response *response;
+
+    response = new Response(Response::DATA);
+    response->setMessage((unsigned char *)bytes, len, allocType);
+    queue->enqueue(response);
+}
+#else
+
+static ssize_t
+SocketWrite(const void *bytes, size_t len)
+{
+    size_t ofs = 0;
+    ssize_t bytesWritten;
+    while ((bytesWritten = write(g_fdOut, (const char *)bytes + ofs, len - ofs)) > 0) {
+        ofs += bytesWritten;
+        if (ofs == len)
+            break;
+    }
+    if (bytesWritten < 0) {
+        ERROR("write: %s", strerror(errno));
+    }
+    return bytesWritten;
+}
+
+#endif  /*USE_THREADS*/
+
 static int
 ExecuteCommand(Tcl_Interp *interp, Tcl_DString *dsPtr) 
@@ -29 +69 @@
     int result;
 
-    result = Tcl_Eval(interp, Tcl_DStringValue(dsPtr));
+    TRACE("command: '%s'", Tcl_DStringValue(dsPtr));
+    lastCmdStatus = TCL_OK;
+    result = Tcl_EvalEx(interp, Tcl_DStringValue(dsPtr), 
+                        Tcl_DStringLength(dsPtr), 
+                        TCL_EVAL_DIRECT | TCL_EVAL_GLOBAL);
     Tcl_DStringSetLength(dsPtr, 0);
-
+    if (lastCmdStatus == TCL_BREAK) {
+        return TCL_BREAK;
+    }
+    lastCmdStatus = result;
     return result;
 }
 
-static bool
+static int
 GetBooleanFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, bool *boolPtr)
 {
@@ -47 +94 @@
 }
 
-int
+static int
 GetFloatFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, float *valuePtr)
 {
@@ -324 +371 @@
 
     char buf[256];
-    snprintf(buf, sizeof(buf), "nv>camera set %.12e %.12e %.12e %.12e %.12e %.12e %.12e %.12e %.12e", 
+    snprintf(buf, sizeof(buf), "nv>camera set %.12e %.12e %.12e %.12e %.12e %.12e %.12e %.12e %.12e\n", 
              pos[0], pos[1], pos[2], focalPt[0], focalPt[1], focalPt[2], viewUp[0], viewUp[1], viewUp[2]);
-    ssize_t bytesWritten;
-    size_t len = strlen(buf);
-    size_t ofs = 0;
-    while ((bytesWritten = write(g_fdOut, buf + ofs, len - ofs)) > 0) {
-        ofs += bytesWritten;
-        if (ofs == len)
-            break;
-    }
+
+#ifdef USE_THREADS
+    QueueResponse(clientData, buf, strlen(buf), Response::VOLATILE);
+#else 
+    ssize_t bytesWritten = SocketWrite(buf, strlen(buf));
     if (bytesWritten < 0) {
         return TCL_ERROR;
     }
+#endif
     return TCL_OK;
 }
@@ -361 +406 @@
               Tcl_Obj *const *objv)
 {
-    double x, y, width, height;
-
-    if (Tcl_GetDoubleFromObj(interp, objv[2], &x) != TCL_OK ||
-        Tcl_GetDoubleFromObj(interp, objv[3], &y) != TCL_OK ||
-        Tcl_GetDoubleFromObj(interp, objv[4], &width) != TCL_OK ||
-        Tcl_GetDoubleFromObj(interp, objv[5], &height) != TCL_OK) {
-        return TCL_ERROR;
-    }
-
-    g_renderer->setCameraZoomRegion(x, y, width, height);
+    const char *string = Tcl_GetString(objv[2]);
+
+    if (string[0] == 'p' && strcmp(string, "pixel") == 0) {
+        int x, y, width, height;
+        if (Tcl_GetIntFromObj(interp, objv[3], &x) != TCL_OK ||
+            Tcl_GetIntFromObj(interp, objv[4], &y) != TCL_OK ||
+            Tcl_GetIntFromObj(interp, objv[5], &width) != TCL_OK ||
+            Tcl_GetIntFromObj(interp, objv[6], &height) != TCL_OK) {
+            return TCL_ERROR;
+        }
+        g_renderer->setCameraZoomRegionPixels(x, y, width, height);
+    } else if (string[0] == 'w' && strcmp(string, "world") == 0) {
+        double x, y, width, height;
+        if (Tcl_GetDoubleFromObj(interp, objv[3], &x) != TCL_OK ||
+            Tcl_GetDoubleFromObj(interp, objv[4], &y) != TCL_OK ||
+            Tcl_GetDoubleFromObj(interp, objv[5], &width) != TCL_OK ||
+            Tcl_GetDoubleFromObj(interp, objv[6], &height) != TCL_OK) {
+            return TCL_ERROR;
+        }
+        g_renderer->setCameraZoomRegion(x, y, width, height);
+    } else {
+        Tcl_AppendResult(interp, "bad camera ortho option \"", string,
+                         "\": should be pixel or world", (char*)NULL);
+        return TCL_ERROR;
+    }
+
     return TCL_OK;
 }
@@ -466 +527 @@
     {"mode", 1, CameraModeOp, 3, 3, "mode"},
     {"orient", 3, CameraOrientOp, 6, 6, "qw qx qy qz"},
-    {"ortho", 1, CameraOrthoOp, 6, 6, "x y width height"},
+    {"ortho", 1, CameraOrthoOp, 7, 7, "coordMode x y width height"},
     {"pan", 1, CameraPanOp, 4, 4, "panX panY"},
     {"reset", 2, CameraResetOp, 2, 3, "?all?"},
@@ -625 +686 @@
     if (objc == 5) {
         const char *name = Tcl_GetString(objv[4]);
-        g_renderer->addContour2D(name);
-        g_renderer->setContour2DContourList(name, contourList);
-    } else {
-        g_renderer->addContour2D("all");
-        g_renderer->setContour2DContourList("all", contourList);
+        if (!g_renderer->addContour2D(name, contourList)) {
+            Tcl_AppendResult(interp, "Failed to create contour2d", (char*)NULL);
+            return TCL_ERROR;
+        }
+    } else {
+        if (!g_renderer->addContour2D("all", contourList)) {
+            Tcl_AppendResult(interp, "Failed to create contour2d for one or more data sets", (char*)NULL);
+            return TCL_ERROR;
+        }
     }
     return TCL_OK;
@@ -644 +709 @@
     if (objc == 5) {
         const char *name = Tcl_GetString(objv[4]);
-        g_renderer->addContour2D(name);
-        g_renderer->setContour2DContours(name, numContours);
-    } else {
-        g_renderer->addContour2D("all");
-        g_renderer->setContour2DContours("all", numContours);
+        if (!g_renderer->addContour2D(name, numContours)) {
+            Tcl_AppendResult(interp, "Failed to create contour2d", (char*)NULL);
+            return TCL_ERROR;
+        }
+    } else {
+       if (!g_renderer->addContour2D("all", numContours)) {
+            Tcl_AppendResult(interp, "Failed to create contour2d for one or more data sets", (char*)NULL);
+            return TCL_ERROR;
+       }
     }
     return TCL_OK;
@@ -715 +784 @@
     if (objc == 6) {
         const char *name = Tcl_GetString(objv[5]);
-        g_renderer->setContour2DEdgeColor(name, color);
-    } else {
-        g_renderer->setContour2DEdgeColor("all", color);
+        g_renderer->setContour2DColor(name, color);
+    } else {
+        g_renderer->setContour2DColor("all", color);
     }
     return TCL_OK;
@@ -833 +902 @@
 static Rappture::CmdSpec contour2dOps[] = {
     {"add",       1, Contour2DAddOp, 4, 5, "oper value ?dataSetName?"},
+    {"color",     1, Contour2DLineColorOp, 5, 6, "r g b ?dataSetName?"},
     {"delete",    1, Contour2DDeleteOp, 2, 3, "?dataSetName?"},
     {"lighting",  3, Contour2DLightingOp, 3, 4, "bool ?dataSetName?"},
@@ -882 +952 @@
     if (objc == 5) {
         const char *name = Tcl_GetString(objv[4]);
-        g_renderer->addContour3D(name);
-        g_renderer->setContour3DContourList(name, contourList);
-    } else {
-        g_renderer->addContour3D("all");
-        g_renderer->setContour3DContourList("all", contourList);
+        if (!g_renderer->addContour3D(name, contourList)) {
+            Tcl_AppendResult(interp, "Failed to create contour3d", (char*)NULL);
+            return TCL_ERROR;
+        }
+    } else {
+        if (!g_renderer->addContour3D("all", contourList)) {
+            Tcl_AppendResult(interp, "Failed to create contour3d for one or more data sets", (char*)NULL);
+            return TCL_ERROR;
+        }
     }
     return TCL_OK;
@@ -901 +975 @@
     if (objc == 5) {
         const char *name = Tcl_GetString(objv[4]);
-        g_renderer->addContour3D(name);
-        g_renderer->setContour3DContours(name, numContours);
-    } else {
-        g_renderer->addContour3D("all");
-        g_renderer->setContour3DContours("all", numContours);
+        if (!g_renderer->addContour3D(name, numContours)) {
+            Tcl_AppendResult(interp, "Failed to create contour3d", (char*)NULL);
+            return TCL_ERROR;
+        }
+    } else {
+        if (!g_renderer->addContour3D("all", numContours)) {
+            Tcl_AppendResult(interp, "Failed to create contour3d for one or more data sets", (char*)NULL);
+            return TCL_ERROR;
+        }
     }
     return TCL_OK;
@@ -1256 +1334 @@
     }
     char *data = (char *)malloc(nbytes);
-#ifdef notdef
-    size_t ofs = 0;
-    ssize_t bytesRead = 0;
-    while ((bytesRead = read(g_fdIn, data + ofs, nbytes - ofs)) > 0) {
-        ofs += bytesRead;
-        if (ofs == nbytes)
-            break;
-    }
-    TRACE("bytesRead: %d", ofs);
-    if (bytesRead < 0) {
-        free(data);
-        return TCL_ERROR;
-    }
-#else
     size_t bytesRead = fread(data, 1, nbytes, g_fIn);
-    TRACE("bytesRead: %d '%c'", bytesRead, data[0]);
+    TRACE("bytesRead: %d", bytesRead);
     if (bytesRead < (size_t)nbytes) {
         free(data);
         return TCL_ERROR;
     }
-#endif
     g_renderer->addDataSet(name);
     g_renderer->setData(name, data, nbytes);
@@ -1298 +1361 @@
 
 static int
-DataSetGetValuePixelOp(ClientData clientData, Tcl_Interp *interp, int objc, 
-                       Tcl_Obj *const *objv)
+DataSetGetScalarPixelOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                        Tcl_Obj *const *objv)
 {
     const char *name = Tcl_GetString(objv[5]);
@@ -1307 +1370 @@
         return TCL_ERROR;
     }
-    double value = g_renderer->getDataValueAtPixel(name, x, y);
-    char buf[128];
-    snprintf(buf, sizeof(buf), "nv>dataset value pixel %d %d %.12e", x, y, value);
-    ssize_t bytesWritten;
-    size_t len = strlen(buf);
-    size_t ofs = 0;
-    while ((bytesWritten = write(g_fdOut, buf + ofs, len - ofs)) > 0) {
-        ofs += bytesWritten;
-        if (ofs == len)
-            break;
-    }
+    double value;
+    if (!g_renderer->getScalarValueAtPixel(name, x, y, &value)) {
+        Tcl_AppendResult(interp, "Pixel out of dataset bounds or no scalar data available", (char*)NULL);
+        return TCL_ERROR;
+    }
+
+    char buf[256];
+    int length;
+
+    length = snprintf(buf, sizeof(buf), "nv>dataset scalar pixel %d %d %g %s\n",
+        x, y, value, name);
+
+#ifdef USE_THREADS
+    QueueResponse(clientData, buf, length, Response::VOLATILE);
+#else
+    ssize_t bytesWritten = SocketWrite(buf, length);
+
     if (bytesWritten < 0) {
         return TCL_ERROR;
     }
-    return TCL_OK;
-}
-
-static int
-DataSetGetValueWorldOp(ClientData clientData, Tcl_Interp *interp, int objc, 
-                       Tcl_Obj *const *objv)
+#endif
+    return TCL_OK;
+}
+
+static int
+DataSetGetScalarWorldOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                        Tcl_Obj *const *objv)
 {
     const char *name = Tcl_GetString(objv[6]);
@@ -1335 +1405 @@
         return TCL_ERROR;
     }
-    double value = g_renderer->getDataValue(name, x, y, z);
-    char buf[128];
-    snprintf(buf, sizeof(buf), "nv>dataset value world %.12e %.12e %.12e %.12e", x, y, z, value);
-    ssize_t bytesWritten;
-    size_t len = strlen(buf);
-    size_t ofs = 0;
-    while ((bytesWritten = write(g_fdOut, buf + ofs, len - ofs)) > 0) {
-        ofs += bytesWritten;
-        if (ofs == len)
-            break;
-    }
+    double value;
+    if (!g_renderer->getScalarValue(name, x, y, z, &value)) {
+        Tcl_AppendResult(interp, "Coordinate out of dataset bounds or no scalar data available", (char*)NULL);
+        return TCL_ERROR;
+    }
+
+    char buf[256];
+    int length;
+
+    length = snprintf(buf, sizeof(buf), 
+        "nv>dataset scalar world %g %g %g %g %s\n", x, y, z, value, name);
+
+#ifdef USE_THREADS
+    QueueResponse(clientData, buf, length, Response::VOLATILE);
+#else 
+    ssize_t bytesWritten = SocketWrite(buf, length);
     if (bytesWritten < 0) {
         return TCL_ERROR;
     }
-    return TCL_OK;
-}
-
-static Rappture::CmdSpec dataSetGetValueOps[] = {
-    {"pixel", 1, DataSetGetValuePixelOp, 6, 6, "x y dataSetName"},
-    {"world", 1, DataSetGetValueWorldOp, 7, 7, "x y z dataSetName"}
+#endif
+    return TCL_OK;
+}
+
+static Rappture::CmdSpec dataSetGetScalarOps[] = {
+    {"pixel", 1, DataSetGetScalarPixelOp, 6, 6, "x y dataSetName"},
+    {"world", 1, DataSetGetScalarWorldOp, 7, 7, "x y z dataSetName"}
 };
-static int nDataSetGetValueOps = NumCmdSpecs(dataSetGetValueOps);
-
-static int
-DataSetGetValueOp(ClientData clientData, Tcl_Interp *interp, int objc, 
-                  Tcl_Obj *const *objv)
+static int nDataSetGetScalarOps = NumCmdSpecs(dataSetGetScalarOps);
+
+static int
+DataSetGetScalarOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                   Tcl_Obj *const *objv)
 {
     Tcl_ObjCmdProc *proc;
 
-    proc = Rappture::GetOpFromObj(interp, nDataSetGetValueOps, dataSetGetValueOps,
+    proc = Rappture::GetOpFromObj(interp, nDataSetGetScalarOps, dataSetGetScalarOps,
                                   Rappture::CMDSPEC_ARG2, objc, objv, 0);
     if (proc == NULL) {
@@ -1373 +1449 @@
 
 static int
-DataSetOpacityOp(ClientData clientData, Tcl_Interp *interp, int objc, 
-                 Tcl_Obj *const *objv)
-{
-    double opacity;
-    if (Tcl_GetDoubleFromObj(interp, objv[2], &opacity) != TCL_OK) {
-        return TCL_ERROR;
-    }
-    if (objc == 4) {
-        const char *name = Tcl_GetString(objv[3]);
-        g_renderer->setOpacity(name, opacity);
-    } else {
-        g_renderer->setOpacity("all", opacity);
-    }
-    return TCL_OK;
+DataSetGetVectorPixelOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                        Tcl_Obj *const *objv)
+{
+    const char *name = Tcl_GetString(objv[5]);
+    int x, y;
+    if (Tcl_GetIntFromObj(interp, objv[3], &x) != TCL_OK ||
+        Tcl_GetIntFromObj(interp, objv[4], &y) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    double value[3];
+    if (!g_renderer->getVectorValueAtPixel(name, x, y, value)) {
+        Tcl_AppendResult(interp, "Pixel out of dataset bounds or no vector data available", (char*)NULL);
+        return TCL_ERROR;
+    }
+
+    char buf[256];
+    int length; 
+    length = snprintf(buf, sizeof(buf), 
+        "nv>dataset vector pixel %d %d %g %g %g %s\n", x, y, value[0], 
+        value[1], value[2], name);
+
+#ifdef USE_THREADS
+    QueueResponse(clientData, buf, length, Response::VOLATILE);
+#else 
+    ssize_t bytesWritten = SocketWrite(buf, length);
+
+    if (bytesWritten < 0) {
+        return TCL_ERROR;
+    }
+#endif /*USE_THREADS*/
+    return TCL_OK;
+}
+
+static int
+DataSetGetVectorWorldOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                        Tcl_Obj *const *objv)
+{
+    const char *name = Tcl_GetString(objv[6]);
+    double x, y, z;
+    if (Tcl_GetDoubleFromObj(interp, objv[3], &x) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[4], &y) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[5], &z) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    double value[3];
+    if (!g_renderer->getVectorValue(name, x, y, z, value)) {
+        Tcl_AppendResult(interp, "Coordinate out of dataset bounds or no vector data available", (char*)NULL);
+        return TCL_ERROR;
+    }
+
+    char buf[256];
+    int length;
+    length = snprintf(buf, sizeof(buf), 
+        "nv>dataset vector world %g %g %g %g %g %g %s\n", x, y, z,
+        value[0], value[1], value[2], name);
+#ifdef USE_THREADS
+    QueueResponse(clientData, buf, length, Response::VOLATILE);
+#else 
+    ssize_t bytesWritten = SocketWrite(buf, length);
+
+    if (bytesWritten < 0) {
+        return TCL_ERROR;
+    }
+#endif /*USE_THREADS*/
+    return TCL_OK;
+}
+
+static Rappture::CmdSpec dataSetGetVectorOps[] = {
+    {"pixel", 1, DataSetGetVectorPixelOp, 6, 6, "x y dataSetName"},
+    {"world", 1, DataSetGetVectorWorldOp, 7, 7, "x y z dataSetName"}
+};
+static int nDataSetGetVectorOps = NumCmdSpecs(dataSetGetVectorOps);
+
+static int
+DataSetGetVectorOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                   Tcl_Obj *const *objv)
+{
+    Tcl_ObjCmdProc *proc;
+
+    proc = Rappture::GetOpFromObj(interp, nDataSetGetVectorOps, dataSetGetVectorOps,
+                                  Rappture::CMDSPEC_ARG2, objc, objv, 0);
+    if (proc == NULL) {
+        return TCL_ERROR;
+    }
+    return (*proc) (clientData, interp, objc, objv);
 }
 
@@ -1401 +1548 @@
         g_renderer->setUseCumulativeDataRange(false);
     } else {
-        return TCL_ERROR;
+        Tcl_AppendResult(interp, "bad maprange option \"", value,
+                         "\": should be all, visible, or separate", (char*)NULL);
+        return TCL_ERROR;
+    }
+    return TCL_OK;
+}
+
+static int
+DataSetNamesOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+               Tcl_Obj *const *objv)
+{
+    std::vector<std::string> dataSets;
+    g_renderer->getDataSetNames(dataSets);
+    std::ostringstream oss;
+    size_t len = 0;
+    oss << "nv>dataset names {";
+    len += 18;
+    for (size_t i = 0; i < dataSets.size(); i++) {
+        oss << "\"" << dataSets[i] << "\"";
+        len += 2 + dataSets[i].length();
+        if (i < dataSets.size() - 1) {
+            oss << " ";
+            len++;
+        }
+    }
+    oss << "}\n";
+    len += 2;
+#ifdef USE_THREADS
+    QueueResponse(clientData, oss.str().c_str(), len, Response::VOLATILE);
+#else 
+    ssize_t bytesWritten = SocketWrite(oss.str().c_str(), len);
+
+    if (bytesWritten < 0) {
+        return TCL_ERROR;
+    }
+#endif /*USE_THREADS*/
+    return TCL_OK;
+}
+
+static int
+DataSetOpacityOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                 Tcl_Obj *const *objv)
+{
+    double opacity;
+    if (Tcl_GetDoubleFromObj(interp, objv[2], &opacity) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (objc == 4) {
+        const char *name = Tcl_GetString(objv[3]);
+        g_renderer->setDataSetOpacity(name, opacity);
+    } else {
+        g_renderer->setDataSetOpacity("all", opacity);
+    }
+    return TCL_OK;
+}
+
+static int
+DataSetOutlineOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                 Tcl_Obj *const *objv)
+{
+    bool state;
+    if (GetBooleanFromObj(interp, objv[2], &state) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (objc == 4) {
+        const char *name = Tcl_GetString(objv[3]);
+        g_renderer->setDataSetShowBounds(name, state);
+    } else {
+        g_renderer->setDataSetShowBounds("all", state);
+    }
+    return TCL_OK;
+}
+
+static int
+DataSetOutlineColorOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                      Tcl_Obj *const *objv)
+{
+    float color[3];
+    if (GetFloatFromObj(interp, objv[2], &color[0]) != TCL_OK ||
+        GetFloatFromObj(interp, objv[3], &color[1]) != TCL_OK ||
+        GetFloatFromObj(interp, objv[4], &color[2]) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (objc == 6) {
+        const char *name = Tcl_GetString(objv[5]);
+        g_renderer->setDataSetOutlineColor(name, color);
+    } else {
+        g_renderer->setDataSetOutlineColor("all", color);
     }
     return TCL_OK;
@@ -1416 +1650 @@
     if (objc == 4) {
         const char *name = Tcl_GetString(objv[3]);
-        g_renderer->setVisibility(name, state);
-    } else {
-        g_renderer->setVisibility("all", state);
+        g_renderer->setDataSetVisibility(name, state);
+    } else {
+        g_renderer->setDataSetVisibility("all", state);
     }
     return TCL_OK;
@@ -1424 +1658 @@
 
 static Rappture::CmdSpec dataSetOps[] = {
-    {"add",      1, DataSetAddOp, 6, 6, "name data follows nBytes"},
-    {"delete",   1, DataSetDeleteOp, 2, 3, "?name?"},
-    {"getvalue", 1, DataSetGetValueOp, 6, 7, "oper x y ?z? name"},
-    {"maprange", 1, DataSetMapRangeOp, 3, 3, "value"},
-    {"opacity",  1, DataSetOpacityOp, 3, 4, "value ?name?"},
-    {"scalar",   1, DataSetActiveScalarsOp, 3, 4, "scalarName ?name?"},
-    {"vector",   2, DataSetActiveVectorsOp, 3, 4, "vectorName ?name?"},
-    {"visible",  2, DataSetVisibleOp, 3, 4, "bool ?name?"}
+    {"add",       1, DataSetAddOp, 6, 6, "name data follows nBytes"},
+    {"color",     1, DataSetOutlineColorOp, 5, 6, "r g b ?name?"},
+    {"delete",    1, DataSetDeleteOp, 2, 3, "?name?"},
+    {"getscalar", 4, DataSetGetScalarOp, 6, 7, "oper x y ?z? name"},
+    {"getvector", 4, DataSetGetVectorOp, 6, 7, "oper x y ?z? name"},
+    {"maprange",  1, DataSetMapRangeOp, 3, 3, "value"},
+    {"names",     1, DataSetNamesOp, 2, 2, ""},
+    {"opacity",   2, DataSetOpacityOp, 3, 4, "value ?name?"},
+    {"outline",   2, DataSetOutlineOp, 3, 4, "bool ?name?"},
+    {"scalar",    1, DataSetActiveScalarsOp, 3, 4, "scalarName ?name?"},
+    {"vector",    2, DataSetActiveVectorsOp, 3, 4, "vectorName ?name?"},
+    {"visible",   2, DataSetVisibleOp, 3, 4, "bool ?name?"}
 };
 static int nDataSetOps = NumCmdSpecs(dataSetOps);
@@ -1468 +1706 @@
     } else if (shapeOpt[0] == 'i' && strcmp(shapeOpt, "icosahedron") == 0) {
         shape = Glyphs::ICOSAHEDRON;
+    } else if (shapeOpt[0] == 'l' && strcmp(shapeOpt, "line") == 0) {
+        shape = Glyphs::LINE;
     } else if (shapeOpt[0] == 'o' && strcmp(shapeOpt, "octahedron") == 0) {
         shape = Glyphs::OCTAHEDRON;
@@ -1482 +1722 @@
     if (objc == 4) {
         const char *name = Tcl_GetString(objv[3]);
-        g_renderer->addGlyphs(name);
-        g_renderer->setGlyphsShape(name, shape);
-    } else {
-        g_renderer->addGlyphs("all");
-        g_renderer->setGlyphsShape("all", shape);
+        if (!g_renderer->addGlyphs(name, shape)) {
+            Tcl_AppendResult(interp, "Failed to create glyphs", (char*)NULL);
+            return TCL_ERROR;
+        }
+    } else {
+        if (!g_renderer->addGlyphs("all", shape)) {
+            Tcl_AppendResult(interp, "Failed to create glyphs for one or more data sets", (char*)NULL);
+            return TCL_ERROR;
+        }
     }
     return TCL_OK;
@@ -1532 +1776 @@
     if (str[0] == 'c' && strcmp(str, "ccolor") == 0) {
         mode = Glyphs::COLOR_CONSTANT;
-    } else if (str[0] == 's' && strcmp(str, "scale") == 0) {
-        mode = Glyphs::COLOR_BY_SCALE;
     } else if (str[0] == 's' && strcmp(str, "scalar") == 0) {
         mode = Glyphs::COLOR_BY_SCALAR;
-    } else if (str[0] == 'v' && strcmp(str, "vector") == 0) {
-        mode = Glyphs::COLOR_BY_VECTOR;
+    } else if (str[0] == 'v' && strcmp(str, "vmag") == 0) {
+        mode = Glyphs::COLOR_BY_VECTOR_MAGNITUDE;
     } else {
         Tcl_AppendResult(interp, "bad color mode option \"", str,
-                         "\": should be one of: 'scale', 'scalar', 'vector', 'ccolor'", (char*)NULL);
+                         "\": should be one of: 'scalar', 'vmag', 'ccolor'", (char*)NULL);
         return TCL_ERROR;
     }
@@ -1631 +1873 @@
     } else {
         g_renderer->setGlyphsEdgeWidth("all", width);
+    }
+    return TCL_OK;
+}
+
+static int
+GlyphsNormalizeScaleOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                       Tcl_Obj *const *objv)
+{
+    bool normalize;
+    if (GetBooleanFromObj(interp, objv[2], &normalize) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (objc == 4) {
+        const char *name = Tcl_GetString(objv[3]);
+        g_renderer->setGlyphsNormalizeScale(name, normalize);
+    } else {
+        g_renderer->setGlyphsNormalizeScale("all", normalize);
     }
     return TCL_OK;
@@ -1735 +1994 @@
     if (str[0] == 's' && strcmp(str, "scalar") == 0) {
         mode = Glyphs::SCALE_BY_SCALAR;
-    } else if (str[0] == 'v' && strcmp(str, "vector") == 0) {
-        mode = Glyphs::SCALE_BY_VECTOR;
-    } else if (str[0] == 'v' && strcmp(str, "vector_comp") == 0) {
+    } else if (str[0] == 'v' && strcmp(str, "vmag") == 0) {
+        mode = Glyphs::SCALE_BY_VECTOR_MAGNITUDE;
+    } else if (str[0] == 'v' && strcmp(str, "vcomp") == 0) {
         mode = Glyphs::SCALE_BY_VECTOR_COMPONENTS;
     } else if (str[0] == 'o' && strcmp(str, "off") == 0) {
@@ -1743 +2002 @@
     } else {
         Tcl_AppendResult(interp, "bad scaling mode option \"", str,
-                         "\": should be one of: 'scalar', 'vector', 'vector_comp', 'off'", (char*)NULL);
+                         "\": should be one of: 'scalar', 'vmag', 'vcomp', 'off'", (char*)NULL);
         return TCL_ERROR;
     }
@@ -1774 +2033 @@
     } else if (shapeOpt[0] == 'i' && strcmp(shapeOpt, "icosahedron") == 0) {
         shape = Glyphs::ICOSAHEDRON;
+    } else if (shapeOpt[0] == 'l' && strcmp(shapeOpt, "line") == 0) {
+        shape = Glyphs::LINE;
     } else if (shapeOpt[0] == 'o' && strcmp(shapeOpt, "octahedron") == 0) {
         shape = Glyphs::OCTAHEDRON;
@@ -1782 +2043 @@
     } else {
         Tcl_AppendResult(interp, "bad shape option \"", shapeOpt,
-                         "\": should be one of: 'arrow', 'cone', 'cube', 'cylinder', 'dodecahedron', 'icosahedron', 'octahedron', 'sphere', 'tetrahedron'", (char*)NULL);
+                         "\": should be one of: 'arrow', 'cone', 'cube', 'cylinder', 'dodecahedron', 'icosahedron', 'line', 'octahedron', 'sphere', 'tetrahedron'", (char*)NULL);
         return TCL_ERROR;
     }
@@ -1840 +2101 @@
     {"linecolor", 5, GlyphsLineColorOp, 5, 6, "r g b ?dataSetName?"},
     {"linewidth", 5, GlyphsLineWidthOp, 3, 4, "width ?dataSetName?"},
+    {"normscale", 1, GlyphsNormalizeScaleOp, 3, 4, "bool ?dataSetName?"},
     {"opacity",   2, GlyphsOpacityOp, 3, 4, "value ?dataSetName?"},
     {"orient",    2, GlyphsOrientOp, 6, 7, "qw qx qy qz ?dataSetName?"},
@@ -1870 +2132 @@
 {
     std::vector<double> contourList;
+    double heightScale;
 
     int clistc;
@@ -1886 +2149 @@
     }
 
-    if (objc == 5) {
-        const char *name = Tcl_GetString(objv[4]);
-        g_renderer->addHeightMap(name);
-        g_renderer->setHeightMapContourList(name, contourList);
-    } else {
-        g_renderer->addHeightMap("all");
-        g_renderer->setHeightMapContourList("all", contourList);
+    if (Tcl_GetDoubleFromObj(interp, objv[4], &heightScale) != TCL_OK) {
+        return TCL_ERROR;
+    }
+
+    if (objc == 6) {
+        const char *name = Tcl_GetString(objv[5]);
+        if (!g_renderer->addHeightMap(name, contourList, heightScale)) {
+            Tcl_AppendResult(interp, "Failed to create heightmap", (char*)NULL);
+            return TCL_ERROR;
+        }
+    } else {
+        if (!g_renderer->addHeightMap("all", contourList, heightScale)) {
+            Tcl_AppendResult(interp, "Failed to create heightmap for one or more data sets", (char*)NULL);
+            return TCL_ERROR;
+        }
     }
     return TCL_OK;
@@ -1902 +2173 @@
 {
     int numContours;
+    double heightScale;
     if (Tcl_GetIntFromObj(interp, objv[3], &numContours) != TCL_OK) {
         return TCL_ERROR;
     }
-    if (objc == 5) {
-        const char *name = Tcl_GetString(objv[4]);
-        g_renderer->addHeightMap(name);
-        g_renderer->setHeightMapContours(name, numContours);
-    } else {
-        g_renderer->addHeightMap("all");
-        g_renderer->setHeightMapContours("all", numContours);
+    if (Tcl_GetDoubleFromObj(interp, objv[4], &heightScale) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (objc == 6) {
+        const char *name = Tcl_GetString(objv[5]);
+        if (!g_renderer->addHeightMap(name, numContours, heightScale)) {
+            Tcl_AppendResult(interp, "Failed to create heightmap", (char*)NULL);
+            return TCL_ERROR;
+        }
+    } else {
+        if (!g_renderer->addHeightMap("all", numContours, heightScale)) {
+            Tcl_AppendResult(interp, "Failed to create heightmap for one or more data sets", (char*)NULL);
+            return TCL_ERROR;
+        }
     }
     return TCL_OK;
@@ -1917 +2196 @@
 
 static Rappture::CmdSpec heightmapAddOps[] = {
-    {"contourlist", 1, HeightMapAddContourListOp, 4, 5, "contourList ?dataSetName?"},
-    {"numcontours", 1, HeightMapAddNumContoursOp, 4, 5, "numContours ?dataSetName?"}
+    {"contourlist", 1, HeightMapAddContourListOp, 5, 6, "contourList heightscale ?dataSetName?"},
+    {"numcontours", 1, HeightMapAddNumContoursOp, 5, 6, "numContours heightscale ?dataSetName?"}
 };
 static int nHeightmapAddOps = NumCmdSpecs(heightmapAddOps);
@@ -1987 +2266 @@
 
 static int
-HeightMapContourVisibleOp(ClientData clientData, Tcl_Interp *interp, int objc, 
-                          Tcl_Obj *const *objv)
+HeightMapContourListOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                       Tcl_Obj *const *objv)
+{
+    std::vector<double> contourList;
+
+    int clistc;
+    Tcl_Obj **clistv;
+
+    if (Tcl_ListObjGetElements(interp, objv[2], &clistc, &clistv) != TCL_OK) {
+        return TCL_ERROR;
+    }
+
+    for (int i = 0; i < clistc; i++) {
+        double val;
+        if (Tcl_GetDoubleFromObj(interp, clistv[i], &val) != TCL_OK) {
+            return TCL_ERROR;
+        }
+        contourList.push_back(val);
+    }
+
+    if (objc == 4) {
+        const char *name = Tcl_GetString(objv[3]);
+        g_renderer->setHeightMapContourList(name, contourList);
+    } else {
+        g_renderer->setHeightMapContourList("all", contourList);
+    }
+    return TCL_OK;
+}
+
+static int
+HeightMapContourLineVisibleOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                              Tcl_Obj *const *objv)
 {
     bool state;
@@ -1996 +2305 @@
     if (objc == 4) {
         const char *name = Tcl_GetString(objv[3]);
-        g_renderer->setHeightMapContourVisibility(name, state);
-    } else {
-        g_renderer->setHeightMapContourVisibility("all", state);
+        g_renderer->setHeightMapContourLineVisibility(name, state);
+    } else {
+        g_renderer->setHeightMapContourLineVisibility("all", state);
+    }
+    return TCL_OK;
+}
+
+static int
+HeightMapContourSurfaceVisibleOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                                 Tcl_Obj *const *objv)
+{
+    bool state;
+    if (GetBooleanFromObj(interp, objv[2], &state) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (objc == 4) {
+        const char *name = Tcl_GetString(objv[3]);
+        g_renderer->setHeightMapContourSurfaceVisibility(name, state);
+    } else {
+        g_renderer->setHeightMapContourSurfaceVisibility("all", state);
     }
     return TCL_OK;
@@ -2099 +2425 @@
     } else {
         g_renderer->setHeightMapEdgeWidth("all", width);
+    }
+    return TCL_OK;
+}
+
+static int
+HeightMapNumContoursOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                       Tcl_Obj *const *objv)
+{
+    int numContours;
+
+    if (Tcl_GetIntFromObj(interp, objv[2], &numContours) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (objc == 4) {
+        const char *name = Tcl_GetString(objv[3]);
+        g_renderer->setHeightMapNumContours(name, numContours);
+    } else {
+        g_renderer->setHeightMapNumContours("all", numContours);
     }
     return TCL_OK;
@@ -2226 +2570 @@
 }
 
+static int
+HeightMapWireframeOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                     Tcl_Obj *const *objv)
+{
+    bool state;
+    if (GetBooleanFromObj(interp, objv[2], &state) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (objc == 4) {
+        const char *name = Tcl_GetString(objv[3]);
+        g_renderer->setHeightMapWireframe(name, state);
+    } else {
+        g_renderer->setHeightMapWireframe("all", state);
+    }
+    return TCL_OK;
+}
+
 static Rappture::CmdSpec heightmapOps[] = {
-    {"add",          1, HeightMapAddOp, 4, 5, "oper value ?dataSetName?"},
-    {"colormap",     1, HeightMapColorMapOp, 3, 4, "colorMapName ?dataSetName?"},
+    {"add",          1, HeightMapAddOp, 5, 6, "oper value ?dataSetName?"},
+    {"colormap",     2, HeightMapColorMapOp, 3, 4, "colorMapName ?dataSetName?"},
+    {"contourlist",  2, HeightMapContourListOp, 3, 4, "contourList ?dataSetName?"},
     {"delete",       1, HeightMapDeleteOp, 2, 3, "?dataSetName?"},
     {"edges",        1, HeightMapEdgeVisibilityOp, 3, 4, "bool ?dataSetName?"},
     {"heightscale",  1, HeightMapHeightScaleOp, 3, 4, "value ?dataSetName?"},
     {"isolinecolor", 8, HeightMapContourLineColorOp, 5, 6, "r g b ?dataSetName?"},
-    {"isolines",     8, HeightMapContourVisibleOp, 3, 4, "bool ?dataSetName?"},
+    {"isolines",     8, HeightMapContourLineVisibleOp, 3, 4, "bool ?dataSetName?"},
     {"isolinewidth", 8, HeightMapContourLineWidthOp, 3, 4, "width ?dataSetName?"},
     {"lighting",     3, HeightMapLightingOp, 3, 4, "bool ?dataSetName?"},
     {"linecolor",    5, HeightMapLineColorOp, 5, 6, "r g b ?dataSetName?"},
     {"linewidth",    5, HeightMapLineWidthOp, 3, 4, "width ?dataSetName?"},
+    {"numcontours",  1, HeightMapNumContoursOp, 3, 4, "numContours ?dataSetName?"},
     {"opacity",      2, HeightMapOpacityOp, 3, 4, "value ?dataSetName?"},
     {"orient",       2, HeightMapOrientOp, 6, 7, "qw qx qy qz ?dataSetName?"},
     {"pos",          1, HeightMapPositionOp, 5, 6, "x y z ?dataSetName?"},
     {"scale",        1, HeightMapScaleOp, 5, 6, "sx sy sz ?dataSetName?"},
+    {"surface",      2, HeightMapContourSurfaceVisibleOp, 3, 4, "bool ?dataSetName?"},
     {"visible",      2, HeightMapVisibleOp, 3, 4, "bool ?dataSetName?"},
-    {"volumeslice",  2, HeightMapVolumeSliceOp, 4, 5, "axis ratio ?dataSetName?"}
+    {"volumeslice",  2, HeightMapVolumeSliceOp, 4, 5, "axis ratio ?dataSetName?"},
+    {"wireframe",    1, HeightMapWireframeOp, 3, 4, "bool ?dataSetName?"}
 };
 static int nHeightmapOps = NumCmdSpecs(heightmapOps);
@@ -2262 +2627 @@
 
 static int
+ImageFlushCmd(ClientData clientData, Tcl_Interp *interp, int objc, 
+             Tcl_Obj *const *objv)
+{
+    lastCmdStatus = TCL_BREAK;
+    return TCL_OK;
+}
+
+static int
 LegendCmd(ClientData clientData, Tcl_Interp *interp, int objc, 
           Tcl_Obj *const *objv)
 {
-    if (objc < 4) {
+    if (objc < 7) {
         Tcl_AppendResult(interp, "wrong # args: should be \"",
-                Tcl_GetString(objv[0]), " colormapName title width height ?dataSetName?\"", (char*)NULL);
-        return TCL_ERROR;
-    }
-    const char *name = Tcl_GetString(objv[1]);
-    const char *title = Tcl_GetString(objv[2]);
-    int width, height;
-
-    if (Tcl_GetIntFromObj(interp, objv[3], &width) != TCL_OK ||
-        Tcl_GetIntFromObj(interp, objv[4], &height) != TCL_OK) {
+                Tcl_GetString(objv[0]), " colormapName legendType title width height numLabels ?dataSetName?\"", (char*)NULL);
+        return TCL_ERROR;
+    }
+    const char *colorMapName = Tcl_GetString(objv[1]);
+    const char *typeStr = Tcl_GetString(objv[2]);
+    Renderer::LegendType type;
+    if (typeStr[0] == 's' && strcmp(typeStr, "scalar") == 0) {
+        type = Renderer::ACTIVE_SCALAR;
+    } else if (typeStr[0] == 'v' && strcmp(typeStr, "vmag") == 0) {
+        type = Renderer::ACTIVE_VECTOR_MAGNITUDE;
+    } else if (typeStr[0] == 'v' && strcmp(typeStr, "vx") == 0) {
+        type = Renderer::ACTIVE_VECTOR_X;
+    } else if (typeStr[0] == 'v' && strcmp(typeStr, "vy") == 0) {
+        type = Renderer::ACTIVE_VECTOR_Y;
+    } else if (typeStr[0] == 'v' && strcmp(typeStr, "vz") == 0) {
+        type = Renderer::ACTIVE_VECTOR_Z;
+    } else {
+        Tcl_AppendResult(interp, "Bad legendType option \"",
+                         typeStr, "\", should be one of 'scalar', 'vmag', 'vx', 'vy', 'vz'", (char*)NULL);
+        return TCL_ERROR;
+    }
+
+    std::string title(Tcl_GetString(objv[3]));
+    int width, height, numLabels;
+
+    if (Tcl_GetIntFromObj(interp, objv[4], &width) != TCL_OK ||
+        Tcl_GetIntFromObj(interp, objv[5], &height) != TCL_OK ||
+        Tcl_GetIntFromObj(interp, objv[6], &numLabels) != TCL_OK) {
         return TCL_ERROR;
     }
@@ -2282 +2674 @@
         vtkSmartPointer<vtkUnsignedCharArray>::New();
 
-    if (objc == 6) {
-        const char *dataSetName = Tcl_GetString(objv[5]);
-        if (!g_renderer->renderColorMap(name, dataSetName, title, width, height, imgData)) {
+    double range[2];
+
+    if (objc == 8) {
+        const char *dataSetName = Tcl_GetString(objv[7]);
+        if (!g_renderer->renderColorMap(colorMapName, dataSetName, type, title,
+                                        range, width, height, numLabels, imgData)) {
             Tcl_AppendResult(interp, "Color map \"",
-                             name, "\" was not found", (char*)NULL);
+                             colorMapName, "\" or dataset \"",
+                             dataSetName, "\" was not found", (char*)NULL);
             return TCL_ERROR;
         }
     } else {
-        if (!g_renderer->renderColorMap(name, "all", title, width, height, imgData)) {
+        if (!g_renderer->renderColorMap(colorMapName, "all", type, title,
+                                        range, width, height, numLabels, imgData)) {
             Tcl_AppendResult(interp, "Color map \"",
-                             name, "\" was not found", (char*)NULL);
+                             colorMapName, "\" was not found", (char*)NULL);
             return TCL_ERROR;
         }
@@ -2298 +2695 @@
 
 #ifdef DEBUG
+# ifdef RENDER_TARGA
     writeTGAFile("/tmp/legend.tga", imgData->GetPointer(0), width, height,
                  TARGA_BYTES_PER_PIXEL);
+# else
+    writeTGAFile("/tmp/legend.tga", imgData->GetPointer(0), width, height,
+                 TARGA_BYTES_PER_PIXEL, true);
+# endif
 #else
     char cmd[256];
-    snprintf(cmd, sizeof(cmd), "nv>legend %s", name);
-#ifdef RENDER_TARGA
+    snprintf(cmd, sizeof(cmd), "nv>legend {%s} {%s} %g %g",
+             colorMapName, title.c_str(), range[0], range[1]);
+
+# ifdef USE_THREADS
+#  ifdef RENDER_TARGA
+    ResponseQueue *queue = (ResponseQueue *)clientData;
+    queueTGA(queue, cmd, imgData->GetPointer(0), width, height,
+             TARGA_BYTES_PER_PIXEL);
+#  else
+    ResponseQueue *queue = (ResponseQueue *)clientData;
+    queuePPM(queue, cmd, imgData->GetPointer(0), width, height);
+#  endif
+# else
+#  ifdef RENDER_TARGA
     writeTGA(g_fdOut, cmd, imgData->GetPointer(0), width, height,
-                 TARGA_BYTES_PER_PIXEL);
-#else
+             TARGA_BYTES_PER_PIXEL);
+#  else
     writePPM(g_fdOut, cmd, imgData->GetPointer(0), width, height);
-#endif
-#endif
-
+#  endif
+# endif // USE_THREADS
+#endif // DEBUG
     return TCL_OK;
 }
@@ -2320 +2734 @@
     if (objc == 3) {
         const char *name = Tcl_GetString(objv[2]);
-        g_renderer->addLIC(name);
-    } else {
-        g_renderer->addLIC("all");
+        if (!g_renderer->addLIC(name)) {
+            Tcl_AppendResult(interp, "Failed to create lic", (char*)NULL);
+            return TCL_ERROR;
+        }
+    } else {
+        if (!g_renderer->addLIC("all")) {
+            Tcl_AppendResult(interp, "Failed to create lic for one or more data sets", (char*)NULL);
+            return TCL_ERROR;
+        }
     }
     return TCL_OK;
@@ -2584 +3004 @@
     if (objc == 3) {
         const char *name = Tcl_GetString(objv[2]);
-        g_renderer->addMolecule(name);
-    } else {
-        g_renderer->addMolecule("all");
+        if (!g_renderer->addMolecule(name)) {
+            Tcl_AppendResult(interp, "Failed to create molecule", (char*)NULL);
+            return TCL_ERROR;
+        }
+    } else {
+        if (!g_renderer->addMolecule("all")) {
+            Tcl_AppendResult(interp, "Failed to create molecule for one or more data sets", (char*)NULL);
+            return TCL_ERROR;
+        }
     }
     return TCL_OK;
@@ -2899 +3325 @@
     if (objc == 3) {
         const char *name = Tcl_GetString(objv[2]);
-        g_renderer->addPolyData(name);
-    } else {
-        g_renderer->addPolyData("all");
+        if (!g_renderer->addPolyData(name)) {
+            Tcl_AppendResult(interp, "Failed to create polydata", (char*)NULL);
+            return TCL_ERROR;
+        }
+    } else {
+        if (!g_renderer->addPolyData("all")) {
+            Tcl_AppendResult(interp, "Failed to create polydata for one or more data sets", (char*)NULL);
+            return TCL_ERROR;
+        }
     }
     return TCL_OK;
@@ -3041 +3473 @@
     } else {
         g_renderer->setPolyDataOrientation("all", quat);
+    }
+    return TCL_OK;
+}
+
+static int
+PolyDataPointSizeOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                    Tcl_Obj *const *objv)
+{
+    float size;
+    if (GetFloatFromObj(interp, objv[2], &size) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (objc == 4) {
+        const char *name = Tcl_GetString(objv[3]);
+        g_renderer->setPolyDataPointSize(name, size);
+    } else {
+        g_renderer->setPolyDataPointSize("all", size);
     }
     return TCL_OK;
@@ -3127 +3576 @@
     {"opacity",   2, PolyDataOpacityOp, 3, 4, "value ?dataSetName?"},
     {"orient",    2, PolyDataOrientOp, 6, 7, "qw qx qy qz ?dataSetName?"},
-    {"pos",       1, PolyDataPositionOp, 5, 6, "x y z ?dataSetName?"},
+    {"pos",       2, PolyDataPositionOp, 5, 6, "x y z ?dataSetName?"},
+    {"ptsize",    2, PolyDataPointSizeOp, 3, 4, "size ?dataSetName?"},
     {"scale",     1, PolyDataScaleOp, 5, 6, "sx sy sz ?dataSetName?"},
     {"visible",   1, PolyDataVisibleOp, 3, 4, "bool ?dataSetName?"},
@@ -3154 +3604 @@
     if (objc == 3) {
         const char *name = Tcl_GetString(objv[2]);
-        g_renderer->addPseudoColor(name);
-    } else {
-        g_renderer->addPseudoColor("all");
+        if (!g_renderer->addPseudoColor(name)) {
+            Tcl_AppendResult(interp, "Failed to create pseudocolor", (char*)NULL);
+            return TCL_ERROR;
+        }
+    } else {
+        if (!g_renderer->addPseudoColor("all")) {
+            Tcl_AppendResult(interp, "Failed to create pseudocolor for one or more data sets", (char*)NULL);
+            return TCL_ERROR;
+        }
+    }
+    return TCL_OK;
+}
+
+static int
+PseudoColorColorOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                   Tcl_Obj *const *objv)
+{
+    float color[3];
+    if (GetFloatFromObj(interp, objv[2], &color[0]) != TCL_OK ||
+        GetFloatFromObj(interp, objv[3], &color[1]) != TCL_OK ||
+        GetFloatFromObj(interp, objv[4], &color[2]) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (objc == 6) {
+        const char *name = Tcl_GetString(objv[5]);
+        g_renderer->setPseudoColorColor(name, color);
+    } else {
+        g_renderer->setPseudoColorColor("all", color);
     }
     return TCL_OK;
@@ -3171 +3646 @@
     } else {
         g_renderer->setPseudoColorColorMap("all", colorMapName);
+    }
+    return TCL_OK;
+}
+
+static int
+PseudoColorColorModeOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                       Tcl_Obj *const *objv)
+{
+    PseudoColor::ColorMode mode;
+    const char *str = Tcl_GetString(objv[2]);
+    if (str[0] == 'c' && strcmp(str, "ccolor") == 0) {
+        mode = PseudoColor::COLOR_CONSTANT;
+    } else if (str[0] == 's' && strcmp(str, "scalar") == 0) {
+        mode = PseudoColor::COLOR_BY_SCALAR;
+    } else if (str[0] == 'v' && strcmp(str, "vmag") == 0) {
+        mode = PseudoColor::COLOR_BY_VECTOR_MAGNITUDE;
+    } else if (str[0] == 'v' && strcmp(str, "vx") == 0) {
+        mode = PseudoColor::COLOR_BY_VECTOR_X;
+    } else if (str[0] == 'v' && strcmp(str, "vy") == 0) {
+        mode = PseudoColor::COLOR_BY_VECTOR_Y;
+    } else if (str[0] == 'v' && strcmp(str, "vz") == 0) {
+        mode = PseudoColor::COLOR_BY_VECTOR_Z;
+    } else {
+        Tcl_AppendResult(interp, "bad color mode option \"", str,
+                         "\": should be one of: 'scalar', 'vmag', 'vx', 'vy', 'vz', 'ccolor'", (char*)NULL);
+        return TCL_ERROR;
+    }
+    if (objc == 4) {
+        const char *name = Tcl_GetString(objv[3]);
+        g_renderer->setPseudoColorColorMode(name, mode);
+    } else {
+        g_renderer->setPseudoColorColorMode("all", mode);
     }
     return TCL_OK;
@@ -3369 +3876 @@
 static Rappture::CmdSpec pseudoColorOps[] = {
     {"add",       1, PseudoColorAddOp, 2, 3, "?dataSetName?"},
-    {"colormap",  1, PseudoColorColorMapOp, 3, 4, "colorMapName ?dataSetName?"},
+    {"ccolor",    2, PseudoColorColorOp, 5, 6, "r g b ?dataSetName?"},
+    {"colormap",  7, PseudoColorColorMapOp, 3, 4, "colorMapName ?dataSetNme?"},
+    {"colormode", 7, PseudoColorColorModeOp, 3, 4, "mode ?dataSetNme?"},
     {"delete",    1, PseudoColorDeleteOp, 2, 3, "?dataSetName?"},
     {"edges",     1, PseudoColorEdgeVisibilityOp, 3, 4, "bool ?dataSetName?"},
@@ -3539 +4048 @@
     if (objc == 3) {
         const char *name = Tcl_GetString(objv[2]);
-        g_renderer->addStreamlines(name);
-    } else {
-        g_renderer->addStreamlines("all");
+        if (!g_renderer->addStreamlines(name)) {
+            Tcl_AppendResult(interp, "Failed to create streamlines", (char*)NULL);
+            return TCL_ERROR;
+        }
+    } else {
+        if (!g_renderer->addStreamlines("all")) {
+            Tcl_AppendResult(interp, "Failed to create streamlines for one or more data sets", (char*)NULL);
+            return TCL_ERROR;
+        }
     }
     return TCL_OK;
@@ -4071 +4586 @@
 
 static Rappture::CmdSpec streamlinesOps[] = {
-    {"add",       1, StreamlinesAddOp, 2, 3, "?dataSetName?"},
-    {"ccolor",    1, StreamlinesColorOp, 5, 6, "r g b ?dataSetName?"},
-    {"colormap",  7, StreamlinesColorMapOp, 3, 4, "colorMapName ?dataSetName?"},
+    {"add",       1, StreamlinesAddOp,       2, 3, "?dataSetName?"},
+    {"ccolor",    1, StreamlinesColorOp,     5, 6, "r g b ?dataSetName?"},
+    {"colormap",  7, StreamlinesColorMapOp,  3, 4, "colorMapName ?dataSetName?"},
     {"colormode", 7, StreamlinesColorModeOp, 3, 4, "mode ?dataSetNme?"},
-    {"delete",    1, StreamlinesDeleteOp, 2, 3, "?dataSetName?"},
+    {"delete",    1, StreamlinesDeleteOp,    2, 3, "?dataSetName?"},
     {"edges",     1, StreamlinesEdgeVisibilityOp, 3, 4, "bool ?dataSetName?"},
-    {"length",    2, StreamlinesLengthOp, 3, 4, "length ?dataSetName?"},
-    {"lighting",  3, StreamlinesLightingOp, 3, 4, "bool ?dataSetName?"},
+    {"length",    2, StreamlinesLengthOp,    3, 4, "length ?dataSetName?"},
+    {"lighting",  3, StreamlinesLightingOp,  3, 4, "bool ?dataSetName?"},
     {"linecolor", 5, StreamlinesLineColorOp, 5, 6, "r g b ?dataSetName?"},
-    {"lines",     5, StreamlinesLinesOp, 2, 3, "?dataSetName?"},
+    {"lines",     5, StreamlinesLinesOp,     2, 3, "?dataSetName?"},
     {"linewidth", 5, StreamlinesLineWidthOp, 3, 4, "width ?dataSetName?"},
-    {"opacity",   2, StreamlinesOpacityOp, 3, 4, "val ?dataSetName?"},
-    {"orient",    2, StreamlinesOrientOp, 6, 7, "qw qx qy qz ?dataSetName?"},
-    {"pos",       1, StreamlinesPositionOp, 5, 6, "x y z ?dataSetName?"},
-    {"ribbons",   1, StreamlinesRibbonsOp, 4, 5, "width angle ?dataSetName?"},
-    {"scale",     2, StreamlinesScaleOp, 5, 6, "sx sy sz ?dataSetName?"},
-    {"seed",      2, StreamlinesSeedOp, 4, 14, "op params... ?dataSetName?"},
+    {"opacity",   2, StreamlinesOpacityOp,   3, 4, "val ?dataSetName?"},
+    {"orient",    2, StreamlinesOrientOp,    6, 7, "qw qx qy qz ?dataSetName?"},
+    {"pos",       1, StreamlinesPositionOp,  5, 6, "x y z ?dataSetName?"},
+    {"ribbons",   1, StreamlinesRibbonsOp,   4, 5, "width angle ?dataSetName?"},
+    {"scale",     2, StreamlinesScaleOp,     5, 6, "sx sy sz ?dataSetName?"},
+    {"seed",      2, StreamlinesSeedOp,  4, 14, "op params... ?dataSetName?"},
     {"tubes",     1, StreamlinesTubesOp, 4, 5, "numSides radius ?dataSetName?"},
     {"visible",   1, StreamlinesVisibleOp, 3, 4, "bool ?dataSetName?"}
@@ -4113 +4628 @@
     if (objc == 3) {
         const char *name = Tcl_GetString(objv[2]);
-        g_renderer->addVolume(name);
-    } else {
-        g_renderer->addVolume("all");
+        if (!g_renderer->addVolume(name)) {
+            Tcl_AppendResult(interp, "Failed to create volume", (char*)NULL);
+            return TCL_ERROR;
+        }
+    } else {
+        if (!g_renderer->addVolume("all")) {
+            Tcl_AppendResult(interp, "Failed to create volume for one or more data sets", (char*)NULL);
+            return TCL_ERROR;
+        }
     }
     return TCL_OK;
@@ -4295 +4816 @@
 
 static Rappture::CmdSpec volumeShadingOps[] = {
-    {"ambient",  1, VolumeShadingAmbientOp, 4, 5, "coeff ?dataSetName?"},
-    {"diffuse",  1, VolumeShadingDiffuseOp, 4, 5, "coeff ?dataSetName?"},
+    {"ambient",  1, VolumeShadingAmbientOp,  4, 5, "coeff ?dataSetName?"},
+    {"diffuse",  1, VolumeShadingDiffuseOp,  4, 5, "coeff ?dataSetName?"},
     {"specular", 1, VolumeShadingSpecularOp, 5, 6, "coeff power ?dataSetName?"}
 };
@@ -4333 +4854 @@
 
 static Rappture::CmdSpec volumeOps[] = {
-    {"add",      1, VolumeAddOp, 2, 3, "?dataSetName?"},
+    {"add",      1, VolumeAddOp,      2, 3, "?dataSetName?"},
     {"colormap", 1, VolumeColorMapOp, 3, 4, "colorMapName ?dataSetName?"},
-    {"delete",   1, VolumeDeleteOp, 2, 3, "?dataSetName?"},
+    {"delete",   1, VolumeDeleteOp,   2, 3, "?dataSetName?"},
     {"lighting", 1, VolumeLightingOp, 3, 4, "bool ?dataSetName?"},
-    {"opacity",  2, VolumeOpacityOp, 3, 4, "val ?dataSetName?"},
-    {"orient",   2, VolumeOrientOp, 6, 7, "qw qx qy qz ?dataSetName?"},
+    {"opacity",  2, VolumeOpacityOp,  3, 4, "val ?dataSetName?"},
+    {"orient",   2, VolumeOrientOp,   6, 7, "qw qx qy qz ?dataSetName?"},
     {"pos",      1, VolumePositionOp, 5, 6, "x y z ?dataSetName?"},
-    {"scale",    2, VolumeScaleOp, 5, 6, "sx sy sz ?dataSetName?"},
-    {"shading",  2, VolumeShadingOp, 4, 6, "oper val ?dataSetName?"},
-    {"visible",  1, VolumeVisibleOp, 3, 4, "bool ?dataSetName?"}
+    {"scale",    2, VolumeScaleOp,    5, 6, "sx sy sz ?dataSetName?"},
+    {"shading",  2, VolumeShadingOp,  4, 6, "oper val ?dataSetName?"},
+    {"visible",  1, VolumeVisibleOp,  3, 4, "bool ?dataSetName?"}
 };
 static int nVolumeOps = NumCmdSpecs(volumeOps);
@@ -4362 +4883 @@
 /**
  * \brief Execute commands from client in Tcl interpreter
+ * 
+ * In this threaded model, the select call is for event compression.  We
+ * want to execute render server commands as long as they keep coming.  
+ * This lets us execute a stream of many commands but render once.  This 
+ * benefits camera movements, screen resizing, and opacity changes 
+ * (using a slider on the client).  The down side is you don't render
+ * until there's a lull in the command stream.  If the client needs an
+ * image, it can issue an "imgflush" command.  That breaks us out of the
+ * read loop.
  */
 int
 Rappture::VtkVis::processCommands(Tcl_Interp *interp, FILE *fin, FILE *fout)
 {
-    Tcl_DString cmdbuffer;
-    Tcl_DStringInit(&cmdbuffer);
-
-    int fdIn = fileno(fin);
-    int fdOut = fileno(fout);
-    int flags = fcntl(fdIn, F_GETFL, 0);
-    fcntl(fdIn, F_SETFL, flags & ~O_NONBLOCK);
-
     int status = TCL_OK;
-    int nCommands = 0;
-    bool isComplete = false;
-    while ((!feof(fin)) && (status == TCL_OK)) {
-        while (!feof(fin)) {
-            int c = fgetc(fin);
-            if (c <= 0) {
-                if (errno == EWOULDBLOCK) {
-                    break;
-                }
-                if (feof(fin))
-                    return 1;
-                else
-                    return c;
+
+#define BUFFERSIZE   ((1<<16)-1)
+    char buffer[BUFFERSIZE+1];
+
+    Tcl_DString command;
+    Tcl_DStringInit(&command);
+
+    fd_set readFds;
+    struct timeval tv, *tvPtr;
+
+    FD_ZERO(&readFds);
+    FD_SET(fileno(fin), &readFds);
+    tvPtr = NULL;                       /* Initially there is no timeout. */
+    while (select(1, &readFds, NULL, NULL, tvPtr) > 0) {
+        if (fgets(buffer, BUFFERSIZE, fin) == NULL) {
+            /* Terminate the server if we can't
+             * communicate with the client
+             * anymore. */
+            if (feof(fin)) {
+                INFO("Exiting server on EOF from client");
+                exit(0);
+            } else {
+                ERROR("Exiting server, failed to read from client: %s",
+                      strerror(errno));
+                exit(1);
             }
-            char ch = (char)c;
-            Tcl_DStringAppend(&cmdbuffer, &ch, 1);
-            if (ch == '\n') {
-                isComplete = Tcl_CommandComplete(Tcl_DStringValue(&cmdbuffer));
-                if (isComplete) {
-                    break;
-                }
+        }
+        buffer[BUFFERSIZE] = '\0';
+        Tcl_DStringAppend(&command, buffer, -1);
+        if (Tcl_CommandComplete(Tcl_DStringValue(&command))) {
+            status = ExecuteCommand(interp, &command);
+            if (status == TCL_BREAK) {
+                return 1;               /* This was caused by a "imgflush"
+                                         * command. Break out of the read loop
+                                         * and allow a new image to be
+                                         * rendered. */
             }
         }
-        // no command? then we're done for now
-        if (Tcl_DStringLength(&cmdbuffer) == 0) {
-            break;
-        }
-        if (isComplete) {
-            // back to original flags during command evaluation...
-            fcntl(fdIn, F_SETFL, flags & ~O_NONBLOCK);
-            TRACE("command: '%s'", Tcl_DStringValue(&cmdbuffer));
-            status = ExecuteCommand(interp, &cmdbuffer);
-            // non-blocking for next read -- we might not get anything
-            fcntl(fdIn, F_SETFL, flags | O_NONBLOCK);
-            isComplete = false;
-            nCommands++;
-        }
-    }
-    fcntl(fdIn, F_SETFL, flags);
+        tv.tv_sec = tv.tv_usec = 0L;
+        FD_SET(fileno(fin), &readFds);
+        tvPtr = &tv;
+    }
 
     if (status != TCL_OK) {
@@ -4421 +4946 @@
         string = Tcl_GetVar(interp, "errorInfo", TCL_GLOBAL_ONLY);
         TRACE("ERROR errorInfo=(%s)", string);
-
+        INFO("%s: status=%d ERROR errorInfo=(%s)", Tcl_DStringValue(&command),
+             status, string);
         nBytes = strlen(string);
         struct iovec iov[3];
@@ -4429 +4955 @@
         iov[1].iov_len = nBytes;
         iov[2].iov_base = (char *)"\n";
-        iov[2].iov_len = 1;
+        iov[2].iov_len = strlen((char *)iov[2].iov_base);
+        int fdOut = fileno(fout);
         if (writev(fdOut, iov, 3) < 0) {
             ERROR("write failed: %s", strerror(errno));
@@ -4444 +4971 @@
  * \return The initialized Tcl interpreter
  */
-Tcl_Interp *
-Rappture::VtkVis::initTcl()
-{
-    Tcl_Interp *interp;
-    interp = Tcl_CreateInterp();
-
+void
+Rappture::VtkVis::initTcl(Tcl_Interp *interp, ClientData clientData)
+{
     Tcl_MakeSafe(interp);
-
-    Tcl_CreateObjCommand(interp, "axis",        AxisCmd,        NULL, NULL);
-    Tcl_CreateObjCommand(interp, "camera",      CameraCmd,      NULL, NULL);
-    Tcl_CreateObjCommand(interp, "colormap",    ColorMapCmd,    NULL, NULL);
-    Tcl_CreateObjCommand(interp, "contour2d",   Contour2DCmd,   NULL, NULL);
-    Tcl_CreateObjCommand(interp, "contour3d",   Contour3DCmd,   NULL, NULL);
-    Tcl_CreateObjCommand(interp, "dataset",     DataSetCmd,     NULL, NULL);
-    Tcl_CreateObjCommand(interp, "glyphs",      GlyphsCmd,      NULL, NULL);
-    Tcl_CreateObjCommand(interp, "heightmap",   HeightMapCmd,   NULL, NULL);
-    Tcl_CreateObjCommand(interp, "legend",      LegendCmd,      NULL, NULL);
-    Tcl_CreateObjCommand(interp, "lic",         LICCmd,         NULL, NULL);
-    Tcl_CreateObjCommand(interp, "molecule",    MoleculeCmd,    NULL, NULL);
-    Tcl_CreateObjCommand(interp, "polydata",    PolyDataCmd,    NULL, NULL);
-    Tcl_CreateObjCommand(interp, "pseudocolor", PseudoColorCmd, NULL, NULL);
-    Tcl_CreateObjCommand(interp, "renderer",    RendererCmd,    NULL, NULL);
-    Tcl_CreateObjCommand(interp, "screen",      ScreenCmd,      NULL, NULL);
-    Tcl_CreateObjCommand(interp, "streamlines", StreamlinesCmd, NULL, NULL);
-    Tcl_CreateObjCommand(interp, "volume",      VolumeCmd,      NULL, NULL);
-    return interp;
+    Tcl_CreateObjCommand(interp, "axis",        AxisCmd,        clientData, NULL);
+    Tcl_CreateObjCommand(interp, "camera",      CameraCmd,      clientData, NULL);
+    Tcl_CreateObjCommand(interp, "colormap",    ColorMapCmd,    clientData, NULL);
+    Tcl_CreateObjCommand(interp, "contour2d",   Contour2DCmd,   clientData, NULL);
+    Tcl_CreateObjCommand(interp, "contour3d",   Contour3DCmd,   clientData, NULL);
+    Tcl_CreateObjCommand(interp, "dataset",     DataSetCmd,     clientData, NULL);
+    Tcl_CreateObjCommand(interp, "glyphs",      GlyphsCmd,      clientData, NULL);
+    Tcl_CreateObjCommand(interp, "heightmap",   HeightMapCmd,   clientData, NULL);
+    Tcl_CreateObjCommand(interp, "imgflush",    ImageFlushCmd,  clientData, NULL);
+    Tcl_CreateObjCommand(interp, "legend",      LegendCmd,      clientData, NULL);
+    Tcl_CreateObjCommand(interp, "lic",         LICCmd,         clientData, NULL);
+    Tcl_CreateObjCommand(interp, "molecule",    MoleculeCmd,    clientData, NULL);
+    Tcl_CreateObjCommand(interp, "polydata",    PolyDataCmd,    clientData, NULL);
+    Tcl_CreateObjCommand(interp, "pseudocolor", PseudoColorCmd, clientData, NULL);
+    Tcl_CreateObjCommand(interp, "renderer",    RendererCmd,    clientData, NULL);
+    Tcl_CreateObjCommand(interp, "screen",      ScreenCmd,      clientData, NULL);
+    Tcl_CreateObjCommand(interp, "streamlines", StreamlinesCmd, clientData, NULL);
+    Tcl_CreateObjCommand(interp, "volume",      VolumeCmd,      clientData, NULL);
 }
 
 /**
  * \brief Delete Tcl commands and interpreter
- *
  */
 void Rappture::VtkVis::exitTcl(Tcl_Interp *interp)
@@ -4487 +5009 @@
     Tcl_DeleteCommand(interp, "glyphs");
     Tcl_DeleteCommand(interp, "heightmap");
+    Tcl_DeleteCommand(interp, "imgflush");
     Tcl_DeleteCommand(interp, "legend");
     Tcl_DeleteCommand(interp, "lic");

branches/blt4/packages/vizservers/vtkvis/RpVtkRendererCmd.h

@@ -16 +16 @@
 
 extern int processCommands(Tcl_Interp *interp, FILE *fin, FILE *fout);
-extern Tcl_Interp *initTcl();
+extern void initTcl(Tcl_Interp *interp, ClientData clientData);
 extern void exitTcl(Tcl_Interp *interp);
 

branches/blt4/packages/vizservers/vtkvis/TGAWriter.cpp

@@ -17 +17 @@
 #include "TGAWriter.h"
 #include "Trace.h"
+#ifdef USE_THREADS
+#include "ResponseQueue.h"
+#endif
+
+#ifdef USE_THREADS
+
+/**
+ * \brief Writes image command + data to supplied file descriptor.
+ *
+ * The image data must be supplied in BGR(A) order with bottom to 
+ * top scanline ordering.
+ *
+ * \param[in] queue Pointer to ResponseQueue to write to
+ * \param[in] cmdName Command name to send (byte length will be appended)
+ * \param[in] data Image data
+ * \param[in] width Width of image in pixels
+ * \param[in] height Height of image in pixels
+ * \param[in] bytesPerPixel Should be 3 or 4, depending on alpha
+ */
+void
+Rappture::VtkVis::queueTGA(ResponseQueue *queue, const char *cmdName, 
+                           const unsigned char *data,
+                           int width, int height,
+                           int bytesPerPixel)
+{
+    TRACE("(%dx%d)\n", width, height);
+
+    size_t headerLength = 18;
+
+    char header[headerLength];
+    memset(header, 0, headerLength);
+    header[2] = (char)2;  // image type (2 = uncompressed true-color)
+    header[12] = (char)width;
+    header[13] = (char)(width >> 8);
+    header[14] = (char)height;
+    header[15] = (char)(height >> 8);
+    header[16] = (char)(bytesPerPixel*8); // bits per pixel
+
+    size_t dataLength = width * height * bytesPerPixel;
+    size_t cmdLength;
+
+    char command[200];
+    cmdLength = snprintf(command, sizeof(command), "%s %lu\n", cmdName, 
+                         (unsigned long)headerLength + dataLength);
+
+    size_t length;
+    unsigned char *mesg = NULL;
+
+    length = headerLength + dataLength + cmdLength;
+    mesg = (unsigned char *)malloc(length);
+    if (mesg == NULL) {
+        ERROR("can't allocate %ld bytes for the image message", length);
+        return;
+    }
+    memcpy(mesg, command, cmdLength);
+    memcpy(mesg + cmdLength, header, headerLength);
+    memcpy(mesg + cmdLength + headerLength, 
+           const_cast<unsigned char *>(data), dataLength);
+
+    Response *response = NULL;
+    if (strncmp(cmdName, "nv>legend", 9) == 0) {
+        response = new Response(Response::LEGEND);
+    } else {
+        response = new Response(Response::IMAGE);
+    }
+    response->setMessage(mesg, length, Response::DYNAMIC);
+    queue->enqueue(response);
+    TRACE("Leaving (%dx%d)\n", width, height);
+}
+#else
 
 /**
@@ -79 +149 @@
     TRACE("Leaving (%dx%d)\n", width, height);
 }
+#endif  /*USE_THREADS*/
 
 /**

branches/blt4/packages/vizservers/vtkvis/TGAWriter.h

@@ -9 +9 @@
 #define __RAPPTURE_VTKVIS_TGAWRITER_H__
 
+#ifdef USE_THREADS
+#include "ResponseQueue.h"
+#endif
+
 namespace Rappture {
 namespace VtkVis {
-
+#ifdef USE_THREADS
 extern
-void writeTGA(int fd, const char *cmdName, const unsigned char *data,
-              int width, int height, int bytesPerPixel);
-
+void queueTGA(ResponseQueue *queue, const char *cmdName, 
+              const unsigned char *data, int width, int height, 
+              int bytesPerPixel);
+#else
 extern
-void writeTGAFile(const char *filename, const unsigned char *data,
-                  int width, int height, int bytesPerPixel,
-                  bool srcIsRGB = false);
-
+void writeTGA(int fd, const char *cmdName, 
+              const unsigned char *data, int width, int height, 
+              int bytesPerPixel);
+#endif
+extern
+void writeTGAFile(const char *filename, 
+                  const unsigned char *data, int width, int height, 
+                  int bytesPerPixel, bool srcIsRGB = false);
 }
 }

branches/blt4/packages/vizservers/vtkvis/Trace.cpp

@@ -21 +21 @@
  */
 void
-Rappture::VtkVis::InitLog()
+Rappture::VtkVis::initLog()
 {
     openlog("vtkvis", LOG_CONS | LOG_PERROR | LOG_PID,  LOG_USER);
@@ -30 +30 @@
  */
 void
-Rappture::VtkVis::CloseLog()
+Rappture::VtkVis::closeLog()
 {
     closelog();
@@ -39 +39 @@
  */
 void 
-Rappture::VtkVis::LogMessage(int priority, const char *funcname,
+Rappture::VtkVis::logMessage(int priority, const char *funcname,
                              const char *path, int lineNum, const char* fmt, ...)
 {

branches/blt4/packages/vizservers/vtkvis/Trace.h

@@ -14 +14 @@
 namespace VtkVis {
 
-extern void InitLog();
+extern void initLog();
 
-extern void CloseLog();
+extern void closeLog();
 
-extern void LogMessage(int priority, const char *funcname, const char *fileName, int lineNum,
-                       const char* format, ...);
+extern void logMessage(int priority, const char *funcname, const char *fileName,
+                       int lineNum, const char* format, ...);
 
-#define ERROR(...)      LogMessage(LOG_ERR, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
+#define ERROR(...)      Rappture::VtkVis::logMessage(LOG_ERR, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
 #ifdef WANT_TRACE
-#define TRACE(...)      LogMessage(LOG_DEBUG, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
+#define TRACE(...)      Rappture::VtkVis::logMessage(LOG_DEBUG, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
 #else 
 #define TRACE(...) 
-#endif
-#define WARN(...)       LogMessage(LOG_WARNING, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
-#define INFO(...)       LogMessage(LOG_INFO, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
+#endif  /*WANT_TRACE*/
+#define WARN(...)       Rappture::VtkVis::logMessage(LOG_WARNING, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
+#define INFO(...)       Rappture::VtkVis::logMessage(LOG_INFO, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
 
 }

branches/blt4/packages/vizservers/vtkvis/protocol.txt

@@ -40 +40 @@
 axis visible <axis> <bool>
      <axis> = x|y|z|all
+     Note: 'all' means all enabled axes.  To force all axes on, set each axis on
+     individually -- however, it is best to let the server determine which of 
+     the individual axes are enabled based on the dataset bounds.
 
 camera get
@@ -47 +50 @@
 camera orient <quatW> <quatX> <quatY> <quatZ>
        Set scene orientation using a quaternion
-camera ortho <x> <y> <width> <height>
-       Supply world coordinate bounds of plot area for image camera mode
-       Data is assumed to lie in XY plane (z = 0)
+camera ortho <coordMode> <x> <y> <width> <height>
+       <coordMode> = pixel|world
+       Supply bounds of plot area for image camera mode
 camera pan <x> <y>
        <x,y> viewport coordinates (window center at 0,0).  Positive x pan
@@ -70 +73 @@
 colormap delete <?colorMapName?>
 
-legend <colormapName> <legendTitle> <width> <height> <?datasetName?>
+legend <colormapName> <legendType> <legendTitle> <width> <height> <numLabels> <?datasetName?>
        Causes legend to be rendered and written back with labels and title
+       (title may be left blank)
+       <legendType> = scalar|vmag|vx|vy|vz
+       <numLabels> Can be zero or more 'tick' value labels
+       If datasetName is omitted, the cumulative data range of all data sets 
+       will be used to label the legend -- otherwise, the current setting of 
+       'dataset maprange' will be used to determine if the individual dataset
+       range or cumulative range will be used.
 
 dataset add <datasetName> data follows <nbytes>
+dataset color <r> <g> <b> <?datasetName?>
+        Set color of outline bounding box
 dataset delete <?datasetName?>
-dataset getvalue world <x> <y> <z> <datasetName>
-dataset getvalue pixel <x> <y> <datasetName>
+dataset getscalar world <x> <y> <z> <datasetName>
+dataset getscalar pixel <x> <y> <datasetName>
+dataset getvector world <x> <y> <z> <datasetName>
+dataset getvector pixel <x> <y> <datasetName>
         Use pixel for image camera mode
 dataset maprange <val>
@@ -85 +99 @@
         "all"
 dataset opacity <val> <?datasetName?>
+dataset outline <bool> <?datasetName?>
+        Toggle wireframe outline of dataset's bounding box
 dataset scalar <scalarName> <?datasetName?>
         Set the active scalar field to plot
@@ -96 +112 @@
 contour2d add contourlist <list> <?datasetName?>
           list = {isoval1 isoval2 isoval3...}
+contour2d color <r> <g> <b> <?datasetName?>
+          synonym for linecolor
 contour2d delete <?datasetName?>
 contour2d lighting <bool> <?datasetName?>
 contour2d linecolor <r> <g> <b> <?datasetName?>
+          synonym for color
 contour2d linewidth <val> <?datasetName?>
 contour2d opacity <val> <?datasetName?>
@@ -128 +147 @@
 glyphs ccolor r g b <?datasetName?>
 glyphs colormap <colorMapName> <?dataSetName?>
-glyphs colormode <scale|scalar|vector|ccolor> <?dataSetName?>
-       Set the color mode: color by scale, scalar field or
-       vector magnitude -- uses the current color map
+glyphs colormode <scalar|vmag|ccolor> <?dataSetName?>
+       Set the color mode: color by scalar field or
+       vector magnitude -- uses the current color map,
+       or ccolor for constant color
 glyphs delete <?dataSetName?>
 glyphs edges <bool> <?datasetName?>
@@ -138 +158 @@
 glyphs linecolor <r> <g> <b> <?datasetName?>
 glyphs linewidth <val> <?datasetName?>
+glyphs normscale <bool> <?datasetName?>
+       Control if data values are normalized to [0,1] range before applying
+       glyph scaling factor (gscale)
 glyphs opacity <val> <?datasetName?>
 glyphs orient <qw> <qx> <qy> <qz> <?dataSetName?>
 glyphs pos <x> <y> <z> <?dataSetName?>
 glyphs scale <sx> <sy> <sz> <?dataSetName?>
-glyphs shape <arrow|cone|cube|cylinder|dodecahedron|icosahedron|octahedron|sphere|tetrahedron> <?datasetName?>
-glyphs smode <scalar|vector|vector_comp|off> <?dataSetName?>
+glyphs shape <arrow|cone|cube|cylinder|dodecahedron|icosahedron|line|octahedron|sphere|tetrahedron> <?datasetName?>
+glyphs smode <scalar|vmag|vcomp|off> <?dataSetName?>
        Set the scaling mode: use the scalar field, vector magnitude 
        (uniform scale), vector components, or disable scaling
@@ -149 +172 @@
 glyphs wireframe <bool> <?datasetName?>
 
-heightmap add numcontours <n> <?dataSetName?>
+heightmap add numcontours <n> <heightScale> <?dataSetName?>
           Generate evenly spaced contours including range endpoints.  See also
           'dataset maprange' command.
-heightmap add contourlist <list> <?dataSetName?>
+heightmap add contourlist <list> <heightScale> <?dataSetName?>
           list = {isoval1 isoval2 isoval3...}
 heightmap colormap <colorMapName> <?dataSetName?>
+heightmap contourlist <list> <?dataSetName?>
 heightmap delete <?dataSetName?>
 heightmap edges <bool> <?dataSetName?>
@@ -164 +188 @@
 heightmap linecolor <r> <g> <b> <?dataSetName?>
 heightmap linewidth <width> <?dataSetName?>
+heightmap numcontours <n> <?dataSetName?>
 heightmap opacity <value> <?dataSetName?>
 heightmap orient <qw> <qx> <qy> <qz> <?dataSetName?>
 heightmap pos <x> <y> <z> <?dataSetName?>
 heightmap scale <sx> <sy> <sz> <?dataSetName?>
+heightmap surface <bool> <?dataSetName?>
+          Toggle rendering of colormapped surface (mountain plot or cutplane)
 heightmap visible <bool> <?dataSetName?>
 heightmap volumeslice axis ratio <?dataSetName?>
           For 3D data, select a slice along a principle axis of the volume. The
           ratio is [0,1]
+heightmap wireframe <bool> <?datasetName?>
 
 lic add <?datasetName?>
@@ -218 +246 @@
 polydata orient <qw> <qx> <qy> <qz> <?dataSetName?>
 polydata pos <x> <y> <z> <?dataSetName?>
+polydata ptsize <size> <?dataSetName?>
 polydata scale <sx> <sy> <sz> <?dataSetName?>
 polydata visible <bool> <?datasetName?>
@@ -223 +252 @@
 
 pseudocolor add <?datasetName?>
+pseudocolor ccolor r g b <?datasetName?>
 pseudocolor colormap <colormapName> <?datasetName?>
+pseudocolor colormode <scalar|vmag|vx|vy|vz|ccolor> <?datasetName?>
+            Set the field used to color the object.  'ccolor' means to use
+            the constant color defined by the ccolor subcommand.  'scalar' uses
+            the active scalar field.  'vmag' uses the magnitude of the current
+            vector field, and 'vx','vy','vz' use the corresponding component of
+            the active vector field.
 pseudocolor delete <?datasetName?>
 pseudocolor edges <bool> <?datasetName?>
@@ -301 +337 @@
 nv>image -type image -bytes <nbytes>
   <binary RGB data>
-nv>image -type image -bbox {x1 y1 x2 y2} -bytes <nbytes>
+nv>image -type image -bbox {x y w h} -bytes <nbytes>
   <binary RGB data>
-  Note: in this form, the bbox is the upper left and lower right screen corners
-  in world coordinates.  This form is currently used only if the camera mode is
-  set to 'image'.
-nv>legend <colormapName> <nbytes>
+  The bounding box of the 2D image camera zoom region is supplied
+  Note: The bbox coordinates are in the form used by 'camera ortho world ...':
+  x,y - world coordinate of lower left corner, w,h - width height in world coords
+  This form is currently used only if the camera mode is set to 'image'.
+nv>legend <colormapName> <title> <rmin> <rmax> <nbytes>
   <binary RGB data>
-nv>dataset value world <x> <y> <z> <value>
-nv>dataset value pixel <x> <y> <value>
+nv>dataset scalar world <x> <y> <z> <value> <dataSetName>
+nv>dataset scalar pixel <x> <y> <value> <dataSetName>
+nv>dataset vector world <x> <y> <z> <valueX> <valueY> <valueZ> <dataSetName>
+nv>dataset vector pixel <x> <y> <valueX> <valueY> <valueZ> <dataSetName>
 
 ================================================================================

branches/blt4/packages/vizservers/vtkvis/vtkRpCubeAxesActor2D.cpp

@@ -2 +2 @@
 
   Program:   Visualization Toolkit
-  Module:    vtkCubeAxesActor2D.cxx
+  Module:    vtkCubeAxesActor2D.cpp
 
   Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
@@ -419 +419 @@
   this->YAxis->SetFontFactor(AxisFontFactor);
   this->YAxis->SetProperty(this->GetProperty());
-
-  this->ZAxis->GetPositionCoordinate()->SetValue(zCoords[0], zCoords[1]);
-  this->ZAxis->GetPosition2Coordinate()->SetValue(zCoords[2], zCoords[3]);
-  this->ZAxis->SetRange(zRange[0], zRange[1]);
+  if ( this->YAxisVisibility ) {
+      this->ZAxis->GetPositionCoordinate()->SetValue(zCoords[0], zCoords[1]);
+      this->ZAxis->GetPosition2Coordinate()->SetValue(zCoords[2], zCoords[3]);
+      this->ZAxis->SetRange(zRange[0], zRange[1]);
+  } else {
+      this->ZAxis->GetPositionCoordinate()->SetValue(zCoords[2], zCoords[3]);
+      this->ZAxis->GetPosition2Coordinate()->SetValue(zCoords[0], zCoords[1]);
+      this->ZAxis->SetRange(zRange[1], zRange[0]);
+  }
   this->ZAxis->SetTitle(this->Labels[zAxes]);
   this->ZAxis->SetNumberOfLabels(this->NumberOfLabels);