Changeset 5836
- Timestamp:
- Aug 22, 2015 2:18:27 PM (9 years ago)
- Location:
- vtkvis/branches/1.8
- Files:
-
- 19 edited
Legend:
- Unmodified
- Added
- Removed
-
vtkvis/branches/1.8
- Property svn:mergeinfo changed
/vtkvis/trunk merged: 5835
- Property svn:mergeinfo changed
-
vtkvis/branches/1.8/Contour2D.cpp
r5819 r5836 136 136 cellToPtData = 137 137 vtkSmartPointer<vtkCellDataToPointData>::New(); 138 #ifdef USE_VTK6139 138 cellToPtData->SetInputData(ds); 140 #else141 cellToPtData->SetInput(ds);142 #endif143 139 cellToPtData->PassCellDataOn(); 144 140 dsOutput = cellToPtData->GetOutputPort(); -
vtkvis/branches/1.8/Contour3D.cpp
r5819 r5836 131 131 cellToPtData = 132 132 vtkSmartPointer<vtkCellDataToPointData>::New(); 133 #ifdef USE_VTK6134 133 cellToPtData->SetInputData(ds); 135 #else136 cellToPtData->SetInput(ds);137 #endif138 134 cellToPtData->PassCellDataOn(); 139 135 dsOutput = cellToPtData->GetOutputPort(); -
vtkvis/branches/1.8/Cutplane.cpp
r5072 r5836 230 230 _actor[1]->VisibilityOff(); 231 231 } 232 #ifdef USE_VTK6233 232 mesher->SetInputData(ds); 234 #else235 mesher->SetInput(ds);236 #endif237 233 for (int i = 0; i < 3; i++) { 238 234 _mapper[i]->SetInputConnection(mesher->GetOutputPort()); … … 243 239 _splatter = vtkSmartPointer<vtkGaussianSplatter>::New(); 244 240 } 245 #ifdef USE_VTK6246 241 _splatter->SetInputData(ds); 247 #else248 _splatter->SetInput(ds);249 #endif250 242 int dims[3]; 251 243 _splatter->GetSampleDimensions(dims); … … 272 264 // Result of Delaunay3D mesher is unstructured grid 273 265 vtkSmartPointer<vtkDelaunay3D> mesher = vtkSmartPointer<vtkDelaunay3D>::New(); 274 #ifdef USE_VTK6275 266 mesher->SetInputData(ds); 276 #else277 mesher->SetInput(ds);278 #endif279 267 // Sample a plane within the grid bounding box 280 268 for (int i = 0; i < 3; i++) { … … 290 278 _splatter = vtkSmartPointer<vtkGaussianSplatter>::New(); 291 279 } 292 #ifdef USE_VTK6293 280 _splatter->SetInputData(ds); 294 #else295 _splatter->SetInput(ds);296 #endif297 281 int dims[3]; 298 282 dims[0] = dims[1] = dims[2] = 64; … … 317 301 // Sample a plane within the grid bounding box 318 302 for (int i = 0; i < 3; i++) { 319 #ifdef USE_VTK6320 303 _cutter[i]->SetInputData(ds); 321 #else322 _cutter[i]->SetInput(ds);323 #endif324 304 vtkSmartPointer<vtkDataSetSurfaceFilter> gf = vtkSmartPointer<vtkDataSetSurfaceFilter>::New(); 325 305 gf->UseStripsOn(); … … 343 323 vtkSmartPointer<vtkDataSetSurfaceFilter> gf = vtkSmartPointer<vtkDataSetSurfaceFilter>::New(); 344 324 gf->UseStripsOn(); 345 #ifdef USE_VTK6346 325 gf->SetInputData(ds); 347 #else348 gf->SetInput(ds);349 #endif350 326 _mapper[i]->SetInputConnection(gf->GetOutputPort()); 351 327 } -
vtkvis/branches/1.8/DataSet.cpp
r5812 r5836 88 88 89 89 writer->SetFileName(filename); 90 #ifdef USE_VTK691 90 writer->SetInputData(_dataSet); 92 #else93 writer->SetInput(_dataSet);94 #endif95 91 writer->Write(); 96 92 } … … 148 144 /** 149 145 * \brief Read dataset using supplied reader 150 *151 * Pipeline information is removed from the resulting152 * vtkDataSet, so that the reader and its data can be153 * released154 146 */ 155 147 bool DataSet::setData(vtkDataSetReader *reader) … … 166 158 if (vtkUnstructuredGrid::SafeDownCast(_dataSet) != NULL && !isCloud()) { 167 159 vtkSmartPointer<vtkExtractUnstructuredGrid> filter = vtkSmartPointer<vtkExtractUnstructuredGrid>::New(); 168 #ifdef USE_VTK6169 160 filter->SetInputData(_dataSet); 170 #else171 filter->SetInput(_dataSet);172 #endif173 161 filter->MergingOn(); 174 162 filter->ReleaseDataFlagOn(); … … 177 165 } 178 166 179 #ifndef USE_VTK6180 _dataSet->SetPipelineInformation(NULL);181 #endif182 167 if (_dataSet->GetPointData() != NULL && 183 168 _dataSet->GetPointData()->GetScalars() != NULL && … … 197 182 /** 198 183 * \brief Set DataSet from existing vtkDataSet object 199 *200 * Pipeline information is removed from the supplied vtkDataSet201 184 */ 202 185 bool DataSet::setData(vtkDataSet *ds) 203 186 { 204 187 _dataSet = ds; 205 #ifndef USE_VTK6206 _dataSet->SetPipelineInformation(NULL);207 #endif208 188 209 189 if (_dataSet->GetPointData() != NULL && -
vtkvis/branches/1.8/Glyphs.cpp
r5760 r5836 303 303 cellToPtData = 304 304 vtkSmartPointer<vtkCellDataToPointData>::New(); 305 #ifdef USE_VTK6306 305 cellToPtData->SetInputData(ds); 307 #else308 cellToPtData->SetInput(ds);309 #endif310 306 //cellToPtData->PassCellDataOn(); 311 307 cellToPtData->Update(); … … 316 312 } 317 313 318 #ifdef USE_VTK6319 314 _glyphMapper->SetInputData(ds); 320 #else321 _glyphMapper->SetInputConnection(ds->GetProducerPort());322 #endif323 315 324 316 if (ds->GetPointData()->GetVectors() != NULL) { … … 356 348 mesher->SetTransform(trans); 357 349 } 358 #ifdef USE_VTK6359 350 mesher->SetInputData(ds); 360 #else361 mesher->SetInput(ds);362 #endif363 351 mesher->Update(); 364 352 vtkPolyData *pd = mesher->GetOutput(); … … 381 369 // 3D cloud 382 370 vtkSmartPointer<vtkDelaunay3D> mesher = vtkSmartPointer<vtkDelaunay3D>::New(); 383 #ifdef USE_VTK6384 371 mesher->SetInputData(ds); 385 #else386 mesher->SetInput(ds);387 #endif388 372 mesher->Update(); 389 373 vtkUnstructuredGrid *ugrid = mesher->GetOutput(); … … 899 883 if (max < 0) { 900 884 if (_maskPoints != NULL) { 901 #ifdef USE_VTK6902 885 _glyphMapper->SetInputData(_dataSet->getVtkDataSet()); 903 #else904 _glyphMapper->SetInputConnection(_dataSet->getVtkDataSet()->GetProducerPort());905 #endif906 886 _maskPoints = NULL; 907 887 } … … 910 890 _maskPoints = vtkSmartPointer<vtkMaskPoints>::New(); 911 891 } 912 #ifdef USE_VTK6913 892 _maskPoints->SetInputData(_dataSet->getVtkDataSet()); 914 #else915 _maskPoints->SetInput(_dataSet->getVtkDataSet());916 #endif917 893 _maskPoints->SetMaximumNumberOfPoints(max); 918 894 _maskPoints->SetOffset(offset); -
vtkvis/branches/1.8/HeightMap.cpp
r5826 r5836 239 239 cellToPtData = 240 240 vtkSmartPointer<vtkCellDataToPointData>::New(); 241 #ifdef USE_VTK6242 241 cellToPtData->SetInputData(ds); 243 #else244 cellToPtData->SetInput(ds);245 #endif246 242 cellToPtData->PassCellDataOn(); 247 243 dsOutput = cellToPtData->GetOutputPort(); -
vtkvis/branches/1.8/ImageCutplane.cpp
r4256 r5836 206 206 // DataSet is a 3D point cloud 207 207 vtkSmartPointer<vtkGaussianSplatter> splatter = vtkSmartPointer<vtkGaussianSplatter>::New(); 208 #ifdef USE_VTK6209 208 splatter->SetInputData(ds); 210 #else211 splatter->SetInput(ds);212 #endif213 209 int dims[3]; 214 210 dims[0] = dims[1] = dims[2] = 64; … … 257 253 258 254 vtkSmartPointer<vtkProbeFilter> probe = vtkSmartPointer<vtkProbeFilter>::New(); 259 #ifdef USE_VTK6260 255 probe->SetInputData(resampleGrid); 261 256 probe->SetSourceData(ds); 262 #else263 probe->SetInput(resampleGrid);264 probe->SetSource(ds);265 #endif266 257 probe->Update(); 267 258 … … 275 266 // Have ImageData 276 267 for (int i = 0; i < 3; i++) { 277 #ifdef USE_VTK6278 268 _mapper[i]->SetInputData(imgData); 279 #else280 _mapper[i]->SetInput(imgData);281 #endif282 269 } 283 270 } -
vtkvis/branches/1.8/LIC.cpp
r4649 r5836 78 78 cellToPtData = 79 79 vtkSmartPointer<vtkCellDataToPointData>::New(); 80 #ifdef USE_VTK681 80 cellToPtData->SetInputData(ds); 82 #else83 cellToPtData->SetInput(ds);84 #endif85 81 //cellToPtData->PassCellDataOn(); 86 82 cellToPtData->Update(); … … 105 101 imageData->GetDimensions(dims); 106 102 TRACE("Image data dimensions: %d %d %d", dims[0], dims[1], dims[2]); 107 #ifdef USE_VTK6108 103 _volumeSlicer->SetInputData(ds); 109 #else110 _volumeSlicer->SetInput(ds);111 #endif112 104 _volumeSlicer->SetVOI(0, dims[0]-1, 0, dims[1]-1, (dims[2]-1)/2, (dims[2]-1)/2); 113 105 _volumeSlicer->SetSampleRate(1, 1, 1); … … 115 107 } else { 116 108 // 2D image/uniform grid 117 #ifdef USE_VTK6118 109 _lic->SetInputData(ds); 119 #else120 _lic->SetInput(ds);121 #endif122 110 } 123 111 if (_mapper == NULL) { … … 175 163 // 3D cloud -- Need to mesh it before we can resample 176 164 vtkSmartPointer<vtkDelaunay3D> mesher = vtkSmartPointer<vtkDelaunay3D>::New(); 177 #ifdef USE_VTK6178 165 mesher->SetInputData(ds); 179 #else180 mesher->SetInput(ds);181 #endif182 166 cutter->SetInputConnection(mesher->GetOutputPort()); 183 167 } else { 184 #ifdef USE_VTK6185 168 cutter->SetInputData(ds); 186 #else187 cutter->SetInput(ds);188 #endif189 169 } 190 170 cutter->SetCutFunction(_cutPlane); … … 214 194 mesher->SetTransform(trans); 215 195 } 216 #ifdef USE_VTK6217 196 mesher->SetInputData(ds); 218 #else219 mesher->SetInput(ds);220 #endif221 197 _probeFilter->SetSourceConnection(mesher->GetOutputPort()); 222 198 } else { 223 #ifdef USE_VTK6224 199 _probeFilter->SetSourceData(ds); 225 #else226 _probeFilter->SetSource(ds);227 #endif228 200 } 229 201 } … … 270 242 imageData->SetOrigin(origin); 271 243 imageData->SetSpacing(spacing); 272 #ifdef USE_VTK6273 244 _probeFilter->SetInputData(imageData); 274 #else275 _probeFilter->SetInput(imageData);276 #endif277 245 _lic->SetInputConnection(_probeFilter->GetOutputPort()); 278 246 … … 316 284 } 317 285 ppdmapper->SetPainter(_painter); 318 #ifdef USE_VTK6319 286 ppdmapper->SetInputData(pd); 320 #else321 ppdmapper->SetInput(pd);322 #endif323 287 } 324 288 -
vtkvis/branches/1.8/Makefile.in
r4813 r5836 8 8 USE_THREADS = yes 9 9 USE_CPU_LEGEND_RENDER = yes 10 NEW_SCALAR_BAR = yes11 10 12 11 bindir = @bindir@ … … 141 140 DEFINES += -DLEGEND_SOFTWARE_RENDER 142 141 endif 143 ifdef NEW_SCALAR_BAR144 DEFINES += -DNEW_SCALAR_BAR145 endif146 142 ifndef USE_OPENGL2_BACKEND 147 143 DEFINES += -DHAVE_LIC … … 153 149 VTK_MOD_DEFS = -DvtkRenderingCore_AUTOINIT="4(vtkInteractionStyle,vtkRenderingFreeType,vtkRenderingFreeTypeOpenGL,vtkRenderingOpenGL)" -DvtkRenderingFreeType_AUTOINIT="1(vtkRenderingFreeTypeFontConfig)" -DvtkRenderingVolume_AUTOINIT="1(vtkRenderingVolumeOpenGL)" 154 150 endif 155 DEFINES += -DUSE_VTK6$(VTK_MOD_DEFS)151 DEFINES += $(VTK_MOD_DEFS) 156 152 157 153 CXX_SWITCHES = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(DEFINES) $(INCLUDES) -
vtkvis/branches/1.8/Molecule.cpp
r5072 r5836 217 217 218 218 _bondMapper->SetSourceConnection(_cylinderTrans->GetOutputPort()); 219 #ifdef USE_VTK6220 219 _bondMapper->SetInputData(_bondPD); 221 #else222 _bondMapper->SetInputConnection(_bondPD->GetProducerPort());223 #endif224 220 _bondMapper->SetOrientationArray("bond_orientations"); 225 221 _bondMapper->SetOrientationModeToDirection(); … … 241 237 } 242 238 vtkSmartPointer<vtkTransformPolyDataFilter> transformFilter = vtkSmartPointer<vtkTransformPolyDataFilter>::New(); 243 #ifdef USE_VTK6244 239 transformFilter->SetInputData(pd); 245 #else246 transformFilter->SetInput(pd);247 #endif248 240 transformFilter->SetTransform(_labelTransform); 249 241 _labelHierarchy->SetInputConnection(transformFilter->GetOutputPort()); … … 262 254 263 255 _atomMapper->SetSourceConnection(_sphereSource->GetOutputPort()); 264 #ifdef USE_VTK6265 256 _atomMapper->SetInputData(pd); 266 #else267 _atomMapper->SetInputConnection(pd->GetProducerPort());268 #endif269 257 _atomMapper->SetScaleArray("_radii"); 270 258 _atomMapper->SetScaleModeToScaleByMagnitude(); -
vtkvis/branches/1.8/Outline.cpp
r3621 r5836 61 61 if (sg != NULL) { 62 62 vtkSmartPointer<vtkStructuredGridOutlineFilter> ofilter = vtkSmartPointer<vtkStructuredGridOutlineFilter>::New(); 63 #ifdef USE_VTK664 63 ofilter->SetInputData(ds); 65 #else66 ofilter->SetInput(ds);67 #endif68 64 ofilter->ReleaseDataFlagOn(); 69 65 _pdMapper->SetInputConnection(ofilter->GetOutputPort()); 70 66 } else { 71 67 vtkSmartPointer<vtkOutlineFilter> ofilter = vtkSmartPointer<vtkOutlineFilter>::New(); 72 #ifdef USE_VTK673 68 ofilter->SetInputData(ds); 74 #else75 ofilter->SetInput(ds);76 #endif77 69 ofilter->ReleaseDataFlagOn(); 78 70 _pdMapper->SetInputConnection(ofilter->GetOutputPort()); -
vtkvis/branches/1.8/PolyData.cpp
r5072 r5836 129 129 _dataSet->numDimensions() < 2 || ds->GetNumberOfPoints() < 3) { // 0D or 1D or not enough points to mesh 130 130 vtkSmartPointer<vtkVertexGlyphFilter> vgf = vtkSmartPointer<vtkVertexGlyphFilter>::New(); 131 #ifdef USE_VTK6132 131 vgf->SetInputData(ds); 133 #else134 vgf->SetInput(ds);135 #endif136 132 _mapper->SetInputConnection(vgf->GetOutputPort()); 137 133 } else if (_dataSet->is2D(&plane, &offset)) { … … 157 153 mesher->SetTransform(trans); 158 154 } 159 #ifdef USE_VTK6160 155 mesher->SetInputData(ds); 161 #else162 mesher->SetInput(ds);163 #endif164 156 mesher->ReleaseDataFlagOn(); 165 157 mesher->Update(); … … 173 165 WARN("Delaunay2D mesher failed"); 174 166 vtkSmartPointer<vtkVertexGlyphFilter> vgf = vtkSmartPointer<vtkVertexGlyphFilter>::New(); 175 #ifdef USE_VTK6176 167 vgf->SetInputData(ds); 177 #else178 vgf->SetInput(ds);179 #endif180 168 _mapper->SetInputConnection(vgf->GetOutputPort()); 181 169 } else { … … 186 174 } else { 187 175 vtkSmartPointer<vtkDelaunay3D> mesher = vtkSmartPointer<vtkDelaunay3D>::New(); 188 #ifdef USE_VTK6189 176 mesher->SetInputData(ds); 190 #else191 mesher->SetInput(ds);192 #endif193 177 mesher->ReleaseDataFlagOn(); 194 178 mesher->Update(); … … 199 183 WARN("Delaunay3D mesher failed"); 200 184 vtkSmartPointer<vtkVertexGlyphFilter> vgf = vtkSmartPointer<vtkVertexGlyphFilter>::New(); 201 #ifdef USE_VTK6202 185 vgf->SetInputData(ds); 203 #else204 vgf->SetInput(ds);205 #endif206 186 _mapper->SetInputConnection(vgf->GetOutputPort()); 207 187 } else { … … 221 201 // DataSet is a vtkPolyData with cells 222 202 if (hasNormals) { 223 #ifdef USE_VTK6224 203 _mapper->SetInputData(pd); 225 #else226 _mapper->SetInput(pd);227 #endif228 204 } else { 229 205 vtkSmartPointer<vtkPolyDataNormals> normalFilter = vtkSmartPointer<vtkPolyDataNormals>::New(); 230 #ifdef USE_VTK6231 206 normalFilter->SetInputData(pd); 232 #else233 normalFilter->SetInput(pd);234 #endif235 207 _mapper->SetInputConnection(normalFilter->GetOutputPort()); 236 208 } … … 241 213 //gf->UseStripsOn(); 242 214 gf->ReleaseDataFlagOn(); 243 #ifdef USE_VTK6244 215 gf->SetInputData(ds); 245 #else246 gf->SetInput(ds);247 #endif248 216 vtkSmartPointer<vtkPolyDataNormals> normalFilter = vtkSmartPointer<vtkPolyDataNormals>::New(); 249 217 normalFilter->SetInputConnection(gf->GetOutputPort()); -
vtkvis/branches/1.8/PseudoColor.cpp
r5072 r5836 110 110 _dataSet->numDimensions() < 2 || ds->GetNumberOfPoints() < 3) { 111 111 vtkSmartPointer<vtkVertexGlyphFilter> vgf = vtkSmartPointer<vtkVertexGlyphFilter>::New(); 112 #ifdef USE_VTK6113 112 vgf->SetInputData(ds); 114 #else115 vgf->SetInput(ds);116 #endif117 113 vgf->ReleaseDataFlagOn(); 118 114 _mapper->SetInputConnection(vgf->GetOutputPort()); … … 144 140 mesher->SetTransform(trans); 145 141 } 146 #ifdef USE_VTK6147 142 mesher->SetInputData(ds); 148 #else149 mesher->SetInput(ds);150 #endif151 143 _mapper->SetInputConnection(mesher->GetOutputPort()); 152 144 } else { … … 155 147 _splatter = vtkSmartPointer<vtkGaussianSplatter>::New(); 156 148 } 157 #ifdef USE_VTK6158 149 _splatter->SetInputData(ds); 159 #else160 _splatter->SetInput(ds);161 #endif162 150 int dims[3]; 163 151 _splatter->GetSampleDimensions(dims); … … 192 180 // 3D cloud 193 181 vtkSmartPointer<vtkDelaunay3D> mesher = vtkSmartPointer<vtkDelaunay3D>::New(); 194 #ifdef USE_VTK6195 182 mesher->SetInputData(ds); 196 #else197 mesher->SetInput(ds);198 #endif199 183 vtkSmartPointer<vtkDataSetSurfaceFilter> gf = vtkSmartPointer<vtkDataSetSurfaceFilter>::New(); 200 184 gf->SetInputConnection(mesher->GetOutputPort()); … … 204 188 } else if (vtkPolyData::SafeDownCast(ds) != NULL) { 205 189 // DataSet is a vtkPolyData with lines and/or polygons 206 #ifdef USE_VTK6207 190 _mapper->SetInputData(vtkPolyData::SafeDownCast(ds)); 208 #else209 _mapper->SetInput(vtkPolyData::SafeDownCast(ds));210 #endif211 191 } else { 212 192 TRACE("Generating surface for data set"); 213 193 // DataSet is NOT a vtkPolyData and has cells 214 194 vtkSmartPointer<vtkDataSetSurfaceFilter> gf = vtkSmartPointer<vtkDataSetSurfaceFilter>::New(); 215 #ifdef USE_VTK6216 195 gf->SetInputData(ds); 217 #else218 gf->SetInput(ds);219 #endif220 196 _mapper->SetInputConnection(gf->GetOutputPort()); 221 197 } -
vtkvis/branches/1.8/Renderer.cpp
r5812 r5836 1982 1982 // Set viewport-relative width/height/pos 1983 1983 if (title.empty() && numLabels == 0) { 1984 #ifdef NEW_SCALAR_BAR1985 1984 _scalarBarActor->SetBarRatio(1); 1986 1985 _scalarBarActor->SetTitleRatio(0); 1987 #endif1988 1986 if (width > height) { 1989 1987 // horizontal 1990 #ifdef NEW_SCALAR_BAR1991 1988 _scalarBarActor->SetDisplayPosition(0, 0); 1992 1989 _scalarBarActor->GetPosition2Coordinate()->SetCoordinateSystemToDisplay(); 1993 1990 _scalarBarActor->GetPosition2Coordinate()->SetValue(width+4, height); 1994 #else1995 _scalarBarActor->SetPosition(0, 0);1996 _scalarBarActor->SetHeight((((double)height+1.5)/((double)height))/0.4); // VTK: floor(actorHeight * .4)1997 _scalarBarActor->SetWidth(1); // VTK: actorWidth1998 #endif1999 1991 } else { 2000 1992 // vertical 2001 #ifdef NEW_SCALAR_BAR2002 1993 _scalarBarActor->SetDisplayPosition(0, -4); 2003 1994 _scalarBarActor->GetPosition2Coordinate()->SetCoordinateSystemToDisplay(); 2004 1995 _scalarBarActor->GetPosition2Coordinate()->SetValue(width+1, height+5); 2005 #else2006 _scalarBarActor->SetPosition(0, 0);2007 _scalarBarActor->SetHeight((((double)height+1.5)/((double)height))/0.86); // VTK: floor(actorHeight * .86)2008 _scalarBarActor->SetWidth(((double)(width+5))/((double)width)); // VTK: actorWidth - 4 pixels2009 #endif2010 1996 } 2011 1997 } else { 2012 #ifdef NEW_SCALAR_BAR2013 1998 _scalarBarActor->SetBarRatio(0.375); 2014 1999 _scalarBarActor->SetTitleRatio(0.5); … … 2016 2001 _scalarBarActor->GetPosition2Coordinate()->SetCoordinateSystemToDisplay(); 2017 2002 _scalarBarActor->GetPosition2Coordinate()->SetValue(width, height); 2018 #else2019 if (width > height) {2020 // horizontal2021 _scalarBarActor->SetPosition(.075, .1);2022 _scalarBarActor->SetHeight(0.8);2023 _scalarBarActor->SetWidth(0.85);2024 } else {2025 // vertical2026 _scalarBarActor->SetPosition(.1, .05);2027 _scalarBarActor->SetHeight(0.9);2028 _scalarBarActor->SetWidth(0.8);2029 }2030 #endif2031 2003 } 2032 2004 … … 2179 2151 _scalarBarActor->GetLabelTextProperty()->ItalicOff(); 2180 2152 _scalarBarActor->GetLabelTextProperty()->ShadowOff(); 2181 #ifdef NEW_SCALAR_BAR2182 2153 if (!drawTitle && numLabels == 0) { 2183 2154 _scalarBarActor->DrawAnnotationsOff(); … … 2189 2160 _scalarBarActor->SetTextPad(1); 2190 2161 } 2191 #endif2192 2162 2193 2163 _legendRenderWindow->Render(); … … 2297 2267 2298 2268 // Set viewport-relative width/height/pos 2299 #ifdef NEW_SCALAR_BAR2300 2269 _scalarBarActor->SetBarRatio(1); 2301 2270 _scalarBarActor->SetTitleRatio(0); 2302 #endif2303 2271 if (width > height) { 2304 2272 // horizontal 2305 #ifdef NEW_SCALAR_BAR2306 2273 _scalarBarActor->SetDisplayPosition(0, 0); 2307 2274 _scalarBarActor->GetPosition2Coordinate()->SetCoordinateSystemToDisplay(); 2308 2275 _scalarBarActor->GetPosition2Coordinate()->SetValue(width+4, height); 2309 #else2310 _scalarBarActor->SetPosition(0, 0);2311 _scalarBarActor->SetHeight((((double)height+1.5)/((double)height))/0.4); // VTK: floor(actorHeight * .4)2312 _scalarBarActor->SetWidth(1); // VTK: actorWidth2313 #endif2314 2276 } else { 2315 2277 // vertical 2316 #ifdef NEW_SCALAR_BAR2317 2278 _scalarBarActor->SetDisplayPosition(0, -4); 2318 2279 _scalarBarActor->GetPosition2Coordinate()->SetCoordinateSystemToDisplay(); 2319 2280 _scalarBarActor->GetPosition2Coordinate()->SetValue(width+1, height+5); 2320 #else2321 _scalarBarActor->SetPosition(0, 0);2322 _scalarBarActor->SetHeight((((double)height+1.5)/((double)height))/0.86); // VTK: floor(actorHeight * .86)2323 _scalarBarActor->SetWidth(((double)(width+5))/((double)width)); // VTK: actorWidth - 4 pixels2324 #endif2325 2281 } 2326 2282 … … 2337 2293 _scalarBarActor->SetTitle(""); 2338 2294 _scalarBarActor->SetNumberOfLabels(0); 2339 #ifdef NEW_SCALAR_BAR2340 2295 _scalarBarActor->DrawAnnotationsOff(); 2341 2296 _scalarBarActor->SetAnnotationLeaderPadding(0); 2342 2297 _scalarBarActor->SetTextPad(0); 2343 #endif2344 2298 2345 2299 _legendRenderWindow->Render(); -
vtkvis/branches/1.8/RendererGraphicsObjs.cpp
r4815 r5836 3672 3672 return false; 3673 3673 } 3674 #ifndef USE_VTK63675 dataSet->SetPipelineInformation(NULL);3676 #endif3677 3674 StreamlinesHashmap::iterator itr; 3678 3675 … … 3726 3723 return false; 3727 3724 } 3728 #ifndef USE_VTK63729 dataSet->SetPipelineInformation(NULL);3730 #endif3731 3725 StreamlinesHashmap::iterator itr; 3732 3726 -
vtkvis/branches/1.8/Streamlines.cpp
r5750 r5836 486 486 cellToPtData = 487 487 vtkSmartPointer<vtkCellDataToPointData>::New(); 488 #ifdef USE_VTK6489 488 cellToPtData->SetInputData(ds); 490 #else491 cellToPtData->SetInput(ds);492 #endif493 489 cellToPtData->PassCellDataOn(); 494 490 cellToPtData->Update(); … … 532 528 vtkDelaunay2D::SafeDownCast(_mesher)->SetTransform(trans); 533 529 } 534 #ifdef USE_VTK6535 530 vtkDelaunay2D::SafeDownCast(_mesher)->SetInputData(ds); 536 #else537 _mesher->SetInput(ds);538 #endif539 531 _streamTracer->SetInputConnection(_mesher->GetOutputPort()); 540 532 _mesher->Update(); … … 543 535 // Generate a 3D unstructured grid 544 536 _mesher = vtkSmartPointer<vtkDelaunay3D>::New(); 545 #ifdef USE_VTK6546 537 vtkDelaunay3D::SafeDownCast(_mesher)->SetInputData(ds); 547 #else548 _mesher->SetInput(ds);549 #endif550 538 _streamTracer->SetInputConnection(_mesher->GetOutputPort()); 551 539 _mesher->Update(); … … 556 544 } else { 557 545 // DataSet is NOT a cloud (has cells) 558 #ifdef USE_VTK6559 546 _streamTracer->SetInputData(ds); 560 #else561 _streamTracer->SetInput(ds);562 #endif563 547 } 564 548 … … 721 705 return; 722 706 723 #ifndef USE_VTK6724 vtkSmartPointer<vtkDataSet> oldSeed;725 if (_streamTracer->GetSource() != NULL) {726 oldSeed = _streamTracer->GetSource();727 }728 #endif729 730 707 if (maxPoints > 0 && seed->GetNumberOfPoints() > maxPoints) { 731 708 TRACE("Seed points: %d", maxPoints); 732 709 vtkSmartPointer<vtkMaskPoints> mask = vtkSmartPointer<vtkMaskPoints>::New(); 733 #ifdef USE_VTK6734 710 mask->SetInputData(seed); 735 #else736 mask->SetInput(seed);737 #endif738 711 mask->SetMaximumNumberOfPoints(maxPoints); 739 712 mask->RandomModeOn(); … … 747 720 TRACE("Seed points: %d", seed->GetNumberOfPoints()); 748 721 749 #ifdef USE_VTK6750 722 _streamTracer->SetSourceData(seed); 751 #else752 _streamTracer->SetSource(seed);753 #endif754 723 if (vtkPolyData::SafeDownCast(seed) != NULL) { 755 #ifdef USE_VTK6756 724 _seedMapper->SetInputData(vtkPolyData::SafeDownCast(seed)); 757 #else758 _seedMapper->SetInput(vtkPolyData::SafeDownCast(seed));759 #endif760 725 } else { 761 726 vtkSmartPointer<vtkVertexGlyphFilter> vertFilter = vtkSmartPointer<vtkVertexGlyphFilter>::New(); 762 #ifdef USE_VTK6763 727 vertFilter->SetInputData(seed); 764 #else765 vertFilter->SetInput(seed);766 #endif767 728 _seedMapper->SetInputConnection(vertFilter->GetOutputPort()); 768 729 } 769 730 } 770 771 #ifndef USE_VTK6772 if (oldSeed != NULL) {773 oldSeed->SetPipelineInformation(NULL);774 }775 #endif776 731 } 777 732 … … 833 788 } 834 789 835 #ifdef USE_VTK6836 790 _streamTracer->SetSourceData(seed); 837 791 _seedMapper->SetInputData(seed); 838 #else839 _streamTracer->SetSource(seed);840 841 if (oldSeed != NULL) {842 oldSeed->SetPipelineInformation(NULL);843 }844 _seedMapper->SetInput(seed);845 #endif846 792 } 847 793 } … … 892 838 oldSeed = _streamTracer->GetSource(); 893 839 } 894 #ifdef USE_VTK6895 840 _streamTracer->SetSourceData(seed); 896 841 _seedMapper->SetInputData(seed); 897 #else898 _streamTracer->SetSource(seed);899 if (oldSeed != NULL) {900 oldSeed->SetPipelineInformation(NULL);901 }902 903 _seedMapper->SetInput(seed);904 #endif905 842 } 906 843 } … … 969 906 for (int j = 0; j < numPoints; j++) { 970 907 // Get random sweep angle and radius 971 #ifdef USE_VTK6972 908 double angle = getRandomNum(0, 2.0 * vtkMath::Pi()); 973 #else974 double angle = getRandomNum(0, 2.0 * vtkMath::DoublePi());975 #endif976 909 // Need sqrt to get uniform distribution 977 910 double r = sqrt(getRandomNum(minSquared, 1)) * radius; … … 994 927 oldSeed = _streamTracer->GetSource(); 995 928 } 996 #ifdef USE_VTK6997 929 _streamTracer->SetSourceData(seed); 998 930 _seedMapper->SetInputData(seed); 999 #else1000 _streamTracer->SetSource(seed);1001 if (oldSeed != NULL) {1002 oldSeed->SetPipelineInformation(NULL);1003 }1004 1005 _seedMapper->SetInput(seed);1006 #endif1007 931 } 1008 932 } … … 1065 989 _seedMapper->SetInputConnection(seed->GetOutputPort()); 1066 990 } 1067 1068 #ifndef USE_VTK61069 if (oldSeed != NULL) {1070 oldSeed->SetPipelineInformation(NULL);1071 }1072 #endif1073 991 } 1074 992 } … … 1137 1055 1138 1056 double verts[numSides][3]; 1139 #ifdef USE_VTK61140 1057 double sliceTheta = 2.0 * vtkMath::Pi() / (double)numSides; 1141 #else1142 double sliceTheta = 2.0 * vtkMath::DoublePi() / (double)numSides;1143 #endif1144 1058 angle = vtkMath::RadiansFromDegrees(angle); 1145 1059 for (int j = 0; j < numSides; j++) { … … 1185 1099 } 1186 1100 1187 #ifdef USE_VTK61188 1101 _streamTracer->SetSourceData(seed); 1189 1102 _seedMapper->SetInputData(seed); 1190 #else1191 _streamTracer->SetSource(seed);1192 if (oldSeed != NULL) {1193 oldSeed->SetPipelineInformation(NULL);1194 }1195 1196 _seedMapper->SetInput(seed);1197 #endif1198 1103 } 1199 1104 } -
vtkvis/branches/1.8/Volume.cpp
r4650 r5836 121 121 _volumeMapper = vtkSmartPointer<vtkVolumeTextureMapper3D>::New(); 122 122 #endif 123 #ifdef USE_VTK6124 123 #ifdef USE_GPU_RAYCAST_MAPPER 125 124 vtkGPUVolumeRayCastMapper::SafeDownCast(_volumeMapper)->SetInputData(ds); 126 125 #else 127 126 vtkVolumeTextureMapper3D::SafeDownCast(_volumeMapper)->SetInputData(ds); 128 #endif129 #else130 _volumeMapper->SetInput(ds);131 127 #endif 132 128 vtkVolumeMapper::SafeDownCast(_volumeMapper)->SetBlendModeToComposite(); … … 134 130 // DataSet is a 3D point cloud 135 131 vtkSmartPointer<vtkGaussianSplatter> splatter = vtkSmartPointer<vtkGaussianSplatter>::New(); 136 #ifdef USE_VTK6137 132 splatter->SetInputData(ds); 138 #else139 splatter->SetInput(ds);140 #endif141 133 int dims[3]; 142 134 dims[0] = dims[1] = dims[2] = 64; … … 215 207 if (ugrid->GetCellType(0) == VTK_TETRA && 216 208 ugrid->IsHomogeneous()) { 217 #ifdef USE_VTK6218 209 vtkProjectedTetrahedraMapper::SafeDownCast(_volumeMapper)->SetInputData(ds); 219 #else220 _volumeMapper->SetInput(ds);221 #endif222 210 } else { 223 211 // Decompose to tetrahedra 224 212 vtkSmartPointer<vtkDataSetTriangleFilter> filter = 225 213 vtkSmartPointer<vtkDataSetTriangleFilter>::New(); 226 #ifdef USE_VTK6227 214 filter->SetInputData(ugrid); 228 #else229 filter->SetInput(ugrid);230 #endif231 215 filter->TetrahedraOnlyOn(); 232 216 TRACE("Decomposing grid to tets"); -
vtkvis/branches/1.8/Warp.cpp
r5825 r5836 120 120 cellToPtData = 121 121 vtkSmartPointer<vtkCellDataToPointData>::New(); 122 #ifdef USE_VTK6123 122 cellToPtData->SetInputData(ds); 124 #else125 cellToPtData->SetInput(ds);126 #endif127 123 cellToPtData->PassCellDataOn(); 128 124 dsOutput = cellToPtData->GetOutputPort();
Note: See TracChangeset
for help on using the changeset viewer.