Changeset 3982 for trunk/packages/vizservers/vtkvis/ColorMap.cpp

Timestamp:

Oct 2, 2013 6:40:26 AM (11 years ago)

Author:

ldelgass

Message:

Add explicit copy ctor, assignment operator for ColorMap?, in order to make
deep copies of vtk transfer functions and lookup table (instead of copying
smart pointer refs)

File:

• trunk/packages/vizservers/vtkvis/ColorMap.cpp (modified) (3 diffs)

trunk/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;
@@ -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]);
-        tmp[1] *= opacityScale;
+        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;