#include "vvSlicerManagerCommand.h"
#include "vvInteractorStyleNavigator.h"
#include "vvLandmarks.h"
-#include "vvImageReader.h"
-#include "vvImageReader.h"
#include "vvMesh.h"
#include "vvImageMapToWLColors.h"
#include "vvBlendImageActor.h"
mFusionWindow = 1000;
mFusionLevel = 1000;
- mReader = NULL;
- mImage = NULL;
- mVF=NULL;
- mVectorReader = NULL;
- mOverlayReader = NULL;
- mFusionReader = NULL;
mLandmarks = NULL;
mLinkedId.resize(0);
- for ( int i = 0; i < numberOfSlicers; i++) {
- vvSlicer *slicer = vvSlicer::New();
- mSlicers.push_back(slicer);
- }
+ for ( int i = 0; i < numberOfSlicers; i++)
+ mSlicers.push_back(vtkSmartPointer<vvSlicer>::New());
+
mPreviousSlice.resize(numberOfSlicers);
mPreviousTSlice.resize(numberOfSlicers);
}
//----------------------------------------------------------------------------
vvSlicerManager::~vvSlicerManager()
{
- for ( unsigned int i = 0; i < mSlicers.size(); i++) {
- if (mSlicers[i] != NULL)
- mSlicers[i]->Delete();
- }
- if (mReader) {
- delete mReader;
- }
- if (mVectorReader) {
- delete mVectorReader;
- }
- if (mOverlayReader) {
- delete mOverlayReader;
- }
- if (mFusionReader) {
- delete mFusionReader;
- }
if (mLandmarks)
delete mLandmarks;
}
bool vvSlicerManager::SetImage(std::string filename, LoadedImageType type, int n, unsigned int slice)
{
mType = type;
- if (mReader == NULL)
- mReader = new vvImageReader;
+ if (mReader.IsNull())
+ mReader = vvImageReader::New();
std::vector<std::string> filenames;
filenames.push_back(filename);
mReader->SetInputFilenames(filenames);
mFileName = vtksys::SystemTools::GetFilenameName(mFileName);
mFileName = fileWithoutExtension + vtksys::SystemTools::GetFilenameExtension(filenames[0]);
- if (mReader == NULL)
- mReader = new vvImageReader;
+ if (mReader.IsNull())
+ mReader = vvImageReader::New();
mReader->SetInputFilenames(filenames);
mReader->Update(type);
mLastError = " Overlay dimension cannot be greater then reference image!";
return false;
}
- if (mOverlayReader == NULL)
- mOverlayReader = new vvImageReader;
+ if (mOverlayReader.IsNull())
+ mOverlayReader = vvImageReader::New();
std::vector<std::string> filenames;
filenames.push_back(filename);
mOverlayReader->SetInputFilenames(filenames);
mLastError = " Overlay dimension cannot be greater then reference image!";
return false;
}
- if (mFusionReader == NULL)
- mFusionReader = new vvImageReader;
+ if (mFusionReader.IsNull())
+ mFusionReader = vvImageReader::New();
std::vector<std::string> filenames;
filenames.push_back(filename);
mFusionReader->SetInputFilenames(filenames);
//----------------------------------------------------------------------------
bool vvSlicerManager::SetVF(std::string filename)
{
- if (mVectorReader == NULL)
- mVectorReader = new vvImageReader;
+ if (mVectorReader.IsNull())
+ mVectorReader = vvImageReader::New();
mVectorReader->SetInputFilename(filename);
mVectorReader->Update(VECTORFIELD);
if (mVectorReader->GetLastError().size() != 0) {
//----------------------------------------------------------------------------
//----------------------------------------------------------------------------
-void vvSlicerManager::SetCursorVisibility(int s)
+void vvSlicerManager::SetCursorAndCornerAnnotationVisibility(int s)
{
for ( unsigned int i = 0; i < mSlicers.size(); i++) {
mSlicers[i]->SetCursorVisibility(s);
+ mSlicers[i]->SetCornerAnnotationVisibility(s);
}
}
//----------------------------------------------------------------------------
-
//----------------------------------------------------------------------------
void vvSlicerManager::SetOpacity(int i, double factor)
{
//----------------------------------------------------------------------------
void vvSlicerManager::RemoveActor(const std::string& actor_type, int overlay_index)
{
- if (actor_type =="overlay") {
- delete mOverlayReader;
+ if (actor_type =="overlay")
mOverlayReader = NULL;
- }
- if (actor_type =="fusion") {
- delete mFusionReader;
+ if (actor_type =="fusion")
mFusionReader = NULL;
- }
- for (unsigned int i = 0; i < mSlicers.size(); i++) {
+ for (unsigned int i = 0; i < mSlicers.size(); i++)
mSlicers[i]->RemoveActor(actor_type,overlay_index);
- }
+
if (actor_type=="vector") {
mVF=NULL;
- if (mVectorReader) {
- delete mVectorReader;
- mVectorReader=NULL;
- }
+ mVectorReader=NULL;
}
}
//----------------------------------------------------------------------------