From e587ab8667151f0d9930151868825dc6ad580544 Mon Sep 17 00:00:00 2001
From: "facat@lab.com" <facat@lab.com>
Date: Fri, 12 Dec 2014 17:13:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0Breaker=E7=8A=B6=E6=80=81=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: facat@lab.com <facat@lab.com>
---
 testHasttable/breaker.cpp          |  5 +++++
 testHasttable/elementhashtable.cpp |  2 +-
 testHasttable/topologyrecorder.cpp | 10 ++++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/testHasttable/breaker.cpp b/testHasttable/breaker.cpp
index 33a879f..13e78de 100644
--- a/testHasttable/breaker.cpp
+++ b/testHasttable/breaker.cpp
@@ -44,6 +44,11 @@ bool Breaker::derivedParse(QXmlStreamReader &reader)
     return true;
 }
 
+bool Breaker::getOpenState()
+{
+    return this->isOpen;
+}
+
 QString Breaker::getTerminalA()
 {
     return this->terminalA;
diff --git a/testHasttable/elementhashtable.cpp b/testHasttable/elementhashtable.cpp
index 2b813cb..42c27a8 100644
--- a/testHasttable/elementhashtable.cpp
+++ b/testHasttable/elementhashtable.cpp
@@ -80,7 +80,7 @@ bool ElementHashtable::GoPath()
 //        if(p->getName()=="ACLineSegment"){
 //            std::cout<<p->getID().toStdString()<<std::endl;
 //        }
-        if(p->getName()=="ACLineSegment" && p->getID()=="AC-456702")
+        if(p->getName()=="ACLineSegment" && p->getID()=="AC-456491")
         {
             ACLineSegment *ac=static_cast<ACLineSegment *>(p);//BusbarSection也就是线路头节点
             QString acTerminal=ac->getTerminalB();
diff --git a/testHasttable/topologyrecorder.cpp b/testHasttable/topologyrecorder.cpp
index eb3bb3c..3d18ef5 100644
--- a/testHasttable/topologyrecorder.cpp
+++ b/testHasttable/topologyrecorder.cpp
@@ -44,6 +44,7 @@ bool TopologyRecorder::startWithNode(const QString& node)
                 //                std::cout<<"can not find "<<acID.toStdString()<<std::endl;//@1
                 continue;
             }
+//            if(AC->getNamingDescription()=="")
             terminalA=AC->getTerminalA();
             terminalB=AC->getTerminalB();
             std::cout<<"find"<<AC->getID().toStdString()<<std::endl;
@@ -61,6 +62,15 @@ bool TopologyRecorder::startWithNode(const QString& node)
                 //                std::cout<<"can not SW "<<swID.toStdString()<<std::endl;//@1
                 continue;
             }
+            //显示开关状态
+            if(SW->getOpenState()==true)
+            {
+                std::cout<<"sw "<<SW->getName().toStdString()<<"is open";
+            }
+            else
+            {
+                std::cout<<"sw "<<SW->getName().toStdString()<<"is close";
+            }
             terminalA=SW->getTerminalA();
             terminalB=SW->getTerminalB();
             std::cout<<"find"<<SW->getID().toStdString()<<std::endl;