diff --git a/Modules/Chart/include/QmitkChartData.h b/Modules/Chart/include/QmitkChartData.h
index 0c0ba8cda7..cfcfdd4114 100644
--- a/Modules/Chart/include/QmitkChartData.h
+++ b/Modules/Chart/include/QmitkChartData.h
@@ -1,128 +1,123 @@
/*===================================================================
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 QmitkC3Data_h
#define QmitkC3Data_h
#include <QmitkChartWidget.h>
#include <QVariant>
/** \brief This class holds the relevant properties for the chart generation with C3 such as labels and diagram type.
* It is derived from QObject, because we need Q_PROPERTIES to send Data via QWebChannel to JavaScript.
* \sa The actual data for the chart generation is in QmitkC3xyData!
*/
class QmitkChartData : public QObject
{
Q_OBJECT
Q_PROPERTY(QVariant m_xAxisLabel READ GetXAxisLabel WRITE SetXAxisLabel NOTIFY SignalXAxisLabelChanged);
Q_PROPERTY(QVariant m_yAxisLabel READ GetYAxisLabel WRITE SetYAxisLabel NOTIFY SignalYAxisLabelChanged);
Q_PROPERTY(QVariant m_chartTitle READ GetTitle WRITE SetTitle NOTIFY SignalTitleChanged);
Q_PROPERTY(QVariant m_themeName READ GetThemeName WRITE SetThemeName NOTIFY SignalThemeNameChanged);
Q_PROPERTY(QVariant m_LegendPosition READ GetLegendPosition WRITE SetLegendPosition NOTIFY SignalLegendPositionChanged);
Q_PROPERTY(QVariant m_ShowLegend READ GetShowLegend WRITE SetShowLegend NOTIFY SignalShowLegendChanged);
Q_PROPERTY(QVariant m_ShowErrorBars READ GetShowErrorBars WRITE SetShowErrorBars NOTIFY SignalShowErrorBarsChanged);
Q_PROPERTY(QVariant m_YAxisScale READ GetYAxisScale WRITE SetYAxisScale NOTIFY SignalYAxisScaleChanged);
Q_PROPERTY(QVariant m_ShowSubchart READ GetShowSubchart WRITE SetShowSubchart NOTIFY SignalShowSubchartChanged);
Q_PROPERTY(QVariant m_UsePercentageInPieChart READ GetUsePercentageInPieChart WRITE SetUsePercentageInPieChart NOTIFY SignalUsePercentageInPieChartChanged);
Q_PROPERTY(QVariant m_DataPointSize READ GetDataPointSize WRITE SetDataPointSize NOTIFY SignalDataPointSizeChanged);
Q_PROPERTY(QVariant m_StackedData READ GetStackedData WRITE SetStackedData NOTIFY SignalStackedDataChanged);
- Q_PROPERTY(QVariant m_UseMinMaxValues READ GetUseMinMaxValues WRITE UseMinMaxValues MOTIFY SignalUseMinMaxValues);
public:
QmitkChartData();
void SetAppearance(bool showSubChart = true, bool usePercentageInPieChart = false);
Q_INVOKABLE QVariant GetXAxisLabel() const { return m_xAxisLabel; };
Q_INVOKABLE void SetXAxisLabel(const QVariant& label) { m_xAxisLabel = label; emit SignalXAxisLabelChanged(label); };
Q_INVOKABLE QVariant GetYAxisLabel() const { return m_yAxisLabel; };
Q_INVOKABLE void SetYAxisLabel(const QVariant& label) { m_yAxisLabel = label; emit SignalYAxisLabelChanged(label); };
Q_INVOKABLE QVariant GetTitle() const { return m_chartTitle; };
Q_INVOKABLE void SetTitle(const QVariant& title) { m_chartTitle = title; emit SignalTitleChanged(title); };
Q_INVOKABLE QVariant GetThemeName() const { return m_themeName; };
Q_INVOKABLE void SetThemeName(const QVariant &themeName)
{
m_themeName = themeName;
emit SignalThemeNameChanged(themeName);
};
Q_INVOKABLE QVariant GetLegendPosition() const { return m_LegendPosition; };
Q_INVOKABLE void SetLegendPosition(const QVariant& legendPosition) { m_LegendPosition = legendPosition; emit SignalLegendPositionChanged(legendPosition); };
Q_INVOKABLE QVariant GetShowLegend() const { return m_ShowLegend; };
Q_INVOKABLE void SetShowLegend(const QVariant& show) { m_ShowLegend = show; emit SignalShowLegendChanged(show); };
Q_INVOKABLE QVariant GetShowErrorBars() const { return m_ShowErrorBars; };
Q_INVOKABLE void SetShowErrorBars(const QVariant &show)
{
m_ShowErrorBars = show;
emit SignalShowErrorBarsChanged(show);
};
Q_INVOKABLE QVariant GetYAxisScale() const { return m_YAxisScale; };
Q_INVOKABLE void SetYAxisScale(const QVariant& YAxisScale) { m_YAxisScale = YAxisScale; emit SignalYAxisScaleChanged(YAxisScale); };
Q_INVOKABLE QVariant GetShowSubchart() const { return m_ShowSubchart; };
Q_INVOKABLE void SetShowSubchart(const QVariant& showSubchart) { m_ShowSubchart = showSubchart; emit SignalShowSubchartChanged(showSubchart); };
Q_INVOKABLE QVariant GetUsePercentageInPieChart() const { return m_UsePercentageInPieChart; };
Q_INVOKABLE void SetUsePercentageInPieChart(const QVariant& usePercentageInPieChart) { m_UsePercentageInPieChart = usePercentageInPieChart; emit SignalUsePercentageInPieChartChanged(usePercentageInPieChart); };
Q_INVOKABLE QVariant GetDataPointSize() const { return m_DataPointSize; };
Q_INVOKABLE void SetDataPointSize(const QVariant& showDataPoints) { m_DataPointSize = showDataPoints; emit SignalDataPointSizeChanged(showDataPoints); };
Q_INVOKABLE QVariant GetStackedData() const { return m_StackedData; };
Q_INVOKABLE void SetStackedData(const QVariant& stackedData) { m_StackedData = stackedData; emit SignalStackedDataChanged(m_StackedData); };
- Q_INVOKABLE QVariant GetUseMinMaxValues() const { return m_UseMinMaxValues; };
- Q_INVOKABLE void SetUseMinMaxValues(const QVariant& useMinMaxValues) { m_UseMinMaxValues = useMinMaxValues; emit SignalUseMinMaxValues(useMinMaxValues); };
signals:
void SignalYAxisLabelChanged(const QVariant label);
void SignalXAxisLabelChanged(const QVariant label);
void SignalLegendPositionChanged(const QVariant legendPosition);
void SignalShowLegendChanged(const QVariant show);
void SignalShowErrorBarsChanged(const QVariant show);
void SignalYAxisScaleChanged(const QVariant YAxisScale);
void SignalTitleChanged(const QVariant title);
void SignalThemeNameChanged(const QVariant themeName);
void SignalShowSubchartChanged(const QVariant showSubchart);
void SignalUsePercentageInPieChartChanged(const QVariant usePercentageInPieChart);
void SignalDataPointSizeChanged(const QVariant showDataPoints);
void SignalStackedDataChanged(const QVariant stackedData);
- void SignalUseMinMaxValues(const QVariant useMinMaxValues);
private:
QVariant m_xAxisLabel;
QVariant m_yAxisLabel;
QVariant m_chartTitle;
QVariant m_themeName = "dark";
QVariant m_ShowLegend = true;
QVariant m_ShowErrorBars;
QVariant m_LegendPosition = "topRight";
QVariant m_ShowSubchart;
QVariant m_YAxisScale;
QVariant m_UsePercentageInPieChart;
QVariant m_numberDatasets;
QVariant m_DataPointSize = 0;
QVariant m_StackedData;
- QVariant m_UseMinMaxValues;
};
#endif //QmitkC3Data_h
diff --git a/Modules/Chart/include/QmitkChartWidget.h b/Modules/Chart/include/QmitkChartWidget.h
index 43cf16c99b..79bf31b844 100644
--- a/Modules/Chart/include/QmitkChartWidget.h
+++ b/Modules/Chart/include/QmitkChartWidget.h
@@ -1,262 +1,268 @@
/*===================================================================
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 QmitkC3jsWidget_h
#define QmitkC3jsWidget_h
#include <map>
#include <memory>
#include <QWidget>
#include <MitkChartExports.h>
/*!
\brief QmitkChartWidget is a widget to display various charts based on the javascript chart library plotly.
* \details Data is added via AddData1D() or AddData2D().\n
* There can be multiple charts (of different types with different properties) created by calling AddData1D or AddData2D multiple times.\n\n
* The following chart types are supported:
* * line chart
* * bar chart
* * spline chart
* * pie chart
* * scatter chart
* * area chart
* * area spline chart.
*
* Technical details: The javascript code is embedded in a QWebEngineView. The actual js code is implemented in resource\Chart.js.
* \sa https://plot.ly/javascript/ for further information about the used javaScript library.
* \ingroup Modules/Chart
*/
class MITKCHART_EXPORT QmitkChartWidget : public QWidget
{
Q_OBJECT
public:
/*!
* \brief enum of diagram types.
*/
enum class ChartType {
bar, /*!< bar chart, see https://plot.ly/javascript/bar-charts/ */
line, /*!< line chart, see https://plot.ly/javascript/line-charts/ */
spline, /*!< spline chart (smoothed line chart), see https://plot.ly/~jduelfer/23/spline/#/ */
pie, /*!< pie chart, see https://plot.ly/javascript/pie-charts/ */
area, /*!< area chart, see https://plot.ly/javascript/filled-area-plots/ */
area_spline, /*!< area-spline chart, similar to https://plot.ly/~jduelfer/23/spline/#/ */
scatter /*!< scatter chart, see https://plot.ly/javascript/line-and-scatter/ */
};
/*!
* \brief enum of chart style (modifies background and line color).
*/
enum class ColorTheme {
darkstyle, /*!< background color: dark gray, foreground color: white*/
lightstyle /*!< background color: white, foreground color: black */
};
enum class LineStyle {
solid,
dashed
};
enum class AxisScale {
linear,
log
};
/*!
* \brief enum of legend position.
* See https://plot.ly/javascript/legend/
*/
enum class LegendPosition {
bottomMiddle,
bottomRight,
topRight,
topLeft,
middleRight
};
explicit QmitkChartWidget(QWidget* parent = nullptr);
//for UnitTests
explicit QmitkChartWidget(QWidget *parent, bool unitTest);
~QmitkChartWidget() override;
/*!
* \brief Adds 1D data to the widget
* \details internally, the list is converted to a map with increasing integers keys starting at 0.
* \param label the name of the data that is also used as identifier.
* \param chartType the chart type that should be used for this data entry
* \note the data can be cleared with ClearDiagram()
* \note If the label name already exists, the name is replaced with a unique one by concatenating numbers to it.
* \warning Pie chart is significantly different than the other chart types. Here, the data given by AddData1D is summed. Each entry represents a different category.
*/
void AddData1D(const std::vector<double>& data1D, const std::string& label, ChartType chartType = ChartType::bar);
/*!
* \brief Adds 2D data to the widget. Call repeatedly for displaying multiple charts.
* \details each entry represents a data point: key: value --> x-value: y-value.
* \param label the name of the data that is also used as identifier.
* \param chartType the chart type that should be used for this data entry
* \note the data can be cleared with ClearDiagram()
* \note If the label name already exists, the name is replaced with a unique one by concatenating numbers to it.
* \warning Pie chart is significantly different than the other chart types. Here, the data given by AddData1D is summed. Each entry represents a different category.
*/
void AddData2D(const std::map<double, double> &data2D,
const std::string &label,
ChartType chartType = ChartType::bar);
/*!
* \brief Removes data from the widget, works for 1D and 2D Data
* \param label the name of the data that is also used as identifier.
* \note All data can be cleared with ClearDiagram()
* \throws Invalid Argument Exception when the label cannot be found
*/
void RemoveData(const std::string& label);
/*!
* \brief Sets the color of one data entry (identifier is previously assigned label)
* \details the color name can be "red" or a hex number (#FF0000).
* \warning Either define all data entries with a color or no data entry. If a mixed approach is used,
* plotly choses the color of the data entry (that could be the same as a user defined color).
* \note If an unknown label is given, nothing happens.
* \sa https://www.w3schools.com/cssref/css_colors.asp
*/
void SetColor(const std::string& label, const std::string& colorName);
/*!
* \brief Sets the line style of one data entry (identifier is previously assigned label)
* \details two line styles are possible: LineStyle::solid and LineStyle::dashed.
* The default line style is solid.
* \note If an unknown label is given, nothing happens.
* \warning only sets the line style if the current chart type is ChartType::line.
* However, the line style remains also if the chart changes (e.g. new chart type)
*/
void SetLineStyle(const std::string& label, LineStyle style);
/*!
* \brief Sets the axis scale to either linear (default) or logarithmic.
* \sa https://plot.ly/javascript/log-plot/
*/
void SetYAxisScale(AxisScale scale);
void SetXAxisLabel(const std::string& label);
void SetYAxisLabel(const std::string& label);
/*!
* \brief Sets a title for the chart.
*/
void SetTitle(const std::string &title);
/*!
* \brief Changes the chart type for all data entries and reloads the chart
*/
void SetChartTypeForAllDataAndReload(ChartType type);
/*!
* \brief Sets the chart type for a data entry
* \details for available types, see ChartType
* \note If an unknown label is given, nothing happens.
* \warning Pie chart is significantly different than the other chart types. Here, the data given by AddData1D is summed. Each entry represents a different category.
* \sa DiagramType for available types
*/
void SetChartType(const std::string& label, ChartType type);
/*!
* \brief Sets error bars for data in x direction
* \note If only error plus is provided, the error bars are symmetrical
* \param label the name of the data that is also used as identifier.
* \param errorPlus the error in positive direction
* \param errorMinus the error in negative direction. Same as error plus if omitted
*/
void SetXErrorBars(const std::string &label, const std::vector<double> &errorPlus, const std::vector<double>& errorMinus = std::vector<double>());
/*!
* \brief Sets error bars for data in y direction
* \details for parameters, see SetXErrorBars
* \note If only error plus is provided, the error bars are symmetrical
*/
void SetYErrorBars(const std::string &label, const std::vector<double> &errorPlus, const std::vector<double> &errorMinus = std::vector<double>());
/*!
* \brief Sets the legend position.
* \details Default position is bottom.
* \sa LegendPosition for available types
*/
void SetLegendPosition(LegendPosition position);
void SetShowLegend(bool show);
void SetStackedData(bool stacked);
/*!
* \brief Displays the chart in the widget
* \param showSubChart if a subchart is displayed inside the widget or not.
* \note if no data has been provided, (\sa AddData1D AddData2D), an empty chart is displayed.
*/
void Show(bool showSubChart=false);
/*!
* \brief Either displays the dataPoints or not
* \param showDataPoints if dataPoints are displayed inside the widget or not.
* \details: example for not showing points: https://plot.ly/javascript/line-charts/#styling-line-plot
* example for showing the points: https://plot.ly/javascript/pointcloud/
*/
void SetShowDataPoints(bool showDataPoints);
/*!
* \brief Clears all data inside and resets the widget.
*/
void Clear();
/*!
* \brief Sets the theme of the widget.
* \details default is dark theme as in MITK.
* \warning has to be called before Show() or Reload() to work
*/
void SetTheme(ColorTheme themeEnabled);
/*!
* \brief Sets whether the subchart shall be shown.
* \details Changes the state of the current chart object.
* \note Needs to be reloaded with Reload() to display changes.
*/
void SetShowSubchart(bool showSubChart);
/*!
* \brief Sets whether the error bars shall be shown.
* \details Changes the state of the current chart object.
* \note Needs to be reloaded with Reload() to display changes.
* \param showErrorBars if error bars are displayed or not.
*/
void SetShowErrorBars(bool showErrorBars);
+ /*!
+ * \brief Updates the histogram�s min and max values
+ * \details Zooms in to view the values between minValue and maxValue
+ */
+ void UpdateMinMaxValue(double minValue,double maxValue);
+
/*!
* \brief Reloads the chart in the widget
* \details reloading may be needed to display added data in an existing chart
*/
void Reload();
QSize sizeHint() const override;
public slots:
void OnLoadFinished(bool isLoadSuccessful);
void OnPageSuccessfullyLoaded();
signals:
void PageSuccessfullyLoaded();
private:
/*! source: https://stackoverflow.com/questions/29383/converting-bool-to-text-in-c*/
std::string convertBooleanValue(bool value) const;
class Impl;
std::unique_ptr<Impl> m_Impl;
};
#endif
diff --git a/Modules/Chart/resource/Chart.js b/Modules/Chart/resource/Chart.js
index bead0ae8b4..638236cc8b 100644
--- a/Modules/Chart/resource/Chart.js
+++ b/Modules/Chart/resource/Chart.js
@@ -1,386 +1,390 @@
document.body.style.backgroundColor = 'rgb(240, 240, 240)';
const minHeight = 255;
var chart;
var chartData;
var xErrorValuesPlus=[];
var xErrorValuesMinus=[];
var yErrorValuesPlus=[];
var yErrorValuesMinus=[];
var xValues=[];
var yValues=[];
var dataLabels=[];
var xs = {};
var dataColors = {};
var chartTypes = {};
var lineStyle = {};
var backgroundColor = '#f0f0f0';
var foregroundColor = 'black';
var dataProperties = {};
// Important loading function. This will be executed at first in this whole script.
// Fetching data from QWebChannel and storing them for display purposes.
window.onload = function()
{
initHeight();
new QWebChannel(qt.webChannelTransport, function(channel) {
chartData = channel.objects.chartData;
let count = 0;
for(let propertyName in channel.objects) {
if (propertyName != 'chartData')
{
let xDataTemp = channel.objects[propertyName].m_XData;
let yDataTemp = channel.objects[propertyName].m_YData;
let xErrorsTempPlus = channel.objects[propertyName].m_XErrorDataPlus;
let xErrorsTempMinus = channel.objects[propertyName].m_XErrorDataMinus;
let yErrorsTempPlus = channel.objects[propertyName].m_YErrorDataPlus;
let yErrorsTempMinus = channel.objects[propertyName].m_YErrorDataMinus;
let dataLabel = channel.objects[propertyName].m_Label;
dataLabels.push(dataLabel);
console.log("loading datalabel: "+dataLabel);
//add label to x array
xDataTemp.unshift('x'+count.toString())
xs[dataLabel] = 'x' + count.toString()
xDataTemp.push(null); //append null value, to make sure the last tick on x-axis is displayed correctly
yDataTemp.unshift(dataLabel)
yDataTemp.push(null); //append null value, to make sure the last tick on y-axis is displayed correctly
xValues[count] = xDataTemp
yValues[count] = yDataTemp
xErrorValuesPlus[count] = xErrorsTempPlus;
xErrorValuesMinus[count] = xErrorsTempMinus;
yErrorValuesPlus[count] = yErrorsTempPlus;
yErrorValuesMinus[count] = yErrorsTempMinus;
var tempLineStyle = '';
if (channel.objects[propertyName].m_LineStyleName == "solid")
{
tempLineStyle = ''
}
else
{
tempLineStyle = "dashed"
}
dataProperties[dataLabel] = {
"color" : channel.objects[propertyName].m_Color,
"chartType": channel.objects[propertyName].m_ChartType,
"style": tempLineStyle
}
count++;
}
}
var theme = chartData.m_themeName;
setThemeColors(theme);
generateChart(chartData);
});
}
/**
* Inits the height of the chart element to 90% of the full window height.
*/
function initHeight() {
var size = window.innerHeight-(window.innerHeight/100*10); //subtract 10% of height to hide vertical scrool bar
let chart = document.getElementById("chart");
chart.style.height = `${size}px`;
}
function getPlotlyChartType(inputType){
let plotlyType = inputType;
if (inputType == "line"){
plotlyType = "scatter";
} else if (inputType == "scatter"){
plotlyType = "scatterOnly"
}
return plotlyType;
}
/**
* Generate error bars object
*
* @param {array} errors - contains error bar values
* @return error bar object
*/
function generateErrorBars(errors, visible){
let errorObject = {
type: 'data',
array: errors,
visible: visible
}
return errorObject;
}
function generateErrorBarsAsymmetric(errorsPlus, errorsMinus, visible){
let errorObject = generateErrorBars(errorsPlus, visible);
errorObject["arrayminus"] = errorsMinus;
errorObject["symmetric"] = false;
return errorObject;
}
function generateStackPlotData(){
let data = [];
for (let index = 0; index < dataLabels.length; index++){
let trace = {
x: xValues[index].slice(1),
y: yValues[index].slice(1),
stackgroup: 'one',
name: dataLabels[index]
};
data.push(trace);
}
return data;
}
function generatePlotData(){
let data = [];
for (let index = 0; index < dataLabels.length; index++){
let inputType = dataProperties[dataLabels[index]]["chartType"];
let chartType = getPlotlyChartType(inputType);
let trace = {
x: xValues[index].slice(1),
y: yValues[index].slice(1),
type: chartType,
name: dataLabels[index]
};
if(typeof xErrorValuesPlus[index] !== 'undefined'){
if(typeof xErrorValuesMinus[index] !== 'undefined' && xErrorValuesMinus[index].length > 0)
{
trace["error_x"] = generateErrorBarsAsymmetric(xErrorValuesPlus[index], xErrorValuesMinus[index], chartData.m_ShowErrorBars);
}else{
trace["error_x"] = generateErrorBars(xErrorValuesPlus[index], chartData.m_ShowErrorBars);
}
}
if(typeof yErrorValuesPlus[index] !== 'undefined'){
if(typeof yErrorValuesMinus[index] !== 'undefined' && yErrorValuesMinus[index].length > 0)
{
trace["error_y"] = generateErrorBarsAsymmetric(yErrorValuesPlus[index], yErrorValuesMinus[index], chartData.m_ShowErrorBars);
}else{
trace["error_y"] = generateErrorBars(yErrorValuesPlus[index], chartData.m_ShowErrorBars);
}
}
// ===================== CHART TYPE OPTIONS HANDLING ===========
// initialize line object
trace["line"] = {}
if (chartType == "scatter"){
trace["line"]["color"] = dataProperties[dataLabels[index]]["color"]
} else if (chartType == "area"){
trace["fill"] = 'tozeroy'
} else if (chartType == "spline"){
trace["line"]["shape"] = 'spline'
} else if (chartType == "scatterOnly"){
trace["mode"] = 'markers';
} else if (chartType == "area-spline"){
trace["fill"] = 'tozeroy'
trace["line"]["shape"] = 'spline'
}
// handle marker visibility/size
trace["marker"] = {size: chartData.m_DataPointSize}
if (chartData.m_DataPointSize == 0){
trace["mode"] = "lines";
}
if (dataProperties[dataLabels[index]]["style"] == "dashed"){
trace["line"]["dash"] = "dot"
}
data.push(trace)
}
return data;
}
/**
* Here, the chart magic takes place. Plot.ly is called.
*
* @param {object} chartData - containing the options for plotting, not the actual values
*/
function generateChart(chartData)
{
console.log("generate chart");
if (chartData == undefined)
{
chartData = {}
}
if (dataLabels == undefined)
{
dataLabels = []
}
//=============================== DATA ========================
var data = [];
if (chartData.m_StackedData){
data = generateStackPlotData();
} else {
data = generatePlotData();
}
//=============================== STYLE ========================
let marginTop = chartData.m_chartTitle == undefined ? 10 : 50;
if (chartData.m_LegendPosition == "bottomMiddle"){
var legendX = 0.5;
var legendY = -0.75;
}
else if (chartData.m_LegendPosition == "bottomRight"){
var legendX = 1;
var legendY = 0;
}
else if (chartData.m_LegendPosition == "topRight"){
var legendX = 1;
var legendY = 1;
}
else if (chartData.m_LegendPosition == "topLeft"){
var legendX = 0;
var legendY = 1;
}
else if (chartData.m_LegendPosition == "middleRight"){
var legendX = 1;
var legendY = 0.5;
}
var layout = {
paper_bgcolor : backgroundColor,
plot_bgcolor : backgroundColor,
title: {
text:chartData.m_chartTitle,
font: {
color: foregroundColor
}
},
xaxis: {
title: {
text: chartData.m_xAxisLabel
},
color: foregroundColor
},
yaxis: {
title: {
text:chartData.m_yAxisLabel
},
color: foregroundColor
},
margin: {
l: 50,
r: 10,
b: 50,
t: marginTop,
pad: 4
},
showlegend: chartData.m_ShowLegend,
legend: {
x: legendX,
y: legendY,
font : {
color: foregroundColor
}
}
};
if (chartData.m_YAxisScale){
layout.yaxis["type"] = "log"
}
if (chartData.m_ShowSubchart){
layout.xaxis.rangeslider = {}; // adds range slider below x axis
}
- /*
- if (chartData.m_UseMinMaxValues){
- layout ={
- xaxis:{
- range:[,]
- }
- };
- }*/
Plotly.newPlot('chart', data, layout, {displayModeBar: false, responsive: true});
}
/**
* Change theme of chart.
*
* @param {string} color - dark or not dark
*/
function changeTheme(color) {
setThemeColors(color);
link = document.getElementsByTagName("link")[0];
if (color == 'dark') {
link.href = "Chart_dark.css";
}
else
{
link.href = "Chart.css";
}
};
/**
* Reload the chart with the given arguments.
*
* This method is called by C++. Changes on signature with caution.
*/
function Reload(){
console.log("Reload chart");
generateChart(chartData);
}
function SetShowSubchart(showSubchart)
{
chartData.m_ShowSubchart = showSubchart;
}
function setThemeColors(theme){
if (theme == 'dark'){
backgroundColor = '#2d2d30';
foregroundColor = 'white';
}
else {
backgroundColor = '#f0f0f0';
foregroundColor = 'black';
}
}
function SetStackDataString(stackDataString)
{
chartData.m_StackedData = stackDataString;
}
function SetShowErrorBars(showErrorBars)
{
chartData.m_ShowErrorBars = showErrorBars;
}
+
+function UpdateMinMaxValue(minValue, maxValue)
+{
+ let chart = document.getElementById("chart");
+ let update = {
+ xaxis:{
+ range:[minValue, maxValue]
+ }
+ };
+ Plotly.relayout(chart, update);
+}
+
/**
* Transforms the view to another chart type.
*
* This method is called by C++. Changes on signature with caution.
* @param {string} transformTo - 'line' or 'bar'
*/
function transformView(transformTo) {
console.log("transform view");
console.log(transformTo);
dataProperties[dataLabels[0]]["chartType"] = transformTo; // preserve chartType for later updates
let plotlyType = getPlotlyChartType(transformTo);
let chart = document.getElementById("chart");
let update = {type : plotlyType}
Plotly.restyle(chart, update, 0); // updates the given plotly trace at index 0 with an update object built of a standard trace object
};
diff --git a/Modules/Chart/src/QmitkChartWidget.cpp b/Modules/Chart/src/QmitkChartWidget.cpp
index 24da174536..5bfc4e2c72 100644
--- a/Modules/Chart/src/QmitkChartWidget.cpp
+++ b/Modules/Chart/src/QmitkChartWidget.cpp
@@ -1,652 +1,660 @@
/*===================================================================
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 <regex>
#include <QGridLayout>
#include <QWebChannel>
#include <QWebEngineSettings>
#include <QWebEngineView>
#include <QmitkChartWidget.h>
#include "mitkExceptionMacro.h"
#include <QmitkChartData.h>
#include <QmitkChartxyData.h>
class CustomPage : public QWebEnginePage
{
public:
CustomPage(QObject *parent = 0) : QWebEnginePage(parent) {}
virtual void javaScriptConsoleMessage(JavaScriptConsoleMessageLevel /*level*/,
const QString &message,
int lineNumber,
const QString & /*sourceID*/)
{
MITK_INFO << "JS > " << lineNumber << ": " << message.toStdString();
}
};
class QmitkChartWidget::Impl final
{
public:
explicit Impl(QWidget *parent);
~Impl();
Impl(const Impl &) = delete;
Impl &operator=(const Impl &) = delete;
void AddData1D(const std::vector<double> &data1D, const std::string &label, QmitkChartWidget::ChartType chartType);
void AddData2D(const std::map<double, double> &data2D,
const std::string &label,
QmitkChartWidget::ChartType chartType);
void RemoveData(const std::string &label);
void ClearData();
void SetColor(const std::string &label, const std::string &colorName);
void SetLineStyle(const std::string &label, LineStyle style);
void SetYAxisScale(AxisScale scale);
void SetXAxisLabel(const std::string &label);
void SetYAxisLabel(const std::string &label);
void SetTitle(const std::string &title);
void SetXErrorBars(const std::string &label,
const std::vector<double> &errorPlus,
const std::vector<double> &errorMinus = std::vector<double>());
void SetYErrorBars(const std::string &label,
const std::vector<double> &errorPlus,
const std::vector<double> &errorMinus = std::vector<double>());
std::string GetThemeName() const;
void SetThemeName(ColorTheme style);
void SetChartType(QmitkChartWidget::ChartType chartType);
void SetLegendPosition(LegendPosition position);
void SetChartTypeByLabel(const std::string &label, QmitkChartWidget::ChartType chartType);
void Show(bool showSubChart);
void SetShowLegend(bool show);
void SetShowErrorBars(bool show);
void SetStackedData(bool stacked);
void SetShowDataPoints(bool showDataPoints = false);
void SetChartType(const std::string &label, QmitkChartWidget::ChartType chartType);
QList<QVariant> ConvertErrorVectorToQList(const std::vector<double> &error);
std::string ConvertChartTypeToString(QmitkChartWidget::ChartType chartType) const;
void ClearJavaScriptChart();
void InitializeJavaScriptChart();
void CallJavaScriptFuntion(const QString &command);
QSize sizeHint() const;
private:
using ChartxyDataVector = std::vector<std::unique_ptr<QmitkChartxyData>>;
std::string GetUniqueLabelName(const QList<QVariant> &labelList, const std::string &label) const;
QmitkChartxyData *GetDataElementByLabel(const std::string &label) const;
QList<QVariant> GetDataLabels(const ChartxyDataVector &c3xyData) const;
QWebChannel *m_WebChannel;
QWebEngineView *m_WebEngineView;
QmitkChartData m_C3Data;
ChartxyDataVector m_C3xyData;
std::map<QmitkChartWidget::ChartType, std::string> m_ChartTypeToName;
std::map<QmitkChartWidget::ColorTheme, std::string> m_ColorThemeToName;
std::map<QmitkChartWidget::LegendPosition, std::string> m_LegendPositionToName;
std::map<QmitkChartWidget::LineStyle, std::string> m_LineStyleToName;
std::map<QmitkChartWidget::AxisScale, std::string> m_AxisScaleToName;
};
std::string QmitkChartWidget::Impl::GetThemeName() const {
return m_C3Data.GetThemeName().toString().toStdString();
}
QmitkChartWidget::Impl::Impl(QWidget *parent)
: m_WebChannel(new QWebChannel(parent)), m_WebEngineView(new QWebEngineView(parent))
{
// disable context menu for QWebEngineView
m_WebEngineView->setContextMenuPolicy(Qt::NoContextMenu);
m_WebEngineView->setPage(new CustomPage());
// Set the webengineview to an initial empty page. The actual chart will be loaded once the data is calculated.
m_WebEngineView->load(QUrl(QStringLiteral("qrc:///Chart/empty.html")));
m_WebEngineView->page()->setWebChannel(m_WebChannel);
m_WebEngineView->settings()->setAttribute(QWebEngineSettings::FocusOnNavigationEnabled, false);
connect(m_WebEngineView, SIGNAL(loadFinished(bool)), parent, SLOT(OnLoadFinished(bool)));
auto layout = new QGridLayout(parent);
layout->setMargin(0);
layout->addWidget(m_WebEngineView);
m_ChartTypeToName.emplace(ChartType::bar, "bar");
m_ChartTypeToName.emplace(ChartType::line, "line");
m_ChartTypeToName.emplace(ChartType::spline, "spline");
m_ChartTypeToName.emplace(ChartType::pie, "pie");
m_ChartTypeToName.emplace(ChartType::area, "area");
m_ChartTypeToName.emplace(ChartType::area_spline, "area-spline");
m_ChartTypeToName.emplace(ChartType::scatter, "scatter");
m_LegendPositionToName.emplace(LegendPosition::bottomMiddle, "bottomMiddle");
m_LegendPositionToName.emplace(LegendPosition::bottomRight, "bottomRight");
m_LegendPositionToName.emplace(LegendPosition::topRight, "topRight");
m_LegendPositionToName.emplace(LegendPosition::topLeft, "topLeft");
m_LegendPositionToName.emplace(LegendPosition::middleRight, "middleRight");
m_LineStyleToName.emplace(LineStyle::solid, "solid");
m_LineStyleToName.emplace(LineStyle::dashed, "dashed");
m_AxisScaleToName.emplace(AxisScale::linear, "");
m_AxisScaleToName.emplace(AxisScale::log, "log");
m_ColorThemeToName.emplace(ColorTheme::lightstyle, "light");
m_ColorThemeToName.emplace(ColorTheme::darkstyle, "dark");
}
QmitkChartWidget::Impl::~Impl() {}
std::string CheckForCorrectHex(const std::string &colorName)
{
std::regex rgx("([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})");
std::smatch match;
if (!colorName.empty() && colorName.at(0) != '#' && std::regex_search(colorName.begin(), colorName.end(), match, rgx))
{
return "#" + colorName;
}
else
{
return colorName;
}
}
void QmitkChartWidget::Impl::AddData1D(const std::vector<double> &data1D,
const std::string &label,
QmitkChartWidget::ChartType type)
{
std::map<double, double> transformedData2D;
unsigned int count = 0;
// transform the 1D data to 2D data
for (const auto &ele : data1D)
{
transformedData2D[count] = ele;
count++;
}
AddData2D(transformedData2D, label, type);
}
void QmitkChartWidget::Impl::AddData2D(const std::map<double, double> &data2D,
const std::string &label,
QmitkChartWidget::ChartType type)
{
QMap<QVariant, QVariant> data2DConverted;
for (const auto &aValue : data2D)
{
data2DConverted.insert(aValue.first, aValue.second);
}
const std::string chartTypeName(m_ChartTypeToName.at(type));
auto definedLabels = GetDataLabels(m_C3xyData);
auto uniqueLabel = GetUniqueLabelName(definedLabels, label);
if (type == ChartType::scatter)
{
SetShowDataPoints(true);
MITK_INFO << "Enabling data points for all because of scatter plot";
}
m_C3xyData.push_back(std::make_unique<QmitkChartxyData>(
data2DConverted, QVariant(QString::fromStdString(uniqueLabel)), QVariant(QString::fromStdString(chartTypeName))));
}
void QmitkChartWidget::Impl::RemoveData(const std::string &label)
{
for (ChartxyDataVector::iterator iter = m_C3xyData.begin(); iter != m_C3xyData.end(); ++iter)
{
if ((*iter)->GetLabel().toString().toStdString() == label)
{
m_C3xyData.erase(iter);
return;
}
}
throw std::invalid_argument("Cannot Remove Data because the label does not exist.");
}
void QmitkChartWidget::Impl::ClearData()
{
for (auto &xyData : m_C3xyData)
{
m_WebChannel->deregisterObject(xyData.get());
}
m_C3xyData.clear();
}
void QmitkChartWidget::Impl::SetColor(const std::string &label, const std::string &colorName)
{
auto element = GetDataElementByLabel(label);
if (element)
{
auto colorChecked = CheckForCorrectHex(colorName);
element->SetColor(QVariant(QString::fromStdString(colorChecked)));
}
}
void QmitkChartWidget::Impl::SetLineStyle(const std::string &label, LineStyle style)
{
auto element = GetDataElementByLabel(label);
const std::string lineStyleName(m_LineStyleToName.at(style));
element->SetLineStyle(QVariant(QString::fromStdString(lineStyleName)));
}
void QmitkChartWidget::Impl::SetYAxisScale(AxisScale scale)
{
const std::string axisScaleName(m_AxisScaleToName.at(scale));
m_C3Data.SetYAxisScale(QString::fromStdString(axisScaleName));
}
QmitkChartxyData *QmitkChartWidget::Impl::GetDataElementByLabel(const std::string &label) const
{
for (const auto &qmitkChartxyData : m_C3xyData)
{
if (qmitkChartxyData->GetLabel().toString() == label.c_str())
{
return qmitkChartxyData.get();
}
}
MITK_WARN << "label " << label << " not found in QmitkChartWidget";
return nullptr;
}
QList<QVariant> QmitkChartWidget::Impl::GetDataLabels(const ChartxyDataVector &c3xyData) const
{
QList<QVariant> dataLabels;
for (auto element = c3xyData.begin(); element != c3xyData.end(); ++element)
{
dataLabels.push_back((*element)->GetLabel());
}
return dataLabels;
}
void QmitkChartWidget::Impl::SetXAxisLabel(const std::string &label)
{
m_C3Data.SetXAxisLabel(QString::fromStdString(label));
}
void QmitkChartWidget::Impl::SetYAxisLabel(const std::string &label)
{
m_C3Data.SetYAxisLabel(QString::fromStdString(label));
}
void QmitkChartWidget::Impl::SetTitle(const std::string &title)
{
m_C3Data.SetTitle(QString::fromStdString(title));
}
void QmitkChartWidget::Impl::SetThemeName(QmitkChartWidget::ColorTheme style)
{
const std::string themeName(m_ColorThemeToName.at(style));
m_C3Data.SetThemeName(QString::fromStdString(themeName));
}
void QmitkChartWidget::Impl::SetChartType(QmitkChartWidget::ChartType chartType)
{
for (auto iterator = m_C3xyData.begin(); iterator != m_C3xyData.end(); ++iterator)
{
SetChartTypeByLabel((*iterator)->GetLabel().toString().toStdString(), chartType);
}
auto chartTypeName = ConvertChartTypeToString(chartType);
const QString command = QString::fromStdString("transformView('" + chartTypeName + "')");
CallJavaScriptFuntion(command);
}
void QmitkChartWidget::Impl::SetChartTypeByLabel(const std::string &label, QmitkChartWidget::ChartType chartType)
{
auto element = GetDataElementByLabel(label);
if (element)
{
if (chartType == ChartType::scatter)
{
SetShowDataPoints(true);
MITK_INFO << "Enabling data points for all because of scatter plot";
}
auto chartTypeName = ConvertChartTypeToString(chartType);
element->SetChartType(QVariant(QString::fromStdString(chartTypeName)));
}
}
void QmitkChartWidget::Impl::SetLegendPosition(QmitkChartWidget::LegendPosition legendPosition)
{
const std::string legendPositionName(m_LegendPositionToName.at(legendPosition));
m_C3Data.SetLegendPosition(QString::fromStdString(legendPositionName));
}
void QmitkChartWidget::Impl::Show(bool showSubChart)
{
if (m_C3xyData.empty())
{
MITK_WARN << "no data available for display in chart";
}
else
{
m_C3Data.SetAppearance(showSubChart, m_C3xyData.front()->GetChartType() == QVariant("pie"));
}
InitializeJavaScriptChart();
}
void QmitkChartWidget::Impl::SetShowLegend(bool show)
{
m_C3Data.SetShowLegend(show);
}
void QmitkChartWidget::Impl::SetStackedData(bool stacked)
{
m_C3Data.SetStackedData(stacked);
}
void QmitkChartWidget::Impl::SetShowErrorBars(bool show)
{
m_C3Data.SetShowErrorBars(show);
}
void QmitkChartWidget::Impl::SetShowDataPoints(bool showDataPoints)
{
if (showDataPoints == true)
{
m_C3Data.SetDataPointSize(6.5);
}
else
{
m_C3Data.SetDataPointSize(0);
}
}
void QmitkChartWidget::Impl::SetChartType(const std::string &label, QmitkChartWidget::ChartType chartType)
{
auto element = GetDataElementByLabel(label);
if (element)
{
if (chartType == ChartType::scatter)
{
SetShowDataPoints(true);
MITK_INFO << "Enabling data points for all because of scatter plot";
}
const std::string chartTypeName(m_ChartTypeToName.at(chartType));
element->SetChartType(QVariant(QString::fromStdString(chartTypeName)));
}
}
QList<QVariant> QmitkChartWidget::Impl::ConvertErrorVectorToQList(const std::vector<double> &error)
{
QList<QVariant> errorConverted;
for (const auto &aValue : error)
{
errorConverted.append(aValue);
}
return errorConverted;
}
void QmitkChartWidget::Impl::SetXErrorBars(const std::string &label,
const std::vector<double> &errorPlus,
const std::vector<double> &errorMinus)
{
auto element = GetDataElementByLabel(label);
if (element)
{
auto errorConvertedPlus = ConvertErrorVectorToQList(errorPlus);
auto errorConvertedMinus = ConvertErrorVectorToQList(errorMinus);
element->SetXErrorDataPlus(errorConvertedPlus);
element->SetXErrorDataMinus(errorConvertedMinus);
}
}
void QmitkChartWidget::Impl::SetYErrorBars(const std::string &label,
const std::vector<double> &errorPlus,
const std::vector<double> &errorMinus)
{
auto element = GetDataElementByLabel(label);
if (element)
{
auto errorConvertedPlus = ConvertErrorVectorToQList(errorPlus);
auto errorConvertedMinus = ConvertErrorVectorToQList(errorMinus);
element->SetYErrorDataPlus(errorConvertedPlus);
element->SetYErrorDataMinus(errorConvertedMinus);
}
}
std::string QmitkChartWidget::Impl::ConvertChartTypeToString(QmitkChartWidget::ChartType chartType) const
{
return m_ChartTypeToName.at(chartType);
}
QSize QmitkChartWidget::Impl::sizeHint() const
{
return QSize(400, 300);
}
void QmitkChartWidget::Impl::CallJavaScriptFuntion(const QString &command)
{
m_WebEngineView->page()->runJavaScript(command);
}
void QmitkChartWidget::Impl::ClearJavaScriptChart()
{
m_WebEngineView->load(QUrl(QStringLiteral("qrc:///Chart/empty.html")));
}
void QmitkChartWidget::Impl::InitializeJavaScriptChart()
{
m_WebChannel->registerObject(QStringLiteral("chartData"), &m_C3Data);
unsigned count = 0;
for (auto &xyData : m_C3xyData)
{
QString variableName = "xyData" + QString::number(count);
m_WebChannel->registerObject(variableName, xyData.get());
count++;
}
m_WebEngineView->load(QUrl(QStringLiteral("qrc:///Chart/QmitkChartWidget.html")));
}
std::string QmitkChartWidget::Impl::GetUniqueLabelName(const QList<QVariant> &labelList, const std::string &label) const
{
QString currentLabel = QString::fromStdString(label);
int counter = 0;
while (labelList.contains(currentLabel))
{
currentLabel = QString::fromStdString(label + std::to_string(counter));
counter++;
}
return currentLabel.toStdString();
}
QmitkChartWidget::QmitkChartWidget(QWidget *parent) : QWidget(parent), m_Impl(new Impl(this)) {
connect(this, &QmitkChartWidget::PageSuccessfullyLoaded, this, &QmitkChartWidget::OnPageSuccessfullyLoaded);
}
QmitkChartWidget::~QmitkChartWidget() {}
void QmitkChartWidget::AddData2D(const std::map<double, double> &data2D, const std::string &label, ChartType type)
{
m_Impl->AddData2D(data2D, label, type);
}
void QmitkChartWidget::SetColor(const std::string &label, const std::string &colorName)
{
m_Impl->SetColor(label, colorName);
}
void QmitkChartWidget::SetLineStyle(const std::string &label, LineStyle style)
{
m_Impl->SetLineStyle(label, style);
}
void QmitkChartWidget::SetYAxisScale(AxisScale scale)
{
m_Impl->SetYAxisScale(scale);
}
void QmitkChartWidget::AddData1D(const std::vector<double> &data1D, const std::string &label, ChartType type)
{
m_Impl->AddData1D(data1D, label, type);
}
void QmitkChartWidget::RemoveData(const std::string &label)
{
m_Impl->RemoveData(label);
}
void QmitkChartWidget::SetXAxisLabel(const std::string &label)
{
m_Impl->SetXAxisLabel(label);
}
void QmitkChartWidget::SetYAxisLabel(const std::string &label)
{
m_Impl->SetYAxisLabel(label);
}
void QmitkChartWidget::SetTitle(const std::string &title)
{
m_Impl->SetTitle(title);
}
void QmitkChartWidget::SetShowDataPoints(bool showDataPoints)
{
m_Impl->SetShowDataPoints(showDataPoints);
}
void QmitkChartWidget::SetChartType(const std::string &label, ChartType type)
{
m_Impl->SetChartType(label, type);
}
void QmitkChartWidget::SetXErrorBars(const std::string &label,
const std::vector<double> &errorPlus,
const std::vector<double> &errorMinus)
{
m_Impl->SetXErrorBars(label, errorPlus, errorMinus);
}
void QmitkChartWidget::SetYErrorBars(const std::string &label,
const std::vector<double> &errorPlus,
const std::vector<double> &errorMinus)
{
m_Impl->SetYErrorBars(label, errorPlus, errorMinus);
}
void QmitkChartWidget::SetLegendPosition(LegendPosition position)
{
m_Impl->SetLegendPosition(position);
}
void QmitkChartWidget::SetShowLegend(bool show)
{
m_Impl->SetShowLegend(show);
}
void QmitkChartWidget::SetStackedData(bool stacked)
{
m_Impl->SetStackedData(stacked);
}
void QmitkChartWidget::Show(bool showSubChart)
{
m_Impl->Show(showSubChart);
}
void QmitkChartWidget::Clear()
{
m_Impl->ClearData();
m_Impl->ClearJavaScriptChart();
}
void QmitkChartWidget::OnLoadFinished(bool isLoadSuccessful)
{
if (isLoadSuccessful)
{
emit PageSuccessfullyLoaded();
}
}
void QmitkChartWidget::OnPageSuccessfullyLoaded() {
auto themeName = m_Impl->GetThemeName();
QString command;
if (themeName == "dark")
{
command = QString("changeTheme('dark')");
}
else
{
command = QString("changeTheme('light')");
}
m_Impl->CallJavaScriptFuntion(command);
}
std::string QmitkChartWidget::convertBooleanValue(bool value) const {
std::stringstream converter;
converter << std::boolalpha << value;
return converter.str();
}
void QmitkChartWidget::SetChartTypeForAllDataAndReload(ChartType type)
{
m_Impl->SetChartType(type);
}
void QmitkChartWidget::SetTheme(ColorTheme themeEnabled)
{
m_Impl->SetThemeName(themeEnabled);
}
void QmitkChartWidget::SetShowSubchart(bool showSubChart)
{
QString subChartString = QString::fromStdString(convertBooleanValue(showSubChart));
const QString command = QString("SetShowSubchart(" + subChartString + ")");
m_Impl->CallJavaScriptFuntion(command);
}
void QmitkChartWidget::SetShowErrorBars(bool showErrorBars)
{
m_Impl->SetShowErrorBars(showErrorBars);
}
+void QmitkChartWidget::UpdateMinMaxValue(double minValue, double maxValue)
+{
+ QString minMaxValueString = QString::fromStdString(std::to_string(minValue))+QString(",");
+ minMaxValueString += QString::fromStdString(std::to_string(maxValue));
+ const QString command = QString("UpdateMinMaxValue(" + minMaxValueString + ")");
+ m_Impl->CallJavaScriptFuntion(command);
+}
+
void QmitkChartWidget::Reload()
{
const QString command = QString("Reload()");
m_Impl->CallJavaScriptFuntion(command);
}
QSize QmitkChartWidget::sizeHint() const
{
return m_Impl->sizeHint();
}
diff --git a/Modules/ImageStatisticsUI/Qmitk/QmitkHistogramVisualizationWidget.cpp b/Modules/ImageStatisticsUI/Qmitk/QmitkHistogramVisualizationWidget.cpp
index c82bc413f6..1767c0b464 100644
--- a/Modules/ImageStatisticsUI/Qmitk/QmitkHistogramVisualizationWidget.cpp
+++ b/Modules/ImageStatisticsUI/Qmitk/QmitkHistogramVisualizationWidget.cpp
@@ -1,172 +1,177 @@
/*===================================================================
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);
m_Controls.checkBoxShowSubchart->setChecked(false);
m_Controls.spinBoxNBins->setValue(m_DefaultNBins);
m_Controls.spinBoxNBins->setMinimum(m_MinNBins);
m_Controls.spinBoxNBins->setMaximum(m_MaxNBins);
- m_Controls.spinBoxMaxValue->setMaximum(m_MaxNBins);
- m_Controls.spinBoxMaxValue->setMinimum(m_MinNBins);
- m_Controls.spinBoxMinValue->setMaximum(m_MaxNBins);
- m_Controls.spinBoxMinValue->setMinimum(m_MinNBins);
+ m_Controls.doubleSpinBoxMaxValue->setMaximum(1000);
+ m_Controls.doubleSpinBoxMaxValue->setMinimum(-1000);
+ m_Controls.doubleSpinBoxMinValue->setMaximum(1000);
+ m_Controls.doubleSpinBoxMinValue->setMinimum(-1000);
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");
m_Controls.chartWidget->Show(m_Controls.checkBoxShowSubchart->isChecked());
SetGUIElementsEnabled(true);
}
void QmitkHistogramVisualizationWidget::Reset()
{
m_Controls.chartWidget->Clear();
SetGUIElementsEnabled(false);
}
void QmitkHistogramVisualizationWidget::SetTheme(QmitkChartWidget::ColorTheme style)
{
m_Controls.chartWidget->SetTheme(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.checkBoxOverwriteMinMax, &QCheckBox::clicked, this, &QmitkHistogramVisualizationWidget::OnOverwriteMinMaxCheckBoxChanged);
- connect(m_Controls.spinBoxMaxValue, &QSpinBox::editingFinished, this, &QmitkHistogramVisualizationWidget::OnMaxValueSpinBoxValueChanged);
- connect(m_Controls.spinBoxMinValue, &QSpinBox::editingFinished, this, &QmitkHistogramVisualizationWidget::OnMinValueSpinBoxValueChanged);
+ connect(m_Controls.doubleSpinBoxMaxValue, &QSpinBox::editingFinished, this, &QmitkHistogramVisualizationWidget::OnMaxValueSpinBoxValueChanged);
+ connect(m_Controls.doubleSpinBoxMinValue, &QSpinBox::editingFinished, this, &QmitkHistogramVisualizationWidget::OnMinValueSpinBoxValueChanged);
}
void QmitkHistogramVisualizationWidget::SetGUIElementsEnabled(bool enabled)
{
this->setEnabled(enabled);
m_Controls.tabWidgetPlot->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);
m_Controls.checkBoxOverwriteMinMax->setEnabled(enabled);
- m_Controls.spinBoxMaxValue->setEnabled(m_Controls.checkBoxOverwriteMinMax->isChecked());
- m_Controls.spinBoxMinValue->setEnabled(m_Controls.checkBoxOverwriteMinMax->isChecked());
+ m_Controls.doubleSpinBoxMaxValue->setEnabled(m_Controls.checkBoxOverwriteMinMax->isChecked());
+ m_Controls.doubleSpinBoxMinValue->setEnabled(m_Controls.checkBoxOverwriteMinMax->isChecked());
}
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);
if (m_Controls.spinBoxNBins->value() != static_cast<int>(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::OnOverwriteMinMaxCheckBoxChanged()
{
if (!m_Controls.checkBoxOverwriteMinMax->isChecked())
{
- m_Controls.spinBoxMaxValue->setEnabled(false);
- m_Controls.spinBoxMinValue->setEnabled(false);
+ m_Controls.doubleSpinBoxMaxValue->setEnabled(false);
+ m_Controls.doubleSpinBoxMinValue->setEnabled(false);
+ m_Controls.chartWidget->Reload();
}
else
{
- m_Controls.spinBoxMaxValue->setEnabled(true);
- m_Controls.spinBoxMinValue->setEnabled(true);
+ m_Controls.doubleSpinBoxMaxValue->setEnabled(true);
+ m_Controls.doubleSpinBoxMinValue->setEnabled(true);
}
}
-void QmitkHistogramVisualizationWidget::OnMaxValueSpinBoxValueChanged()
+void QmitkHistogramVisualizationWidget::OnMinValueSpinBoxValueChanged()
{
-
+ m_Controls.doubleSpinBoxMaxValue->setMinimum(m_Controls.doubleSpinBoxMinValue->value()+1);
+
+ m_Controls.chartWidget->UpdateMinMaxValue(m_Controls.doubleSpinBoxMinValue->value(),m_Controls.doubleSpinBoxMaxValue->value());
}
-void QmitkHistogramVisualizationWidget::OnMinValueSpinBoxValueChanged()
+void QmitkHistogramVisualizationWidget::OnMaxValueSpinBoxValueChanged()
{
-
+ m_Controls.doubleSpinBoxMinValue->setMaximum(m_Controls.doubleSpinBoxMaxValue->value()-1);
+
+ m_Controls.chartWidget->UpdateMinMaxValue(m_Controls.doubleSpinBoxMinValue->value(),m_Controls.doubleSpinBoxMaxValue->value());
}
\ No newline at end of file
diff --git a/Modules/ImageStatisticsUI/Qmitk/QmitkHistogramVisualizationWidget.ui b/Modules/ImageStatisticsUI/Qmitk/QmitkHistogramVisualizationWidget.ui
index 6650c15e12..f6619a86e2 100644
--- a/Modules/ImageStatisticsUI/Qmitk/QmitkHistogramVisualizationWidget.ui
+++ b/Modules/ImageStatisticsUI/Qmitk/QmitkHistogramVisualizationWidget.ui
@@ -1,238 +1,238 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>QmitkHistogramVisualizationControls</class>
<widget class="QWidget" name="QmitkHistogramVisualizationControls">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>540</width>
<height>394</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QTabWidget" name="tabWidgetPlot">
<property name="enabled">
<bool>false</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="currentIndex">
- <number>0</number>
+ <number>1</number>
</property>
- <widget class="QWidget" name="tabWidgetPlotPage1" native="true">
+ <widget class="QWidget" name="tabWidgetPlotPage1">
<attribute name="title">
<string>Default</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_5">
<item>
<widget class="QCheckBox" name="checkBoxShowSubchart">
<property name="text">
<string>Show Subchart</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBoxUseDefaultNBins">
<property name="text">
<string>Use default #bins</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QFrame" name="FrameBinSize">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<property name="spacing">
<number>0</number>
</property>
<item row="1" column="0">
<widget class="QLabel" name="labelNBins">
<property name="minimumSize">
<size>
<width>60</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>100</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string># bins:</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QSpinBox" name="spinBoxNBins">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>Press enter to recalculate statistics with new bin size.</string>
</property>
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>10000</number>
</property>
<property name="value">
<number>100</number>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="tabWidgetPlotPage2">
<attribute name="title">
<string>Overwrite</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QCheckBox" name="checkBoxOverwriteMinMax">
<property name="text">
<string>Overwrite min/max values</string>
</property>
</widget>
</item>
<item>
<widget class="QFrame" name="frameOverwriteValues">
<layout class="QGridLayout" name="gridLayout">
<item row="2" column="1">
<widget class="QLabel" name="labelMinValue">
<property name="text">
<string>Minimum value</string>
</property>
</widget>
</item>
- <item row="4" column="0">
- <widget class="QSpinBox" name="spinBoxMaxValue"/>
- </item>
<item row="4" column="1">
<widget class="QLabel" name="labelMaxValue">
<property name="text">
<string>Maximum value</string>
</property>
</widget>
</item>
<item row="2" column="0">
- <widget class="QSpinBox" name="spinBoxMinValue"/>
+ <widget class="QDoubleSpinBox" name="doubleSpinBoxMinValue"/>
+ </item>
+ <item row="4" column="0">
+ <widget class="QDoubleSpinBox" name="doubleSpinBoxMaxValue"/>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
<item>
<widget class="QmitkChartWidget" name="chartWidget" native="true"/>
</item>
<item>
<widget class="QWidget" name="widgetClipboard" native="true">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QPushButton" name="buttonCopyHistogramToClipboard">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Copy to Clipboard</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>QmitkChartWidget</class>
<extends>QWidget</extends>
<header location="global">QmitkChartWidget.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>
diff --git a/Modules/ImageStatisticsUI/Qmitk/QmitkHistogramVisualizationWidget.ui.autosave b/Modules/ImageStatisticsUI/Qmitk/QmitkHistogramVisualizationWidget.ui.autosave
deleted file mode 100644
index d2e46b343a..0000000000
--- a/Modules/ImageStatisticsUI/Qmitk/QmitkHistogramVisualizationWidget.ui.autosave
+++ /dev/null
@@ -1,238 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>QmitkHistogramVisualizationControls</class>
- <widget class="QWidget" name="QmitkHistogramVisualizationControls">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>540</width>
- <height>394</height>
- </rect>
- </property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <widget class="QTabWidget" name="tabWidgetPlot">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>16777215</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="currentIndex">
- <number>0</number>
- </property>
- <widget class="QWidget" name="tabWidgetPlotPage1">
- <attribute name="title">
- <string>Default</string>
- </attribute>
- <layout class="QVBoxLayout" name="verticalLayout_5">
- <item>
- <widget class="QCheckBox" name="checkBoxShowSubchart">
- <property name="text">
- <string>Show Subchart</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="checkBoxUseDefaultNBins">
- <property name="text">
- <string>Use default #bins</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QFrame" name="FrameBinSize">
- <property name="frameShape">
- <enum>QFrame::NoFrame</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Raised</enum>
- </property>
- <layout class="QGridLayout" name="gridLayout_2">
- <property name="leftMargin">
- <number>0</number>
- </property>
- <property name="topMargin">
- <number>0</number>
- </property>
- <property name="rightMargin">
- <number>0</number>
- </property>
- <property name="bottomMargin">
- <number>0</number>
- </property>
- <property name="spacing">
- <number>0</number>
- </property>
- <item row="1" column="0">
- <widget class="QLabel" name="labelNBins">
- <property name="minimumSize">
- <size>
- <width>60</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>100</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="text">
- <string># bins:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="2">
- <widget class="QSpinBox" name="spinBoxNBins">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="toolTip">
- <string>Press enter to recalculate statistics with new bin size.</string>
- </property>
- <property name="minimum">
- <number>1</number>
- </property>
- <property name="maximum">
- <number>10000</number>
- </property>
- <property name="value">
- <number>100</number>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- </layout>
- </widget>
- <widget class="QWidget" name="tabWidgetPlotPage2">
- <attribute name="title">
- <string>Overwrite</string>
- </attribute>
- <layout class="QVBoxLayout" name="verticalLayout_3">
- <item>
- <widget class="QCheckBox" name="checkBoxOverwriteMinMax">
- <property name="text">
- <string>Overwrite min/max values</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QFrame" name="frameOverwriteValues">
- <layout class="QGridLayout" name="gridLayout">
- <item row="2" column="1">
- <widget class="QLabel" name="labelMinValue">
- <property name="text">
- <string>Minimum value</string>
- </property>
- </widget>
- </item>
- <item row="4" column="0">
- <widget class="QSpinBox" name="spinBoxMaxValue"/>
- </item>
- <item row="4" column="1">
- <widget class="QLabel" name="labelMaxValue">
- <property name="text">
- <string>Maximum value</string>
- </property>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="QSpinBox" name="spinBoxMinValue"/>
- </item>
- </layout>
- </widget>
- </item>
- </layout>
- </widget>
- </widget>
- </item>
- <item>
- <widget class="QmitkChartWidget" name="chartWidget" native="true"/>
- </item>
- <item>
- <widget class="QWidget" name="widgetClipboard" native="true">
- <layout class="QHBoxLayout" name="horizontalLayout_3">
- <property name="spacing">
- <number>0</number>
- </property>
- <property name="leftMargin">
- <number>0</number>
- </property>
- <property name="topMargin">
- <number>0</number>
- </property>
- <property name="rightMargin">
- <number>0</number>
- </property>
- <property name="bottomMargin">
- <number>0</number>
- </property>
- <item>
- <widget class="QPushButton" name="buttonCopyHistogramToClipboard">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Copy to Clipboard</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer_2">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </widget>
- </item>
- </layout>
- </widget>
- <customwidgets>
- <customwidget>
- <class>QmitkChartWidget</class>
- <extends>QWidget</extends>
- <header location="global">QmitkChartWidget.h</header>
- </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>