From a012ca3502412b1e71a872f019c04180ac30c52f Mon Sep 17 00:00:00 2001
From: "facat@lab.com" <facat@lab.com>
Date: Thu, 25 Dec 2014 16:21:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=BE=93=E5=87=BA=E9=81=87?=
 =?UTF-8?q?=E5=88=B0=E7=9A=84Substation=E7=9A=84=E5=90=8D=E5=AD=97?=
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/busbarsection.cpp    | 13 +++++++++++++
 testHasttable/busbarsection.h      |  2 ++
 testHasttable/elementhashtable.cpp |  2 +-
 testHasttable/substation.cpp       |  4 ++++
 testHasttable/substation.h         |  1 +
 testHasttable/topologyrecorder.cpp | 21 ++++++++++++++++++++-
 testHasttable/topologyrecorder.h   |  1 +
 7 files changed, 42 insertions(+), 2 deletions(-)

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 "<<this->terminal<<"\n";
+//        std::cout<<"ConductingEquipment.Terminals"<<this->terminal.toStdString()<<std::endl;
+    }
+    if("Equipment.MemberOf_EquipmentContainer"==reader.name() && reader.attributes().hasAttribute("rdf:resource"))
+    {
+        QString container;
+        container=reader.attributes().value("rdf:resource").toString();
+        this->equipmentMemberOf_EquipmentContainer=container.replace("#","").leftRef(-1).toString();
+        qDebug()<<"got "<<"ConductingEquipment.Terminals "<<this->terminal<<"\n";
 //        std::cout<<"ConductingEquipment.Terminals"<<this->terminal.toStdString()<<std::endl;
     }
     return true;
 }
 
+QString BusbarSection::getEquipmentMemberOf_EquipmentContainer()
+{
+    return this->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<<p->getID().toStdString()<<std::endl;
 //        }
-        if(p->getName()=="ACLineSegment" && p->getID()=="AC-671400")
+        if(p->getName()=="ACLineSegment" && p->getID()=="AC-671401")
         {
             ACLineSegment *ac=static_cast<ACLineSegment *>(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<BusbarSection *>(ht[ce]);
+            if(bs==NULL)
+            {
+                std::cout<<"not find bussection"<<ce.toStdString()<<std::endl;
+            }
+            else
+            {
+                QString container=bs->getEquipmentMemberOf_EquipmentContainer();
+                Substation *sfd=static_cast<Substation *>(ht[container]);
+                if(sfd==NULL)
+                {
+                    std::cout<<"can not find"<<container.toStdString()<<std::endl;
+                }
+                else
+                {
+                    std::cout<<"encounter "<<sfd->getNamingDescription().toStdString()<<std::endl;
+                }
+            }
             continue;
         }
         if(ce.startsWith("TF"))
@@ -95,7 +114,7 @@ bool TopologyRecorder::startWithNode(const QString& node)
             else
             {
                 QString feederID=sfd->getSubstationMemberOf_Feeder();
-                if(feederID!="FD-2004")
+                if(feederID!="FD-2003")
                 {
                     std::cout<<tf->getNamingDescription().toStdString()<<"not belong"<<std::endl;
                 }
diff --git a/testHasttable/topologyrecorder.h b/testHasttable/topologyrecorder.h
index 528f45e..bd4afa0 100644
--- a/testHasttable/topologyrecorder.h
+++ b/testHasttable/topologyrecorder.h
@@ -11,6 +11,7 @@
 #include "terminal.h"
 #include "powertransformer.h"
 #include "substation.h"
+#include "busbarsection.h"
 class TopologyRecorder
 {
 public: