diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/CMakeLists.txt b/Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/CMakeLists.txt index ed6a565..6a48682 100644 --- a/Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/CMakeLists.txt +++ b/Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/CMakeLists.txt @@ -1,10 +1,10 @@ # The project name must correspond to the directory name of your plug-in # and must not contain periods. project(org_mitk_gui_qt_diffusionimaging_fiberprocessing) mitk_create_plugin( SUBPROJECTS MITK-Diffusion EXPORT_DIRECTIVE DIFFUSIONIMAGING_FIBERPROCESSING_EXPORT EXPORTED_INCLUDE_SUFFIXES src - MODULE_DEPENDS MitkFiberTracking MitkMriSimulation MitkChart MitkMultilabel MitkModelFit MitkQtWidgetsExt + MODULE_DEPENDS MitkFiberTracking MitkMriSimulation MitkChart MitkMultilabel MitkModelFit MitkQtWidgetsExt MitkFiberDissection ) diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/QmitkInteractiveFiberDissectionView.cpp b/Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/QmitkInteractiveFiberDissectionView.cpp index a1e80fc..f4b0652 100644 --- a/Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/QmitkInteractiveFiberDissectionView.cpp +++ b/Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/QmitkInteractiveFiberDissectionView.cpp @@ -1,583 +1,574 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center. 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. ===================================================================*/ // Blueberry #include #include #include // Qmitk #include "QmitkInteractiveFiberDissectionView.h" #include //Pointset #include //Pointset #include #include #include #include #include #include #include #include #include "usModuleRegistry.h" //#include #include "mitkNodePredicateDataType.h" #include #include #include #include + #include #include #include #include #include #include #include #include #include #include #include #include #include const std::string QmitkInteractiveFiberDissectionView::VIEW_ID = "org.mitk.views.interactivefiberdissection"; const std::string id_DataManager = "org.mitk.views.datamanager"; using namespace mitk; QmitkInteractiveFiberDissectionView::QmitkInteractiveFiberDissectionView() : QmitkAbstractView() , m_Controls( 0 ) , m_IterationCounter(0) + , m_StreamlineInteractor(nullptr) { } // Destructor QmitkInteractiveFiberDissectionView::~QmitkInteractiveFiberDissectionView() { - + //disable interactor + if (m_StreamlineInteractor != nullptr) + { +// m_StreamlineInteractor->SetStreamlineNode(nullptr); + m_StreamlineInteractor->EnableInteraction(false); + } } + void QmitkInteractiveFiberDissectionView::CreateQtPartControl( QWidget *parent ) { // build up qt view, unless already done if ( !m_Controls ) { // create GUI widgets from the Qt Designer's .ui file m_Controls = new Ui::QmitkInteractiveFiberDissectionViewControls; m_Controls->setupUi( parent ); m_Controls->m_selectedPointSetWidget->SetDataStorage(GetDataStorage());//pointset m_Controls->m_selectedPointSetWidget->SetNodePredicate(mitk::NodePredicateAnd::New(//pointset mitk::TNodePredicateDataType::New(),//pointset mitk::NodePredicateNot::New(mitk::NodePredicateOr::New(//pointset mitk::NodePredicateProperty::New("helper object"),//pointset mitk::NodePredicateProperty::New("hidden object")))));//pointset m_Controls->m_selectedPointSetWidget->SetSelectionIsOptional(true);//pointset m_Controls->m_selectedPointSetWidget->SetAutoSelectNewNodes(true);//pointset m_Controls->m_selectedPointSetWidget->SetEmptyInfo(QString("Please select a point set"));//pointset - m_Controls->m_selectedPointSetWidget->SetPopUpTitel(QString("Select point set"));//pointset + m_Controls->m_selectedPointSetWidget->SetPopUpTitel(QString("Select point set"));//pointsett connect(m_Controls->m_ErazorButton, SIGNAL( clicked() ), this, SLOT( RemovefromBundle() ) ); //need - connect(m_Controls->m_HighlighterButton, SIGNAL( clicked() ), this, SLOT( AddtoBundle() ) ); //need connect(m_Controls->m_StreamlineCreation, SIGNAL( clicked() ), this, SLOT( CreateStreamline())); connect(m_Controls->m_AddRandomFibers, SIGNAL( clicked() ), this, SLOT( ExtractRandomFibersFromTractogram() ) ); //need + connect(m_Controls->m_TrainClassifier, SIGNAL( clicked() , this, SLOT( StartAlgorithm ))); + connect(m_Controls->m_addPointSetPushButton, &QPushButton::clicked,//pointset this, &QmitkInteractiveFiberDissectionView::OnAddPointSetClicked);//pointset connect(m_Controls->m_selectedPointSetWidget, &QmitkSingleNodeSelectionWidget::CurrentSelectionChanged,//pointset this, &QmitkInteractiveFiberDissectionView::OnCurrentSelectionChanged);//pointset auto renderWindowPart = this->GetRenderWindowPart();//pointset if (nullptr != renderWindowPart)//pointset this->RenderWindowPartActivated(renderWindowPart);//pointset this->OnCurrentSelectionChanged(m_Controls->m_selectedPointSetWidget->GetSelectedNodes());//pointset } UpdateGui(); } void QmitkInteractiveFiberDissectionView::SetFocus() { m_Controls->toolBoxx->setFocus(); //m_Controls->m_addPointSetPushButton->setFocus();//pointset } void QmitkInteractiveFiberDissectionView::UpdateGui() { m_Controls->m_FibLabel->setText("mandatory"); m_Controls->m_InputData->setTitle("Please Select Input Data"); // disable alle frames m_Controls->m_ErazorButton->setEnabled(false); - m_Controls->m_HighlighterButton->setEnabled(false); + m_Controls->m_addPointSetPushButton->setEnabled(false); m_Controls->m_StreamlineCreation->setEnabled(false); - m_Controls->m_StreamtoTractogram->setEnabled(false); m_Controls->m_TrainClassifier->setEnabled(false); m_Controls->m_CreatePrediction->setEnabled(false); m_Controls->m_CreateUncertantyMap->setEnabled(false); m_Controls->m_Numtolabel->setEnabled(false); m_Controls->m_addPointSetPushButton->setEnabled(false); m_Controls->m_AddRandomFibers->setEnabled(false); + m_Controls->m_AddUncertainFibers->setEnabled(false); bool fibSelected = !m_SelectedFB.empty(); bool multipleFibsSelected = (m_SelectedFB.size()>1); bool sthSelected = m_SelectedImageNode.IsNotNull(); bool psSelected = m_SelectedPS.IsNotNull(); - bool nfibSelected = !m_negativeSelectedBundles.empty(); + bool nfibSelected = !m_newfibersSelectedBundles.empty(); + bool posSelected = !m_positivSelectedBundles.empty(); + bool negSelected = !m_negativeSelectedBundles.IsNotNull(); // toggle visibility of elements according to selected method // are fiber bundles selected? if ( fibSelected ) { m_Controls->m_FibLabel->setText(QString(m_SelectedFB.at(0)->GetName().c_str())); m_Controls->m_addPointSetPushButton->setEnabled(true); m_Controls->m_AddRandomFibers->setEnabled(true); // more than two bundles needed to join/subtract if (multipleFibsSelected) { m_Controls->m_FibLabel->setText("multiple bundles selected"); } } // is image selected if (sthSelected) { m_Controls->m_addPointSetPushButton->setEnabled(true); } if (psSelected) { m_Controls->m_StreamlineCreation->setEnabled(true); } if (nfibSelected) { - m_Controls->m_HighlighterButton->setEnabled(true); + m_Controls->m_ErazorButton->setEnabled(true); } + if (posSelected && negSelected) + { + m_Controls->m_TrainClassifier->setEnabled(true); + } + } void QmitkInteractiveFiberDissectionView::OnEndInteraction() { } void QmitkInteractiveFiberDissectionView::OnAddPointSetClicked()//pointset { // ask for the name of the point set bool ok = false; QString name = QInputDialog::getText(QApplication::activeWindow(), tr("Add point set..."), tr("Enter name for the new point set"), QLineEdit::Normal, tr("PointSet").arg(++m_IterationCounter), &ok); // QString name = "PointSet"; if (!ok || name.isEmpty()) { return; } mitk::PointSet::Pointer pointSet = mitk::PointSet::New(); mitk::DataNode::Pointer pointSetNode = mitk::DataNode::New(); pointSetNode->SetData(pointSet); pointSetNode->SetProperty("name", mitk::StringProperty::New(name.toStdString())); pointSetNode->SetProperty("opacity", mitk::FloatProperty::New(1)); pointSetNode->SetColor(1.0, 1.0, 0.0); this->GetDataStorage()->Add(pointSetNode, m_SelectedImageNode); + m_Controls->m_selectedPointSetWidget->SetCurrentSelectedNode(pointSetNode); } void QmitkInteractiveFiberDissectionView::OnCurrentSelectionChanged(QmitkSingleNodeSelectionWidget::NodeList /*nodes*/)//pointset { m_Controls->m_poinSetListWidget->SetPointSetNode(m_Controls->m_selectedPointSetWidget->GetSelectedNode()); m_SelectedPS = m_Controls->m_selectedPointSetWidget->GetSelectedNode(); UpdateGui(); } void QmitkInteractiveFiberDissectionView::OnSelectionChanged(berry::IWorkbenchPart::Pointer /*part*/, const QList& nodes) { m_SelectedFB.clear(); if (nodes.empty() || nodes.front().IsNull()) { m_SelectedImageNode = nullptr; } else { m_SelectedImageNode = nodes.front(); } for (auto node: nodes) { if (dynamic_cast(node->GetData())) m_SelectedImage = dynamic_cast(node->GetData()); else if ( dynamic_cast(node->GetData()) ) m_SelectedFB.push_back(node); } UpdateGui(); } void QmitkInteractiveFiberDissectionView::RenderWindowPartActivated(mitk::IRenderWindowPart* renderWindowPart)//pointset { if (nullptr != m_Controls) { m_Controls->m_poinSetListWidget->AddSliceNavigationController(renderWindowPart->GetQmitkRenderWindow("axial")->GetSliceNavigationController()); m_Controls->m_poinSetListWidget->AddSliceNavigationController(renderWindowPart->GetQmitkRenderWindow("sagittal")->GetSliceNavigationController()); m_Controls->m_poinSetListWidget->AddSliceNavigationController(renderWindowPart->GetQmitkRenderWindow("coronal")->GetSliceNavigationController()); } } void QmitkInteractiveFiberDissectionView::RenderWindowPartDeactivated(mitk::IRenderWindowPart* renderWindowPart)//pointset { if (nullptr != m_Controls) { m_Controls->m_poinSetListWidget->RemoveSliceNavigationController(renderWindowPart->GetQmitkRenderWindow("axial")->GetSliceNavigationController()); m_Controls->m_poinSetListWidget->RemoveSliceNavigationController(renderWindowPart->GetQmitkRenderWindow("sagittal")->GetSliceNavigationController()); m_Controls->m_poinSetListWidget->RemoveSliceNavigationController(renderWindowPart->GetQmitkRenderWindow("coronal")->GetSliceNavigationController()); } } void QmitkInteractiveFiberDissectionView::CreateStreamline() { if (m_positivSelectedBundles.empty()) { mitk::DataNode::Pointer node = mitk::DataNode::New(); m_positiveFibersData = vtkSmartPointer::New(); m_positiveFibersData->SetPoints(vtkSmartPointer::New()); m_positiveFibersData->SetLines(vtkSmartPointer::New()); m_positiveBundle = mitk::FiberBundle:: New(m_positiveFibersData); node->SetData( m_positiveBundle ); m_positivSelectedBundles.push_back(node); MITK_INFO << m_positivSelectedBundles.size(); this->GetDataStorage()->Add(m_positivSelectedBundles.at(0)); MITK_INFO << "Create Bundle"; } if (!m_positivSelectedBundles.empty()) { this->GetDataStorage()->Remove(m_positivSelectedBundles.at(m_positivSelectedBundles.size()-1)); MITK_INFO << "Adding fibers"; } mitk::PointSet::Pointer pointSet = dynamic_cast(m_SelectedPS->GetData()); vnl_matrix streamline; streamline.set_size(3, pointSet->GetSize()); streamline.fill(0.0); mitk::PointSet::PointsIterator begin = pointSet->Begin(); mitk::PointSet::PointsIterator end = pointSet->End(); unsigned int i; mitk::PointSet::PointsContainer::Iterator it; for (it = begin, i = 0; it != end; ++it, ++i) { PointSet::PointType pt = pointSet->GetPoint(it->Index()); vnl_vector_fixed< float, 3 > candV; candV[0]=pt[0]; candV[1]=pt[1]; candV[2]=pt[2]; streamline.set_column(i, candV); } vtkSmartPointer vNewPolyData = vtkSmartPointer::New(); vtkSmartPointer vNewLines = vtkSmartPointer::New(); vtkSmartPointer vNewPoints = vtkSmartPointer::New(); unsigned int counter = 0; for (unsigned int i=0; iGetNumberOfCells(); ++i) { vtkCell* cell = m_positiveFibersData->GetCell(i); auto numPoints = cell->GetNumberOfPoints(); vtkPoints* points = cell->GetPoints(); vtkSmartPointer container = vtkSmartPointer::New(); for (unsigned int j=0; jGetPoint(j, p); vtkIdType id = vNewPoints->InsertNextPoint(p); container->GetPointIds()->InsertNextId(id); } vNewLines->InsertNextCell(container); counter++; } // build Fiber vtkSmartPointer container = vtkSmartPointer::New(); for (unsigned int j=0; jInsertNextPoint(p); container->GetPointIds()->InsertNextId(id); } vNewLines->InsertNextCell(container); vNewPolyData->SetPoints(vNewPoints); vNewPolyData->SetLines(vNewLines); m_positiveFibersData = vtkSmartPointer::New(); m_positiveFibersData->SetPoints(vtkSmartPointer::New()); m_positiveFibersData->SetLines(vtkSmartPointer::New()); m_positiveFibersData->SetPoints(vNewPoints); m_positiveFibersData->SetLines(vNewLines); m_positiveBundle = mitk::FiberBundle::New(vNewPolyData); m_positiveBundle->SetTrackVisHeader(dynamic_cast(m_SelectedImageNode->GetData())->GetGeometry()); - m_positiveBundle->SetFiberColors(255, 255, 255); + m_positiveBundle->SetFiberColors(0, 255, 0); mitk::DataNode::Pointer node = mitk::DataNode::New(); node->SetData(m_positiveBundle); node->SetName("+Bundle"); m_positivSelectedBundles.push_back(node); MITK_INFO << m_positivSelectedBundles.size(); + MITK_INFO << "The + Bundle has Streamlines:"; + auto m_NegStreamline= dynamic_cast(m_positivSelectedBundles.at(m_positivSelectedBundles.size()-1)->GetData()); + MITK_INFO << m_NegStreamline->GetFiberPolyData()->GetNumberOfCells(); + this->GetDataStorage()->Add(m_positivSelectedBundles.at(m_positivSelectedBundles.size()-1)); UpdateGui(); } void QmitkInteractiveFiberDissectionView::ExtractRandomFibersFromTractogram() { MITK_INFO << "Number of Fibers to extract from Tractogram: "; MITK_INFO << m_Controls->m_NumRandomFibers->value(); - if (m_negativeSelectedBundles.empty()) + if (m_newfibersSelectedBundles.empty()) { mitk::DataNode::Pointer node = mitk::DataNode::New(); - m_negativeFibersData = vtkSmartPointer::New(); - m_negativeFibersData->SetPoints(vtkSmartPointer::New()); - m_negativeFibersData->SetLines(vtkSmartPointer::New()); - m_negativeBundle = mitk::FiberBundle:: New(m_negativeFibersData); + m_newfibersFibersData = vtkSmartPointer::New(); + m_newfibersFibersData->SetPoints(vtkSmartPointer::New()); + m_newfibersFibersData->SetLines(vtkSmartPointer::New()); + m_newfibersBundle = mitk::FiberBundle:: New(m_newfibersFibersData); - node->SetData( m_negativeBundle ); - m_negativeSelectedBundles.push_back(node); - MITK_INFO << m_negativeSelectedBundles.size(); - // this->GetDataStorage()->Add(m_negativeSelectedBundles.at(0)); + node->SetData( m_newfibersBundle ); + m_newfibersSelectedBundles.push_back(node); + MITK_INFO << m_newfibersSelectedBundles.size(); + // this->GetDataStorage()->Add(m_newfibersSelectedBundles.at(0)); // UpdateGui(); MITK_INFO << "Create Bundle"; } mitk::FiberBundle::Pointer fib = dynamic_cast(m_SelectedFB.at(0)->GetData()); // mitk::DataNode::Pointer node = mitk::DataNode::New(); // node ->SetData(pi); // this->GetDataStorage()->Add(cur_bundle); vtkSmartPointer vNewPolyData = vtkSmartPointer::New(); vtkSmartPointer vNewLines = vtkSmartPointer::New(); vtkSmartPointer vNewPoints = vtkSmartPointer::New(); unsigned int counter = 0; for ( int i=0; im_NumRandomFibers->value(); i++) { vtkCell* cell = fib->GetFiberPolyData()->GetCell(i); auto numPoints = cell->GetNumberOfPoints(); vtkPoints* points = cell->GetPoints(); vtkSmartPointer container = vtkSmartPointer::New(); for (unsigned int j=0; jGetPoint(j, p); vtkIdType id = vNewPoints->InsertNextPoint(p); container->GetPointIds()->InsertNextId(id); } // weights->InsertValue(counter, fib->GetFiberWeight(i)); vNewLines->InsertNextCell(container); counter++; + MITK_INFO << counter; + MITK_INFO << vNewLines; + } - vNewPolyData->SetPoints(vNewPoints); vNewPolyData->SetLines(vNewLines); + vNewPolyData->SetPoints(vNewPoints); - m_negativeFibersData = vtkSmartPointer::New(); - m_negativeFibersData->SetPoints(vtkSmartPointer::New()); - m_negativeFibersData->SetLines(vtkSmartPointer::New()); - m_negativeFibersData->SetPoints(vNewPoints); - m_negativeFibersData->SetLines(vNewLines); + m_newfibersFibersData = vtkSmartPointer::New(); + m_newfibersFibersData->SetPoints(vtkSmartPointer::New()); + m_newfibersFibersData->SetLines(vtkSmartPointer::New()); + m_newfibersFibersData->SetPoints(vNewPoints); + m_newfibersFibersData->SetLines(vNewLines); - m_negativeBundle = mitk::FiberBundle::New(vNewPolyData); - m_negativeBundle->SetFiberColors(255, 0, 0); + m_newfibersBundle = mitk::FiberBundle::New(vNewPolyData); + m_newfibersBundle->SetFiberColors(255, 255, 255); mitk::DataNode::Pointer node = mitk::DataNode::New(); - node->SetData(m_negativeBundle); - node->SetName("-Bundle"); - m_negativeSelectedBundles.push_back(node); - MITK_INFO << m_negativeSelectedBundles.size(); + node->SetData(m_newfibersBundle); + node->SetName("ToLabel"); + m_newfibersSelectedBundles.push_back(node); + MITK_INFO << m_newfibersSelectedBundles.size(); - this->GetDataStorage()->Add(m_negativeSelectedBundles.at(m_negativeSelectedBundles.size()-1)); + this->GetDataStorage()->Add(m_newfibersSelectedBundles.at(m_newfibersSelectedBundles.size()-1)); UpdateGui(); } void QmitkInteractiveFiberDissectionView::RemovefromBundle() { + if (m_StreamlineInteractor.IsNull()) + { + this->CreateStreamlineInteractor(); + mitk::FiberBundle::Pointer m_negativeBundle = mitk::FiberBundle::New(); + mitk::DataNode::Pointer m_negativeSelectedBundles = mitk::DataNode::New(); + m_negativeSelectedBundles->SetName("-Bundle"); + m_negativeSelectedBundles->SetData(m_negativeBundle); + this->GetDataStorage()->Add(m_negativeSelectedBundles); + +// if (m_positivSelectedBundles.IsNull()) +// { + +// mitk::FiberBundle::Pointer m_positiveBundle = mitk::FiberBundle::New(); +// mitk::DataNode::Pointer m_positiveSelectedBundles = mitk::DataNode::New(); +// m_positiveSelectedBundles->SetName("-Bundle"); +// m_positiveSelectedBundles->SetData(m_positiveBundle); +// this->GetDataStorage()->Add(m_positiveSelectedBundles);) +// } + + m_StreamlineInteractor->EnableInteraction(true); + m_StreamlineInteractor->SetNegativeNode(m_negativeSelectedBundles); + m_StreamlineInteractor->SetPositiveNode(m_positivSelectedBundles.at(m_positivSelectedBundles.size()-1)); + m_StreamlineInteractor->SetToLabelNode(m_newfibersSelectedBundles.at(m_newfibersSelectedBundles.size()-1)); + } + + + + + + -// BaseRenderer *renderer = positionEvent->GetSender(); - -// auto positionEvent = dynamic_cast(interactionEvent); -// MITK_INFO << positionEvent; - -// if (interactionEvent->GetSender()->GetMapperID() == BaseRenderer::Standard2D) -// { -// MITK_INFO << "2d"; -// } -// else -// { -// MITK_INFO << "3d"; -// } - -// auto mapper = GetDataNode()->GetMapper(BaseRenderer::Standard2D); -// auto gizmo_mapper = dynamic_cast(mapper); -// auto &picker = m_Picker[renderer]; - -// if (picker == nullptr) -// { -// picker = vtkSmartPointer::New(); -// picker->SetTolerance(0.005); - -// if (gizmo_mapper) -// { // doing this each time is bizarre -// picker->AddPickList(gizmo_mapper->GetVtkProp(renderer)); -// picker->PickFromListOn(); -// } -// } - -// auto displayPosition = positionEvent->GetPointerPositionOnScreen(); -// picker->Pick(displayPosition[0], displayPosition[1], 0, positionEvent->GetSender()->GetVtkRenderer()); - -// vtkIdType pickedPointID = picker->GetPointId(); -// if (pickedPointID == -1) -// { -// return Gizmo::NoHandle; -// } - -// vtkPolyData *polydata = gizmo_mapper->GetVtkPolyData(renderer); - -// if (polydata && polydata->GetPointData() && polydata->GetPointData()->GetScalars()) -// { -// double dataValue = polydata->GetPointData()->GetScalars()->GetTuple1(pickedPointID); -// return m_Gizmo->GetHandleFromPointDataValue(dataValue); -// } - -// return Gizmo::NoHandle; - -// m_picker1 = vtkSmartPointer::New(); -// m_picker1->PickFromListOn(); -// m_picker1->SetTolerance(0.005); -// m_picker1->GetCellId(); -// m_picker1->GetPickedPositions(); - -//// selPt = m_picker1->GetSelectionPoint(); -//// x = *selPt; -//// y = *(selPt + 1); -//// pickPos = m_picker1->GetPickedPositions(); -//// xp = *(pickPos->GetPoint(0)); -//// yp = *(pickPos->GetPoint(0)+1); -//// zp = *(pickPos->GetPoint(0)+2); -//// double worldPos[3]; - - -// double* worldPosition = m_picker1->GetPickPosition(); -// MITK_INFO << m_picker1; -// MITK_INFO << m_picker1->GetCellId(); -// MITK_INFO << m_picker1->GetPickPosition(); -// MITK_INFO << m_picker1->GetSelectionPoint(); -// MITK_INFO << worldPosition[0] ; -// MITK_INFO << worldPosition[1] ; - -// vtkNew iren; UpdateGui(); } -void QmitkInteractiveFiberDissectionView::OnAddBundle() + +void QmitkInteractiveFiberDissectionView::CreateStreamlineInteractor() { - UpdateGui(); + m_StreamlineInteractor = mitk::StreamlineInteractor::New(); + + m_StreamlineInteractor->LoadStateMachine("Streamline3DStates.xml", us::ModuleRegistry::GetModule("MitkFiberDissection")); + m_StreamlineInteractor->SetEventConfig("Streamline3DConfig.xml", us::ModuleRegistry::GetModule("MitkFiberDissection")); + +// m_StreamlineInteractor->SetRotationEnabled(rotationEnabled); +} + + +void QmitkInteractiveFiberDissectionView::StartAlgorithm() +{ } diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/QmitkInteractiveFiberDissectionView.h b/Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/QmitkInteractiveFiberDissectionView.h index 32059b3..a662fe5 100644 --- a/Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/QmitkInteractiveFiberDissectionView.h +++ b/Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/QmitkInteractiveFiberDissectionView.h @@ -1,135 +1,140 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center. 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. ===================================================================*/ #ifndef QmitkInteractiveFiberDissectionView_h #define QmitkInteractiveFiberDissectionView_h #include "ui_QmitkInteractiveFiberDissectionViewControls.h" #include //Pointset #include //Pointset #include //Pointset #include //Pointset #include #include #include //Pointset +#include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include /*! \brief View to process fiber bundles. Supplies methods to extract fibers from the bundle, fiber resampling, mirroring, join and subtract bundles and much more. */ class QmitkInteractiveFiberDissectionView : public QmitkAbstractView, public mitk::IRenderWindowPartListener { // this is needed for all Qt objects that should have a Qt meta-object // (everything that derives from QObject and wants to have signal/slots) Q_OBJECT public: typedef itk::Image< unsigned char, 3 > ItkUCharImageType; typedef itk::Image< float, 3 > ItkFloatImageType; static const std::string VIEW_ID; QmitkInteractiveFiberDissectionView(); virtual ~QmitkInteractiveFiberDissectionView(); virtual void CreateQtPartControl(QWidget *parent) override; /// /// Sets the focus to an internal widget. /// virtual void SetFocus() override; protected slots: void RenderWindowPartActivated(mitk::IRenderWindowPart* renderWindowPart) override; //Pointset void RenderWindowPartDeactivated(mitk::IRenderWindowPart* renderWindowPart) override; //Pointset void OnAddPointSetClicked();//Pointset void CreateStreamline(); -// void AddtoBundle(); void RemovefromBundle(); void ExtractRandomFibersFromTractogram(); + void StartAlgorithm(); void UpdateGui(); ///< update button activity etc. dpending on current datamanager selection protected: void OnCurrentSelectionChanged(QmitkSingleNodeSelectionWidget::NodeList nodes);//Pointset virtual void OnSelectionChanged(berry::IWorkbenchPart::Pointer part, const QList& nodes) override; void OnEndInteraction(); - void OnAddBundle(); + void CreateStreamlineInteractor(); Ui::QmitkInteractiveFiberDissectionViewControls* m_Controls; int m_IterationCounter; ///< used for data node naming std::vector m_SelectedFB; ///< selected fiber bundle nodes mitk::Image::Pointer m_SelectedImage; mitk::DataNode::Pointer m_SelectedPS; mitk::DataNode::Pointer m_SelectedImageNode; mitk::FiberBundle::Pointer m_positiveBundle; + mitk::FiberBundle::Pointer m_newfibersBundle; mitk::FiberBundle::Pointer m_negativeBundle; std::vector< mitk::DataNode::Pointer> m_positivSelectedBundles; - std::vector< mitk::DataNode::Pointer> m_negativeSelectedBundles; + std::vector< mitk::DataNode::Pointer> m_newfibersSelectedBundles; + mitk::DataNode::Pointer m_negativeSelectedBundles; + vtkSmartPointer m_positiveFibersData; - vtkSmartPointer m_negativeFibersData; + vtkSmartPointer m_newfibersFibersData; vtkSmartPointer m_picker1; + mitk::StreamlineInteractor::Pointer m_StreamlineInteractor; }; #endif // _QMITKFIBERTRACKINGVIEW_H_INCLUDED diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/QmitkInteractiveFiberDissectionViewControls.ui b/Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/QmitkInteractiveFiberDissectionViewControls.ui index 21ead88..671a229 100644 --- a/Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/QmitkInteractiveFiberDissectionViewControls.ui +++ b/Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/QmitkInteractiveFiberDissectionViewControls.ui @@ -1,636 +1,631 @@ QmitkInteractiveFiberDissectionViewControls 0 0 417 711 Form QCommandLinkButton:disabled { border: none; } QGroupBox { background-color: transparent; } 9 9 9 9 Please Select Input Data 6 6 6 6 Input DTI Fiber Bundle: <html><head/><body><p><span style=" color:#ff0000;">mandatory</span></p></body></html> true true true Label Fibers QFrame::NoFrame - 1 + 0 6 0 0 399 492 Fiber Creation QFrame::StyledPanel QFrame::Raised - - + + - Add new Streamline Pointset + Selected Streamline Pointset - - - - Add Streamline to Tractogram + + + + Qt::Horizontal - + + + 40 + 20 + + + - - - - Create Streamline + + + + Streamline Points + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + - - + + Qt::Horizontal 40 20 - - + + Qt::Horizontal 40 20 + + + + Add new Streamline Pointset + + + 0 0 0 40 - - - - Selected Streamline Pointset - - - - + Qt::Vertical 20 40 - - - - Streamline Points + + + + Create Streamline - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - true 0 0 399 492 Fiber Labelling Dissect/Eraze Fibers by Erasion and Highlighting - + Qt::Vertical 20 40 - - - - Streamlines belonging to Bundle - - - - - - - - - - Streamlines not belonging to Bundle - - - - - - - Streamlines to be labeled - - - - - - - - - true ArrowCursor QFrame::NoFrame QFrame::Raised Label individual Streamlines + + + + Streamlines to be labeled + + + QFrame::StyledPanel QFrame::Raised - + + + + Label Streamlines + + + + 30 30 :/org.mitk.gui.qt.diffusionimaging.fiberprocessing/resources/eraze.png:/org.mitk.gui.qt.diffusionimaging.fiberprocessing/resources/eraze.png 32 32 true - - - - - 30 - 30 - - + + - + Reject: Rightclick + shift - - - :/org.mitk.gui.qt.diffusionimaging.fiberprocessing/resources/highlighter.png:/org.mitk.gui.qt.diffusionimaging.fiberprocessing/resources/highlighter.png + + + + + + Qt::Horizontal - + - 32 - 32 + 40 + 20 - - true + + + + + + Random Streamlines - - + + - Qt::Vertical + Qt::Horizontal - 20 - 40 + 40 + 20 - - - - Add + + + + Qt::Horizontal - + + + 40 + 20 + + + - - + + Qt::Horizontal 40 20 - - + + - Random Streamlines + Add - - + + + + Accept: Rightclick + alt + + + + + - Qt::Horizontal + Qt::Vertical - 40 - 20 + 20 + 40 - - + + + + 10 + + 0 0 399 492 Active Learning 9 9 341 391 QFrame::StyledPanel QFrame::Raised Qt::Horizontal 40 20 Train Classifier 5 10 Create Prediction Qt::Vertical 20 40 Qt::Horizontal 40 20 Create Uncertanty Map - + Add To be labeled Qt::Horizontal 40 20 Qt::Horizontal 84 22 Qt::Vertical QSizePolicy::Fixed 20 40 QmitkSingleNodeSelectionWidget QWidget
QmitkSingleNodeSelectionWidget.h
QmitkPointListWidget QWidget
QmitkPointListWidget.h