Changeset 4234

Timestamp:

Mar 11, 2014 11:24:01 AM (10 years ago)

Author:

ldelgass

Message:

merge r3978:3983 from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• packages/vizservers/vtkvis/ColorMap.cpp (modified) (6 diffs)
• packages/vizservers/vtkvis/ColorMap.h (modified) (2 diffs)
• packages/vizservers/vtkvis/Image.cpp (modified) (4 diffs)
• packages/vizservers/vtkvis/Image.h (modified) (3 diffs)
• packages/vizservers/vtkvis/RendererCmd.cpp (modified) (7 diffs)
• packages/vizservers/vtkvis/Volume.cpp (modified) (3 diffs)
• packages/vizservers/vtkvis/protocol.txt (modified) (1 diff)

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

@@ -37 +37 @@
 }
 
+ColorMap::ColorMap(const ColorMap& other) :
+    _name(other._name),
+    _controlPoints(other._controlPoints),
+    _opacityControlPoints(other._opacityControlPoints),
+    _needsBuild(other._needsBuild),
+    _numTableEntries(other._numTableEntries)
+{
+    _colorTF = vtkSmartPointer<vtkColorTransferFunction>::New();
+    _colorTF->ClampingOn();
+    _opacityTF = vtkSmartPointer<vtkPiecewiseFunction>::New();
+    _opacityTF->ClampingOn();
+    _colorTF->DeepCopy(other._colorTF);
+    _opacityTF->DeepCopy(other._opacityTF);
+    if (other._lookupTable != NULL) {
+        _lookupTable = vtkSmartPointer<vtkLookupTable>::New();
+        _lookupTable->DeepCopy(other._lookupTable);
+    }
+}
+
+ColorMap& ColorMap::operator=(const ColorMap& other)
+{
+    if (&other != this) {
+        _name = other._name;
+        _controlPoints = other._controlPoints;
+        _opacityControlPoints = other._opacityControlPoints;
+        _needsBuild = other._needsBuild;
+        _numTableEntries = other._numTableEntries;
+        _colorTF->DeepCopy(other._colorTF);
+        _opacityTF->DeepCopy(other._opacityTF);
+        if (other._lookupTable != NULL) {
+            _lookupTable = vtkSmartPointer<vtkLookupTable>::New();
+            _lookupTable->DeepCopy(other._lookupTable);
+        }
+    }
+    return *this;
+}
+
 ColorMap::~ColorMap()
 {
@@ -70 +107 @@
     for (int i = 0; i < _colorTF->GetSize(); i++) {
         _colorTF->GetNodeValue(i, tmp);
+        //TRACE("Norm: %d: %g %g,%g,%g", i, tmp[0], tmp[1], tmp[2], tmp[3]);
         tmp[0] = range[0] + tmp[0] * (range[1] - range[0]);
         tf->AddRGBPoint(tmp[0], tmp[1], tmp[2], tmp[3], tmp[4], tmp[5]);
+        //TRACE("New : %d: %g %g,%g,%g", i, tmp[0], tmp[1], tmp[2], tmp[3]);
     }
     return tf;
@@ -81 +120 @@
  */
 vtkSmartPointer<vtkPiecewiseFunction>
-ColorMap::getOpacityTransferFunction(double range[2])
+ColorMap::getOpacityTransferFunction(double range[2], double opacityScale)
 {
     vtkSmartPointer<vtkPiecewiseFunction> tf = vtkSmartPointer<vtkPiecewiseFunction>::New();
@@ -87 +126 @@
     for (int i = 0; i < _opacityTF->GetSize(); i++) {
         _opacityTF->GetNodeValue(i, tmp);
+        //TRACE("Norm: %d: %g %g", i, tmp[0], tmp[1]);
         tmp[0] = range[0] + tmp[0] * (range[1] - range[0]);
+        if (opacityScale < 1.0) {
+            tmp[1] *= opacityScale;
+        }
         tf->AddPoint(tmp[0], tmp[1], tmp[2], tmp[3]);
+        //TRACE("New : %d: %g %g", i, tmp[0], tmp[1]);
     }
     return tf;
@@ -106 +150 @@
 
 #ifdef DEBUG
-    TRACE("New control point: %g  = %g %g %g",
+    TRACE("New control point: %g = %g %g %g",
           cp.value, cp.color[0], cp.color[1], cp.color[2]);
 #endif
@@ -137 +181 @@
 
 #ifdef DEBUG
-    TRACE("New opacity control point: %g  = %g",
+    TRACE("New opacity control point: %g = %g",
           cp.value, cp.alpha);
 #endif

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

@@ -83 +83 @@
 
     ColorMap(const std::string& name);
+
+    ColorMap(const ColorMap& other);
+
+    ColorMap& operator=(const ColorMap& other);
+
     virtual ~ColorMap();
 
@@ -91 +96 @@
     vtkSmartPointer<vtkColorTransferFunction> getColorTransferFunction(double range[2]);
 
-    vtkSmartPointer<vtkPiecewiseFunction> getOpacityTransferFunction(double range[2]);
+    vtkSmartPointer<vtkPiecewiseFunction> getOpacityTransferFunction(double range[2], double opacityScale = 1.0);
 
     void setNumberOfTableEntries(int numEntries);

branches/1.3/packages/vizservers/vtkvis/Image.cpp

@@ -9 +9 @@
 #include <vtkImageData.h>
 #include <vtkImageActor.h>
+#include <vtkImageSlice.h>
 #include <vtkImageProperty.h>
 #include <vtkImageMapper3D.h>
+#include <vtkImageResliceMapper.h>
 #include <vtkLookupTable.h>
 
@@ -17 +19 @@
 
 using namespace VtkVis;
+
+#define USE_RESLICE_MAPPER
 
 Image::Image() :
@@ -32 +36 @@
 {
     if (_prop == NULL) {
+#ifdef USE_RESLICE_MAPPER
+        _prop = vtkSmartPointer<vtkImageSlice>::New();
+#else
         _prop = vtkSmartPointer<vtkImageActor>::New();
+#endif
         vtkImageProperty *property = getImageProperty();
         property->SetInterpolationTypeToLinear();
@@ -64 +72 @@
 
     vtkImageActor *actor = getImageActor();
-    actor->SetInputData(imageData);
-    actor->InterpolateOn();
+    vtkImageMapper3D *mapper = getImageMapper();
+    if (mapper == NULL) {
+        TRACE("Creating mapper");
+        vtkSmartPointer<vtkImageResliceMapper> newMapper = vtkSmartPointer<vtkImageResliceMapper>::New();
+        getImageSlice()->SetMapper(newMapper);
+        mapper = getImageMapper();
+        assert(mapper != NULL);
+    }
+    if (actor != NULL) {
+        TRACE("Have actor");
+        actor->SetInputData(imageData);
+        actor->InterpolateOn();
+    } else {
+        TRACE("No actor");
+        mapper->SetInputData(imageData);
+    }
 
-    vtkImageMapper3D *mapper = getImageMapper();
+    mapper->SliceAtFocalPointOn();
+    mapper->SliceFacesCameraOn();
+
+    vtkImageResliceMapper *resliceMapper = getImageResliceMapper();
+    if (resliceMapper) {
+        TRACE("Mapper is a vtkImageResliceMapper");
+        resliceMapper->AutoAdjustImageQualityOff();
+        resliceMapper->ResampleToScreenPixelsOff();
+    } else {
+        TRACE("Mapper is a %s", mapper->GetClassName());
+    }
+
     mapper->Update();
 }

branches/1.3/packages/vizservers/vtkvis/Image.h

@@ -10 +10 @@
 
 #include <vtkSmartPointer.h>
+#include <vtkImageSlice.h>
 #include <vtkImageActor.h>
 #include <vtkImageMapper3D.h>
+#include <vtkImageResliceMapper.h>
+#include <vtkImageSliceMapper.h>
 #include <vtkLookupTable.h>
 #include <vtkPlaneCollection.h>
@@ -141 +144 @@
     vtkImageProperty *getImageProperty()
     {
-        if (getImageActor() != NULL) {
-            return getImageActor()->GetProperty();
+        if (getImageSlice() != NULL) {
+            return getImageSlice()->GetProperty();
         } else {
             return NULL;
@@ -150 +153 @@
     vtkImageMapper3D *getImageMapper()
     {
-        if (getImageActor() != NULL) {
-            return getImageActor()->GetMapper();
+        if (getImageSlice() != NULL) {
+            return getImageSlice()->GetMapper();
+        } else {
+            return NULL;
+        }
+    }
+
+    vtkImageResliceMapper *getImageResliceMapper()
+    {
+        if (getImageSlice() != NULL) {
+            return vtkImageResliceMapper::SafeDownCast(getImageSlice()->GetMapper());
+        } else {
+            return NULL;
+        }
+    }
+
+    vtkImageSliceMapper *getImageSliceMapper()
+    {
+        if (getImageSlice() != NULL) {
+            return vtkImageSliceMapper::SafeDownCast(getImageSlice()->GetMapper());
         } else {
             return NULL;

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

@@ -2509 +2509 @@
 static Rappture::CmdSpec colorMapOps[] = {
     {"add",    1, ColorMapAddOp,             5, 5, "colorMapName colormap alphamap"},
-    {"delete", 1, ColorMapDeleteOp,          2, 3, "?colorMapName?"},
+    {"define", 3, ColorMapAddOp,             5, 5, "colorMapName colormap alphamap"},
+    {"delete", 3, ColorMapDeleteOp,          2, 3, "?colorMapName?"},
     {"res",    1, ColorMapNumTableEntriesOp, 3, 4, "numTableEntries ?colorMapName?"}
 };
@@ -7165 +7166 @@
     range[1] = -DBL_MAX;
 
+    bool opaque = true;
+
     if (objc == 9) {
         const char *dataSetName = Tcl_GetString(objv[8]);
         if (!g_renderer->renderColorMap(colorMapName, dataSetName, legendType, fieldName, title,
-                                        range, width, height, true, numLabels, imgData)) {
+                                        range, width, height, opaque, numLabels, imgData)) {
             Tcl_AppendResult(interp, "Color map \"",
                              colorMapName, "\" or dataset \"",
@@ -7176 +7179 @@
     } else {
         if (!g_renderer->renderColorMap(colorMapName, "all", legendType, fieldName, title,
-                                        range, width, height, true, numLabels, imgData)) {
+                                        range, width, height, opaque, numLabels, imgData)) {
             Tcl_AppendResult(interp, "Color map \"",
                              colorMapName, "\" was not found", (char*)NULL);
@@ -7237 +7240 @@
         vtkSmartPointer<vtkUnsignedCharArray>::New();
 
-    if (!g_renderer->renderColorMap(colorMapName, width, height, true, imgData)) {
+    bool opaque = true;
+
+    if (!g_renderer->renderColorMap(colorMapName, width, height, opaque, imgData)) {
         Tcl_AppendResult(interp, "Color map \"",
                          colorMapName, "\" was not found", (char*)NULL);
@@ -7273 +7278 @@
 # endif // USE_THREADS
 #endif // DEBUG
+
     return TCL_OK;
 }
@@ -11936 +11942 @@
     double distance;
     double maxFactor = 4.0;
+#if 1
+    distance = 1.0 / (quality * (maxFactor - 1.0) + 1.0);
+#else
     if (quality >= 0.5) {
         distance = 1.0 / ((quality - 0.5) * (maxFactor - 1.0) * 2.0 + 1.0);
@@ -11941 +11950 @@
         distance = ((0.5 - quality) * (maxFactor - 1.0) * 2.0 + 1.0);
     }
+#endif
     if (objc == 4) {
         const char *name = Tcl_GetString(objv[3]);

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

@@ -213 +213 @@
     if (getVolume() != NULL) {
         getVolume()->GetProperty()->SetColor(_colorMap->getColorTransferFunction(_dataRange));
+#ifdef USE_GPU_RAYCAST_MAPPER
+        getVolume()->GetProperty()->SetScalarOpacity(_colorMap->getOpacityTransferFunction(_dataRange, _opacity));
+#else
         getVolume()->GetProperty()->SetScalarOpacity(_colorMap->getOpacityTransferFunction(_dataRange));
+#endif
     }
 }
@@ -234 +238 @@
     if (getVolume() != NULL) {
         getVolume()->GetProperty()->SetColor(_colorMap->getColorTransferFunction(_dataRange));
+#ifdef USE_GPU_RAYCAST_MAPPER
+        getVolume()->GetProperty()->SetScalarOpacity(_colorMap->getOpacityTransferFunction(_dataRange, _opacity));
+#else
         getVolume()->GetProperty()->SetScalarOpacity(_colorMap->getOpacityTransferFunction(_dataRange));
+#endif
     }
 }
@@ -256 +264 @@
     // 3D texture mapper, not the GPU raycast mapper
     if (getVolume() != NULL) {
+#ifdef USE_GPU_RAYCAST_MAPPER
+        getVolume()->GetProperty()->SetScalarOpacity(_colorMap->getOpacityTransferFunction(_dataRange, opacity));
+#else
         if (opacity < 1.0e-6)
             opacity = 1.0e-6;
         getVolume()->GetProperty()->SetScalarOpacityUnitDistance(1.0/opacity);
+#endif
     }
 }

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

@@ -189 +189 @@
 
 colormap add <colorMapName> <colorMap> <opacityMap>
+         (Re-)define a colormap.  If colorMapName doesn't exist, it is created,
+         otherwise the colormap is redefined and all users will be updated.
          colorMap = Tcl list of {value r g b} control points
          opacityMap = Tcl list of {value alpha} control points
+colormap define <colorMapName> <colorMap> <opacityMap>
+         (Re-)define a colormap (same as 'add')
 colormap delete <?colorMapName?>
 colormap res <numberOfTableEntries>