Changeset 4604 for vtkvis/branches/1.7

Timestamp:

Aug 2, 2014, 12:29:05 AM (10 years ago)

Author:

ldelgass

Message:

Merge r4073-4074,4077-4081 from trunk

Location:

vtkvis/branches/1.7

Files:

• . (modified) (1 prop)
• ColorMap.cpp (modified) (1 diff)
• ColorMap.h (modified) (2 diffs)
• Image.cpp (modified) (1 diff)
• Image.h (modified) (6 diffs)
• Makefile.in (modified) (2 diffs)
• Renderer.cpp (modified) (5 diffs)
• RendererCmd.cpp (modified) (2 diffs)
• RendererGraphicsObjs.cpp (modified) (1 diff)

vtkvis/branches/1.7/ColorMap.cpp

@@ -488 +488 @@
     return _elementDefault;
 }
+
+/**
+ * \brief Render (using CPU) color map to an image
+ */
+void ColorMap::renderColorMap(ColorMap *map, int width, int height,
+                              vtkUnsignedCharArray *imgData,
+                              bool opaque, float bgColor[3],
+                              bool bgr, int bytesPerPixel)
+{
+    int size = bytesPerPixel * width * height;
+    if (imgData->GetMaxId() + 1 != size) {
+        imgData->SetNumberOfComponents(bytesPerPixel);
+        imgData->SetNumberOfValues(size);
+    }
+    unsigned char *dst = imgData->GetPointer(0);
+    vtkLookupTable *table = map->getLookupTable();
+    if (height > width) {
+        for (int i = 0; i < height; i++) {
+            double x = (double)i/(height-1);
+            double rgb[3];
+            table->GetColor(x, rgb);
+            unsigned char color[3];
+            if (opaque) {
+                color[0] = (unsigned char)(255. * (bgr ? rgb[2] : rgb[0]));
+                color[1] = (unsigned char)(255. * rgb[1]);
+                color[2] = (unsigned char)(255. * (bgr ? rgb[0] : rgb[2]));
+            } else {
+                double opacity = table->GetOpacity(x);
+                color[0] = (unsigned char)(255. * (bgColor[0] * (1.0 - opacity) + (bgr ? rgb[2] : rgb[0]) * opacity));
+                color[1] = (unsigned char)(255. * (bgColor[1] * (1.0 - opacity) + rgb[1] * opacity));
+                color[2] = (unsigned char)(255. * (bgColor[2] * (1.0 - opacity) + (bgr ? rgb[0] : rgb[2]) * opacity));
+            }
+            for (int j = 0; j < width; j++) {
+                memcpy(dst, color, 3);
+                dst += 3;
+                if (bytesPerPixel == 4) {
+                    *(dst++) = (unsigned char)255.;
+                }
+            }
+        }
+    } else {
+        for (int i = 0; i < height; i++) {
+            for (int j = 0; j < width; j++) {
+                double x = (double)j/(width-1);
+                double rgb[3];
+                table->GetColor(x, rgb);
+                unsigned char color[3];
+                if (opaque) {
+                    color[0] = (unsigned char)(255. * (bgr ? rgb[2] : rgb[0]));
+                    color[1] = (unsigned char)(255. * rgb[1]);
+                    color[2] = (unsigned char)(255. * (bgr ? rgb[0] : rgb[2]));
+                } else {
+                    double opacity = table->GetOpacity(x);
+                    color[0] = (unsigned char)(255. * (bgColor[0] * (1.0 - opacity) + (bgr ? rgb[2] : rgb[0]) * opacity));
+                    color[1] = (unsigned char)(255. * (bgColor[1] * (1.0 - opacity) + rgb[1] * opacity));
+                    color[2] = (unsigned char)(255. * (bgColor[2] * (1.0 - opacity) + (bgr ? rgb[0] : rgb[2]) * opacity));
+                }
+                memcpy(dst, color, 3);
+                dst += 3;
+                if (bytesPerPixel == 4) {
+                    *(dst++) = (unsigned char)255.;
+                }
+            }
+        }
+    }
+}

