diff --git a/Modules/ImageStatisticsUI/CMakeLists.txt b/Modules/ImageStatisticsUI/CMakeLists.txt index e485f5c3d3..dae8b9505b 100644 --- a/Modules/ImageStatisticsUI/CMakeLists.txt +++ b/Modules/ImageStatisticsUI/CMakeLists.txt @@ -1,5 +1,5 @@ MITK_CREATE_MODULE( INCLUDE_DIRS Qmitk - DEPENDS MitkCore MitkChart + DEPENDS MitkCore MitkChart MitkImageStatistics PACKAGE_DEPENDS PRIVATE Qt5|WebEngineWidgets ) \ No newline at end of file diff --git a/Modules/ImageStatisticsUI/Qmitk/QmitkImageStatisticsWidget.cpp b/Modules/ImageStatisticsUI/Qmitk/QmitkImageStatisticsWidget.cpp new file mode 100644 index 0000000000..d3a5b696db --- /dev/null +++ b/Modules/ImageStatisticsUI/Qmitk/QmitkImageStatisticsWidget.cpp @@ -0,0 +1,48 @@ +/*=================================================================== + +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 "QmitkImageStatisticsWidget.h" + +QmitkImageStatisticsWidget::QmitkImageStatisticsWidget(QWidget* parent) : QWidget(parent) +{ + m_Controls.setupUi(parent); + CreateConnections(); +} + +void QmitkImageStatisticsWidget::SetStatistics(const std::vector& sc) +{ + //m_tableModel->AddMap(aDoseStatistics, structName); + //m_Controls.tableViewStatistics->setModel(m_tableModel); + m_Controls.tableViewStatistics->resizeColumnsToContents(); + m_Controls.tableViewStatistics->resizeRowsToContents(); +} + +void QmitkImageStatisticsWidget::CreateConnections() +{ + connect(m_Controls.buttonCopyImageStatisticsToClipboard, &QPushButton::clicked, this, &QmitkImageStatisticsWidget::OnClipboardButtonClicked); +} + +void QmitkImageStatisticsWidget::EnableAllComponents() +{ + this->setEnabled(true); + m_Controls.buttonCopyImageStatisticsToClipboard->setEnabled(true); + m_Controls.checkBox4dCompleteTable->setEnabled(true); + m_Controls.tableViewStatistics->setEnabled(true); +} + +void QmitkImageStatisticsWidget::OnClipboardButtonClicked() +{ +} diff --git a/Modules/ImageStatisticsUI/Qmitk/QmitkImageStatisticsWidget.h b/Modules/ImageStatisticsUI/Qmitk/QmitkImageStatisticsWidget.h new file mode 100644 index 0000000000..ed90ae2bb7 --- /dev/null +++ b/Modules/ImageStatisticsUI/Qmitk/QmitkImageStatisticsWidget.h @@ -0,0 +1,49 @@ +/*=================================================================== + +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. + +===================================================================*/ +#ifndef QmitkImageStatisticsWidget_H__INCLUDED +#define QmitkImageStatisticsWidget_H__INCLUDED + +#include + +#include +#include + +//Qt +#include + +class MITKIMAGESTATISTICSUI_EXPORT QmitkImageStatisticsWidget : public QWidget +{ + Q_OBJECT + +public: + QmitkImageStatisticsWidget(QWidget* parent = nullptr); + + void SetStatistics(const std::vector& sc); + +private: + + void CreateConnections(); + + void EnableAllComponents(); + + /** \brief Saves the image statistics to the clipboard */ + void OnClipboardButtonClicked(); + /** \brief Toogle GUI elements if histogram default bin size checkbox value changed. */ + +private: + Ui::QmitkImageStatisticsControls m_Controls; +}; +#endif // QmitkImageStatisticsWidget_H__INCLUDED diff --git a/Modules/ImageStatisticsUI/Qmitk/QmitkImageStatisticsWidget.ui b/Modules/ImageStatisticsUI/Qmitk/QmitkImageStatisticsWidget.ui new file mode 100644 index 0000000000..4cad6e6890 --- /dev/null +++ b/Modules/ImageStatisticsUI/Qmitk/QmitkImageStatisticsWidget.ui @@ -0,0 +1,130 @@ + + + QmitkImageStatisticsControls + + + + 0 + 0 + 540 + 460 + + + + + 0 + 0 + + + + + 0 + 0 + + + + Form + + + + + + false + + + + 400 + 450 + + + + + + + false + + + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + Copy to Clipboard + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 20 + 20 + + + + + + + + false + + + copy complete table + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + + + diff --git a/Modules/ImageStatisticsUI/files.cmake b/Modules/ImageStatisticsUI/files.cmake index 29fbf68799..bfd7f71fcc 100644 --- a/Modules/ImageStatisticsUI/files.cmake +++ b/Modules/ImageStatisticsUI/files.cmake @@ -1,17 +1,20 @@ set(CPP_FILES Qmitk/QmitkHistogramVisualizationWidget.cpp + Qmitk/QmitkImageStatisticsWidget.cpp ) set(H_FILES ) set(TPP_FILES ) set(UI_FILES Qmitk/QmitkHistogramVisualizationWidget.ui + Qmitk/QmitkImageStatisticsWidget.ui ) set(MOC_H_FILES Qmitk/QmitkHistogramVisualizationWidget.h + Qmitk/QmitkImageStatisticsWidget.h ) diff --git a/Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsReloadedView.cpp b/Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsReloadedView.cpp index 659e43cee1..e3da6e2070 100644 --- a/Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsReloadedView.cpp +++ b/Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsReloadedView.cpp @@ -1,93 +1,92 @@ /*=================================================================== 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 "QmitkImageStatisticsReloadedView.h" // berry includes #include #include #include #include #include #include const std::string QmitkImageStatisticsReloadedView::VIEW_ID = "org.mitk.views.imagestatisticsReloaded"; QmitkImageStatisticsReloadedView::QmitkImageStatisticsReloadedView(QObject* /*parent*/, const char* /*name*/) -: m_Controls( ) { } QmitkImageStatisticsReloadedView::~QmitkImageStatisticsReloadedView() { } void QmitkImageStatisticsReloadedView::CreateQtPartControl(QWidget *parent) { m_Controls.setupUi(parent); CreateConnections(); PrepareDataStorageComboBoxes(); } void QmitkImageStatisticsReloadedView::CreateConnections() { } void QmitkImageStatisticsReloadedView::PartClosed(const berry::IWorkbenchPartReference::Pointer& ) { } void QmitkImageStatisticsReloadedView::OnSelectionChanged( berry::IWorkbenchPart::Pointer /*part*/, const QList &nodes ) { } void QmitkImageStatisticsReloadedView::PrepareDataStorageComboBoxes() { auto isImage = mitk::NodePredicateDataType::New("Image"); auto isBinary = mitk::NodePredicateProperty::New("binary", mitk::BoolProperty::New(true)); auto isBinaryImage = mitk::NodePredicateAnd::New(isImage, isBinary); m_Controls.imageSelector->SetDataStorage(GetDataStorage()); m_Controls.imageSelector->SetPredicate(isImage); m_Controls.maskImageSelector->SetDataStorage(GetDataStorage()); m_Controls.maskImageSelector->SetPredicate(isBinaryImage); } void QmitkImageStatisticsReloadedView::Activated() { } void QmitkImageStatisticsReloadedView::Deactivated() { } void QmitkImageStatisticsReloadedView::Visible() { } void QmitkImageStatisticsReloadedView::Hidden() { } void QmitkImageStatisticsReloadedView::SetFocus() { } \ No newline at end of file diff --git a/Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsReloadedViewControls.ui b/Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsReloadedViewControls.ui index afdc1af00c..742f2e88b4 100644 --- a/Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsReloadedViewControls.ui +++ b/Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsReloadedViewControls.ui @@ -1,226 +1,255 @@ QmitkImageStatisticsReloadedViewControls true 0 0 548 853 Form QLayout::SetMinimumSize 4 0 0 false 0 0 0 0 0 0 0 0 120 120 120 Image: 0 0 0 0 0 0 0 0 120 120 120 Mask image: 0 0 false false + + + 0 + 250 + + Statistics 9 9 9 + + + + + 0 + 0 + + + + false 400 450 Histogram false - + + + + 0 + 0 + + + Qt::Vertical 20 40 QmitkHistogramVisualizationWidget QWidget
QmitkHistogramVisualizationWidget.h
1
+ + QmitkImageStatisticsWidget + QWidget +
QmitkImageStatisticsWidget.h
+ 1 +