Skip to content

Commit

Permalink
COMP: Remove legacy VTK APIs to prepare switching to VTK-8.90
Browse files Browse the repository at this point in the history
  • Loading branch information
Andras Lasso committed Nov 12, 2019
1 parent 49e4038 commit b9f1ef5
Show file tree
Hide file tree
Showing 31 changed files with 114 additions and 41 deletions.
4 changes: 2 additions & 2 deletions Base/QTGUI/Testing/Cxx/qSlicerWidgetTest2.cxx
Expand Up @@ -182,7 +182,7 @@ int qSlicerWidgetTest2(int argc, char * argv[] )

vtkWidget->setParent(&parentWidget);
vbox.addWidget(vtkWidget);
vtkWidget->GetRenderWindow()->Render();
vtkWidget->renderWindow()->Render();

#ifdef Slicer_BUILD_WEBENGINE_SUPPORT
QWebEngineView webView;
Expand All @@ -197,7 +197,7 @@ int qSlicerWidgetTest2(int argc, char * argv[] )
parentWidget.raise();

vtkMRMLSliceLogic *sliceLogic = setupSliceDisplay(
scene, vtkWidget->GetRenderWindow(), argv[1] );
scene, vtkWidget->renderWindow(), argv[1] );


if (argc < 3 || QString(argv[2]) != "-I")
Expand Down
4 changes: 4 additions & 0 deletions Libs/FreeSurfer/vtkFSLookupTable.h
Expand Up @@ -155,6 +155,10 @@ class VTK_FreeSurfer_EXPORT vtkFSLookupTable : public vtkLookupTable
///
/// output of colour computation
unsigned char RGBA[4];

private:
vtkFSLookupTable(const vtkFSLookupTable&) = delete;
void operator=(const vtkFSLookupTable&) = delete;
};

#endif
4 changes: 4 additions & 0 deletions Libs/FreeSurfer/vtkFSSurfaceHelper.h
Expand Up @@ -37,6 +37,10 @@ class VTK_FreeSurfer_EXPORT vtkFSSurfaceHelper: public vtkObject

protected:
vtkFSSurfaceHelper();

private:
vtkFSSurfaceHelper(const vtkFSSurfaceHelper&) = delete;
void operator=(const vtkFSSurfaceHelper&) = delete;
};

#endif
2 changes: 1 addition & 1 deletion Libs/MRML/Logic/vtkArchive.cxx
Expand Up @@ -370,7 +370,7 @@ bool zip(const char* zipFileName, const char* directoryToZip)
return false;
}

std::vector<vtksys::String> directoryParts;
std::vector<std::string> directoryParts;
directoryParts = vtksys::SystemTools::SplitString(directoryToZip, '/', true);
std::string directoryName = directoryParts.back();

Expand Down
4 changes: 4 additions & 0 deletions Libs/MRML/Logic/vtkImageLabelOutline.h
Expand Up @@ -51,6 +51,10 @@ class VTK_MRML_LOGIC_EXPORT vtkImageLabelOutline : public vtkImageNeighborhoodFi

void ThreadedExecute(vtkImageData *inData, vtkImageData *outData,
int extent[6], int id) override;

private:
vtkImageLabelOutline(const vtkImageLabelOutline&) = delete;
void operator=(const vtkImageLabelOutline&) = delete;
};

#endif
4 changes: 4 additions & 0 deletions Libs/MRML/Logic/vtkImageNeighborhoodFilter.h
Expand Up @@ -63,6 +63,10 @@ class VTK_MRML_LOGIC_EXPORT vtkImageNeighborhoodFilter : public vtkImageSpatialA

int Neighbor;
unsigned char *Mask;

private:
vtkImageNeighborhoodFilter(const vtkImageNeighborhoodFilter&) = delete;
void operator=(const vtkImageNeighborhoodFilter&) = delete;
};

#endif
Expand Up @@ -80,7 +80,7 @@ class qSlicerLayoutCustomSliceViewFactory
// there is a unique slice widget per node
Q_ASSERT(!this->viewWidget(viewNode));

this->LastNode = viewNode;
this->LastNode = vtkMRMLSliceNode::SafeDownCast(viewNode);

