From 2552edfb5608ae15600aac38622354fe46701002 Mon Sep 17 00:00:00 2001
From: Thales Lima Oliveira <thaleslima.ufu@gmail.com>
Date: Sat, 7 Oct 2017 17:56:03 -0300
Subject: MIMO fully implemented

Electromechanical adjusted
Some control editor bugfixes
---
 Project/ControlEditor.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'Project/ControlEditor.h')

diff --git a/Project/ControlEditor.h b/Project/ControlEditor.h
index dfa76ab..315efec 100644
--- a/Project/ControlEditor.h
+++ b/Project/ControlEditor.h
@@ -140,7 +140,7 @@ class ControlEditor : public ControlEditorBase
     void BuildControlElementPanel();
     void SetViewport();
     void ConsolidateTexts();
-    void SetLastElementID();
+    int GetNextID();
 
     std::vector<ConnectionLine*>::iterator DeleteLineFromList(std::vector<ConnectionLine*>::iterator& it);
 
@@ -160,8 +160,6 @@ class ControlEditor : public ControlEditorBase
     bool m_firstDraw = true;
     int m_ioFlags;
 
-    int m_lastElementID = 0;
-
     int m_inputType = 0;
     double m_startTime = 1.0;
     double m_slope = 1.0;
-- 
cgit 


From eea796f53f5d9dc1444a620713b3326f04b73339 Mon Sep 17 00:00:00 2001
From: Thales Lima Oliveira <thaleslima.ufu@gmail.com>
Date: Mon, 9 Oct 2017 22:17:10 -0300
Subject: Divider control element implemented

Abstract class math operations implemented
Divider need to be redesigned
Expor/import divider functions implemented but supressed
---
 Project/ControlEditor.h | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'Project/ControlEditor.h')

diff --git a/Project/ControlEditor.h b/Project/ControlEditor.h
index 315efec..5383e85 100644
--- a/Project/ControlEditor.h
+++ b/Project/ControlEditor.h
@@ -44,6 +44,8 @@ class RateLimiter;
 class Exponential;
 class Constant;
 class Gain;
+class MathOperation;
+class Divider;
 
 class ControlElementSolver;
 class ControlElementContainer;
@@ -51,7 +53,18 @@ class ControlElementContainer;
 class ChartView;
 class ElementDataObject;
 
-enum ControlElementButtonID { ID_IO = 0, ID_TF, ID_SUM, ID_CONST, ID_LIMITER, ID_GAIN, ID_MULT, ID_EXP, ID_RATELIM };
+enum ControlElementButtonID {
+    ID_IO = 0,
+    ID_TF,
+    ID_SUM,
+    ID_CONST,
+    ID_LIMITER,
+    ID_GAIN,
+    ID_MULT,
+    ID_EXP,
+    ID_RATELIM,
+    ID_MATH_DIV
+};
 
 /**
  * @class ControlElementButton
-- 
cgit