Auto status change to "Under Review"
| @@ -21,6 +21,11 | |||||
| 21 | ----------------------------------------------------------------------------*/ |
|
21 | ----------------------------------------------------------------------------*/ | |
| 22 | #include "MainWindow.h" |
|
22 | #include "MainWindow.h" | |
| 23 | #include "ui_MainWindow.h" |
|
23 | #include "ui_MainWindow.h" | |
|
|
24 | ||||
|
|
25 | #include <DataSource/DataSourceController.h> | |||
|
|
26 | #include <DataSource/DataSourceWidget.h> | |||
|
|
27 | #include <SqpApplication.h> | |||
|
|
28 | ||||
| 24 | #include <QAction> |
|
29 | #include <QAction> | |
| 25 | #include <QDate> |
|
30 | #include <QDate> | |
| 26 | #include <QDateTime> |
|
31 | #include <QDateTime> | |
| @@ -57,6 +62,11 MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), m_Ui(new Ui::Main | |||||
| 57 | this->menuBar()->addAction("File"); |
|
62 | this->menuBar()->addAction("File"); | |
| 58 | auto mainToolBar = this->addToolBar("MainToolBar"); |
|
63 | auto mainToolBar = this->addToolBar("MainToolBar"); | |
| 59 | mainToolBar->addAction("A1"); |
|
64 | mainToolBar->addAction("A1"); | |
|
|
65 | ||||
|
|
66 | // Widgets / controllers connections | |||
|
|
67 | connect(&sqpApp->dataSourceController(), SIGNAL(dataSourceItemSet(DataSourceItem &)), | |||
|
|
68 | m_Ui->dataSourceWidget, SLOT(addDataSource(DataSourceItem &))); | |||
|
|
69 | ||||
| 60 | /* QLopGUI::registerMenuBar(menuBar()); |
|
70 | /* QLopGUI::registerMenuBar(menuBar()); | |
| 61 | this->setWindowIcon(QIcon(":/sciqlopLOGO.svg")); |
|
71 | this->setWindowIcon(QIcon(":/sciqlopLOGO.svg")); | |
| 62 | this->m_progressWidget = new QWidget(); |
|
72 | this->m_progressWidget = new QWidget(); | |
| @@ -49,7 +49,7 public slots: | |||||
| 49 |
|
49 | |||
| 50 | signals: |
|
50 | signals: | |
| 51 | /// Signal emitted when a structure has been set for a data source |
|
51 | /// Signal emitted when a structure has been set for a data source | |
| 52 |
void dataSourceItemSet( |
|
52 | void dataSourceItemSet(DataSourceItem &dataSourceItem); | |
| 53 |
|
53 | |||
| 54 | private: |
|
54 | private: | |
| 55 | void waitForFinish(); |
|
55 | void waitForFinish(); | |
General Comments 3
Pull request updated. Auto status change to "Under Review"
Changed commits: * 6 added * 3 removed Changed files: * A gui/src/Visualization/VisualizationWidget.cpp * A gui/include/SidePane/SqpSidePane.h * A gui/include/Visualization/VisualizationGraphWidget.h * A gui/include/Visualization/VisualizationTabWidget.h * A gui/include/Visualization/VisualizationWidget.h * A gui/include/Visualization/VisualizationZoneWidget.h * A gui/include/Visualization/qcustomplot.h * A gui/src/SidePane/SqpSidePane.cpp * A gui/src/Visualization/VisualizationGraphWidget.cpp * A gui/src/Visualization/VisualizationTabWidget.cpp * A gui/src/Visualization/VisualizationZoneWidget.cpp * A gui/src/Visualization/qcustomplot.cpp * M gui/include/DataSource/DataSourceWidget.h * M gui/src/DataSource/DataSourceTreeWidgetItem.cpp * M gui/src/DataSource/DataSourceWidget.cpp * M app/src/Main.cpp * M app/src/MainWindow.cpp * M app/ui/MainWindow.ui * M core/include/DataSource/DataSourceController.h * M core/src/DataSource/DataSourceController.cpp * M core/tests/DataSource/TestDataSourceController.cpp * M gui/ui/visualization/VisualizationWidget.ui * M gui/vera-exclusions/exclusions.txt * M gui/src/visualization/VisualizationWidget.cpp * R cmake/sciqlop_package_qt.cmake * R core/include/Plugin/PluginManager.h * R core/include/Visualization/VisualizationController.h * R core/src/Plugin/PluginManager.cpp * R core/src/Visualization/VisualizationController.cpp * R gui/include/sidepane/SqpSidePane.h * R gui/include/visualization/VisualizationGraphWidget.h * R gui/include/visualization/VisualizationTabWidget.h * R gui/include/visualization/VisualizationWidget.h * R gui/include/visualization/VisualizationZoneWidget.h * R gui/include/visualization/qcustomplot.h * R gui/src/sidepane/SqpSidePane.cpp * R gui/src/visualization/VisualizationGraphWidget.cpp * R gui/src/visualization/VisualizationTabWidget.cpp * R gui/src/visualization/VisualizationZoneWidget.cpp * R gui/src/visualization/qcustomplot.cpp * R gui/ui/sidepane/SqpSidePane.ui * R gui/ui/visualization/VisualizationGraphWidget.ui * R gui/ui/visualization/VisualizationTabWidget.ui * R gui/ui/visualization/VisualizationZoneWidget.ui * R plugin/CMakeLists.txt * R plugin/cmake/Findsciqlop-plugin.cmake * R plugin/include/Plugin/IPlugin.h * R app/CMakeLists.txt * R app/include/MainWindow.h * R app/vera-exclusions/exclusions.txt * R cmake/sciqlop_applications.cmake * R core/CMakeLists.txt * R core/include/Common/spimpl.h * R gui/CMakeLists.txt * R gui/include/SqpApplication.h * R gui/src/SqpApplication.cpp * R app/src/mainwindow.ui
You need to be logged in to leave comments.
Login now