diff --git a/Modules/Chart/include/QmitkChartWidget.h b/Modules/Chart/include/QmitkChartWidget.h
index dea90f4365..dda2589fcb 100644
--- a/Modules/Chart/include/QmitkChartWidget.h
+++ b/Modules/Chart/include/QmitkChartWidget.h
@@ -1,273 +1,279 @@
/*===================================================================
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 labels for pie chart data.
+ * \note in AddData1D, the label still has to be given that acts as a unique id. However, the label is omitted then.
+ */
+ void SetPieLabels(const std::vector<std::string> &pieLabels, 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 min and max x values of the chart
* \details Zooms in to view the values between minValue and maxValue in x direction
*/
void UpdateMinMaxValueXView(double minValueX,double maxValueX);
/*!
* \brief Updates the min and max y values of the chart
* \details Zooms in to view the values between minValue and maxValue in y direction
*/
void UpdateMinMaxValueYView(double minValueY, double maxValueY);
/*!
* \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/include/QmitkChartxyData.h b/Modules/Chart/include/QmitkChartxyData.h
index bb2c20db44..59843cf65e 100644
--- a/Modules/Chart/include/QmitkChartxyData.h
+++ b/Modules/Chart/include/QmitkChartxyData.h
@@ -1,106 +1,113 @@
/*===================================================================
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 QmitkC3xyData_h
#define QmitkC3xyData_h
#include <QVariant>
/** /brief This class holds the actual data for the chart generation with C3.
* data can be loaded in constructor directly or with SetData
* It is derived from QObject, because we need Q_PROPERTIES to send Data via QWebChannel to JavaScript.
*/
class QmitkChartxyData : public QObject
{
Q_OBJECT
Q_PROPERTY(QList<QVariant> m_YData READ GetYData WRITE SetYData NOTIFY SignalYDataChanged);
Q_PROPERTY(QList<QVariant> m_XData READ GetXData WRITE SetXData NOTIFY SignalXDataChanged);
Q_PROPERTY(QList<QVariant> m_XErrorDataPlus READ GetXErrorDataPlus WRITE SetXErrorDataPlus NOTIFY SignalErrorDataChanged);
Q_PROPERTY(QList<QVariant> m_XErrorDataMinus READ GetXErrorDataMinus WRITE SetXErrorDataMinus NOTIFY SignalErrorDataChanged);
Q_PROPERTY(QList<QVariant> m_YErrorDataPlus READ GetYErrorDataPlus WRITE SetYErrorDataPlus NOTIFY SignalErrorDataChanged);
Q_PROPERTY(QList<QVariant> m_YErrorDataMinus READ GetYErrorDataMinus WRITE SetYErrorDataMinus NOTIFY SignalErrorDataChanged);
+ Q_PROPERTY(
+ QList<QVariant> m_PieLabels READ GetPieLabels WRITE SetPieLabels NOTIFY SignalPieLabelsChanged);
Q_PROPERTY(QVariant m_ChartType READ GetChartType WRITE SetChartType NOTIFY SignalDiagramTypeChanged);
Q_PROPERTY(QVariant m_Color READ GetColor WRITE SetColor NOTIFY SignalColorChanged);
Q_PROPERTY(QVariant m_Label READ GetLabel WRITE SetLabel NOTIFY SignalLabelChanged);
Q_PROPERTY(QVariant m_LineStyleName READ GetLineStyle WRITE SetLineStyle NOTIFY SignalLineStyleChanged);
public:
explicit QmitkChartxyData(const QMap<QVariant, QVariant>& data, const QVariant& label, const QVariant& diagramType); //Constructor for Data2D (x:y=1:2, 2:6, 3:7)
void SetData(const QMap<QVariant, QVariant>& data);
Q_INVOKABLE QList<QVariant> GetYData() const { return m_YData; };
Q_INVOKABLE void SetYData(const QList<QVariant>& yData) { m_YData =yData; };
Q_INVOKABLE QList<QVariant> GetXData() const { return m_XData; };
Q_INVOKABLE void SetXData(const QList<QVariant>& xData) { m_XData =xData; };
Q_INVOKABLE QList<QVariant> GetXErrorDataPlus() const { return m_XErrorDataPlus; };
Q_INVOKABLE void SetXErrorDataPlus(const QList<QVariant> &errorData) { m_XErrorDataPlus = errorData; };
Q_INVOKABLE QList<QVariant> GetXErrorDataMinus() const { return m_XErrorDataMinus; };
Q_INVOKABLE void SetXErrorDataMinus(const QList<QVariant> &errorData) { m_XErrorDataMinus = errorData; };
Q_INVOKABLE QList<QVariant> GetYErrorDataPlus() const { return m_YErrorDataPlus; };
Q_INVOKABLE void SetYErrorDataPlus(const QList<QVariant> &errorData) { m_YErrorDataPlus = errorData; };
Q_INVOKABLE QList<QVariant> GetYErrorDataMinus() const { return m_YErrorDataMinus; };
Q_INVOKABLE void SetYErrorDataMinus(const QList<QVariant> &errorData) { m_YErrorDataMinus = errorData; };
Q_INVOKABLE QVariant GetChartType() const { return m_ChartType; };
Q_INVOKABLE void SetChartType(const QVariant& chartType) { m_ChartType = chartType; };
Q_INVOKABLE QVariant GetLabel() const { return m_Label; };
Q_INVOKABLE void SetLabel(const QVariant& label) { m_Label = label; };
+ Q_INVOKABLE QList<QVariant> GetPieLabels() const { return m_PieLabels; };
+ Q_INVOKABLE void SetPieLabels(const QList<QVariant> &pieLabels) { m_PieLabels = pieLabels; };
+
Q_INVOKABLE QVariant GetColor() const { return m_Color; };
Q_INVOKABLE void SetColor(const QVariant& color) { m_Color = color; };
Q_INVOKABLE QVariant GetLineStyle() const { return m_LineStyleName; };
Q_INVOKABLE void SetLineStyle(const QVariant& lineStyle) { m_LineStyleName = lineStyle; };
/**
* \brief Clears the Data.
*
* This function clears the data.
*/
void ClearData();
signals:
void SignalYDataChanged(const QList<QVariant> yData);
void SignalXDataChanged(const QList<QVariant> xData);
void SignalErrorDataChanged(const QList<QVariant> errorData);
void SignalDiagramTypeChanged(const QVariant diagramType);
void SignalColorChanged(const QVariant color);
void SignalLabelChanged(const QVariant label);
+ void SignalPieLabelsChanged(const QList<QVariant> pieLabels);
void SignalLineStyleChanged(const QVariant lineStyle);
private:
QList<QVariant> m_YData;
QList<QVariant> m_XData;
QList<QVariant> m_XErrorDataPlus;
QList<QVariant> m_XErrorDataMinus;
QList<QVariant> m_YErrorDataPlus;
QList<QVariant> m_YErrorDataMinus;
QVariant m_Label;
+ QList<QVariant> m_PieLabels;
QVariant m_ChartType;
QVariant m_Color;
QVariant m_LineStyleName;
};
#endif //QmitkC3xyData_h
diff --git a/Modules/Chart/resource/Chart.js b/Modules/Chart/resource/Chart.js
index 0a0fb91356..ddbeeccde3 100644
--- a/Modules/Chart/resource/Chart.js
+++ b/Modules/Chart/resource/Chart.js
@@ -1,420 +1,430 @@
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 pieDataLabels=[];
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 pieDataLabelsTemp = channel.objects[propertyName].m_PieLabels;
+
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;
+ pieDataLabels[count] = pieDataLabelsTemp;
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*5); //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 inputType = dataProperties[dataLabels[index]]["chartType"];
let chartType = getPlotlyChartType(inputType);
let trace = {
x: xValues[index].slice(1),
y: yValues[index].slice(1),
stackgroup: 'one',
name: dataLabels[index],
type: chartType,
marker:{
color: dataProperties[dataLabels[index]]["color"]
}
};
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 (chartType=="pie"){
+ trace["values"] = yValues[index].slice(1);
+ if (typeof pieDataLabels[index] !== 'undefined' && pieDataLabels[index].length > 0){
+ trace["labels"] = pieDataLabels[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"] = {}
trace["line"]["color"] = dataProperties[dataLabels[index]]["color"]
if (chartType == "scatter"){
} 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/color
trace["marker"] = {size: chartData.m_DataPointSize, color: dataProperties[dataLabels[index]]["color"]}
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: 40,
t: marginTop,
pad: 4
},
showlegend: chartData.m_ShowLegend,
legend: {
x: legendX,
y: legendY,
font : {
color: foregroundColor
}
}
};
if (chartData.m_StackedData){
layout["barmode"] = 'stack';
}
if (chartData.m_YAxisScale){
layout.yaxis["type"] = "log"
}
if (chartData.m_ShowSubchart){
layout.xaxis.rangeslider = {}; // adds range slider below x axis
}
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;
}
/**
* Zooms to the given x-axis min and max values.
*/
function UpdateMinMaxValueXView(minValueX, maxValueX)
{
//y-Axis can't be adapted for now. See https://github.com/plotly/plotly.js/issues/1876
let chart = document.getElementById("chart");
let update = {
xaxis:{
range:[minValueX, maxValueX]
}
};
Plotly.relayout(chart, update);
}
/**
* Zooms to the given y-axis min and max values.
*/
function UpdateMinMaxValueYView(minValueY, maxValueY)
{
//x-Axis can't be adapted for now. See https://github.com/plotly/plotly.js/issues/1876
let chart = document.getElementById("chart");
let update = {
yaxis:{
range:[minValueY, maxValueY]
}
};
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 914eb7ce4a..c2fa9e5577 100644
--- a/Modules/Chart/src/QmitkChartWidget.cpp
+++ b/Modules/Chart/src/QmitkChartWidget.cpp
@@ -1,678 +1,724 @@
/*===================================================================
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 SetPieLabels(const std::vector<std::string> &pieLabels, 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);
+ QList<QVariant> ConvertVectorToQList(const std::vector<std::string> &vec);
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 {
+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::SetPieLabels(const std::vector<std::string> &pieLabels, const std::string &label)
+{
+ auto element = GetDataElementByLabel(label);
+ if (element)
+ {
+ if (element->GetChartType() == QVariant("pie"))
+ {
+ auto dataY = element->GetYData();
+ element->SetPieLabels(ConvertVectorToQList(pieLabels));
+ if (dataY.size() != pieLabels.size())
+ {
+ MITK_INFO << "data has " << dataY.size() << " entries whereas pie labels have " << pieLabels.size()
+ << " entries. Unnamed pie labels automatically get a numerical label.";
+ }
+ }
+ else
+ {
+ MITK_INFO << "label" << label << "has chart type " << element->GetChartType().toString().toStdString() << ", but pie is required";
+ }
+ }
+}
+
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;
}
+QList<QVariant> QmitkChartWidget::Impl::ConvertVectorToQList(const std::vector<std::string> &vec)
+{
+ QList<QVariant> vecConverted;
+ for (const auto &aValue : vec)
+ {
+ vecConverted.append(QString::fromStdString(aValue));
+ }
+
+ return vecConverted;
+}
+
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()
{
auto alreadyRegisteredObjects = m_WebChannel->registeredObjects();
auto alreadyRegisteredObjectsValues = alreadyRegisteredObjects.values();
- //only register objects that have not been registered yet
+ // only register objects that have not been registered yet
if (alreadyRegisteredObjectsValues.indexOf(&m_C3Data) == -1)
{
m_WebChannel->registerObject(QStringLiteral("chartData"), &m_C3Data);
}
unsigned count = 0;
for (auto &xyData : m_C3xyData)
{
// only register objects that have not been registered yet
if (alreadyRegisteredObjectsValues.indexOf(xyData.get()) == -1)
{
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)) {
+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::SetPieLabels(const std::vector<std::string> &pieLabels, const std::string &label)
+{
+ m_Impl->SetPieLabels(pieLabels, 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() {
+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::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::UpdateMinMaxValueXView(double minValueX, double maxValueX)
{
- QString minMaxValueXString = QString::fromStdString(std::to_string(minValueX))+QString(",");
+ QString minMaxValueXString = QString::fromStdString(std::to_string(minValueX)) + QString(",");
minMaxValueXString += QString::fromStdString(std::to_string(maxValueX));
const QString command = QString("UpdateMinMaxValueXView(" + minMaxValueXString + ")");
m_Impl->CallJavaScriptFuntion(command);
}
-void QmitkChartWidget::UpdateMinMaxValueYView(double minValueY, double maxValueY) {
+void QmitkChartWidget::UpdateMinMaxValueYView(double minValueY, double maxValueY)
+{
QString minMaxValueYString = QString::fromStdString(std::to_string(minValueY)) + QString(",");
minMaxValueYString += QString::fromStdString(std::to_string(maxValueY));
const QString command = QString("UpdateMinMaxValueYView(" + minMaxValueYString + ")");
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/Plugins/org.mitk.gui.qt.chartExample/src/internal/ChartExample.h b/Plugins/org.mitk.gui.qt.chartExample/src/internal/ChartExample.h
index 2a717ff41f..8cf18c1aec 100644
--- a/Plugins/org.mitk.gui.qt.chartExample/src/internal/ChartExample.h
+++ b/Plugins/org.mitk.gui.qt.chartExample/src/internal/ChartExample.h
@@ -1,75 +1,79 @@
/*===================================================================
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 ChartExample_h
#define ChartExample_h
#include <QmitkAbstractView.h>
#include "ui_ChartExampleControls.h"
/**
\brief Basic example for use of module mitkChart
\sa QmitkAbstractView
\ingroup ${plugin_target}_internal
*/
class ChartExample : public QmitkAbstractView
{
// this is needed for all Qt objects that should have a Qt meta-object
// (everything that derives from QObject and wants to have signal/slots)
Q_OBJECT
public:
static const std::string VIEW_ID;
protected:
virtual void CreateQtPartControl(QWidget *parent) override;
virtual void SetFocus() override;
void CreateChart();
void ClearChart();
void AddData();
void ShowXData(bool show);
void ShowErrorOptions(bool show);
void ShowXErrorOptions(bool show);
void ShowYErrorOptions(bool show);
void AdaptZoomX();
void AdaptZoomY();
+ void AdaptDataGUI(const QString &chartType);
+ void ResetDataGUI();
+
private:
void FillRandomDataValues();
std::vector<double> GenerateRandomNumbers(unsigned int amount, double max) const;
std::vector<double> ConvertToVector(const QString& data, QChar delimiter=';') const;
+ std::vector<std::string> ConvertToStringVector(const QString &data, QChar delimiter = ';') const;
std::map<double, double> CreateMap(std::vector<double> keys, std::vector<double> values) const;
std::string ConvertToText(std::vector<double> numbers, std::string delimiter = ";") const;
std::string ConvertToText(std::map<double, double> numbers, std::string delimiter = ";") const;
QmitkChartWidget::ColorTheme GetColorTheme() const;
std::map<std::string, QmitkChartWidget::ChartType> m_ChartNameToChartType;
std::map<std::string, QmitkChartWidget::LineStyle> m_LineNameToLineType;
std::map<std::string, QmitkChartWidget::AxisScale> m_AxisScaleNameToAxisScaleType;
std::map<std::string, QmitkChartWidget::LegendPosition> m_LegendPositionNameToLegendPositionType;
unsigned int countForUID = 0;
Ui::ChartExampleControls m_Controls;
};
#endif // ChartExample_h
diff --git a/Plugins/org.mitk.gui.qt.chartExample/src/internal/ChartExampleControls.ui b/Plugins/org.mitk.gui.qt.chartExample/src/internal/ChartExampleControls.ui
index 6cbef6d95e..82daa5d965 100644
--- a/Plugins/org.mitk.gui.qt.chartExample/src/internal/ChartExampleControls.ui
+++ b/Plugins/org.mitk.gui.qt.chartExample/src/internal/ChartExampleControls.ui
@@ -1,648 +1,658 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ChartExampleControls</class>
<widget class="QWidget" name="ChartExampleControls">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>455</width>
<height>1054</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="windowTitle">
<string>QmitkTemplate</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QToolBox" name="toolBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="currentIndex">
<number>0</number>
</property>
<widget class="QWidget" name="page">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>420</width>
<height>411</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<attribute name="label">
<string>Data</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_7">
<item>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>data entry</string>
</property>
</widget>
</item>
<item row="0" column="1">
<layout class="QFormLayout" name="formLayout_6">
<item row="1" column="1">
<widget class="QLineEdit" name="m_lineEditDataYVector"/>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="m_lineEditDataXVector">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QCheckBox" name="m_checkBoxEnableDataX">
<property name="text">
<string>x</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_13">
<property name="text">
<string>y:</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="m_checkBoxEnableErrors">
<property name="text">
<string>error</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QGroupBox" name="m_groupBoxErrors">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="title">
<string>Error values</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<layout class="QFormLayout" name="formLayout_3">
<item row="0" column="0">
<widget class="QCheckBox" name="m_checkBoxEnableYErrors">
<property name="text">
<string>y error</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QCheckBox" name="m_checkBoxEnableXErrors">
<property name="text">
<string>x error</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QGroupBox" name="m_groupBoxXErrors">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="title">
<string>GroupBox</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_6">
<item>
<layout class="QFormLayout" name="formLayout_5">
<item row="0" column="0">
<widget class="QLabel" name="label_11">
<property name="text">
<string>plus error</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_12">
<property name="text">
<string>minus error</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="m_lineEditXErrorPlus"/>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="m_lineEditXErrorMinus"/>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item row="0" column="1">
<widget class="QGroupBox" name="m_groupBoxYErrors">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="title">
<string>GroupBox</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_5">
<item>
<layout class="QFormLayout" name="formLayout_4">
<item row="0" column="0">
<widget class="QLabel" name="label_10">
<property name="text">
<string>plus error</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="m_lineEditYErrorPlus">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="m_lineEditYErrorMinus">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
<string>minus error</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>data label</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLineEdit" name="m_lineEditDataLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
- <item row="3" column="0">
+ <item row="3" column="1">
+ <widget class="QLineEdit" name="m_lineEditPieDataLabel">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Chart type</string>
</property>
</widget>
</item>
- <item row="3" column="1">
+ <item row="4" column="1">
<widget class="QComboBox" name="m_comboBoxChartType">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<item>
<property name="text">
<string>bar</string>
</property>
</item>
<item>
<property name="text">
<string>line</string>
</property>
</item>
<item>
<property name="text">
<string>area</string>
</property>
</item>
<item>
<property name="text">
<string>spline</string>
</property>
</item>
<item>
<property name="text">
<string>area-spline</string>
</property>
</item>
<item>
<property name="text">
<string>scatter</string>
</property>
</item>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_7">
<property name="text">
<string>Color</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLineEdit" name="m_lineEditColor">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
<string>Line style</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QComboBox" name="m_comboBoxLineStyle">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<item>
<property name="text">
<string>solid</string>
</property>
</item>
<item>
<property name="text">
<string>dashed</string>
</property>
</item>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QPushButton" name="m_buttonAddData">
<property name="text">
<string>Add data</string>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="page_2">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>420</width>
<height>236</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<attribute name="label">
<string>Global options</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_8">
<item>
<layout class="QFormLayout" name="formLayout_2">
<property name="sizeConstraint">
<enum>QLayout::SetDefaultConstraint</enum>
</property>
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="0" column="0">
<widget class="QLabel" name="titleLabel">
<property name="text">
<string>Title</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="title"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>XAxis label</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="m_lineEditXAxisLabel"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>YAxis label</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLineEdit" name="m_lineEditYAxisLabel"/>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_9">
<property name="text">
<string>Y Axis scale</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QComboBox" name="m_comboBoxYAxisScale">
<item>
<property name="text">
<string>linear</string>
</property>
</item>
<item>
<property name="text">
<string>logarithmic</string>
</property>
</item>
</widget>
</item>
<item row="5" column="0">
<widget class="QCheckBox" name="m_checkBoxShowLegend">
<property name="text">
<string>Show legend</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QCheckBox" name="m_checkBoxStackedData">
<property name="text">
<string>Stacked data</string>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QCheckBox" name="m_checkBoxShowDataPoints">
<property name="text">
<string>Show data points</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="8" column="0">
<widget class="QCheckBox" name="m_checkBoxShowSubchart">
<property name="text">
<string>Show Subchart</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_16">
<property name="text">
<string>Legend position</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QComboBox" name="m_comboBoxLegendPosition">
<property name="currentIndex">
<number>2</number>
</property>
<item>
<property name="text">
<string>bottom middle</string>
</property>
</item>
<item>
<property name="text">
<string>bottom right</string>
</property>
</item>
<item>
<property name="text">
<string>top right</string>
</property>
</item>
<item>
<property name="text">
<string>top left</string>
</property>
</item>
<item>
<property name="text">
<string>middle right</string>
</property>
</item>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<widget class="QWidget" name="page_3">
<attribute name="label">
<string>Zoom</string>
</attribute>
<widget class="QWidget" name="gridLayoutWidget">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>431</width>
<height>121</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label_14">
<property name="text">
<string>x:</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_15">
<property name="text">
<string>y:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QDoubleSpinBox" name="m_doubleSpinBox_minZoomX"/>
</item>
<item row="1" column="1">
<widget class="QDoubleSpinBox" name="m_doubleSpinBox_minZoomY"/>
</item>
<item row="0" column="2">
<widget class="QDoubleSpinBox" name="m_doubleSpinBox_maxZoomX"/>
</item>
<item row="1" column="2">
<widget class="QDoubleSpinBox" name="m_doubleSpinBox_maxZoomY"/>
</item>
</layout>
</widget>
</widget>
</widget>
</item>
<item>
<widget class="QPushButton" name="m_buttonCreateChart">
<property name="toolTip">
<string>Do image processing</string>
</property>
<property name="text">
<string>Create chart</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="m_buttonClearChart">
<property name="text">
<string>Clear chart</string>
</property>
</widget>
</item>
<item>
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
</widget>
</item>
<item>
<widget class="QStackedWidget" name="m_StatisticsWidgetStack">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>250</height>
</size>
</property>
<property name="currentIndex">
<number>0</number>
</property>
<widget class="QmitkChartWidget" name="m_Chart">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</widget>
</item>
<item>
<widget class="QPlainTextEdit" name="m_plainTextEditDataView">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>150</height>
</size>
</property>
</widget>
</item>
<item>
<spacer name="spacer1">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11"/>
<customwidgets>
<customwidget>
<class>QmitkChartWidget</class>
<extends>QWidget</extends>
<header location="global">QmitkChartWidget.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>