##// END OF EJS Templates
HG_REPOSITORIES » LPP » SciQLOP_Repos » SciQLop
RSS
Removed useless Visualization CTRLR component...
jeandet -
r1475:d1ba435fd66a
parent child
Show More
Side by Side Unified
Context file:
r1475:d1ba435fd66a Loading diff...:
Show file before | Show file after | Hide comments
@@ -32,7 +32,6
32 #include <SqpApplication.h>
32 #include <SqpApplication.h>
33 #include <Time/TimeController.h>
33 #include <Time/TimeController.h>
34 #include <TimeWidget/TimeWidget.h>
34 #include <TimeWidget/TimeWidget.h>
35 #include <Visualization/VisualizationController.h>
36
35
37 #include "toolbar.h"
36 #include "toolbar.h"
38
37
@@ -198,15 +197,6 MainWindow::MainWindow(QWidget* parent)
198 connect(mainToolBar, &ToolBar::timeUpdated, &sqpApp->timeController(),
197 connect(mainToolBar, &ToolBar::timeUpdated, &sqpApp->timeController(),
199 &TimeController::setDateTimeRange);
198 &TimeController::setDateTimeRange);
200
199
201 // Visualization
202 connect(&sqpApp->visualizationController(),
203 SIGNAL(variableAboutToBeDeleted(std::shared_ptr<Variable2>)), m_Ui->view,
204 SLOT(onVariableAboutToBeDeleted(std::shared_ptr<Variable2>)));
205
206 connect(&sqpApp->visualizationController(),
207 SIGNAL(rangeChanged(std::shared_ptr<Variable2>, const DateTimeRange&)), m_Ui->view,
208 SLOT(onRangeChanged(std::shared_ptr<Variable2>, const DateTimeRange&)));
209
210 // Widgets / widgets connections
200 // Widgets / widgets connections
211
201
212 // For the following connections, we use DirectConnection to allow each widget that can
202 // For the following connections, we use DirectConnection to allow each widget that can
Show file before | Show file after | Hide comments
@@ -1,1 +1,1
1 Subproject commit 521f9540ac01f61c92600a4aa6c8d3c148abc74a
1 Subproject commit 64a22e9756a85346e7aef52d26bc5c50c4778d86
Show file before | Show file after | Hide comments
@@ -27,7 +27,6 class TimeController;
27 class VariableController;
27 class VariableController;
28 class VariableController2;
28 class VariableController2;
29 class VariableModel2;
29 class VariableModel2;
30 class VisualizationController;
31 class DragDropGuiController;
30 class DragDropGuiController;
32 class ActionsGuiController;
31 class ActionsGuiController;
33 class CatalogueController;
32 class CatalogueController;
@@ -76,9 +75,6 public:
76 TimeController& timeController() noexcept;
75 TimeController& timeController() noexcept;
77 VariableController2& variableController() noexcept;
76 VariableController2& variableController() noexcept;
78 std::shared_ptr<VariableController2> variableControllerOwner() noexcept;
77 std::shared_ptr<VariableController2> variableControllerOwner() noexcept;
79 //@TODO there should not be any global model it's just GUI impl detail
80 // VariableModel2 &variableModel() noexcept;
81 VisualizationController& visualizationController() noexcept;
82 CatalogueController& catalogueController() noexcept;
78 CatalogueController& catalogueController() noexcept;
83
79
84 /// Accessors for the differents sciqlop helpers, these helpers classes are like controllers but
80 /// Accessors for the differents sciqlop helpers, these helpers classes are like controllers but
Show file before | Show file after | Hide comments
@@ -10,7 +10,6
10 #include <Time/TimeController.h>
10 #include <Time/TimeController.h>
11 #include <Variable/VariableController2.h>
11 #include <Variable/VariableController2.h>
12 #include <Variable/VariableModel2.h>
12 #include <Variable/VariableModel2.h>
13 #include <Visualization/VisualizationController.h>
14
13
15 Q_LOGGING_CATEGORY(LOG_SqpApplication, "SqpApplication")
14 Q_LOGGING_CATEGORY(LOG_SqpApplication, "SqpApplication")
16
15
@@ -34,25 +33,11 public:
34 variableProvider, sqpApp->timeController().dateTime());
33 variableProvider, sqpApp->timeController().dateTime());
35 });
34 });
36
35
37 // VariableController <-> VisualizationController
38 // connect(m_VariableController.get(),
39 // SIGNAL(variableAboutToBeDeleted(std::shared_ptr<Variable>)),
40 // m_VisualizationController.get(),
41 // SIGNAL(variableAboutToBeDeleted(std::shared_ptr<Variable>)),
42 // Qt::DirectConnection);
43
44 // connect(m_VariableController.get(),
45 // SIGNAL(rangeChanged(std::shared_ptr<Variable>, const DateTimeRange &)),
46 // m_VisualizationController.get(),
47 // SIGNAL(rangeChanged(std::shared_ptr<Variable>, const DateTimeRange &)));
48
49
36
50 m_DataSourceController.moveToThread(&m_DataSourceControllerThread);
37 m_DataSourceController.moveToThread(&m_DataSourceControllerThread);
51 m_DataSourceControllerThread.setObjectName("DataSourceControllerThread");
38 m_DataSourceControllerThread.setObjectName("DataSourceControllerThread");
52 m_NetworkController.moveToThread(&m_NetworkControllerThread);
39 m_NetworkController.moveToThread(&m_NetworkControllerThread);
53 m_NetworkControllerThread.setObjectName("NetworkControllerThread");
40 m_NetworkControllerThread.setObjectName("NetworkControllerThread");
54 m_VisualizationController.moveToThread(&m_VisualizationControllerThread);
55 m_VisualizationControllerThread.setObjectName("VsualizationControllerThread");
56
41
57 // Additionnal init
42 // Additionnal init
58 // m_VariableController->setTimeController(m_TimeController.get());
43 // m_VariableController->setTimeController(m_TimeController.get());
@@ -65,21 +50,16 public:
65
50
66 m_NetworkControllerThread.quit();
51 m_NetworkControllerThread.quit();
67 m_NetworkControllerThread.wait();
52 m_NetworkControllerThread.wait();
68
69 m_VisualizationControllerThread.quit();
70 m_VisualizationControllerThread.wait();
71 }
53 }
72
54
73 DataSourceController m_DataSourceController;
55 DataSourceController m_DataSourceController;
74 std::shared_ptr<VariableController2> m_VariableController;
56 std::shared_ptr<VariableController2> m_VariableController;
75 TimeController m_TimeController;
57 TimeController m_TimeController;
76 NetworkController m_NetworkController;
58 NetworkController m_NetworkController;
77 VisualizationController m_VisualizationController;
78 CatalogueController m_CatalogueController;
59 CatalogueController m_CatalogueController;
79
60
80 QThread m_DataSourceControllerThread;
61 QThread m_DataSourceControllerThread;
81 QThread m_NetworkControllerThread;
62 QThread m_NetworkControllerThread;
82 QThread m_VisualizationControllerThread;
83
63
84 DragDropGuiController m_DragDropGuiController;
64 DragDropGuiController m_DragDropGuiController;
85 ActionsGuiController m_ActionsGuiController;
65 ActionsGuiController m_ActionsGuiController;
@@ -107,15 +87,8 SqpApplication::SqpApplication(int& argc, char** argv)
107 connect(&impl->m_NetworkControllerThread, &QThread::finished, &impl->m_NetworkController,
87 connect(&impl->m_NetworkControllerThread, &QThread::finished, &impl->m_NetworkController,
108 &NetworkController::finalize);
88 &NetworkController::finalize);
109
89
110 connect(&impl->m_VisualizationControllerThread, &QThread::started,
111 &impl->m_VisualizationController, &VisualizationController::initialize);
112 connect(&impl->m_VisualizationControllerThread, &QThread::finished,
113 &impl->m_VisualizationController, &VisualizationController::finalize);
114
115 impl->m_DataSourceControllerThread.start();
90 impl->m_DataSourceControllerThread.start();
116 impl->m_NetworkControllerThread.start();
91 impl->m_NetworkControllerThread.start();
117 impl->m_VisualizationControllerThread.start();
118 // impl->m_CatalogueController.initialize();
119 }
92 }
120
93
121 SqpApplication::~SqpApplication() {}
94 SqpApplication::~SqpApplication() {}
@@ -147,16 +120,6 std::shared_ptr<VariableController2> SqpApplication::variableControllerOwner() n
147 return impl->m_VariableController;
120 return impl->m_VariableController;
148 }
121 }
149
122
150 // VariableModel2 &SqpApplication::variableModel() noexcept
151 //{
152 // return impl->m_VariableModel;
153 //}
154
155 VisualizationController& SqpApplication::visualizationController() noexcept
156 {
157 return impl->m_VisualizationController;
158 }
159
160 CatalogueController& SqpApplication::catalogueController() noexcept
123 CatalogueController& SqpApplication::catalogueController() noexcept
161 {
124 {
162 return impl->m_CatalogueController;
125 return impl->m_CatalogueController;
General Comments 0
You need to be logged in to leave comments. Login now