From 5cd6849e95432029577ef16fcb15a3ac666f69f5 Mon Sep 17 00:00:00 2001
From: "dmy@lab" <dmy@lab.lab>
Date: Thu, 15 Jan 2015 17:19:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=89=E5=8F=AF=E8=83=BD=E4=BC=9A=E8=AE=BF?=
 =?UTF-8?q?=E9=97=AE=E5=88=B0=E9=87=8D=E5=A4=8D=E7=9A=84=E5=85=83=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=98=AF=E5=B7=B2=E7=BB=8F=E8=AE=BF?=
 =?UTF-8?q?=E9=97=AE=E8=BF=87=E7=9A=84=E5=B0=B1=E4=B8=8D=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=BA=86=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: dmy@lab <dmy@lab.lab>
---
 testHasttable/cimexporter.cpp      |  1 +
 testHasttable/main.cpp             |  8 ++++----
 testHasttable/task.cpp             |  2 +-
 testHasttable/task.txt             |  2 +-
 testHasttable/topologyrecorder.cpp | 11 ++++++-----
 testHasttable/topologyrecorder.h   |  1 +
 6 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/testHasttable/cimexporter.cpp b/testHasttable/cimexporter.cpp
index 8fdf615..4bc9892 100644
--- a/testHasttable/cimexporter.cpp
+++ b/testHasttable/cimexporter.cpp
@@ -49,6 +49,7 @@ void CIMExporter::exportTo(const QString& path)
 
 
 }
+
 template<typename T>
 void CIMExporter::idToNumber(QList<T> &s)//把所有元件的标识进行编号
 {
diff --git a/testHasttable/main.cpp b/testHasttable/main.cpp
index ebf5db8..0459346 100644
--- a/testHasttable/main.cpp
+++ b/testHasttable/main.cpp
@@ -7,10 +7,10 @@ int main(int argc, char *argv[])
 {
     QCoreApplication a(argc, argv);
 //    ReadWrite aa;
-    RegexExtract re;
-    re.extract("D:/Project/佛山项目/数据/df8003/df8600/exportfiles/exportmodel_pw.xml");
-    re.exportBlocks("./a");
-    return a.exec();
+//    RegexExtract re;
+//    re.extract("D:/Project/佛山项目/数据/df8003/df8600/exportfiles/exportmodel_pw.xml");
+//    re.exportBlocks("./a");
+//    return a.exec();
     ElementHashtable eleReader;
     eleReader.Parse("D:/Project/佛山项目/数据/df8003/df8600/exportfiles/exportmodel_pw.xml","D:/Project/佛山项目/佛山收资/exportmodel_zwyth20141204/exportmodel_zwyth.xml");
 //    eleReader.GoPath();
diff --git a/testHasttable/task.cpp b/testHasttable/task.cpp
index 53163a7..4160cfd 100644
--- a/testHasttable/task.cpp
+++ b/testHasttable/task.cpp
@@ -66,7 +66,7 @@ void Task::doAgainstTaskFile(ElementHashtable &eleHT)
             eleHT.SetFDSet(setSep.toVector());
             eleHT.GoPath();
             eleHT.ShowContainerInfo(lineName);
-//            break;
+            break;
         }
         file.close();
     }
diff --git a/testHasttable/task.txt b/testHasttable/task.txt
index 85ece74..fac20d0 100644
--- a/testHasttable/task.txt
+++ b/testHasttable/task.txt
@@ -47,7 +47,7 @@
 719��ˮ����,AC-831217,(FD-2048)
 #704��ˮ����,AC-591831,()��svg
 703��ǰ����,AC-671661,(FD-1992,FD-1998)
-730̩������,AC-903666,(FD-58442,FD-2025)
+730̩������,AC-903666,(FD-58442,FD-2025,)
 716��ҵ����,AC-591810,(FD-1994,FD-58443)
 712ϴ�����,AC-671668,(FD-2042)
 714̩��������,AC-671670,(FD-2103,)
diff --git a/testHasttable/topologyrecorder.cpp b/testHasttable/topologyrecorder.cpp
index 6247f0b..972079e 100644
--- a/testHasttable/topologyrecorder.cpp
+++ b/testHasttable/topologyrecorder.cpp
@@ -83,7 +83,6 @@ bool TopologyRecorder::startWithNode(const QString& node)
     {
         TopologyRecorder::Type::EleType typ;
         BasicElementInfo *foundEle=NULL;
-//        bool foundCate=false;
         anotherTerminal=anotherTerminalVector.at(atI);
         if(this->reachedTerminal.contains(anotherTerminal))
         {
@@ -109,10 +108,6 @@ bool TopologyRecorder::startWithNode(const QString& node)
             }
             terminalA=AC->getTerminalA();
             terminalB=AC->getTerminalB();
-//            std::cout<<"find"<<AC->getID().toStdString()<<std::endl;
-//            std::cout<<AC->getNamingDescription().toStdString()<<std::endl;
-            //把线路长度也输出来看一下
-//            std::cout<<AC->getLength()<<std::endl;
             foundEle=AC;
             typ=TopologyRecorder::Type::AC;
         }
@@ -244,6 +239,12 @@ bool TopologyRecorder::startWithNode(const QString& node)
             Branch *branch=NULL;
             switch(typ)
             {
+                //有可能会访问到重复的元件，所以这里判断一下，如果是已经访问过的就不添加了。
+                if(this->hasAdded.contains(foundEle->getID()))
+                {
+                    continue;
+                }
+                this->hasAdded[foundEle->getID()]=0;
                 case TopologyRecorder::Type::AC:
                 branch=new Line(fromTo,static_cast<ACLineSegment *>(foundEle),this);
                 this->cimExporter.add(fromTo,static_cast<Line *>(branch));
diff --git a/testHasttable/topologyrecorder.h b/testHasttable/topologyrecorder.h
index 3ca8c28..e2291c0 100644
--- a/testHasttable/topologyrecorder.h
+++ b/testHasttable/topologyrecorder.h
@@ -42,6 +42,7 @@ private:
     QVector<QString> tfs;
     CIMExporter cimExporter;
     QVector<QString> FDSet;
+    QHash<QString,char> hasAdded;
     bool isEquipmentNeeded(const QString& substatinID);
 };