Changeset 3958

Timestamp:

Sep 24, 2013, 4:41:59 PM (11 years ago)

Author:

gah

Message:

sync with trunk

Location:

branches/blt4/packages

Files:

• Makefile.in (modified) (1 diff)
• optimizer/examples/app-qdot.tcl (modified) (1 diff)
• optimizer/examples/rosenbrock.tcl (modified) (1 diff)
• optimizer/examples/simple.tcl (modified) (1 diff)
• optimizer/examples/simplesingle.tcl (modified) (1 diff)
• optimizer/examples/visualize.tcl (modified) (1 diff)
• optimizer/src/pgapack/Makefile.in (modified) (1 diff)
• optimizer/src/plugin_pgapack.c (modified) (1 diff)
• optimizer/src/rp_optimizer.c (modified) (1 diff)
• optimizer/src/rp_optimizer.h (modified) (1 diff)
• optimizer/src/rp_optimizer_tcl.c (modified) (1 diff)
• optimizer/src/rp_tcloptions.c (modified) (1 diff)
• optimizer/src/rp_tcloptions.h (modified) (1 diff)
• optimizer/src/tclconfig/mkindex.tcl (modified) (1 diff)
• optimizer/src/tclconfig/patchlevel.tcl (modified) (1 diff)
• optimizer/src/test.c (modified) (1 diff)
• optimizer/tests/aaa.test (modified) (1 diff)
• optimizer/tests/all.tcl (modified) (1 diff)
• optimizer/tests/pgapack.test (modified) (1 diff)
• vizservers/nanovis/BMPWriter.cpp (modified) (1 diff)
• vizservers/nanovis/Camera.cpp (modified) (1 diff)
• vizservers/nanovis/Camera.h (modified) (1 diff)
• vizservers/nanovis/Command.cpp (modified) (5 diffs)
• vizservers/nanovis/DataSetResample.cpp (added)
• vizservers/nanovis/DataSetResample.h (added)
• vizservers/nanovis/Doxyfile.in (modified) (1 diff)
• vizservers/nanovis/Flow.cpp (modified) (8 diffs)
• vizservers/nanovis/Flow.h (modified) (4 diffs)
• vizservers/nanovis/FlowCmd.cpp (modified) (6 diffs)
• vizservers/nanovis/Grid.cpp (modified) (12 diffs)
• vizservers/nanovis/Makefile.in (modified) (10 diffs)
• vizservers/nanovis/ReaderCommon.cpp (modified) (1 diff)
• vizservers/nanovis/ReaderCommon.h (modified) (1 diff)
• vizservers/nanovis/Shader.cpp (modified) (2 diffs)
• vizservers/nanovis/Shader.h (modified) (2 diffs)
• vizservers/nanovis/Unirect.cpp (modified) (2 diffs)
• vizservers/nanovis/Unirect.h (modified) (2 diffs)
• vizservers/nanovis/VelocityArrowsSlice.cpp (modified) (4 diffs)
• vizservers/nanovis/Volume.cpp (modified) (5 diffs)
• vizservers/nanovis/Volume.h (modified) (3 diffs)
• vizservers/nanovis/VolumeRenderer.cpp (modified) (1 diff)
• vizservers/nanovis/VtkDataSetReader.cpp (added)
• vizservers/nanovis/VtkDataSetReader.h (added)
• vizservers/nanovis/VtkReader.cpp (modified) (1 diff)
• vizservers/nanovis/ZincBlendeVolume.cpp (modified) (2 diffs)
• vizservers/nanovis/ZincBlendeVolume.h (modified) (1 diff)
• vizservers/nanovis/config.h (modified) (1 diff)
• vizservers/nanovis/dxReader.cpp (modified) (1 diff)
• vizservers/nanovis/nanovis.cpp (modified) (12 diffs)
• vizservers/nanovis/nanovis.h (modified) (2 diffs)
• vizservers/nanovis/util/Fonts.cpp (modified) (2 diffs)
• vizservers/nanovis/vrmath/include/vrmath/Vector2f.h (modified) (2 diffs)
• vizservers/nanovis/vrmath/include/vrmath/Vector3f.h (modified) (6 diffs)
• vizservers/nanovis/vrmath/include/vrmath/Vector4f.h (modified) (3 diffs)
• vizservers/vtkvis/DataSet.cpp (modified) (1 diff)
• vizservers/vtkvis/Makefile.in (modified) (3 diffs)
• vizservers/vtkvis/Parallelepiped.cpp (added)
• vizservers/vtkvis/Parallelepiped.h (added)
• vizservers/vtkvis/RenderServer.h (modified) (1 diff)
• vizservers/vtkvis/Renderer.cpp (modified) (6 diffs)
• vizservers/vtkvis/Renderer.h (modified) (5 diffs)
• vizservers/vtkvis/RendererCmd.cpp (modified) (5 diffs)
• vizservers/vtkvis/RendererGraphicsObjs.cpp (modified) (5 diffs)
• vizservers/vtkvis/Volume.cpp (modified) (5 diffs)
• vizservers/vtkvis/protocol.txt (modified) (1 diff)

branches/blt4/packages/Makefile.in

@@ -15 +15 @@
 VPATH           = $(srcdir)
 
-.PHONY: optimizer
+.PHONY: all install clean distclean optimizer
 
 all: 

branches/blt4/packages/optimizer/examples/app-qdot.tcl

@@ -10 +10 @@
 #  AUTHOR:  Ganesh Hegde, Purdue University
 #  Adapted from: simple.tcl
-#  Copyright (c) 2008  Purdue Research Foundation
+#  Copyright (c) 2004-2012  HUBzero Foundation, LLC
 #
 #  See the file "license.terms" for information on usage and

branches/blt4/packages/optimizer/examples/rosenbrock.tcl

@@ -11 +11 @@
 # ======================================================================
 #  AUTHOR:  Michael McLennan, Purdue University
-#  Copyright (c) 2004-2007  Purdue Research Foundation
+#  Copyright (c) 2004-2012  HUBzero Foundation, LLC
 #
 #  See the file "license.terms" for information on usage and

branches/blt4/packages/optimizer/examples/simple.tcl

@@ -11 +11 @@
 # ======================================================================
 #  AUTHOR:  Michael McLennan, Purdue University
-#  Copyright (c) 2008  Purdue Research Foundation
+#  Copyright (c) 2004-2012  HUBzero Foundation, LLC
 #
 #  See the file "license.terms" for information on usage and

branches/blt4/packages/optimizer/examples/simplesingle.tcl

@@ -11 +11 @@
 # ======================================================================
 #  AUTHOR:  Michael McLennan, Purdue University
-#  Copyright (c) 2008  Purdue Research Foundation
+#  Copyright (c) 2004-2012  HUBzero Foundation, LLC
 #
 #  See the file "license.terms" for information on usage and

branches/blt4/packages/optimizer/examples/visualize.tcl

@@ -10 +10 @@
 # ======================================================================
 #  AUTHOR:  Michael McLennan, Purdue University
-#  Copyright (c) 2008  Purdue Research Foundation
+#  Copyright (c) 2004-2012  HUBzero Foundation, LLC
 #
 #  See the file "license.terms" for information on usage and

branches/blt4/packages/optimizer/src/pgapack/Makefile.in

@@ -12 +12 @@
 PGAPACK         = @PGAPACK@
 
-.PHONY: pgapack
+.PHONY: all install test clean distclean pgapack
 
 all: pgapack

branches/blt4/packages/optimizer/src/plugin_pgapack.c

@@ -8 +8 @@
  * ======================================================================
  *  AUTHOR:  Michael McLennan, Purdue University
- *  Copyright (c) 2008  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/packages/optimizer/src/rp_optimizer.c

@@ -9 +9 @@
  * ======================================================================
  *  AUTHOR:  Michael McLennan, Purdue University
- *  Copyright (c) 2008  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/packages/optimizer/src/rp_optimizer.h

@@ -9 +9 @@
  * ======================================================================
  *  AUTHOR:  Michael McLennan, Purdue University
- *  Copyright (c) 2008  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/packages/optimizer/src/rp_optimizer_tcl.c

@@ -8 +8 @@
  * ======================================================================
  *  AUTHOR:  Michael McLennan, Purdue University
- *  Copyright (c) 2008  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/packages/optimizer/src/rp_tcloptions.c

@@ -10 +10 @@
  * ======================================================================
  *  AUTHOR:  Michael McLennan, Purdue University
- *  Copyright (c) 2008  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/packages/optimizer/src/rp_tcloptions.h

@@ -10 +10 @@
  * ======================================================================
  *  AUTHOR:  Michael McLennan, Purdue University
- *  Copyright (c) 2008  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/packages/optimizer/src/tclconfig/mkindex.tcl

@@ -7 +7 @@
 # ======================================================================
 #  AUTHOR:  Michael McLennan, Purdue University
-#  Copyright (c) 2004-2005  Purdue Research Foundation
+#  Copyright (c) 2004-2012  HUBzero Foundation, LLC
 #
 #  See the file "license.terms" for information on usage and

branches/blt4/packages/optimizer/src/tclconfig/patchlevel.tcl

@@ -6 +6 @@
 # ======================================================================
 #  AUTHOR:  Michael McLennan, Purdue University
-#  Copyright (c) 2004-2005  Purdue Research Foundation
+#  Copyright (c) 2004-2012  HUBzero Foundation, LLC
 #
 #  See the file "license.terms" for information on usage and

branches/blt4/packages/optimizer/src/test.c

@@ -8 +8 @@
  * ======================================================================
  *  AUTHOR:  Michael McLennan, Purdue University
- *  Copyright (c) 2004-2007  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/packages/optimizer/tests/aaa.test

@@ -7 +7 @@
 # ======================================================================
 #  AUTHOR:  Michael McLennan, Purdue University
-#  Copyright (c) 2008  Purdue Research Foundation
+#  Copyright (c) 2004-2012  HUBzero Foundation, LLC
 #
 #  See the file "license.terms" for information on usage and

branches/blt4/packages/optimizer/tests/all.tcl

@@ -7 +7 @@
 # ======================================================================
 #  AUTHOR:  Michael McLennan, Purdue University
-#  Copyright (c) 2008  Purdue Research Foundation
+#  Copyright (c) 2004-2012  HUBzero Foundation, LLC
 #
 #  See the file "license.terms" for information on usage and

branches/blt4/packages/optimizer/tests/pgapack.test

@@ -8 +8 @@
 # ======================================================================
 #  AUTHOR:  Michael McLennan, Purdue University
-#  Copyright (c) 2008  Purdue Research Foundation
+#  Copyright (c) 2004-2012  HUBzero Foundation, LLC
 #
 #  See the file "license.terms" for information on usage and

branches/blt4/packages/vizservers/nanovis/BMPWriter.cpp

@@ -9 +9 @@
  */
 
+#ifndef USE_THREADS
+#include <unistd.h>
+#endif
 #include <cstdlib>
 #include <cstring>

branches/blt4/packages/vizservers/nanovis/Camera.cpp

@@ -286 +286 @@
     }
 
+    TRACE("near: %g far: %g", _near, _far);
+
     // Extend the bounds a bit 
     _near = 0.99 * _near - (_far - _near) * 0.5;
     _far  = 1.01 * _far  + (_far - _near) * 0.5;
+
+    TRACE("after extend: near: %g far: %g", _near, _far);
 
     // Ensure near is closer than far

branches/blt4/packages/vizservers/nanovis/Camera.h

@@ -55 +55 @@
     }
 
-    float getDistance() const
+    double getDistance() const
     {
         return vrmath::Vector3f(_focalPoint - _position).length();

branches/blt4/packages/vizservers/nanovis/Command.cpp

@@ -55 +55 @@
 #include "FlowCmd.h"
 #include "dxReader.h"
+#ifdef USE_VTK
+#include "VtkDataSetReader.h"
+#endif
 #include "VtkReader.h"
 #include "BMPWriter.h"
@@ -763 +766 @@
 }
 
