diff --git a/Modules/Chart/include/QmitkChartWidget.h b/Modules/Chart/include/QmitkChartWidget.h
index 2638649dd5..b62c8b0737 100644
--- a/Modules/Chart/include/QmitkChartWidget.h
+++ b/Modules/Chart/include/QmitkChartWidget.h
@@ -1,253 +1,253 @@
/*===================================================================
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 C3js.
* \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: http://c3js.org/samples/simple_multiple.html
* * bar chart: http://c3js.org/samples/chart_bar.html
* * spline chart: http://c3js.org/samples/chart_spline.html
* * pie chart: http://c3js.org/samples/chart_pie.html
* * scatter chart: http://c3js.org/samples/chart_scatter.html
* * area chart: http://c3js.org/samples/chart_area.html
* * area spline chart: http://c3js.org/samples/chart_area.html
*
* Technical details: The javascript code is embedded in a QWebEngineView. The actual js code is implemented in resource\Chart.js.
* \sa http://c3js.org 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 http://c3js.org/samples/chart_bar.html */
line, /*!< line chart, see http://c3js.org/samples/simple_multiple.html */
spline, /*!< spline chart (smoothed line chart), see http://c3js.org/samples/chart_spline.html */
pie, /*!< pie chart, see http://c3js.org/samples/chart_pie.html*/
area, /*!< area chart, see http://c3js.org/samples/chart_area.html*/
area_spline, /*!< area-spline chart, see http://c3js.org/samples/chart_area.html*/
scatter /*!< scatter chart, see http://c3js.org/samples/chart_scatter.html*/
};
/*!
* \brief enum of chart style (modifies background and line color).
*/
enum class ChartStyle {
darkstyle, /*!< background color: dark gray, line color: blue */
lightstyle /*!< background color: white, line color: blue */
};
enum class LineStyle {
solid,
dashed
};
enum class AxisScale {
linear,
log
};
/*!
* \brief enum of legend position.
* See http://c3js.org/reference.html#legend-position
*/
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,
* C3 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.
*/
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);
- void SetErrorBars(const std::string &label, const std::vector<double> &error);
+ void SetErrorBars(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 (see http://c3js.org/samples/options_subchart.html).
* \exception if no data has been provided (\sa AddData1D AddData2D)
*/
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: http://c3js.org/samples/point_show.html
* example for showing the points: http://c3js.org/samples/simple_multiple.html
*/
void SetShowDataPoints(bool showDataPoints);
/*!
* \brief Clears all data inside and resets the widget.
*/
void Clear();
/*!
* \brief Changes the theme of the widget.
*/
void SetTheme(ChartStyle themeEnabled);
/*!
* \brief Sets whether the subchart shall be shown.
* \details Changes the state of the current chart object. Needs to be reloaded with Reload() to display changes.
* \param showSubChart if a subchart is displayed inside the widget or not.
*/
void SetShowSubchart(bool showSubChart);
/*!
* \brief Sets whether the error bars shall be shown.
* \details Changes the state of the current chart object. Needs to be reloaded with Reload() to display changes.
* \param showErrorBars if error bars are displayed or not.
*/
void SetShowErrorBars(bool showErrorBars);
/*!
* \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);
signals:
void PageSuccessfullyLoaded();
private:
QString convertBooleanValue(bool value) {
if (value)
{
return "true";
}
else
{
return "false";
}
}
class Impl;
std::unique_ptr<Impl> m_Impl;
};
#endif
diff --git a/Modules/Chart/include/QmitkChartxyData.h b/Modules/Chart/include/QmitkChartxyData.h
index 827acd5f72..2eaa5d67b6 100644
--- a/Modules/Chart/include/QmitkChartxyData.h
+++ b/Modules/Chart/include/QmitkChartxyData.h
@@ -1,91 +1,96 @@
/*===================================================================
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_ErrorData READ GetErrorData WRITE SetErrorData NOTIFY SignalErrorDataChanged);
+ Q_PROPERTY(QList<QVariant> m_ErrorDataPlus READ GetErrorDataPlus WRITE SetErrorDataPlus NOTIFY SignalErrorDataChanged);
+ Q_PROPERTY(QList<QVariant> m_ErrorDataMinus READ GetErrorDataMinus WRITE SetErrorDataMinus NOTIFY SignalErrorDataChanged);
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> GetErrorData() const { return m_ErrorData; };
- Q_INVOKABLE void SetErrorData(const QList<QVariant> &errorData) { m_ErrorData = errorData; };
+ Q_INVOKABLE QList<QVariant> GetErrorDataPlus() const { return m_ErrorDataPlus; };
+ Q_INVOKABLE void SetErrorDataPlus(const QList<QVariant> &errorData) { m_ErrorDataPlus = errorData; };
+
+ Q_INVOKABLE QList<QVariant> GetErrorDataMinus() const { return m_ErrorDataMinus; };
+ Q_INVOKABLE void SetErrorDataMinus(const QList<QVariant> &errorData) { m_ErrorDataMinus = 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 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 SignalLineStyleChanged(const QVariant lineStyle);
private:
QList<QVariant> m_YData;
QList<QVariant> m_XData;
- QList<QVariant> m_ErrorData;
+ QList<QVariant> m_ErrorDataPlus;
+ QList<QVariant> m_ErrorDataMinus;
QVariant m_Label;
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 b20d470c48..9d27f0ac1a 100644
--- a/Modules/Chart/resource/Chart.js
+++ b/Modules/Chart/resource/Chart.js
@@ -1,274 +1,291 @@
document.body.style.backgroundColor = 'rgb(240, 240, 240)';
const minHeight = 255;
var chart;
var chartData;
-var errorValues=[];
+var errorValuesPlus=[];
+var errorValuesMinus=[];
var xValues=[];
var yValues=[];
var dataLabels=[];
var xs = {};
var dataColors = {};
var chartTypes = {};
var lineStyle = {};
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 errorsTemp = channel.objects[propertyName].m_ErrorData;
+ let errorsTempPlus = channel.objects[propertyName].m_ErrorDataPlus;
+ let errorsTempMinus = channel.objects[propertyName].m_ErrorDataMinus;
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
- errorValues[count] = errorsTemp;
+ errorValuesPlus[count] = errorsTempPlus;
+ errorValuesMinus[count] = errorsTempMinus;
+
let tempLineStyle = '';
if (channel.objects[propertyName].m_LineStyleName == "solid")
{
tempLineStyle = ''
}
else
{
tempLineStyle = { 'style': 'dashed' }
}
dataProperties[dataLabel] = {
"color" : channel.objects[propertyName].m_Color,
"chartType": channel.objects[propertyName].m_ChartType,
"style": tempLineStyle
}
count++;
}
}
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 = "";
if (inputType == "line"){
plotlyType = "scatter";
} else if (inputType == "bar"){
plotlyType = "bar";
}
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 generateLineOptions(options){
return {
color : options.color
}
}
/**
* 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 ========================
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 errorValues[index] !== 'undefined'){
- trace["error_y"] = generateErrorBars(errorValues[index], chartData.m_ShowErrorBars);
+ if(typeof errorValuesPlus[index] !== 'undefined'){
+ if(typeof errorValuesMinus[index] !== 'undefined' && errorValuesMinus[index].length > 0)
+ {
+ trace["error_y"] = generateErrorBarsAsymmetric(errorValuesPlus[index], errorValuesMinus[index], chartData.m_ShowErrorBars);
+ }else{
+ trace["error_y"] = generateErrorBars(errorValuesPlus[index], chartData.m_ShowErrorBars);
+ }
}
if (dataProperties[dataLabels[index]]["style"] == "dashed"){
trace["line"]["dash"] = "dot"
}
// ===================== CHART TYPE OPTIONS HANDLING ===========
if (chartType == "scatter"){
trace["line"] = generateLineOptions(dataProperties[dataLabels][index]["color"])
}
data.push(trace)
}
//=============================== STYLE ========================
let marginTop = chartData.m_diagramTitle == 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 = {
title: chartData.m_diagramTitle,
xaxis: {
title: chartData.m_xAxisLabel
},
yaxis: {
title: chartData.m_yAxisLabel
},
margin: {
l: 50,
r: 10,
b: 50,
t: marginTop,
pad: 4
},
showlegend: chartData.m_ShowLegend,
legend: {
x: legendX,
y: legendY
}
};
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) {
link = document.getElementsByTagName("link")[0];
if (color == 'dark') {
link.href = "Chart_dark.css";
}
else
{
link.href = "Chart.css";
}
};
function Reload(){
console.log("Reload chart");
generateChart(chartData);
}
function SetShowSubchart(showSubchart)
{
chartData.m_ShowSubchart = showSubchart;
}
function SetStackDataString(stackDataString)
{
chartData.m_StackedData = stackDataString;
}
function SetShowErrorBars(showErrorBars)
{
chartData.m_ShowErrorBars = showErrorBars;
}
/**
* 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 d0e5890b64..0a01aa6a2a 100644
--- a/Modules/Chart/src/QmitkChartWidget.cpp
+++ b/Modules/Chart/src/QmitkChartWidget.cpp
@@ -1,583 +1,588 @@
/*===================================================================
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 SetErrorBars(const std::string &label, const std::vector<double> &error);
+ void SetErrorBars(const std::string &label, const std::vector<double> &errorPlus, const std::vector<double>& errorMinus = std::vector<double>());
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 SetShowDataPoints(bool showDataPoints = false);
void SetChartType(const std::string &label, QmitkChartWidget::ChartType chartType);
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;
void MapTypes();
QWebChannel *m_WebChannel;
QWebEngineView *m_WebEngineView;
QmitkChartData m_C3Data;
ChartxyDataVector m_C3xyData;
std::map<QmitkChartWidget::ChartType, std::string> m_ChartTypeToName;
std::map<QmitkChartWidget::LegendPosition, std::string> m_LegendPositionToName;
std::map<QmitkChartWidget::LineStyle, std::string> m_LineStyleToName;
std::map<QmitkChartWidget::AxisScale, std::string> m_AxisScaleToName;
};
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->setUrl(QUrl(QStringLiteral("qrc:///C3js/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");
}
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);
// only has effect with chart type line
if (element && element->GetChartType() == QVariant(QString::fromStdString(ConvertChartTypeToString(ChartType::line))))
{
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::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::SetShowErrorBars(bool show)
{
m_C3Data.SetShowErrorBars(show);
}
-void QmitkChartWidget::SetStackedData(bool stacked) {}
-
void QmitkChartWidget::Impl::SetShowDataPoints(bool showDataPoints)
{
if (showDataPoints == true)
{
m_C3Data.SetDataPointSize(3);
}
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)));
}
}
-void QmitkChartWidget::Impl::SetErrorBars(const std::string &label, const std::vector<double> &error)
+void QmitkChartWidget::Impl::SetErrorBars(const std::string &label, const std::vector<double> &errorPlus, const std::vector<double>& errorMinus)
{
auto element = GetDataElementByLabel(label);
if (element)
{
- QList<QVariant> errorConverted;
- for (const auto &aValue : error)
+ QList<QVariant> errorConvertedPlus;
+ for (const auto &aValue : errorPlus)
+ {
+ errorConvertedPlus.append(aValue);
+ }
+
+ QList<QVariant> errorConvertedMinus;
+ for (const auto &aValue : errorMinus)
{
- errorConverted.append(aValue);
+ errorConvertedMinus.append(aValue);
}
- element->SetErrorData(errorConverted);
+ element->SetErrorDataPlus(errorConvertedPlus);
+ element->SetErrorDataMinus(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->setUrl(QUrl(QStringLiteral("qrc:///C3js/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:///C3js/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() {}
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::SetErrorBars(const std::string &label, const std::vector<double> &error)
+void QmitkChartWidget::SetErrorBars(const std::string &label, const std::vector<double> &errorPlus, const std::vector<double>& errorMinus)
{
- m_Impl->SetErrorBars(label, error);
+ m_Impl->SetErrorBars(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) {
Q_UNUSED(stacked) //this is a temporary solution and will be changed as soon as this method is implemented
MITK_WARN << "not yet implemented";
}
void QmitkChartWidget::Show(bool showSubChart)
{
m_Impl->Show(showSubChart);
}
void QmitkChartWidget::Clear()
{
m_Impl->ClearData();
m_Impl->ClearJavaScriptChart();
}
void QmitkChartWidget::OnLoadFinished(bool isLoadSuccessfull)
{
if (isLoadSuccessfull)
{
emit PageSuccessfullyLoaded();
}
}
void QmitkChartWidget::SetChartTypeForAllDataAndReload(ChartType type)
{
m_Impl->SetChartType(type);
}
void QmitkChartWidget::SetTheme(ChartStyle themeEnabled)
{
QString command;
if (themeEnabled == ChartStyle::darkstyle)
{
command = QString("changeTheme('dark')");
}
else
{
command = QString("changeTheme('light')");
}
m_Impl->CallJavaScriptFuntion(command);
}
void QmitkChartWidget::SetShowSubchart(bool showSubChart)
{
QString subChartString = convertBooleanValue(showSubChart);
const QString command = QString("SetShowSubchart(" + subChartString + ")");
m_Impl->CallJavaScriptFuntion(command);
}
void QmitkChartWidget::SetShowErrorBars(bool showErrorBars)
{
m_Impl->SetShowErrorBars(showErrorBars);
//QString showErrorBarsString = convertBooleanValue(showErrorBars);
//const QString command = QString("SetShowErrorBars(" + showErrorBarsString + ")");
//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.cpp b/Plugins/org.mitk.gui.qt.chartExample/src/internal/ChartExample.cpp
index 28b0cec098..37ed214d7a 100644
--- a/Plugins/org.mitk.gui.qt.chartExample/src/internal/ChartExample.cpp
+++ b/Plugins/org.mitk.gui.qt.chartExample/src/internal/ChartExample.cpp
@@ -1,192 +1,194 @@
/*===================================================================
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.
===================================================================*/
// Blueberry
#include <berryISelectionService.h>
#include <berryIWorkbenchWindow.h>
#include <berryWorkbenchPlugin.h>
#include <berryIQtStyleManager.h>
// Qmitk
#include "ChartExample.h"
// Qt
#include <QMessageBox>
#include <QRandomGenerator>
// mitk image
#include <mitkImage.h>
const std::string ChartExample::VIEW_ID = "org.mitk.views.chartexample";
void ChartExample::SetFocus()
{
m_Controls.m_buttonCreateChart->setFocus();
}
void ChartExample::CreateQtPartControl(QWidget *parent)
{
// create GUI widgets from the Qt Designer's .ui file
m_Controls.setupUi(parent);
connect(m_Controls.m_buttonCreateChart, &QPushButton::clicked, this, &ChartExample::CreateChart);
connect(m_Controls.m_buttonClearChart, &QPushButton::clicked, this, &ChartExample::ClearChart);
connect(m_Controls.m_buttonAddData, &QPushButton::clicked, this, &ChartExample::AddData);
FillRandomDataValues();
m_Controls.m_Chart->SetTheme(GetColorTheme());
m_Controls.m_lineEditXAxisLabel->setText("xLabel");
m_Controls.m_lineEditYAxisLabel->setText("yLabel");
m_chartNameToChartType.emplace("bar", QmitkChartWidget::ChartType::bar);
m_chartNameToChartType.emplace("line", QmitkChartWidget::ChartType::line);
m_chartNameToChartType.emplace("spline", QmitkChartWidget::ChartType::spline);
m_chartNameToChartType.emplace("pie", QmitkChartWidget::ChartType::pie);
m_chartNameToChartType.emplace("area", QmitkChartWidget::ChartType::area);
m_chartNameToChartType.emplace("area-spline", QmitkChartWidget::ChartType::area_spline);
m_chartNameToChartType.emplace("scatter", QmitkChartWidget::ChartType::scatter);
m_LineNameToLineType.emplace("solid", QmitkChartWidget::LineStyle::solid);
m_LineNameToLineType.emplace("dashed", QmitkChartWidget::LineStyle::dashed);
m_AxisScaleNameToAxisScaleType.emplace("linear", QmitkChartWidget::AxisScale::linear);
m_AxisScaleNameToAxisScaleType.emplace("logarithmic", QmitkChartWidget::AxisScale::log);
}
void ChartExample::FillRandomDataValues()
{
std::vector<double> numbers = generateRandomNumbers(10, 10.0);
std::string text = convertToText(numbers, ";");
m_Controls.m_lineEditDataVector->setText(QString::fromStdString(text));
m_Controls.m_lineEditDataLabel->setText("test" + QString::number(countForUID));
countForUID++;
}
void ChartExample::CreateChart()
{
auto dataYAxisScaleType = m_AxisScaleNameToAxisScaleType.at(m_Controls.m_comboBoxYAxisScale->currentText().toStdString());
auto xAxisLabel = m_Controls.m_lineEditXAxisLabel->text().toStdString();
auto yAxisLabel = m_Controls.m_lineEditYAxisLabel->text().toStdString();
auto showLegend = m_Controls.m_checkBoxShowLegend->isChecked();
auto showDataPoints = m_Controls.m_checkBoxShowDataPoints->isChecked();
auto stackedData = m_Controls.m_checkBoxStackedData->isChecked();
auto showSubchart = m_Controls.m_checkBoxShowSubchart->isChecked();
m_Controls.m_Chart->SetYAxisScale(dataYAxisScaleType);
m_Controls.m_Chart->SetXAxisLabel(xAxisLabel);
m_Controls.m_Chart->SetYAxisLabel(yAxisLabel);
m_Controls.m_Chart->SetShowLegend(showLegend);
m_Controls.m_Chart->SetShowErrorBars(true);
m_Controls.m_Chart->SetShowDataPoints(showDataPoints);
m_Controls.m_Chart->SetStackedData(stackedData);
m_Controls.m_Chart->Show(showSubchart);
}
void ChartExample::ClearChart()
{
m_Controls.m_Chart->Clear();
m_Controls.m_plainTextEditDataView->clear();
}
void ChartExample::AddData()
{
auto lineEditData = m_Controls.m_lineEditDataVector->text();
std::vector<double> data;
for(const QString entry : lineEditData.split(';'))
{
data.push_back(entry.toDouble());
}
auto chartType = m_chartNameToChartType.at(m_Controls.m_comboBoxChartType->currentText().toStdString());
std::string dataLabel = m_Controls.m_lineEditDataLabel->text().toStdString();
std::string dataColor = m_Controls.m_lineEditColor->text().toStdString();
auto dataLineStyleType = m_LineNameToLineType.at(m_Controls.m_comboBoxLineStyle->currentText().toStdString());
m_Controls.m_Chart->AddData1D(data, dataLabel, chartType);
if (!dataColor.empty()) {
m_Controls.m_Chart->SetColor(dataLabel, dataColor);
}
- m_Controls.m_Chart->SetErrorBars(dataLabel, data);
+ auto errorValuesMinus = std::vector<double>(data.size());
+ std::transform(data.begin(), data.end(), errorValuesMinus.begin(), [](double d) { return d / 2; });
+ m_Controls.m_Chart->SetErrorBars(dataLabel, data, errorValuesMinus);
m_Controls.m_Chart->SetLineStyle(dataLabel, dataLineStyleType);
QString dataOverview;
dataOverview.append(m_Controls.m_lineEditDataLabel->text());
dataOverview.append("(").append(m_Controls.m_comboBoxChartType->currentText());
if (!dataColor.empty()) {
dataOverview.append(", ").append(dataColor.c_str());
}
dataOverview.append(", ").append(m_Controls.m_comboBoxLineStyle->currentText());
dataOverview.append(")");
dataOverview.append(":").append(lineEditData);
m_Controls.m_plainTextEditDataView->appendPlainText(dataOverview);
FillRandomDataValues();
}
std::vector<double> ChartExample::generateRandomNumbers(unsigned int amount, double max) const
{
QRandomGenerator gen;
gen.seed(time(NULL));
std::vector<double> data;
for (unsigned int i = 0; i < amount; i++) {
data.push_back(gen.bounded(max));
}
return data;
}
std::string ChartExample::convertToText(std::vector<double> numbers, std::string delimiter) const
{
std::ostringstream oss;
oss.precision(3);
if (!numbers.empty())
{
for (auto number : numbers) {
oss << number << delimiter;
}
}
auto aString = oss.str();
aString.pop_back();
return aString;
}
QmitkChartWidget::ChartStyle ChartExample::GetColorTheme() const
{
ctkPluginContext* context = berry::WorkbenchPlugin::GetDefault()->GetPluginContext();
ctkServiceReference styleManagerRef = context->getServiceReference<berry::IQtStyleManager>();
if (styleManagerRef)
{
auto styleManager = context->getService<berry::IQtStyleManager>(styleManagerRef);
if (styleManager->GetStyle().name == "Dark") {
return QmitkChartWidget::ChartStyle::darkstyle;
}
else {
return QmitkChartWidget::ChartStyle::lightstyle;
}
}
return QmitkChartWidget::ChartStyle::darkstyle;
}