diff --git a/Modules/ImageStatisticsUI/Qmitk/QmitkHistogramVisualizationWidget.cpp b/Modules/ImageStatisticsUI/Qmitk/QmitkHistogramVisualizationWidget.cpp
index 336f14d585..eb0b0c4a84 100644
--- a/Modules/ImageStatisticsUI/Qmitk/QmitkHistogramVisualizationWidget.cpp
+++ b/Modules/ImageStatisticsUI/Qmitk/QmitkHistogramVisualizationWidget.cpp
@@ -1,150 +1,157 @@
/*===================================================================
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 "QmitkHistogramVisualizationWidget.h"
#include <QClipboard>
QmitkHistogramVisualizationWidget::QmitkHistogramVisualizationWidget(QWidget* parent) : QWidget(parent)
{
m_Controls.setupUi(this);
#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)
m_Controls.labelHistogramIsInvisibleWarning->setVisible(true);
m_Controls.labelHistogramIsInvisibleWarning->setText("<font color = 'red'>Histogram is not visible because Qt 5.10 is required for MitkChart. You can use the button <i>Copy to Clipboard</i> below to retrieve values.< / font>");
m_Controls.groupBoxPlot->setVisible(false);
m_Controls.chartWidget->setVisible(false);
#else
m_Controls.labelHistogramIsInvisibleWarning->setVisible(false);
m_Controls.checkBoxShowSubchart->setChecked(false);
#endif
+ m_Controls.spinBoxNBins->setValue(m_DefaultNBins);
+ m_Controls.spinBoxNBins->setMinimum(m_MinNBins);
+ m_Controls.spinBoxNBins->setMaximum(m_MaxNBins);
+
CreateConnections();
}
void QmitkHistogramVisualizationWidget::SetHistogram(itk::Statistics::Histogram<double>::ConstPointer histogram, const std::string& dataLabel)
{
if (histogram == nullptr)
return;
m_Histogram = histogram;
m_Controls.chartWidget->AddData2D(ConvertHistogramToMap(m_Histogram), dataLabel);
m_Controls.chartWidget->SetChartType(dataLabel, QmitkChartWidget::ChartType::bar);
m_Controls.chartWidget->SetXAxisLabel("Gray value");
m_Controls.chartWidget->SetYAxisLabel("Frequency");
#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
m_Controls.chartWidget->Show(m_Controls.checkBoxShowSubchart->isChecked());
#endif
SetGUIElementsEnabled(true);
}
void QmitkHistogramVisualizationWidget::Reset()
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
m_Controls.chartWidget->Clear();
#endif
SetGUIElementsEnabled(false);
}
void QmitkHistogramVisualizationWidget::SetTheme(QmitkChartWidget::ChartStyle style)
{
m_ChartStyle = style;
}
void QmitkHistogramVisualizationWidget::CreateConnections()
{
connect(m_Controls.buttonCopyHistogramToClipboard, &QPushButton::clicked, this, &QmitkHistogramVisualizationWidget::OnClipboardButtonClicked);
connect(m_Controls.checkBoxUseDefaultNBins, &QCheckBox::clicked, this, &QmitkHistogramVisualizationWidget::OnDefaultNBinsCheckBoxChanged);
connect(m_Controls.spinBoxNBins, &QSpinBox::editingFinished, this, &QmitkHistogramVisualizationWidget::OnNBinsSpinBoxValueChanged);
connect(m_Controls.checkBoxShowSubchart, &QCheckBox::clicked, this, &QmitkHistogramVisualizationWidget::OnShowSubchartCheckBoxChanged);
connect(m_Controls.chartWidget, &QmitkChartWidget::PageSuccessfullyLoaded, this, &QmitkHistogramVisualizationWidget::OnPageSuccessfullyLoaded);
}
void QmitkHistogramVisualizationWidget::SetGUIElementsEnabled(bool enabled)
{
this->setEnabled(enabled);
m_Controls.groupBoxHistogram->setEnabled(enabled);
m_Controls.groupBoxPlot->setEnabled(enabled);
m_Controls.checkBoxShowSubchart->setEnabled(enabled);
m_Controls.checkBoxUseDefaultNBins->setEnabled(enabled);
m_Controls.spinBoxNBins->setEnabled(!m_Controls.checkBoxUseDefaultNBins->isChecked());
m_Controls.buttonCopyHistogramToClipboard->setEnabled(enabled);
}
std::map<double, double> QmitkHistogramVisualizationWidget::ConvertHistogramToMap(itk::Statistics::Histogram<double>::ConstPointer histogram) const
{
std::map<double, double> histogramMap;
if (histogram)
{
auto endIt = histogram->End();
auto it = histogram->Begin();
// generating Lists of measurement and frequencies
for (; it != endIt; ++it)
{
double frequency = it.GetFrequency();
double measurement = it.GetMeasurementVector()[0];
histogramMap.emplace(measurement, frequency);
}
}
return histogramMap;
}
void QmitkHistogramVisualizationWidget::OnClipboardButtonClicked()
{
if (m_Histogram)
{
QApplication::clipboard()->clear();
QString clipboard("Measurement \t Frequency\n");
auto iter = m_Histogram->Begin();
auto iterEnd = m_Histogram->End();
for (; iter != iterEnd; ++iter)
{
clipboard = clipboard.append("%L1 \t %L2\n")
.arg(iter.GetMeasurementVector()[0], 0, 'f', 2)
.arg(iter.GetFrequency());
}
QApplication::clipboard()->setText(clipboard, QClipboard::Clipboard);
}
}
void QmitkHistogramVisualizationWidget::OnDefaultNBinsCheckBoxChanged()
{
if (m_Controls.checkBoxUseDefaultNBins->isChecked())
{
m_Controls.spinBoxNBins->setEnabled(false);
- m_Controls.spinBoxNBins->setValue(100);
+ if (m_Controls.spinBoxNBins->value() != m_DefaultNBins) {
+ m_Controls.spinBoxNBins->setValue(m_DefaultNBins);
+ OnNBinsSpinBoxValueChanged();
+ }
}
else
{
m_Controls.spinBoxNBins->setEnabled(true);
}
}
void QmitkHistogramVisualizationWidget::OnNBinsSpinBoxValueChanged()
{
emit RequestHistogramUpdate(m_Controls.spinBoxNBins->value());
}
void QmitkHistogramVisualizationWidget::OnShowSubchartCheckBoxChanged()
{
m_Controls.chartWidget->Show(m_Controls.checkBoxShowSubchart->isChecked());
}
void QmitkHistogramVisualizationWidget::OnPageSuccessfullyLoaded()
{
m_Controls.chartWidget->SetTheme(m_ChartStyle);
}
diff --git a/Modules/ImageStatisticsUI/Qmitk/QmitkHistogramVisualizationWidget.h b/Modules/ImageStatisticsUI/Qmitk/QmitkHistogramVisualizationWidget.h
index 10f29d9e1d..aac9fdf1c3 100644
--- a/Modules/ImageStatisticsUI/Qmitk/QmitkHistogramVisualizationWidget.h
+++ b/Modules/ImageStatisticsUI/Qmitk/QmitkHistogramVisualizationWidget.h
@@ -1,72 +1,75 @@
/*===================================================================
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 QmitkHistogramVisualizationWidget_H__INCLUDED
#define QmitkHistogramVisualizationWidget_H__INCLUDED
#include <MitkImageStatisticsUIExports.h>
#include <ui_QmitkHistogramVisualizationWidget.h>
//itk
#include <itkHistogram.h>
/**
* \brief Widget for displaying Histograms.
*/
class MITKIMAGESTATISTICSUI_EXPORT QmitkHistogramVisualizationWidget : public QWidget
{
Q_OBJECT
public:
QmitkHistogramVisualizationWidget(QWidget* parent = nullptr);
/** \brief Draws the histogram and enables the GUI elements. */
void SetHistogram(itk::Statistics::Histogram<double>::ConstPointer histogram, const std::string& dataLabel);
/** \brief Clears the histogram and disables all GUI elements. */
void Reset();
/** \brief Sets the theme (either dark or light) */
void SetTheme(QmitkChartWidget::ChartStyle style);
signals:
/** \brief Signal to be emitted when the number of bins is changed by the user. The HistogramCalculator should connect to this signal and recalculate the data accordingly. */
void RequestHistogramUpdate(unsigned int nBins);
private:
void CreateConnections();
void SetGUIElementsEnabled(bool enabled);
/** \brief Helper function to convert the histogram in order to forward it to the ChartWidget. */
std::map<double, double> ConvertHistogramToMap(itk::Statistics::Histogram<double>::ConstPointer histogram) const;
//slots
/** \brief Saves the histogram to the clipboard. */
void OnClipboardButtonClicked();
/** \brief Enables / Disables SpinBox to change the number of bins. */
void OnDefaultNBinsCheckBoxChanged();
/** \brief Emits the signal RequestHistogramUpdate(unsigned int nBins) with the updated value. */
void OnNBinsSpinBoxValueChanged();
/** \brief Shows / Hides the subchart. */
void OnShowSubchartCheckBoxChanged();
void OnPageSuccessfullyLoaded();
private:
Ui::QmitkHistogramVisualizationControls m_Controls;
+ const unsigned int m_DefaultNBins = 100;
+ const unsigned int m_MinNBins = 10;
+ const unsigned int m_MaxNBins = 10000;
itk::Statistics::Histogram<double>::ConstPointer m_Histogram;
QmitkChartWidget::ChartStyle m_ChartStyle = QmitkChartWidget::ChartStyle::darkstyle;
};
#endif //QmitkHistogramVisualizationWidget_H__INCLUDED
\ No newline at end of file