From 54bb80251432ff49c967115f8401e7dafc5c57d6 Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Tue, 19 Dec 2017 22:00:05 -0200 Subject: Several implementations on math expression block --- Project/MathExpression.h | 68 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 Project/MathExpression.h (limited to 'Project/MathExpression.h') diff --git a/Project/MathExpression.h b/Project/MathExpression.h new file mode 100644 index 0000000..ce39aca --- /dev/null +++ b/Project/MathExpression.h @@ -0,0 +1,68 @@ +/* + * Copyright (C) 2017 Thales Lima Oliveira + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef MATHEXPRESSION_H +#define MATHEXPRESSION_H + +#include "ControlElement.h" +#include "MathExprParser.h" +#include "OpenGLText.h" + +class MathExpressionForm; + +/** + * @class MathExpression + * @author Thales Lima Oliveira + * @date 19/12/2017 + * @brief A generic math expression block that can perform math and conditional operations with the inputs. + * @file MathExpression.h + */ +class MathExpression : public ControlElement +{ + public: + MathExpression(int id); + ~MathExpression(); + + virtual void Draw(wxPoint2DDouble translation, double scale) const; + virtual bool Contains(wxPoint2DDouble position) const { return m_rect.Contains(position); } + virtual bool Intersects(wxRect2DDouble rect) const { return m_rect.Intersects(rect); } + virtual bool ShowForm(wxWindow* parent, Element* element); + virtual void Rotate(bool clockwise = true); + + virtual bool Solve(double input, double timeStep); + + virtual void UpdatePoints(); + void AddInNode(); + void RemoveInNode(); + + virtual Element* GetCopy(); + + protected: + void CalculateBlockSize(double numInNodes); + + MathExprParser m_fparser; + wxString m_mathExpression = "sqrt(x^2 + y^2)"; + wxString m_variables = "x,y"; + std::vector m_variablesVector; + std::vector m_glTextInputVector; + OpenGLText m_symbol; + wxSize m_symbolSize; + int m_maxSringSize = 0; + double m_minimumSize = 36.0; +}; + +#endif // MATHEXPRESSION_H -- cgit From c6d815b6b11504be68d7a97df63cfef749624418 Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Wed, 20 Dec 2017 20:45:35 -0200 Subject: Math expr GUI implemented --- Project/MathExpression.h | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'Project/MathExpression.h') diff --git a/Project/MathExpression.h b/Project/MathExpression.h index ce39aca..92b3796 100644 --- a/Project/MathExpression.h +++ b/Project/MathExpression.h @@ -22,6 +22,8 @@ #include "MathExprParser.h" #include "OpenGLText.h" +class ConnectionLine; + class MathExpressionForm; /** @@ -43,11 +45,18 @@ class MathExpression : public ControlElement virtual bool ShowForm(wxWindow* parent, Element* element); virtual void Rotate(bool clockwise = true); - virtual bool Solve(double input, double timeStep); + virtual bool Solve(double input, double timeStep, double currentTime); + virtual bool Initialize(); + virtual wxString GetMathExpression() { return m_mathExpression; } + virtual void SetMathExpression(wxString mathExpression) { m_mathExpression = mathExpression; } + virtual std::vector GetVariables() { return m_variablesVector; } + virtual void SetVariables(std::vector variablesVector); + virtual MathExprParser GetParser() { return m_fparser; } virtual void UpdatePoints(); void AddInNode(); void RemoveInNode(); + virtual bool UpdateText(); virtual Element* GetCopy(); @@ -56,8 +65,9 @@ class MathExpression : public ControlElement MathExprParser m_fparser; wxString m_mathExpression = "sqrt(x^2 + y^2)"; - wxString m_variables = "x,y"; + wxString m_variables = "time,step,x,y"; std::vector m_variablesVector; + double* m_inputValues = NULL; std::vector m_glTextInputVector; OpenGLText m_symbol; wxSize m_symbolSize; -- cgit From dbe0b112622f8e91fa3e44a6b6e1aa7e230d3ded Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Sun, 31 Dec 2017 17:59:10 -0200 Subject: Math Expression implemented --- Project/MathExpression.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Project/MathExpression.h') diff --git a/Project/MathExpression.h b/Project/MathExpression.h index 92b3796..77894ef 100644 --- a/Project/MathExpression.h +++ b/Project/MathExpression.h @@ -45,7 +45,7 @@ class MathExpression : public ControlElement virtual bool ShowForm(wxWindow* parent, Element* element); virtual void Rotate(bool clockwise = true); - virtual bool Solve(double input, double timeStep, double currentTime); + virtual bool Solve(double* input, double timeStep); virtual bool Initialize(); virtual wxString GetMathExpression() { return m_mathExpression; } virtual void SetMathExpression(wxString mathExpression) { m_mathExpression = mathExpression; } -- cgit