Changeset 2404 for trunk/packages/vizservers/vtkvis
- Timestamp:
- Aug 22, 2011 12:36:47 PM (13 years ago)
- Location:
- trunk/packages/vizservers/vtkvis
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/packages/vizservers/vtkvis/ColorMap.cpp
r2402 r2404 21 21 22 22 ColorMap *ColorMap::_default = NULL; 23 ColorMap *ColorMap::_grayDefault = NULL; 23 24 ColorMap *ColorMap::_volumeDefault = NULL; 24 25 ColorMap *ColorMap::_elementDefault = NULL; … … 337 338 338 339 /** 340 * \brief Create a default ColorMap with a black-white grayscale ramp 341 */ 342 ColorMap *ColorMap::getGrayDefault() 343 { 344 if (_grayDefault != NULL) { 345 return _grayDefault; 346 } 347 348 _grayDefault = new ColorMap("grayDefault"); 349 ControlPoint cp[2]; 350 cp[0].value = 0.0; 351 cp[0].color[0] = 0.0; 352 cp[0].color[1] = 0.0; 353 cp[0].color[2] = 0.0; 354 _grayDefault->addControlPoint(cp[0]); 355 cp[1].value = 1.0; 356 cp[1].color[0] = 1.0; 357 cp[1].color[1] = 1.0; 358 cp[1].color[2] = 1.0; 359 _grayDefault->addControlPoint(cp[1]); 360 OpacityControlPoint ocp[2]; 361 ocp[0].value = 0.0; 362 ocp[0].alpha = 1.0; 363 ocp[1].value = 1.0; 364 ocp[1].alpha = 1.0; 365 _grayDefault->addOpacityControlPoint(ocp[0]); 366 _grayDefault->addOpacityControlPoint(ocp[1]); 367 _grayDefault->build(); 368 return _grayDefault; 369 } 370 371 /** 339 372 * \brief Create a default ColorMap with a blue-cyan-green-yellow-red ramp 340 373 * and transparent to opaque ramp -
trunk/packages/vizservers/vtkvis/ColorMap.h
r2320 r2404 104 104 105 105 static ColorMap *getDefault(); 106 static ColorMap *getGrayDefault(); 106 107 static ColorMap *getVolumeDefault(); 107 108 static ColorMap *getElementDefault(); … … 109 110 private: 110 111 static ColorMap *_default; 112 static ColorMap *_grayDefault; 111 113 static ColorMap *_volumeDefault; 112 114 static ColorMap *_elementDefault; -
trunk/packages/vizservers/vtkvis/RpLIC.cpp
r2402 r2404 185 185 186 186 if (_lut == NULL) { 187 setColorMap(ColorMap::get Default());187 setColorMap(ColorMap::getGrayDefault()); 188 188 } 189 189 -
trunk/packages/vizservers/vtkvis/RpVtkDataSet.cpp
r2402 r2404 327 327 } 328 328 329 #if 0330 /**331 * \brief Get the range of scalar values in the DataSet332 */333 void DataSet::getDataRange(double minmax[2]) const334 {335 _dataSet->GetScalarRange(minmax);336 }337 #endif338 339 329 /** 340 330 * \brief Get the range of a vector component in the DataSet … … 388 378 389 379 /** 390 * \brief Get the range of cell AABB diagonal lengths the DataSet380 * \brief Get the range of cell AABB diagonal lengths in the DataSet 391 381 */ 392 382 void DataSet::getCellSizeRange(double minmax[6], double *average) const -
trunk/packages/vizservers/vtkvis/RpVtkDataSet.h
r2402 r2404 51 51 void getScalarRange(double minmax[2]) const; 52 52 53 //void getDataRange(double minmax[2]) const;54 55 53 void getDataRange(double minmax[2], const char *fieldName, int component = -1) const; 56 54 -
trunk/packages/vizservers/vtkvis/RpVtkGraphicsObject.h
r2402 r2404 110 110 _dataRange[1] = scalarRange[1]; 111 111 } else { 112 dataSet->getScalarRange(_dataRange);112 _dataSet->getScalarRange(_dataRange); 113 113 } 114 114 … … 132 132 double vectorComponentRange[3][2]) 133 133 { 134 if (useCumulative) { 135 _dataRange[0] = scalarRange[0]; 136 _dataRange[1] = scalarRange[1]; 137 } else { 138 _dataSet->getScalarRange(_dataRange); 139 } 134 140 } 135 141 -
trunk/packages/vizservers/vtkvis/RpVtkRenderer.cpp
r2402 r2404 136 136 initCamera(); 137 137 addColorMap("default", ColorMap::getDefault()); 138 addColorMap("grayDefault", ColorMap::getGrayDefault()); 138 139 addColorMap("volumeDefault", ColorMap::getVolumeDefault()); 139 140 addColorMap("elementDefault", ColorMap::getElementDefault()); … … 1325 1326 do { 1326 1327 if (itr->second->getName().compare("default") == 0 || 1328 itr->second->getName().compare("grayDefault") == 0 || 1327 1329 itr->second->getName().compare("volumeDefault") == 0 || 1328 1330 itr->second->getName().compare("elementDefault") == 0) {
Note: See TracChangeset
for help on using the changeset viewer.