HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/SciQLOPCore Commit - r30:02d2d8643fcb

Fixed tests due to async var creation, plus minor stuff...

jeandet -

r30:02d2d8643fcb

parent child

Context file:

r30:02d2d8643fcb

include/Data/DataProviderParameters.h +1 -1

              */
             struct DataProviderParameters {
                 /// Times for which retrieve data
-                QVector<DateTimeRange> m_Times;
+                DateTimeRange m_Range;
                 /// Extra data that can be used by the provider to retrieve data
                 QVariantHash m_Data;
             };

include/Variable/VariableController2.h +2 -3

                 const std::vector<std::shared_ptr<Variable>> variables();
                 bool isReady(const std::shared_ptr<Variable>& variable);
+                bool isReady();
                 void synchronize(const std::shared_ptr<Variable>& var, const std::shared_ptr<Variable>& with);
                 const std::vector<std::shared_ptr<Variable>> variables(const std::vector<QUuid>& ids);
-                const std::shared_ptr<Variable>& operator[] (int index) const;
-                std::shared_ptr<Variable> operator[] (int index);
             signals:
                 void variableAdded(const std::shared_ptr<Variable>&);

include/Variable/VariableModel2.h +2 0

                                              const QModelIndex &parent) const override;
                 virtual bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column,
                                           const QModelIndex &parent) override;
+                const std::vector<std::shared_ptr<Variable>>& variables() const
+                {return _variables;}
             signals:
                 void createVariable(const QVariantHash &productData);

src/Variable/VariableController2.cpp +17 -11

                     return _transactions.active(*_maps.group(*variable));
                 }
+                bool hasPendingTransactions()
+                {
+                    bool has = false;
+                    for(const auto& var:_maps.variables())
+                    {
+                        has |= _transactions.active(*_maps.group(*var));
+                    }
+                    return has;
+                }
                 void deleteVariable(const std::shared_ptr<Variable>& variable)
                 {
                     _maps.removeVariable(variable);
             std::shared_ptr<Variable> VariableController2::createVariable(const QString &name, const QVariantHash &metadata, const std::shared_ptr<IDataProvider>& provider, const DateTimeRange &range)
             {
                 auto var =  impl->createVariable(name, metadata, provider);
+                var->setRange(range); // even with no data this is it's range
                 emit variableAdded(var);
                 if(!DateTimeRangeHelper::hasnan(range))
                     impl->asyncChangeRange(var,range);
             bool VariableController2::isReady(const std::shared_ptr<Variable> &variable)
             {
-                return impl->hasPendingTransactions(variable);
+                return !impl->hasPendingTransactions(variable);
+            }
+            bool VariableController2::isReady()
+            {
+                return !impl->hasPendingTransactions();
             }
             void VariableController2::synchronize(const std::shared_ptr<Variable> &var, const std::shared_ptr<Variable> &with)
                 }
                 return variables;
             }
-            const std::shared_ptr<Variable> &VariableController2::operator[](int index) const
-                return impl->variable (index);
-            std::shared_ptr<Variable> VariableController2::operator[](int index)
-                return impl->variable (index);

tests/TestUtils/TestProviders.h +2 -2

                 IDataSeries* getData(const DataProviderParameters &parameters) override
                 {
                     callCounter+=1;
-                    auto tstart = parameters.m_Times[0].m_TStart;
+                    auto tstart = parameters.m_Range.m_TStart;
-                    auto tend = parameters.m_Times[0].m_TEnd;
+                    auto tend = parameters.m_Range.m_TEnd;
                     std::vector<double> x;
                     std::vector<double> y;
                     for(double i = ceil(tstart);i<=floor(tend);i+=1.) //1 seconde data resolution

tests/Variable/TestVariableController2.cpp +2 0

                 auto range = DateTimeRange::fromDateTime(QDate(2018,8,7),QTime(14,00),\
                                                       QDate(2018,8,7),QTime(16,00));\
                 auto name = vc.createVariable("name", {}, provider, range);\
+                while(!vc.isReady(name))QCoreApplication::processEvents();\
             Q_DECLARE_METATYPE(DateTimeRangeTransformation);
                     bool callbackCalled = false;
                     connect(&vc,&VariableController2::variableDeleted, [&callbackCalled](std::shared_ptr<Variable>){callbackCalled=true;});
                     auto var1 = vc.createVariable("var1", {}, provider, range);
+                    while(!vc.isReady(var1))QCoreApplication::processEvents();
                     QVERIFY(SciQLop::containers::contains(vc.variables(), var1));
                     QVERIFY(!callbackCalled);
                     vc.deleteVariable(var1);

tests/Variable/TestVariableController2WithSync.cpp +2 0

                 auto range = DateTimeRange::fromDateTime(QDate(2018,8,7),QTime(14,00),\
                                                       QDate(2018,8,7),QTime(16,00));\
                 auto name1 = vc.createVariable("name1", {}, provider, range);\
+                while(!vc.isReady(name1))QCoreApplication::processEvents();\
                 auto name2 = vc.cloneVariable(name1);\
                 auto name3 = vc.cloneVariable(name2);\
                 vc.synchronize(name1,name2);\
+                while(!vc.isReady(name1))QCoreApplication::processEvents();\
             class TestVariableController2WithSync : public QObject

General Comments 0

Write
Preview

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

No TODOs yet

	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