- Timestamp:
- Feb 21, 2013, 8:03:33 PM (12 years ago)
- Location:
- branches/Rappture 1.2
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/Rappture 1.2/gui/scripts/vtkisosurfaceviewer.tcl
r3311 r3316 2100 2100 $itk_component(xbutton) select 2101 2101 itk_component add xposition { 2102 ::scale $inner.xval -from 100 -to 1\2102 ::scale $inner.xval -from 100 -to 0 \ 2103 2103 -width 10 -orient vertical -showvalue yes \ 2104 2104 -borderwidth 1 -highlightthickness 0 \ … … 2129 2129 2130 2130 itk_component add yposition { 2131 ::scale $inner.yval -from 100 -to 1\2131 ::scale $inner.yval -from 100 -to 0 \ 2132 2132 -width 10 -orient vertical -showvalue yes \ 2133 2133 -borderwidth 1 -highlightthickness 0 \ … … 2161 2161 2162 2162 itk_component add zposition { 2163 ::scale $inner.zval -from 100 -to 1\2163 ::scale $inner.zval -from 100 -to 0 \ 2164 2164 -width 10 -orient vertical -showvalue yes \ 2165 2165 -borderwidth 1 -highlightthickness 0 \ -
branches/Rappture 1.2/gui/scripts/vtkstreamlinesviewer.tcl
r3311 r3316 2306 2306 2307 2307 itk_component add xCutScale { 2308 ::scale $inner.xval -from 100 -to 1\2308 ::scale $inner.xval -from 100 -to 0 \ 2309 2309 -width 10 -orient vertical -showvalue yes \ 2310 2310 -borderwidth 1 -highlightthickness 0 \ … … 2335 2335 2336 2336 itk_component add yCutScale { 2337 ::scale $inner.yval -from 100 -to 1\2337 ::scale $inner.yval -from 100 -to 0 \ 2338 2338 -width 10 -orient vertical -showvalue yes \ 2339 2339 -borderwidth 1 -highlightthickness 0 \ … … 2364 2364 2365 2365 itk_component add zCutScale { 2366 ::scale $inner.zval -from 100 -to 1\2366 ::scale $inner.zval -from 100 -to 0 \ 2367 2367 -width 10 -orient vertical -showvalue yes \ 2368 2368 -borderwidth 1 -highlightthickness 0 \ -
branches/Rappture 1.2/gui/scripts/vtkviewer.tcl
r3311 r3316 2102 2102 2103 2103 itk_component add xCutScale { 2104 ::scale $inner.xval -from 100 -to 1\2104 ::scale $inner.xval -from 100 -to 0 \ 2105 2105 -width 10 -orient vertical -showvalue yes \ 2106 2106 -borderwidth 1 -highlightthickness 0 \ … … 2142 2142 2143 2143 itk_component add yCutScale { 2144 ::scale $inner.yval -from 100 -to 1\2144 ::scale $inner.yval -from 100 -to 0 \ 2145 2145 -width 10 -orient vertical -showvalue yes \ 2146 2146 -borderwidth 1 -highlightthickness 0 \ … … 2182 2182 2183 2183 itk_component add zCutScale { 2184 ::scale $inner.zval -from 100 -to 1\2184 ::scale $inner.zval -from 100 -to 0 \ 2185 2185 -width 10 -orient vertical -showvalue yes \ 2186 2186 -borderwidth 1 -highlightthickness 0 \ -
branches/Rappture 1.2/gui/scripts/vtkvolumeviewer.tcl
r3311 r3316 2171 2171 2172 2172 itk_component add xCutScale { 2173 ::scale $inner.xval -from 100 -to 1\2173 ::scale $inner.xval -from 100 -to 0 \ 2174 2174 -width 10 -orient vertical -showvalue yes \ 2175 2175 -borderwidth 1 -highlightthickness 0 \ … … 2198 2198 2199 2199 itk_component add yCutScale { 2200 ::scale $inner.yval -from 100 -to 1\2200 ::scale $inner.yval -from 100 -to 0 \ 2201 2201 -width 10 -orient vertical -showvalue yes \ 2202 2202 -borderwidth 1 -highlightthickness 0 \ … … 2225 2225 2226 2226 itk_component add zCutScale { 2227 ::scale $inner.zval -from 100 -to 1\2227 ::scale $inner.zval -from 100 -to 0 \ 2228 2228 -width 10 -orient vertical -showvalue yes \ 2229 2229 -borderwidth 1 -highlightthickness 0 \ -
branches/Rappture 1.2/packages/vizservers/vtkvis/RpCutplane.cpp
r3273 r3316 350 350 if (_mapper[i] != NULL) { 351 351 _borderMapper[i] = vtkSmartPointer<vtkPolyDataMapper>::New(); 352 #ifdef CUTPLANE_TIGHT_OUTLINE 352 353 _outlineFilter[i] = vtkSmartPointer<vtkOutlineFilter>::New(); 353 354 _outlineFilter[i]->SetInputConnection(_mapper[i]->GetInputConnection(0, 0)); 354 355 _borderMapper[i]->SetInputConnection(_outlineFilter[i]->GetOutputPort()); 356 #else 357 _outlineSource[i] = vtkSmartPointer<vtkOutlineSource>::New(); 358 switch (i) { 359 case 0: 360 _outlineSource[i]->SetBounds(bounds[0] + (bounds[1]-bounds[0])/2., 361 bounds[0] + (bounds[1]-bounds[0])/2., 362 bounds[2], bounds[3], 363 bounds[4], bounds[5]); 364 break; 365 case 1: 366 _outlineSource[i]->SetBounds(bounds[0], bounds[1], 367 bounds[2] + (bounds[3]-bounds[2])/2., 368 bounds[2] + (bounds[3]-bounds[2])/2., 369 bounds[4], bounds[5]); 370 break; 371 case 2: 372 _outlineSource[i]->SetBounds(bounds[0], bounds[1], 373 bounds[2], bounds[3], 374 bounds[4] + (bounds[5]-bounds[4])/2., 375 bounds[4] + (bounds[5]-bounds[4])/2.); 376 break; 377 default: 378 ; 379 } 380 _borderMapper[i]->SetInputConnection(_outlineSource[i]->GetOutputPort()); 381 #endif 355 382 _borderMapper[i]->SetResolveCoincidentTopologyToPolygonOffset(); 356 383 } … … 406 433 double bounds[6]; 407 434 _dataSet->getBounds(bounds); 435 #if 0 436 if (ratio == 0.0) 437 ratio = 0.001; 438 if (ratio == 1.0) 439 ratio = 0.999; 440 #endif 408 441 switch (axis) { 409 442 case X_AXIS: … … 411 444 0, 412 445 0); 446 #ifndef CUTPLANE_TIGHT_OUTLINE 447 _outlineSource[0]->SetBounds(bounds[0] + (bounds[1]-bounds[0]) * ratio, 448 bounds[0] + (bounds[1]-bounds[0]) * ratio, 449 bounds[2], bounds[3], 450 bounds[4], bounds[5]); 451 #endif 413 452 if (_mapper[0] != NULL) 414 453 _mapper[0]->Update(); … … 418 457 bounds[2] + (bounds[3]-bounds[2]) * ratio, 419 458 0); 459 #ifndef CUTPLANE_TIGHT_OUTLINE 460 _outlineSource[1]->SetBounds(bounds[0], bounds[1], 461 bounds[2] + (bounds[3]-bounds[2]) * ratio, 462 bounds[2] + (bounds[3]-bounds[2]) * ratio, 463 bounds[4], bounds[5]); 464 #endif 420 465 if (_mapper[1] != NULL) 421 466 _mapper[1]->Update(); … … 425 470 0, 426 471 bounds[4] + (bounds[5]-bounds[4]) * ratio); 472 #ifndef CUTPLANE_TIGHT_OUTLINE 473 _outlineSource[2]->SetBounds(bounds[0], bounds[1], 474 bounds[2], bounds[3], 475 bounds[4] + (bounds[5]-bounds[4]) * ratio, 476 bounds[4] + (bounds[5]-bounds[4]) * ratio); 477 #endif 427 478 if (_mapper[2] != NULL) 428 479 _mapper[2]->Update(); -
branches/Rappture 1.2/packages/vizservers/vtkvis/RpCutplane.h
r3211 r3316 17 17 #include <vtkPlane.h> 18 18 #include <vtkOutlineFilter.h> 19 #include <vtkOutlineSource.h> 19 20 #include <vtkGaussianSplatter.h> 20 21 … … 25 26 namespace Rappture { 26 27 namespace VtkVis { 28 29 //#define CUTPLANE_TIGHT_OUTLINE 27 30 28 31 /** … … 110 113 vtkSmartPointer<vtkCutter> _cutter[3]; 111 114 vtkSmartPointer<vtkPlane> _cutPlane[3]; 115 #ifdef CUTPLANE_TIGHT_OUTLINE 112 116 vtkSmartPointer<vtkOutlineFilter> _outlineFilter[3]; 117 #else 118 vtkSmartPointer<vtkOutlineSource> _outlineSource[3]; 119 #endif 113 120 vtkSmartPointer<vtkGaussianSplatter> _splatter; 114 121 };
Note: See TracChangeset
for help on using the changeset viewer.