+static int
+CutplaneVisibleOp(ClientData clientData, Tcl_Interp *interp, int objc,
+                  Tcl_Obj *const *objv)
+{
+    bool state;
+    if (GetBooleanFromObj(interp, objv[2], &state) != TCL_OK) {
+        return TCL_ERROR;
+    }
+
+    std::vector<Volume *> ivol;
+    if (GetVolumes(interp, objc - 3, objv + 3, &ivol) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    std::vector<Volume *>::iterator iter;
+    for (iter = ivol.begin(); iter != ivol.end(); iter++) {
+        (*iter)->cutplanesVisible(state);
+    }
+    return TCL_OK;
+}
+
 static Rappture::CmdSpec cutplaneOps[] = {
     {"position", 1, CutplanePositionOp, 4, 0, "relval axis ?indices?",},
     {"state",    1, CutplaneStateOp,    4, 0, "bool axis ?indices?",},
+    {"visible",  1, CutplaneVisibleOp,  3, 0, "bool ?indices?",},
 };
 static int nCutplaneOps = NumCmdSpecs(cutplaneOps);
@@ -1273 +1297 @@
     } else if ((nBytes > 14) && (strncmp(bytes, "# vtk DataFile", 14) == 0)) {
         TRACE("VTK loading...");
-        std::stringstream fdata;
-        fdata.write(bytes, nBytes);
         if (nBytes <= 0) {
             ERROR("data buffer is empty");
@@ -1280 +1302 @@
         }
         Rappture::Outcome context;
+#ifdef USE_VTK
+        volume = load_vtk_volume_stream(context, tag, bytes, nBytes);
+#else
+        std::stringstream fdata;
+        fdata.write(bytes, nBytes);
         volume = load_vtk_volume_stream(context, tag, fdata);
+#endif
         if (volume == NULL) {
             Tcl_AppendResult(interp, context.remark(), (char*)NULL);
@@ -1292 +1320 @@
         }
         TRACE("DX loading...");
-        std::stringstream fdata;
-        fdata.write(bytes, nBytes);
         if (nBytes <= 0) {
             ERROR("data buffer is empty");
             abort();
         }
+        std::stringstream fdata;
+        fdata.write(bytes, nBytes);
         Rappture::Outcome context;
         volume = load_dx_volume_stream(context, tag, fdata);

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

@@ -599 +599 @@
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 
-EXCLUDE                = @srcdir@/newmat11 @srcdir@/CircularQueue.h @srcdir@/ParticleEmitter.h @srcdir@/ParticleEmitter.cpp @srcdir@/ParticleSystem.h @srcdir@/ParticleSystem.cpp @srcdir@/ParticleSystemFactory.h @srcdir@/ParticleSystemFactory.cpp @srcdir@/BucketSort.h @srcdir@/BucketSort.cpp @srcdir@/PCASplit.h @srcdir@/PCASplit.cpp @srcdir@/PointSet.h @srcdir@/PointSet.cpp @srcdir@/PointSetRenderer.h @srcdir@/PointSetRenderer.cpp @srcdir@/PointShader.h @srcdir@/PointShader.cpp
+EXCLUDE                = @srcdir@/bak @srcdir@/newmat11 @srcdir@/CircularQueue.h @srcdir@/ParticleEmitter.h @srcdir@/ParticleEmitter.cpp @srcdir@/ParticleSystem.h @srcdir@/ParticleSystem.cpp @srcdir@/ParticleSystemFactory.h @srcdir@/ParticleSystemFactory.cpp @srcdir@/BucketSort.h @srcdir@/BucketSort.cpp @srcdir@/PCASplit.h @srcdir@/PCASplit.cpp @srcdir@/PointSet.h @srcdir@/PointSet.cpp @srcdir@/PointSetRenderer.h @srcdir@/PointSetRenderer.cpp @srcdir@/PointShader.h @srcdir@/PointShader.cpp
 
 # The EXCLUDE_SYMLINKS tag can be used select whether or not files or

branches/blt4/packages/vizservers/nanovis/Flow.cpp

@@ -41 +41 @@
     _interp(interp),
     _name(name),
-    _data(NULL),
     _volume(NULL)
 {
@@ -59 +58 @@
     Rappture::FreeSwitches(_switches, &_sv, 0);
 
-    if (_data != NULL) {
-        delete _data;
-    }
     if (_volume != NULL) {
         NanoVis::removeVolume(_volume);
@@ -91 +87 @@
     if (isDataLoaded()) {
         BBox bbox;
-        data()->getBounds(bbox.min, bbox.max);
+        _volume->getBounds(bbox.min, bbox.max);
         allBounds.extend(bbox);
     }
@@ -115 +111 @@
     switch (position->axis) {
     case AXIS_X:  
-        return (position->value - _data->xMin()) / 
-            (_data->xMax() - _data->xMin()); 
+        return (position->value - _volume->xAxis.min()) / 
+            (_volume->xAxis.max() - _volume->xAxis.min()); 
     case AXIS_Y:  
-        return (position->value - _data->yMin()) / 
-            (_data->yMax() - _data->yMin()); 
+        return (position->value - _volume->yAxis.min()) / 
+            (_volume->yAxis.max() - _volume->yAxis.min()); 
     case AXIS_Z:  
-        return (position->value - _data->zMin()) / 
-            (_data->zMax() - _data->zMin()); 
+        return (position->value - _volume->zAxis.min()) / 
+            (_volume->zAxis.max() - _volume->zAxis.min()); 
     }
     return 0.0;
@@ -303 +299 @@
 Flow::scaleVectorField()
 {
-    float *vdata = getScaledVector();
-    if (_volume != NULL) {
-        TRACE("Updating existing volume: %s", _volume->name());
-        _volume->setData(vdata, magMin, magMax, 0);
-    } else {
-        _volume = makeVolume(vdata);
-        if (_volume == NULL) {
-            return false;
-        }
-    }
-    delete [] vdata;
+    if (_volume == NULL) {
+        ERROR("Called with NULL _volume");
+        return false;
+    }
+
     // FIXME: LIC and arrows should be per-flow
     if (NanoVis::licRenderer != NULL) {
@@ -346 +336 @@
 
 float *
-Flow::getScaledVector()
-{
-    assert(_data->nComponents() == 3);
-    size_t n = _data->nValues() / _data->nComponents() * 4;
+Flow::getScaledVector(Rappture::Unirect3d *unirect)
+{
+    assert(unirect->nComponents() == 3);
+    size_t n = unirect->nValues() / unirect->nComponents() * 4;
     float *data = new float[n];
     memset(data, 0, sizeof(float) * n);
     float *dest = data;
-    const float *values = _data->values();
-    for (size_t iz = 0; iz < _data->zNum(); iz++) {
-        for (size_t iy = 0; iy < _data->yNum(); iy++) {
-            for (size_t ix = 0; ix < _data->xNum(); ix++) {
+    const float *values = unirect->values();
+    for (size_t iz = 0; iz < unirect->zNum(); iz++) {
+        for (size_t iy = 0; iy < unirect->yNum(); iy++) {
+            for (size_t ix = 0; ix < unirect->xNum(); ix++) {
                 double vx, vy, vz, vm;
                 vx = values[0];
@@ -362 +352 @@
                 vz = values[2];
                 vm = sqrt(vx*vx + vy*vy + vz*vz);
-                dest[0] = vm / magMax;
-                dest[1] = vx /(2.0 * magMax) + 0.5;
-                dest[2] = vy /(2.0 * magMax) + 0.5;
-                dest[3] = vz /(2.0 * magMax) + 0.5;
+                dest[0] = vm / unirect->magMax();
+                dest[1] = vx /(2.0 * unirect->magMax()) + 0.5;
+                dest[2] = vy /(2.0 * unirect->magMax()) + 0.5;
+                dest[3] = vz /(2.0 * unirect->magMax()) + 0.5;
                 values += 3;
                 dest += 4;
@@ -375 +365 @@
 
 Volume *
-Flow::makeVolume(float *data)
+Flow::makeVolume(Rappture::Unirect3d *unirect, float *data)
 {
     Volume *volume =
         NanoVis::loadVolume(_name.c_str(),
-                            _data->xNum(),
-                            _data->yNum(), 
-                            _data->zNum(),
+                            unirect->xNum(),
+                            unirect->yNum(), 
+                            unirect->zNum(),
                             4, data, 
-                            magMin, magMax, 0);
-    volume->xAxis.setRange(_data->xMin(), _data->xMax());
-    volume->yAxis.setRange(_data->yMin(), _data->yMax());
-    volume->zAxis.setRange(_data->zMin(), _data->zMax());
-
-    TRACE("mag=%g %g", magMin, magMax);
-
-    volume->disableCutplane(0);
-    volume->disableCutplane(1);
-    volume->disableCutplane(2);
+                            unirect->magMin(),
+                            unirect->magMax(),
+                            0);
+    volume->xAxis.setRange(unirect->xMin(), unirect->xMax());
+    volume->yAxis.setRange(unirect->yMin(), unirect->yMax());
+    volume->zAxis.setRange(unirect->zMin(), unirect->zMax());
+
+    TRACE("mag=%g %g", unirect->magMin(), unirect->magMax());
+
+    return volume;
+}
+
+void
+Flow::initVolume()
+{
+    _volume->disableCutplane(0);
+    _volume->disableCutplane(1);
+    _volume->disableCutplane(2);
 
     /* Initialize the volume with the previously configured values. */
-    volume->transferFunction(_sv.transferFunction);
-    volume->dataEnabled(_sv.showVolume);
-    volume->twoSidedLighting(_sv.twoSidedLighting);
-    volume->outline(_sv.showOutline);
-    volume->opacityScale(_sv.opacity);
-    volume->ambient(_sv.ambient);
-    volume->diffuse(_sv.diffuse);
-    volume->specularLevel(_sv.specular);
-    volume->specularExponent(_sv.specularExp);
+    _volume->transferFunction(_sv.transferFunction);
+    _volume->dataEnabled(_sv.showVolume);
+    _volume->twoSidedLighting(_sv.twoSidedLighting);
+    _volume->outline(_sv.showOutline);
+    _volume->opacityScale(_sv.opacity);
+    _volume->ambient(_sv.ambient);
+    _volume->diffuse(_sv.diffuse);
+    _volume->specularLevel(_sv.specular);
+    _volume->specularExponent(_sv.specularExp);
 
     Volume::updatePending = true;
-    return volume;
-}
+}

branches/blt4/packages/vizservers/nanovis/Flow.h

@@ -83 +83 @@
     void getBoxNames(std::vector<std::string>& names);
 
-    bool scaleVectorField();
-
     bool visible()
     {
@@ -97 +95 @@
     bool isDataLoaded()
     {
-        return (_data != NULL);
-    }
-
-    Rappture::Unirect3d *data()
-    {
-        return _data;
-    }
-
-    void data(Rappture::Unirect3d *data)
-    {
-        if (_data != NULL) {
-            delete _data;
-        }
-        _data = data;
+        return (_volume != NULL);
+    }
+
+    void getVectorRange(double range[])
+    {
+        range[0] = _volume->wAxis.min();
+        range[1] = _volume->wAxis.max();
+    }
+
+    void data(Rappture::Unirect3d *unirect)
+    {
+        float *vdata = getScaledVector(unirect);
+        _volume = makeVolume(unirect, vdata);
+        delete [] vdata;
+        delete unirect;
+        initVolume();
+        scaleVectorField();
+    }
+
+    void data(Volume *volume)
+    {
+        _volume = volume;
+        initVolume();
+        scaleVectorField();
     }
 
@@ -198 +206 @@
     typedef std::tr1::unordered_map<BoxId, FlowBox *> BoxHashmap;
 
-    float *getScaledVector();
-
-    Volume *makeVolume(float *data);
+    void initVolume();
+
+    bool scaleVectorField();
+
+    float *getScaledVector(Rappture::Unirect3d *unirect);
+
+    Volume *makeVolume(Rappture::Unirect3d *unirect, float *data);
 
     void renderBoxes();
@@ -219 +231 @@
 
     /**
-     * Uniform rectangular data
-     * representing the mesh and vector
-     * field values.  These values are
-     * kept to regenerate the volume
-     * associated with the flow. */
-    Rappture::Unirect3d *_data;
-
-    /**
      * The volume associated with the
      * flow.  This isn't the same thing as

branches/blt4/packages/vizservers/nanovis/FlowCmd.cpp

@@ -30 +30 @@
 #include "Command.h"
 #include "PPMWriter.h"
+#ifdef USE_VTK
+#include "VtkDataSetReader.h"
+#endif
+#include "VtkReader.h"
 #include "FlowCmd.h"
 #include "FlowTypes.h"
@@ -243 +247 @@
     size_t length = buf.size();
 
-    Rappture::Unirect3d *dataPtr;
-    dataPtr = new Rappture::Unirect3d(nComponents);
+    Rappture::Unirect3d *unirect = NULL;
+    Volume *volume = NULL;
 
     Flow *flow = (Flow *)clientData;
     if ((length > 4) && (strncmp(bytes, "<DX>", 4) == 0)) {
-        if (!dataPtr->importDx(result, nComponents, length - 4, bytes + 4)) {
+        unirect = new Rappture::Unirect3d(nComponents);
+        if (!unirect->importDx(result, nComponents, length - 4, bytes + 4)) {
             Tcl_AppendResult(interp, result.remark(), (char *)NULL);
-            delete dataPtr;
+            delete unirect;
             return TCL_ERROR;
         }
     } else if ((length > 10) && (strncmp(bytes, "unirect3d ", 10) == 0)) {
-        if (dataPtr->parseBuffer(interp, buf) != TCL_OK) {
-            delete dataPtr;
+        unirect = new Rappture::Unirect3d(nComponents);
+        if (unirect->parseBuffer(interp, buf) != TCL_OK) {
+            delete unirect;
             return TCL_ERROR;
         }
     } else if ((length > 10) && (strncmp(bytes, "unirect2d ", 10) == 0)) {
+        unirect = new Rappture::Unirect3d(nComponents);
         Rappture::Unirect2d *u2dPtr;
         u2dPtr = new Rappture::Unirect2d(nComponents);
         if (u2dPtr->parseBuffer(interp, buf) != TCL_OK) {
+            delete unirect;
             delete u2dPtr;
             return TCL_ERROR;
         }
-        dataPtr->convert(u2dPtr);
+        unirect->convert(u2dPtr);
         delete u2dPtr;
-#if 0
     } else if ((length > 14) && (strncmp(bytes, "# vtk DataFile", 14) == 0)) {
         TRACE("VTK loading...");
@@ -277 +284 @@
         }
         Rappture::Outcome context;
-        volume = load_vtk_volume_stream(context, tag, fdata);
+#ifdef USE_VTK
+        volume = load_vtk_volume_stream(context, flow->name(), bytes, length);
+#else
+        std::stringstream fdata;
+        fdata.write(bytes, nBytes);
+        volume = load_vtk_volume_stream(context, flow->name(), fdata);
+#endif
         if (volume == NULL) {
             Tcl_AppendResult(interp, context.remark(), (char*)NULL);
             return TCL_ERROR;
         }
-#endif
     } else {
         TRACE("header is %.14s", buf.bytes());
-        if (!dataPtr->importDx(result, nComponents, length, bytes)) {
+        unirect = new Rappture::Unirect3d(nComponents);
+        if (!unirect->importDx(result, nComponents, length, bytes)) {
             Tcl_AppendResult(interp, result.remark(), (char *)NULL);
-            delete dataPtr;
-            return TCL_ERROR;
-        }
-    }
-    if (dataPtr->nValues() == 0) {
-        delete dataPtr;
+            delete unirect;
+            return TCL_ERROR;
+        }
+    }
+    if (unirect != NULL && unirect->nValues() == 0) {
+        delete unirect;
         Tcl_AppendResult(interp, "no data found in stream", (char *)NULL);
         return TCL_ERROR;
     }
-    TRACE("nx = %d ny = %d nz = %d",
-          dataPtr->xNum(), dataPtr->yNum(), dataPtr->zNum());
-    TRACE("x0 = %lg y0 = %lg z0 = %lg",
-          dataPtr->xMin(), dataPtr->yMin(), dataPtr->zMin());
-    TRACE("lx = %lg ly = %lg lz = %lg",
-          dataPtr->xMax() - dataPtr->xMin(),
-          dataPtr->yMax() - dataPtr->yMin(),
-          dataPtr->zMax() - dataPtr->zMin());
-    TRACE("dx = %lg dy = %lg dz = %lg",
-          dataPtr->xNum() > 1 ? (dataPtr->xMax() - dataPtr->xMin())/(dataPtr->xNum()-1) : 0,
-          dataPtr->yNum() > 1 ? (dataPtr->yMax() - dataPtr->yMin())/(dataPtr->yNum()-1) : 0,
-          dataPtr->zNum() > 1 ? (dataPtr->zMax() - dataPtr->zMin())/(dataPtr->zNum()-1) : 0);
-    TRACE("magMin = %lg magMax = %lg",
-          dataPtr->magMin(), dataPtr->magMax());
-    flow->data(dataPtr);
+    if (unirect != NULL) {
+        TRACE("nx = %d ny = %d nz = %d",
+              unirect->xNum(), unirect->yNum(), unirect->zNum());
+        TRACE("x0 = %lg y0 = %lg z0 = %lg",
+              unirect->xMin(), unirect->yMin(), unirect->zMin());
+        TRACE("lx = %lg ly = %lg lz = %lg",
+              unirect->xMax() - unirect->xMin(),
+              unirect->yMax() - unirect->yMin(),
+              unirect->zMax() - unirect->zMin());
+        TRACE("dx = %lg dy = %lg dz = %lg",
+              unirect->xNum() > 1 ? (unirect->xMax() - unirect->xMin())/(unirect->xNum()-1) : 0,
+              unirect->yNum() > 1 ? (unirect->yMax() - unirect->yMin())/(unirect->yNum()-1) : 0,
+              unirect->zNum() > 1 ? (unirect->zMax() - unirect->zMin())/(unirect->zNum()-1) : 0);
+        TRACE("magMin = %lg magMax = %lg",
+              unirect->magMin(), unirect->magMax());
+
+        flow->data(unirect);
+    } else {
+        flow->data(volume);
+    }
+    double range[2];
+    flow->getVectorRange(range);
     {
         char info[1024];
         int length = 
             sprintf(info, "nv>data tag %s min %g max %g\n",
-                    flow->name(), dataPtr->magMin(), dataPtr->magMax());
+                    flow->name(), range[0], range[1]);
 #ifdef USE_THREADS
         queueResponse(info, (size_t)length, Response::VOLATILE);
@@ -840 +860 @@
     }
     if (Flow::updatePending) {
-        NanoVis::mapFlows();
+        NanoVis::setFlowRanges();
     }
     NanoVis::renderLegend(tf, Flow::magMin, Flow::magMax, w, h, label);
@@ -965 +985 @@
     NanoVis::resetFlows();
     if (Flow::updatePending) {
-        NanoVis::mapFlows();
+        NanoVis::setFlowRanges();
     }
     for (int i = 0; i < nSteps; i++) {
@@ -997 +1017 @@
     assert(NanoVis::licRenderer != NULL);
     if (Flow::updatePending) {
-        NanoVis::mapFlows();
+        NanoVis::setFlowRanges();
     }
     NanoVis::licRenderer->convolve();

branches/blt4/packages/vizservers/nanovis/Grid.cpp

@@ -20 +20 @@
 
 #define NUMDIGITS       6
-#define GRID_TICK       0.05
+#define TICK_LENGTH     0.05
+#define LABEL_OFFSET    0.06
+#define TITLE_OFFSET    0.2
 
 Grid::Grid() :
@@ -55 +57 @@
     glEnable(GL_DEPTH_TEST);
     glDisable(GL_TEXTURE_2D);
+#ifdef notdef
     glEnable(GL_BLEND);
-#ifdef notdef
     glEnable(GL_LINE_SMOOTH);
+#else
+    glDisable(GL_BLEND);
 #endif
 
@@ -73 +77 @@
     {
         glVertex3f(0.0f, 0.0f, 0.0f);
-        glVertex3f(1.0f + GRID_TICK, 0.0f, 0.0f);
+        glVertex3f(1.0f + TICK_LENGTH/xAxis.range(), 0.0f, 0.0f);
         glVertex3f(0.0f, 0.0f, 0.0f);
-        glVertex3f(0.0f, 1.0f + GRID_TICK, 0.0f);
+        glVertex3f(0.0f, 1.0f + TICK_LENGTH/yAxis.range(), 0.0f);
         glVertex3f(0.0f, 0.0f, 0.0f);
-        glVertex3f(0.0f, 0.0f, 1.0f + GRID_TICK);
+        glVertex3f(0.0f, 0.0f, 1.0f + TICK_LENGTH/zAxis.range());
     }
     glEnd();
@@ -96 +100 @@
             glVertex3f(x, 1.0f, 0.0f);
             glVertex3f(x, 0.0f, 0.0f);
-            glVertex3f(x, 0.0f, 1.0f + GRID_TICK);
+            glVertex3f(x, 0.0f, 1.0f + TICK_LENGTH/zAxis.range());
         }
         for (result = yAxis.firstMajor(iter); result; result = iter.next()) {
@@ -102 +106 @@
             y = yAxis.map(iter.getValue());
             glVertex3f(0.0f, y, 0.0f);
-            glVertex3f(1.0f + GRID_TICK, y, 0.0f);
+            glVertex3f(1.0f + TICK_LENGTH/xAxis.range(), y, 0.0f);
             glVertex3f(0.0f, y, 0.0f);
             glVertex3f(0.0f, y, 1.0f);
@@ -112 +116 @@
             glVertex3f(0.0f, 1.0f, z);
             glVertex3f(0.0f, 0.0f, z);
-            glVertex3f(1.0f + GRID_TICK, 0.0f, z);
+            glVertex3f(1.0f + TICK_LENGTH/xAxis.range(), 0.0f, z);
         }
     }
@@ -163 +167 @@
         glGetDoublev(GL_PROJECTION_MATRIX, prjm);
         glGetIntegerv(GL_VIEWPORT, viewport);
-        
+
         _font->begin();
-        if (gluProject(1.2, 0.0, 0.0, mv, prjm, viewport, &wx, &wy, &wz)) {
+        if (gluProject(1.0 + TITLE_OFFSET/xAxis.range(), 0.0, 0.0, mv, prjm, viewport, &wx, &wy, &wz) &&
+            wz >= 0.0 && wz <= 1.0) {
             glLoadIdentity();
             glTranslatef((int) wx, viewport[3] - (int) wy, 0);
@@ -175 +180 @@
         }
         
-        if (gluProject(0.0, 1.2, 0.0, mv, prjm, viewport, &wx, &wy, &wz)) {
+        if (gluProject(0.0, 1.0 + TITLE_OFFSET/yAxis.range(), 0.0, mv, prjm, viewport, &wx, &wy, &wz) &&
+            wz >= 0.0 && wz <= 1.0) {
             glLoadIdentity();
             glTranslatef((int) wx, viewport[3] - (int)wy, 0);
@@ -185 +191 @@
         }
         
-        if (gluProject(0.0, 0.0, 1.2, mv, prjm, viewport, &wx, &wy, &wz)) {
+        if (gluProject(0.0, 0.0, 1.0 + TITLE_OFFSET/zAxis.range(), mv, prjm, viewport, &wx, &wy, &wz) &&
+            wz >= 0.0 && wz <= 1.0) {
             glLoadIdentity();
             glTranslatef((int) wx, (int) viewport[3] - (int)wy, 0.0f);
@@ -200 +207 @@
             float x;
             x = xAxis.map(iter.getValue());
-            if (gluProject(x, 0.0f, 1.06f, mv, prjm, viewport, &wx, &wy, &wz)) {
+            if (gluProject(x, 0.0f, 1.0 + LABEL_OFFSET/zAxis.range(), mv, prjm, viewport, &wx, &wy, &wz) &&
+                wz >= 0.0 && wz <= 1.0) {
                 char buff[20];
                 glLoadIdentity();
@@ -211 +219 @@
             float y;
             y = yAxis.map(iter.getValue());
-            if (gluProject(1.06f, y, 0.0f, mv, prjm, viewport, &wx, &wy, &wz)) {
+            if (gluProject(1.0 + LABEL_OFFSET/xAxis.range(), y, 0.0f, mv, prjm, viewport, &wx, &wy, &wz) &&
+                wz >= 0.0 && wz <= 1.0) {
                 char buff[20];
                 glLoadIdentity();
@@ -219 +228 @@
             }
         }
-        for (result = zAxis.firstMajor(iter); result; result = iter.next()) {
+        for (result = zAxis.firstMajor(iter) + LABEL_OFFSET/xAxis.range(); result; result = iter.next()) {
             float z;
             z = zAxis.map(iter.getValue());
-            if (gluProject(1.06f, 0.0f, z, mv, prjm, viewport, &wx, &wy, &wz)) {
+            if (gluProject(1.0 + LABEL_OFFSET/xAxis.range(), 0.0f, z, mv, prjm, viewport, &wx, &wy, &wz) &&
+                wz >= 0.0 && wz <= 1.0) {
                 char buff[20];
                 glLoadIdentity();

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

@@ -3 +3 @@
 USE_POINTSET_RENDERER   = #yes
 USE_PARTICLE_SYSTEM     = #yes
+USE_VTK                 = yes
 
 SHELL = /bin/sh
@@ -53 +54 @@
 VRMATH_LIB_SPEC = $(VRMATH_LIB)
 
+VTK_LIB_DIR     = @VTK_LIB_DIR@
+VTK_INC_SPEC    = @VTK_INC_SPEC@
+VTK_LIB_SPEC    = \
+                -lvtkIOCore-6.0 \
+                -lvtkIOLegacy-6.0 \
+                -lvtkFiltersCore-6.0 \
+                -lvtkImagingHybrid-6.0 \
+                -lvtkImagingCore-6.0 \
+                -lvtkCommonCore-6.0 \
+                -lvtkCommonDataModel-6.0 \
+                -lvtkCommonExecutionModel-6.0  \
+                -lvtkCommonMisc-6.0  \
+                -lvtkCommonSystem-6.0 \
+                -lvtkCommonTransforms-6.0 \
+                -lvtkCommonMath-6.0
+
 EXTRA_LIBS      = -lm -lpthread
 RP_DIR          =  @RP_DIR@
@@ -73 +90 @@
                 $(UTIL_LIB_SPEC) \
                 $(VRMATH_LIB_SPEC) \
+                $(VTK_LIB_SPEC) \
                 $(TCL_LIB_SPEC) \
                 $(CG_LIB_SPEC) \
@@ -85 +103 @@
                 $(MAT_INC_SPEC) \
                 $(VRMATH_INC_SPEC) \
+                $(VTK_INC_SPEC) \
                 $(TCL_INC_SPEC) \
                 $(CG_INC_SPEC) \
@@ -103 +122 @@
 ifdef USE_POINTSET_RENDERER
 DEFINES         += -DUSE_POINTSET_RENDERER
+endif
+ifdef USE_VTK
+DEFINES         += -DUSE_VTK
 endif
 CXX_SWITCHES    = $(CFLAGS) $(EXTRA_CFLAGS) $(DEFINES) $(INCLUDES)
@@ -204 +226 @@
 endif
 
+ifdef USE_VTK
+OBJS +=         DataSetResample.o \
+                VtkDataSetReader.o
+endif
+
 .PHONY: all install install-resources install-shaders install-nanovis docs clean-docs clean distclean graphics imgloaders newmat11 util vrmath
 
@@ -287 +314 @@
 ContourLineFilter.o: ContourLineFilter.cpp ContourLineFilter.h
 ConvexPolygon.o: ConvexPolygon.cpp ConvexPolygon.h $(VRMATH_DIR)/include/vrmath/Vector4f.h $(VRMATH_DIR)/include/vrmath/Matrix4x4d.h Plane.h
+DataSetResample.o: DataSetResample.cpp DataSetResample.h
 Flow.o: Flow.cpp Flow.h FlowCmd.h FlowTypes.h FlowBox.h FlowParticles.h LIC.h VelocityArrowsSlice.h Switch.h Unirect.h Volume.h TransferFunction.h Trace.h
 FlowBox.o: FlowBox.cpp FlowBox.h FlowTypes.h Switch.h Trace.h Volume.h $(VRMATH_DIR)/include/vrmath/Vector3f.h $(VRMATH_DIR)/include/vrmath/Vector4f.h $(VRMATH_DIR)/include/vrmath/Matrix4x4d.h
@@ -293 +321 @@
 GradientFilter.o: GradientFilter.cpp GradientFilter.h
 Grid.o: Grid.cpp Grid.h Axis.h Chain.h $(UTIL_DIR)/Fonts.h $(VRMATH_DIR)/include/vrmath/Color4f.h $(VRMATH_DIR)/include/vrmath/Vector4f.h
-HeightMap.o: HeightMap.cpp HeightMap.h
-LIC.o: LIC.cpp LIC.h
+HeightMap.o: HeightMap.cpp HeightMap.h Shader.h
+LIC.o: LIC.cpp LIC.h Shader.h
 OrientationIndicator.o: OrientationIndicator.cpp OrientationIndicator.h
 ParticleAdvectionShader.o: ParticleAdvectionShader.cpp ParticleAdvectionShader.h Shader.h
@@ -312 +340 @@
 RegularVolumeShader.o: RegularVolumeShader.cpp RegularVolumeShader.h VolumeShader.h Shader.h
 RenderVertexArray.o: RenderVertexArray.cpp RenderVertexArray.h
-Shader.o: Shader.cpp Shader.h
+Shader.o: Shader.cpp Shader.h config.h
 ShaderGL.o: ShaderGL.cpp ShaderGL.h
 StdVertexShader.o: StdVertexShader.cpp StdVertexShader.h Shader.h
@@ -327 +355 @@
 VolumeRenderer.o: VolumeRenderer.cpp VolumeRenderer.h ConvexPolygon.h Volume.h nanovis.h Trace.h Plane.h StdVertexShader.h Shader.h
 VolumeShader.o: VolumeShader.cpp VolumeShader.h Shader.h
-VtkReader.o: VtkReader.h Trace.h Volume.h $(VRMATH_DIR)/include/vrmath/Vector3f.h ReaderCommon.h nanovis.h
+VtkDataSetReader.o: VtkDataSetReader.cpp VtkDataSetReader.h DataSetResample.h $(VRMATH_DIR)/include/vrmath/Vector3f.h ReaderCommon.h Trace.h Volume.h nanovis.h config.h
+VtkReader.o: VtkReader.h Trace.h Volume.h $(VRMATH_DIR)/include/vrmath/Vector3f.h ReaderCommon.h nanovis.h config.h
 ZincBlendeReconstructor.o: ZincBlendeReconstructor.cpp ZincBlendeReconstructor.h ZincBlendeVolume.h Volume.h $(VRMATH_DIR)/include/vrmath/Vector3f.h
 ZincBlendeVolume.o: ZincBlendeVolume.cpp ZincBlendeVolume.h config.h define.h

branches/blt4/packages/vizservers/nanovis/ReaderCommon.cpp

@@ -64 +64 @@
 
 /**
+ * \brief Normalize data to [0,1] based on vmin,vmax range
+ * 
+ * Data outside of given range is clamped, and NaNs are set to
+ * -1 in the output
+ *
+ * \param data Float array of unnormalized data, will be normalized on return
+ * \param count Number of elts in array
+ * \param stride Stride between values in data array
+ * \param vmin Minimum value in data array
+ * \param vmax Maximum value in data array
+ */
+void
+nv::normalizeVector(float *data, int count, double vmin, double vmax)
+{
+    for (int p = 0; p < count; p++) {
+        int i = p * 4;
+        data[i  ] = data[i]/vmax;
+        data[i+1] = data[i+1]/(2.0 * vmax) + 0.5;
+        data[i+2] = data[i+2]/(2.0 * vmax) + 0.5;
+        data[i+3] = data[i+3]/(2.0 * vmax) + 0.5;
+    }
+}
+
+/**
  * \brief Compute Sobel filtered gradients for a 3D volume
  *

branches/blt4/packages/vizservers/nanovis/ReaderCommon.h

@@ -15 +15 @@
 normalizeScalar(float *data, int count, int stride, double min, double max);
 
+extern void
+normalizeVector(float *data, int count, double min, double max);
+
 extern float *
 computeGradient(float *data,

branches/blt4/packages/vizservers/nanovis/Shader.cpp

@@ -12 +12 @@
 #include <util/FilePath.h>
 
+#include "config.h"
 #include "Shader.h"
 #include "Trace.h"
@@ -18 +19 @@
 using namespace nv::util;
 
+/**
+ * These correspond to NV_vertex_program3 and NV_fragment_program2:
+ * CG_PROFILE_VP40
+ * CG_PROFILE_FP40
+ *
+ * These correspond to ARB_vertex_program and ARB_fragment_program:
+ * CG_PROFILE_ARBVP1
+ * CG_PROFILE_ARBFP1
+ *
+ * Generic GLSL targets:
+ * CG_PROFILE_GLSLV
+ * CG_PROFILE_GLSLF
+ */
+#ifdef USE_ARB_PROGRAMS
+CGprofile Shader::_defaultVertexProfile = CG_PROFILE_ARBVP1;
+CGprofile Shader::_defaultFragmentProfile = CG_PROFILE_ARBFP1;
+#else
 CGprofile Shader::_defaultVertexProfile = CG_PROFILE_VP40;
 CGprofile Shader::_defaultFragmentProfile = CG_PROFILE_FP40;
+#endif
 CGcontext Shader::_cgContext = NULL;
 

branches/blt4/packages/vizservers/nanovis/Shader.h

@@ -49 +49 @@
     void loadFragmentProgram(const char *fileName);
 
+    bool isVertexProgramLoaded()
+    {
+        return (getVP() == NULL);
+    }
+
+    bool isFragmentProgramLoaded()
+    {
+        return (getFP() == NULL);
+    }
+
     void setVPParameter1f(const char *name, float val)
     {
@@ -284 +294 @@
     void resetPrograms();
 
-
     CGprogram getVP()
     {

branches/blt4/packages/vizservers/nanovis/Unirect.cpp

@@ -8 +8 @@
 
 #include <tcl.h>
-
-#include <RpField1D.h>
-#include <RpFieldRect3D.h>
 
 #include "Command.h"
@@ -634 +631 @@
 }
 
-bool
-Rappture::Unirect3d::resample(Rappture::Outcome &result, size_t nSamples)
-{
-    Rappture::Mesh1D xgrid(_xMin, _xMax, _xNum);
-    Rappture::Mesh1D ygrid(_yMin, _yMax, _yNum);
-    Rappture::Mesh1D zgrid(_zMin, _zMax, _zNum);
-    Rappture::FieldRect3D xfield(xgrid, ygrid, zgrid);
-    Rappture::FieldRect3D yfield(xgrid, ygrid, zgrid);
-    Rappture::FieldRect3D zfield(xgrid, ygrid, zgrid);
-
-    size_t i, j;
-    for (i = 0, j = 0; i < _nValues; i += _nComponents, j++) {
-        double vx, vy, vz;
-
-        vx = _values[i];
-        vy = _values[i+1];
-        vz = _values[i+2];
-        
-        xfield.define(j, vx);
-        yfield.define(j, vy);
-        zfield.define(j, vz);
-    }
-    // Figure out a good mesh spacing
-    double dx, dy, dz;
-    double lx, ly, lz;
-    lx = xfield.rangeMax(Rappture::xaxis) - xfield.rangeMin(Rappture::xaxis);
-    ly = xfield.rangeMax(Rappture::yaxis) - xfield.rangeMin(Rappture::yaxis);
-    lz = xfield.rangeMax(Rappture::zaxis) - xfield.rangeMin(Rappture::zaxis);
-
-    double dmin;
-    dmin = pow((lx*ly*lz)/((nSamples-1)*(nSamples-1)*(nSamples-1)), 0.333);
-
-    /* Recompute new number of points for each axis. */
-    _xNum = (size_t)ceil(lx/dmin);
-    _yNum = (size_t)ceil(ly/dmin);
-    _zNum = (size_t)ceil(lz/dmin);
-
-#ifndef HAVE_NPOT_TEXTURES
-    // must be an even power of 2 for older cards
-    _xNum = (int)pow(2.0, ceil(log10((double)_xNum)/log10(2.0)));
-    _yNum = (int)pow(2.0, ceil(log10((double)_yNum)/log10(2.0)));
-    _zNum = (int)pow(2.0, ceil(log10((double)_zNum)/log10(2.0)));
-#endif
-
-    dx = lx/(double)(_xNum-1);
-    dy = ly/(double)(_yNum-1);
-    dz = lz/(double)(_zNum-1);
-
-    TRACE("lx:%lf ly:%lf lz:%lf dmin:%lf dx:%lf dy:%lf dz:%lf", lx, ly, lz, dmin, dx, dy, dz);
-
-    size_t n = _nComponents * _xNum * _yNum * _zNum;
-    _values = (float *)realloc(_values, sizeof(float) * n);
-    memset(_values, 0, sizeof(float) * n);
-
-    // Generate the uniformly sampled rectangle that we need for a volume
-    float *destPtr = _values;
-    for (size_t i = 0; i < _zNum; i++) {
-        double z;
-
-        z = _zMin + (i * dx);
-        for (size_t j = 0; j < _yNum; j++) {
-            double y;
-                
-            y = _yMin + (j * dy);
-            for (size_t k = 0; k < _xNum; k++) {
-                double x;
-
-                x = _xMin + (k * dz);
-                destPtr[0] = xfield.value(x, y, z);
-                destPtr[1] = yfield.value(x, y, z);
-                destPtr[2] = zfield.value(x, y, z);
-            }
-        }
-    }
-    _nValues = _xNum * _yNum * _zNum * _nComponents;
-    return true;
-}
-
 void
 Rappture::Unirect3d::getVectorRange()

branches/blt4/packages/vizservers/nanovis/Unirect.h

@@ -229 +229 @@
     bool convert(Unirect2d *dataPtr);
 
-    bool resample(Rappture::Outcome &context, size_t nSamples = 30);
-
     bool isInitialized()
     {
@@ -247 +245 @@
     float _zValueMin, _zValueMax;
     double _magMin, _magMax;                /* Range of magnitudes of vector
-                                         * data. */
+                                             * data. */
     char *_xUnits;
     char *_yUnits;

branches/blt4/packages/vizservers/nanovis/VelocityArrowsSlice.cpp

@@ -65 +65 @@
     _queryVelocityFP.loadFragmentProgram("queryvelocity.cg");
 
-    _particleShader.loadVertexProgram("velocityslicevp.cg");
-    _particleShader.loadFragmentProgram("velocityslicefp.cg");
+    // Delay loading of shaders only required for glyph style rendering
+    if (_renderMode == GLYPHS) {
+        _particleShader.loadVertexProgram("velocityslicevp.cg");
+        _particleShader.loadFragmentProgram("velocityslicefp.cg");
+    }
 
     createRenderTarget();
@@ -362 +365 @@
                     continue;
                 }
-                if (length > 1.0e-6) {
+                if (length > 0.0) {
                     Vector3f vnorm = vel.normalize();
                     Vector3f rotationAxis = refVec.cross(vnorm);
@@ -414 +417 @@
         glTexEnvf(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE);
 
+        // FIXME: This vertex shader won't compile with ARB_vertex_program,
+        // so it should use GLSL
+        if (!_particleShader.isVertexProgramLoaded()) {
+            _particleShader.loadVertexProgram("velocityslicevp.cg");
+        }
+        if (!_particleShader.isFragmentProgramLoaded()) {
+            _particleShader.loadFragmentProgram("velocityslicefp.cg");
+        }
+
         _particleShader.bind();
         _particleShader.setVPTextureParameter("vfield", _vectorFieldGraphicsID);
@@ -458 +470 @@
     Vector3f bmin, bmax;
     volume->getBounds(bmin, bmax);
-    _origin = bmin;
+    _origin.set(bmin.x, bmin.y, bmin.z);
     _scale.set(bmax.x-bmin.x, bmax.y-bmin.y, bmax.z-bmin.z);
 

branches/blt4/packages/vizservers/nanovis/Volume.cpp

@@ -31 +31 @@
 double Volume::valueMax = 1.0;
 
-Volume::Volume(int w, int h, int d,
-               int n, float *data,
-               double v0, double v1, double nonZeroMin) :
+Volume::Volume(int width, int height, int depth,
+               int numComponents, float *data,
+               double vmin, double vmax, double nonZeroMin) :
     _id(0),
-    _width(w),
-    _height(h),
-    _depth(d),
+    _width(width),
+    _height(height),
+    _depth(depth),
     _transferFunc(NULL),
     _ambient(0.6f),
@@ -46 +46 @@
     _opacityScale(0.5f),
     _data(NULL),
-    _numComponents(n),
+    _numComponents(numComponents),
     _nonZeroMin(nonZeroMin),
+    _cutplanesVisible(true),
     _tex(NULL),
     _position(0,0,0),
@@ -62 +63 @@
     _outlineColor[0] = _outlineColor[1] = _outlineColor[2] = 1.0f;
 
-    _tex = new Texture3D(_width, _height, _depth, GL_FLOAT, GL_LINEAR, n);
+    _tex = new Texture3D(_width, _height, _depth, GL_FLOAT, GL_LINEAR, _numComponents);
     int fcount = _width * _height * _depth * _numComponents;
     _data = new float[fcount];
@@ -70 +71 @@
     _id = _tex->id();
 
-    wAxis.setRange(v0, v1);
+    wAxis.setRange(vmin, vmax);
 
     //Add cut planes. We create 3 default cut planes facing x, y, z directions.
@@ -90 +91 @@
 }
 
-void Volume::setData(float *data, double v0, double v1, double nonZeroMin)
+void Volume::setData(float *data, double vmin, double vmax, double nonZeroMin)
 {
     int fcount = _width * _height * _depth * _numComponents;
     memcpy(_data, data, fcount * sizeof(float));
     _tex->update(_data);
-    wAxis.setRange(v0, v1);
+    wAxis.setRange(vmin, vmax);
     _nonZeroMin = nonZeroMin;
     updatePending = true;

branches/blt4/packages/vizservers/nanovis/Volume.h

@@ -125 +125 @@
     }
 
-    void setData(float *data, double v0, double v1, double nonZeroMin);
+    void setData(float *data, double vmin, double vmax, double nonZeroMin);
 
     const float *data() const
@@ -154 +154 @@
 
     void disableCutplane(int index);
+
+    void cutplanesVisible(bool state)
+    {
+        _cutplanesVisible = state;
+    }
+
+    bool cutplanesVisible() const
+    {
+        return _cutplanesVisible;
+    }
 
     void setCutplanePosition(int index, float location);
@@ -387 +397 @@
     double _nonZeroMin;
 
+    bool _cutplanesVisible;
     std::vector<CutPlane> _plane; ///< cut planes
 

branches/blt4/packages/vizservers/nanovis/VolumeRenderer.cpp

@@ -281 +281 @@
 
         for (int j = 0; j < volume->getCutplaneCount(); j++) {
-            if (!volume->isCutplaneEnabled(j)) {
+            if (!volume->cutplanesVisible() || !volume->isCutplaneEnabled(j)) {
                 continue;
             }

branches/blt4/packages/vizservers/nanovis/VtkReader.cpp

@@ -16 +16 @@
 #include "ReaderCommon.h"
 
+#include "config.h"
 #include "nanovis.h"
 #include "VtkReader.h"

branches/blt4/packages/vizservers/nanovis/ZincBlendeVolume.cpp

@@ -24 +24 @@
 using namespace vrmath;
 
-ZincBlendeVolume::ZincBlendeVolume(int w, int h, int d, int n, 
+ZincBlendeVolume::ZincBlendeVolume(int width, int height, int depth,
+                                   int numComponents, 
                                    float *dataVolumeA, float *dataVolumeB,
-                                   double v0, double v1, double non_zeromin,
+                                   double vmin, double vmax, double nonZeroMin,
                                    const Vector3f& cellSz) :
-    Volume(w, h, d, n, dataVolumeA, v0, v1, non_zeromin),
+    Volume(width, height, depth, numComponents, dataVolumeA, vmin, vmax, nonZeroMin),
     cellSize(cellSz)
 {
@@ -34 +35 @@
     _volumeType = ZINCBLENDE;
 
-    //store member tex initialize in Volume() as zincblende_tex[0]
+    //store member tex initialize in Volume() as zincblendeTex[0]
     assert(_tex);
     zincblendeTex[0] = _tex;
 
     //now add another tex as zincblende_tex[1]
-    Texture3D *secondTex = new Texture3D(w, h, d, GL_FLOAT, GL_LINEAR, n);
+    Texture3D *secondTex = new Texture3D(width, height, depth, GL_FLOAT, GL_LINEAR, numComponents);
     assert(secondTex);
     secondTex->initialize(dataVolumeB);

branches/blt4/packages/vizservers/nanovis/ZincBlendeVolume.h

@@ -23 +23 @@
     ZincBlendeVolume(int width, int height, int depth, int numComponents, 
                      float *dataVolumeA, float *dataVolumeB,
-                     double vmin, double vmax, double non_zeromin,
+                     double vmin, double vmax, double nonZeroMin,
                      const vrmath::Vector3f& cellSize);
 

branches/blt4/packages/vizservers/nanovis/config.h

@@ -38 +38 @@
 
 /*
+ * If defined, use ARB_vertex_program and ARB_fragment_program as Cg
+ * profile target, otherwise NV_vertex_program3 and NV_fragment_program2
+ * are required
+ */
+//#define USE_ARB_PROGRAMS
+
+/*
  * Keep statistics
  */

branches/blt4/packages/vizservers/nanovis/dxReader.cpp

@@ -211 +211 @@
     }
 
-    TRACE("found nx=%d ny=%d nxy=%d nz=%d\ndx=%f dy=%f dz=%f\nx0=%f y0=%f z0=%f", 
+    TRACE("found nx=%d ny=%d nxy=%d nz=%d\ndx=%g dy=%g dz=%g\nx0=%g y0=%g z0=%g", 
           nx, ny, nxy, nz, dx, dy, dz, x0, y0, z0);
 

branches/blt4/packages/vizservers/nanovis/nanovis.cpp

@@ -504 +504 @@
     }
 #endif
-    // FIXME: should use ARB programs or (preferably) a GLSL profile for portability
+    // FIXME: should use GLSL for portability
+#ifdef USE_ARB_PROGRAMS
+    if (!GLEW_ARB_vertex_program ||
+        !GLEW_ARB_fragment_program) {
+        ERROR("ARB_vertex_program and ARB_fragment_program extensions are required");
+        return false;
+    }
+#else
     if (!GLEW_NV_vertex_program3 ||
         !GLEW_NV_fragment_program2) {
@@ -510 +517 @@
         return false;
     }
+#endif
 
     if (!FilePath::getInstance()->setPath(path)) {
@@ -611 +619 @@
 }
 
+/**
+ * \brief Called when new volumes are added to update ranges
+ */
 void
 NanoVis::setVolumeRanges()
@@ -636 +647 @@
 }
 
+/**
+ * \brief Called when new heightmaps are added to update ranges
+ */
 void
 NanoVis::setHeightmapRanges()
@@ -668 +682 @@
 NanoVis::collectBounds(bool onlyVisible)
 {
-    if (Flow::updatePending) {
-        mapFlows();
-    }
-
     sceneBounds.makeEmpty();
 
@@ -698 +708 @@
     }
 
-    {
+    for (FlowHashmap::iterator itr = flowTable.begin();
+         itr != flowTable.end(); ++itr) {
+        Flow *flow = itr->second;
+
         BBox bbox;
-        getFlowBounds(bbox.min, bbox.max, onlyVisible);
+        flow->getBounds(bbox.min, bbox.max, onlyVisible);
         sceneBounds.extend(bbox);
     }
@@ -714 +727 @@
     }
 
+#if 0
     if (!onlyVisible || grid->isVisible()) {
         BBox bbox;
@@ -719 +733 @@
         sceneBounds.extend(bbox);
     }
+#endif
 
     if (sceneBounds.isEmpty()) {
@@ -802 +817 @@
 }
 
+/**
+ * \brief Called when new flows are added to update ranges
+ */
 bool
-NanoVis::mapFlows()
+NanoVis::setFlowRanges()
 {
     TRACE("Enter");
@@ -817 +835 @@
          itr != flowTable.end(); ++itr) {
         Flow *flow = itr->second;
-        double min, max;
         if (!flow->isDataLoaded()) {
             continue;
         }
-        Rappture::Unirect3d *data = flow->data();
-        min = data->magMin();
-        max = data->magMax();
-        if (min < Flow::magMin) {
-            Flow::magMin = min;
+        double range[2];
+        flow->getVectorRange(range);
+        if (range[0] < Flow::magMin) {
+            Flow::magMin = range[0];
         } 
-        if (max > Flow::magMax) {
-            Flow::magMax = max;
+        if (range[1] > Flow::magMax) {
+            Flow::magMax = range[1];
         }
     }
@@ -846 +862 @@
             flow->initializeParticles();
         }
-        if (!flow->scaleVectorField()) {
-            return false;
-        }
     }
 
     Flow::updatePending = false;
     return true;
-}
-
-void
-NanoVis::getFlowBounds(Vector3f& min,
-                       Vector3f& max,
-                       bool onlyVisible)
-{
-    TRACE("Enter");
-
-    BBox allBounds;
-    for (FlowHashmap::iterator itr = flowTable.begin();
-         itr != flowTable.end(); ++itr) {
-        BBox bbox;
-        itr->second->getBounds(bbox.min, bbox.max, onlyVisible);
-        allBounds.extend(bbox);
-    }
-
-    min = allBounds.min;
-    max = allBounds.max;
 }
 
@@ -918 +912 @@
 
     if (Flow::updatePending) {
-        mapFlows();
+        setFlowRanges();
     }
     if (HeightMap::updatePending) {

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

@@ -123 +123 @@
     static void setVolumeRanges();
     static void setHeightmapRanges();
-    static bool mapFlows();
+    static bool setFlowRanges();
 
     static Flow *getFlow(const char *name);
@@ -129 +129 @@
     static void deleteFlows(Tcl_Interp *interp);
     static void deleteFlow(const char *name);
-    static void getFlowBounds(vrmath::Vector3f& min,
-                              vrmath::Vector3f& max,
-                              bool onlyVisible = false);
+
     static void renderFlows();
     static void resetFlows();

branches/blt4/packages/vizservers/nanovis/util/Fonts.cpp

@@ -93 +93 @@
     glLoadIdentity();
 
+#if 0
+    glDisable(GL_BLEND);
+    glEnable(GL_DEPTH_TEST);
+#else
     glEnable(GL_BLEND);
     glDisable(GL_DEPTH_TEST);
+#endif
 }
 
@@ -223 +228 @@
             glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
             glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
+            glTexEnvi(GL_TEXTURE_2D, GL_TEXTURE_ENV_MODE, GL_MODULATE);
             glBindTexture(GL_TEXTURE_2D, 0);
 

branches/blt4/packages/vizservers/nanovis/vrmath/include/vrmath/Vector2f.h

@@ -40 +40 @@
     void set(const Vector2f& v);
 
-    float dot() const;
+    double dot() const;
 
     double length() const;
@@ -67 +67 @@
 }
 
-inline float Vector2f::dot() const
+inline double Vector2f::dot() const
 {
     return (x * x + y * y);

branches/blt4/packages/vizservers/nanovis/vrmath/include/vrmath/Vector3f.h

@@ -58 +58 @@
     Vector3f scale(const Vector3f& scale) const;
 
-    Vector3f scale(float scale) const;
+    Vector3f scale(double scale) const;
 
     bool operator==(const Vector3f& v) const;
@@ -67 +67 @@
 
     // scalar ops
-    Vector3f operator+(float scalar) const;
-    Vector3f operator-(float scalar) const;
-    Vector3f operator*(float scalar) const;
-    Vector3f operator/(float scalar) const;
-    Vector3f& operator*=(float scalar);
+    Vector3f operator+(double scalar) const;
+    Vector3f operator-(double scalar) const;
+    Vector3f operator*(double scalar) const;
+    Vector3f operator/(double scalar) const;
+    Vector3f& operator*=(double scalar);
 
     // vector ops
@@ -113 +113 @@
 }
 
-inline Vector3f Vector3f::operator+(float scalar) const
+inline Vector3f Vector3f::operator+(double scalar) const
 {
     return Vector3f(x + scalar, y + scalar, z + scalar);
 }
 
-inline Vector3f Vector3f::operator-(float scalar) const
+inline Vector3f Vector3f::operator-(double scalar) const
 {
     return Vector3f(x - scalar, y - scalar, z - scalar);
 }
 
-inline Vector3f Vector3f::operator*(float scalar) const
+inline Vector3f Vector3f::operator*(double scalar) const
 {
     return Vector3f(x * scalar, y * scalar, z * scalar);
 }
 
-inline Vector3f Vector3f::operator/(float scalar) const
+inline Vector3f Vector3f::operator/(double scalar) const
 {
     return Vector3f(x / scalar, y / scalar, z / scalar);
 }
 
-inline Vector3f& Vector3f::operator*=(float scalar)
+inline Vector3f& Vector3f::operator*=(double scalar)
 {
     x *= scalar;
@@ -168 +168 @@
 
 #if 0
-inline Vector3f operator*(float scale, const Vector3f& value)
+inline Vector3f operator*(double scale, const Vector3f& value)
 {
     return Vector3f(value.x * scale, value.y * scale, value.z * scale);
@@ -231 +231 @@
 inline Vector3f Vector3f::normalize() const
 {
-    float len = length();
-    if (len > 1.0e-6) {
+    double len = length();
+    if (len > 0.0) {
         return Vector3f(x / len, y / len, z / len);
     } else {
@@ -239 +239 @@
 }
 
-inline Vector3f Vector3f::scale(float scale) const
+inline Vector3f Vector3f::scale(double scale) const
 {
     return Vector3f(x * scale, y * scale, z * scale);

branches/blt4/packages/vizservers/nanovis/vrmath/include/vrmath/Vector4f.h

@@ -66 +66 @@
     }
 
-    Vector4f operator*(float op2) const
+    Vector4f operator*(double op2) const
     {
         return Vector4f(x * op2, y * op2, z * op2, w * op2);
     }
 
-    Vector4f operator/(float op2) const
+    Vector4f operator/(double op2) const
     {
         return Vector4f(x / op2, y / op2, z / op2, w / op2);
@@ -78 +78 @@
     void divideByW();
 
-    float dot(const Vector4f& vec) const;
+    double dot(const Vector4f& vec) const;
 
     union {
@@ -122 +122 @@
 }
 
-inline float Vector4f::dot(const Vector4f& v) const
+inline double Vector4f::dot(const Vector4f& v) const
 {
-    return (x * v.x + y * v.y + z * v.z + w * v.w);
+    return ((double)x * v.x + (double)y * v.y + (double)z * v.z + (double)w * v.w);
 }
 

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

@@ -164 +164 @@
         return false;
 
-    if (vtkUnstructuredGrid::SafeDownCast(_dataSet) != NULL) {
+    if (vtkUnstructuredGrid::SafeDownCast(_dataSet) != NULL && !isCloud()) {
         vtkSmartPointer<vtkExtractUnstructuredGrid> filter = vtkSmartPointer<vtkExtractUnstructuredGrid>::New();
 #ifdef USE_VTK6

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

@@ -147 +147 @@
                 Molecule.cpp \
                 Outline.cpp \
+                Parallelepiped.cpp \
                 PolyData.cpp \
                 Polygon.cpp \
@@ -230 +231 @@
 Molecule.o: Molecule.h MoleculeData.h GraphicsObject.h DataSet.h Renderer.h ColorMap.h Trace.h
 Outline.o: Outline.h GraphicsObject.h DataSet.h Trace.h
+Parallelepiped.o: Parallelepiped.h Shape.h GraphicsObject.h DataSet.h Renderer.h Trace.h
 PolyData.o: PolyData.h GraphicsObject.h DataSet.h Renderer.h Trace.h
 Polygon.o: Polygon.h Shape.h GraphicsObject.h DataSet.h Renderer.h Trace.h
@@ -235 +237 @@
 PseudoColor.o: PseudoColor.h GraphicsObject.h DataSet.h Renderer.h ColorMap.h Trace.h
 ReadBuffer.o: ReadBuffer.h Trace.h
-Renderer.o: Renderer.h RendererGraphicsObjs.h vtkRpCubeAxesActor.h vtkRpAxisFollower.h vtkRpAxisActor.h Math.h DataSet.h Arc.h Arrow.h Box.h Cone.h Contour2D.h Contour3D.h Cutplane.h Cylinder.h Disk.h Glyphs.h Group.h HeightMap.h Image.h LIC.h Line.h Molecule.h Outline.h PolyData.h Polygon.h PseudoColor.h Sphere.h Streamlines.h Text3D.h Volume.h Warp.h ColorMap.h Trace.h
-RendererCmd.o: Renderer.h RendererGraphicsObjs.h vtkRpCubeAxesActor.h vtkRpAxisFollower.h vtkRpAxisActor.h DataSet.h Arc.h Arrow.h Box.h Cone.h Contour2D.h Contour3D.h Cutplane.h Cylinder.h Disk.h Glyphs.h Group.h HeightMap.h Image.h LIC.h Line.h Molecule.h Outline.h PolyData.h Polygon.h PseudoColor.h Sphere.h Streamlines.h Text3D.h Volume.h Warp.h ColorMap.h ReadBuffer.h ResponseQueue.h Trace.h CmdProc.h PPMWriter.h TGAWriter.h
-RendererGraphicsObjs.o: Renderer.h RendererGraphicsObjs.h DataSet.h Arc.h Arrow.h Box.h Cone.h Contour2D.h Contour3D.h Cutplane.h Cylinder.h Disk.h Glyphs.h Group.h HeightMap.h Image.h LIC.h Line.h Molecule.h Outline.h PolyData.h Polygon.h PseudoColor.h Sphere.h Streamlines.h Text3D.h Volume.h Warp.h ColorMap.h Trace.h
+Renderer.o: Renderer.h RendererGraphicsObjs.h vtkRpCubeAxesActor.h vtkRpAxisFollower.h vtkRpAxisActor.h Math.h DataSet.h Arc.h Arrow.h Box.h Cone.h Contour2D.h Contour3D.h Cutplane.h Cylinder.h Disk.h Glyphs.h Group.h HeightMap.h Image.h LIC.h Line.h Molecule.h Outline.h Parallelepiped.h PolyData.h Polygon.h PseudoColor.h Sphere.h Streamlines.h Text3D.h Volume.h Warp.h ColorMap.h Trace.h
+RendererCmd.o: Renderer.h RendererGraphicsObjs.h vtkRpCubeAxesActor.h vtkRpAxisFollower.h vtkRpAxisActor.h DataSet.h Arc.h Arrow.h Box.h Cone.h Contour2D.h Contour3D.h Cutplane.h Cylinder.h Disk.h Glyphs.h Group.h HeightMap.h Image.h LIC.h Line.h Molecule.h Outline.h Parallelepiped.h PolyData.h Polygon.h PseudoColor.h Sphere.h Streamlines.h Text3D.h Volume.h Warp.h ColorMap.h ReadBuffer.h ResponseQueue.h Trace.h CmdProc.h PPMWriter.h TGAWriter.h
+RendererGraphicsObjs.o: Renderer.h RendererGraphicsObjs.h DataSet.h Arc.h Arrow.h Box.h Cone.h Contour2D.h Contour3D.h Cutplane.h Cylinder.h Disk.h Glyphs.h Group.h HeightMap.h Image.h LIC.h Line.h Molecule.h Outline.h Parallelepiped.h PolyData.h Polygon.h PseudoColor.h Sphere.h Streamlines.h Text3D.h Volume.h Warp.h ColorMap.h Trace.h
 RenderServer.o: RenderServer.h RendererCmd.h Renderer.h vtkRpCubeAxesActor.h vtkRpAxisFollower.h vtkRpAxisActor.h ReadBuffer.h ResponseQueue.h Trace.h PPMWriter.h TGAWriter.h
 ResponseQueue.o: ResponseQueue.h Trace.h

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

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

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

@@ -197 +197 @@
     deleteAllGraphicsObjects<Molecule>();
     deleteAllGraphicsObjects<Outline>();
+    deleteAllGraphicsObjects<Parallelepiped>();
     deleteAllGraphicsObjects<PolyData>();
     deleteAllGraphicsObjects<Polygon>();
@@ -382 +383 @@
     bool needRangeUpdate = false;
     do {
-        if (strcmp(itr->second->getActiveScalarsName(), scalarName) != 0) {
+        const char *name = itr->second->getActiveScalarsName();
+        if (name == NULL || (strcmp(name, scalarName) != 0)) {
             if (!itr->second->setActiveScalars(scalarName)) {
                 ret = false;
@@ -2436 +2438 @@
     setGraphicsObjectAspect<Molecule>(aspectRatio);
     setGraphicsObjectAspect<Outline>(aspectRatio);
+    setGraphicsObjectAspect<Parallelepiped>(aspectRatio);
     setGraphicsObjectAspect<PolyData>(aspectRatio);
     setGraphicsObjectAspect<Polygon>(aspectRatio);
@@ -3357 +3360 @@
     mergeGraphicsObjectBounds<Molecule>(bounds, onlyVisible);
     mergeGraphicsObjectBounds<Outline>(bounds, onlyVisible);
+    mergeGraphicsObjectBounds<Parallelepiped>(bounds, onlyVisible);
     mergeGraphicsObjectBounds<PolyData>(bounds, onlyVisible);
     mergeGraphicsObjectBounds<Polygon>(bounds, onlyVisible);
@@ -3429 +3433 @@
     mergeGraphicsObjectUnscaledBounds<Outline>(bounds, onlyVisible);
     mergeGraphicsObjectUnscaledBounds<PolyData>(bounds, onlyVisible);
+    mergeGraphicsObjectUnscaledBounds<Parallelepiped>(bounds, onlyVisible);
     mergeGraphicsObjectUnscaledBounds<Polygon>(bounds, onlyVisible);
     mergeGraphicsObjectUnscaledBounds<PseudoColor>(bounds, onlyVisible);
@@ -4577 +4582 @@
     setGraphicsObjectClippingPlanes<Molecule>(_activeClipPlanes);
     setGraphicsObjectClippingPlanes<Outline>(_activeClipPlanes);
+    setGraphicsObjectClippingPlanes<Parallelepiped>(_activeClipPlanes);
     setGraphicsObjectClippingPlanes<PolyData>(_activeClipPlanes);
     setGraphicsObjectClippingPlanes<Polygon>(_activeClipPlanes);

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

@@ -45 +45 @@
 #include "Molecule.h"
 #include "Outline.h"
+#include "Parallelepiped.h"
 #include "PolyData.h"
 #include "Polygon.h"
@@ -809 +810 @@
                               const char *name, double range[2] = NULL);
 
-    // N-sided Regular Polygons
-
-    bool addPolygon(const DataSetId& id, int numSides, double center[3], double normal[3], double radius);
+    // Parallelepipeds
+
+    bool addParallelepiped(const DataSetId& id, double vec1[3], double vec2[3], double vec3[3],
+                           bool flipNormals = false);
 
     // PolyData meshes
@@ -826 +828 @@
                               DataSet::DataAttributeType type,
                               const char *name, double range[2] = NULL);
+
+    // N-sided Regular Polygons
+
+    bool addPolygon(const DataSetId& id, int numSides, double center[3], double normal[3], double radius);
 
     // Color-mapped surfaces
@@ -975 +981 @@
     typedef std::tr1::unordered_map<DataSetId, Molecule *> MoleculeHashmap;
     typedef std::tr1::unordered_map<DataSetId, Outline *> OutlineHashmap;
+    typedef std::tr1::unordered_map<DataSetId, Parallelepiped *> ParallelepipedHashmap;
     typedef std::tr1::unordered_map<DataSetId, PolyData *> PolyDataHashmap;
     typedef std::tr1::unordered_map<DataSetId, Polygon *> PolygonHashmap;
@@ -1114 +1121 @@
     MoleculeHashmap _molecules;
     OutlineHashmap _outlines;
+    ParallelepipedHashmap _parallelepipeds;
     PolyDataHashmap _polyDatas;
     PolygonHashmap _polygons;

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

@@ -1317 +1317 @@
 {
     const char *title = Tcl_GetString(objv[3]);
-    if (strlen(title) > 30) {
+    if (strlen(title) > 60) {
         Tcl_AppendResult(interp, "axis name \"", title,
                          "\" is too long", (char*)NULL);
@@ -1601 +1601 @@
 {
     const char *units = Tcl_GetString(objv[3]);
-    if (strlen(units) > 10) {
+    if (strlen(units) > 20) {
         Tcl_AppendResult(interp, "axis units name \"", units,
                          "\" is too long", (char*)NULL);
@@ -8559 +8559 @@
 
 static int
+ParallelepipedAddOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                    Tcl_Obj *const *objv)
+{
+    double vec1[3], vec2[3], vec3[3];
+    if (Tcl_GetDoubleFromObj(interp, objv[2], &vec1[0]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[3], &vec1[1]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[4], &vec1[2]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[5], &vec2[0]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[6], &vec2[1]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[7], &vec2[2]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[8], &vec3[0]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[9], &vec3[1]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[10], &vec3[2]) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    const char *name = Tcl_GetString(objv[11]);
+    if (!g_renderer->addParallelepiped(name, vec1, vec2, vec3)) {
+        Tcl_AppendResult(interp, "Failed to create parallelepiped", (char*)NULL);
+        return TCL_ERROR;
+    }
+    return TCL_OK;
+}
+
+static int
+ParallelepipedDeleteOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                       Tcl_Obj *const *objv)
+{
+    if (objc == 3) {
+        const char *name = Tcl_GetString(objv[2]);
+        g_renderer->deleteGraphicsObject<Parallelepiped>(name);
+    } else {
+        g_renderer->deleteGraphicsObject<Parallelepiped>("all");
+    }
+    return TCL_OK;
+}
+
+static int
+ParallelepipedColorOp(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->setGraphicsObjectColor<Parallelepiped>(name, color);
+    } else {
+        g_renderer->setGraphicsObjectColor<Parallelepiped>("all", color);
+    }
+    return TCL_OK;
+}
+
+static int
+ParallelepipedCullingOp(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->setGraphicsObjectCulling<Parallelepiped>(name, state);
+    } else {
+        g_renderer->setGraphicsObjectCulling<Parallelepiped>("all", state);
+    }
+    return TCL_OK;
+}
+
+static int
+ParallelepipedEdgeVisibilityOp(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->setGraphicsObjectEdgeVisibility<Parallelepiped>(name, state);
+    } else {
+        g_renderer->setGraphicsObjectEdgeVisibility<Parallelepiped>("all", state);
+    }
+    return TCL_OK;
+}
+
+static int
+ParallelepipedFlipNormalsOp(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->setGraphicsObjectFlipNormals<Parallelepiped>(name, state);
+    } else {
+        g_renderer->setGraphicsObjectFlipNormals<Parallelepiped>("all", state);
+    }
+    return TCL_OK;
+}
+
+static int
+ParallelepipedLightingOp(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->setGraphicsObjectLighting<Parallelepiped>(name, state);
+    } else {
+        g_renderer->setGraphicsObjectLighting<Parallelepiped>("all", state);
+    }
+    return TCL_OK;
+}
+
+static int
+ParallelepipedLineColorOp(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->setGraphicsObjectEdgeColor<Parallelepiped>(name, color);
+    } else {
+        g_renderer->setGraphicsObjectEdgeColor<Parallelepiped>("all", color);
+    }
+    return TCL_OK;
+}
+
+static int
+ParallelepipedLineWidthOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                          Tcl_Obj *const *objv)
+{
+    float width;
+    if (GetFloatFromObj(interp, objv[2], &width) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (objc == 4) {
+        const char *name = Tcl_GetString(objv[3]);
+        g_renderer->setGraphicsObjectEdgeWidth<Parallelepiped>(name, width);
+    } else {
+        g_renderer->setGraphicsObjectEdgeWidth<Parallelepiped>("all", width);
+    }
+    return TCL_OK;
+}
+
+static int
+ParallelepipedMaterialOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                         Tcl_Obj *const *objv)
+{
+    double ambient, diffuse, specCoeff, specPower;
+    if (Tcl_GetDoubleFromObj(interp, objv[2], &ambient) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[3], &diffuse) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[4], &specCoeff) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[5], &specPower) != TCL_OK) {
+        return TCL_ERROR;
+    }
+
+    if (objc == 7) {
+        const char *name = Tcl_GetString(objv[6]);
+        g_renderer->setGraphicsObjectAmbient<Parallelepiped>(name, ambient);
+        g_renderer->setGraphicsObjectDiffuse<Parallelepiped>(name, diffuse);
+        g_renderer->setGraphicsObjectSpecular<Parallelepiped>(name, specCoeff, specPower);
+    } else {
+        g_renderer->setGraphicsObjectAmbient<Parallelepiped>("all", ambient);
+        g_renderer->setGraphicsObjectDiffuse<Parallelepiped>("all", diffuse);
+        g_renderer->setGraphicsObjectSpecular<Parallelepiped>("all", specCoeff, specPower);
+    }
+    return TCL_OK;
+}
+
+static int
+ParallelepipedOpacityOp(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->setGraphicsObjectOpacity<Parallelepiped>(name, opacity);
+    } else {
+        g_renderer->setGraphicsObjectOpacity<Parallelepiped>("all", opacity);
+    }
+    return TCL_OK;
+}
+
+static int
+ParallelepipedOrientOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                       Tcl_Obj *const *objv)
+{
+    double quat[4];
+    if (Tcl_GetDoubleFromObj(interp, objv[2], &quat[0]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[3], &quat[1]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[4], &quat[2]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[5], &quat[3]) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (objc == 7) {
+        const char *name = Tcl_GetString(objv[6]);
+        g_renderer->setGraphicsObjectOrientation<Parallelepiped>(name, quat);
+    } else {
+        g_renderer->setGraphicsObjectOrientation<Parallelepiped>("all", quat);
+    }
+    return TCL_OK;
+}
+
+static int
+ParallelepipedOriginOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                       Tcl_Obj *const *objv)
+{
+    double origin[3];
+    if (Tcl_GetDoubleFromObj(interp, objv[2], &origin[0]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[3], &origin[1]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[4], &origin[2]) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (objc == 6) {
+        const char *name = Tcl_GetString(objv[5]);
+        g_renderer->setGraphicsObjectOrigin<Parallelepiped>(name, origin);
+    } else {
+        g_renderer->setGraphicsObjectOrigin<Parallelepiped>("all", origin);
+    }
+    return TCL_OK;
+}
+
+static int
+ParallelepipedPositionOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                         Tcl_Obj *const *objv)
+{
+    double pos[3];
+    if (Tcl_GetDoubleFromObj(interp, objv[2], &pos[0]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[3], &pos[1]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[4], &pos[2]) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (objc == 6) {
+        const char *name = Tcl_GetString(objv[5]);
+        g_renderer->setGraphicsObjectPosition<Parallelepiped>(name, pos);
+    } else {
+        g_renderer->setGraphicsObjectPosition<Parallelepiped>("all", pos);
+    }
+    return TCL_OK;
+}
+
+static int
+ParallelepipedScaleOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                      Tcl_Obj *const *objv)
+{
+    double scale[3];
+    if (Tcl_GetDoubleFromObj(interp, objv[2], &scale[0]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[3], &scale[1]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[4], &scale[2]) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (objc == 6) {
+        const char *name = Tcl_GetString(objv[5]);
+        g_renderer->setGraphicsObjectScale<Parallelepiped>(name, scale);
+    } else {
+        g_renderer->setGraphicsObjectScale<Parallelepiped>("all", scale);
+    }
+    return TCL_OK;
+}
+
+static int
+ParallelepipedShadingOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                        Tcl_Obj *const *objv)
+{
+    GraphicsObject::ShadingModel shadeModel;
+    const char *str = Tcl_GetString(objv[2]);
+    if (str[0] == 'f' && strcmp(str, "flat") == 0) {
+        shadeModel = GraphicsObject::SHADE_FLAT;
+    } else if (str[0] == 's' && strcmp(str, "smooth") == 0) {
+        shadeModel = GraphicsObject::SHADE_GOURAUD;
+    } else {
+         Tcl_AppendResult(interp, "bad shading option \"", str,
+                         "\": should be one of: 'flat', 'smooth'", (char*)NULL);
+        return TCL_ERROR;
+    }
+    if (objc == 4) {
+        const char *name = Tcl_GetString(objv[3]);
+        g_renderer->setGraphicsObjectShadingModel<Parallelepiped>(name, shadeModel);
+    } else {
+        g_renderer->setGraphicsObjectShadingModel<Parallelepiped>("all", shadeModel);
+    }
+    return TCL_OK;
+}
+
+static int
+ParallelepipedVisibleOp(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->setGraphicsObjectVisibility<Parallelepiped>(name, state);
+    } else {
+        g_renderer->setGraphicsObjectVisibility<Parallelepiped>("all", state);
+    }
+    return TCL_OK;
+}
+
+static int
+ParallelepipedWireframeOp(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->setGraphicsObjectWireframe<Parallelepiped>(name, state);
+    } else {
+        g_renderer->setGraphicsObjectWireframe<Parallelepiped>("all", state);
+    }
+    return TCL_OK;
+}
+
+static Rappture::CmdSpec parallelepipedOps[] = {
+    {"add",       1, ParallelepipedAddOp, 12, 12, "v0x v0y v0z v1x v1y v1z v2x v2y v2z name"},
+    {"color",     2, ParallelepipedColorOp, 5, 6, "r g b ?name?"},
+    {"culling",   2, ParallelepipedCullingOp, 3, 4, "bool ?name?"},
+    {"delete",    1, ParallelepipedDeleteOp, 2, 3, "?name?"},
+    {"edges",     1, ParallelepipedEdgeVisibilityOp, 3, 4, "bool ?name?"},
+    {"flipnorms", 1, ParallelepipedFlipNormalsOp, 3, 4, "bool ?name?"},
+    {"lighting",  3, ParallelepipedLightingOp, 3, 4, "bool ?name?"},
+    {"linecolor", 5, ParallelepipedLineColorOp, 5, 6, "r g b ?name?"},
+    {"linewidth", 5, ParallelepipedLineWidthOp, 3, 4, "width ?name?"},
+    {"material",  1, ParallelepipedMaterialOp, 6, 7, "ambientCoeff diffuseCoeff specularCoeff specularPower ?name?"},
+    {"opacity",   2, ParallelepipedOpacityOp, 3, 4, "value ?name?"},
+    {"orient",    4, ParallelepipedOrientOp, 6, 7, "qw qx qy qz ?name?"},
+    {"origin",    4, ParallelepipedOriginOp, 5, 6, "x y z ?name?"},
+    {"pos",       1, ParallelepipedPositionOp, 5, 6, "x y z ?name?"},
+    {"scale",     2, ParallelepipedScaleOp, 5, 6, "sx sy sz ?name?"},
+    {"shading",   2, ParallelepipedShadingOp, 3, 4, "val ?name?"},
+    {"visible",   1, ParallelepipedVisibleOp, 3, 4, "bool ?name?"},
+    {"wireframe", 1, ParallelepipedWireframeOp, 3, 4, "bool ?name?"}
+};
+static int nParallelepipedOps = NumCmdSpecs(parallelepipedOps);
+
+static int
+ParallelepipedCmd(ClientData clientData, Tcl_Interp *interp, int objc, 
+       Tcl_Obj *const *objv)
+{
+    Tcl_ObjCmdProc *proc;
+
+    proc = Rappture::GetOpFromObj(interp, nParallelepipedOps, parallelepipedOps,
+                                  Rappture::CMDSPEC_ARG1, objc, objv, 0);
+    if (proc == NULL) {
+        return TCL_ERROR;
+    }
+    return (*proc) (clientData, interp, objc, objv);
+}
+
+static int
 PolyDataAddOp(ClientData clientData, Tcl_Interp *interp, int objc, 
               Tcl_Obj *const *objv)
@@ -12228 +12601 @@
 {
     Tcl_MakeSafe(interp);
-    Tcl_CreateObjCommand(interp, "arc",         ArcCmd,         clientData, NULL);
-    Tcl_CreateObjCommand(interp, "arrow",       ArrowCmd,       clientData, NULL);
-    Tcl_CreateObjCommand(interp, "axis",        AxisCmd,        clientData, NULL);
-    Tcl_CreateObjCommand(interp, "box",         BoxCmd,         clientData, NULL);
-    Tcl_CreateObjCommand(interp, "camera",      CameraCmd,      clientData, NULL);
-    Tcl_CreateObjCommand(interp, "clientinfo",  ClientInfoCmd,  clientData, NULL);
-    Tcl_CreateObjCommand(interp, "colormap",    ColorMapCmd,    clientData, NULL);
-    Tcl_CreateObjCommand(interp, "cone",        ConeCmd,        clientData, NULL);
-    Tcl_CreateObjCommand(interp, "contour2d",   Contour2DCmd,   clientData, NULL);
-    Tcl_CreateObjCommand(interp, "contour3d",   Contour3DCmd,   clientData, NULL);
-    Tcl_CreateObjCommand(interp, "cutplane",    CutplaneCmd,    clientData, NULL);
-    Tcl_CreateObjCommand(interp, "cylinder",    CylinderCmd,    clientData, NULL);
-    Tcl_CreateObjCommand(interp, "dataset",     DataSetCmd,     clientData, NULL);
-    Tcl_CreateObjCommand(interp, "disk",        DiskCmd,        clientData, NULL);
-    Tcl_CreateObjCommand(interp, "glyphs",      GlyphsCmd,      clientData, NULL);
-    Tcl_CreateObjCommand(interp, "group",       GroupCmd,       clientData, NULL);
-    Tcl_CreateObjCommand(interp, "heightmap",   HeightMapCmd,   clientData, NULL);
-    Tcl_CreateObjCommand(interp, "image",       ImageCmd,       clientData, NULL);
-    Tcl_CreateObjCommand(interp, "imgflush",    ImageFlushCmd,  clientData, NULL);
-    Tcl_CreateObjCommand(interp, "legend",      LegendCmd,      clientData, NULL);
-    Tcl_CreateObjCommand(interp, "legend2",     LegendSimpleCmd,clientData, NULL);
-    Tcl_CreateObjCommand(interp, "lic",         LICCmd,         clientData, NULL);
-    Tcl_CreateObjCommand(interp, "line",        LineCmd,        clientData, NULL);
-    Tcl_CreateObjCommand(interp, "molecule",    MoleculeCmd,    clientData, NULL);
-    Tcl_CreateObjCommand(interp, "outline",     OutlineCmd,     clientData, NULL);
-    Tcl_CreateObjCommand(interp, "polydata",    PolyDataCmd,    clientData, NULL);
-    Tcl_CreateObjCommand(interp, "polygon",     PolygonCmd,     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, "sphere",      SphereCmd,      clientData, NULL);
-    Tcl_CreateObjCommand(interp, "streamlines", StreamlinesCmd, clientData, NULL);
-    Tcl_CreateObjCommand(interp, "text3d",      Text3DCmd,      clientData, NULL);
-    Tcl_CreateObjCommand(interp, "volume",      VolumeCmd,      clientData, NULL);
-    Tcl_CreateObjCommand(interp, "warp",        WarpCmd,        clientData, NULL);
+    Tcl_CreateObjCommand(interp, "arc",            ArcCmd,            clientData, NULL);
+    Tcl_CreateObjCommand(interp, "arrow",          ArrowCmd,          clientData, NULL);
+    Tcl_CreateObjCommand(interp, "axis",           AxisCmd,           clientData, NULL);
+    Tcl_CreateObjCommand(interp, "box",            BoxCmd,            clientData, NULL);
+    Tcl_CreateObjCommand(interp, "camera",         CameraCmd,         clientData, NULL);
+    Tcl_CreateObjCommand(interp, "clientinfo",     ClientInfoCmd,     clientData, NULL);
+    Tcl_CreateObjCommand(interp, "colormap",       ColorMapCmd,       clientData, NULL);
+    Tcl_CreateObjCommand(interp, "cone",           ConeCmd,           clientData, NULL);
+    Tcl_CreateObjCommand(interp, "contour2d",      Contour2DCmd,      clientData, NULL);
+    Tcl_CreateObjCommand(interp, "contour3d",      Contour3DCmd,      clientData, NULL);
+    Tcl_CreateObjCommand(interp, "cutplane",       CutplaneCmd,       clientData, NULL);
+    Tcl_CreateObjCommand(interp, "cylinder",       CylinderCmd,       clientData, NULL);
+    Tcl_CreateObjCommand(interp, "dataset",        DataSetCmd,        clientData, NULL);
+    Tcl_CreateObjCommand(interp, "disk",           DiskCmd,           clientData, NULL);
+    Tcl_CreateObjCommand(interp, "glyphs",         GlyphsCmd,         clientData, NULL);
+    Tcl_CreateObjCommand(interp, "group",          GroupCmd,          clientData, NULL);
+    Tcl_CreateObjCommand(interp, "heightmap",      HeightMapCmd,      clientData, NULL);
+    Tcl_CreateObjCommand(interp, "image",          ImageCmd,          clientData, NULL);
+    Tcl_CreateObjCommand(interp, "imgflush",       ImageFlushCmd,     clientData, NULL);
+    Tcl_CreateObjCommand(interp, "legend",         LegendCmd,         clientData, NULL);
+    Tcl_CreateObjCommand(interp, "legend2",        LegendSimpleCmd,   clientData, NULL);
+    Tcl_CreateObjCommand(interp, "lic",            LICCmd,            clientData, NULL);
+    Tcl_CreateObjCommand(interp, "line",           LineCmd,           clientData, NULL);
+    Tcl_CreateObjCommand(interp, "molecule",       MoleculeCmd,       clientData, NULL);
+    Tcl_CreateObjCommand(interp, "outline",        OutlineCmd,        clientData, NULL);
+    Tcl_CreateObjCommand(interp, "parallelepiped", ParallelepipedCmd, clientData, NULL);
+    Tcl_CreateObjCommand(interp, "polydata",       PolyDataCmd,       clientData, NULL);
+    Tcl_CreateObjCommand(interp, "polygon",        PolygonCmd,        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, "sphere",         SphereCmd,         clientData, NULL);
+    Tcl_CreateObjCommand(interp, "streamlines",    StreamlinesCmd,    clientData, NULL);
+    Tcl_CreateObjCommand(interp, "text3d",         Text3DCmd,         clientData, NULL);
+    Tcl_CreateObjCommand(interp, "volume",         VolumeCmd,         clientData, NULL);
+    Tcl_CreateObjCommand(interp, "warp",           WarpCmd,           clientData, NULL);
 }
 
@@ -12295 +12669 @@
     Tcl_DeleteCommand(interp, "molecule");
     Tcl_DeleteCommand(interp, "outline");
+    Tcl_DeleteCommand(interp, "parallelepiped");
     Tcl_DeleteCommand(interp, "polydata");
     Tcl_DeleteCommand(interp, "polygon");

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

@@ -28 +28 @@
 #include "Line.h"
 #include "Molecule.h"
+#include "Parallelepiped.h"
 #include "PolyData.h"
 #include "PseudoColor.h"
@@ -123 +124 @@
 Renderer::getGraphicsObjectHashmap<Outline>()
 { return _outlines; }
+
+template<>
+Renderer::ParallelepipedHashmap &
+Renderer::getGraphicsObjectHashmap<Parallelepiped>()
+{ return _parallelepipeds; }
 
 template<>
@@ -173 +179 @@
 template Group *Renderer::getGraphicsObject(const DataSetId&);
 template Line *Renderer::getGraphicsObject(const DataSetId&);
+template Parallelepiped *Renderer::getGraphicsObject(const DataSetId&);
 template Polygon *Renderer::getGraphicsObject(const DataSetId&);
 template Sphere *Renderer::getGraphicsObject(const DataSetId&);
@@ -287 +294 @@
     }
     if ((gobj = getGraphicsObject<Line>(id)) != NULL) {
+        return gobj;
+    }
+    if ((gobj = getGraphicsObject<Parallelepiped>(id)) != NULL) {
         return gobj;
     }
@@ -2938 +2948 @@
 
 /**
+ * \brief Create a new Parallelepiped and associate it with an ID
+ */
+bool Renderer::addParallelepiped(const DataSetId& id,
+                                 double vec1[3], double vec2[3], double vec3[3],
+                                 bool flipNormals)
+{
+    Parallelepiped *gobj;
+    if ((gobj = getGraphicsObject<Parallelepiped>(id)) != NULL) {
+        WARN("Replacing existing %s %s", gobj->getClassName(), id.c_str());
+        deleteGraphicsObject<Parallelepiped>(id);
+    }
+
+    gobj = new Parallelepiped();
+ 
+    gobj->setDataSet(NULL, this);
+
+    if (gobj->getProp() == NULL &&
+        gobj->getOverlayProp() == NULL) {
+        delete gobj;
+        return false;
+    } else {
+        if (gobj->getProp())
+            _renderer->AddViewProp(gobj->getProp());
+        if (gobj->getOverlayProp())
+            _renderer->AddViewProp(gobj->getOverlayProp());
+    }
+
+    gobj->setVectors(vec1, vec2, vec3);
+    if (flipNormals)
+        gobj->flipNormals(flipNormals);
+
+    getGraphicsObjectHashmap<Parallelepiped>()[id] = gobj;
+
+    sceneBoundsChanged();
+    _needsRedraw = true;
+    return true;
+}
+
+/**
  * \brief Create a new n-sided regular Polygon and associate it with an ID
  */

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

@@ -14 +14 @@
 #include <vtkGPUVolumeRayCastMapper.h>
 #include <vtkVolumeTextureMapper3D.h>
+#include <vtkRectilinearGrid.h>
+#include <vtkStructuredGrid.h>
 #include <vtkUnstructuredGrid.h>
 #include <vtkPolyData.h>
@@ -121 +123 @@
 #endif
         vtkVolumeMapper::SafeDownCast(_volumeMapper)->SetBlendModeToComposite();
-    } else if (_dataSet->isCloud()) {
-        // DataSet is a 3D point cloud
+    } else if (_dataSet->isCloud() ||
+               vtkUnstructuredGrid::SafeDownCast(ds) == NULL) {
+        // DataSet is a 3D point cloud, rectilinear grid or structured grid
         vtkSmartPointer<vtkGaussianSplatter> splatter = vtkSmartPointer<vtkGaussianSplatter>::New();
 #ifdef USE_VTK6
@@ -131 +134 @@
         int dims[3];
         dims[0] = dims[1] = dims[2] = 64;
-        TRACE("Generating volume with dims (%d,%d,%d) from point cloud",
-              dims[0], dims[1], dims[2]);
+        if (vtkStructuredGrid::SafeDownCast(ds) != NULL) {
+            vtkStructuredGrid::SafeDownCast(ds)->GetDimensions(dims);
+        } else if (vtkRectilinearGrid::SafeDownCast(ds) != NULL) {
+            vtkRectilinearGrid::SafeDownCast(ds)->GetDimensions(dims);
+        }
+        TRACE("Generating volume with dims (%d,%d,%d) from %d points",
+              dims[0], dims[1], dims[2], ds->GetNumberOfPoints());
         splatter->SetSampleDimensions(dims);
         splatter->Update();
@@ -144 +152 @@
         _volumeMapper->SetInputConnection(splatter->GetOutputPort());
         vtkVolumeMapper::SafeDownCast(_volumeMapper)->SetBlendModeToComposite();
-    } else if (vtkUnstructuredGrid::SafeDownCast(ds) != NULL) {
+    } else {
         // Unstructured grid with cells (not a cloud)
         vtkUnstructuredGrid *ugrid = vtkUnstructuredGrid::SafeDownCast(ds);
+        assert(ugrid != NULL);
         // DataSet is unstructured grid
         // Only works if cells are all tetrahedra
@@ -177 +186 @@
         vtkUnstructuredGridVolumeMapper::SafeDownCast(_volumeMapper)->
             SetBlendModeToComposite();
-    } else {
-        ERROR("Unsupported DataSet type: %s", _dataSet->getVtkType());
-        _dataSet = NULL;
-        return;
     }
 

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

@@ -685 +685 @@
 outline scale <sx> <sy> <sz> <?datasetName?>
 outline visible <bool> <?datasetName?>
+
+parallelepiped add <v0x> <v0y> <v0z> <v1x> <v1y> <v1z> <v2x> <v2y> <v2z> <name>
+               Specify parallelepiped using 3 basis vectors.  The 3 vectors should
+               be given in order to create a right-handed coordinate system, i.e.
+               (v0 cross v1) dot v2 should be positive.
+parallelepiped color <r> <g> <b> <?name?>
+parallelepiped culling <bool> <?name?>
+parallelepiped delete <?name?>
+parallelepiped edges <bool> <?name?>
+parallelepiped flipnorm <bool> <?name?>
+parallelepiped lighting <bool> <?name?>
+parallelepiped linecolor <r> <g> <b> <?name?>
+parallelepiped linewidth <val> <?name?>
+parallelepiped material <ambientCoeff> <diffuseCoeff> <specularCoeff> <specularExp> <?name?>
+parallelepiped opacity <val> <?name?>
+parallelepiped orient <qw> <qx> <qy> <qz> <?name?>
+parallelepiped origin <x> <y> <z> <?name?>
+parallelepiped pos <x> <y> <z> <?name?>
+parallelepiped scale <sx> <sy> <sz> <?name?>
+parallelepiped shading <val> <?name?>
+               val = flat|smooth
+parallelepiped visible <bool> <?name?>
+parallelepiped wireframe <bool> <?name?>
 
 polydata add <?datasetName?>