GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Files · gui/src/SqpApplication.cpp

Add current progression for thread fix

perrinel - - Load All Authors

File last commit:

r338:858bcca39f5d


                r338:858bcca39f5d

Download file

             SqpApplication.cpp
        
                    127 lines
            
             | 5.0 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"

        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>

      #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>

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

        perrinel
    
Time widget is now used with the variable createion request

              r193
            
                    m_TimeController{std::make_unique<TimeController>()},

        Alexandre Leroux
    
Inits variable controller and adds it to the SciQlop app

              r111
            
                    m_VariableController{std::make_unique<VariableController>()},

        perrinel
    
add missing visualization thread call

              r55
            
                    m_VisualizationController{std::make_unique<VisualizationController>()}

        Alexandre Leroux
    
Minor fixes...

              r32
            
          {

        perrinel
    
Add current progression for thread fix

              r338
            
              QThread::currentThread()->setObjectName("MainThread");

              m_DataSourceController->moveToThread(&m_DataSourceControllerThread);

              m_DataSourceControllerThread.setObjectName("DataSourceControllerThread");

              m_VariableController->moveToThread(&m_VariableControllerThread);

              m_VariableControllerThread.setObjectName("VariableControllerThread");

              m_VisualizationController->moveToThread(&m_VisualizationControllerThread);

              m_VisualizationControllerThread.setObjectName("VisualizationControllerThread");

        Alexandre Leroux
    
Makes the connection between Data source controller and Variable controller...

              r169
            
              // /////////////////////////////// //

              // Connections between controllers //

              // /////////////////////////////// //

              // VariableController <-> DataSourceController

              connect(m_DataSourceController.get(),

                      SIGNAL(variableCreationRequested(const QString &, std::shared_ptr<IDataProvider>)),

                      m_VariableController.get(),

                      SLOT(createVariable(const QString &, std::shared_ptr<IDataProvider>)));

        Alexandre Leroux
    
Makes the connection between Variable controller and Visualization controller...

              r170
            
              // VariableController <-> VisualizationController

              connect(m_VariableController.get(), SIGNAL(variableCreated(std::shared_ptr<Variable>)),

                      m_VisualizationController.get(),

        Alexandre Leroux
    
Removes VisualizationController::onVariableCreated() slot...

              r174
            
                      SIGNAL(variableCreated(std::shared_ptr<Variable>)));

        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
    
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
            
          {

        Alexandre Leroux
    
Minor fixes...

              r32
            
              qCInfo(LOG_SqpApplication()) << tr("SqpApplicationPrivate destruction");

        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
            
        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
    
Add the visualization controller

              r53
            
          std::unique_ptr<VisualizationController> m_VisualizationController;

        perrinel
    
Initialisation de l'application multithread avec le spimpl....

              r21
            
          QThread m_DataSourceControllerThread;

        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;

        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
            
      {

        Alexandre Leroux
    
Minor fixes...

              r32
            
          qCInfo(LOG_SqpApplication()) << tr("SqpApplication construction");

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

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

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

        perrinel
    
Initialisation de l'application multithread avec le spimpl....

              r21
            
      }

      SqpApplication::~SqpApplication()

      {

      }

      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
    
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;

      }

	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

perrinel Initialisation de l'application multithread avec le spimpl....	r21	#include "SqpApplication.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>
		#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>
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>()},
perrinel Time widget is now used with the variable createion request	r193	m_TimeController{std::make_unique<TimeController>()},
Alexandre Leroux Inits variable controller and adds it to the SciQlop app	r111	m_VariableController{std::make_unique<VariableController>()},
perrinel add missing visualization thread call	r55	m_VisualizationController{std::make_unique<VisualizationController>()}
Alexandre Leroux Minor fixes...	r32	{
perrinel Add current progression for thread fix	r338	QThread::currentThread()->setObjectName("MainThread");
		m_DataSourceController->moveToThread(&m_DataSourceControllerThread);
		m_DataSourceControllerThread.setObjectName("DataSourceControllerThread");
		m_VariableController->moveToThread(&m_VariableControllerThread);
		m_VariableControllerThread.setObjectName("VariableControllerThread");
		m_VisualizationController->moveToThread(&m_VisualizationControllerThread);
		m_VisualizationControllerThread.setObjectName("VisualizationControllerThread");

Alexandre Leroux Makes the connection between Data source controller and Variable controller...	r169	// /////////////////////////////// //
		// Connections between controllers //
		// /////////////////////////////// //

		// VariableController <-> DataSourceController
		connect(m_DataSourceController.get(),
		SIGNAL(variableCreationRequested(const QString &, std::shared_ptr<IDataProvider>)),
		m_VariableController.get(),
		SLOT(createVariable(const QString &, std::shared_ptr<IDataProvider>)));

Alexandre Leroux Makes the connection between Variable controller and Visualization controller...	r170	// VariableController <-> VisualizationController
		connect(m_VariableController.get(), SIGNAL(variableCreated(std::shared_ptr<Variable>)),
		m_VisualizationController.get(),
Alexandre Leroux Removes VisualizationController::onVariableCreated() slot...	r174	SIGNAL(variableCreated(std::shared_ptr<Variable>)));
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 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	{
Alexandre Leroux Minor fixes...	r32	qCInfo(LOG_SqpApplication()) << tr("SqpApplicationPrivate destruction");
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
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 Add the visualization controller	r53	std::unique_ptr<VisualizationController> m_VisualizationController;
perrinel Initialisation de l'application multithread avec le spimpl....	r21	QThread m_DataSourceControllerThread;
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;
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	{
Alexandre Leroux Minor fixes...	r32	qCInfo(LOG_SqpApplication()) << tr("SqpApplication construction");
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);

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();
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();
perrinel Initialisation de l'application multithread avec le spimpl....	r21	}

		SqpApplication::~SqpApplication()
		{
		}

		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 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;
		}