vtkvis/branches/1.7/ColorMap.h

@@ -17 +17 @@
 #include <vtkPiecewiseFunction.h>
 #include <vtkLookupTable.h>
+#include <vtkUnsignedCharArray.h>
 
 namespace VtkVis {
@@ -115 +116 @@
     static ColorMap *getElementDefault();
 
+    static void renderColorMap(ColorMap *map, int width, int height,
+                               vtkUnsignedCharArray *imgData,
+                               bool opaque, float bgColor[3],
+                               bool bgr = false,
+                               int bytesPerPixel = 3);
+
 private:
     static ColorMap *_default;

vtkvis/branches/1.7/Image.cpp

@@ -148 +148 @@
 }
 
+void Image::setAspect(double aspect)
+{
+    double bounds[6];
+    vtkDataSet *ds = _dataSet->getVtkDataSet();
+    ds->GetBounds(bounds);
+    double size[3];
+    size[0] = bounds[1] - bounds[0];
+    size[1] = bounds[3] - bounds[2];
+    size[2] = bounds[5] - bounds[4];
+    double scale[3];
+    scale[0] = scale[1] = scale[2] = 1.;
+
+    vtkImageMapper3D *mapper = getImageMapper();
+    if (mapper == NULL)
+        return;
+
+    mapper->Update();
+
+    double normal[3];
+    mapper->GetSlicePlane()->GetNormal(normal);
+
+    Axis sliceAxis = Z_AXIS;
+    if (fabs(normal[0]) == 1.0 &&
+        normal[1] == 0.0 &&
+        normal[2] == 0.0) {
+        sliceAxis = X_AXIS;
+    } else if (normal[0] == 0.0 &&
+               fabs(normal[1]) == 1.0 &&
+               normal[2] == 0.0) {
+        sliceAxis = Y_AXIS;
+    } else if (normal[0] == 0.0 &&
+               normal[1] == 0.0 &&
+               fabs(normal[2]) == 1.0) {
+        sliceAxis = Z_AXIS;
+    } else {
+        TRACE("Non orthogonal slice plane, setting native aspect");
+        aspect = 0.0;
+    }
+
+    if (aspect == 1.0) {
+        // Square
+        switch (sliceAxis) {
+        case X_AXIS: {
+            if (size[1] > size[2] && size[2] > 0.0) {
+                scale[2] = size[1] / size[2];
+            } else if (size[2] > size[1] && size[1] > 0.0) {
+                scale[1] = size[2] / size[1];
+            }
+        }
+            break;
+        case Y_AXIS: {
+            if (size[0] > size[2] && size[2] > 0.0) {
+                scale[2] = size[0] / size[2];
+            } else if (size[2] > size[0] && size[0] > 0.0) {
+                scale[0] = size[2] / size[0];
+            }
+        }
+            break;
+        case Z_AXIS: {
+            if (size[0] > size[1] && size[1] > 0.0) {
+                scale[1] = size[0] / size[1];
+            } else if (size[1] > size[0] && size[0] > 0.0) {
+                scale[0] = size[1] / size[0];
+            }
+        }
+            break;
+        }
+    } else if (aspect != 0.0) {
+        switch (sliceAxis) {
+        case X_AXIS: {
+            if (aspect > 1.0) {
+                if (size[2] > size[1] && size[1] > 0.0) {
+                    scale[1] = (size[2] / aspect) / size[1];
+                } else if (size[2] > 0.0) {
+                    scale[2] = (size[1] * aspect) / size[2];
+                }
+            } else {
+                if (size[1] > size[2] && size[2] > 0.0) {
+                    scale[2] = (size[1] * aspect) / size[2];
+                } else if (size[1] > 0.0) {
+                    scale[1] = (size[2] / aspect) / size[1];
+                }
+            }
+        }
+            break;
+        case Y_AXIS: {
+            if (aspect > 1.0) {
+                if (size[0] > size[2] && size[2] > 0.0) {
+                    scale[2] = (size[0] / aspect) / size[2];
+                } else if (size[0] > 0.0) {
+                    scale[0] = (size[2] * aspect) / size[0];
+                }
+            } else {
+                if (size[2] > size[0] && size[0] > 0.0) {
+                    scale[0] = (size[2] * aspect) / size[0];
+                } else if (size[2] > 0.0) {
+                    scale[2] = (size[0] / aspect) / size[2];
+                }
+            }
+        }
+            break;
+        case Z_AXIS: {
+            if (aspect > 1.0) {
+                if (size[0] > size[1] && size[1] > 0.0) {
+                    scale[1] = (size[0] / aspect) / size[1];
+                } else if (size[0] > 0.0) {
+                    scale[0] = (size[1] * aspect) / size[0];
+                }
+            } else {
+                if (size[1] > size[0] && size[0] > 0.0) {
+                    scale[0] = (size[1] * aspect) / size[0];
+                } else if (size[1] > 0.0) {
+                    scale[1] = (size[0] / aspect) / size[1];
+                }
+            }
+        }
+            break;
+        }
+    }
+
+    TRACE("%s dims %g,%g,%g", _dataSet->getName().c_str(),
+          size[0], size[1], size[2]);
+    TRACE("Setting scale to %g,%g,%g", scale[0], scale[1], scale[2]);
+    setScale(scale);
+    mapper->Modified();
+    mapper->Update();
+}
+
 void Image::setClippingPlanes(vtkPlaneCollection *planes)
 {

vtkvis/branches/1.7/Image.h

@@ -32 +32 @@
 {
 public:
+    enum InterpType {
+        INTERP_NEAREST,
+        INTERP_LINEAR,
+        INTERP_CUBIC
+    };
+
     Image();
     virtual ~Image();
@@ -45 +51 @@
 
     virtual void setClippingPlanes(vtkPlaneCollection *planes);
+
+    virtual void setAspect(double aspect);
 
     void updateColorMap()
@@ -84 +92 @@
     }
 
+    void setUseWindowLevel(bool state)
+    {
+        vtkImageProperty *property = getImageProperty();
+        if (property == NULL)
+            return;
+
+        property->SetUseLookupTableScalarRange((state ? 0 : 1));
+    }
+
     double getWindow()
     {
@@ -100 +117 @@
 
         property->SetColorWindow(window);
+        property->UseLookupTableScalarRangeOff();
     }
 
@@ -118 +136 @@
 
         property->SetColorLevel(level);
-    }
-
-    void setWindowAndLevel(double window, double level)
-    {
-        vtkImageProperty *property = getImageProperty();
-        if (property == NULL)
-            return;
-
-        property->SetColorWindow(window);
-        property->SetColorLevel(level);
+        property->UseLookupTableScalarRangeOff();
     }
 
