HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r1188:ea075ddc1542

Defines VariableState struct (2)...

Alexandre Leroux -

r1188:ea075ddc1542

parent child

Context file:

r1188:ea075ddc1542

Collapse all files

plugins/amda/tests/FuzzingOperations.cpp +16 -11

             namespace {
             struct CreateOperation : public IFuzzingOperation {
-                bool canExecute(std::shared_ptr<Variable> variable) const override
+                bool canExecute(const VariableState &variableState) const override
                 {
                     // A variable can be created only if it doesn't exist yet
-                    return variable == nullptr;
+                    return variableState.m_Variable == nullptr;
                 }
-                void execute(std::shared_ptr<Variable> &variable, VariableController &variableController,
+                void execute(VariableState &variableState, VariableController &variableController,
                              const Properties &properties) const override
                 {
                     // Retrieves metadata pool from properties, and choose one of the metadata entries to
                     auto newVariable
                         = variableController.createVariable(variableName, variableMetadata, variableProvider);
-                    std::swap(variable, newVariable);
+                    std::swap(variableState.m_Variable, newVariable);
                 }
             };
                 {
                 }
-                bool canExecute(std::shared_ptr<Variable> variable) const override
+                bool canExecute(const VariableState &variableState) const override
                 {
-                    return variable != nullptr;
+                    return variableState.m_Variable != nullptr;
                 }
-                void execute(std::shared_ptr<Variable> &variable, VariableController &variableController,
+                void execute(VariableState &variableState, VariableController &variableController,
                              const Properties &properties) const override
                 {
+                    auto variable = variableState.m_Variable;
                     // Gets the max range defined
                     auto maxRange = properties.value(MAX_RANGE_PROPERTY, QVariant::fromValue(INVALID_RANGE))
                                         .value<SqpRange>();
                         << "Performing" << m_Label << "on" << variable->name() << "(from" << variableRange
                         << "to" << newVariableRange << ")...";
                     variableController.onRequestDataLoading({variable}, newVariableRange, false);
+                    // Updates variable's state
+                    variableState.m_Range = newVariableRange;
                 }
                 MoveFunction m_RangeStartMoveFun;
             };
             struct UnknownOperation : public IFuzzingOperation {
-                bool canExecute(std::shared_ptr<Variable> variable) const override
+                bool canExecute(const VariableState &variableState) const override
                 {
-                    Q_UNUSED(variable);
+                    Q_UNUSED(variableState);
                     return false;
                 }
-                void execute(std::shared_ptr<Variable> &variable, VariableController &variableController,
+                void execute(VariableState &variableState, VariableController &variableController,
                              const Properties &properties) const override
                 {
-                    Q_UNUSED(variable);
+                    Q_UNUSED(variableState);
                     Q_UNUSED(variableController);
                     Q_UNUSED(properties);
                     // Does nothing

plugins/amda/tests/FuzzingOperations.h +8 -9

             Q_DECLARE_LOGGING_CATEGORY(LOG_FuzzingOperations)
-            class Variable;
             class VariableController;
             /**
             struct IFuzzingOperation {
                 virtual ~IFuzzingOperation() noexcept = default;
-                /// Checks if the operation can be executed according to the current state of the variable
+                /// Checks if the operation can be executed according to the current variable state passed in
-                /// passed in parameter
+                /// parameter
-                virtual bool canExecute(std::shared_ptr<Variable> variable) const = 0;
+                virtual bool canExecute(const VariableState &variableState) const = 0;
-                /// Executes the operation on the variable passed in parameter
+                /// Executes the operation on the variable state passed in parameter
-                /// @param variable the variable on which to execute the operation
+                /// @param variableState the variable state on which to execute the operation
                 /// @param variableController the controller associated to the operation
                 /// @param properties properties that can be used to configure the operation
-                /// @remarks variable is passed as a reference because, according to the operation, it can be
+                /// @remarks variableState is passed as a reference because, according to the operation, it can
+                /// be
                 /// modified (in/out parameter)
-                virtual void execute(std::shared_ptr<Variable> &variable,
+                virtual void execute(VariableState &variableState, VariableController &variableController,
-                                     VariableController &variableController,
                                      const Properties &properties = {}) const = 0;
             };

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