GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation Commit - r209:9423975d81b3

Create a variable notify the variable cache parameter

perrinel -

r209:9423975d81b3

parent child

Context file:

r209:9423975d81b3

core/include/Variable/VariableCacheController.h created 644 +26 0

@@ -0,0 +1,26
	1	#ifndef SCIQLOP_VARIABLECACHECONTROLLER_H
	2	#define SCIQLOP_VARIABLECACHECONTROLLER_H
	3
	4	#include <QObject>
	5
	6	#include <Data/SqpDateTime.h>
	7
	8	#include <Common/spimpl.h>
	9
	10	class Variable;
	11
	12	/// This class aims to store in the cash all of the dateTime already requested to the variable.
	13	class VariableCacheController : public QObject {
	14	Q_OBJECT
	15	public:
	16	explicit VariableCacheController(QObject *parent = 0);
	17
	18
	19	void addDateTime(std::shared_ptr<Variable> variable, const SqpDateTime &dateTime);
	20
	21	private:
	22	class VariableCacheControllerPrivate;
	23	spimpl::unique_impl_ptr<VariableCacheControllerPrivate> impl;
	24	};
	25
	26	#endif // SCIQLOP_VARIABLECACHECONTROLLER_H

core/src/Variable/VariableCacheController.cpp created 644 +25 0

@@ -0,0 +1,25
	1	#include "Variable/VariableCacheController.h"
	2
	3	#include "Variable/Variable.h"
	4	#include <unordered_map>
	5
	6	struct VariableCacheController::VariableCacheControllerPrivate {
	7
	8	std::unordered_map<std::shared_ptr<Variable>, std::list<SqpDateTime> >
	9	m_VariableToSqpDateTimeListMap;
	10	};
	11
	12
	13	VariableCacheController::VariableCacheController(QObject *parent)
	14	: QObject(parent), impl{spimpl::make_unique_impl<VariableCacheControllerPrivate>()}
	15	{
	16	}
	17
	18	void VariableCacheController::addDateTime(std::shared_ptr<Variable> variable,
	19	const SqpDateTime &dateTime)
	20	{
	21	if (variable) {
	22	// TODO: squeeze the map to let it only some SqpDateTime without intersection
	23	impl->m_VariableToSqpDateTimeListMap[variable].push_back(dateTime);
	24	}
	25	}

core/src/Variable/VariableController.cpp +15 -2

+            #include <Variable/VariableCacheController.h>
             #include <Variable/VariableController.h>
             #include <Variable/VariableModel.h>
             #include <QMutex>
             #include <QThread>
+            #include <unordered_map>
             Q_LOGGING_CATEGORY(LOG_VariableController, "VariableController")
             namespace {
             struct VariableController::VariableControllerPrivate {
                 explicit VariableControllerPrivate(VariableController *parent)
-                        : m_WorkingMutex{}, m_VariableModel{new VariableModel{parent}}
+                        : m_WorkingMutex{},
+                          m_VariableModel{new VariableModel{parent}},
+                          m_VariableCacheController{std::make_unique<VariableCacheController>()}
            


        

    

      

  

      
          

              

                    
                        
                        note
                    

              
          
          
              
  

  
    
  
  

  

    
        perrinel
    
  

          

          
              Tue, 27 Jun 2017 15:57:15
          


          

              
                
              

          

                    
                    

            
              
              

                
                    Comment #1616
                    
                

                      
                      
                        Edit
                      
                      
                        Delete
                      
              
            

            |
                 
                 

          
      
      
          We can do both. But because all other controller are already using smart pointer. I think we can keep it here
                 {
                 }
                 /// Variable model. The VariableController has the ownership
                 VariableModel *m_VariableModel;
                 TimeController *m_TimeController{nullptr};
+                std::unique_ptr<VariableCacheController> m_VariableCacheController;
             };
             VariableController::VariableController(QObject *parent)
                 /// it will be retained later
                 /// - default data are generated for the variable, without taking into account the timerange set
                 /// in sciqlop
+                auto dateTime = impl->m_TimeController->dateTime();
                 if (auto newVariable = impl->m_VariableModel->createVariable(
-                        name, generateDefaultDataSeries(*provider, impl->m_TimeController->dateTime()))) {
+                        name, generateDefaultDataSeries(*provider, dateTime))) {
+                    // store in cache
+                    impl->m_VariableCacheController->addDateTime(newVariable, dateTime);
+                    // notify the creation
                     emit variableCreated(newVariable);
                 }
             }

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

	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