@@ -157 +166 @@
     }
 
+    void setInterpolationType(InterpType type)
+    {
+        vtkImageProperty *property = getImageProperty();
+        if (property == NULL)
+            return;
+
+        switch (type) {
+        case INTERP_NEAREST:
+            property->SetInterpolationTypeToNearest();
+            break;
+        case INTERP_LINEAR:
+            property->SetInterpolationTypeToLinear();
+            break;
+        case INTERP_CUBIC:
+            property->SetInterpolationTypeToCubic();
+            break;
+        }
+    }
+
 private:
     virtual void update();

vtkvis/branches/1.7/Makefile.in

@@ -6 +6 @@
 USE_OFFSCREEN_RENDERING = #yes
 USE_THREADS             = yes
+USE_CPU_LEGEND_RENDER   = yes
 NEW_SCALAR_BAR          = yes
 
@@ -124 +125 @@
 ifdef USE_THREADS
 DEFINES         += -DUSE_THREADS
+endif
+ifdef USE_CPU_LEGEND_RENDER
+DEFINES         += -DLEGEND_SOFTWARE_RENDER
 endif
 ifdef NEW_SCALAR_BAR

vtkvis/branches/1.7/Renderer.cpp

@@ -1919 +1919 @@
     if (colorMap == NULL)
         return false;