qMRMLSliceWidget * sliceWidget = new qMRMLSliceWidget(this->layoutManager()->viewport());
sliceWidget->sliceController()->setControllerButtonGroup(this->SliceControllerButtonGroup);
Expand Down Expand Up @@ -178,7 +178,7 @@ class qMRMLLayoutCustomViewFactory
// There must be a unique Custom widget per node
Q_ASSERT(!this->viewWidget(viewNode));

this->LastNode = viewNode;
this->LastNode = vtkMRMLSliceNode::SafeDownCast(viewNode);

QLabel* label = new QLabel();
label->setText("This is a custom view");
Expand Down
2 changes: 1 addition & 1 deletion Libs/MRML/Widgets/qMRMLPlotView.cxx
Expand Up @@ -1125,7 +1125,7 @@ void qMRMLPlotView::saveAsSVG(const QString &filePathPrefix)

exporter->SetFileFormatToSVG();
exporter->CompressOff();
exporter->SetRenderWindow(this->GetRenderWindow());
exporter->SetRenderWindow(this->renderWindow());
exporter->SetFilePrefix(filePathPrefix.toStdString().c_str());
exporter->Update();
}
2 changes: 1 addition & 1 deletion Libs/MRML/Widgets/qMRMLTableViewControllerWidget.cxx
Expand Up @@ -163,7 +163,7 @@ void qMRMLTableViewControllerWidgetPrivate::onTableNodeSelected(vtkMRMLNode * no

this->qvtkReconnect(this->TableNode, node, vtkCommand::ModifiedEvent,
q, SLOT(updateWidgetFromMRML()));
this->TableNode = node;
this->TableNode = vtkMRMLTableNode::SafeDownCast(node);

this->TableViewNode->SetTableNodeID(this->TableNode ? this->TableNode->GetID() : nullptr);

Expand Down
4 changes: 4 additions & 0 deletions Libs/vtkITK/vtkITKArchetypeDiffusionTensorImageReaderFile.h
Expand Up @@ -35,6 +35,10 @@ class VTK_ITK_EXPORT vtkITKArchetypeDiffusionTensorImageReaderFile
int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
static void ReadProgressCallback(itk::ProcessObject* obj,const itk::ProgressEvent&, void* data);
/// private:

private:
vtkITKArchetypeDiffusionTensorImageReaderFile(const vtkITKArchetypeDiffusionTensorImageReaderFile&) = delete;
void operator=(const vtkITKArchetypeDiffusionTensorImageReaderFile&) = delete;
};

#endif
4 changes: 4 additions & 0 deletions Libs/vtkITK/vtkITKArchetypeImageSeriesScalarReader.h
Expand Up @@ -34,6 +34,10 @@ class VTK_ITK_EXPORT vtkITKArchetypeImageSeriesScalarReader : public vtkITKArche
int RequestData(vtkInformation* request, vtkInformationVector** inputVector, vtkInformationVector* outputVector) override;
static void ReadProgressCallback(itk::ProcessObject* obj,const itk::ProgressEvent&, void* data);
/// private:

private:
vtkITKArchetypeImageSeriesScalarReader(const vtkITKArchetypeImageSeriesScalarReader&) = delete;
void operator=(const vtkITKArchetypeImageSeriesScalarReader&) = delete;
};

#endif
5 changes: 4 additions & 1 deletion Libs/vtkITK/vtkITKArchetypeImageSeriesVectorReaderFile.h
Expand Up @@ -33,7 +33,10 @@ class VTK_ITK_EXPORT vtkITKArchetypeImageSeriesVectorReaderFile : public vtkITKA

void ExecuteDataWithInformation(vtkDataObject *output, vtkInformation *outInfo) override;
static void ReadProgressCallback(itk::ProcessObject* obj,const itk::ProgressEvent&, void* data);
/// private:

private:
vtkITKArchetypeImageSeriesVectorReaderFile(const vtkITKArchetypeImageSeriesVectorReaderFile&) = delete;
void operator=(const vtkITKArchetypeImageSeriesVectorReaderFile&) = delete;
};

#endif
4 changes: 4 additions & 0 deletions Libs/vtkITK/vtkITKArchetypeImageSeriesVectorReaderSeries.h
Expand Up @@ -38,6 +38,10 @@ class VTK_ITK_EXPORT vtkITKArchetypeImageSeriesVectorReaderSeries : public vtkIT
~vtkITKArchetypeImageSeriesVectorReaderSeries() override;

