diff --git a/DataService.pro b/DataService.pro index 7d9cd69..df1f653 100644 --- a/DataService.pro +++ b/DataService.pro @@ -31,7 +31,10 @@ SOURCES += \ dataloader.cpp \ dataresult1d.cpp \ datarequest.cpp \ - converttoseries.cpp + converttoseries.cpp \ + chart.cpp \ + chartview.cpp \ + multichartview.cpp HEADERS += \ mainwindow.h \ @@ -40,9 +43,13 @@ HEADERS += \ dataloader.h \ dataresult1d.h \ datarequest.h \ - converttoseries.h + converttoseries.h \ + chart.h \ + chartview.h \ + multichartview.h FORMS += \ - mainwindow.ui + mainwindow.ui \ + multichartview.ui unix|win32: LIBS += -lnix diff --git a/DataService.pro.user b/DataService.pro.user index 1e348ad..caa6644 100644 --- a/DataService.pro.user +++ b/DataService.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {854dd791-5ef0-48c7-a29e-c0b69b1d5eac} + {8b523b8d-f5ce-4be4-a9bd-780a0aec766f} ProjectExplorer.Project.ActiveTarget @@ -59,14 +59,14 @@ ProjectExplorer.Project.Target.0 - Qt 5.10.1 (5.10.1) - Qt 5.10.1 (5.10.1) - {3a0db74d-7ece-40c0-8cf4-3c58a6999fdf} + Desktop + Desktop + {d7263c99-5355-4486-be71-56523c5d259f} 0 0 0 - /Users/jan/zwischenlager/threading_test/build-DataService-Qt_5_10_1_5_10_1-Debug + /home/grewe/zwischenlager/build-DataService-Desktop-Debug true @@ -112,7 +112,7 @@ 1 - Bereinigen + Clean ProjectExplorer.BuildSteps.Clean @@ -120,13 +120,13 @@ false Debug - + Debug Qt4ProjectManager.Qt4BuildConfiguration 2 true - /Users/jan/zwischenlager/threading_test/build-DataService-Qt_5_10_1_5_10_1-Release + /home/grewe/zwischenlager/build-DataService-Desktop-Release true @@ -172,7 +172,7 @@ 1 - Bereinigen + Clean ProjectExplorer.BuildSteps.Clean @@ -180,13 +180,13 @@ false Release - + Release Qt4ProjectManager.Qt4BuildConfiguration 0 true - /Users/jan/zwischenlager/threading_test/build-DataService-Qt_5_10_1_5_10_1-Profile + /home/grewe/zwischenlager/build-DataService-Desktop-Profile true @@ -232,7 +232,7 @@ 1 - Bereinigen + Clean ProjectExplorer.BuildSteps.Clean @@ -240,7 +240,7 @@ false Profile - + Profile Qt4ProjectManager.Qt4BuildConfiguration 0 true @@ -249,12 +249,12 @@ 0 - Deployment + Deploy ProjectExplorer.BuildSteps.Deploy 1 - Lokales Deployment + Deploy Configuration ProjectExplorer.DefaultDeployConfiguration @@ -300,12 +300,12 @@ 13 14 - 2 + -1 - %{buildDir} - Benutzerdefinierte ausführbare Datei + + ProjectExplorer.CustomExecutableRunConfiguration 3768 diff --git a/chartview.cpp b/chartview.cpp index c0dc152..3c5d125 100644 --- a/chartview.cpp +++ b/chartview.cpp @@ -7,7 +7,6 @@ ChartView::ChartView(QChart *chart, QWidget *parent) : m_isTouching(false) { setRubberBand(QChartView::RectangleRubberBand); - addScrollBarWidget(bar, Qt::AlignBottom); } diff --git a/mainwindow.cpp b/mainwindow.cpp index 2388b23..9331843 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -27,11 +27,11 @@ MainWindow::MainWindow(QWidget *parent) : dataQueue.start(); connect(ui->requestDataBtn, SIGNAL(clicked(bool)), this, SLOT(requestData())); - //file = nix::File::open("/home/grewe/zwischenlager/2017-08-17-af-invivo-1/2017-08-17-af-invivo-1.nix", - // nix::FileMode::ReadOnly); - - file = nix::File::open("/Users/jan/zwischenlager/threading_test/dataservice/data/2017-08-17-af-invivo-1.nix", + file = nix::File::open("/home/grewe/zwischenlager/2017-08-17-af-invivo-1/2017-08-17-af-invivo-1.nix", nix::FileMode::ReadOnly); + + //file = nix::File::open("/Users/jan/zwischenlager/threading_test/dataservice/data/2017-08-17-af-invivo-1.nix", + //nix::FileMode::ReadOnly); nix::Block b = file.getBlock(0); this->voltage = b.getDataArray("V-1"); this->eod = b.getDataArray("EOD"); diff --git a/multichartview.cpp b/multichartview.cpp new file mode 100644 index 0000000..cde59fc --- /dev/null +++ b/multichartview.cpp @@ -0,0 +1,12 @@ +#include "multichartview.h" +#include "ui_multichartview.h" + +MultiChartView::MultiChartView(QWidget *parent) : + QWidget(parent) +{ + +} + +void MultiChartView::addArray(const nix::DataArray &array) { + +} diff --git a/multichartview.h b/multichartview.h new file mode 100644 index 0000000..a00ee26 --- /dev/null +++ b/multichartview.h @@ -0,0 +1,16 @@ +#ifndef MULTICHARTVIEW_H +#define MULTICHARTVIEW_H + +#include +#include +class MultiChartView : public QWidget +{ +public: + MultiChartView(QWidget *parent = nullptr_t); + void addArray(const nix::DataArray &array); + +private: + std::vector arrays; +}; + +#endif // MULTICHARTWIDGET_H diff --git a/multichartview.ui b/multichartview.ui new file mode 100644 index 0000000..8fc389e --- /dev/null +++ b/multichartview.ui @@ -0,0 +1,31 @@ + + + Form + + + + 0 + 0 + 640 + 480 + + + + Form + + + + + + + + + Qt::Horizontal + + + + + + + +