diff --git a/Modules/Segmentation/Interactions/mitkSegmentationInteractor.cpp b/Modules/Segmentation/Interactions/mitkSegmentationInteractor.cpp index cc5ffa0bfd..a21e9d2dd2 100644 --- a/Modules/Segmentation/Interactions/mitkSegmentationInteractor.cpp +++ b/Modules/Segmentation/Interactions/mitkSegmentationInteractor.cpp @@ -1,63 +1,63 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #include "mitkSegmentationInteractor.h" #include "mitkLabelSetImage.h" #include "mitkInteractionPositionEvent.h" #include "mitkToolManager.h" #include "mitkToolManagerProvider.h" #include void mitk::SegmentationInteractor::ConnectActionsAndFunctions() { Superclass::ConnectActionsAndFunctions(); - CONNECT_FUNCTION("change_active_label", ChangeActiveLabel); + //CONNECT_FUNCTION("change_active_label", ChangeActiveLabel); } bool mitk::SegmentationInteractor::ChangeActiveLabel(StateMachineAction*, InteractionEvent* interactionEvent) { BaseRenderer::Pointer sender = interactionEvent->GetSender(); InteractionPositionEvent* positionEvent = static_cast(interactionEvent); //MLI TODO //m_LastDisplayCoordinate = m_CurrentDisplayCoordinate; //m_CurrentDisplayCoordinate = positionEvent->GetPointerPositionOnScreen(); mitk::ToolManager* toolManager = mitk::ToolManagerProvider::GetInstance()->GetToolManager(); assert(toolManager); DataNode* workingNode( toolManager->GetWorkingData(0) ); if (workingNode) { mitk::LabelSetImage* workingImage = dynamic_cast(workingNode->GetData()); assert(workingImage); int timestep = positionEvent->GetSender()->GetTimeStep(); int pixelValue = workingImage->GetPixelValueByWorldCoordinate( positionEvent->GetPositionInWorld(), timestep ); workingImage->GetActiveLabelSet()->SetActiveLabel(pixelValue); // can be the background // Call Events //workingImage->ActiveLabelEvent.Send(pixelValue); //MLI TODO //toolManager->WorkingDataModified.Send(); } sender->GetRenderingManager()->RequestUpdateAll(); return true; -} \ No newline at end of file +} diff --git a/Plugins/org.mitk.gui.qt.multilabelsegmentation/src/internal/QmitkCreateMultiLabelPresetAction.cpp b/Plugins/org.mitk.gui.qt.multilabelsegmentation/src/internal/QmitkCreateMultiLabelPresetAction.cpp index aa8aa14566..da2bdad4dc 100644 --- a/Plugins/org.mitk.gui.qt.multilabelsegmentation/src/internal/QmitkCreateMultiLabelPresetAction.cpp +++ b/Plugins/org.mitk.gui.qt.multilabelsegmentation/src/internal/QmitkCreateMultiLabelPresetAction.cpp @@ -1,84 +1,84 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #include "QmitkCreateMultiLabelPresetAction.h" #include "mitkLabelSetImage.h" #include "QMessageBox" #include #include "QFileDialog" //MLI TODO -#include "mitkLabelSetImageIO.h" +//#include "mitkLabelSetImageIO.h" #include "tinyxml.h" QmitkCreateMultiLabelPresetAction::QmitkCreateMultiLabelPresetAction() { } QmitkCreateMultiLabelPresetAction::~QmitkCreateMultiLabelPresetAction() { } void QmitkCreateMultiLabelPresetAction::Run( const QList &selectedNodes ) { - foreach ( mitk::DataNode::Pointer referenceNode, selectedNodes ) - { - if (referenceNode.IsNotNull()) - { - mitk::LabelSetImage::Pointer referenceImage = dynamic_cast( referenceNode->GetData() ); - assert(referenceImage); +// foreach ( mitk::DataNode::Pointer referenceNode, selectedNodes ) +// { +// if (referenceNode.IsNotNull()) +// { +// mitk::LabelSetImage::Pointer referenceImage = dynamic_cast( referenceNode->GetData() ); +// assert(referenceImage); - if(referenceImage->GetNumberOfLabels() <= 1) - { - QMessageBox::information(NULL, "Create LabelSetImage Preset", "Could not create a LabelSetImage preset.\nNo Labels defined!\n");\ - return; - } +// if(referenceImage->GetNumberOfLabels() <= 1) +// { +// QMessageBox::information(NULL, "Create LabelSetImage Preset", "Could not create a LabelSetImage preset.\nNo Labels defined!\n");\ +// return; +// } - std::string sName = referenceNode->GetName(); - QString qName; - qName.sprintf("%s.lsetp",sName.c_str()); - QString filename = QFileDialog::getSaveFileName( NULL,"save file dialog",QString(),"LabelSet Preset(*.lsetp)"); - if ( filename.isEmpty() ) - return; - //MLI TODO - bool wasSaved = mitk::LabelSetImageIO::SaveLabelSetImagePreset(filename.toStdString(),referenceImage); +// std::string sName = referenceNode->GetName(); +// QString qName; +// qName.sprintf("%s.lsetp",sName.c_str()); +// QString filename = QFileDialog::getSaveFileName( NULL,"save file dialog",QString(),"LabelSet Preset(*.lsetp)"); +// if ( filename.isEmpty() ) +// return; +// //MLI TODO +// bool wasSaved = mitk::LabelSetImageIO::SaveLabelSetImagePreset(filename.toStdString(),referenceImage); - if(!wasSaved) - { - QMessageBox::information(NULL, "Create LabelSetImage Preset", "Could not save a LabelSetImage preset as Xml.\n");\ - return; - } - } - } +// if(!wasSaved) +// { +// QMessageBox::information(NULL, "Create LabelSetImage Preset", "Could not save a LabelSetImage preset as Xml.\n");\ +// return; +// } +// } +// } } void QmitkCreateMultiLabelPresetAction::SetDataStorage(mitk::DataStorage* dataStorage) { m_DataStorage = dataStorage; } void QmitkCreateMultiLabelPresetAction::SetFunctionality(berry::QtViewPart* /*functionality*/) { //not needed } void QmitkCreateMultiLabelPresetAction::SetSmoothed(bool smoothed) { //not needed } void QmitkCreateMultiLabelPresetAction::SetDecimated(bool decimated) { //not needed } diff --git a/Plugins/org.mitk.gui.qt.multilabelsegmentation/src/internal/QmitkLoadMultiLabelPresetAction.cpp b/Plugins/org.mitk.gui.qt.multilabelsegmentation/src/internal/QmitkLoadMultiLabelPresetAction.cpp index 010f83431f..3d3683844d 100644 --- a/Plugins/org.mitk.gui.qt.multilabelsegmentation/src/internal/QmitkLoadMultiLabelPresetAction.cpp +++ b/Plugins/org.mitk.gui.qt.multilabelsegmentation/src/internal/QmitkLoadMultiLabelPresetAction.cpp @@ -1,74 +1,74 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #include "QmitkLoadMultiLabelPresetAction.h" #include "mitkLabelSetImage.h" #include "mitkRenderingManager.h" -#include "mitkLabelSetImageIO.h" +//#include "mitkLabelSetImageIO.h" #include "QInputDialog" #include "QMessageBox" #include "QFileDialog" #include "tinyxml.h" QmitkLoadMultiLabelPresetAction::QmitkLoadMultiLabelPresetAction() { } QmitkLoadMultiLabelPresetAction::~QmitkLoadMultiLabelPresetAction() { } void QmitkLoadMultiLabelPresetAction::Run( const QList &selectedNodes ) { - foreach ( mitk::DataNode::Pointer referenceNode, selectedNodes ) - { +// foreach ( mitk::DataNode::Pointer referenceNode, selectedNodes ) +// { - if (referenceNode.IsNull()) return; +// if (referenceNode.IsNull()) return; - mitk::LabelSetImage::Pointer referenceImage = dynamic_cast( referenceNode->GetData() ); - assert(referenceImage); +// mitk::LabelSetImage::Pointer referenceImage = dynamic_cast( referenceNode->GetData() ); +// assert(referenceImage); - std::string sName = referenceNode->GetName(); - QString qName; - qName.sprintf("%s.lsetp",sName.c_str()); - QString filename = QFileDialog::getOpenFileName(NULL,"Load file",QString(),"LabelSet Preset(*.lsetp)"); - if ( filename.isEmpty() ) - return; +// std::string sName = referenceNode->GetName(); +// QString qName; +// qName.sprintf("%s.lsetp",sName.c_str()); +// QString filename = QFileDialog::getOpenFileName(NULL,"Load file",QString(),"LabelSet Preset(*.lsetp)"); +// if ( filename.isEmpty() ) +// return; - mitk::LabelSetImageIO::LoadLabelSetImagePreset(filename.toStdString(), referenceImage); - } +// mitk::LabelSetImageIO::LoadLabelSetImagePreset(filename.toStdString(), referenceImage); +// } } void QmitkLoadMultiLabelPresetAction::SetDataStorage(mitk::DataStorage* dataStorage) { m_DataStorage = dataStorage; } void QmitkLoadMultiLabelPresetAction::SetFunctionality(berry::QtViewPart* /*functionality*/) { //not needed } void QmitkLoadMultiLabelPresetAction::SetSmoothed(bool smoothed) { //not needed } void QmitkLoadMultiLabelPresetAction::SetDecimated(bool decimated) { //not needed }