void ExecuteDataWithInformation(vtkDataObject *output, vtkInformation *outInfo) override;

private:
vtkITKArchetypeImageSeriesVectorReaderSeries(const vtkITKArchetypeImageSeriesVectorReaderSeries&) = delete;
void operator=(const vtkITKArchetypeImageSeriesVectorReaderSeries&) = delete;
};

#endif
Expand Up @@ -95,13 +95,15 @@ class vtkSegmentationCore_EXPORT vtkBinaryLabelmapToClosedSurfaceConversionRule
protected:
vtkBinaryLabelmapToClosedSurfaceConversionRule();
~vtkBinaryLabelmapToClosedSurfaceConversionRule() override;
void operator=(const vtkBinaryLabelmapToClosedSurfaceConversionRule&);

protected:
/// Cache for storing merged closed surfaces that have been joint smoothed
/// The key used is the binary labelmap representation, which maps to the combined vtkPolyData containing surfaces for all segments in the segmentation
std::map<vtkOrientedImageData*, vtkSmartPointer<vtkPolyData> > JointSmoothCache;

private:
vtkBinaryLabelmapToClosedSurfaceConversionRule(const vtkBinaryLabelmapToClosedSurfaceConversionRule&) = delete;
void operator=(const vtkBinaryLabelmapToClosedSurfaceConversionRule&) = delete;
};

#endif // __vtkBinaryLabelmapToClosedSurfaceConversionRule_h
Expand Up @@ -109,7 +109,10 @@ class vtkSegmentationCore_EXPORT vtkClosedSurfaceToBinaryLabelmapConversionRule
protected:
vtkClosedSurfaceToBinaryLabelmapConversionRule();
~vtkClosedSurfaceToBinaryLabelmapConversionRule() override;
void operator=(const vtkClosedSurfaceToBinaryLabelmapConversionRule&);

private:
vtkClosedSurfaceToBinaryLabelmapConversionRule(const vtkClosedSurfaceToBinaryLabelmapConversionRule&) = delete;
void operator=(const vtkClosedSurfaceToBinaryLabelmapConversionRule&) = delete;
};

#endif // __vtkClosedSurfaceToBinaryLabelmapConversionRule_h
Expand Up @@ -84,7 +84,10 @@ class vtkSegmentationCore_EXPORT vtkClosedSurfaceToFractionalLabelmapConversionR

vtkClosedSurfaceToFractionalLabelmapConversionRule();
~vtkClosedSurfaceToFractionalLabelmapConversionRule() override;
void operator=(const vtkClosedSurfaceToFractionalLabelmapConversionRule&);

private:
vtkClosedSurfaceToFractionalLabelmapConversionRule(const vtkClosedSurfaceToFractionalLabelmapConversionRule&) = delete;
void operator=(const vtkClosedSurfaceToFractionalLabelmapConversionRule&) = delete;
};

#endif // __vtkClosedSurfaceToFractionalLabelmapConversionRule_h
Expand Up @@ -79,7 +79,10 @@ class vtkSegmentationCore_EXPORT vtkFractionalLabelmapToClosedSurfaceConversionR
protected:
vtkFractionalLabelmapToClosedSurfaceConversionRule();
~vtkFractionalLabelmapToClosedSurfaceConversionRule() override;
void operator=(const vtkFractionalLabelmapToClosedSurfaceConversionRule&);

private:
vtkFractionalLabelmapToClosedSurfaceConversionRule(const vtkFractionalLabelmapToClosedSurfaceConversionRule&) = delete;
void operator=(const vtkFractionalLabelmapToClosedSurfaceConversionRule&) = delete;
};

#endif // __vtkFractionalLabelmapToClosedSurfaceConversionRule_h
5 changes: 4 additions & 1 deletion Libs/vtkSegmentationCore/vtkSegment.h
Expand Up @@ -141,7 +141,6 @@ class vtkSegmentationCore_EXPORT vtkSegment : public vtkObject
protected:
vtkSegment();
~vtkSegment() override;
void operator=(const vtkSegment&);

protected:
/// Stored representations. Map from type string to data object
Expand All @@ -153,6 +152,10 @@ class vtkSegmentationCore_EXPORT vtkSegment : public vtkObject
bool NameAutoGenerated;
bool ColorAutoGenerated;
int LabelValue;

