diff --git a/testHasttable/busbarsection.cpp b/testHasttable/busbarsection.cpp index 14dff2d..547ae45 100644 --- a/testHasttable/busbarsection.cpp +++ b/testHasttable/busbarsection.cpp @@ -14,11 +14,24 @@ bool BusbarSection::derivedParse(QXmlStreamReader& reader) terminal=reader.attributes().value("rdf:resource").toString(); this->terminal=terminal.replace("#","").leftRef(-1).toString(); qDebug()<<"got "<<"ConductingEquipment.Terminals "<terminal<<"\n"; +// std::cout<<"ConductingEquipment.Terminals"<terminal.toStdString()<equipmentMemberOf_EquipmentContainer=container.replace("#","").leftRef(-1).toString(); + qDebug()<<"got "<<"ConductingEquipment.Terminals "<terminal<<"\n"; // std::cout<<"ConductingEquipment.Terminals"<terminal.toStdString()<equipmentMemberOf_EquipmentContainer; +} + QString BusbarSection::getTerminal() { return this->terminal; diff --git a/testHasttable/busbarsection.h b/testHasttable/busbarsection.h index 7be25d0..bdf234a 100644 --- a/testHasttable/busbarsection.h +++ b/testHasttable/busbarsection.h @@ -7,10 +7,12 @@ class BusbarSection:public BasicElementInfo public: explicit BusbarSection(QObject *parent = 0); virtual bool parse(QXmlStreamReader& reader); + QString getEquipmentMemberOf_EquipmentContainer(); QString getTerminal(); protected: QString terminal; virtual bool derivedParse(QXmlStreamReader& reader); + QString equipmentMemberOf_EquipmentContainer; }; #endif // BUSBARSECTION_H diff --git a/testHasttable/elementhashtable.cpp b/testHasttable/elementhashtable.cpp index ee82c01..4633e35 100644 --- a/testHasttable/elementhashtable.cpp +++ b/testHasttable/elementhashtable.cpp @@ -85,7 +85,7 @@ bool ElementHashtable::GoPath() // if(p->getName()=="ACLineSegment"){ // std::cout<getID().toStdString()<getName()=="ACLineSegment" && p->getID()=="AC-671400") + if(p->getName()=="ACLineSegment" && p->getID()=="AC-671401") { ACLineSegment *ac=static_cast(p);//BusbarSection也就是线路头节点 QString acTerminal=ac->getTerminalB(); diff --git a/testHasttable/substation.cpp b/testHasttable/substation.cpp index 4480e39..227761b 100644 --- a/testHasttable/substation.cpp +++ b/testHasttable/substation.cpp @@ -24,6 +24,10 @@ bool Substation::derivedParse(QXmlStreamReader& reader) return true; } +QString Substation::getNamingDescription() +{ + return this->namingDescription; +} QString Substation::getSubstationMemberOf_Feeder() { diff --git a/testHasttable/substation.h b/testHasttable/substation.h index e13c738..534bd61 100644 --- a/testHasttable/substation.h +++ b/testHasttable/substation.h @@ -7,6 +7,7 @@ class Substation:public BasicElementInfo public: explicit Substation(QObject *parent = 0); virtual bool parse(QXmlStreamReader& reader); + QString getNamingDescription(); QString getSubstationMemberOf_Feeder(); protected: virtual bool derivedParse(QXmlStreamReader& reader); diff --git a/testHasttable/topologyrecorder.cpp b/testHasttable/topologyrecorder.cpp index e7bcfb8..ac708d7 100644 --- a/testHasttable/topologyrecorder.cpp +++ b/testHasttable/topologyrecorder.cpp @@ -77,6 +77,25 @@ bool TopologyRecorder::startWithNode(const QString& node) } if(ce.startsWith("BS")) { + //看找到那个Substation了 + BusbarSection *bs=static_cast(ht[ce]); + if(bs==NULL) + { + std::cout<<"not find bussection"<getEquipmentMemberOf_EquipmentContainer(); + Substation *sfd=static_cast(ht[container]); + if(sfd==NULL) + { + std::cout<<"can not find"<getNamingDescription().toStdString()<getSubstationMemberOf_Feeder(); - if(feederID!="FD-2004") + if(feederID!="FD-2003") { std::cout<getNamingDescription().toStdString()<<"not belong"<