From d13b7013afa5ba1d40ee52e77eabd43bfd1b4acd Mon Sep 17 00:00:00 2001
From: Thales Lima Oliveira <thaleslima.ufu@gmail.com>
Date: Fri, 7 Apr 2017 17:49:47 -0300
Subject: generic controls gui implemented

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

(limited to 'Project/ControlElementContainer.h')

diff --git a/Project/ControlElementContainer.h b/Project/ControlElementContainer.h
new file mode 100644
index 0000000..0e2adc0
--- /dev/null
+++ b/Project/ControlElementContainer.h
@@ -0,0 +1,50 @@
+#ifndef CONTROLELEMENTCONTAINER_H
+#define CONTROLELEMENTCONTAINER_H
+
+class ControlEditor;
+
+class ControlElement;
+class ConnectionLine;
+class Constant;
+class Exponential;
+class Gain;
+class IOControl;
+class Limiter;
+class Multiplier;
+class RateLimiter;
+class Sum;
+class TransferFunction;
+
+class ControlElementContainer
+{
+   public:
+    ControlElementContainer();
+    ~ControlElementContainer();
+
+    virtual void FillContainer(ControlEditor* editor);
+    virtual void ClearContainer();
+
+    std::vector<ConnectionLine*> GetConnectionLineList() const { return m_cLineList; }
+    std::vector<Constant*> GetConstantList() const { return m_constantList; }
+    std::vector<Exponential*> GetExponentialList() const { return m_exponentialList; }
+    std::vector<Gain*> GetGainList() const { return m_gainList; }
+    std::vector<IOControl*> GetIOControlList() const { return m_ioControlList; }
+    std::vector<Limiter*> GetLimiterList() const { return m_limiterList; }
+    std::vector<Multiplier*> GetMultiplierList() const { return m_multiplierList; }
+    std::vector<RateLimiter*> GetRateLimiterList() const { return m_rateLimiterList; }
+    std::vector<Sum*> GetSumList() const { return m_sumList; }
+    std::vector<TransferFunction*> GetTFList() const { return m_tfList; }
+   protected:
+    std::vector<ConnectionLine*> m_cLineList;
+    std::vector<Constant*> m_constantList;
+    std::vector<Exponential*> m_exponentialList;
+    std::vector<Gain*> m_gainList;
+    std::vector<IOControl*> m_ioControlList;
+    std::vector<Limiter*> m_limiterList;
+    std::vector<Multiplier*> m_multiplierList;
+    std::vector<RateLimiter*> m_rateLimiterList;
+    std::vector<Sum*> m_sumList;
+    std::vector<TransferFunction*> m_tfList;
+};
+
+#endif  // CONTROLELEMENTCONTAINER_H
-- 
cgit 


From f19803bc64885bcfaef15cfd7a8139c28d3dd506 Mon Sep 17 00:00:00 2001
From: Thales Lima Oliveira <thaleslima.ufu@gmail.com>
Date: Sat, 8 Apr 2017 16:31:25 -0300
Subject: Control editor export under implementation

File handling
---
 Project/ControlElementContainer.h | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'Project/ControlElementContainer.h')

diff --git a/Project/ControlElementContainer.h b/Project/ControlElementContainer.h
index 0e2adc0..5ff218f 100644
--- a/Project/ControlElementContainer.h
+++ b/Project/ControlElementContainer.h
@@ -1,19 +1,21 @@
 #ifndef CONTROLELEMENTCONTAINER_H
 #define CONTROLELEMENTCONTAINER_H
 
-class ControlEditor;
+#include <vector>
 
+class ControlEditor;
 class ControlElement;
-class ConnectionLine;
-class Constant;
-class Exponential;
-class Gain;
-class IOControl;
-class Limiter;
-class Multiplier;
-class RateLimiter;
-class Sum;
-class TransferFunction;
+
+#include "ConnectionLine.h"
+#include "Constant.h"
+#include "Exponential.h"
+#include "Gain.h"
+#include "IOControl.h"
+#include "Limiter.h"
+#include "Multiplier.h"
+#include "RateLimiter.h"
+#include "Sum.h"
+#include "TransferFunction.h"
 
 class ControlElementContainer
 {
-- 
cgit 


From b43f89144d6122b3100efb3971c8fa32a3001888 Mon Sep 17 00:00:00 2001
From: Thales Lima Oliveira <thaleslima.ufu@gmail.com>
Date: Tue, 18 Apr 2017 19:05:35 -0300
Subject: Some bugfixes and generalization

---
 Project/ControlElementContainer.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'Project/ControlElementContainer.h')

diff --git a/Project/ControlElementContainer.h b/Project/ControlElementContainer.h
index 5ff218f..119ba82 100644
--- a/Project/ControlElementContainer.h
+++ b/Project/ControlElementContainer.h
@@ -24,8 +24,10 @@ class ControlElementContainer
     ~ControlElementContainer();
 
     virtual void FillContainer(ControlEditor* editor);
+    virtual void FillContainer(std::vector<ControlElement*> controlElementList, std::vector<ConnectionLine*> connectionLineList);
     virtual void ClearContainer();
-
+    
+    std::vector<ControlElement*> GetControlElementsList() const { return m_ctrlElementsList; }
     std::vector<ConnectionLine*> GetConnectionLineList() const { return m_cLineList; }
     std::vector<Constant*> GetConstantList() const { return m_constantList; }
     std::vector<Exponential*> GetExponentialList() const { return m_exponentialList; }
@@ -37,8 +39,10 @@ class ControlElementContainer
     std::vector<Sum*> GetSumList() const { return m_sumList; }
     std::vector<TransferFunction*> GetTFList() const { return m_tfList; }
    protected:
-    std::vector<ConnectionLine*> m_cLineList;
+    std::vector<ControlElement*> m_ctrlElementsList;
     std::vector<Constant*> m_constantList;
+
+    std::vector<ConnectionLine*> m_cLineList;
     std::vector<Exponential*> m_exponentialList;
     std::vector<Gain*> m_gainList;
     std::vector<IOControl*> m_ioControlList;
-- 
cgit