private:
vtkSegment(const vtkSegment&) = delete;
void operator=(const vtkSegment&) = delete;
};

#endif // __vtkSegment_h
5 changes: 4 additions & 1 deletion Libs/vtkSegmentationCore/vtkSegmentation.h
Expand Up @@ -504,7 +504,6 @@ class vtkSegmentationCore_EXPORT vtkSegmentation : public vtkObject
protected:
vtkSegmentation();
~vtkSegmentation() override;
void operator=(const vtkSegmentation&);

protected:
/// Container of segments that belong to this segmentation
Expand Down Expand Up @@ -543,6 +542,10 @@ class vtkSegmentationCore_EXPORT vtkSegmentation : public vtkObject
friend class vtkMRMLSegmentationNode;
friend class vtkSlicerSegmentationsModuleLogic;
friend class qMRMLSegmentEditorWidgetPrivate;

private:
vtkSegmentation(const vtkSegmentation&) = delete;
void operator=(const vtkSegmentation&) = delete;
};

#endif // __vtkSegmentation_h
5 changes: 4 additions & 1 deletion Libs/vtkSegmentationCore/vtkSegmentationConverter.h
Expand Up @@ -170,7 +170,6 @@ class vtkSegmentationCore_EXPORT vtkSegmentationConverter : public vtkObject
protected:
vtkSegmentationConverter();
~vtkSegmentationConverter() override;
void operator=(const vtkSegmentationConverter&);

protected:
/// Converter rules. When the class is created it contains just the default converter rules but then
Expand All @@ -185,6 +184,10 @@ class vtkSegmentationCore_EXPORT vtkSegmentationConverter : public vtkObject

/// Source representation to target representation rule graph
RepresentationToRepresentationToRuleMapType RulesGraph;

private:
vtkSegmentationConverter(const vtkSegmentationConverter&) = delete;
void operator=(const vtkSegmentationConverter&) = delete;
};

#endif // __vtkSegmentationConverter_h
5 changes: 4 additions & 1 deletion Libs/vtkSegmentationCore/vtkSegmentationHistory.h
Expand Up @@ -99,7 +99,6 @@ class vtkSegmentationCore_EXPORT vtkSegmentationHistory : public vtkObject
protected:
vtkSegmentationHistory();
~vtkSegmentationHistory() override;
void operator=(const vtkSegmentationHistory&);

/// Deep copies source segment to destination segment. If the same representation is found in baseline
/// with up-to-date timestamp then the representation is reused from baseline.
Expand All @@ -125,6 +124,10 @@ class vtkSegmentationCore_EXPORT vtkSegmentationHistory : public vtkObject
unsigned int LastRestoredState;

bool RestoreStateInProgress;

private:
vtkSegmentationHistory(const vtkSegmentationHistory&) = delete;
void operator=(const vtkSegmentationHistory&) = delete;
};

#endif // __vtkSegmentation_h
Expand Up @@ -311,7 +311,9 @@ class VTK_SLICER_ANNOTATIONS_MODULE_LOGIC_EXPORT vtkSlicerAnnotationModuleLogic
/// a parent to the new hierarchy node. Return true on success, false on failure.
bool AddHierarchyNodeForAnnotation(vtkMRMLAnnotationNode* annotationNode=nullptr);


private:
vtkSlicerAnnotationModuleLogic(const vtkSlicerAnnotationModuleLogic&) = delete;
void operator=(const vtkSlicerAnnotationModuleLogic&) = delete;
};

#endif
Expand Up @@ -421,7 +421,7 @@ void qSlicerCropVolumeModuleWidget::setInputVolume(vtkMRMLNode* volumeNode)
}

qvtkReconnect(d->InputVolumeNode, volumeNode, vtkCommand::ModifiedEvent, this, SLOT(updateVolumeInfo()));
d->InputVolumeNode = volumeNode;
d->InputVolumeNode = vtkMRMLVolumeNode::SafeDownCast(volumeNode);
d->ParametersNode->SetInputVolumeNodeID(volumeNode ? volumeNode->GetID() : nullptr);
}

