diff options
Diffstat (limited to 'Project')
| -rw-r--r-- | Project/Divider.cpp | 2 | ||||
| -rw-r--r-- | Project/FileHanding.cpp | 75 | ||||
| -rw-r--r-- | Project/Project.mk | 2 |
3 files changed, 41 insertions, 38 deletions
diff --git a/Project/Divider.cpp b/Project/Divider.cpp index 29e438e..2bd8251 100644 --- a/Project/Divider.cpp +++ b/Project/Divider.cpp @@ -29,6 +29,8 @@ void Divider::DrawSymbol() const mSymbol.push_back(m_position + wxPoint2DDouble(5, 0)); glColor4d(0.0, 0.3, 1.0, 1.0); DrawLine(mSymbol, GL_LINES); + DrawCircle(m_position + wxPoint2DDouble(0, -3), 2, 10, GL_POLYGON); + DrawCircle(m_position + wxPoint2DDouble(0, 3), 2, 10, GL_POLYGON); } bool Divider::Solve(double input, double timeStep) diff --git a/Project/FileHanding.cpp b/Project/FileHanding.cpp index 78abaa0..79dd800 100644 --- a/Project/FileHanding.cpp +++ b/Project/FileHanding.cpp @@ -1994,9 +1994,9 @@ void FileHanding::SaveControlElements(rapidxml::xml_document<>& doc, auto nodeList = AppendNode(doc, multiplierNode, "NodeList"); SaveControlNodes(doc, nodeList, multiplier->GetNodeList()); } //} - + //{ Divider - /*auto dividersNode = AppendNode(doc, elementsNode, "DividerList"); + auto dividersNode = AppendNode(doc, elementsNode, "DividerList"); auto dividersList = ctrlContainer->GetDividerList(); for(auto it = dividersList.begin(), itEnd = dividersList.end(); it != itEnd; ++it) { Divider* divider = *it; @@ -2019,7 +2019,7 @@ void FileHanding::SaveControlElements(rapidxml::xml_document<>& doc, // Nodes auto nodeList = AppendNode(doc, dividerNode, "NodeList"); SaveControlNodes(doc, nodeList, divider->GetNodeList()); - }*/ //} + } //} //{ Rate limiter auto rateLimitersNode = AppendNode(doc, elementsNode, "RateLimiterList"); @@ -2407,41 +2407,42 @@ bool FileHanding::OpenControlElements(rapidxml::xml_document<>& doc, multiplierNode = multiplierNode->next_sibling("Multiplier"); } //} - - //{ Divider - /*auto dividerListNode = elementsNode->first_node("DividerList"); - if(!dividerListNode) return false; - auto dividerNode = dividerListNode->first_node("Divider"); - while(dividerNode) { - int id = GetAttributeValueInt(dividerNode, "ID"); - Divider* divider = new Divider(id); - - auto cadPropNode = dividerNode->first_node("CADProperties"); - if(!cadPropNode) return false; - auto position = cadPropNode->first_node("Position"); - double posX = GetNodeValueDouble(position, "X"); - double posY = GetNodeValueDouble(position, "Y"); - auto size = cadPropNode->first_node("Size"); - double width = GetNodeValueDouble(size, "Width"); - double height = GetNodeValueDouble(size, "Height"); - double angle = GetNodeValueDouble(cadPropNode, "Angle"); - - std::vector<Node*> nodeVector; - if(!OpenControlNodeList(dividerNode, nodeVector)) return false; - - divider->SetWidth(width); - divider->SetHeight(height); - divider->SetAngle(angle); - divider->SetPosition(wxPoint2DDouble(posX, posY)); - - divider->StartMove(divider->GetPosition()); - divider->SetNodeList(nodeVector); - divider->UpdatePoints(); - elementList.push_back(divider); - - dividerNode = dividerNode->next_sibling("Divider"); - }*/ + //{ Divider + auto dividerListNode = elementsNode->first_node("DividerList"); + if(dividerListNode) { + auto dividerNode = dividerListNode->first_node("Divider"); + while(dividerNode) { + int id = GetAttributeValueInt(dividerNode, "ID"); + Divider* divider = new Divider(id); + + auto cadPropNode = dividerNode->first_node("CADProperties"); + if(!cadPropNode) return false; + + auto position = cadPropNode->first_node("Position"); + double posX = GetNodeValueDouble(position, "X"); + double posY = GetNodeValueDouble(position, "Y"); + auto size = cadPropNode->first_node("Size"); + double width = GetNodeValueDouble(size, "Width"); + double height = GetNodeValueDouble(size, "Height"); + double angle = GetNodeValueDouble(cadPropNode, "Angle"); + + std::vector<Node*> nodeVector; + if(!OpenControlNodeList(dividerNode, nodeVector)) return false; + + divider->SetWidth(width); + divider->SetHeight(height); + divider->SetAngle(angle); + divider->SetPosition(wxPoint2DDouble(posX, posY)); + + divider->StartMove(divider->GetPosition()); + divider->SetNodeList(nodeVector); + divider->UpdatePoints(); + elementList.push_back(divider); + + dividerNode = dividerNode->next_sibling("Divider"); + } + } //} //{ Rate limiter diff --git a/Project/Project.mk b/Project/Project.mk index 2e24786..a4fb215 100644 --- a/Project/Project.mk +++ b/Project/Project.mk @@ -13,7 +13,7 @@ CurrentFileName := CurrentFilePath := CurrentFileFullPath := User :=NDSE-69 -Date :=09/10/2017 +Date :=10/10/2017 CodeLitePath :="C:/Program Files/CodeLite" LinkerName :=C:/TDM-GCC-64/bin/g++.exe SharedObjectLinkerName :=C:/TDM-GCC-64/bin/g++.exe -shared -fPIC |