##// END OF EJS Templates
GIT_REPOSITORIES » LPP » Users » mperrinel » SciQLop-fork
RSS

Fork of HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop

Merge branch 'develop' of...
Merge branch 'develop' of https://perrinel@hephaistos.lpp.polytechnique.fr/rhodecode/GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork into develop Conflicts: core/src/Catalogue/CatalogueController.cpp
trabillard - - Load All Authors

File last commit:

r1291:5ad3c2260734
r1315:7185ea8182da merge
Show More
SqpApplication.cpp
205 lines | 7.9 KiB | text/x-c | CppLexer
/ gui / src / SqpApplication.cpp
History | Source | Raw |Copy content |Copy permalink
perrinel
Initialisation de l'application multithread avec le spimpl....
 r21 #include "SqpApplication.h"
trabillard
Adds a a gui controller class to manage global actions across the application.
 r1111 #include <Actions/ActionsGuiController.h>
Thibaud Rabillard
Fix wrong merge
 r1122 #include <Catalogue/CatalogueController.h>
Alexandre Leroux
Makes the connection between Data source controller and Variable controller...
 r169 #include <Data/IDataProvider.h>
perrinel
Initialisation de l'application multithread avec le spimpl....
 r21 #include <DataSource/DataSourceController.h>
trabillard
Rename "DragDropHelper" in "DragDropGuiController"
 r1110 #include <DragAndDrop/DragDropGuiController.h>
perrinel
Intialization of network controller
 r339 #include <Network/NetworkController.h>
perrinel
Initialisation de l'application multithread avec le spimpl....
 r21 #include <QThread>
perrinel
Time widget is now used with the variable createion request
 r193 #include <Time/TimeController.h>
Alexandre Leroux
Makes the connection between Variable controller and Visualization controller...
 r170 #include <Variable/Variable.h>
Alexandre Leroux
Inits variable controller and adds it to the SciQlop app
 r111 #include <Variable/VariableController.h>
trabillard
Drop of product in variables
 r877 #include <Variable/VariableModel.h>
perrinel
Add the visualization controller
 r53 #include <Visualization/VisualizationController.h>
perrinel
Initialisation de l'application multithread avec le spimpl....
 r21
