X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvToolStructureSetManager.cxx;h=f625e4cd46ef0945fa3c40df9036a2be50e547ee;hb=9548105324e0d1e8d440a1e1d83faf37ebcf1c08;hp=c4f36033f9e1d09390560215edb3ded128d2fbbe;hpb=ff1d5b8af965e75ecdbc1b0cbff0dad6f3b3c511;p=clitk.git diff --git a/vv/vvToolStructureSetManager.cxx b/vv/vvToolStructureSetManager.cxx index c4f3603..f625e4c 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 @@ -100,13 +101,14 @@ 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::map::iterator it; - for (it = mMapROIToTreeWidget.begin(); it!=mMapROIToTreeWidget.end(); it++) - delete it->second; - for(unsigned int i=0; i< mStructureSetActorsList.size(); i++) - delete mStructureSetActorsList[i]; - + //std::cout << "vvToolStructureSetManager::~vvToolStructureSetManager()" << std::endl; } //------------------------------------------------------------------------------ @@ -126,6 +128,8 @@ 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); @@ -133,6 +137,7 @@ void vvToolStructureSetManager::InputIsSelected(vvSlicerManager *m) if (mCurrentImage->GetNumberOfDimensions() != 3) { QMessageBox::information(this,tr("Sorry only 3D yet"), tr("Sorry only 3D yet")); close(); + return; } // Hide selector HideInputSelector(); // splitter @@ -179,7 +184,8 @@ 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())); QBrush brush(QColor(roi->GetDisplayColor()[0]*255, roi->GetDisplayColor()[1]*255, roi->GetDisplayColor()[2]*255)); @@ -196,11 +202,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(); 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 + } } //------------------------------------------------------------------------------ @@ -209,7 +223,7 @@ 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); @@ -239,10 +253,10 @@ 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"), @@ -252,24 +266,25 @@ void vvToolStructureSetManager::OpenBinaryImage() 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); return; } - vvImage::Pointer binaryImage = mReader.GetOutput(); + vvImage::Pointer binaryImage = reader->GetOutput(); AddImage(binaryImage, filename[i].toStdString(), mBackgroundValueSpinBox->value()); mOpenedBinaryImage.push_back(binaryImage); } + UpdateImage(); } //------------------------------------------------------------------------------ @@ -309,7 +324,7 @@ void vvToolStructureSetManager::AddImage(vvImage * binaryImage, std::string file index = mCurrentStructureSetIndex; } mCurrentStructureSet = mStructureSetsList[index]; - mCurrentStructureSetActor = mStructureSetActorsList[index]; + mCurrentStructureSetActor = mStructureSetActorsList[index].data(); mCurrentStructureSetIndex = index; // Check Dimension @@ -327,14 +342,14 @@ void vvToolStructureSetManager::AddImage(vvImage * binaryImage, std::string file int n = mCurrentStructureSet->AddBinaryImageAsNewROI(binaryImage, filename); mLoadedROIIndex.push_back(n); if (m_modeBG) - mCurrentStructureSet->GetROI(n)->SetBackgroundValueLabelImage(BG); + mCurrentStructureSet->GetROIFromROINumber(n)->SetBackgroundValueLabelImage(BG); else - mCurrentStructureSet->GetROI(n)->SetForegroundValueLabelImage(BG); + mCurrentStructureSet->GetROIFromROINumber(n)->SetForegroundValueLabelImage(BG); // Change color if (nGetNumberOfTableValues ()) { double * color = mDefaultLUTColor->GetTableValue(n % mDefaultLUTColor->GetNumberOfTableValues ()); - mCurrentStructureSet->GetROI(n)->SetDisplayColor(color[0], color[1], color[2]); + mCurrentStructureSet->GetROIFromROINumber(n)->SetDisplayColor(color[0], color[1], color[2]); } // Add a new roi actor @@ -361,6 +376,8 @@ void vvToolStructureSetManager::apply() //------------------------------------------------------------------------------ bool vvToolStructureSetManager::close() { + //std::cout << "vvToolStructureSetManager::close()" << std::endl; + return vvToolWidgetBase::close(); } //------------------------------------------------------------------------------ @@ -369,6 +386,8 @@ bool vvToolStructureSetManager::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); @@ -377,14 +396,8 @@ void vvToolStructureSetManager::closeEvent(QCloseEvent *event) mCheckBoxShowAll->setCheckState(Qt::Unchecked); mContourCheckBoxShowAll->setCheckState(Qt::Unchecked); - if (mCurrentSlicerManager != 0) 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) { @@ -404,6 +417,7 @@ void vvToolStructureSetManager::closeEvent(QCloseEvent *event) //------------------------------------------------------------------------------ void vvToolStructureSetManager::SelectedItemChangedInTree() { + // Search which roi is selected QList l = mTree->selectedItems(); if (l.size() == 0) { @@ -413,6 +427,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; @@ -584,15 +600,15 @@ void vvToolStructureSetManager::ChangeContourWidth(int n) { //------------------------------------------------------------------------------ void vvToolStructureSetManager::ReloadCurrentROI() { // Reload image - vvImageReader mReader; - 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->GetImage()->GetFirstVTKImageData()->ReleaseData(); - mCurrentROI->SetImage(mReader.GetOutput()); + mCurrentROI->SetImage(reader->GetOutput()); // Update visu" mCurrentROIActor->UpdateImage();