X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvToolStructureSetManager.cxx;h=a169c087cfcea1538a77329cbb0410cb4b9c7ce4;hb=8b99436ccbdc216bb3e327ad2e9fa17d9882157e;hp=a698e3c5e4ca95a80ea07c5eab6dc38ff66654c2;hpb=1f2d49aa5d3d0e8d5913967e5464505e6f7a61c5;p=clitk.git diff --git a/vv/vvToolStructureSetManager.cxx b/vv/vvToolStructureSetManager.cxx index a698e3c..a169c08 100644 --- a/vv/vvToolStructureSetManager.cxx +++ b/vv/vvToolStructureSetManager.cxx @@ -3,7 +3,7 @@ Authors belong to: - University of LYON http://www.universite-lyon.fr/ - - Léon Bérard cancer center http://oncora1.lyon.fnclcc.fr + - Léon Bérard cancer center http://www.centreleonberard.fr - CREATIS CNRS laboratory http://www.creatis.insa-lyon.fr This software is distributed WITHOUT ANY WARRANTY; without even @@ -14,7 +14,7 @@ - BSD See included LICENSE.txt file - CeCILL-B http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html - ======================================================================-====*/ + ===========================================================================**/ // vv #include "vvToolStructureSetManager.h" @@ -27,7 +27,8 @@ #include #include #include - +#include + // vtk #include #include @@ -38,37 +39,30 @@ ADD_TOOL(vvToolStructureSetManager); //------------------------------------------------------------------------------ +int vvToolStructureSetManager::m_NumberOfTool = 0; +std::vector vvToolStructureSetManager::mListOfInputs; +std::map vvToolStructureSetManager::mListOfOpenTool; + //------------------------------------------------------------------------------ -vvToolStructureSetManager::vvToolStructureSetManager(vvMainWindowBase * parent, Qt::WindowFlags f) - :vvToolWidgetBase(parent, f),//, true), - vvToolBase(parent), - Ui::vvToolStructureSetManager() +vvToolStructureSetManager::vvToolStructureSetManager(vvMainWindowBase * parent, + Qt::WindowFlags f, + vvSlicerManager * current): + vvToolWidgetBase(parent, f), + // if Qt::Widget -> No dialog in this case (in tab) ; PB = "invisible widget on menu" ! + // if "f" normal widget + vvToolBase(parent), + Ui::vvToolStructureSetManager() { - // Setup the UI - /* - QWidget * aw = new QWidget(parent, f); - QVBoxLayout * verticalLayout = new QVBoxLayout(aw); - verticalLayout->addWidget(mToolInputSelectionWidget); - verticalLayout->addWidget(mToolWidget); - aw->setLayout(verticalLayout); - */ Ui_vvToolStructureSetManager::setupUi(mToolWidget); - // ---------------- - // Essai TAB - /* - //int a = mMainWindowBase->GetTab()->addTab(mToolWidget, "Toto"); - int a = mMainWindowBase->GetTab()->addTab(aw, "Toto"); - - // essai avec mToolWidget ? ok mais frame à cacher ... - // Changer le construceur par defautl de widgetbase -> pas dialog, pas parent (cf doc) - mMainWindowBase->GetTab()->setCurrentIndex(a); - mMainWindowBase->GetTab()->setTabIcon(a, QIcon(vvToolCreator::GetInstance()->mToolIconFilename)); - DD(this->width()); - */ - // --------------- - + // this->setFixedWidth(120); + m_NumberOfTool++; + mCurrentStructureSetActor = 0; + connect(mCloseButton, SIGNAL(clicked()), this, SLOT(close())); + mCloseButton->setVisible(false); mTree->clear(); + mTree->header()->resizeSection(0, 30); + mMainWindowBase->GetTab()->setTabIcon(mTabNumber, GetToolIcon()); mCurrentStructureSet = NULL; mCurrentStructureSetIndex = -1; mGroupBoxROI->setEnabled(false); @@ -76,8 +70,8 @@ vvToolStructureSetManager::vvToolStructureSetManager(vvMainWindowBase * parent, mIsAllVisibleEnabled = false; mNumberOfVisibleROI = 0; mNumberOfVisibleContourROI = 0; - mDefaultLUTColor = vtkLookupTable::New(); - for(unsigned int i=0; iGetNumberOfTableValues(); i++) { + mDefaultLUTColor = vtkSmartPointer::New(); + for(int i=0; iGetNumberOfTableValues(); i++) { double r = (rand()/(RAND_MAX+1.0)); double v = (rand()/(RAND_MAX+1.0)); double b = (rand()/(RAND_MAX+1.0)); @@ -87,7 +81,18 @@ vvToolStructureSetManager::vvToolStructureSetManager(vvMainWindowBase * parent, #include "vvDefaultLut.h" // Add input selector - AddInputSelector("Select image"); + if (current == NULL) { + MustOpenDialogWhenCreated = true; + AddInputSelector("Select image"); + } + else { + MustOpenDialogWhenCreated = false; + mMainButtonBox->setEnabled(true); + mCurrentSlicerManager = current; + mCurrentImage = mCurrentSlicerManager->GetImage(); + mToolWidget->setEnabled(true); + InputIsSelected(mCurrentSlicerManager); + } } //------------------------------------------------------------------------------ @@ -95,16 +100,26 @@ vvToolStructureSetManager::vvToolStructureSetManager(vvMainWindowBase * parent, //------------------------------------------------------------------------------ vvToolStructureSetManager::~vvToolStructureSetManager() { + m_NumberOfTool--; + + // clearing the list at this point avoids + // segfaulting due to events being dispatched + // after object destruction + mTreeWidgetList.clear(); + mTree->clearSelection(); + + //std::cout << "vvToolStructureSetManager::~vvToolStructureSetManager()" << std::endl; } //------------------------------------------------------------------------------ //------------------------------------------------------------------------------ +// STATIC void vvToolStructureSetManager::Initialize() { - SetToolName("ROIManager"); - SetToolMenuName("Display ROI"); - SetToolIconFilename(":/common/icons/ducky.png"); - SetToolTip("Display ROI from label image."); + SetToolName("ROIManager_OLD"); + SetToolMenuName("Display ROI (binary image)"); + SetToolIconFilename(":/common/icons/tool-roi.png"); + SetToolTip("Display ROI from a binary image."); SetToolExperimental(true); } //------------------------------------------------------------------------------ @@ -113,15 +128,28 @@ void vvToolStructureSetManager::Initialize() { //------------------------------------------------------------------------------ void vvToolStructureSetManager::InputIsSelected(vvSlicerManager *m) { + //std::cout << "vvToolStructureSetManager::InputIsSelected()" << std::endl; + + //int mTabNumber = parent->GetTab()->addTab(this, ""); + // this->setFixedWidth(120); + //this->setPreferedHeight(441); // Refuse if 4D if (mCurrentImage->GetNumberOfDimensions() != 3) { QMessageBox::information(this,tr("Sorry only 3D yet"), tr("Sorry only 3D yet")); close(); - // return; + return; } // Hide selector HideInputSelector(); // splitter - // mToolInputSelectionWidget->hide(); + mToolInputSelectionWidget->hide(); + mLabelInputInfo->setText(QString("%1").arg(m->GetFileName().c_str())); + + // add to instance + // if (!isWindow()) { + mListOfInputs.push_back(mCurrentSlicerManager); + mListOfOpenTool[mCurrentSlicerManager] = this; + // } + // Connect open menus connect(mOpenBinaryButton, SIGNAL(clicked()), this, SLOT(OpenBinaryImage())); connect(mTree, SIGNAL(itemSelectionChanged()), this, SLOT(SelectedItemChangedInTree())); @@ -131,9 +159,14 @@ void vvToolStructureSetManager::InputIsSelected(vvSlicerManager *m) connect(mContourCheckBoxShow, SIGNAL(toggled(bool)), this, SLOT(VisibleContourROIToggled(bool))); connect(mChangeContourColorButton, SIGNAL(clicked()), this, SLOT(ChangeContourColor())); connect(mContourWidthSpinBox, SIGNAL(valueChanged(int)), this, SLOT(ChangeContourWidth(int))); + connect(mDepthSpinBox, SIGNAL(valueChanged(int)), this, SLOT(ChangeDepth(int))); connect(mReloadButton, SIGNAL(clicked()), this, SLOT(ReloadCurrentROI())); connect(mCheckBoxShowAll, SIGNAL(stateChanged(int)), this, SLOT(AllVisibleROIToggled(int))); connect(mContourCheckBoxShowAll, SIGNAL(toggled(bool)), this, SLOT(AllVisibleContourROIToggled(bool))); + + // Browse to load image + if (MustOpenDialogWhenCreated) + OpenBinaryImage(); } //------------------------------------------------------------------------------ @@ -152,14 +185,19 @@ void vvToolStructureSetManager::Open(int type) { //------------------------------------------------------------------------------ void vvToolStructureSetManager::AddRoiInTreeWidget(clitk::DicomRT_ROI * roi, QTreeWidget * ww) { - QTreeWidgetItem * w = new QTreeWidgetItem(ww); + mTreeWidgetList.push_back(QSharedPointer(new QTreeWidgetItem(ww))); + QTreeWidgetItem * w = mTreeWidgetList.back().data(); w->setText(0, QString("%1").arg(roi->GetROINumber())); w->setText(1, QString("%1").arg(roi->GetName().c_str())); + vvROIActor * actor = mStructureSetActorsList[0]->GetROIActor(roi->GetROINumber()); + w->setText(3, QString("%1").arg(actor->GetDepth())); QBrush brush(QColor(roi->GetDisplayColor()[0]*255, roi->GetDisplayColor()[1]*255, roi->GetDisplayColor()[2]*255)); brush.setStyle(Qt::SolidPattern); w->setBackground(2, brush); mMapROIToTreeWidget[roi] = w; mMapTreeWidgetToROI[w] = roi; + mTree->resizeColumnToContents(0); + mTree->resizeColumnToContents(1); } //------------------------------------------------------------------------------ @@ -167,11 +205,19 @@ void vvToolStructureSetManager::AddRoiInTreeWidget(clitk::DicomRT_ROI * roi, QTr //------------------------------------------------------------------------------ void vvToolStructureSetManager::UpdateStructureSetInTreeWidget(int index, clitk::DicomRT_StructureSet * s) { // Insert ROI - const std::vector & rois = s->GetListOfROI(); + /* + const std::vector & rois = s->GetListOfROI(); for(unsigned int i=0; iGetROIs().begin(); iter != s->GetROIs().end(); iter++) { + clitk::DicomRT_ROI::Pointer roi = iter->second; + if (mMapROIToTreeWidget.find(roi) == mMapROIToTreeWidget.end()) + AddRoiInTreeWidget(roi, mTree); // replace mTree with ss if several SS + } } //------------------------------------------------------------------------------ @@ -179,7 +225,9 @@ void vvToolStructureSetManager::UpdateStructureSetInTreeWidget(int index, clitk: //------------------------------------------------------------------------------ int vvToolStructureSetManager::AddStructureSet(clitk::DicomRT_StructureSet * mStructureSet) { // Create actor for this SS - vvStructureSetActor * mStructureSetActor = new vvStructureSetActor; + + QSharedPointer mStructureSetActor(new vvStructureSetActor); + mStructureSetActor->SetStructureSet(mStructureSet); mStructureSetActor->SetSlicerManager(mCurrentSlicerManager); // Insert in lists and get index @@ -193,11 +241,12 @@ int vvToolStructureSetManager::AddStructureSet(clitk::DicomRT_StructureSet * mSt //------------------------------------------------------------------------------ -void vvToolStructureSetManager::OpenBinaryImage() { +void vvToolStructureSetManager::OpenBinaryImage() +{ int index; if (mCurrentStructureSet == NULL) { if (mStructureSetsList.size() == 0) { // Create a default SS - clitk::DicomRT_StructureSet * mStructureSet = new clitk::DicomRT_StructureSet; + clitk::DicomRT_StructureSet::Pointer mStructureSet = clitk::DicomRT_StructureSet::New(); index = AddStructureSet(mStructureSet); } else { // Get first SS @@ -207,82 +256,118 @@ void vvToolStructureSetManager::OpenBinaryImage() { index = mCurrentStructureSetIndex; } mCurrentStructureSet = mStructureSetsList[index]; - mCurrentStructureSetActor = mStructureSetActorsList[index]; + mCurrentStructureSetActor = mStructureSetActorsList[index].data(); mCurrentStructureSetIndex = index; // Open images - QString Extensions = "Images files ( *.mhd *.hdr *.his)"; + QString Extensions = "Images files ( *.mha *.mhd *.hdr *.his)"; Extensions += ";;All Files (*)"; QStringList filename = QFileDialog::getOpenFileNames(this,tr("Open binary image"), mMainWindowBase->GetInputPathName(),Extensions); if (filename.size() == 0) return; - std::vector mLoadedROIIndex; + mLoadedROIIndex.clear(); for(int i=0; i filenames; filenames.push_back(filename[i].toStdString()); - mReader->SetInputFilenames(filenames); - mReader->Update(IMAGE); + reader->SetInputFilenames(filenames); + reader->Update(vvImageReader::IMAGE); QApplication::restoreOverrideCursor(); - if (mReader->GetLastError().size() != 0) { + if (reader->GetLastError().size() != 0) { std::cerr << "Error while reading " << filename[i].toStdString() << std::endl; QString error = "Cannot open file \n"; - error += mReader->GetLastError().c_str(); + error += reader->GetLastError().c_str(); QMessageBox::information(this,tr("Reading problem"),error); - delete mReader; - return; - } - vvImage::Pointer binaryImage = mReader->GetOutput(); - - // Check Dimension - int dim = mCurrentImage->GetNumberOfDimensions(); - int bin_dim = binaryImage->GetNumberOfDimensions(); - if (dim < bin_dim) { ////////// TO CHANGE FOR 3D/4D - std::ostringstream os; - os << "Error. Loaded binary image is " << bin_dim - << "D while selected image is " << dim << "D" << std::endl; - QMessageBox::information(this,tr("Reading problem"),os.str().c_str()); return; } + vvImage::Pointer binaryImage = reader->GetOutput(); + AddImage(binaryImage, filename[i].toStdString(), mBackgroundValueSpinBox->value()); + mOpenedBinaryImage.push_back(binaryImage); + } - // Add a new roi to the structure - int n = mCurrentStructureSet->AddBinaryImageAsNewROI(binaryImage, filename[i].toStdString()); - mLoadedROIIndex.push_back(n); - mCurrentStructureSet->GetROI(n)->SetBackgroundValueLabelImage(mBackgroundValueSpinBox->value()); - - // Change color - if (nGetNumberOfTableValues ()) { - double * color = mDefaultLUTColor->GetTableValue(n % mDefaultLUTColor->GetNumberOfTableValues ()); - mCurrentStructureSet->GetROI(n)->SetDisplayColor(color[0], color[1], color[2]); - } - - // Add a new roi actor - mCurrentStructureSetActor->CreateNewROIActor(n); + UpdateImage(); +} +//------------------------------------------------------------------------------ - // CheckBox for "All" - if (mCurrentStructureSetActor->GetROIActor(n)->IsVisible()) - mNumberOfVisibleROI++; - if (mCurrentStructureSetActor->GetROIActor(n)->IsContourVisible()) - mNumberOfVisibleContourROI++; - UpdateAllROIStatus(); - } // end loop on n selected filenames +//------------------------------------------------------------------------------ +void vvToolStructureSetManager::UpdateImage() +{ // Update the TreeWidget - UpdateStructureSetInTreeWidget(index, mCurrentStructureSet); + UpdateStructureSetInTreeWidget(mCurrentStructureSetIndex, mCurrentStructureSet); // Render loaded ROIs (the first is sufficient) for(unsigned int i=0; iGetROIActor(mLoadedROIIndex[i])->Update(); } - for(int i=0; iNumberOfSlicers(); i++) { + for(int i=0; iGetNumberOfSlicers(); i++) { mCurrentSlicerManager->GetSlicer(i)->Render(); } } //------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ +void vvToolStructureSetManager::AddImage(vvImage * binaryImage, std::string filename, + double BG, bool m_modeBG) +{ + // Check current structure set + int index; + if (mCurrentStructureSet == NULL) { + if (mStructureSetsList.size() == 0) { // Create a default SS + clitk::DicomRT_StructureSet::Pointer mStructureSet = clitk::DicomRT_StructureSet::New(); + index = AddStructureSet(mStructureSet); + } + else { // Get first SS + index = 0; + } + } else { + index = mCurrentStructureSetIndex; + } + mCurrentStructureSet = mStructureSetsList[index]; + mCurrentStructureSetActor = mStructureSetActorsList[index].data(); + mCurrentStructureSetIndex = index; + + // Check Dimension + int dim = mCurrentImage->GetNumberOfDimensions(); + int bin_dim = binaryImage->GetNumberOfDimensions(); + if (dim < bin_dim) { ////////// TO CHANGE FOR 3D/4D + std::ostringstream os; + os << "Error. Loaded binary image is " << bin_dim + << "D while selected image is " << dim << "D" << std::endl; + QMessageBox::information(this,tr("Reading problem"),os.str().c_str()); + return; + } + + // Add a new roi to the structure + int n = mCurrentStructureSet->AddBinaryImageAsNewROI(binaryImage, filename); + mLoadedROIIndex.push_back(n); + if (m_modeBG) + mCurrentStructureSet->GetROIFromROINumber(n)->SetBackgroundValueLabelImage(BG); + else + mCurrentStructureSet->GetROIFromROINumber(n)->SetForegroundValueLabelImage(BG); + + // Change color + if (nGetNumberOfTableValues ()) { + double * color = mDefaultLUTColor->GetTableValue(n % mDefaultLUTColor->GetNumberOfTableValues ()); + mCurrentStructureSet->GetROIFromROINumber(n)->SetDisplayColor(color[0], color[1], color[2]); + } + + // Add a new roi actor + mCurrentStructureSetActor->CreateNewROIActor(n, m_modeBG); + + // CheckBox for "All" + if (mCurrentStructureSetActor->GetROIActor(n)->IsVisible()) + mNumberOfVisibleROI++; + if (mCurrentStructureSetActor->GetROIActor(n)->IsContourVisible()) + mNumberOfVisibleContourROI++; + UpdateAllROIStatus(); +} +//------------------------------------------------------------------------------ + + //------------------------------------------------------------------------------ void vvToolStructureSetManager::apply() { @@ -294,17 +379,36 @@ void vvToolStructureSetManager::apply() //------------------------------------------------------------------------------ bool vvToolStructureSetManager::close() { + //std::cout << "vvToolStructureSetManager::close()" << std::endl; + + return vvToolWidgetBase::close(); +} +//------------------------------------------------------------------------------ + + +//------------------------------------------------------------------------------ +void vvToolStructureSetManager::closeEvent(QCloseEvent *event) +{ + //std::cout << "vvToolStructureSetManager::closeEvent()" << std::endl; + + std::vector::iterator iter = std::find(mListOfInputs.begin(), mListOfInputs.end(), mCurrentSlicerManager); + if (iter != mListOfInputs.end()) mListOfInputs.erase(iter); + + // DD("how delete mListOfOpenTool ???"); + mListOfOpenTool.erase(mCurrentSlicerManager); + mCheckBoxShowAll->setCheckState(Qt::Unchecked); mContourCheckBoxShowAll->setCheckState(Qt::Unchecked); - if (mCurrentSlicerManager) mCurrentSlicerManager->Render(); - if (mCurrentStructureSetActor) { - for(int i=0; iGetNumberOfROIs(); i++) { - mCurrentStructureSetActor->GetROIList()[i]->SetVisible(false); - mCurrentStructureSetActor->GetROIList()[i]->SetContourVisible(false); - delete mCurrentStructureSetActor->GetROIList()[i]; + if (mCurrentSlicerManager != 0) + mCurrentSlicerManager->Render(); + + if (!isWindow()) { + if (m_NumberOfTool == 1) { + mMainWindow->GetTab()->removeTab(mTabNumber); } - } - return vvToolWidgetBase::close(); + } + + event->accept(); } //------------------------------------------------------------------------------ @@ -316,6 +420,7 @@ bool vvToolStructureSetManager::close() //------------------------------------------------------------------------------ void vvToolStructureSetManager::SelectedItemChangedInTree() { + // Search which roi is selected QList l = mTree->selectedItems(); if (l.size() == 0) { @@ -325,6 +430,8 @@ void vvToolStructureSetManager::SelectedItemChangedInTree() { return; } QTreeWidgetItem * w = l[0]; + //std::cout << "selected item -> " << w->text(1).toStdString() << std::endl; + //std::cout << "m_NumberOfTool -> " << m_NumberOfTool << std::endl; if (mMapTreeWidgetToROI.find(w) == mMapTreeWidgetToROI.end()) { mCurrentROIActor = NULL; mCurrentROI = NULL; @@ -337,24 +444,40 @@ void vvToolStructureSetManager::SelectedItemChangedInTree() { mCurrentROI = roi; mCurrentROIActor = actor; + // Warning -> avoid unuseful Render here by disconnect slider // Update GUI + disconnect(mTree, SIGNAL(itemSelectionChanged()), this, SLOT(SelectedItemChangedInTree())); + disconnect(mCheckBoxShow, SIGNAL(toggled(bool)), this, SLOT(VisibleROIToggled(bool))); + disconnect(mOpacitySlider, SIGNAL(valueChanged(int)), this, SLOT(OpacityChanged(int))); + disconnect(mChangeColorButton, SIGNAL(clicked()), this, SLOT(ChangeColor())); + disconnect(mContourCheckBoxShow, SIGNAL(toggled(bool)), this, SLOT(VisibleContourROIToggled(bool))); + disconnect(mChangeContourColorButton, SIGNAL(clicked()), this, SLOT(ChangeContourColor())); + disconnect(mContourWidthSpinBox, SIGNAL(valueChanged(int)), this, SLOT(ChangeContourWidth(int))); + disconnect(mDepthSpinBox, SIGNAL(valueChanged(int)), this, SLOT(ChangeDepth(int))); + mGroupBoxROI->setEnabled(true); mROInameLabel->setText(roi->GetName().c_str()); mCheckBoxShow->setChecked(actor->IsVisible()); mContourCheckBoxShow->setChecked(actor->IsContourVisible()); mContourWidthSpinBox->setValue(actor->GetContourWidth()); - - // Warning -> avoir unuseful Render here by disconnect slider - disconnect(mOpacitySlider, SIGNAL(valueChanged(int)), - this, SLOT(OpacityChanged(int))); + mDepthSpinBox->setValue(actor->GetDepth()); + w->setText(3, QString("%1").arg(actor->GetDepth())); mOpacitySlider->setValue((int)lrint(actor->GetOpacity()*100)); mOpacitySpinBox->setValue((int)lrint(actor->GetOpacity()*100)); - connect(mOpacitySlider, SIGNAL(valueChanged(int)), - this, SLOT(OpacityChanged(int))); - actor->Update(); + connect(mTree, SIGNAL(itemSelectionChanged()), this, SLOT(SelectedItemChangedInTree())); + connect(mCheckBoxShow, SIGNAL(toggled(bool)), this, SLOT(VisibleROIToggled(bool))); + connect(mOpacitySlider, SIGNAL(valueChanged(int)), this, SLOT(OpacityChanged(int))); + connect(mChangeColorButton, SIGNAL(clicked()), this, SLOT(ChangeColor())); + connect(mContourCheckBoxShow, SIGNAL(toggled(bool)), this, SLOT(VisibleContourROIToggled(bool))); + connect(mChangeContourColorButton, SIGNAL(clicked()), this, SLOT(ChangeContourColor())); + connect(mContourWidthSpinBox, SIGNAL(valueChanged(int)), this, SLOT(ChangeContourWidth(int))); + connect(mDepthSpinBox, SIGNAL(valueChanged(int)), this, SLOT(ChangeDepth(int))); + + // is this needed ? + // actor->Update(); // Final rendering - mCurrentSlicerManager->Render(); + // mCurrentSlicerManager->Render(); } //------------------------------------------------------------------------------ @@ -493,17 +616,30 @@ void vvToolStructureSetManager::ChangeContourWidth(int n) { //------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ +void vvToolStructureSetManager::ChangeDepth(int n) { + mCurrentROIActor->SetDepth(n); + mCurrentROIActor->UpdateImage(); + mCurrentSlicerManager->Render(); + QList l = mTree->selectedItems(); + QTreeWidgetItem * w = l[0]; + w->setText(3, QString("%1").arg(mCurrentROIActor->GetDepth())); +} +//------------------------------------------------------------------------------ + + //------------------------------------------------------------------------------ void vvToolStructureSetManager::ReloadCurrentROI() { // Reload image - vvImageReader * mReader = new vvImageReader; - mReader->SetInputFilename(mCurrentROI->GetFilename()); - mReader->Update(IMAGE); - if (mReader->GetLastError() != "") { - QMessageBox::information(mMainWindowBase, tr("Sorry, error. Could not reload"), mReader->GetLastError().c_str()); + vvImageReader::Pointer reader = vvImageReader::New(); + reader->SetInputFilename(mCurrentROI->GetFilename()); + reader->Update(vvImageReader::IMAGE); + if (reader->GetLastError() != "") { + QMessageBox::information(mMainWindowBase, tr("Sorry, error. Could not reload"), reader->GetLastError().c_str()); return; } - mCurrentROI->SetImage(mReader->GetOutput()); + mCurrentROI->GetImage()->GetFirstVTKImageData()->ReleaseData(); + mCurrentROI->SetImage(reader->GetOutput()); // Update visu" mCurrentROIActor->UpdateImage(); @@ -512,3 +648,40 @@ void vvToolStructureSetManager::ReloadCurrentROI() { //------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ +void vvToolStructureSetManager::CheckInputList(std::vector & l, int & index) +{ + for(unsigned int i=0; i::iterator iter = std::find(mListOfInputs.begin(), mListOfInputs.end(), l[i]); + if (iter != mListOfInputs.end()) { + for(unsigned int j=i;jAddImage(image, name, BG, m_modeBG); + tool->UpdateImage(); + return tool; + } + + // If the tool is not open, create it + vvToolStructureSetManager * tool = new vvToolStructureSetManager + (CREATOR(vvToolStructureSetManager)->GetMainWindow(), Qt::Dialog, m); + tool->AddImage(image, name, BG, m_modeBG); + tool->UpdateImage(); + tool->show(); + return tool; +} +//------------------------------------------------------------------------------