From 14476a79398b8be4f6dce5c01258fd75b2966164 Mon Sep 17 00:00:00 2001
From: "facat@lab.com" <facat@lab.com>
Date: Fri, 12 Dec 2014 17:38:45 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99Breaker=E5=A2=9E=E5=8A=A0NamingDescrip?=
 =?UTF-8?q?tion?=
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          | 9 +++++++++
 testHasttable/breaker.h            | 2 ++
 testHasttable/topologyrecorder.cpp | 4 ++--
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/testHasttable/breaker.cpp b/testHasttable/breaker.cpp
index 13e78de..1132c7e 100644
--- a/testHasttable/breaker.cpp
+++ b/testHasttable/breaker.cpp
@@ -28,6 +28,10 @@ bool Breaker::derivedParse(QXmlStreamReader &reader)
         this->equipmentContainer=ss.replace("#","").leftRef(-1).toString();
         qDebug()<<"got "<<"Equipment.MemberOf_EquipmentContainer "<<this->equipmentContainer<<"\n";
     }
+    if("Naming.description"==reader.name())
+    {
+        this->namingDescription=reader.readElementText();
+    }
     if("Switch.normalOpen"==reader.name())
     {
         QString open=reader.readElementText();
@@ -44,6 +48,11 @@ bool Breaker::derivedParse(QXmlStreamReader &reader)
     return true;
 }
 
+QString Breaker::getNamingDescription()
+{
+    return this->namingDescription;
+}
+
 bool Breaker::getOpenState()
 {
     return this->isOpen;
diff --git a/testHasttable/breaker.h b/testHasttable/breaker.h
index 528536c..dfe2dfd 100644
--- a/testHasttable/breaker.h
+++ b/testHasttable/breaker.h
@@ -8,6 +8,7 @@ class Breaker:public BasicElementInfo
 public:
     explicit Breaker(QObject *parent = 0);
     virtual bool parse(QXmlStreamReader& reader);
+    QString getNamingDescription();
     QString getTerminalA();
     QString getTerminalB();
     bool getOpenState();
@@ -15,6 +16,7 @@ protected:
     QString terminalA;
     QString terminalB;
     QString equipmentContainer;
+    QString namingDescription;
     bool isOpen;
     virtual bool derivedParse(QXmlStreamReader& reader);
 private:
diff --git a/testHasttable/topologyrecorder.cpp b/testHasttable/topologyrecorder.cpp
index 3d18ef5..4787bc4 100644
--- a/testHasttable/topologyrecorder.cpp
+++ b/testHasttable/topologyrecorder.cpp
@@ -65,11 +65,11 @@ bool TopologyRecorder::startWithNode(const QString& node)
             //显示开关状态
             if(SW->getOpenState()==true)
             {
-                std::cout<<"sw "<<SW->getName().toStdString()<<"is open";
+                std::cout<<"sw "<<SW->getNamingDescription().toStdString()<<"is open"<<std::endl;
             }
             else
             {
-                std::cout<<"sw "<<SW->getName().toStdString()<<"is close";
+                std::cout<<"sw "<<SW->getNamingDescription().toStdString()<<"is close"<<std::endl;
             }
             terminalA=SW->getTerminalA();
             terminalB=SW->getTerminalB();