diff options
author | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2017-10-11 19:26:19 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-11 19:26:19 -0300 |
commit | 28760ff098cf5ef68cb95c869c2cd96ea5c324ec (patch) | |
tree | 9eea1f1d2622446b3bf64d8cf0864c9a9aafad34 /Project/ControlElementContainer.cpp | |
parent | a32372968abb2f4b3bf0472f59c18f5028d20206 (diff) | |
parent | 7fb65c6ec6148a75830ad25b7f76500c17db0f3b (diff) | |
download | PSP.git-28760ff098cf5ef68cb95c869c2cd96ea5c324ec.tar.gz PSP.git-28760ff098cf5ef68cb95c869c2cd96ea5c324ec.tar.xz PSP.git-28760ff098cf5ef68cb95c869c2cd96ea5c324ec.zip |
Merge pull request #40 from Thales1330/wip-mimo-control-system
Wip mimo control system
Diffstat (limited to 'Project/ControlElementContainer.cpp')
-rw-r--r-- | Project/ControlElementContainer.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Project/ControlElementContainer.cpp b/Project/ControlElementContainer.cpp index 3c420e7..9c9b1f1 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); } } } @@ -62,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, @@ -90,6 +93,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); } } } @@ -109,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. |