Q_LOGGING_CATEGORY(LOG_SqpApplication, "SqpApplication")
class SqpApplication::SqpApplicationPrivate {
public:
perrinel
add missing visualization thread call
 r55 SqpApplicationPrivate()
: m_DataSourceController{std::make_unique<DataSourceController>()},
Alexandre Leroux
Inits variable controller and adds it to the SciQlop app
 r111 m_VariableController{std::make_unique<VariableController>()},
Alexandre Leroux
Removes compilation warnings (with Meson)
 r1004 m_TimeController{std::make_unique<TimeController>()},
m_NetworkController{std::make_unique<NetworkController>()},
trabillard
New helper class for the drag&drop
 r840 m_VisualizationController{std::make_unique<VisualizationController>()},
trabillard
Rename "DragDropHelper" in "DragDropGuiController"
 r1110 m_DragDropGuiController{std::make_unique<DragDropGuiController>()},
perrinel
correction of merge
 r1097 m_CatalogueController{std::make_unique<CatalogueController>()},
trabillard
Adds a a gui controller class to manage global actions across the application.
 r1111 m_ActionsGuiController{std::make_unique<ActionsGuiController>()},
trabillard
Toolbar for interactions modes
 r1000 m_PlotInterractionMode(SqpApplication::PlotsInteractionMode::None),
m_PlotCursorMode(SqpApplication::PlotsCursorMode::NoCursor)
Alexandre Leroux
Minor fixes...
 r32 {
Alexandre Leroux
Makes the connection between Data source controller and Variable controller...
 r169 // /////////////////////////////// //
// Connections between controllers //
// /////////////////////////////// //
// VariableController <-> DataSourceController
connect(m_DataSourceController.get(),
Alexandre Leroux
Updates variable creation to pass metadata...
 r410 SIGNAL(variableCreationRequested(const QString &, const QVariantHash &,
std::shared_ptr<IDataProvider>)),
Alexandre Leroux
Makes the connection between Data source controller and Variable controller...
 r169 m_VariableController.get(),
Alexandre Leroux
Updates variable creation to pass metadata...
 r410 SLOT(createVariable(const QString &, const QVariantHash &,
std::shared_ptr<IDataProvider>)));
Alexandre Leroux
Makes the connection between Data source controller and Variable controller...
 r169
trabillard
Drop of product in variables
 r877 connect(m_VariableController->variableModel(), &VariableModel::requestVariable,
m_DataSourceController.get(), &DataSourceController::requestVariable);
Alexandre Leroux
Makes the connection between Variable controller and Visualization controller...
 r170 // VariableController <-> VisualizationController
Alexandre Leroux
Variable deletion (7)...
 r336 connect(m_VariableController.get(),
SIGNAL(variableAboutToBeDeleted(std::shared_ptr<Variable>)),
m_VisualizationController.get(),
SIGNAL(variableAboutToBeDeleted(std::shared_ptr<Variable>)), Qt::DirectConnection);
Alexandre Leroux
Makes the connection between Variable controller and Visualization controller...
 r170
perrinel
Add connection logical for the rescale operation
 r437 connect(m_VariableController.get(),
perrinel
Change SqpRange for SqpDateTime
 r512 SIGNAL(rangeChanged(std::shared_ptr<Variable>, const SqpRange &)),
perrinel
Add connection logical for the rescale operation
 r437 m_VisualizationController.get(),
perrinel
Change SqpRange for SqpDateTime
 r512 SIGNAL(rangeChanged(std::shared_ptr<Variable>, const SqpRange &)));
perrinel
Add connection logical for the rescale operation
 r437
perrinel
Time widget is now used with the variable createion request
 r193
Alexandre Leroux
Minor fixes...
 r32 m_DataSourceController->moveToThread(&m_DataSourceControllerThread);
perrinel
Add a name for all thread
 r429 m_DataSourceControllerThread.setObjectName("DataSourceControllerThread");
perrinel
Intialization of network controller
 r339 m_NetworkController->moveToThread(&m_NetworkControllerThread);
perrinel
Add a name for all thread
 r429 m_NetworkControllerThread.setObjectName("NetworkControllerThread");
Alexandre Leroux
Inits variable controller and adds it to the SciQlop app
 r111 m_VariableController->moveToThread(&m_VariableControllerThread);
perrinel
Add a name for all thread
 r429 m_VariableControllerThread.setObjectName("VariableControllerThread");
perrinel
add missing visualization thread call
 r55 m_VisualizationController->moveToThread(&m_VisualizationControllerThread);
perrinel
Add a name for all thread
 r429 m_VisualizationControllerThread.setObjectName("VsualizationControllerThread");
perrinel
Merge branch 'feature/NetworkController' into develop...
 r374
perrinel
Time widget is now used with the variable createion request
 r193 // Additionnal init
m_VariableController->setTimeController(m_TimeController.get());
Alexandre Leroux
Minor fixes...
 r32 }
perrinel
Ajout des règles vera++
 r24 virtual ~SqpApplicationPrivate()
perrinel
Ajout de la méthode wait pour éviter de détruire un thread en cours...
 r22 {
m_DataSourceControllerThread.quit();
m_DataSourceControllerThread.wait();
perrinel
Add the visualization controller
 r53
perrinel
Intialization of network controller
 r339 m_NetworkControllerThread.quit();
m_NetworkControllerThread.wait();
Alexandre Leroux
Inits variable controller and adds it to the SciQlop app
 r111 m_VariableControllerThread.quit();
m_VariableControllerThread.wait();
perrinel
add missing visualization thread call
 r55 m_VisualizationControllerThread.quit();
m_VisualizationControllerThread.wait();
perrinel
Ajout de la méthode wait pour éviter de détruire un thread en cours...
 r22 }
perrinel
Initialisation de l'application multithread avec le spimpl....
 r21
std::unique_ptr<DataSourceController> m_DataSourceController;
Alexandre Leroux
Inits variable controller and adds it to the SciQlop app
 r111 std::unique_ptr<VariableController> m_VariableController;
perrinel
Time widget is now used with the variable createion request
 r193 std::unique_ptr<TimeController> m_TimeController;
perrinel
Intialization of network controller
 r339 std::unique_ptr<NetworkController> m_NetworkController;
perrinel
Add the visualization controller
 r53 std::unique_ptr<VisualizationController> m_VisualizationController;
Thibaud Rabillard
Fix wrong merge
 r1122 std::unique_ptr<CatalogueController> m_CatalogueController;
trabillard
Adds a a gui controller class to manage global actions across the application.
 r1111
perrinel
Initialisation de l'application multithread avec le spimpl....
 r21 QThread m_DataSourceControllerThread;
perrinel
Intialization of network controller
 r339 QThread m_NetworkControllerThread;
Alexandre Leroux
Inits variable controller and adds it to the SciQlop app
 r111 QThread m_VariableControllerThread;
perrinel
add missing visualization thread call
 r55 QThread m_VisualizationControllerThread;
trabillard
New helper class for the drag&drop
 r840
trabillard
Rename "DragDropHelper" in "DragDropGuiController"
 r1110 std::unique_ptr<DragDropGuiController> m_DragDropGuiController;
trabillard
Adds a a gui controller class to manage global actions across the application.
 r1111 std::unique_ptr<ActionsGuiController> m_ActionsGuiController;
trabillard
Toolbar for interactions modes
 r1000
SqpApplication::PlotsInteractionMode m_PlotInterractionMode;
SqpApplication::PlotsCursorMode m_PlotCursorMode;
perrinel
Initialisation de l'application multithread avec le spimpl....
 r21 };
SqpApplication::SqpApplication(int &argc, char **argv)
Alexandre Leroux
Minor fixes...
 r32 : QApplication{argc, argv}, impl{spimpl::make_unique_impl<SqpApplicationPrivate>()}
