Auto status change to "Under Review"
1 | NO CONTENT: new file 100644, binary diff hidden |
|
NO CONTENT: new file 100644, binary diff hidden |
1 | NO CONTENT: new file 100644, binary diff hidden |
|
NO CONTENT: new file 100644, binary diff hidden |
1 | NO CONTENT: new file 100644, binary diff hidden |
|
NO CONTENT: new file 100644, binary diff hidden |
1 | NO CONTENT: new file 100644, binary diff hidden |
|
NO CONTENT: new file 100644, binary diff hidden |
1 | NO CONTENT: new file 100644, binary diff hidden |
|
NO CONTENT: new file 100644, binary diff hidden |
@@ -1,254 +1,353 | |||||
1 | /*------------------------------------------------------------------------------ |
|
1 | /*------------------------------------------------------------------------------ | |
2 | -- This file is a part of the SciQLop Software |
|
2 | -- This file is a part of the SciQLop Software | |
3 | -- Copyright (C) 2017, Plasma Physics Laboratory - CNRS |
|
3 | -- Copyright (C) 2017, Plasma Physics Laboratory - CNRS | |
4 | -- |
|
4 | -- | |
5 | -- This program is free software; you can redistribute it and/or modify |
|
5 | -- This program is free software; you can redistribute it and/or modify | |
6 | -- it under the terms of the GNU General Public License as published by |
|
6 | -- it under the terms of the GNU General Public License as published by | |
7 | -- the Free Software Foundation; either version 2 of the License, or |
|
7 | -- the Free Software Foundation; either version 2 of the License, or | |
8 | -- (at your option) any later version. |
|
8 | -- (at your option) any later version. | |
9 | -- |
|
9 | -- | |
10 | -- This program is distributed in the hope that it will be useful, |
|
10 | -- This program is distributed in the hope that it will be useful, | |
11 | -- but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
11 | -- but WITHOUT ANY WARRANTY; without even the implied warranty of | |
12 | -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
12 | -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
13 | -- GNU General Public License for more details. |
|
13 | -- GNU General Public License for more details. | |
14 | -- |
|
14 | -- | |
15 | -- You should have received a copy of the GNU General Public License |
|
15 | -- You should have received a copy of the GNU General Public License | |
16 | -- along with this program; if not, write to the Free Software |
|
16 | -- along with this program; if not, write to the Free Software | |
17 | -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
|
17 | -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
18 | -------------------------------------------------------------------------------*/ |
|
18 | -------------------------------------------------------------------------------*/ | |
19 | /*-- Author : Alexis Jeandet |
|
19 | /*-- Author : Alexis Jeandet | |
20 | -- Mail : alexis.jeandet@member.fsf.org |
|
20 | -- Mail : alexis.jeandet@member.fsf.org | |
21 | ----------------------------------------------------------------------------*/ |
|
21 | ----------------------------------------------------------------------------*/ | |
22 | #include "MainWindow.h" |
|
22 | #include "MainWindow.h" | |
23 | #include "ui_MainWindow.h" |
|
23 | #include "ui_MainWindow.h" | |
24 |
|
24 | |||
25 | #include <DataSource/DataSourceController.h> |
|
25 | #include <DataSource/DataSourceController.h> | |
26 | #include <DataSource/DataSourceWidget.h> |
|
26 | #include <DataSource/DataSourceWidget.h> | |
27 | #include <Settings/SqpSettingsDialog.h> |
|
27 | #include <Settings/SqpSettingsDialog.h> | |
28 | #include <Settings/SqpSettingsGeneralWidget.h> |
|
28 | #include <Settings/SqpSettingsGeneralWidget.h> | |
29 | #include <SidePane/SqpSidePane.h> |
|
29 | #include <SidePane/SqpSidePane.h> | |
30 | #include <SqpApplication.h> |
|
30 | #include <SqpApplication.h> | |
31 | #include <Time/TimeController.h> |
|
31 | #include <Time/TimeController.h> | |
32 | #include <TimeWidget/TimeWidget.h> |
|
32 | #include <TimeWidget/TimeWidget.h> | |
33 | #include <Variable/Variable.h> |
|
33 | #include <Variable/Variable.h> | |
34 | #include <Variable/VariableController.h> |
|
34 | #include <Variable/VariableController.h> | |
35 | #include <Visualization/VisualizationController.h> |
|
35 | #include <Visualization/VisualizationController.h> | |
36 |
|
36 | |||
37 | #include <QAction> |
|
37 | #include <QAction> | |
38 | #include <QDate> |
|
38 | #include <QDate> | |
39 | #include <QDir> |
|
39 | #include <QDir> | |
40 | #include <QFileDialog> |
|
40 | #include <QFileDialog> | |
41 | #include <QToolBar> |
|
41 | #include <QToolBar> | |
42 | #include <QToolButton> |
|
42 | #include <QToolButton> | |
43 | #include <memory.h> |
|
43 | #include <memory.h> | |
44 |
|
44 | |||
45 | #include "iostream" |
|
45 | #include "iostream" | |
46 |
|
46 | |||
47 | Q_LOGGING_CATEGORY(LOG_MainWindow, "MainWindow") |
|
47 | Q_LOGGING_CATEGORY(LOG_MainWindow, "MainWindow") | |
48 |
|
48 | |||
49 | namespace { |
|
49 | namespace { | |
50 | const auto LEFTMAININSPECTORWIDGETSPLITTERINDEX = 0; |
|
50 | const auto LEFTMAININSPECTORWIDGETSPLITTERINDEX = 0; | |
51 | const auto LEFTINSPECTORSIDEPANESPLITTERINDEX = 1; |
|
51 | const auto LEFTINSPECTORSIDEPANESPLITTERINDEX = 1; | |
52 | const auto VIEWPLITTERINDEX = 2; |
|
52 | const auto VIEWPLITTERINDEX = 2; | |
53 | const auto RIGHTINSPECTORSIDEPANESPLITTERINDEX = 3; |
|
53 | const auto RIGHTINSPECTORSIDEPANESPLITTERINDEX = 3; | |
54 | const auto RIGHTMAININSPECTORWIDGETSPLITTERINDEX = 4; |
|
54 | const auto RIGHTMAININSPECTORWIDGETSPLITTERINDEX = 4; | |
55 | } |
|
55 | } | |
56 |
|
56 | |||
57 | class MainWindow::MainWindowPrivate { |
|
57 | class MainWindow::MainWindowPrivate { | |
58 | public: |
|
58 | public: | |
59 | explicit MainWindowPrivate(MainWindow *mainWindow) |
|
59 | explicit MainWindowPrivate(MainWindow *mainWindow) | |
60 | : m_LastOpenLeftInspectorSize{}, |
|
60 | : m_LastOpenLeftInspectorSize{}, | |
61 | m_LastOpenRightInspectorSize{}, |
|
61 | m_LastOpenRightInspectorSize{}, | |
62 | m_GeneralSettingsWidget{new SqpSettingsGeneralWidget{mainWindow}}, |
|
62 | m_GeneralSettingsWidget{new SqpSettingsGeneralWidget{mainWindow}}, | |
63 | m_SettingsDialog{new SqpSettingsDialog{mainWindow}} |
|
63 | m_SettingsDialog{new SqpSettingsDialog{mainWindow}} | |
64 | { |
|
64 | { | |
65 | } |
|
65 | } | |
66 |
|
66 | |||
67 | QSize m_LastOpenLeftInspectorSize; |
|
67 | QSize m_LastOpenLeftInspectorSize; | |
68 | QSize m_LastOpenRightInspectorSize; |
|
68 | QSize m_LastOpenRightInspectorSize; | |
69 | /// General settings widget. MainWindow has the ownership |
|
69 | /// General settings widget. MainWindow has the ownership | |
70 | SqpSettingsGeneralWidget *m_GeneralSettingsWidget; |
|
70 | SqpSettingsGeneralWidget *m_GeneralSettingsWidget; | |
71 | /// Settings dialog. MainWindow has the ownership |
|
71 | /// Settings dialog. MainWindow has the ownership | |
72 | SqpSettingsDialog *m_SettingsDialog; |
|
72 | SqpSettingsDialog *m_SettingsDialog; | |
73 | }; |
|
73 | }; | |
74 |
|
74 | |||
75 | MainWindow::MainWindow(QWidget *parent) |
|
75 | MainWindow::MainWindow(QWidget *parent) | |
76 | : QMainWindow{parent}, |
|
76 | : QMainWindow{parent}, | |
77 | m_Ui{new Ui::MainWindow}, |
|
77 | m_Ui{new Ui::MainWindow}, | |
78 | impl{spimpl::make_unique_impl<MainWindowPrivate>(this)} |
|
78 | impl{spimpl::make_unique_impl<MainWindowPrivate>(this)} | |
79 | { |
|
79 | { | |
80 | m_Ui->setupUi(this); |
|
80 | m_Ui->setupUi(this); | |
81 |
|
81 | |||
82 | m_Ui->splitter->setCollapsible(LEFTINSPECTORSIDEPANESPLITTERINDEX, false); |
|
82 | m_Ui->splitter->setCollapsible(LEFTINSPECTORSIDEPANESPLITTERINDEX, false); | |
83 | m_Ui->splitter->setCollapsible(RIGHTINSPECTORSIDEPANESPLITTERINDEX, false); |
|
83 | m_Ui->splitter->setCollapsible(RIGHTINSPECTORSIDEPANESPLITTERINDEX, false); | |
84 |
|
84 | |||
85 |
|
85 | |||
86 | auto leftSidePane = m_Ui->leftInspectorSidePane->sidePane(); |
|
86 | auto leftSidePane = m_Ui->leftInspectorSidePane->sidePane(); | |
87 | auto openLeftInspectorAction = new QAction{QIcon{ |
|
87 | auto openLeftInspectorAction = new QAction{QIcon{ | |
88 | ":/icones/previous.png", |
|
88 | ":/icones/previous.png", | |
89 | }, |
|
89 | }, | |
90 | tr("Show/hide the left inspector"), this}; |
|
90 | tr("Show/hide the left inspector"), this}; | |
91 |
|
91 | |||
92 |
|
92 | |||
93 | auto spacerLeftTop = new QWidget{}; |
|
93 | auto spacerLeftTop = new QWidget{}; | |
94 | spacerLeftTop->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); |
|
94 | spacerLeftTop->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); | |
95 |
|
95 | |||
96 | auto spacerLeftBottom = new QWidget{}; |
|
96 | auto spacerLeftBottom = new QWidget{}; | |
97 | spacerLeftBottom->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); |
|
97 | spacerLeftBottom->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); | |
98 |
|
98 | |||
99 | leftSidePane->addWidget(spacerLeftTop); |
|
99 | leftSidePane->addWidget(spacerLeftTop); | |
100 | leftSidePane->addAction(openLeftInspectorAction); |
|
100 | leftSidePane->addAction(openLeftInspectorAction); | |
101 | leftSidePane->addWidget(spacerLeftBottom); |
|
101 | leftSidePane->addWidget(spacerLeftBottom); | |
102 |
|
102 | |||
103 |
|
103 | |||
104 | auto rightSidePane = m_Ui->rightInspectorSidePane->sidePane(); |
|
104 | auto rightSidePane = m_Ui->rightInspectorSidePane->sidePane(); | |
105 | auto openRightInspectorAction = new QAction{QIcon{ |
|
105 | auto openRightInspectorAction = new QAction{QIcon{ | |
106 | ":/icones/next.png", |
|
106 | ":/icones/next.png", | |
107 | }, |
|
107 | }, | |
108 | tr("Show/hide the right inspector"), this}; |
|
108 | tr("Show/hide the right inspector"), this}; | |
109 |
|
109 | |||
110 | auto spacerRightTop = new QWidget{}; |
|
110 | auto spacerRightTop = new QWidget{}; | |
111 | spacerRightTop->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); |
|
111 | spacerRightTop->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); | |
112 |
|
112 | |||
113 | auto spacerRightBottom = new QWidget{}; |
|
113 | auto spacerRightBottom = new QWidget{}; | |
114 | spacerRightBottom->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); |
|
114 | spacerRightBottom->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); | |
115 |
|
115 | |||
116 | rightSidePane->addWidget(spacerRightTop); |
|
116 | rightSidePane->addWidget(spacerRightTop); | |
117 | rightSidePane->addAction(openRightInspectorAction); |
|
117 | rightSidePane->addAction(openRightInspectorAction); | |
118 | rightSidePane->addWidget(spacerRightBottom); |
|
118 | rightSidePane->addWidget(spacerRightBottom); | |
119 |
|
119 | |||
120 | openLeftInspectorAction->setCheckable(true); |
|
120 | openLeftInspectorAction->setCheckable(true); | |
121 | openRightInspectorAction->setCheckable(true); |
|
121 | openRightInspectorAction->setCheckable(true); | |
122 |
|
122 | |||
123 | auto openInspector = [this](bool checked, bool right, auto action) { |
|
123 | auto openInspector = [this](bool checked, bool right, auto action) { | |
124 |
|
124 | |||
125 | action->setIcon(QIcon{(checked xor right) ? ":/icones/next.png" : ":/icones/previous.png"}); |
|
125 | action->setIcon(QIcon{(checked xor right) ? ":/icones/next.png" : ":/icones/previous.png"}); | |
126 |
|
126 | |||
127 | auto &lastInspectorSize |
|
127 | auto &lastInspectorSize | |
128 | = right ? impl->m_LastOpenRightInspectorSize : impl->m_LastOpenLeftInspectorSize; |
|
128 | = right ? impl->m_LastOpenRightInspectorSize : impl->m_LastOpenLeftInspectorSize; | |
129 |
|
129 | |||
130 | auto nextInspectorSize = right ? m_Ui->rightMainInspectorWidget->size() |
|
130 | auto nextInspectorSize = right ? m_Ui->rightMainInspectorWidget->size() | |
131 | : m_Ui->leftMainInspectorWidget->size(); |
|
131 | : m_Ui->leftMainInspectorWidget->size(); | |
132 |
|
132 | |||
133 | // Update of the last opened geometry |
|
133 | // Update of the last opened geometry | |
134 | if (checked) { |
|
134 | if (checked) { | |
135 | lastInspectorSize = nextInspectorSize; |
|
135 | lastInspectorSize = nextInspectorSize; | |
136 | } |
|
136 | } | |
137 |
|
137 | |||
138 | auto startSize = lastInspectorSize; |
|
138 | auto startSize = lastInspectorSize; | |
139 | auto endSize = startSize; |
|
139 | auto endSize = startSize; | |
140 | endSize.setWidth(0); |
|
140 | endSize.setWidth(0); | |
141 |
|
141 | |||
142 | auto splitterInspectorIndex |
|
142 | auto splitterInspectorIndex | |
143 | = right ? RIGHTMAININSPECTORWIDGETSPLITTERINDEX : LEFTMAININSPECTORWIDGETSPLITTERINDEX; |
|
143 | = right ? RIGHTMAININSPECTORWIDGETSPLITTERINDEX : LEFTMAININSPECTORWIDGETSPLITTERINDEX; | |
144 |
|
144 | |||
145 | auto currentSizes = m_Ui->splitter->sizes(); |
|
145 | auto currentSizes = m_Ui->splitter->sizes(); | |
146 | if (checked) { |
|
146 | if (checked) { | |
147 | // adjust sizes individually here, e.g. |
|
147 | // adjust sizes individually here, e.g. | |
148 | currentSizes[splitterInspectorIndex] -= lastInspectorSize.width(); |
|
148 | currentSizes[splitterInspectorIndex] -= lastInspectorSize.width(); | |
149 | currentSizes[VIEWPLITTERINDEX] += lastInspectorSize.width(); |
|
149 | currentSizes[VIEWPLITTERINDEX] += lastInspectorSize.width(); | |
150 | m_Ui->splitter->setSizes(currentSizes); |
|
150 | m_Ui->splitter->setSizes(currentSizes); | |
151 | } |
|
151 | } | |
152 | else { |
|
152 | else { | |
153 | // adjust sizes individually here, e.g. |
|
153 | // adjust sizes individually here, e.g. | |
154 | currentSizes[splitterInspectorIndex] += lastInspectorSize.width(); |
|
154 | currentSizes[splitterInspectorIndex] += lastInspectorSize.width(); | |
155 | currentSizes[VIEWPLITTERINDEX] -= lastInspectorSize.width(); |
|
155 | currentSizes[VIEWPLITTERINDEX] -= lastInspectorSize.width(); | |
156 | m_Ui->splitter->setSizes(currentSizes); |
|
156 | m_Ui->splitter->setSizes(currentSizes); | |
157 | } |
|
157 | } | |
158 |
|
158 | |||
159 | }; |
|
159 | }; | |
160 |
|
160 | |||
161 |
|
161 | |||
162 | connect(openLeftInspectorAction, &QAction::triggered, |
|
162 | connect(openLeftInspectorAction, &QAction::triggered, | |
163 | [openInspector, openLeftInspectorAction](bool checked) { |
|
163 | [openInspector, openLeftInspectorAction](bool checked) { | |
164 | openInspector(checked, false, openLeftInspectorAction); |
|
164 | openInspector(checked, false, openLeftInspectorAction); | |
165 | }); |
|
165 | }); | |
166 | connect(openRightInspectorAction, &QAction::triggered, |
|
166 | connect(openRightInspectorAction, &QAction::triggered, | |
167 | [openInspector, openRightInspectorAction](bool checked) { |
|
167 | [openInspector, openRightInspectorAction](bool checked) { | |
168 | openInspector(checked, true, openRightInspectorAction); |
|
168 | openInspector(checked, true, openRightInspectorAction); | |
169 | }); |
|
169 | }); | |
170 |
|
170 | |||
171 | // //// // |
|
171 | // //////////////// // | |
172 | // Menu // |
|
172 | // Menu and Toolbar // | |
173 | // //// // |
|
173 | // //////////////// // | |
174 | this->menuBar()->addAction(tr("File")); |
|
174 | this->menuBar()->addAction(tr("File")); | |
175 | auto toolsMenu = this->menuBar()->addMenu(tr("Tools")); |
|
175 | auto toolsMenu = this->menuBar()->addMenu(tr("Tools")); | |
176 | toolsMenu->addAction(tr("Settings..."), [this]() { |
|
176 | toolsMenu->addAction(tr("Settings..."), [this]() { | |
177 | // Loads settings |
|
177 | // Loads settings | |
178 | impl->m_SettingsDialog->loadSettings(); |
|
178 | impl->m_SettingsDialog->loadSettings(); | |
179 |
|
179 | |||
180 | // Open settings dialog and save settings if the dialog is accepted |
|
180 | // Open settings dialog and save settings if the dialog is accepted | |
181 | if (impl->m_SettingsDialog->exec() == QDialog::Accepted) { |
|
181 | if (impl->m_SettingsDialog->exec() == QDialog::Accepted) { | |
182 | impl->m_SettingsDialog->saveSettings(); |
|
182 | impl->m_SettingsDialog->saveSettings(); | |
183 | } |
|
183 | } | |
184 |
|
184 | |||
185 | }); |
|
185 | }); | |
186 |
|
186 | |||
187 | auto mainToolBar = this->addToolBar(QStringLiteral("MainToolBar")); |
|
187 | auto mainToolBar = this->addToolBar(QStringLiteral("MainToolBar")); | |
188 |
|
188 | |||
189 | auto timeWidget = new TimeWidget{}; |
|
189 | auto timeWidget = new TimeWidget{}; | |
190 | mainToolBar->addWidget(timeWidget); |
|
190 | mainToolBar->addWidget(timeWidget); | |
191 |
|
191 | |||
|
192 | auto actionPointerMode = new QAction{QIcon(":/icones/pointer.png"), "Pointer", this}; | |||
|
193 | actionPointerMode->setCheckable(true); | |||
|
194 | actionPointerMode->setChecked(sqpApp->plotsInteractionMode() | |||
|
195 | == SqpApplication::PlotsInteractionMode::None); | |||
|
196 | connect(actionPointerMode, &QAction::triggered, | |||
|
197 | []() { sqpApp->setPlotsInteractionMode(SqpApplication::PlotsInteractionMode::None); }); | |||
|
198 | ||||
|
199 | auto actionZoomMode = new QAction{QIcon(":/icones/zoom.png"), "Zoom", this}; | |||
|
200 | actionZoomMode->setCheckable(true); | |||
|
201 | actionZoomMode->setChecked(sqpApp->plotsInteractionMode() | |||
|
202 | == SqpApplication::PlotsInteractionMode::ZoomBox); | |||
|
203 | connect(actionZoomMode, &QAction::triggered, []() { | |||
|
204 | sqpApp->setPlotsInteractionMode(SqpApplication::PlotsInteractionMode::ZoomBox); | |||
|
205 | }); | |||
|
206 | ||||
|
207 | auto actionOrganisationMode = new QAction{QIcon(":/icones/drag.png"), "Organize", this}; | |||
|
208 | actionOrganisationMode->setCheckable(true); | |||
|
209 | actionOrganisationMode->setChecked(sqpApp->plotsInteractionMode() | |||
|
210 | == SqpApplication::PlotsInteractionMode::DragAndDrop); | |||
|
211 | connect(actionOrganisationMode, &QAction::triggered, []() { | |||
|
212 | sqpApp->setPlotsInteractionMode(SqpApplication::PlotsInteractionMode::DragAndDrop); | |||
|
213 | }); | |||
|
214 | ||||
|
215 | auto actionZonesMode = new QAction{QIcon(":/icones/rectangle.png"), "Zones", this}; | |||
|
216 | actionZonesMode->setCheckable(true); | |||
|
217 | actionZonesMode->setChecked(sqpApp->plotsInteractionMode() | |||
|
218 | == SqpApplication::PlotsInteractionMode::SelectionZones); | |||
|
219 | connect(actionZonesMode, &QAction::triggered, []() { | |||
|
220 | sqpApp->setPlotsInteractionMode(SqpApplication::PlotsInteractionMode::SelectionZones); | |||
|
221 | }); | |||
|
222 | ||||
|
223 | auto modeActionGroup = new QActionGroup{this}; | |||
|
224 | modeActionGroup->addAction(actionZoomMode); | |||
|
225 | modeActionGroup->addAction(actionZonesMode); | |||
|
226 | modeActionGroup->addAction(actionOrganisationMode); | |||
|
227 | modeActionGroup->addAction(actionPointerMode); | |||
|
228 | modeActionGroup->setExclusive(true); | |||
|
229 | ||||
|
230 | mainToolBar->addSeparator(); | |||
|
231 | mainToolBar->addAction(actionPointerMode); | |||
|
232 | mainToolBar->addAction(actionZoomMode); | |||
|
233 | mainToolBar->addAction(actionOrganisationMode); | |||
|
234 | mainToolBar->addAction(actionZonesMode); | |||
|
235 | mainToolBar->addSeparator(); | |||
|
236 | ||||
|
237 | auto btnCursor = new QToolButton{this}; | |||
|
238 | btnCursor->setIcon(QIcon(":/icones/cursor.png")); | |||
|
239 | btnCursor->setText("Cursor"); | |||
|
240 | btnCursor->setToolTip("Cursor"); | |||
|
241 | btnCursor->setPopupMode(QToolButton::InstantPopup); | |||
|
242 | auto cursorMenu = new QMenu("CursorMenu", this); | |||
|
243 | btnCursor->setMenu(cursorMenu); | |||
|
244 | ||||
|
245 | auto noCursorAction = cursorMenu->addAction("No Cursor"); | |||
|
246 | noCursorAction->setCheckable(true); | |||
|
247 | noCursorAction->setChecked(sqpApp->plotsCursorMode() | |||
|
248 | == SqpApplication::PlotsCursorMode::NoCursor); | |||
|
249 | connect(noCursorAction, &QAction::triggered, | |||
|
250 | []() { sqpApp->setPlotsCursorMode(SqpApplication::PlotsCursorMode::NoCursor); }); | |||
|
251 | ||||
|
252 | cursorMenu->addSeparator(); | |||
|
253 | auto verticalCursorAction = cursorMenu->addAction("Vertical Cursor"); | |||
|
254 | verticalCursorAction->setCheckable(true); | |||
|
255 | verticalCursorAction->setChecked(sqpApp->plotsCursorMode() | |||
|
256 | == SqpApplication::PlotsCursorMode::Vertical); | |||
|
257 | connect(verticalCursorAction, &QAction::triggered, | |||
|
258 | []() { sqpApp->setPlotsCursorMode(SqpApplication::PlotsCursorMode::Vertical); }); | |||
|
259 | ||||
|
260 | auto temporalCursorAction = cursorMenu->addAction("Temporal Cursor"); | |||
|
261 | temporalCursorAction->setCheckable(true); | |||
|
262 | temporalCursorAction->setChecked(sqpApp->plotsCursorMode() | |||
|
263 | == SqpApplication::PlotsCursorMode::Temporal); | |||
|
264 | connect(temporalCursorAction, &QAction::triggered, | |||
|
265 | []() { sqpApp->setPlotsCursorMode(SqpApplication::PlotsCursorMode::Temporal); }); | |||
|
266 | ||||
|
267 | auto horizontalCursorAction = cursorMenu->addAction("Horizontal Cursor"); | |||
|
268 | horizontalCursorAction->setCheckable(true); | |||
|
269 | horizontalCursorAction->setChecked(sqpApp->plotsCursorMode() | |||
|
270 | == SqpApplication::PlotsCursorMode::Horizontal); | |||
|
271 | connect(horizontalCursorAction, &QAction::triggered, | |||
|
272 | []() { sqpApp->setPlotsCursorMode(SqpApplication::PlotsCursorMode::Horizontal); }); | |||
|
273 | ||||
|
274 | auto crossCursorAction = cursorMenu->addAction("Cross Cursor"); | |||
|
275 | crossCursorAction->setCheckable(true); | |||
|
276 | crossCursorAction->setChecked(sqpApp->plotsCursorMode() | |||
|
277 | == SqpApplication::PlotsCursorMode::Cross); | |||
|
278 | connect(crossCursorAction, &QAction::triggered, | |||
|
279 | []() { sqpApp->setPlotsCursorMode(SqpApplication::PlotsCursorMode::Cross); }); | |||
|
280 | ||||
|
281 | mainToolBar->addWidget(btnCursor); | |||
|
282 | ||||
|
283 | auto cursorModeActionGroup = new QActionGroup{this}; | |||
|
284 | cursorModeActionGroup->setExclusive(true); | |||
|
285 | cursorModeActionGroup->addAction(noCursorAction); | |||
|
286 | cursorModeActionGroup->addAction(verticalCursorAction); | |||
|
287 | cursorModeActionGroup->addAction(temporalCursorAction); | |||
|
288 | cursorModeActionGroup->addAction(horizontalCursorAction); | |||
|
289 | cursorModeActionGroup->addAction(crossCursorAction); | |||
|
290 | ||||
192 | // //////// // |
|
291 | // //////// // | |
193 | // Settings // |
|
292 | // Settings // | |
194 | // //////// // |
|
293 | // //////// // | |
195 |
|
294 | |||
196 | // Registers "general settings" widget to the settings dialog |
|
295 | // Registers "general settings" widget to the settings dialog | |
197 | impl->m_SettingsDialog->registerWidget(QStringLiteral("General"), |
|
296 | impl->m_SettingsDialog->registerWidget(QStringLiteral("General"), | |
198 | impl->m_GeneralSettingsWidget); |
|
297 | impl->m_GeneralSettingsWidget); | |
199 |
|
298 | |||
200 | // /////////// // |
|
299 | // /////////// // | |
201 | // Connections // |
|
300 | // Connections // | |
202 | // /////////// // |
|
301 | // /////////// // | |
203 |
|
302 | |||
204 | // Controllers / controllers connections |
|
303 | // Controllers / controllers connections | |
205 | connect(&sqpApp->timeController(), SIGNAL(timeUpdated(SqpRange)), &sqpApp->variableController(), |
|
304 | connect(&sqpApp->timeController(), SIGNAL(timeUpdated(SqpRange)), &sqpApp->variableController(), | |
206 | SLOT(onDateTimeOnSelection(SqpRange))); |
|
305 | SLOT(onDateTimeOnSelection(SqpRange))); | |
207 |
|
306 | |||
208 | // Widgets / controllers connections |
|
307 | // Widgets / controllers connections | |
209 |
|
308 | |||
210 | // DataSource |
|
309 | // DataSource | |
211 | connect(&sqpApp->dataSourceController(), SIGNAL(dataSourceItemSet(DataSourceItem *)), |
|
310 | connect(&sqpApp->dataSourceController(), SIGNAL(dataSourceItemSet(DataSourceItem *)), | |
212 | m_Ui->dataSourceWidget, SLOT(addDataSource(DataSourceItem *))); |
|
311 | m_Ui->dataSourceWidget, SLOT(addDataSource(DataSourceItem *))); | |
213 |
|
312 | |||
214 | // Time |
|
313 | // Time | |
215 | connect(timeWidget, SIGNAL(timeUpdated(SqpRange)), &sqpApp->timeController(), |
|
314 | connect(timeWidget, SIGNAL(timeUpdated(SqpRange)), &sqpApp->timeController(), | |
216 | SLOT(onTimeToUpdate(SqpRange))); |
|
315 | SLOT(onTimeToUpdate(SqpRange))); | |
217 |
|
316 | |||
218 | // Visualization |
|
317 | // Visualization | |
219 | connect(&sqpApp->visualizationController(), |
|
318 | connect(&sqpApp->visualizationController(), | |
220 | SIGNAL(variableAboutToBeDeleted(std::shared_ptr<Variable>)), m_Ui->view, |
|
319 | SIGNAL(variableAboutToBeDeleted(std::shared_ptr<Variable>)), m_Ui->view, | |
221 | SLOT(onVariableAboutToBeDeleted(std::shared_ptr<Variable>))); |
|
320 | SLOT(onVariableAboutToBeDeleted(std::shared_ptr<Variable>))); | |
222 |
|
321 | |||
223 | connect(&sqpApp->visualizationController(), |
|
322 | connect(&sqpApp->visualizationController(), | |
224 | SIGNAL(rangeChanged(std::shared_ptr<Variable>, const SqpRange &)), m_Ui->view, |
|
323 | SIGNAL(rangeChanged(std::shared_ptr<Variable>, const SqpRange &)), m_Ui->view, | |
225 | SLOT(onRangeChanged(std::shared_ptr<Variable>, const SqpRange &))); |
|
324 | SLOT(onRangeChanged(std::shared_ptr<Variable>, const SqpRange &))); | |
226 |
|
325 | |||
227 | // Widgets / widgets connections |
|
326 | // Widgets / widgets connections | |
228 |
|
327 | |||
229 | // For the following connections, we use DirectConnection to allow each widget that can |
|
328 | // For the following connections, we use DirectConnection to allow each widget that can | |
230 | // potentially attach a menu to the variable's menu to do so before this menu is displayed. |
|
329 | // potentially attach a menu to the variable's menu to do so before this menu is displayed. | |
231 | // The order of connections is also important, since it determines the order in which each |
|
330 | // The order of connections is also important, since it determines the order in which each | |
232 | // widget will attach its menu |
|
331 | // widget will attach its menu | |
233 | connect( |
|
332 | connect( | |
234 | m_Ui->variableInspectorWidget, |
|
333 | m_Ui->variableInspectorWidget, | |
235 | SIGNAL(tableMenuAboutToBeDisplayed(QMenu *, const QVector<std::shared_ptr<Variable> > &)), |
|
334 | SIGNAL(tableMenuAboutToBeDisplayed(QMenu *, const QVector<std::shared_ptr<Variable> > &)), | |
236 | m_Ui->view, SLOT(attachVariableMenu(QMenu *, const QVector<std::shared_ptr<Variable> > &)), |
|
335 | m_Ui->view, SLOT(attachVariableMenu(QMenu *, const QVector<std::shared_ptr<Variable> > &)), | |
237 | Qt::DirectConnection); |
|
336 | Qt::DirectConnection); | |
238 | } |
|
337 | } | |
239 |
|
338 | |||
240 | MainWindow::~MainWindow() |
|
339 | MainWindow::~MainWindow() | |
241 | { |
|
340 | { | |
242 | } |
|
341 | } | |
243 |
|
342 | |||
244 | void MainWindow::changeEvent(QEvent *e) |
|
343 | void MainWindow::changeEvent(QEvent *e) | |
245 | { |
|
344 | { | |
246 | QMainWindow::changeEvent(e); |
|
345 | QMainWindow::changeEvent(e); | |
247 | switch (e->type()) { |
|
346 | switch (e->type()) { | |
248 | case QEvent::LanguageChange: |
|
347 | case QEvent::LanguageChange: | |
249 | m_Ui->retranslateUi(this); |
|
348 | m_Ui->retranslateUi(this); | |
250 | break; |
|
349 | break; | |
251 | default: |
|
350 | default: | |
252 | break; |
|
351 | break; | |
253 | } |
|
352 | } | |
254 | } |
|
353 | } |
@@ -1,57 +1,67 | |||||
1 | #ifndef SCIQLOP_SQPAPPLICATION_H |
|
1 | #ifndef SCIQLOP_SQPAPPLICATION_H | |
2 | #define SCIQLOP_SQPAPPLICATION_H |
|
2 | #define SCIQLOP_SQPAPPLICATION_H | |
3 |
|
3 | |||
4 | #include "SqpApplication.h" |
|
4 | #include "SqpApplication.h" | |
5 |
|
5 | |||
6 | #include <QApplication> |
|
6 | #include <QApplication> | |
7 | #include <QLoggingCategory> |
|
7 | #include <QLoggingCategory> | |
8 |
|
8 | |||
9 | #include <Common/spimpl.h> |
|
9 | #include <Common/spimpl.h> | |
10 |
|
10 | |||
11 | Q_DECLARE_LOGGING_CATEGORY(LOG_SqpApplication) |
|
11 | Q_DECLARE_LOGGING_CATEGORY(LOG_SqpApplication) | |
12 |
|
12 | |||
13 | #if defined(sqpApp) |
|
13 | #if defined(sqpApp) | |
14 | #undef sqpApp |
|
14 | #undef sqpApp | |
15 | #endif |
|
15 | #endif | |
16 | #define sqpApp (static_cast<SqpApplication *>(QCoreApplication::instance())) |
|
16 | #define sqpApp (static_cast<SqpApplication *>(QCoreApplication::instance())) | |
17 |
|
17 | |||
18 | class DataSourceController; |
|
18 | class DataSourceController; | |
19 | class NetworkController; |
|
19 | class NetworkController; | |
20 | class TimeController; |
|
20 | class TimeController; | |
21 | class VariableController; |
|
21 | class VariableController; | |
22 | class VisualizationController; |
|
22 | class VisualizationController; | |
23 | class DragDropHelper; |
|
23 | class DragDropHelper; | |
24 |
|
24 | |||
25 | /** |
|
25 | /** | |
26 | * @brief The SqpApplication class aims to make the link between SciQlop |
|
26 | * @brief The SqpApplication class aims to make the link between SciQlop | |
27 | * and its plugins. This is the intermediate class that SciQlop has to use |
|
27 | * and its plugins. This is the intermediate class that SciQlop has to use | |
28 | * in the way to connect a data source. Please first use load method to initialize |
|
28 | * in the way to connect a data source. Please first use load method to initialize | |
29 | * a plugin specified by its metadata name (JSON plugin source) then others specifics |
|
29 | * a plugin specified by its metadata name (JSON plugin source) then others specifics | |
30 | * method will be able to access it. |
|
30 | * method will be able to access it. | |
31 | * You can load a data source driver plugin then create a data source. |
|
31 | * You can load a data source driver plugin then create a data source. | |
32 | */ |
|
32 | */ | |
33 |
|
33 | |||
34 | class SqpApplication : public QApplication { |
|
34 | class SqpApplication : public QApplication { | |
35 | Q_OBJECT |
|
35 | Q_OBJECT | |
36 | public: |
|
36 | public: | |
37 | explicit SqpApplication(int &argc, char **argv); |
|
37 | explicit SqpApplication(int &argc, char **argv); | |
38 | virtual ~SqpApplication(); |
|
38 | virtual ~SqpApplication(); | |
39 | void initialize(); |
|
39 | void initialize(); | |
40 |
|
40 | |||
41 | /// Accessors for the differents sciqlop controllers |
|
41 | /// Accessors for the differents sciqlop controllers | |
42 | DataSourceController &dataSourceController() noexcept; |
|
42 | DataSourceController &dataSourceController() noexcept; | |
43 | NetworkController &networkController() noexcept; |
|
43 | NetworkController &networkController() noexcept; | |
44 | TimeController &timeController() noexcept; |
|
44 | TimeController &timeController() noexcept; | |
45 | VariableController &variableController() noexcept; |
|
45 | VariableController &variableController() noexcept; | |
46 | VisualizationController &visualizationController() noexcept; |
|
46 | VisualizationController &visualizationController() noexcept; | |
47 |
|
47 | |||
48 | /// Accessors for the differents sciqlop helpers, these helpers classes are like controllers but |
|
48 | /// Accessors for the differents sciqlop helpers, these helpers classes are like controllers but | |
49 | /// doesn't live in a thread and access gui |
|
49 | /// doesn't live in a thread and access gui | |
50 | DragDropHelper &dragDropHelper() noexcept; |
|
50 | DragDropHelper &dragDropHelper() noexcept; | |
51 |
|
51 | |||
|
52 | enum class PlotsInteractionMode { None, ZoomBox, DragAndDrop, SelectionZones }; | |||
|
53 | ||||
|
54 | enum class PlotsCursorMode { NoCursor, Vertical, Temporal, Horizontal, Cross }; | |||
|
55 | ||||
|
56 | PlotsInteractionMode plotsInteractionMode() const; | |||
|
57 | void setPlotsInteractionMode(PlotsInteractionMode mode); | |||
|
58 | ||||
|
59 | PlotsCursorMode plotsCursorMode() const; | |||
|
60 | void setPlotsCursorMode(PlotsCursorMode mode); | |||
|
61 | ||||
52 | private: |
|
62 | private: | |
53 | class SqpApplicationPrivate; |
|
63 | class SqpApplicationPrivate; | |
54 | spimpl::unique_impl_ptr<SqpApplicationPrivate> impl; |
|
64 | spimpl::unique_impl_ptr<SqpApplicationPrivate> impl; | |
55 | }; |
|
65 | }; | |
56 |
|
66 | |||
57 | #endif // SCIQLOP_SQPAPPLICATION_H |
|
67 | #endif // SCIQLOP_SQPAPPLICATION_H |
1 | NO CONTENT: modified file, binary diff hidden |
|
NO CONTENT: modified file, binary diff hidden |
@@ -1,17 +1,22 | |||||
1 | <RCC> |
|
1 | <RCC> | |
2 | <qresource prefix="/"> |
|
2 | <qresource prefix="/"> | |
3 | <file>icones/dataSourceComponent.png</file> |
|
3 | <file>icones/dataSourceComponent.png</file> | |
4 | <file>icones/dataSourceNode.png</file> |
|
4 | <file>icones/dataSourceNode.png</file> | |
5 | <file>icones/dataSourceProduct.png</file> |
|
5 | <file>icones/dataSourceProduct.png</file> | |
6 | <file>icones/dataSourceRoot.png</file> |
|
6 | <file>icones/dataSourceRoot.png</file> | |
7 | <file>icones/delete.png</file> |
|
7 | <file>icones/delete.png</file> | |
8 | <file>icones/down.png</file> |
|
8 | <file>icones/down.png</file> | |
9 | <file>icones/openInspector.png</file> |
|
9 | <file>icones/openInspector.png</file> | |
10 | <file>icones/next.png</file> |
|
10 | <file>icones/next.png</file> | |
11 | <file>icones/plot.png</file> |
|
11 | <file>icones/plot.png</file> | |
12 | <file>icones/previous.png</file> |
|
12 | <file>icones/previous.png</file> | |
13 | <file>icones/unplot.png</file> |
|
13 | <file>icones/unplot.png</file> | |
14 | <file>icones/up.png</file> |
|
14 | <file>icones/up.png</file> | |
15 | <file>icones/time.png</file> |
|
15 | <file>icones/time.png</file> | |
|
16 | <file>icones/zoom.png</file> | |||
|
17 | <file>icones/rectangle.png</file> | |||
|
18 | <file>icones/drag.png</file> | |||
|
19 | <file>icones/cursor.png</file> | |||
|
20 | <file>icones/pointer.png</file> | |||
16 | </qresource> |
|
21 | </qresource> | |
17 | </RCC> |
|
22 | </RCC> |
@@ -1,163 +1,188 | |||||
1 | #include "SqpApplication.h" |
|
1 | #include "SqpApplication.h" | |
2 |
|
2 | |||
3 | #include <Data/IDataProvider.h> |
|
3 | #include <Data/IDataProvider.h> | |
4 | #include <DataSource/DataSourceController.h> |
|
4 | #include <DataSource/DataSourceController.h> | |
5 | #include <DragAndDrop/DragDropHelper.h> |
|
5 | #include <DragAndDrop/DragDropHelper.h> | |
6 | #include <Network/NetworkController.h> |
|
6 | #include <Network/NetworkController.h> | |
7 | #include <QThread> |
|
7 | #include <QThread> | |
8 | #include <Time/TimeController.h> |
|
8 | #include <Time/TimeController.h> | |
9 | #include <Variable/Variable.h> |
|
9 | #include <Variable/Variable.h> | |
10 | #include <Variable/VariableController.h> |
|
10 | #include <Variable/VariableController.h> | |
11 | #include <Variable/VariableModel.h> |
|
11 | #include <Variable/VariableModel.h> | |
12 | #include <Visualization/VisualizationController.h> |
|
12 | #include <Visualization/VisualizationController.h> | |
13 |
|
13 | |||
14 | Q_LOGGING_CATEGORY(LOG_SqpApplication, "SqpApplication") |
|
14 | Q_LOGGING_CATEGORY(LOG_SqpApplication, "SqpApplication") | |
15 |
|
15 | |||
16 | class SqpApplication::SqpApplicationPrivate { |
|
16 | class SqpApplication::SqpApplicationPrivate { | |
17 | public: |
|
17 | public: | |
18 | SqpApplicationPrivate() |
|
18 | SqpApplicationPrivate() | |
19 | : m_DataSourceController{std::make_unique<DataSourceController>()}, |
|
19 | : m_DataSourceController{std::make_unique<DataSourceController>()}, | |
20 | m_NetworkController{std::make_unique<NetworkController>()}, |
|
20 | m_NetworkController{std::make_unique<NetworkController>()}, | |
21 | m_TimeController{std::make_unique<TimeController>()}, |
|
21 | m_TimeController{std::make_unique<TimeController>()}, | |
22 | m_VariableController{std::make_unique<VariableController>()}, |
|
22 | m_VariableController{std::make_unique<VariableController>()}, | |
23 | m_VisualizationController{std::make_unique<VisualizationController>()}, |
|
23 | m_VisualizationController{std::make_unique<VisualizationController>()}, | |
24 | m_DragDropHelper{std::make_unique<DragDropHelper>()} |
|
24 | m_DragDropHelper{std::make_unique<DragDropHelper>()}, | |
|
25 | m_PlotInterractionMode(SqpApplication::PlotsInteractionMode::None), | |||
|
26 | m_PlotCursorMode(SqpApplication::PlotsCursorMode::NoCursor) | |||
25 | { |
|
27 | { | |
26 | // /////////////////////////////// // |
|
28 | // /////////////////////////////// // | |
27 | // Connections between controllers // |
|
29 | // Connections between controllers // | |
28 | // /////////////////////////////// // |
|
30 | // /////////////////////////////// // | |
29 |
|
31 | |||
30 | // VariableController <-> DataSourceController |
|
32 | // VariableController <-> DataSourceController | |
31 | connect(m_DataSourceController.get(), |
|
33 | connect(m_DataSourceController.get(), | |
32 | SIGNAL(variableCreationRequested(const QString &, const QVariantHash &, |
|
34 | SIGNAL(variableCreationRequested(const QString &, const QVariantHash &, | |
33 | std::shared_ptr<IDataProvider>)), |
|
35 | std::shared_ptr<IDataProvider>)), | |
34 | m_VariableController.get(), |
|
36 | m_VariableController.get(), | |
35 | SLOT(createVariable(const QString &, const QVariantHash &, |
|
37 | SLOT(createVariable(const QString &, const QVariantHash &, | |
36 | std::shared_ptr<IDataProvider>))); |
|
38 | std::shared_ptr<IDataProvider>))); | |
37 |
|
39 | |||
38 | connect(m_VariableController->variableModel(), &VariableModel::requestVariable, |
|
40 | connect(m_VariableController->variableModel(), &VariableModel::requestVariable, | |
39 | m_DataSourceController.get(), &DataSourceController::requestVariable); |
|
41 | m_DataSourceController.get(), &DataSourceController::requestVariable); | |
40 |
|
42 | |||
41 | // VariableController <-> VisualizationController |
|
43 | // VariableController <-> VisualizationController | |
42 | connect(m_VariableController.get(), |
|
44 | connect(m_VariableController.get(), | |
43 | SIGNAL(variableAboutToBeDeleted(std::shared_ptr<Variable>)), |
|
45 | SIGNAL(variableAboutToBeDeleted(std::shared_ptr<Variable>)), | |
44 | m_VisualizationController.get(), |
|
46 | m_VisualizationController.get(), | |
45 | SIGNAL(variableAboutToBeDeleted(std::shared_ptr<Variable>)), Qt::DirectConnection); |
|
47 | SIGNAL(variableAboutToBeDeleted(std::shared_ptr<Variable>)), Qt::DirectConnection); | |
46 |
|
48 | |||
47 | connect(m_VariableController.get(), |
|
49 | connect(m_VariableController.get(), | |
48 | SIGNAL(rangeChanged(std::shared_ptr<Variable>, const SqpRange &)), |
|
50 | SIGNAL(rangeChanged(std::shared_ptr<Variable>, const SqpRange &)), | |
49 | m_VisualizationController.get(), |
|
51 | m_VisualizationController.get(), | |
50 | SIGNAL(rangeChanged(std::shared_ptr<Variable>, const SqpRange &))); |
|
52 | SIGNAL(rangeChanged(std::shared_ptr<Variable>, const SqpRange &))); | |
51 |
|
53 | |||
52 |
|
54 | |||
53 | m_DataSourceController->moveToThread(&m_DataSourceControllerThread); |
|
55 | m_DataSourceController->moveToThread(&m_DataSourceControllerThread); | |
54 | m_DataSourceControllerThread.setObjectName("DataSourceControllerThread"); |
|
56 | m_DataSourceControllerThread.setObjectName("DataSourceControllerThread"); | |
55 | m_NetworkController->moveToThread(&m_NetworkControllerThread); |
|
57 | m_NetworkController->moveToThread(&m_NetworkControllerThread); | |
56 | m_NetworkControllerThread.setObjectName("NetworkControllerThread"); |
|
58 | m_NetworkControllerThread.setObjectName("NetworkControllerThread"); | |
57 | m_VariableController->moveToThread(&m_VariableControllerThread); |
|
59 | m_VariableController->moveToThread(&m_VariableControllerThread); | |
58 | m_VariableControllerThread.setObjectName("VariableControllerThread"); |
|
60 | m_VariableControllerThread.setObjectName("VariableControllerThread"); | |
59 | m_VisualizationController->moveToThread(&m_VisualizationControllerThread); |
|
61 | m_VisualizationController->moveToThread(&m_VisualizationControllerThread); | |
60 | m_VisualizationControllerThread.setObjectName("VsualizationControllerThread"); |
|
62 | m_VisualizationControllerThread.setObjectName("VsualizationControllerThread"); | |
61 |
|
63 | |||
62 |
|
64 | |||
63 | // Additionnal init |
|
65 | // Additionnal init | |
64 | m_VariableController->setTimeController(m_TimeController.get()); |
|
66 | m_VariableController->setTimeController(m_TimeController.get()); | |
65 | } |
|
67 | } | |
66 |
|
68 | |||
67 | virtual ~SqpApplicationPrivate() |
|
69 | virtual ~SqpApplicationPrivate() | |
68 | { |
|
70 | { | |
69 | m_DataSourceControllerThread.quit(); |
|
71 | m_DataSourceControllerThread.quit(); | |
70 | m_DataSourceControllerThread.wait(); |
|
72 | m_DataSourceControllerThread.wait(); | |
71 |
|
73 | |||
72 | m_NetworkControllerThread.quit(); |
|
74 | m_NetworkControllerThread.quit(); | |
73 | m_NetworkControllerThread.wait(); |
|
75 | m_NetworkControllerThread.wait(); | |
74 |
|
76 | |||
75 | m_VariableControllerThread.quit(); |
|
77 | m_VariableControllerThread.quit(); | |
76 | m_VariableControllerThread.wait(); |
|
78 | m_VariableControllerThread.wait(); | |
77 |
|
79 | |||
78 | m_VisualizationControllerThread.quit(); |
|
80 | m_VisualizationControllerThread.quit(); | |
79 | m_VisualizationControllerThread.wait(); |
|
81 | m_VisualizationControllerThread.wait(); | |
80 | } |
|
82 | } | |
81 |
|
83 | |||
82 | std::unique_ptr<DataSourceController> m_DataSourceController; |
|
84 | std::unique_ptr<DataSourceController> m_DataSourceController; | |
83 | std::unique_ptr<VariableController> m_VariableController; |
|
85 | std::unique_ptr<VariableController> m_VariableController; | |
84 | std::unique_ptr<TimeController> m_TimeController; |
|
86 | std::unique_ptr<TimeController> m_TimeController; | |
85 | std::unique_ptr<NetworkController> m_NetworkController; |
|
87 | std::unique_ptr<NetworkController> m_NetworkController; | |
86 | std::unique_ptr<VisualizationController> m_VisualizationController; |
|
88 | std::unique_ptr<VisualizationController> m_VisualizationController; | |
87 | QThread m_DataSourceControllerThread; |
|
89 | QThread m_DataSourceControllerThread; | |
88 | QThread m_NetworkControllerThread; |
|
90 | QThread m_NetworkControllerThread; | |
89 | QThread m_VariableControllerThread; |
|
91 | QThread m_VariableControllerThread; | |
90 | QThread m_VisualizationControllerThread; |
|
92 | QThread m_VisualizationControllerThread; | |
91 |
|
93 | |||
92 | std::unique_ptr<DragDropHelper> m_DragDropHelper; |
|
94 | std::unique_ptr<DragDropHelper> m_DragDropHelper; | |
|
95 | ||||
|
96 | SqpApplication::PlotsInteractionMode m_PlotInterractionMode; | |||
|
97 | SqpApplication::PlotsCursorMode m_PlotCursorMode; | |||
93 | }; |
|
98 | }; | |
94 |
|
99 | |||
95 |
|
100 | |||
96 | SqpApplication::SqpApplication(int &argc, char **argv) |
|
101 | SqpApplication::SqpApplication(int &argc, char **argv) | |
97 | : QApplication{argc, argv}, impl{spimpl::make_unique_impl<SqpApplicationPrivate>()} |
|
102 | : QApplication{argc, argv}, impl{spimpl::make_unique_impl<SqpApplicationPrivate>()} | |
98 | { |
|
103 | { | |
99 | qCDebug(LOG_SqpApplication()) << tr("SqpApplication construction") << QThread::currentThread(); |
|
104 | qCDebug(LOG_SqpApplication()) << tr("SqpApplication construction") << QThread::currentThread(); | |
100 |
|
105 | |||
101 | connect(&impl->m_DataSourceControllerThread, &QThread::started, |
|
106 | connect(&impl->m_DataSourceControllerThread, &QThread::started, | |
102 | impl->m_DataSourceController.get(), &DataSourceController::initialize); |
|
107 | impl->m_DataSourceController.get(), &DataSourceController::initialize); | |
103 | connect(&impl->m_DataSourceControllerThread, &QThread::finished, |
|
108 | connect(&impl->m_DataSourceControllerThread, &QThread::finished, | |
104 | impl->m_DataSourceController.get(), &DataSourceController::finalize); |
|
109 | impl->m_DataSourceController.get(), &DataSourceController::finalize); | |
105 |
|
110 | |||
106 | connect(&impl->m_NetworkControllerThread, &QThread::started, impl->m_NetworkController.get(), |
|
111 | connect(&impl->m_NetworkControllerThread, &QThread::started, impl->m_NetworkController.get(), | |
107 | &NetworkController::initialize); |
|
112 | &NetworkController::initialize); | |
108 | connect(&impl->m_NetworkControllerThread, &QThread::finished, impl->m_NetworkController.get(), |
|
113 | connect(&impl->m_NetworkControllerThread, &QThread::finished, impl->m_NetworkController.get(), | |
109 | &NetworkController::finalize); |
|
114 | &NetworkController::finalize); | |
110 |
|
115 | |||
111 | connect(&impl->m_VariableControllerThread, &QThread::started, impl->m_VariableController.get(), |
|
116 | connect(&impl->m_VariableControllerThread, &QThread::started, impl->m_VariableController.get(), | |
112 | &VariableController::initialize); |
|
117 | &VariableController::initialize); | |
113 | connect(&impl->m_VariableControllerThread, &QThread::finished, impl->m_VariableController.get(), |
|
118 | connect(&impl->m_VariableControllerThread, &QThread::finished, impl->m_VariableController.get(), | |
114 | &VariableController::finalize); |
|
119 | &VariableController::finalize); | |
115 |
|
120 | |||
116 | connect(&impl->m_VisualizationControllerThread, &QThread::started, |
|
121 | connect(&impl->m_VisualizationControllerThread, &QThread::started, | |
117 | impl->m_VisualizationController.get(), &VisualizationController::initialize); |
|
122 | impl->m_VisualizationController.get(), &VisualizationController::initialize); | |
118 | connect(&impl->m_VisualizationControllerThread, &QThread::finished, |
|
123 | connect(&impl->m_VisualizationControllerThread, &QThread::finished, | |
119 | impl->m_VisualizationController.get(), &VisualizationController::finalize); |
|
124 | impl->m_VisualizationController.get(), &VisualizationController::finalize); | |
120 |
|
125 | |||
121 | impl->m_DataSourceControllerThread.start(); |
|
126 | impl->m_DataSourceControllerThread.start(); | |
122 | impl->m_NetworkControllerThread.start(); |
|
127 | impl->m_NetworkControllerThread.start(); | |
123 | impl->m_VariableControllerThread.start(); |
|
128 | impl->m_VariableControllerThread.start(); | |
124 | impl->m_VisualizationControllerThread.start(); |
|
129 | impl->m_VisualizationControllerThread.start(); | |
125 | } |
|
130 | } | |
126 |
|
131 | |||
127 | SqpApplication::~SqpApplication() |
|
132 | SqpApplication::~SqpApplication() | |
128 | { |
|
133 | { | |
129 | } |
|
134 | } | |
130 |
|
135 | |||
131 | void SqpApplication::initialize() |
|
136 | void SqpApplication::initialize() | |
132 | { |
|
137 | { | |
133 | } |
|
138 | } | |
134 |
|
139 | |||
135 | DataSourceController &SqpApplication::dataSourceController() noexcept |
|
140 | DataSourceController &SqpApplication::dataSourceController() noexcept | |
136 | { |
|
141 | { | |
137 | return *impl->m_DataSourceController; |
|
142 | return *impl->m_DataSourceController; | |
138 | } |
|
143 | } | |
139 |
|
144 | |||
140 | NetworkController &SqpApplication::networkController() noexcept |
|
145 | NetworkController &SqpApplication::networkController() noexcept | |
141 | { |
|
146 | { | |
142 | return *impl->m_NetworkController; |
|
147 | return *impl->m_NetworkController; | |
143 | } |
|
148 | } | |
144 |
|
149 | |||
145 | TimeController &SqpApplication::timeController() noexcept |
|
150 | TimeController &SqpApplication::timeController() noexcept | |
146 | { |
|
151 | { | |
147 | return *impl->m_TimeController; |
|
152 | return *impl->m_TimeController; | |
148 | } |
|
153 | } | |
149 |
|
154 | |||
150 | VariableController &SqpApplication::variableController() noexcept |
|
155 | VariableController &SqpApplication::variableController() noexcept | |
151 | { |
|
156 | { | |
152 | return *impl->m_VariableController; |
|
157 | return *impl->m_VariableController; | |
153 | } |
|
158 | } | |
154 |
|
159 | |||
155 | VisualizationController &SqpApplication::visualizationController() noexcept |
|
160 | VisualizationController &SqpApplication::visualizationController() noexcept | |
156 | { |
|
161 | { | |
157 | return *impl->m_VisualizationController; |
|
162 | return *impl->m_VisualizationController; | |
158 | } |
|
163 | } | |
159 |
|
164 | |||
160 | DragDropHelper &SqpApplication::dragDropHelper() noexcept |
|
165 | DragDropHelper &SqpApplication::dragDropHelper() noexcept | |
161 | { |
|
166 | { | |
162 | return *impl->m_DragDropHelper; |
|
167 | return *impl->m_DragDropHelper; | |
163 | } |
|
168 | } | |
|
169 | ||||
|
170 | SqpApplication::PlotsInteractionMode SqpApplication::plotsInteractionMode() const | |||
|
171 | { | |||
|
172 | return impl->m_PlotInterractionMode; | |||
|
173 | } | |||
|
174 | ||||
|
175 | void SqpApplication::setPlotsInteractionMode(SqpApplication::PlotsInteractionMode mode) | |||
|
176 | { | |||
|
177 | impl->m_PlotInterractionMode = mode; | |||
|
178 | } | |||
|
179 | ||||
|
180 | SqpApplication::PlotsCursorMode SqpApplication::plotsCursorMode() const | |||
|
181 | { | |||
|
182 | return impl->m_PlotCursorMode; | |||
|
183 | } | |||
|
184 | ||||
|
185 | void SqpApplication::setPlotsCursorMode(SqpApplication::PlotsCursorMode mode) | |||
|
186 | { | |||
|
187 | impl->m_PlotCursorMode = mode; | |||
|
188 | } |
General Comments 1
You need to be logged in to leave comments.
Login now