Expand Down
Expand Up @@ -105,6 +105,9 @@ class VTK_SLICER_SCENEVIEWS_MODULE_LOGIC_EXPORT vtkSlicerSceneViewsModuleLogic :

std::string m_StringHolder;

private:
vtkSlicerSceneViewsModuleLogic(const vtkSlicerSceneViewsModuleLogic&) = delete;
void operator=(const vtkSlicerSceneViewsModuleLogic&) = delete;
};

#endif
4 changes: 4 additions & 0 deletions Modules/Loadable/Segmentations/Logic/vtkImageGrowCutSegment.h
Expand Up @@ -39,6 +39,10 @@ class VTK_SLICER_SEGMENTATIONS_LOGIC_EXPORT vtkImageGrowCutSegment : public vtkI
private:
class vtkInternal;
vtkInternal * Internal;

private:
vtkImageGrowCutSegment(const vtkImageGrowCutSegment&) = delete;
void operator=(const vtkImageGrowCutSegment&) = delete;
};

#endif
Expand Up @@ -1893,7 +1893,7 @@ bool vtkSlicerTerminologiesModuleLogic::DeserializeTerminologyEntry(std::string
entry->SetTerminologyContextName(terminologyName.empty()?nullptr:terminologyName.c_str());

// Category
std::vector<vtksys::String> categoryIds = vtksys::SystemTools::SplitString(entryComponents[1], '^');
std::vector<std::string> categoryIds = vtksys::SystemTools::SplitString(entryComponents[1], '^');
if (categoryIds.size() != 3)
{
vtkErrorWithObjectMacro(entry, "DeserializeTerminologyEntry: Invalid category component");
Expand All @@ -1909,7 +1909,7 @@ bool vtkSlicerTerminologiesModuleLogic::DeserializeTerminologyEntry(std::string
entry->GetCategoryObject()->Copy(categoryObject);

// Type
std::vector<vtksys::String> typeIds = vtksys::SystemTools::SplitString(entryComponents[2], '^');
std::vector<std::string> typeIds = vtksys::SystemTools::SplitString(entryComponents[2], '^');
if (typeIds.size() != 3)
{
vtkErrorWithObjectMacro(entry, "DeserializeTerminologyEntry: Invalid type component");
Expand All @@ -1925,7 +1925,7 @@ bool vtkSlicerTerminologiesModuleLogic::DeserializeTerminologyEntry(std::string
entry->GetTypeObject()->Copy(typeObject);

// Type modifier (optional)
std::vector<vtksys::String> typeModifierIds = vtksys::SystemTools::SplitString(entryComponents[3], '^');
std::vector<std::string> typeModifierIds = vtksys::SystemTools::SplitString(entryComponents[3], '^');
if (typeModifierIds.size() == 3)
{
vtkSlicerTerminologiesModuleLogic::CodeIdentifier typeModifierId(typeModifierIds[0], typeModifierIds[1], typeModifierIds[2]);
Expand All @@ -1945,7 +1945,7 @@ bool vtkSlicerTerminologiesModuleLogic::DeserializeTerminologyEntry(std::string
entry->SetAnatomicContextName(anatomicContextName.empty()?nullptr:anatomicContextName.c_str());

// Anatomic region (optional)
std::vector<vtksys::String> regionIds = vtksys::SystemTools::SplitString(entryComponents[5], '^');
std::vector<std::string> regionIds = vtksys::SystemTools::SplitString(entryComponents[5], '^');
if (regionIds.size() == 3)
{
vtkSlicerTerminologiesModuleLogic::CodeIdentifier regionId(regionIds[0], regionIds[1], regionIds[2]);
Expand All @@ -1960,7 +1960,7 @@ bool vtkSlicerTerminologiesModuleLogic::DeserializeTerminologyEntry(std::string
}

// Anatomic region modifier (optional)
std::vector<vtksys::String> regionModifierIds = vtksys::SystemTools::SplitString(entryComponents[6], '^');
std::vector<std::string> regionModifierIds = vtksys::SystemTools::SplitString(entryComponents[6], '^');
if (regionModifierIds.size() == 3)
{
vtkSlicerTerminologiesModuleLogic::CodeIdentifier regionModifierId(regionModifierIds[0], regionModifierIds[1], regionModifierIds[2]);
Expand Down

0 comments on commit b9f1ef5

Please sign in to comment.