Changeset 3189
- Timestamp:
- Nov 15, 2012 6:18:44 PM (11 years ago)
- Location:
- trunk/packages/vizservers/vtkvis
- Files:
-
- 15 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/packages/vizservers/vtkvis/RpContour2D.cpp
r3177 r3189 8 8 #include <cfloat> 9 9 10 #include <vtkVersion.h> 11 #if (VTK_MAJOR_VERSION >= 6) 12 #define USE_VTK6 13 #endif 10 14 #include <vtkDataSet.h> 11 15 #include <vtkPointData.h> … … 127 131 cellToPtData = 128 132 vtkSmartPointer<vtkCellDataToPointData>::New(); 133 #ifdef USE_VTK6 134 cellToPtData->SetInputData(ds); 135 #else 129 136 cellToPtData->SetInput(ds); 137 #endif 130 138 //cellToPtData->PassCellDataOn(); 131 139 cellToPtData->Update(); … … 167 175 mesher->SetTransform(trans); 168 176 } 177 #ifdef USE_VTK6 178 mesher->SetInputData(pd); 179 #else 169 180 mesher->SetInput(pd); 181 #endif 170 182 _contourFilter->SetInputConnection(mesher->GetOutputPort()); 171 183 } else { 172 184 vtkSmartPointer<vtkDelaunay3D> mesher = vtkSmartPointer<vtkDelaunay3D>::New(); 185 #ifdef USE_VTK6 186 mesher->SetInputData(pd); 187 #else 173 188 mesher->SetInput(pd); 189 #endif 174 190 vtkSmartPointer<vtkDataSetSurfaceFilter> gf = vtkSmartPointer<vtkDataSetSurfaceFilter>::New(); 175 191 gf->SetInputConnection(mesher->GetOutputPort()); … … 178 194 } else { 179 195 // DataSet is a vtkPolyData with lines and/or polygons 196 #ifdef USE_VTK6 197 _contourFilter->SetInputData(ds); 198 #else 180 199 _contourFilter->SetInput(ds); 200 #endif 181 201 } 182 202 } else { … … 184 204 // DataSet is NOT a vtkPolyData 185 205 vtkSmartPointer<vtkDataSetSurfaceFilter> gf = vtkSmartPointer<vtkDataSetSurfaceFilter>::New(); 206 #ifdef USE_VTK6 207 gf->SetInputData(ds); 208 #else 186 209 gf->SetInput(ds); 210 #endif 187 211 _contourFilter->SetInputConnection(gf->GetOutputPort()); 188 212 } -
trunk/packages/vizservers/vtkvis/RpContour3D.cpp
r3177 r3189 8 8 #include <cassert> 9 9 10 #include <vtkVersion.h> 11 #if (VTK_MAJOR_VERSION >= 6) 12 #define USE_VTK6 13 #endif 10 14 #include <vtkDataSet.h> 11 15 #include <vtkPointData.h> … … 117 121 cellToPtData = 118 122 vtkSmartPointer<vtkCellDataToPointData>::New(); 123 #ifdef USE_VTK6 124 cellToPtData->SetInputData(ds); 125 #else 119 126 cellToPtData->SetInput(ds); 127 #endif 120 128 //cellToPtData->PassCellDataOn(); 121 129 cellToPtData->Update(); … … 135 143 // Generate a 3D unstructured grid 136 144 vtkSmartPointer<vtkDelaunay3D> mesher = vtkSmartPointer<vtkDelaunay3D>::New(); 145 #ifdef USE_VTK6 146 mesher->SetInputData(pd); 147 #else 137 148 mesher->SetInput(pd); 149 #endif 138 150 _contourFilter->SetInputConnection(mesher->GetOutputPort()); 139 151 } else { … … 144 156 } else { 145 157 // DataSet is NOT a vtkPolyData 158 #ifdef USE_VTK6 159 _contourFilter->SetInputData(ds); 160 #else 146 161 _contourFilter->SetInput(ds); 162 #endif 147 163 } 148 164 -
trunk/packages/vizservers/vtkvis/RpCutplane.cpp
r3178 r3189 10 10 #include <cstring> 11 11 12 #include <vtkVersion.h> 13 #if (VTK_MAJOR_VERSION >= 6) 14 #define USE_VTK6 15 #endif 12 16 #include <vtkDataSet.h> 13 17 #include <vtkPointData.h> … … 226 230 _actor[1]->VisibilityOff(); 227 231 } 232 #ifdef USE_VTK6 233 mesher->SetInputData(pd); 234 #else 228 235 mesher->SetInput(pd); 236 #endif 229 237 for (int i = 0; i < 3; i++) { 230 238 _mapper[i]->SetInputConnection(mesher->GetOutputPort()); … … 234 242 _splatter = vtkSmartPointer<vtkGaussianSplatter>::New(); 235 243 } 244 #ifdef USE_VTK6 245 _splatter->SetInputData(pd); 246 #else 236 247 _splatter->SetInput(pd); 248 #endif 237 249 int dims[3]; 238 250 _splatter->GetSampleDimensions(dims); … … 259 271 // Result of Delaunay3D mesher is unstructured grid 260 272 vtkSmartPointer<vtkDelaunay3D> mesher = vtkSmartPointer<vtkDelaunay3D>::New(); 273 #ifdef USE_VTK6 274 mesher->SetInputData(pd); 275 #else 261 276 mesher->SetInput(pd); 277 #endif 262 278 // Sample a plane within the grid bounding box 263 279 for (int i = 0; i < 3; i++) { … … 272 288 _splatter = vtkSmartPointer<vtkGaussianSplatter>::New(); 273 289 } 290 #ifdef USE_VTK6 291 _splatter->SetInputData(pd); 292 #else 274 293 _splatter->SetInput(pd); 294 #endif 275 295 int dims[3]; 276 296 dims[0] = dims[1] = dims[2] = 64; … … 295 315 // Sample a plane within the grid bounding box 296 316 for (int i = 0; i < 3; i++) { 317 #ifdef USE_VTK6 318 _cutter[i]->SetInputData(ds); 319 #else 297 320 _cutter[i]->SetInput(ds); 321 #endif 298 322 vtkSmartPointer<vtkDataSetSurfaceFilter> gf = vtkSmartPointer<vtkDataSetSurfaceFilter>::New(); 299 323 gf->UseStripsOn(); … … 317 341 vtkSmartPointer<vtkDataSetSurfaceFilter> gf = vtkSmartPointer<vtkDataSetSurfaceFilter>::New(); 318 342 gf->UseStripsOn(); 343 #ifdef USE_VTK6 344 gf->SetInputData(ds); 345 #else 319 346 gf->SetInput(ds); 347 #endif 320 348 _mapper[i]->SetInputConnection(gf->GetOutputPort()); 321 349 } -
trunk/packages/vizservers/vtkvis/RpGlyphs.cpp
r3177 r3189 9 9 #include <cfloat> 10 10 11 #include <vtkVersion.h> 12 #if (VTK_MAJOR_VERSION >= 6) 13 #define USE_VTK6 14 #endif 11 15 #include <vtkDataSet.h> 12 16 #include <vtkPointData.h> … … 211 215 break; 212 216 case CYLINDER: { 213 assert (vtkTransformPolyDataFilter::SafeDownCast(_glyphSource) != NULL); 214 assert (vtkTransformPolyDataFilter::SafeDownCast(_glyphSource)->GetInput() != NULL); 215 TRACE("gsource input: %s", vtkTransformPolyDataFilter::SafeDownCast(_glyphSource)->GetInput()->GetClassName()); 216 vtkSmartPointer<vtkCylinderSource> csource = vtkCylinderSource::SafeDownCast(vtkTransformPolyDataFilter::SafeDownCast(_glyphSource)->GetInput()->GetProducerPort()); 217 assert(vtkTransformPolyDataFilter::SafeDownCast(_glyphSource) != NULL); 218 assert(vtkTransformPolyDataFilter::SafeDownCast(_glyphSource)->GetInputConnection(0, 0) != NULL); 219 vtkSmartPointer<vtkCylinderSource> csource = vtkCylinderSource::SafeDownCast(vtkTransformPolyDataFilter::SafeDownCast(_glyphSource)->GetInputConnection(0, 0)); 217 220 int res = (int)(quality * 25); 218 221 if (res < 5) res = 5; … … 267 270 cellToPtData = 268 271 vtkSmartPointer<vtkCellDataToPointData>::New(); 272 #ifdef USE_VTK6 273 cellToPtData->SetInputData(ds); 274 #else 269 275 cellToPtData->SetInput(ds); 276 #endif 270 277 //cellToPtData->PassCellDataOn(); 271 278 cellToPtData->Update(); … … 277 284 278 285 #ifdef HAVE_GLYPH3D_MAPPER 279 _glyphMapper->SetInputConnection(ds->GetProducerPort()); 286 #ifdef USE_VTK6 287 _glyphMapper->SetInputData(ds); 288 #else 289 _glyphMapper->SetInput(ds); 290 #endif 280 291 #else 281 292 _glyphGenerator->SetInput(ds); -
trunk/packages/vizservers/vtkvis/RpHeightMap.cpp
r3177 r3189 8 8 #include <cassert> 9 9 10 #include <vtkVersion.h> 11 #if (VTK_MAJOR_VERSION >= 6) 12 #define USE_VTK6 13 #endif 10 14 #include <vtkDataSet.h> 11 15 #include <vtkPointData.h> … … 189 193 cellToPtData = 190 194 vtkSmartPointer<vtkCellDataToPointData>::New(); 195 #ifdef USE_VTK6 196 cellToPtData->SetInputData(ds); 197 #else 191 198 cellToPtData->SetInput(ds); 199 #endif 192 200 //cellToPtData->PassCellDataOn(); 193 201 cellToPtData->Update(); … … 234 242 mesher->SetTransform(trans); 235 243 } 244 #ifdef USE_VTK6 245 mesher->SetInputData(pd); 246 #else 236 247 mesher->SetInput(pd); 248 #endif 237 249 vtkAlgorithmOutput *warpOutput = initWarp(mesher->GetOutputPort()); 238 250 _dsMapper->SetInputConnection(warpOutput); … … 243 255 if (_volumeSlicer == NULL) 244 256 _volumeSlicer = vtkSmartPointer<vtkExtractVOI>::New(); 257 #ifdef USE_VTK6 258 _pointSplatter->SetInputData(pd); 259 #else 245 260 _pointSplatter->SetInput(pd); 261 #endif 246 262 int dims[3]; 247 263 _pointSplatter->GetSampleDimensions(dims); … … 281 297 // Result of Delaunay3D mesher is unstructured grid 282 298 vtkSmartPointer<vtkDelaunay3D> mesher = vtkSmartPointer<vtkDelaunay3D>::New(); 299 #ifdef USE_VTK6 300 mesher->SetInputData(pd); 301 #else 283 302 mesher->SetInput(pd); 303 #endif 284 304 // Run the mesher 285 305 mesher->Update(); … … 304 324 if (_pointSplatter == NULL) 305 325 _pointSplatter = vtkSmartPointer<vtkGaussianSplatter>::New(); 326 #ifdef USE_VTK6 327 _pointSplatter->SetInputData(pd); 328 #else 306 329 _pointSplatter->SetInput(pd); 330 #endif 307 331 int dims[3]; 308 332 _pointSplatter->GetSampleDimensions(dims); … … 337 361 _contourFilter->SetInputConnection(warpOutput); 338 362 } else { 363 #ifdef USE_VTK6 364 _dsMapper->SetInputData(pd); 365 _contourFilter->SetInputData(pd); 366 #else 339 367 _dsMapper->SetInput(pd); 340 368 _contourFilter->SetInput(pd); 369 #endif 370 341 371 } 342 372 } … … 354 384 imageData->GetDimensions(dims); 355 385 TRACE("Image data dimensions: %d %d %d", dims[0], dims[1], dims[2]); 386 #ifdef USE_VTK6 387 _volumeSlicer->SetInputData(ds); 388 #else 356 389 _volumeSlicer->SetInput(ds); 390 #endif 357 391 _volumeSlicer->SetVOI(0, dims[0]-1, 0, dims[1]-1, (dims[2]-1)/2, (dims[2]-1)/2); 358 392 _volumeSlicer->SetSampleRate(1, 1, 1); … … 364 398 // Sample a plane within the grid bounding box 365 399 vtkSmartPointer<vtkCutter> cutter = vtkSmartPointer<vtkCutter>::New(); 400 #ifdef USE_VTK6 401 cutter->SetInputData(ds); 402 #else 366 403 cutter->SetInput(ds); 404 #endif 367 405 if (_cutPlane == NULL) { 368 406 _cutPlane = vtkSmartPointer<vtkPlane>::New(); … … 376 414 } else { 377 415 // 2D data 416 #ifdef USE_VTK6 417 gf->SetInputData(ds); 418 #else 378 419 gf->SetInput(ds); 420 #endif 379 421 } 380 422 vtkAlgorithmOutput *warpOutput = initWarp(gf->GetOutputPort()); … … 424 466 } 425 467 468 //setAspect(1.0); 469 426 470 _dsActor->SetMapper(_dsMapper); 427 471 428 472 _dsMapper->Update(); 429 473 _contourMapper->Update(); 474 } 475 476 void HeightMap::setAspect(double aspect) 477 { 478 double bounds[6]; 479 vtkDataSet *ds = _dataSet->getVtkDataSet(); 480 ds->GetBounds(bounds); 481 double size[3]; 482 size[0] = bounds[1] - bounds[0]; 483 size[1] = bounds[3] - bounds[2]; 484 size[2] = bounds[5] - bounds[4]; 485 double scale[3]; 486 scale[0] = scale[1] = scale[2] = 1.; 487 488 if (aspect == 1.0) { 489 // Square 490 switch (_sliceAxis) { 491 case X_AXIS: { 492 if (size[1] > size[2] && size[2] > 1.0e-6) { 493 scale[2] = size[1] / size[2]; 494 } else if (size[2] > size[1] && size[1] > 1.0e-6) { 495 scale[1] = size[2] / size[1]; 496 } 497 } 498 break; 499 case Y_AXIS: { 500 if (size[0] > size[2] && size[2] > 1.0e-6) { 501 scale[2] = size[0] / size[2]; 502 } else if (size[2] > size[0] && size[0] > 1.0e-6) { 503 scale[0] = size[2] / size[0]; 504 } 505 } 506 break; 507 case Z_AXIS: { 508 if (size[0] > size[1] && size[1] > 1.0e-6) { 509 scale[1] = size[0] / size[1]; 510 } else if (size[1] > size[0] && size[0] > 1.0e-6) { 511 scale[0] = size[1] / size[0]; 512 } 513 } 514 break; 515 } 516 } else if (aspect != 0.0) { 517 switch (_sliceAxis) { 518 case X_AXIS: { 519 if (aspect > 1.0) { 520 if (size[2] > size[1]) { 521 scale[1] = (size[2] / aspect) / size[1]; 522 } else { 523 scale[2] = (size[1] * aspect) / size[2]; 524 } 525 } else { 526 if (size[1] > size[2]) { 527 scale[2] = (size[1] * aspect) / size[2]; 528 } else { 529 scale[1] = (size[2] / aspect) / size[1]; 530 } 531 } 532 } 533 break; 534 case Y_AXIS: { 535 if (aspect > 1.0) { 536 if (size[0] > size[2]) { 537 scale[2] = (size[0] / aspect) / size[2]; 538 } else { 539 scale[0] = (size[2] * aspect) / size[0]; 540 } 541 } else { 542 if (size[2] > size[0]) { 543 scale[0] = (size[2] * aspect) / size[0]; 544 } else { 545 scale[2] = (size[0] / aspect) / size[2]; 546 } 547 } 548 } 549 break; 550 case Z_AXIS: { 551 if (aspect > 1.0) { 552 if (size[0] > size[1]) { 553 scale[1] = (size[0] / aspect) / size[1]; 554 } else { 555 scale[0] = (size[1] * aspect) / size[0]; 556 } 557 } else { 558 if (size[1] > size[0]) { 559 scale[0] = (size[1] * aspect) / size[0]; 560 } else { 561 scale[1] = (size[0] / aspect) / size[1]; 562 } 563 } 564 } 565 break; 566 } 567 } 568 569 TRACE("obj %g,%g,%g", size[0], size[1], size[2]); 570 TRACE("Setting scale to %g,%g,%g", scale[0], scale[1], scale[2]); 571 setScale(scale); 430 572 } 431 573 … … 483 625 _warp->UseNormalOn(); 484 626 _warp->SetScaleFactor(_warpScale * _dataScale); 627 #ifdef USE_VTK6 628 _warp->SetInputData(pdInput); 629 #else 485 630 _warp->SetInput(pdInput); 631 #endif 486 632 return _warp->GetOutputPort(); 487 633 } -
trunk/packages/vizservers/vtkvis/RpHeightMap.h
r3177 r3189 60 60 61 61 virtual void setClippingPlanes(vtkPlaneCollection *planes); 62 63 virtual void setAspect(double aspect); 62 64 63 65 void selectVolumeSlice(Axis axis, double ratio); -
trunk/packages/vizservers/vtkvis/RpLIC.cpp
r3177 r3189 8 8 #include <cassert> 9 9 10 #include <vtkVersion.h> 11 #if (VTK_MAJOR_VERSION >= 6) 12 #define USE_VTK6 13 #endif 10 14 #include <vtkActor.h> 11 15 #include <vtkProperty.h> … … 74 78 cellToPtData = 75 79 vtkSmartPointer<vtkCellDataToPointData>::New(); 80 #ifdef USE_VTK6 81 cellToPtData->SetInputData(ds); 82 #else 76 83 cellToPtData->SetInput(ds); 84 #endif 77 85 //cellToPtData->PassCellDataOn(); 78 86 cellToPtData->Update(); … … 96 104 imageData->GetDimensions(dims); 97 105 TRACE("Image data dimensions: %d %d %d", dims[0], dims[1], dims[2]); 106 #ifdef USE_VTK6 107 _volumeSlicer->SetInputData(ds); 108 #else 98 109 _volumeSlicer->SetInput(ds); 110 #endif 99 111 _volumeSlicer->SetVOI(0, dims[0]-1, 0, dims[1]-1, (dims[2]-1)/2, (dims[2]-1)/2); 100 112 _volumeSlicer->SetSampleRate(1, 1, 1); … … 102 114 } else { 103 115 // 2D image/volume/uniform grid 116 #ifdef USE_VTK6 117 _lic->SetInputData(ds); 118 #else 104 119 _lic->SetInput(ds); 120 #endif 105 121 } 106 122 if (_mapper == NULL) { … … 150 166 bounds[4] + (bounds[5]-bounds[4])/2.); 151 167 } 168 #ifdef USE_VTK6 169 cutter->SetInputData(ds); 170 #else 152 171 cutter->SetInput(ds); 172 #endif 153 173 cutter->SetCutFunction(_cutPlane); 154 174 _probeFilter->SetSourceConnection(cutter->GetOutputPort()); 155 175 } else { 176 #ifdef USE_VTK6 177 _probeFilter->SetSourceData(ds); 178 #else 156 179 _probeFilter->SetSource(ds); 180 #endif 157 181 } 158 182 … … 197 221 imageData->SetOrigin(origin); 198 222 imageData->SetSpacing(spacing); 223 #ifdef USE_VTK6 224 _probeFilter->SetInputData(imageData); 225 #else 199 226 _probeFilter->SetInput(imageData); 227 #endif 200 228 _lic->SetInputConnection(_probeFilter->GetOutputPort()); 201 229 … … 228 256 } 229 257 ppdmapper->SetPainter(_painter); 258 #ifdef USE_VTK6 259 ppdmapper->SetInputData(pd); 260 #else 230 261 ppdmapper->SetInput(pd); 262 #endif 231 263 } 232 264 -
trunk/packages/vizservers/vtkvis/RpMolecule.cpp
r3177 r3189 10 10 #include <cassert> 11 11 12 #include <vtkVersion.h> 13 #if (VTK_MAJOR_VERSION >= 6) 14 #define USE_VTK6 15 #endif 12 16 #include <vtkDataSet.h> 13 17 #include <vtkCellArray.h> … … 206 210 if (_tuber == NULL) 207 211 _tuber = vtkSmartPointer<vtkTubeFilter>::New(); 212 #ifdef USE_VTK6 213 _tuber->SetInputData(pd); 214 #else 208 215 _tuber->SetInput(pd); 216 #endif 209 217 _tuber->SetNumberOfSides(12); 210 218 _tuber->CappingOff(); … … 234 242 235 243 _bondMapper->SetSourceConnection(_cylinderTrans->GetOutputPort()); 236 _bondMapper->SetInputConnection(_bondPD->GetProducerPort()); 244 #ifdef USE_VTK6 245 _bondMapper->SetInputData(_bondPD); 246 #else 247 _bondMapper->SetInput(_bondPD); 248 #endif 237 249 _bondMapper->SetOrientationArray("bond_orientations"); 238 250 _bondMapper->SetOrientationModeToDirection(); … … 248 260 if (pd->GetNumberOfVerts() > 0) { 249 261 vtkSmartPointer<vtkPointSetToLabelHierarchy> hier = vtkSmartPointer<vtkPointSetToLabelHierarchy>::New(); 262 #ifdef USE_VTK6 263 hier->SetInputData(pd); 264 #else 250 265 hier->SetInput(pd); 266 #endif 251 267 hier->SetLabelArrayName("labels"); 252 268 hier->GetTextProperty()->SetColor(0, 0, 0); … … 263 279 _glypher = vtkSmartPointer<vtkGlyph3D>::New(); 264 280 _glypher->SetSourceConnection(sphereSource->GetOutputPort()); 281 #ifdef USE_VTK6 282 _glypher->SetInputData(pd); 283 #else 265 284 _glypher->SetInput(pd); 285 #endif 266 286 if (ds->GetPointData() != NULL && 267 287 ds->GetPointData()->GetVectors() != NULL) { … … 277 297 #else 278 298 _atomMapper->SetSourceConnection(sphereSource->GetOutputPort()); 279 _atomMapper->SetInputConnection(pd->GetProducerPort()); 299 #ifdef USE_VTK6 300 _atomMapper->SetInputData(pd); 301 #else 302 _atomMapper->SetInput(pd); 303 #endif 280 304 if (ds->GetPointData() != NULL && 281 305 ds->GetPointData()->GetVectors() != NULL) { -
trunk/packages/vizservers/vtkvis/RpPolyData.cpp
r3177 r3189 8 8 #include <cassert> 9 9 10 #include <vtkVersion.h> 11 #if (VTK_MAJOR_VERSION >= 6) 12 #define USE_VTK6 13 #endif 10 14 #include <vtkDataSet.h> 11 15 #include <vtkPolyData.h> … … 80 84 if (_dataSet->numDimensions() < 2 || pd->GetNumberOfPoints() < 3) { 81 85 // 0D or 1D or not enough points to mesh 86 #ifdef USE_VTK6 87 _pdMapper->SetInputData(pd); 88 #else 82 89 _pdMapper->SetInput(pd); 90 #endif 83 91 } else if (_dataSet->is2D(&plane, &offset)) { 84 92 vtkSmartPointer<vtkDelaunay2D> mesher = vtkSmartPointer<vtkDelaunay2D>::New(); … … 103 111 mesher->SetTransform(trans); 104 112 } 113 #ifdef USE_VTK6 114 mesher->SetInputData(pd); 115 #else 105 116 mesher->SetInput(pd); 117 #endif 106 118 mesher->ReleaseDataFlagOn(); 107 119 mesher->Update(); … … 114 126 if (outpd->GetNumberOfPolys() == 0) { 115 127 WARN("Delaunay2D mesher failed"); 128 #ifdef USE_VTK6 129 _pdMapper->SetInputData(pd); 130 #else 116 131 _pdMapper->SetInput(pd); 132 #endif 117 133 } else { 118 134 _pdMapper->SetInputConnection(mesher->GetOutputPort()); … … 120 136 } else { 121 137 vtkSmartPointer<vtkDelaunay3D> mesher = vtkSmartPointer<vtkDelaunay3D>::New(); 138 #ifdef USE_VTK6 139 mesher->SetInputData(pd); 140 #else 122 141 mesher->SetInput(pd); 142 #endif 123 143 mesher->ReleaseDataFlagOn(); 124 144 mesher->Update(); … … 128 148 if (grid->GetNumberOfCells() == 0) { 129 149 WARN("Delaunay3D mesher failed"); 150 #ifdef USE_VTK6 151 _pdMapper->SetInputData(pd); 152 #else 130 153 _pdMapper->SetInput(pd); 154 #endif 131 155 } else { 132 156 // Delaunay3D returns an UnstructuredGrid, so feed it … … 142 166 } else { 143 167 // DataSet is a vtkPolyData with lines and/or polygons 168 #ifdef USE_VTK6 169 _pdMapper->SetInputData(pd); 170 #else 144 171 _pdMapper->SetInput(pd); 172 #endif 145 173 } 146 174 } else { … … 149 177 vtkSmartPointer<vtkDataSetSurfaceFilter> gf = vtkSmartPointer<vtkDataSetSurfaceFilter>::New(); 150 178 gf->UseStripsOn(); 179 #ifdef USE_VTK6 180 gf->SetInputData(ds); 181 #else 151 182 gf->SetInput(ds); 183 #endif 152 184 gf->ReleaseDataFlagOn(); 153 185 _pdMapper->SetInputConnection(gf->GetOutputPort()); -
trunk/packages/vizservers/vtkvis/RpPseudoColor.cpp
r3177 r3189 10 10 #include <cstring> 11 11 12 #include <vtkVersion.h> 13 #if (VTK_MAJOR_VERSION >= 6) 14 #define USE_VTK6 15 #endif 12 16 #include <vtkDataSet.h> 13 17 #include <vtkPointData.h> … … 136 140 mesher->SetTransform(trans); 137 141 } 142 #ifdef USE_VTK6 143 mesher->SetInputData(pd); 144 #else 138 145 mesher->SetInput(pd); 146 #endif 139 147 _dsMapper->SetInputConnection(mesher->GetOutputPort()); 140 148 #else 141 149 vtkSmartPointer<vtkGaussianSplatter> splatter = vtkSmartPointer<vtkGaussianSplatter>::New(); 142 150 vtkSmartPointer<vtkExtractVOI> slicer = vtkSmartPointer<vtkExtractVOI>::New(); 151 #ifdef USE_VTK6 152 splatter->SetInputData(pd); 153 #else 143 154 splatter->SetInput(pd); 155 #endif 144 156 int dims[3]; 145 157 splatter->GetSampleDimensions(dims); … … 172 184 } else { 173 185 vtkSmartPointer<vtkDelaunay3D> mesher = vtkSmartPointer<vtkDelaunay3D>::New(); 186 #ifdef USE_VTK6 187 mesher->SetInputData(pd); 188 #else 174 189 mesher->SetInput(pd); 190 #endif 175 191 vtkSmartPointer<vtkDataSetSurfaceFilter> gf = vtkSmartPointer<vtkDataSetSurfaceFilter>::New(); 176 192 gf->SetInputConnection(mesher->GetOutputPort()); … … 179 195 } else { 180 196 // DataSet is a vtkPolyData with lines and/or polygons 197 #ifdef USE_VTK6 198 _dsMapper->SetInputData(ds); 199 #else 181 200 _dsMapper->SetInput(ds); 201 #endif 182 202 } 183 203 } else { … … 185 205 // DataSet is NOT a vtkPolyData 186 206 vtkSmartPointer<vtkDataSetSurfaceFilter> gf = vtkSmartPointer<vtkDataSetSurfaceFilter>::New(); 207 #ifdef USE_VTK6 208 gf->SetInputData(ds); 209 #else 187 210 gf->SetInput(ds); 211 #endif 188 212 _dsMapper->SetInputConnection(gf->GetOutputPort()); 189 213 } -
trunk/packages/vizservers/vtkvis/RpStreamlines.cpp
r3177 r3189 12 12 #include <cstring> 13 13 14 #include <vtkVersion.h> 15 #if (VTK_MAJOR_VERSION >= 6) 16 #define USE_VTK6 17 #endif 14 18 #include <vtkMath.h> 15 19 #include <vtkActor.h> … … 484 488 cellToPtData = 485 489 vtkSmartPointer<vtkCellDataToPointData>::New(); 490 #ifdef USE_VTK6 491 cellToPtData->SetInputData(ds); 492 #else 486 493 cellToPtData->SetInput(ds); 494 #endif 487 495 //cellToPtData->PassCellDataOn(); 488 496 cellToPtData->Update(); … … 495 503 } 496 504 505 #ifdef USE_VTK6 506 _streamTracer->SetInputData(ds); 507 #else 497 508 _streamTracer->SetInput(ds); 509 #endif 498 510 _streamTracer->SetMaximumPropagation(xLen + yLen + zLen); 499 511 _streamTracer->SetIntegratorTypeToRungeKutta45(); … … 542 554 } 543 555 544 #if defined(DEBUG)&& defined(WANT_TRACE)556 #if 1 && defined(WANT_TRACE) 545 557 _streamTracer->Update(); 546 558 vtkPolyData *pd = _streamTracer->GetOutput(); 547 559 TRACE("Verts: %d Lines: %d Polys: %d Strips: %d", 548 pd->GetNumberOfVerts(), 549 pd->GetNumberOfLines(), 550 pd->GetNumberOfPolys(), 551 pd->GetNumberOfStrips()); 560 pd->GetNumberOfVerts(), 561 pd->GetNumberOfLines(), 562 pd->GetNumberOfPolys(), 563 pd->GetNumberOfStrips()); 564 vtkCellArray *arr = pd->GetLines(); 565 arr->InitTraversal(); 566 vtkIdType npts, *pts; 567 arr->GetNextCell(npts, pts); 568 for (int i = 0; i < npts; i++) { 569 TRACE("Pt: %d", pts[i]); 570 } 552 571 #endif 553 572 … … 630 649 } 631 650 651 #ifdef USE_VTK6 652 _streamTracer->SetSourceData(seed); 653 #else 632 654 _streamTracer->SetSource(seed); 655 633 656 if (oldSeed != NULL) { 634 657 oldSeed->SetPipelineInformation(NULL); 635 658 } 636 659 #endif 637 660 if (vtkPolyData::SafeDownCast(seed) != NULL) { 661 #ifdef USE_VTK6 662 _seedMapper->SetInputData(vtkPolyData::SafeDownCast(seed)); 663 #else 638 664 _seedMapper->SetInput(vtkPolyData::SafeDownCast(seed)); 665 #endif 639 666 } else { 640 667 vtkSmartPointer<vtkVertexGlyphFilter> vertFilter = vtkSmartPointer<vtkVertexGlyphFilter>::New(); 668 #ifdef USE_VTK6 669 vertFilter->SetInputData(seed); 670 #else 641 671 vertFilter->SetInput(seed); 672 #endif 642 673 _seedMapper->SetInputConnection(vertFilter->GetOutputPort()); 643 674 } … … 661 692 _seedMesh = ds; 662 693 _seedType = FILLED_MESH; 694 #ifdef DEBUG 695 DataSet::print(ds); 696 #endif 663 697 } else { 664 698 _seedMesh = NULL; … … 692 726 } 693 727 728 #ifdef USE_VTK6 729 _streamTracer->SetSourceData(seed); 730 _seedMapper->SetInputData(seed); 731 #else 694 732 _streamTracer->SetSource(seed); 733 695 734 if (oldSeed != NULL) { 696 735 oldSeed->SetPipelineInformation(NULL); 697 736 } 698 699 737 _seedMapper->SetInput(seed); 738 #endif 700 739 } 701 740 } … … 746 785 oldSeed = _streamTracer->GetSource(); 747 786 } 748 787 #ifdef USE_VTK6 788 _streamTracer->SetSourceData(seed); 789 _seedMapper->SetInputData(seed); 790 #else 749 791 _streamTracer->SetSource(seed); 750 792 if (oldSeed != NULL) { … … 753 795 754 796 _seedMapper->SetInput(seed); 797 #endif 755 798 } 756 799 } … … 819 862 for (int j = 0; j < numPoints; j++) { 820 863 // Get random sweep angle and radius 864 #ifdef USE_VTK6 865 double angle = getRandomNum(0, 2.0 * vtkMath::Pi()); 866 #else 821 867 double angle = getRandomNum(0, 2.0 * vtkMath::DoublePi()); 868 #endif 822 869 // Need sqrt to get uniform distribution 823 870 double r = sqrt(getRandomNum(minSquared, 1)) * radius; … … 840 887 oldSeed = _streamTracer->GetSource(); 841 888 } 842 889 #ifdef USE_VTK6 890 _streamTracer->SetSourceData(seed); 891 _seedMapper->SetInputData(seed); 892 #else 843 893 _streamTracer->SetSource(seed); 844 894 if (oldSeed != NULL) { … … 847 897 848 898 _seedMapper->SetInput(seed); 899 #endif 849 900 } 850 901 } … … 908 959 } 909 960 961 #ifndef USE_VTK6 910 962 if (oldSeed != NULL) { 911 963 oldSeed->SetPipelineInformation(NULL); 912 964 } 965 #endif 913 966 } 914 967 } … … 977 1030 978 1031 double verts[numSides][3]; 1032 #ifdef USE_VTK6 1033 double sliceTheta = 2.0 * vtkMath::Pi() / (double)numSides; 1034 #else 979 1035 double sliceTheta = 2.0 * vtkMath::DoublePi() / (double)numSides; 1036 #endif 980 1037 angle = vtkMath::RadiansFromDegrees(angle); 981 1038 for (int j = 0; j < numSides; j++) { … … 1021 1078 } 1022 1079 1080 #ifdef USE_VTK6 1081 _streamTracer->SetSourceData(seed); 1082 _seedMapper->SetInputData(seed); 1083 #else 1023 1084 _streamTracer->SetSource(seed); 1024 1085 if (oldSeed != NULL) { … … 1027 1088 1028 1089 _seedMapper->SetInput(seed); 1090 #endif 1029 1091 } 1030 1092 } -
trunk/packages/vizservers/vtkvis/RpVolume.cpp
r3177 r3189 8 8 #include <cassert> 9 9 10 #include <vtkVersion.h> 11 #if (VTK_MAJOR_VERSION >= 6) 12 #define USE_VTK6 13 #endif 10 14 #include <vtkDataSet.h> 11 15 #include <vtkPointData.h> … … 109 113 _volumeMapper = vtkSmartPointer<vtkVolumeTextureMapper3D>::New(); 110 114 #endif 115 #ifdef USE_VTK6 116 #ifdef USE_GPU_RAYCAST_MAPPER 117 vtkGPUVolumeRayCastMapper::SafeDownCast(_volumeMapper)->SetInputData(ds); 118 #else 119 vtkVolumeTextureMapper3D::SafeDownCast(_volumeMapper)->SetInputData(ds); 120 #endif 121 #else 111 122 _volumeMapper->SetInput(ds); 123 #endif 112 124 vtkVolumeMapper::SafeDownCast(_volumeMapper)->SetBlendModeToComposite(); 113 125 } else if (vtkUnstructuredGrid::SafeDownCast(ds) != NULL) { … … 120 132 if (ugrid->GetCellType(0) == VTK_TETRA && 121 133 ugrid->IsHomogeneous()) { 134 #ifdef USE_VTK6 135 vtkProjectedTetrahedraMapper::SafeDownCast(_volumeMapper)->SetInputData(ds); 136 #else 122 137 _volumeMapper->SetInput(ds); 138 #endif 123 139 } else { 124 140 // Decompose to tetrahedra 125 141 vtkSmartPointer<vtkDataSetTriangleFilter> filter = 126 142 vtkSmartPointer<vtkDataSetTriangleFilter>::New(); 143 #ifdef USE_VTK6 144 filter->SetInputData(ugrid); 145 #else 127 146 filter->SetInput(ugrid); 147 #endif 128 148 filter->TetrahedraOnlyOn(); 129 149 _volumeMapper->SetInputConnection(filter->GetOutputPort()); … … 138 158 // DataSet is a 3D point cloud 139 159 vtkSmartPointer<vtkGaussianSplatter> splatter = vtkSmartPointer<vtkGaussianSplatter>::New(); 160 #ifdef USE_VTK6 161 splatter->SetInputData(ds); 162 #else 140 163 splatter->SetInput(ds); 164 #endif 141 165 int dims[3]; 142 166 dims[0] = dims[1] = dims[2] = 64; -
trunk/packages/vizservers/vtkvis/RpVtkDataSet.cpp
r3177 r3189 11 11 #include <cmath> 12 12 13 #include <vtkVersion.h> 14 #if (VTK_MAJOR_VERSION >= 6) 15 #define USE_VTK6 16 #endif 13 17 #include <vtkCharArray.h> 14 18 #include <vtkDataSetReader.h> … … 68 72 if (_outlineFilter == NULL) { 69 73 _outlineFilter = vtkSmartPointer<vtkOutlineFilter>::New(); 74 #ifdef USE_VTK6 75 _outlineFilter->SetInputData(_dataSet); 76 #else 70 77 _outlineFilter->SetInput(_dataSet); 78 #endif 71 79 } 72 80 if (_outlineMapper == NULL) { … … 149 157 150 158 writer->SetFileName(filename); 159 #ifdef USE_VTK6 160 writer->SetInputData(_dataSet); 161 #else 151 162 writer->SetInput(_dataSet); 163 #endif 152 164 writer->Write(); 153 165 } … … 347 359 348 360 _dataSet = reader->GetOutput(); 361 #ifndef USE_VTK6 349 362 _dataSet->SetPipelineInformation(NULL); 350 363 #endif 351 364 if (_dataSet->GetPointData() != NULL && 352 365 _dataSet->GetPointData()->GetScalars() != NULL && … … 372 385 { 373 386 _dataSet = ds; 387 #ifndef USE_VTK6 374 388 _dataSet->SetPipelineInformation(NULL); 389 #endif 375 390 376 391 if (_dataSet->GetPointData() != NULL && -
trunk/packages/vizservers/vtkvis/RpVtkRendererGraphicsObjs.cpp
r3177 r3189 9 9 #include <typeinfo> 10 10 11 #include <vtkVersion.h> 12 #if (VTK_MAJOR_VERSION >= 6) 13 #define USE_VTK6 14 #endif 11 15 #include <vtkSmartPointer.h> 12 16 #include <vtkDataSet.h> … … 2183 2187 return false; 2184 2188 } 2189 #ifndef USE_VTK6 2185 2190 dataSet->SetPipelineInformation(NULL); 2186 2191 #endif 2187 2192 StreamlinesHashmap::iterator itr; 2188 2193 … … 2235 2240 return false; 2236 2241 } 2242 #ifndef USE_VTK6 2237 2243 dataSet->SetPipelineInformation(NULL); 2238 2244 #endif 2239 2245 StreamlinesHashmap::iterator itr; 2240 2246 -
trunk/packages/vizservers/vtkvis/RpWarp.cpp
r3177 r3189 10 10 #include <cstring> 11 11 12 #include <vtkVersion.h> 13 #if (VTK_MAJOR_VERSION >= 6) 14 #define USE_VTK6 15 #endif 12 16 #include <vtkDataSet.h> 13 17 #include <vtkPointData.h> … … 57 61 58 62 void Warp::setDataSet(DataSet *dataSet, 59 63 Renderer *renderer) 60 64 { 61 65 if (_dataSet != dataSet) { … … 99 103 100 104 if (_warp == NULL) { 101 105 _warp = vtkSmartPointer<vtkWarpVector>::New(); 102 106 } 103 107 … … 112 116 vtkSmartPointer<vtkCellDataToPointData> cellToPtData; 113 117 if (ds->GetPointData() == NULL || 114 ds->GetPointData()->GetVectors() == NULL) { 115 TRACE("No vector point data in dataset %s", _dataSet->getName().c_str()); 116 if (ds->GetCellData() != NULL && 117 ds->GetCellData()->GetVectors() != NULL) { 118 cellToPtData = 119 vtkSmartPointer<vtkCellDataToPointData>::New(); 120 cellToPtData->SetInput(ds); 121 //cellToPtData->PassCellDataOn(); 122 cellToPtData->Update(); 123 ds = cellToPtData->GetOutput(); 124 } else { 125 ERROR("No vector data in dataset %s", _dataSet->getName().c_str()); 126 return; 127 } 118 ds->GetPointData()->GetVectors() == NULL) { 119 TRACE("No vector point data in dataset %s", _dataSet->getName().c_str()); 120 if (ds->GetCellData() != NULL && 121 ds->GetCellData()->GetVectors() != NULL) { 122 cellToPtData = 123 vtkSmartPointer<vtkCellDataToPointData>::New(); 124 #ifdef USE_VTK6 125 cellToPtData->SetInputData(ds); 126 #else 127 cellToPtData->SetInput(ds); 128 #endif 129 //cellToPtData->PassCellDataOn(); 130 cellToPtData->Update(); 131 ds = cellToPtData->GetOutput(); 132 } else { 133 ERROR("No vector data in dataset %s", _dataSet->getName().c_str()); 134 return; 135 } 128 136 } 129 137 … … 160 168 mesher->SetTransform(trans); 161 169 } 170 #ifdef USE_VTK6 171 mesher->SetInputData(pd); 172 #else 162 173 mesher->SetInput(pd); 163 vtkAlgorithmOutput *warpOutput = initWarp(mesher->GetOutputPort()); 174 #endif 175 vtkAlgorithmOutput *warpOutput = initWarp(mesher->GetOutputPort()); 164 176 _dsMapper->SetInputConnection(warpOutput); 165 177 #else 166 178 vtkSmartPointer<vtkGaussianSplatter> splatter = vtkSmartPointer<vtkGaussianSplatter>::New(); 167 179 vtkSmartPointer<vtkExtractVOI> slicer = vtkSmartPointer<vtkExtractVOI>::New(); 180 #ifdef USE_VTK6 181 splatter->SetInputData(pd); 182 #else 168 183 splatter->SetInput(pd); 184 #endif 169 185 int dims[3]; 170 186 splatter->GetSampleDimensions(dims); … … 193 209 gf->UseStripsOn(); 194 210 gf->SetInputConnection(slicer->GetOutputPort()); 195 211 vtkAlgorithmOutput *warpOutput = initWarp(gf->GetOutputPort()); 196 212 _dsMapper->SetInputConnection(warpOutput); 197 213 #endif 198 214 } else { 199 215 // Data Set is a 3D point cloud 200 216 vtkSmartPointer<vtkDelaunay3D> mesher = vtkSmartPointer<vtkDelaunay3D>::New(); 217 #ifdef USE_VTK6 218 mesher->SetInputData(pd); 219 #else 201 220 mesher->SetInput(pd); 221 #endif 202 222 vtkSmartPointer<vtkDataSetSurfaceFilter> gf = vtkSmartPointer<vtkDataSetSurfaceFilter>::New(); 203 204 223 gf->SetInputConnection(mesher->GetOutputPort()); 224 vtkAlgorithmOutput *warpOutput = initWarp(gf->GetOutputPort()); 205 225 _dsMapper->SetInputConnection(warpOutput); 206 226 } 207 227 } else { 208 228 // DataSet is a vtkPolyData with lines and/or polygons 209 vtkAlgorithmOutput *warpOutput = initWarp(pd); 210 _dsMapper->SetInput(ds); 211 if (warpOutput != NULL) { 212 _dsMapper->SetInputConnection(warpOutput); 213 } else { 214 _dsMapper->SetInput(pd); 215 } 229 vtkAlgorithmOutput *warpOutput = initWarp(pd); 230 if (warpOutput != NULL) { 231 _dsMapper->SetInputConnection(warpOutput); 232 } else { 233 #ifdef USE_VTK6 234 _dsMapper->SetInputData(pd); 235 #else 236 _dsMapper->SetInput(pd); 237 #endif 238 } 216 239 } 217 240 } else { … … 219 242 // DataSet is NOT a vtkPolyData 220 243 vtkSmartPointer<vtkDataSetSurfaceFilter> gf = vtkSmartPointer<vtkDataSetSurfaceFilter>::New(); 244 #ifdef USE_VTK6 245 gf->SetInputData(ds); 246 #else 221 247 gf->SetInput(ds); 222 vtkAlgorithmOutput *warpOutput = initWarp(gf->GetOutputPort()); 248 #endif 249 vtkAlgorithmOutput *warpOutput = initWarp(gf->GetOutputPort()); 223 250 _dsMapper->SetInputConnection(warpOutput); 224 251 } … … 266 293 _warp = vtkSmartPointer<vtkWarpVector>::New(); 267 294 _warp->SetScaleFactor(_warpScale); 295 #ifdef USE_VTK6 296 _warp->SetInputData(ds); 297 #else 268 298 _warp->SetInput(ds); 299 #endif 269 300 return _warp->GetOutputPort(); 270 301 } … … 375 406 376 407 void Warp::setColorMode(ColorMode mode, 377 408 const char *name, double range[2]) 378 409 { 379 410 if (_dataSet == NULL) … … 390 421 391 422 void Warp::setColorMode(ColorMode mode, DataSet::DataAttributeType type, 392 423 const char *name, double range[2]) 393 424 { 394 425 _colorMode = mode;
Note: See TracChangeset
for help on using the changeset viewer.