GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1122:6c9818605a3c

1

#include "SqpApplication.h"

1

#include "SqpApplication.h"

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

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

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

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

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()

		Pull request merged and closed
		Status change > Approved
		Status change > Approved
		Auto status change to \|new_status\|...

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

             #include "SqpApplication.h"
             #include <Actions/ActionsGuiController.h>
+            #include <Catalogue/CatalogueController.h>
             #include <Data/IDataProvider.h>
             #include <DataSource/DataSourceController.h>
             #include <DragAndDrop/DragDropGuiController.h>
                     m_VariableControllerThread.setObjectName("VariableControllerThread");
                     m_VisualizationController->moveToThread(&m_VisualizationControllerThread);
                     m_VisualizationControllerThread.setObjectName("VsualizationControllerThread");
+                    m_CatalogueController->moveToThread(&m_CatalogueControllerThread);
+                    m_CatalogueControllerThread.setObjectName("CatalogueControllerThread");
                     // Additionnal init
                     m_VisualizationControllerThread.quit();
                     m_VisualizationControllerThread.wait();
+                    m_CatalogueControllerThread.quit();
+                    m_CatalogueControllerThread.wait();
                 }
                 std::unique_ptr<DataSourceController> m_DataSourceController;
                 std::unique_ptr<TimeController> m_TimeController;
                 std::unique_ptr<NetworkController> m_NetworkController;
                 std::unique_ptr<VisualizationController> m_VisualizationController;
+                std::unique_ptr<CatalogueController> m_CatalogueController;
                 QThread m_DataSourceControllerThread;
                 QThread m_NetworkControllerThread;
                 QThread m_VariableControllerThread;
                 QThread m_VisualizationControllerThread;
+                QThread m_CatalogueControllerThread;
                 std::unique_ptr<DragDropGuiController> m_DragDropGuiController;
                 std::unique_ptr<ActionsGuiController> m_ActionsGuiController;
                 connect(&impl->m_VisualizationControllerThread, &QThread::finished,
                         impl->m_VisualizationController.get(), &VisualizationController::finalize);
+                connect(&impl->m_CatalogueControllerThread, &QThread::started,
+                        impl->m_CatalogueController.get(), &CatalogueController::initialize);
+                connect(&impl->m_CatalogueControllerThread, &QThread::finished,
+                        impl->m_CatalogueController.get(), &CatalogueController::finalize);
                 impl->m_DataSourceControllerThread.start();
                 impl->m_NetworkControllerThread.start();
                 impl->m_VariableControllerThread.start();
                 impl->m_VisualizationControllerThread.start();
+                impl->m_CatalogueControllerThread.start();
             }
             SqpApplication::~SqpApplication()