From cef9e14b989a3ba19321e4fe215ada2ee3998037 Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Wed, 3 Jan 2018 19:01:57 -0200 Subject: Some file hand. organization and generalization --- Project/ControlElement.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'Project/ControlElement.h') diff --git a/Project/ControlElement.h b/Project/ControlElement.h index dbff95e..84e23b6 100644 --- a/Project/ControlElement.h +++ b/Project/ControlElement.h @@ -58,6 +58,7 @@ class Node void SetConnected(bool connected = true) { m_connected = connected; } int GetID() const { return m_id; } void SetID(int id) { m_id = id; } + protected: int m_id = -1; @@ -94,7 +95,7 @@ class ControlElement : public Element std::vector GetNodeList() const { return m_nodeList; } virtual void DrawNodes() const; virtual void ReplaceNode(Node* oldNode, Node* newNode); - + /** * @brief Update the OpenGL text in the element (if present). * @return true if OpenGLText is ok, false otherwise. @@ -106,10 +107,20 @@ class ControlElement : public Element virtual bool Initialize() { return true; } virtual double GetOutput() const { return m_output; } virtual void SetOutput(double output) { m_output = output; } + + static ControlElement* GetControlElementFromID(std::vector elementList, int id); + + // File handling methods + void SaveControlNodes(rapidxml::xml_document<>& doc, rapidxml::xml_node<>* nodesN, std::vector nodeList); + bool OpenControlNodeList(rapidxml::xml_node<>* elementNode, std::vector& nodeVector); + protected: std::vector m_nodeList; bool m_solved = false; double m_output = 0.0; + + void SaveControlNodes(rapidxml::xml_document<>& doc, rapidxml::xml_node<>* elementNode); + bool OpenControlNodes(rapidxml::xml_node<>* elementNode); }; #endif // CONTROLELEMENT_H -- cgit From 76df1de5e2307229da9870306e4a1031170aaadf Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Thu, 4 Jan 2018 19:11:08 -0200 Subject: Control elements file handling reorganized --- Project/ControlElement.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'Project/ControlElement.h') diff --git a/Project/ControlElement.h b/Project/ControlElement.h index 84e23b6..6d1593f 100644 --- a/Project/ControlElement.h +++ b/Project/ControlElement.h @@ -109,10 +109,6 @@ class ControlElement : public Element virtual void SetOutput(double output) { m_output = output; } static ControlElement* GetControlElementFromID(std::vector elementList, int id); - - // File handling methods - void SaveControlNodes(rapidxml::xml_document<>& doc, rapidxml::xml_node<>* nodesN, std::vector nodeList); - bool OpenControlNodeList(rapidxml::xml_node<>* elementNode, std::vector& nodeVector); protected: std::vector m_nodeList; -- cgit From c11a42ee83fcf535557d4f2cc259efae2da1b7ff Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Mon, 8 Jan 2018 20:07:47 -0200 Subject: File handling and control initialization organized --- Project/ControlElement.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Project/ControlElement.h') diff --git a/Project/ControlElement.h b/Project/ControlElement.h index 6d1593f..51f8df3 100644 --- a/Project/ControlElement.h +++ b/Project/ControlElement.h @@ -104,7 +104,7 @@ class ControlElement : public Element virtual bool IsSolved() const { return m_solved; } virtual void SetSolved(bool solved = true) { m_solved = solved; } virtual bool Solve(double* input, double timeStep); - virtual bool Initialize() { return true; } + virtual bool Initialize(); virtual double GetOutput() const { return m_output; } virtual void SetOutput(double output) { m_output = output; } -- cgit