-
+#ifdef LEGEND_SOFTWARE_RENDER
+    ColorMap::renderColorMap(colorMap, width, height, imgData, opaque, _bgColor,
+#ifdef RENDER_TARGA
+                             true, TARGA_BYTES_PER_PIXEL
+#else
+                             false
+#endif
+                             );
+#else
     if (_legendRenderWindow == NULL) {
         _legendRenderWindow = vtkSmartPointer<vtkRenderWindow>::New();
@@ -2212 +2220 @@
                                       imgData);
 #endif
+#endif
     TRACE("Leave");
     return true;
@@ -2225 +2234 @@
     if (colorMap == NULL)
         return false;
-
+#ifdef LEGEND_SOFTWARE_RENDER
+    ColorMap::renderColorMap(colorMap, width, height, imgData, opaque, _bgColor,
+#ifdef RENDER_TARGA
+                             true, TARGA_BYTES_PER_PIXEL
+#else
+                             false
+#endif
+                             );
+#else
     if (_legendRenderWindow == NULL) {
         _legendRenderWindow = vtkSmartPointer<vtkRenderWindow>::New();
@@ -2354 +2371 @@
                                       !_legendRenderWindow->GetDoubleBuffer(),
                                       imgData);
+#endif
 #endif
     TRACE("Leave");
@@ -3155 +3173 @@
         _cameraClipPlanes[1]->SetNormal(1, 0, 0);
         // top
-        _cameraClipPlanes[2]->SetOrigin(0, 0, _imgWorldOrigin[1] + _imgWorldDims[1]);
+        _cameraClipPlanes[2]->SetOrigin(0, 0, _imgWorldOrigin[1] + _imgWindowWorldDims[1]);
         _cameraClipPlanes[2]->SetNormal(0, 0, -1);
         // right
-        _cameraClipPlanes[3]->SetOrigin(_imgWorldOrigin[0] + _imgWorldDims[0], 0, 0);
+        _cameraClipPlanes[3]->SetOrigin(_imgWorldOrigin[0] + _imgWindowWorldDims[0], 0, 0);
         _cameraClipPlanes[3]->SetNormal(-1, 0, 0);
 

vtkvis/branches/1.7/RendererCmd.cpp

@@ -4123 +4123 @@
 
 static CmdSpec cutplaneOps[] = {
-    {"add",          2, CutplaneAddOp, 2, 3, "oper value ?dataSetName?"},
+    {"add",          2, CutplaneAddOp, 2, 3, "?dataSetName?"},
     {"axis",         2, CutplaneSliceVisibilityOp, 4, 5, "axis bool ?dataSetName?"},
     {"ccolor",       2, CutplaneColorOp, 5, 6, "r g b ?dataSetName?"},
@@ -7054 +7054 @@
     if (objc == 4) {
         const char *name = Tcl_GetString(objv[3]);
-        g_renderer->setImageLevel(name, window);
-    } else {
-        g_renderer->setImageLevel("all", window);
+        g_renderer->setImageWindow(name, window);
+    } else {
+        g_renderer->setImageWindow("all", window);
     }
     return TCL_OK;

vtkvis/branches/1.7/RendererGraphicsObjs.cpp

@@ -234 +234 @@
 }
 
-/**
- * \brief Set the volume slice used for mapping volumetric data
- */
-template <>
-void Renderer::setGraphicsObjectVolumeSlice<HeightMap>(const DataSetId& id, Axis axis, double ratio)
-{
-    HeightMapHashmap::iterator itr;
-
-    bool doAll = false;
-
-    if (id.compare("all") == 0) {
-        itr = _heightMaps.begin();
-        if (itr == _heightMaps.end())
-            return;
-        doAll = true;
-    } else {
-        itr = _heightMaps.find(id);
-    }
-
-    if (itr == _heightMaps.end()) {
-        ERROR("HeightMap not found: %s", id.c_str());
-        return;
-    }
-
-    do {
-        itr->second->selectVolumeSlice(axis, ratio);
-     } while (doAll && ++itr != _heightMaps.end());
-
-    sceneBoundsChanged();
-    _needsRedraw = true;
-}
-
 }