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/ControlElementContainer.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'Project/ControlElementContainer.cpp')

diff --git a/Project/ControlElementContainer.cpp b/Project/ControlElementContainer.cpp
index 3c420e7..042f7f2 100644
--- a/Project/ControlElementContainer.cpp
+++ b/Project/ControlElementContainer.cpp
@@ -46,6 +46,8 @@ void ControlElementContainer::FillContainer(ControlEditor* editor)
             m_sumList.push_back(sum);
         } else if(TransferFunction* tf = dynamic_cast<TransferFunction*>(*it)) {
             m_tfList.push_back(tf);
+        } else if(Divider* divider = dynamic_cast<Divider*>(*it)) {
+            m_dividerList.push_back(divider);
         }
     }
 }
@@ -90,6 +92,8 @@ void ControlElementContainer::FillContainer(std::vector<ControlElement*> control
             m_sumList.push_back(sum);
         } else if(TransferFunction* tf = dynamic_cast<TransferFunction*>(*it)) {
             m_tfList.push_back(tf);
+        } else if(Divider* divider = dynamic_cast<Divider*>(*it)) {
+            m_dividerList.push_back(divider);
         }
     }
 }
-- 
cgit 


From 7fb65c6ec6148a75830ad25b7f76500c17db0f3b Mon Sep 17 00:00:00 2001
From: Thales Lima Oliveira <thaleslima.ufu@gmail.com>
Date: Wed, 11 Oct 2017 19:25:34 -0300
Subject: Divider save bug fixed

Control icons updated
Version to download updated
---
 Project/ControlElementContainer.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'Project/ControlElementContainer.cpp')

diff --git a/Project/ControlElementContainer.cpp b/Project/ControlElementContainer.cpp
index 042f7f2..9c9b1f1 100644
--- a/Project/ControlElementContainer.cpp
+++ b/Project/ControlElementContainer.cpp
@@ -64,6 +64,7 @@ void ControlElementContainer::ClearContainer()
     m_rateLimiterList.clear();
     m_sumList.clear();
     m_tfList.clear();
+    m_dividerList.clear();
 }
 
 void ControlElementContainer::FillContainer(std::vector<ControlElement*> controlElementList,
@@ -113,7 +114,7 @@ void ControlElementContainer::GetContainerCopy(std::vector<ControlElement*>& con
     // Copy elements (exept connection line).
     int nodeID = 0;
     for(auto it = m_ctrlElementsList.begin(), itEnd = m_ctrlElementsList.end(); it != itEnd; ++it) {
-        Element* oldElement = *it;
+        ControlElement* oldElement = *it;
         ControlElement* copy = static_cast<ControlElement*>(oldElement->GetCopy());
         controlElementList.push_back(copy);
         // Copy nodes.
-- 
cgit