##// END OF EJS Templates
HG_REPOSITORIES » LPP » SciQLOP_Repos » SciQLop
RSS
Fix wrong merge
Thibaud Rabillard -
r1087:6c9818605a3c
parent child
Show More
Side by Side Unified
Context file:
r1087:6c9818605a3c Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,6 +1,7
1 #include "SqpApplication.h"
1 #include "SqpApplication.h"
2
2
3 #include <Actions/ActionsGuiController.h>
3 #include <Actions/ActionsGuiController.h>
4 #include <Catalogue/CatalogueController.h>
4 #include <Data/IDataProvider.h>
5 #include <Data/IDataProvider.h>
5 #include <DataSource/DataSourceController.h>
6 #include <DataSource/DataSourceController.h>
6 #include <DragAndDrop/DragDropGuiController.h>
7 #include <DragAndDrop/DragDropGuiController.h>
@@ -63,6 +64,8 public:
63 m_VariableControllerThread.setObjectName("VariableControllerThread");
64 m_VariableControllerThread.setObjectName("VariableControllerThread");
64 m_VisualizationController->moveToThread(&m_VisualizationControllerThread);
65 m_VisualizationController->moveToThread(&m_VisualizationControllerThread);
65 m_VisualizationControllerThread.setObjectName("VsualizationControllerThread");
66 m_VisualizationControllerThread.setObjectName("VsualizationControllerThread");
67 m_CatalogueController->moveToThread(&m_CatalogueControllerThread);
68 m_CatalogueControllerThread.setObjectName("CatalogueControllerThread");
66
69
67
70
68 // Additionnal init
71 // Additionnal init
@@ -82,6 +85,9 public:
82
85
83 m_VisualizationControllerThread.quit();
86 m_VisualizationControllerThread.quit();
84 m_VisualizationControllerThread.wait();
87 m_VisualizationControllerThread.wait();
88
89 m_CatalogueControllerThread.quit();
90 m_CatalogueControllerThread.wait();
85 }
91 }
86
92
87 std::unique_ptr<DataSourceController> m_DataSourceController;
93 std::unique_ptr<DataSourceController> m_DataSourceController;
@@ -89,11 +95,13 public:
89 std::unique_ptr<TimeController> m_TimeController;
95 std::unique_ptr<TimeController> m_TimeController;
90 std::unique_ptr<NetworkController> m_NetworkController;
96 std::unique_ptr<NetworkController> m_NetworkController;
91 std::unique_ptr<VisualizationController> m_VisualizationController;
97 std::unique_ptr<VisualizationController> m_VisualizationController;
98 std::unique_ptr<CatalogueController> m_CatalogueController;
92
99
93 QThread m_DataSourceControllerThread;
100 QThread m_DataSourceControllerThread;
94 QThread m_NetworkControllerThread;
101 QThread m_NetworkControllerThread;
95 QThread m_VariableControllerThread;
102 QThread m_VariableControllerThread;
96 QThread m_VisualizationControllerThread;
103 QThread m_VisualizationControllerThread;
104 QThread m_CatalogueControllerThread;
97
105
98 std::unique_ptr<DragDropGuiController> m_DragDropGuiController;
106 std::unique_ptr<DragDropGuiController> m_DragDropGuiController;
99 std::unique_ptr<ActionsGuiController> m_ActionsGuiController;
107 std::unique_ptr<ActionsGuiController> m_ActionsGuiController;
@@ -128,10 +136,16 SqpApplication::SqpApplication(int &argc, char **argv)
128 connect(&impl->m_VisualizationControllerThread, &QThread::finished,
136 connect(&impl->m_VisualizationControllerThread, &QThread::finished,
129 impl->m_VisualizationController.get(), &VisualizationController::finalize);
137 impl->m_VisualizationController.get(), &VisualizationController::finalize);
130
138
139 connect(&impl->m_CatalogueControllerThread, &QThread::started,
140 impl->m_CatalogueController.get(), &CatalogueController::initialize);
141 connect(&impl->m_CatalogueControllerThread, &QThread::finished,
142 impl->m_CatalogueController.get(), &CatalogueController::finalize);
143
131 impl->m_DataSourceControllerThread.start();
144 impl->m_DataSourceControllerThread.start();
132 impl->m_NetworkControllerThread.start();
145 impl->m_NetworkControllerThread.start();
133 impl->m_VariableControllerThread.start();
146 impl->m_VariableControllerThread.start();
134 impl->m_VisualizationControllerThread.start();
147 impl->m_VisualizationControllerThread.start();
148 impl->m_CatalogueControllerThread.start();
135 }
149 }
136
150
137 SqpApplication::~SqpApplication()
151 SqpApplication::~SqpApplication()
General Comments 0
You need to be logged in to leave comments. Login now