From 32e3e9cfb10b26a46f41eae3edd90f3cce03006a Mon Sep 17 00:00:00 2001
From: "facat@lab.com" <facat@lab.com>
Date: Fri, 26 Dec 2014 11:22:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E4=B8=80=E4=BA=9Bdirty=E7=9A=84?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=8C=E5=88=A4=E6=96=AD=E6=98=AF=E4=B8=8D?=
 =?UTF-8?q?=E6=98=AFV=E9=A6=88=E7=BA=BF=E7=AB=99?=
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/elementhashtable.cpp | 2 +-
 testHasttable/topologyrecorder.cpp | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/testHasttable/elementhashtable.cpp b/testHasttable/elementhashtable.cpp
index 6ea3f0a..9b65bad 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-591827")
+        if(p->getName()=="ACLineSegment" && p->getID()=="AC-591831")
         {
             ACLineSegment *ac=static_cast<ACLineSegment *>(p);//BusbarSection也就是线路头节点
             QString acTerminal=ac->getTerminalB();
diff --git a/testHasttable/topologyrecorder.cpp b/testHasttable/topologyrecorder.cpp
index b178511..6285814 100644
--- a/testHasttable/topologyrecorder.cpp
+++ b/testHasttable/topologyrecorder.cpp
@@ -20,7 +20,7 @@ bool TopologyRecorder::isEquipmentNeeded(const QString& substatinID)
     else
     {
         QString feederID=sfd->getSubstationMemberOf_Feeder();
-        return feederID=="FD-2023";
+        return feederID=="FD-2048"||sfd->getNamingDescription()=="V馈线站";
     }
     return false;
 }
@@ -113,6 +113,7 @@ bool TopologyRecorder::startWithNode(const QString& node)
                     QString container=Dis->getEquipmentMemberOf_EquipmentContainer();
                     if(!this->isEquipmentNeeded(container))
                     {
+                        std::cout<<"Dissw not belong "<<disConID.toStdString()<<std::endl;
                         continue;
                     }
                     fromTo.first=node;
@@ -120,7 +121,7 @@ bool TopologyRecorder::startWithNode(const QString& node)
 
                     if(!Dis)
                     {
-        //                                std::cout<<"can not SW "<<swID.toStdString()<<std::endl;//@1
+//                                        std::cout<<"can not SW "<<swID.toStdString()<<std::endl;//@1
                         continue;
                     }
                     //显示开关状态
@@ -184,7 +185,7 @@ bool TopologyRecorder::startWithNode(const QString& node)
             {
                 std::cout<<tf->getNamingDescription().toStdString()<<"not belong"<<std::endl;
             }
-//            foundCate=true;
+
         }
         if(foundCate)
         {