perrinel
Initialisation de l'application multithread avec le spimpl....
 r21 {
perrinel
Implement the network controller to permit the execution of a request...
 r389 qCDebug(LOG_SqpApplication()) << tr("SqpApplication construction") << QThread::currentThread();
perrinel
Initialisation de l'application multithread avec le spimpl....
 r21
connect(&impl->m_DataSourceControllerThread, &QThread::started,
impl->m_DataSourceController.get(), &DataSourceController::initialize);
connect(&impl->m_DataSourceControllerThread, &QThread::finished,
impl->m_DataSourceController.get(), &DataSourceController::finalize);
perrinel
Intialization of network controller
 r339 connect(&impl->m_NetworkControllerThread, &QThread::started, impl->m_NetworkController.get(),
&NetworkController::initialize);
connect(&impl->m_NetworkControllerThread, &QThread::finished, impl->m_NetworkController.get(),
&NetworkController::finalize);
Alexandre Leroux
Inits variable controller and adds it to the SciQlop app
 r111 connect(&impl->m_VariableControllerThread, &QThread::started, impl->m_VariableController.get(),
&VariableController::initialize);
connect(&impl->m_VariableControllerThread, &QThread::finished, impl->m_VariableController.get(),
&VariableController::finalize);
perrinel
add missing visualization thread call
 r55 connect(&impl->m_VisualizationControllerThread, &QThread::started,
impl->m_VisualizationController.get(), &VisualizationController::initialize);
connect(&impl->m_VisualizationControllerThread, &QThread::finished,
impl->m_VisualizationController.get(), &VisualizationController::finalize);
perrinel
Add the visualization controller
 r53
perrinel
Initialisation de l'application multithread avec le spimpl....
 r21 impl->m_DataSourceControllerThread.start();
perrinel
Intialization of network controller
 r339 impl->m_NetworkControllerThread.start();
Alexandre Leroux
Inits variable controller and adds it to the SciQlop app
 r111 impl->m_VariableControllerThread.start();
perrinel
add missing visualization thread call
 r55 impl->m_VisualizationControllerThread.start();
trabillard
unthread the catalogue controller
 r1291 impl->m_CatalogueController->initialize();
perrinel
Initialisation de l'application multithread avec le spimpl....
 r21 }
perrinel
MR for linux compilation
 r848 SqpApplication::~SqpApplication()
{
}
perrinel
Initialisation de l'application multithread avec le spimpl....
 r21
perrinel
MR for linux compilation
 r848 void SqpApplication::initialize()
{
}
Alexandre Leroux
Add access to DataSourceController from SqpApplication
 r33
Alexandre Leroux
Make access to controllers non-const (maybe the controller will be modified)
 r116 DataSourceController &SqpApplication::dataSourceController() noexcept
Alexandre Leroux
Add access to DataSourceController from SqpApplication
 r33 {
return *impl->m_DataSourceController;
}
perrinel
Add the visualization controller
 r53
perrinel
Intialization of network controller
 r339 NetworkController &SqpApplication::networkController() noexcept
{
return *impl->m_NetworkController;
}
perrinel
Time widget is now used with the variable createion request
 r193 TimeController &SqpApplication::timeController() noexcept
{
return *impl->m_TimeController;
}
Alexandre Leroux
Make access to controllers non-const (maybe the controller will be modified)
 r116 VariableController &SqpApplication::variableController() noexcept
Alexandre Leroux
Inits variable controller and adds it to the SciQlop app
 r111 {
return *impl->m_VariableController;
}
Alexandre Leroux
Make access to controllers non-const (maybe the controller will be modified)
 r116 VisualizationController &SqpApplication::visualizationController() noexcept
perrinel
Add the visualization controller
 r53 {
return *impl->m_VisualizationController;
}
trabillard
New helper class for the drag&drop
 r840
trabillard
Add catalogue controller to SqpApplication
 r1177 CatalogueController &SqpApplication::catalogueController() noexcept
{
return *impl->m_CatalogueController;
}
trabillard
Rename "DragDropHelper" in "DragDropGuiController"
 r1110 DragDropGuiController &SqpApplication::dragDropGuiController() noexcept
trabillard
New helper class for the drag&drop
 r840 {
trabillard
Rename "DragDropHelper" in "DragDropGuiController"
 r1110 return *impl->m_DragDropGuiController;
trabillard
New helper class for the drag&drop
 r840 }
trabillard
Toolbar for interactions modes
 r1000
trabillard
Adds a a gui controller class to manage global actions across the application.
 r1111 ActionsGuiController &SqpApplication::actionsGuiController() noexcept
{
return *impl->m_ActionsGuiController;
}
trabillard
Toolbar for interactions modes
 r1000 SqpApplication::PlotsInteractionMode SqpApplication::plotsInteractionMode() const
{
return impl->m_PlotInterractionMode;
}
void SqpApplication::setPlotsInteractionMode(SqpApplication::PlotsInteractionMode mode)
{
impl->m_PlotInterractionMode = mode;
}
SqpApplication::PlotsCursorMode SqpApplication::plotsCursorMode() const
{
return impl->m_PlotCursorMode;
}
void SqpApplication::setPlotsCursorMode(SqpApplication::PlotsCursorMode mode)
{
impl->m_PlotCursorMode = mode;
}