Changeset 5076 for vtkvis/trunk

Timestamp:

Mar 5, 2015 12:38:01 AM (9 years ago)

Author:

ldelgass

Message:

minor cleanup

File:

• vtkvis/trunk/ColorMap.cpp (modified) (5 diffs)

vtkvis/trunk/ColorMap.cpp

@@ -246 +246 @@
     return _numTableEntries;
 }
-#if 0
+
 /**
  * \brief Build the lookup table from the control points in the transfer 
@@ -263 +263 @@
 
     _lookupTable->SetNumberOfTableValues(_numTableEntries);
-
+#if 0
     std::list<ControlPoint>::iterator itr = _controlPoints.begin();
     std::list<OpacityControlPoint>::iterator oitr = _opacityControlPoints.begin();
@@ -328 +328 @@
         _lookupTable->SetTableValue(i, color);
     }
-    _needsBuild = false;
-    TRACE("Leave");
-}
 #else
-/**
- * \brief Build the lookup table from the control points in the transfer 
- * function
- */
-void ColorMap::build()
-{
-    if (!_needsBuild)
-        return;
-
-    TRACE("%s", _name.c_str());
-
-    if (_lookupTable == NULL) {
-        _lookupTable = vtkSmartPointer<vtkLookupTable>::New();
-    }
-
-    _lookupTable->SetNumberOfTableValues(_numTableEntries);
-
     double colorTable[_numTableEntries*3];
     _colorTF->GetTable(0., 1., _numTableEntries, colorTable);
@@ -355 +335 @@
 
     for (int i = 0; i < _numTableEntries; i++) {
-        //double value = _numTableEntries < 2 ? 0.0 : ((double)i)/(_numTableEntries-1);
         double color[4];
         memcpy(color, colorTable+i*3, sizeof(double)*3);
@@ -361 +340 @@
         _lookupTable->SetTableValue(i, color);
     }
+#endif
     _needsBuild = false;
     TRACE("Leave");
 }
-#endif
+
 /**
  * \brief Perform linear interpolation of two color control points