diff options
| author | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2017-05-18 16:48:47 -0300 |
|---|---|---|
| committer | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2017-05-18 16:48:47 -0300 |
| commit | 7a556cd67b60f70b9779d298ee687f66c859a529 (patch) | |
| tree | dab89f31704b2e71aebd1ceac639b555f494e0e2 /Project | |
| parent | 88cfd17f34495dafd631d0a5c20978b1b948c098 (diff) | |
| download | PSP.git-7a556cd67b60f70b9779d298ee687f66c859a529.tar.gz PSP.git-7a556cd67b60f70b9779d298ee687f66c859a529.tar.xz PSP.git-7a556cd67b60f70b9779d298ee687f66c859a529.zip | |
AVR and speed gov open implemented
Diffstat (limited to 'Project')
| -rw-r--r-- | Project/FileHanding.cpp | 6 | ||||
| -rw-r--r-- | Project/Project.mk | 2 | ||||
| -rw-r--r-- | Project/SyncGenerator.cpp | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/Project/FileHanding.cpp b/Project/FileHanding.cpp index b8d467e..02a0f56 100644 --- a/Project/FileHanding.cpp +++ b/Project/FileHanding.cpp @@ -1364,13 +1364,13 @@ bool FileHanding::OpenProject(wxFileName path) data.subTd0 = GetNodeValueDouble(stability, "SubTd0"); data.subTq0 = GetNodeValueDouble(stability, "SubTq0"); - /*auto avr = stability->first_node("AVR"); + auto avr = stability->first_node("AVR"); if(!avr) return false; if(!OpenControlElements(doc, avr, data.avr)) return false; auto speedGov = stability->first_node("SpeedGovernor"); - if(speedGov) return false; - if(!OpenControlElements(doc, speedGov, data.speedGov)) return false;*/ + if(!speedGov) return false; + if(!OpenControlElements(doc, speedGov, data.speedGov)) return false; SwitchingData swData; auto switchingList = electricalProp->first_node("SwitchingList"); diff --git a/Project/Project.mk b/Project/Project.mk index 1582ff8..cea75af 100644 --- a/Project/Project.mk +++ b/Project/Project.mk @@ -13,7 +13,7 @@ CurrentFileName := CurrentFilePath := CurrentFileFullPath := User :=NDSE-69 -Date :=16/05/2017 +Date :=18/05/2017 CodeLitePath :="C:/Program Files/CodeLite" LinkerName :=C:/TDM-GCC-64/bin/g++.exe SharedObjectLinkerName :=C:/TDM-GCC-64/bin/g++.exe -shared -fPIC diff --git a/Project/SyncGenerator.cpp b/Project/SyncGenerator.cpp index a24657c..b736f24 100644 --- a/Project/SyncGenerator.cpp +++ b/Project/SyncGenerator.cpp @@ -29,6 +29,9 @@ void SyncGenerator::Init() double y = std::sin(x); m_sinePts.push_back(wxPoint2DDouble((x / pi) * mx, y * my)); } + + m_electricalData.avr = new ControlElementContainer(); + m_electricalData.speedGov = new ControlElementContainer(); } void SyncGenerator::DrawSymbol() const |