diff options
author | rtk0c <[email protected]> | 2021-05-06 21:56:40 -0700 |
---|---|---|
committer | rtk0c <[email protected]> | 2021-05-06 21:56:40 -0700 |
commit | 1fd1e4b5f2418e3ac2909658993bfedb615537ec (patch) | |
tree | 6de080d2273890f8a74d7fcd3572bb44f44ac545 /core/src/Model/Workflow/Nodes | |
parent | 538e804fc9beb83e711a210ffbb6badc15f285d5 (diff) |
Change brace style to on new line, add initial deliveries view when an order entry is selected
Diffstat (limited to 'core/src/Model/Workflow/Nodes')
-rw-r--r-- | core/src/Model/Workflow/Nodes/DocumentNodes.cpp | 9 | ||||
-rw-r--r-- | core/src/Model/Workflow/Nodes/DocumentNodes.hpp | 3 | ||||
-rw-r--r-- | core/src/Model/Workflow/Nodes/NumericNodes.cpp | 24 | ||||
-rw-r--r-- | core/src/Model/Workflow/Nodes/NumericNodes.hpp | 9 | ||||
-rw-r--r-- | core/src/Model/Workflow/Nodes/TextNodes.cpp | 51 | ||||
-rw-r--r-- | core/src/Model/Workflow/Nodes/TextNodes.hpp | 9 | ||||
-rw-r--r-- | core/src/Model/Workflow/Nodes/UserInputNodes.cpp | 18 | ||||
-rw-r--r-- | core/src/Model/Workflow/Nodes/UserInputNodes.hpp | 6 |
8 files changed, 86 insertions, 43 deletions
diff --git a/core/src/Model/Workflow/Nodes/DocumentNodes.cpp b/core/src/Model/Workflow/Nodes/DocumentNodes.cpp index 255d446..b858b49 100644 --- a/core/src/Model/Workflow/Nodes/DocumentNodes.cpp +++ b/core/src/Model/Workflow/Nodes/DocumentNodes.cpp @@ -3,13 +3,16 @@ #include "Model/Workflow/Evaluation.hpp" #include "Model/Workflow/Values/BasicValues.hpp" -bool DocumentTemplateExpansionNode::IsInstance(const WorkflowNode* node) { +bool DocumentTemplateExpansionNode::IsInstance(const WorkflowNode* node) +{ return node->GetKind() == KD_DocumentTemplateExpansion; } DocumentTemplateExpansionNode::DocumentTemplateExpansionNode() - : WorkflowNode(KD_DocumentTemplateExpansion) { + : WorkflowNode(KD_DocumentTemplateExpansion) +{ } -void DocumentTemplateExpansionNode::Evaluate(WorkflowEvaluationContext& ctx) { +void DocumentTemplateExpansionNode::Evaluate(WorkflowEvaluationContext& ctx) +{ } diff --git a/core/src/Model/Workflow/Nodes/DocumentNodes.hpp b/core/src/Model/Workflow/Nodes/DocumentNodes.hpp index 3b775ec..85bba9e 100644 --- a/core/src/Model/Workflow/Nodes/DocumentNodes.hpp +++ b/core/src/Model/Workflow/Nodes/DocumentNodes.hpp @@ -2,7 +2,8 @@ #include "Model/Workflow/Workflow.hpp" -class DocumentTemplateExpansionNode : public WorkflowNode { +class DocumentTemplateExpansionNode : public WorkflowNode +{ public: static bool IsInstance(const WorkflowNode* node); DocumentTemplateExpansionNode(); diff --git a/core/src/Model/Workflow/Nodes/NumericNodes.cpp b/core/src/Model/Workflow/Nodes/NumericNodes.cpp index f054421..138b35d 100644 --- a/core/src/Model/Workflow/Nodes/NumericNodes.cpp +++ b/core/src/Model/Workflow/Nodes/NumericNodes.cpp @@ -8,7 +8,8 @@ #include <cassert> #include <utility> -WorkflowNode::Kind NumericOperationNode::OperationTypeToNodeKind(OperationType type) { +WorkflowNode::Kind NumericOperationNode::OperationTypeToNodeKind(OperationType type) +{ switch (type) { case Addition: return KD_NumericAddition; case Subtraction: return KD_NumericSubtraction; @@ -18,7 +19,8 @@ WorkflowNode::Kind NumericOperationNode::OperationTypeToNodeKind(OperationType t } } -NumericOperationNode::OperationType NumericOperationNode::NodeKindToOperationType(Kind kind) { +NumericOperationNode::OperationType NumericOperationNode::NodeKindToOperationType(Kind kind) +{ switch (kind) { case KD_NumericAddition: return Addition; case KD_NumericSubtraction: return Subtraction; @@ -28,13 +30,15 @@ NumericOperationNode::OperationType NumericOperationNode::NodeKindToOperationTyp } } -bool NumericOperationNode::IsInstance(const WorkflowNode* node) { +bool NumericOperationNode::IsInstance(const WorkflowNode* node) +{ return node->GetKind() >= KD_NumericAddition && node->GetKind() <= KD_NumericDivision; } NumericOperationNode::NumericOperationNode(OperationType type) : WorkflowNode(OperationTypeToNodeKind(type)) - , mType{ type } { + , mType{ type } +{ mInputs.resize(2); mInputs[0].MatchingType = BaseValue::KD_Numeric; mInputs[1].MatchingType = BaseValue::KD_Numeric; @@ -43,7 +47,8 @@ NumericOperationNode::NumericOperationNode(OperationType type) mOutputs[0].MatchingType = BaseValue::KD_Numeric; } -void NumericOperationNode::Evaluate(WorkflowEvaluationContext& ctx) { +void NumericOperationNode::Evaluate(WorkflowEvaluationContext& ctx) +{ auto lhsVal = dyn_cast<NumericValue>(ctx.GetConnectionValue(mInputs[0])); if (!lhsVal) return; double lhs = lhsVal->GetValue(); @@ -74,13 +79,16 @@ void NumericOperationNode::Evaluate(WorkflowEvaluationContext& ctx) { ctx.SetConnectionValue(mOutputs[0], std::move(value)); } -bool NumericExpressionNode::IsInstance(const WorkflowNode* node) { +bool NumericExpressionNode::IsInstance(const WorkflowNode* node) +{ return node->GetKind() == KD_NumericExpression; } NumericExpressionNode::NumericExpressionNode() - : WorkflowNode(KD_NumericExpression) { + : WorkflowNode(KD_NumericExpression) +{ } -void NumericExpressionNode::Evaluate(WorkflowEvaluationContext& ctx) { +void NumericExpressionNode::Evaluate(WorkflowEvaluationContext& ctx) +{ } diff --git a/core/src/Model/Workflow/Nodes/NumericNodes.hpp b/core/src/Model/Workflow/Nodes/NumericNodes.hpp index 32610f6..56c0313 100644 --- a/core/src/Model/Workflow/Nodes/NumericNodes.hpp +++ b/core/src/Model/Workflow/Nodes/NumericNodes.hpp @@ -7,9 +7,11 @@ #include <variant> #include <vector> -class NumericOperationNode : public WorkflowNode { +class NumericOperationNode : public WorkflowNode +{ public: - enum OperationType { + enum OperationType + { Addition, Subtraction, Multiplication, @@ -31,7 +33,8 @@ public: virtual void Evaluate(WorkflowEvaluationContext& ctx) override; }; -class NumericExpressionNode : public WorkflowNode { +class NumericExpressionNode : public WorkflowNode +{ public: static bool IsInstance(const WorkflowNode* node); NumericExpressionNode(); diff --git a/core/src/Model/Workflow/Nodes/TextNodes.cpp b/core/src/Model/Workflow/Nodes/TextNodes.cpp index 72bd666..944fc07 100644 --- a/core/src/Model/Workflow/Nodes/TextNodes.cpp +++ b/core/src/Model/Workflow/Nodes/TextNodes.cpp @@ -11,10 +11,12 @@ #include <variant> #include <vector> -class TextFormatterNode::Impl { +class TextFormatterNode::Impl +{ public: template <class TFunction> - static void ForArguments(std::vector<Element>::iterator begin, std::vector<Element>::iterator end, const TFunction& func) { + static void ForArguments(std::vector<Element>::iterator begin, std::vector<Element>::iterator end, const TFunction& func) + { for (auto it = begin; it != end; ++it) { auto& elm = *it; if (auto arg = std::get_if<Argument>(&elm)) { @@ -24,7 +26,8 @@ public: } /// Find the pin index that the \c elmIdx -th element should have, based on the elements coming before it. - static int FindPinForElement(const std::vector<Element>& vec, int elmIdx) { + static int FindPinForElement(const std::vector<Element>& vec, int elmIdx) + { for (int i = elmIdx; i >= 0; --i) { auto& elm = vec[i]; if (auto arg = std::get_if<Argument>(&elm)) { @@ -35,7 +38,8 @@ public: } }; -BaseValue::Kind TextFormatterNode::ArgumentTypeToValueKind(TextFormatterNode::ArgumentType arg) { +BaseValue::Kind TextFormatterNode::ArgumentTypeToValueKind(TextFormatterNode::ArgumentType arg) +{ switch (arg) { case NumericArgument: return BaseValue::KD_Numeric; case TextArgument: return BaseValue::KD_Text; @@ -44,23 +48,28 @@ BaseValue::Kind TextFormatterNode::ArgumentTypeToValueKind(TextFormatterNode::Ar } } -bool TextFormatterNode::IsInstance(const WorkflowNode* node) { +bool TextFormatterNode::IsInstance(const WorkflowNode* node) +{ return node->GetKind() == KD_TextFormatting; } TextFormatterNode::TextFormatterNode() - : WorkflowNode(KD_TextFormatting) { + : WorkflowNode(KD_TextFormatting) +{ } -int TextFormatterNode::GetElementCount() const { +int TextFormatterNode::GetElementCount() const +{ return mElements.size(); } -const TextFormatterNode::Element& TextFormatterNode::GetElement(int idx) const { +const TextFormatterNode::Element& TextFormatterNode::GetElement(int idx) const +{ return mElements[idx]; } -void TextFormatterNode::SetElement(int idx, std::string text) { +void TextFormatterNode::SetElement(int idx, std::string text) +{ assert(idx >= 0 && idx < mElements.size()); std::visit( @@ -74,7 +83,8 @@ void TextFormatterNode::SetElement(int idx, std::string text) { mElements[idx] = std::move(text); } -void TextFormatterNode::SetElement(int idx, ArgumentType argument) { +void TextFormatterNode::SetElement(int idx, ArgumentType argument) +{ assert(idx >= 0 && idx < mElements.size()); std::visit( @@ -106,7 +116,8 @@ void TextFormatterNode::SetElement(int idx, ArgumentType argument) { mElements[idx]); } -void TextFormatterNode::InsertElement(int idx, std::string text) { +void TextFormatterNode::InsertElement(int idx, std::string text) +{ assert(idx >= 0); if (idx >= mElements.size()) AppendElement(std::move(text)); @@ -114,7 +125,8 @@ void TextFormatterNode::InsertElement(int idx, std::string text) { mElements.insert(mElements.begin() + idx, std::move(text)); } -void TextFormatterNode::InsertElement(int idx, ArgumentType argument) { +void TextFormatterNode::InsertElement(int idx, ArgumentType argument) +{ assert(idx >= 0); if (idx >= mElements.size()) AppendElement(argument); @@ -133,12 +145,14 @@ void TextFormatterNode::InsertElement(int idx, ArgumentType argument) { }); } -void TextFormatterNode::AppendElement(std::string text) { +void TextFormatterNode::AppendElement(std::string text) +{ mMinOutputChars += text.size(); mElements.push_back(std::move(text)); } -void TextFormatterNode::AppendElement(ArgumentType argument) { +void TextFormatterNode::AppendElement(ArgumentType argument) +{ int pinIdx = mInputs.size(); // Create pin mInputs.push_back(InputPin{}); @@ -150,7 +164,8 @@ void TextFormatterNode::AppendElement(ArgumentType argument) { }); } -void TextFormatterNode::RemoveElement(int idx) { +void TextFormatterNode::RemoveElement(int idx) +{ assert(idx >= 0 && idx < mElements.size()); PreRemoveElement(idx); @@ -160,7 +175,8 @@ void TextFormatterNode::RemoveElement(int idx) { mElements.erase(mElements.begin() + idx); } -void TextFormatterNode::Evaluate(WorkflowEvaluationContext& ctx) { +void TextFormatterNode::Evaluate(WorkflowEvaluationContext& ctx) +{ std::string result; result.reserve((size_t)(mMinOutputChars * 1.5f)); @@ -201,7 +217,8 @@ void TextFormatterNode::Evaluate(WorkflowEvaluationContext& ctx) { } } -void TextFormatterNode::PreRemoveElement(int idx) { +void TextFormatterNode::PreRemoveElement(int idx) +{ auto& elm = mElements[idx]; if (auto arg = std::get_if<Argument>(&elm)) { RemoveInputPin(arg->PinIdx); diff --git a/core/src/Model/Workflow/Nodes/TextNodes.hpp b/core/src/Model/Workflow/Nodes/TextNodes.hpp index 278db32..1beb145 100644 --- a/core/src/Model/Workflow/Nodes/TextNodes.hpp +++ b/core/src/Model/Workflow/Nodes/TextNodes.hpp @@ -7,9 +7,11 @@ #include <variant> #include <vector> -class TextFormatterNode : public WorkflowNode { +class TextFormatterNode : public WorkflowNode +{ public: - enum ArgumentType { + enum ArgumentType + { NumericArgument, TextArgument, DateTimeArgument, @@ -18,7 +20,8 @@ public: private: class Impl; - struct Argument { + struct Argument + { ArgumentType ArgumentType; int PinIdx; }; diff --git a/core/src/Model/Workflow/Nodes/UserInputNodes.cpp b/core/src/Model/Workflow/Nodes/UserInputNodes.cpp index 435cf6d..3a30631 100644 --- a/core/src/Model/Workflow/Nodes/UserInputNodes.cpp +++ b/core/src/Model/Workflow/Nodes/UserInputNodes.cpp @@ -3,24 +3,30 @@ #include "Model/Workflow/Evaluation.hpp" #include "Model/Workflow/Values/BasicValues.hpp" -bool FormInputNode::IsInstance(const WorkflowNode* node) { +bool FormInputNode::IsInstance(const WorkflowNode* node) +{ return node->GetKind() == KD_FormInput; } FormInputNode::FormInputNode() - : WorkflowNode(KD_FormInput) { + : WorkflowNode(KD_FormInput) +{ } -void FormInputNode::Evaluate(WorkflowEvaluationContext& ctx) { +void FormInputNode::Evaluate(WorkflowEvaluationContext& ctx) +{ } -bool DatabaseRowsInputNode::IsInstance(const WorkflowNode* node) { +bool DatabaseRowsInputNode::IsInstance(const WorkflowNode* node) +{ return node->GetKind() == KD_DatabaseRowsInput; } DatabaseRowsInputNode::DatabaseRowsInputNode() - : WorkflowNode(KD_DatabaseRowsInput) { + : WorkflowNode(KD_DatabaseRowsInput) +{ } -void DatabaseRowsInputNode::Evaluate(WorkflowEvaluationContext& ctx) { +void DatabaseRowsInputNode::Evaluate(WorkflowEvaluationContext& ctx) +{ } diff --git a/core/src/Model/Workflow/Nodes/UserInputNodes.hpp b/core/src/Model/Workflow/Nodes/UserInputNodes.hpp index fe66cb4..10ea95d 100644 --- a/core/src/Model/Workflow/Nodes/UserInputNodes.hpp +++ b/core/src/Model/Workflow/Nodes/UserInputNodes.hpp @@ -2,7 +2,8 @@ #include "Model/Workflow/Workflow.hpp" -class FormInputNode : public WorkflowNode { +class FormInputNode : public WorkflowNode +{ public: static bool IsInstance(const WorkflowNode* node); FormInputNode(); @@ -11,7 +12,8 @@ public: virtual void Evaluate(WorkflowEvaluationContext& ctx) override; }; -class DatabaseRowsInputNode : public WorkflowNode { +class DatabaseRowsInputNode : public WorkflowNode +{ public: static bool IsInstance(const WorkflowNode* node); DatabaseRowsInputNode(); |