Changeset 4233 for branches/1.3/packages

Timestamp:

Mar 11, 2014, 11:20:16 AM (10 years ago)

Author:

ldelgass

Message:

merge r3976 from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• packages/vizservers/vtkvis/ColorMap.cpp (modified) (2 diffs)

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

@@ -67 +67 @@
 {
     vtkSmartPointer<vtkColorTransferFunction> tf = vtkSmartPointer<vtkColorTransferFunction>::New();
-    tf->DeepCopy(_colorTF);
     double tmp[6];
-    for (int i = 0; i < tf->GetSize(); i++) {
-        tf->GetNodeValue(i, tmp);
+    for (int i = 0; i < _colorTF->GetSize(); i++) {
+        _colorTF->GetNodeValue(i, tmp);
         tmp[0] = range[0] + tmp[0] * (range[1] - range[0]);
-        tf->SetNodeValue(i, tmp);
+        tf->AddRGBPoint(tmp[0], tmp[1], tmp[2], tmp[3], tmp[4], tmp[5]);
     }
     return tf;
@@ -85 +84 @@
 {
     vtkSmartPointer<vtkPiecewiseFunction> tf = vtkSmartPointer<vtkPiecewiseFunction>::New();
-    tf->DeepCopy(_opacityTF);
     double tmp[4];
-    for (int i = 0; i < tf->GetSize(); i++) {
-        tf->GetNodeValue(i, tmp);
+    for (int i = 0; i < _opacityTF->GetSize(); i++) {
+        _opacityTF->GetNodeValue(i, tmp);
         tmp[0] = range[0] + tmp[0] * (range[1] - range[0]);
-        tf->SetNodeValue(i, tmp);
+        tf->AddPoint(tmp[0], tmp[1], tmp[2], tmp[3]);
     }
     return tf;