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 "<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 "<getName().toStdString()<<"is open"; + std::cout<<"sw "<getNamingDescription().toStdString()<<"is open"<getName().toStdString()<<"is close"; + std::cout<<"sw "<getNamingDescription().toStdString()<<"is close"<getTerminalA(); terminalB=SW->getTerminalB();