From 83ac5037b4acb3736747c4a5f8472f71a42aefa5 Mon Sep 17 00:00:00 2001 From: Jan Grewe Date: Tue, 4 Sep 2018 11:09:10 +0200 Subject: [PATCH] [new class] --- multichartview.cpp | 10 +++++++++- multichartview.h | 17 +++++++++++++---- multichartview.ui | 8 ++++---- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/multichartview.cpp b/multichartview.cpp index cde59fc..624d268 100644 --- a/multichartview.cpp +++ b/multichartview.cpp @@ -1,12 +1,20 @@ #include "multichartview.h" #include "ui_multichartview.h" +#include "chartview.h" MultiChartView::MultiChartView(QWidget *parent) : - QWidget(parent) + QWidget(parent), + ui(new Ui::MultiChartView) { + ui->setupUi(this); +} +MultiChartView::~MultiChartView() +{ + delete ui; } + void MultiChartView::addArray(const nix::DataArray &array) { } diff --git a/multichartview.h b/multichartview.h index a00ee26..4964729 100644 --- a/multichartview.h +++ b/multichartview.h @@ -3,14 +3,23 @@ #include #include + +namespace Ui { +class MultiChartView; +} + class MultiChartView : public QWidget { + Q_OBJECT + public: - MultiChartView(QWidget *parent = nullptr_t); - void addArray(const nix::DataArray &array); + explicit MultiChartView(QWidget *parent = 0); + ~MultiChartView(); + void addArray(const nix::DataArray &array); private: - std::vector arrays; + Ui::MultiChartView *ui; + double xRangeMin, xRangeMax; }; -#endif // MULTICHARTWIDGET_H +#endif // MULTICHARTVIEW_H diff --git a/multichartview.ui b/multichartview.ui index 8fc389e..0121cc8 100644 --- a/multichartview.ui +++ b/multichartview.ui @@ -1,7 +1,7 @@ - Form - + MultiChartView + 0 @@ -13,12 +13,12 @@ Form - + - + Qt::Horizontal