From 54bb80251432ff49c967115f8401e7dafc5c57d6 Mon Sep 17 00:00:00 2001
From: Thales Lima Oliveira <thaleslima.ufu@gmail.com>
Date: Tue, 19 Dec 2017 22:00:05 -0200
Subject: Several implementations on math expression block

---
 Project/MathExpressionForm.h | 48 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 Project/MathExpressionForm.h

(limited to 'Project/MathExpressionForm.h')

diff --git a/Project/MathExpressionForm.h b/Project/MathExpressionForm.h
new file mode 100644
index 0000000..03fb134
--- /dev/null
+++ b/Project/MathExpressionForm.h
@@ -0,0 +1,48 @@
+/*
+ *  Copyright (C) 2017  Thales Lima Oliveira <thales@ufu.br>
+ *
+ *  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 <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef MATHEXPRESSIONFORM_H
+#define MATHEXPRESSIONFORM_H
+
+#include "base/ElementFormBase.h"
+#include "MathExprParser.h"
+#include <wx/msgdlg.h>
+
+class MathExpression;
+
+class MathExpressionForm : public MathExpressionFormBase
+{
+public:
+    MathExpressionForm(wxWindow* parent, MathExpression* mathEpr);
+    virtual ~MathExpressionForm();
+protected:
+    bool ValidateData();
+    void SetSintaxHighlights();
+    std::string GetVariablesToParse();
+    virtual void OnCancelButtonClick(wxCommandEvent& event) { EndModal(wxID_CANCEL); }
+    virtual void OnCheckButtonClick(wxCommandEvent& event);
+    virtual void OnOKButtonClick(wxCommandEvent& event);
+    virtual void OnTextEnter(wxCommandEvent& event) {}
+    virtual void OnTextUpdate(wxCommandEvent& event);
+    virtual void OnLeftClickDown(wxMouseEvent& event);
+    
+    std::vector<wxString> m_translatedErrorMsg;
+    
+    wxWindow* m_parent;
+    MathExpression* m_mathEpr;
+};
+#endif // MATHEXPRESSIONFORM_H
-- 
cgit 


From c6d815b6b11504be68d7a97df63cfef749624418 Mon Sep 17 00:00:00 2001
From: Thales Lima Oliveira <thaleslima.ufu@gmail.com>
Date: Wed, 20 Dec 2017 20:45:35 -0200
Subject: Math expr GUI implemented

---
 Project/MathExpressionForm.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'Project/MathExpressionForm.h')

diff --git a/Project/MathExpressionForm.h b/Project/MathExpressionForm.h
index 03fb134..c0ff4b9 100644
--- a/Project/MathExpressionForm.h
+++ b/Project/MathExpressionForm.h
@@ -19,7 +19,6 @@
 #define MATHEXPRESSIONFORM_H
 
 #include "base/ElementFormBase.h"
-#include "MathExprParser.h"
 #include <wx/msgdlg.h>
 
 class MathExpression;
@@ -27,11 +26,12 @@ class MathExpression;
 class MathExpressionForm : public MathExpressionFormBase
 {
 public:
-    MathExpressionForm(wxWindow* parent, MathExpression* mathEpr);
+    MathExpressionForm(wxWindow* parent, MathExpression* mathExpr);
     virtual ~MathExpressionForm();
 protected:
     bool ValidateData();
     void SetSintaxHighlights();
+    bool CheckMathExpression();
     std::string GetVariablesToParse();
     virtual void OnCancelButtonClick(wxCommandEvent& event) { EndModal(wxID_CANCEL); }
     virtual void OnCheckButtonClick(wxCommandEvent& event);
@@ -43,6 +43,6 @@ protected:
     std::vector<wxString> m_translatedErrorMsg;
     
     wxWindow* m_parent;
-    MathExpression* m_mathEpr;
+    MathExpression* m_mathExpr;
 };
 #endif // MATHEXPRESSIONFORM_H
-- 
cgit