diff --git a/Plugins/org.mitk.gui.qt.dicominspector/src/internal/QmitkDicomInspectorView.cpp b/Plugins/org.mitk.gui.qt.dicominspector/src/internal/QmitkDicomInspectorView.cpp
index f396482627..c4508d80b3 100644
--- a/Plugins/org.mitk.gui.qt.dicominspector/src/internal/QmitkDicomInspectorView.cpp
+++ b/Plugins/org.mitk.gui.qt.dicominspector/src/internal/QmitkDicomInspectorView.cpp
@@ -1,397 +1,310 @@
/*============================================================================
The Medical Imaging Interaction Toolkit (MITK)
Copyright (c) German Cancer Research Center (DKFZ)
All rights reserved.
Use of this source code is governed by a 3-clause BSD license that can be
found in the LICENSE file.
============================================================================*/
// Blueberry
#include <berryISelectionService.h>
#include <berryIWorkbenchWindow.h>
#include <berryIWorkbenchPage.h>
// mitk
#include <QmitkRenderWindow.h>
#include <mitkImagePixelReadAccessor.h>
#include <mitkPixelTypeMultiplex.h>
#include <mitkTimeNavigationController.h>
#include <mitkNodePredicateAnd.h>
#include <mitkNodePredicateNot.h>
#include <mitkNodePredicateProperty.h>
// Qt
#include <QMessageBox>
#include <QMessageBox>
#include <QFileDialog>
#include <qwt_plot_marker.h>
#include "QmitkDicomInspectorView.h"
const std::string QmitkDicomInspectorView::VIEW_ID = "org.mitk.views.dicominspector";
-QmitkDicomInspectorView::ObserverInfo::ObserverInfo(mitk::SliceNavigationController* controller,
- int observerTag, mitk::IRenderWindowPart* part)
- : controller(controller)
- , observerTag(observerTag)
- , renderWindowPart(part)
+namespace
{
+ QmitkAbstractNodeSelectionWidget::NodeList GetInitialSelection(berry::ISelection::ConstPointer selection)
+ {
+ if (selection.IsNotNull() && !selection->IsEmpty())
+ {
+ auto dataNodeSelection = dynamic_cast<const mitk::DataNodeSelection*>(selection.GetPointer());
+
+ if (nullptr != dataNodeSelection)
+ {
+ auto firstSelectedDataNode = dataNodeSelection->GetSelectedDataNodes().front();
+
+ if (firstSelectedDataNode.IsNotNull())
+ {
+ QmitkAbstractNodeSelectionWidget::NodeList initialSelection;
+ initialSelection.push_back(firstSelectedDataNode);
+
+ return initialSelection;
+ }
+ }
+ }
+
+ return QmitkAbstractNodeSelectionWidget::NodeList();
+ }
}
QmitkDicomInspectorView::QmitkDicomInspectorView()
: m_RenderWindowPart(nullptr)
- , m_PendingSliceChangedEvent(false)
, m_SelectedNode(nullptr)
+ , m_ValidSelectedPosition(false)
, m_SelectedTimePoint(0.)
, m_CurrentSelectedZSlice(0)
{
m_SelectedPosition.Fill(0.0);
}
QmitkDicomInspectorView::~QmitkDicomInspectorView()
{
- this->RemoveAllObservers();
}
void QmitkDicomInspectorView::RenderWindowPartActivated(mitk::IRenderWindowPart* renderWindowPart)
{
if (m_RenderWindowPart != renderWindowPart)
{
m_RenderWindowPart = renderWindowPart;
- if (!InitObservers())
- {
- QMessageBox::information(nullptr, "Error", "Unable to set up the event observers. The " \
- "plot will not be triggered on changing the crosshair, " \
- "position or time step.");
- }
+ this->m_SliceNavigationListener.RenderWindowPartActivated(renderWindowPart);
}
}
void QmitkDicomInspectorView::RenderWindowPartDeactivated(mitk::IRenderWindowPart* renderWindowPart)
{
m_RenderWindowPart = nullptr;
- this->RemoveAllObservers(renderWindowPart);
+ this->m_SliceNavigationListener.RenderWindowPartDeactivated(renderWindowPart);
}
void QmitkDicomInspectorView::CreateQtPartControl(QWidget* parent)
{
// create GUI widgets from the Qt Designer's .ui file
m_Controls.setupUi(parent);
auto nodePredicate = mitk::NodePredicateAnd::New();
nodePredicate->AddPredicate(mitk::NodePredicateNot::New(mitk::NodePredicateProperty::New("helper object")));
nodePredicate->AddPredicate(mitk::NodePredicateNot::New(mitk::NodePredicateProperty::New("hidden object")));
m_Controls.singleSlot->SetDataStorage(GetDataStorage());
m_Controls.singleSlot->SetSelectionIsOptional(true);
- m_Controls.singleSlot->SetAutoSelectNewNodes(true);
m_Controls.singleSlot->SetNodePredicate(nodePredicate);
m_Controls.singleSlot->SetEmptyInfo(QString("Please select a data node"));
m_Controls.singleSlot->SetPopUpTitel(QString("Select data node"));
m_SelectionServiceConnector = std::make_unique<QmitkSelectionServiceConnector>();
SetAsSelectionListener(true);
m_Controls.timePointValueLabel->setText(QString(""));
m_Controls.sliceNumberValueLabel->setText(QString(""));
connect(m_Controls.singleSlot, &QmitkSingleNodeSelectionWidget::CurrentSelectionChanged,
this, &QmitkDicomInspectorView::OnCurrentSelectionChanged);
mitk::IRenderWindowPart* renderWindowPart = GetRenderWindowPart();
RenderWindowPartActivated(renderWindowPart);
-}
-
-bool QmitkDicomInspectorView::InitObservers()
-{
- bool result = true;
-
- auto* timeNavigationController = mitk::RenderingManager::GetInstance()->GetTimeNavigationController();
- itk::SimpleMemberCommand<QmitkDicomInspectorView>::Pointer cmdTimeEvent =
- itk::SimpleMemberCommand<QmitkDicomInspectorView>::New();
- cmdTimeEvent->SetCallbackFunction(this, &QmitkDicomInspectorView::OnTimeChanged);
- m_ControllerToTimeObserverTag = timeNavigationController->AddObserver(mitk::TimeNavigationController::TimeEvent(0), cmdTimeEvent);
-
- typedef QHash<QString, QmitkRenderWindow*> WindowMapType;
- WindowMapType windowMap = m_RenderWindowPart->GetQmitkRenderWindows();
+ this->m_SliceNavigationListener.RenderWindowPartActivated(this->GetRenderWindowPart());
+ connect(&m_SliceNavigationListener, &QmitkSliceNavigationListener::SliceChanged, this, &QmitkDicomInspectorView::OnSliceChanged);
- auto i = windowMap.begin();
+ auto selection = this->GetSite()->GetWorkbenchWindow()->GetSelectionService()->GetSelection();
+ auto currentSelection = GetInitialSelection(selection);
- while (i != windowMap.end())
- {
- mitk::SliceNavigationController* sliceNavController = i.value()->GetSliceNavigationController();
-
- if (nullptr != sliceNavController)
- {
- auto cmdSliceEvent = itk::SimpleMemberCommand<QmitkDicomInspectorView>::New();
- cmdSliceEvent->SetCallbackFunction(this, &QmitkDicomInspectorView::OnSliceChanged);
- int tag = sliceNavController->AddObserver(
- mitk::SliceNavigationController::GeometrySliceEvent(nullptr, 0), cmdSliceEvent);
-
- m_ObserverMap.insert(std::make_pair(sliceNavController, ObserverInfo(sliceNavController, tag,
- m_RenderWindowPart)));
-
- auto cmdDelEvent = itk::MemberCommand<QmitkDicomInspectorView>::New();
- cmdDelEvent->SetCallbackFunction(this, &QmitkDicomInspectorView::OnSliceNavigationControllerDeleted);
- tag = sliceNavController->AddObserver(itk::DeleteEvent(), cmdDelEvent);
-
- m_ObserverMap.insert(std::make_pair(sliceNavController, ObserverInfo(sliceNavController, tag,
- m_RenderWindowPart)));
- }
-
- ++i;
-
- result = result && sliceNavController;
- }
-
- return result;
-}
-
-void QmitkDicomInspectorView::RemoveObservers(const mitk::SliceNavigationController* deletedSlicer)
-{
- std::pair<ObserverMapType::const_iterator, ObserverMapType::const_iterator> obsRange =
- m_ObserverMap.equal_range(deletedSlicer);
-
- for (ObserverMapType::const_iterator pos = obsRange.first; pos != obsRange.second; ++pos)
- {
- pos->second.controller->RemoveObserver(pos->second.observerTag);
- }
-
- m_ObserverMap.erase(deletedSlicer);
-}
-
-void QmitkDicomInspectorView::RemoveAllObservers(mitk::IRenderWindowPart* deletedPart)
-{
- for (ObserverMapType::const_iterator pos = m_ObserverMap.begin(); pos != m_ObserverMap.end();)
- {
- ObserverMapType::const_iterator delPos = pos++;
-
- if (nullptr == deletedPart || deletedPart == delPos->second.renderWindowPart)
- {
- delPos->second.controller->RemoveObserver(delPos->second.observerTag);
- m_ObserverMap.erase(delPos);
- }
- }
+ if (!currentSelection.isEmpty())
+ m_Controls.singleSlot->SetCurrentSelection(currentSelection);
}
void QmitkDicomInspectorView::OnCurrentSelectionChanged(QList<mitk::DataNode::Pointer> nodes)
{
if (nodes.empty() || nodes.front().IsNull())
{
m_SelectedNode = nullptr;
m_SelectedData = nullptr;
UpdateData();
return;
}
if (nodes.front() != this->m_SelectedNode)
{
// node is selected, create DICOM tag table
m_SelectedNode = nodes.front();
m_SelectedData = this->m_SelectedNode->GetData();
m_SelectedNodeTime.Modified();
UpdateData();
- OnSliceChangedDelayed();
+ OnSliceChanged();
}
}
-void QmitkDicomInspectorView::OnSliceChanged()
-{
- // Since there are always 3 events arriving (one for each render window) every time the slice
- // or time changes, the slot OnSliceChangedDelayed is triggered - and only if it hasn't been
- // triggered yet - so it is only executed once for every slice/time change.
- if (!m_PendingSliceChangedEvent)
- {
- m_PendingSliceChangedEvent = true;
-
- QTimer::singleShot(0, this, SLOT(OnSliceChangedDelayed()));
- }
-}
-
-void QmitkDicomInspectorView::OnSliceNavigationControllerDeleted(const itk::Object* sender, const itk::EventObject& /*e*/)
-{
- auto sendingSlicer = dynamic_cast<const mitk::SliceNavigationController*>(sender);
-
- this->RemoveObservers(sendingSlicer);
-}
-
void QmitkDicomInspectorView::ValidateAndSetCurrentPosition()
{
const auto currentSelectedPosition = m_RenderWindowPart->GetSelectedPosition();
const auto* timeNavigationController = mitk::RenderingManager::GetInstance()->GetTimeNavigationController();
const mitk::TimeStepType currentSelectedTimePoint = timeNavigationController->GetSelectedTimePoint();
if (m_SelectedPosition != currentSelectedPosition
|| m_SelectedTimePoint != currentSelectedTimePoint
|| m_SelectedNodeTime > m_CurrentPositionTime)
{
// the current position has been changed, the selected node has been changed since
// the last position validation or the current time position has been changed -> check position
m_SelectedPosition = currentSelectedPosition;
m_SelectedTimePoint = currentSelectedTimePoint;
m_CurrentPositionTime.Modified();
m_ValidSelectedPosition = false;
if (m_SelectedData.IsNull())
{
return;
}
mitk::BaseGeometry::Pointer geometry = m_SelectedData->GetTimeGeometry()->GetGeometryForTimePoint(m_SelectedTimePoint);
// check for invalid time step
if (geometry.IsNull())
{
geometry = m_SelectedData->GetTimeGeometry()->GetGeometryForTimeStep(0);
}
if (geometry.IsNull())
{
return;
}
m_ValidSelectedPosition = geometry->IsInside(m_SelectedPosition);
itk::Index<3> index;
geometry->WorldToIndex(m_SelectedPosition, index);
m_CurrentSelectedZSlice = index[2];
}
}
-void QmitkDicomInspectorView::OnSliceChangedDelayed()
-{
- m_PendingSliceChangedEvent = false;
-
- ValidateAndSetCurrentPosition();
-
- m_Controls.tableTags->setEnabled(m_ValidSelectedPosition);
-
- if (m_SelectedNode.IsNotNull())
- {
- RenderTable();
- }
-}
-
-void QmitkDicomInspectorView::OnTimeChanged()
+void QmitkDicomInspectorView::OnSliceChanged()
{
ValidateAndSetCurrentPosition();
m_Controls.tableTags->setEnabled(m_ValidSelectedPosition);
if (m_SelectedNode.IsNotNull())
{
RenderTable();
}
}
void QmitkDicomInspectorView::RenderTable()
{
assert(nullptr != m_RenderWindowPart);
const auto timeStep = (m_SelectedData.IsNull()) ? 0 : m_SelectedData->GetTimeGeometry()->TimePointToTimeStep(m_SelectedTimePoint);
unsigned int rowIndex = 0;
for (const auto& element : m_Tags)
{
QTableWidgetItem* newItem = new QTableWidgetItem(QString::fromStdString(
element.second.prop->GetValue(timeStep, m_CurrentSelectedZSlice, true, true)));
m_Controls.tableTags->setItem(rowIndex, 3, newItem);
++rowIndex;
}
UpdateLabels();
}
void QmitkDicomInspectorView::UpdateData()
{
QStringList headers;
m_Controls.tableTags->horizontalHeader()->resizeSections(QHeaderView::ResizeToContents);
m_Tags.clear();
if (m_SelectedData.IsNotNull())
{
for (const auto& element : *(m_SelectedData->GetPropertyList()->GetMap()))
{
if (element.first.find("DICOM") == 0)
{
std::istringstream stream(element.first);
std::string token;
std::getline(stream, token, '.'); //drop the DICOM suffix
std::getline(stream, token, '.'); //group id
unsigned long dcmgroup = std::stoul(token, nullptr, 16);
std::getline(stream, token, '.'); //element id
unsigned long dcmelement = std::stoul(token, nullptr, 16);
TagInfo info(mitk::DICOMTag(dcmgroup, dcmelement), dynamic_cast<const mitk::DICOMProperty*>(element.second.GetPointer()));
m_Tags.insert(std::make_pair(element.first, info));
}
}
}
m_Controls.tableTags->setRowCount(m_Tags.size());
unsigned int rowIndex = 0;
for (const auto& element : m_Tags)
{
QTableWidgetItem* newItem = new QTableWidgetItem(QString::number(element.second.tag.GetGroup(), 16));
m_Controls.tableTags->setItem(rowIndex, 0, newItem);
newItem = new QTableWidgetItem(QString::number(element.second.tag.GetElement(), 16));
m_Controls.tableTags->setItem(rowIndex, 1, newItem);
newItem = new QTableWidgetItem(QString::fromStdString(element.second.tag.GetName()));
m_Controls.tableTags->setItem(rowIndex, 2, newItem);
newItem = new QTableWidgetItem(QString::fromStdString(element.second.prop->GetValue()));
m_Controls.tableTags->setItem(rowIndex, 3, newItem);
++rowIndex;
}
UpdateLabels();
}
void QmitkDicomInspectorView::UpdateLabels()
{
if (m_SelectedData.IsNull())
{
m_Controls.timePointValueLabel->setText(QString(""));
m_Controls.sliceNumberValueLabel->setText(QString(""));
}
else
{
const auto timeStep = m_SelectedData->GetTimeGeometry()->TimePointToTimeStep(m_SelectedTimePoint);
if (m_ValidSelectedPosition)
{
m_Controls.timePointValueLabel->setText(QString::number(timeStep) + QStringLiteral("(")+ QString::number(m_SelectedTimePoint/1000.) + QStringLiteral(" [s])"));
m_Controls.sliceNumberValueLabel->setText(QString::number(m_CurrentSelectedZSlice));
}
else
{
m_Controls.timePointValueLabel->setText(QString("outside data geometry"));
m_Controls.sliceNumberValueLabel->setText(QString("outside data geometry"));
}
}
}
void QmitkDicomInspectorView::SetAsSelectionListener(bool checked)
{
if (checked)
{
m_SelectionServiceConnector->AddPostSelectionListener(GetSite()->GetWorkbenchWindow()->GetSelectionService());
connect(m_SelectionServiceConnector.get(), &QmitkSelectionServiceConnector::ServiceSelectionChanged,
m_Controls.singleSlot, &QmitkSingleNodeSelectionWidget::SetCurrentSelection);
}
else
{
m_SelectionServiceConnector->RemovePostSelectionListener();
disconnect(m_SelectionServiceConnector.get(), &QmitkSelectionServiceConnector::ServiceSelectionChanged,
m_Controls.singleSlot, &QmitkSingleNodeSelectionWidget::SetCurrentSelection);
}
}
diff --git a/Plugins/org.mitk.gui.qt.dicominspector/src/internal/QmitkDicomInspectorView.h b/Plugins/org.mitk.gui.qt.dicominspector/src/internal/QmitkDicomInspectorView.h
index b26f77fd27..74de75f831 100644
--- a/Plugins/org.mitk.gui.qt.dicominspector/src/internal/QmitkDicomInspectorView.h
+++ b/Plugins/org.mitk.gui.qt.dicominspector/src/internal/QmitkDicomInspectorView.h
@@ -1,155 +1,123 @@
/*============================================================================
The Medical Imaging Interaction Toolkit (MITK)
Copyright (c) German Cancer Research Center (DKFZ)
All rights reserved.
Use of this source code is governed by a 3-clause BSD license that can be
found in the LICENSE file.
============================================================================*/
#ifndef QmitkDicomInspectorView_h
#define QmitkDicomInspectorView_h
#include "ui_QmitkDicomInspectorViewControls.h"
// Blueberry
#include <berryIPartListener.h>
// mitk DICOM module
#include <mitkDICOMTag.h>
#include <mitkDICOMProperty.h>
// mitk gui common plugin
#include <mitkIRenderWindowPartListener.h>
// mitk gui qt common plugin
#include <QmitkAbstractView.h>
#include <QmitkSelectionServiceConnector.h>
+#include <QmitkSliceNavigationListener.h>
/**
* @brief View class to inspect all DICOM tags available for the data of a node.
*/
class QmitkDicomInspectorView : public QmitkAbstractView, public mitk::IRenderWindowPartListener
{
Q_OBJECT
public:
QmitkDicomInspectorView();
~QmitkDicomInspectorView() override;
static const std::string VIEW_ID;
void SetFocus() override { };
void RenderWindowPartActivated(mitk::IRenderWindowPart* renderWindowPart) override;
void RenderWindowPartDeactivated(mitk::IRenderWindowPart* renderWindowPart) override;
protected:
void CreateQtPartControl(QWidget* parent) override;
- /** @brief Initializes and sets the observers that are used to monitor changes in the selected position
- or time point in order to actualize the view*/
- bool InitObservers();
-
- /** @brief Removes all observers of the specific deleted slice navigation controller.*/
- void RemoveObservers(const mitk::SliceNavigationController* deletedSlicer);
-
- /** @brief Removes all observers of the deletedPart. If null pointer is passed all observers will be removed.*/
- void RemoveAllObservers(mitk::IRenderWindowPart* deletedPart = nullptr);
-
/** @brief Called by the selection widget when the selection has changed.*/
void OnCurrentSelectionChanged(QList<mitk::DataNode::Pointer> nodes);
- /** @brief Calls OnSliceChangedDelayed so the event isn't triggered multiple times.*/
- void OnSliceChanged();
- void OnTimeChanged();
-
- void OnSliceNavigationControllerDeleted(const itk::Object* sender, const itk::EventObject& /*e*/);
-
/** @brief Sets m_currentSelectedPosition to the current selection and validates if this position is valid
* for the input image of the currently selected fit. If it is valid, m_validSelectedPosition is set to true.
* If the fit, his input image or geometry is not specified, it will also handled as invalid.*/
void ValidateAndSetCurrentPosition();
-private Q_SLOTS:
-
- /** @brief Updates the current slice and time is correctly displayed.*/
- void OnSliceChangedDelayed();
+protected slots:
+ void OnSliceChanged();
private:
void RenderTable();
/** (Re-)initializes the headers of the data table.*/
void UpdateData();
void UpdateLabels();
void SetAsSelectionListener(bool checked);
Ui::QmitkDicomInspectorViewControls m_Controls;
mitk::IRenderWindowPart* m_RenderWindowPart;
std::unique_ptr<QmitkSelectionServiceConnector> m_SelectionServiceConnector;
- /** Needed for observing the events for when a slice or time step is changed.*/
- bool m_PendingSliceChangedEvent;
-
- /** Helper structure to manage the registered observer events.*/
- struct ObserverInfo
- {
- mitk::SliceNavigationController* controller;
- int observerTag;
- mitk::IRenderWindowPart* renderWindowPart;
-
- ObserverInfo(mitk::SliceNavigationController* controller, int observerTag, mitk::IRenderWindowPart* part);
- };
-
- typedef std::multimap<const mitk::SliceNavigationController*, ObserverInfo> ObserverMapType;
- ObserverMapType m_ObserverMap;
- unsigned int m_ControllerToTimeObserverTag;
+ QmitkSliceNavigationListener m_SliceNavigationListener;
/** @brief Currently selected node for the DICOM information.*/
mitk::DataNode::ConstPointer m_SelectedNode;
/** @brief Base data of the currently selected node.*/
mitk::BaseData::ConstPointer m_SelectedData;
/** @brief Valid selected position in the inspector.*/
mitk::Point3D m_SelectedPosition;
/** @brief Indicates if the currently selected position is valid for the currently selected data.*/
bool m_ValidSelectedPosition;
mitk::TimePointType m_SelectedTimePoint;
itk::IndexValueType m_CurrentSelectedZSlice;
/*************************************/
/* Members for visualizing the model */
itk::TimeStamp m_SelectedNodeTime;
itk::TimeStamp m_CurrentPositionTime;
/**Helper structure to manage the registered observer events.*/
struct TagInfo
{
mitk::DICOMTag tag;
mitk::DICOMProperty::ConstPointer prop;
TagInfo(const mitk::DICOMTag& aTag, mitk::DICOMProperty::ConstPointer aProp)
: tag(aTag)
, prop(aProp)
{
};
};
typedef std::map<std::string, TagInfo> TagMapType;
TagMapType m_Tags;
};
#endif