From bdb5c72fa244703ccb896697de6177aadce783ce Mon Sep 17 00:00:00 2001
From: "dmy@lab" <dmy@lab.lab>
Date: Thu, 8 Jan 2015 10:13:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E4=B8=80=E7=9B=B4?=
 =?UTF-8?q?=E6=98=AF=E4=B9=B1=E7=A0=81=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>
---
 .gitignore                         |   1 +
 testHasttable/elementhashtable.cpp |   9 ++-
 testHasttable/main.cpp             |   2 +-
 testHasttable/task.cpp             |   5 +-
 testHasttable/task.txt             | 110 ++++++++++++++---------------
 testHasttable/topologyrecorder.cpp |   2 +-
 6 files changed, 69 insertions(+), 60 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0f397a5..f99abfa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ release
 Makefile*
 testHasttable/*Debug
 testHasttable/*Release
+output
\ No newline at end of file
diff --git a/testHasttable/elementhashtable.cpp b/testHasttable/elementhashtable.cpp
index cd8897c..2cfa0ea 100644
--- a/testHasttable/elementhashtable.cpp
+++ b/testHasttable/elementhashtable.cpp
@@ -174,11 +174,16 @@ void ElementHashtable::SetFDSet(const QVector<QString> &FDSet)//FeeDer集合
 void ElementHashtable::ShowContainerInfo(const QString& fileName)
 {
     QString relPath="./../output/";
-    QFile file(relPath+fileName+".txt");
-    if(file.open(QFile::ReadOnly))
+    relPath+=fileName+".txt";
+    QFile file(relPath.toLocal8Bit());
+    if(file.open(QFile::WriteOnly|QFile::Text))
     {
         QTextStream stream(&file);
         this->tpRecorder->showContainerInfo(stream);
         file.close();
     }
+    else
+    {
+        std::cerr<<"not open"<<relPath.toStdString()<<std::endl;
+    }
 }
diff --git a/testHasttable/main.cpp b/testHasttable/main.cpp
index aafbbb1..69e3876 100644
--- a/testHasttable/main.cpp
+++ b/testHasttable/main.cpp
@@ -7,7 +7,7 @@ int main(int argc, char *argv[])
 {
     QCoreApplication a(argc, argv);
     ElementHashtable eleReader;
-    eleReader.Parse("D:/Project/佛山项目/佛山收资/exportmodel_pw/df8003/df8600/exportfiles/exportmodel_pw.xml","D:/Project/佛山项目/佛山收资/exportmodel_zwyth20141204/exportmodel_zwyth.xml");
+    eleReader.Parse("D:/Project/佛山项目/数据/df8003/df8600/exportfiles/exportmodel_pw.xml","D:/Project/佛山项目/佛山收资/exportmodel_zwyth20141204/exportmodel_zwyth.xml");
 //    eleReader.GoPath();
     Task task;
     task.doAgainstTaskFile(eleReader);
diff --git a/testHasttable/task.cpp b/testHasttable/task.cpp
index 3f0e82e..4160cfd 100644
--- a/testHasttable/task.cpp
+++ b/testHasttable/task.cpp
@@ -10,7 +10,7 @@ void Task::doAgainstTaskFile(ElementHashtable &eleHT)
     QFile file(this->taskFile);
     QString line;
     QStringList sep;
-    if(file.open(QFile::ReadOnly))
+    if(file.open(QFile::ReadOnly|QFile::Text))
     {
         QTextStream reader(&file);
         while(!reader.atEnd())
@@ -59,10 +59,13 @@ void Task::doAgainstTaskFile(ElementHashtable &eleHT)
                 std::cout<<"error: "<<line.toStdString()<<std::endl;
                 continue;
             }
+            QString lineName=sep.at(0);
             QString lineID=sep.at(1);
+//            std::cout<<lineName.toLocal8Bit().data()<<std::endl;
             eleHT.SetACLineID(lineID);
             eleHT.SetFDSet(setSep.toVector());
             eleHT.GoPath();
+            eleHT.ShowContainerInfo(lineName);
             break;
         }
         file.close();
diff --git a/testHasttable/task.txt b/testHasttable/task.txt
index b030340..85ece74 100644
--- a/testHasttable/task.txt
+++ b/testHasttable/task.txt
@@ -1,57 +1,57 @@
-709美的甲线,AC-671399,(FD-2003,)
-720美的乙线,AC-671401,(FD-2003,)
-#715北都联络线,AC-975725|AC-456393,(FD-2050,)
-705林港I线,AC-591832,(FD-2049,)
-719林港IV线,AC-591838,(FD-2055,)
-721南源线,AC-591821,(FD-2014,FD-2019,FD-2000,)
-701欲华线,AC-591811,(FD-2000,FD-2000,)
-718新城I线,AC-591837,(FD-2054,)
-702高尔夫I线,AC-591829,(FD-2046,FD-2054,)
-710林头线,AC-591834,(FD-2051,FD-2056)
-704广水III线,AC-591831,(FD-2048,)
-705广水Ⅰ线,AC-831215,(FD-2048,)
-719广水Ⅱ线,AC-831217,(FD-2048,)
-714东兴线,AC-591825,(FD-2019,)
-712金茂线,AC-671400,(FD-2004,)
-#707林港Ⅲ线,AC-591861,()没有svg
-723开发区Ⅰ线,AC-591839,(FD-2056,)
-711新城Ⅱ线,AC-831181,(FD-2045,)
-706林港Ⅱ线,AC-591827,(FD-2023,)
-703济虹线,AC-591830,(FD-2019)
-717新基线,AC-591836,(FD-2053,FD-2019)
-724开发区Ⅱ线,AC-591840,(FD-2057,FD-2052)
-713东基线,AC-591858,(FD-2083,FD-2014,FD-2000)
+709���ļ���,AC-671399,(FD-2003,)
+720��������,AC-671401,(FD-2003,)
+#715����������,AC-975725|AC-456393,(FD-2050,)
+705�ָ�I��,AC-591832,(FD-2049,)
+719�ָ�IV��,AC-591838,(FD-2055,)
+721��Դ��,AC-591821,(FD-2014,FD-2019,FD-2000,)
+701������,AC-591811,(FD-2000,FD-2000,)
+718�³�I��,AC-591837,(FD-2054,)
+702�߶���I��,AC-591829,(FD-2046,FD-2054,)
+710��ͷ��,AC-591834,(FD-2051,FD-2056)
+704��ˮIII��,AC-591831,(FD-2048,)
+705��ˮ����,AC-831215,(FD-2048,)
+719��ˮ����,AC-831217,(FD-2048,)
+714������,AC-591825,(FD-2019,)
+712���,AC-671400,(FD-2004,)
+#707�ָۢ���,AC-591861,()û��svg
+723����������,AC-591839,(FD-2056,)
+711�³Ǣ���,AC-831181,(FD-2045,)
+706�ָۢ���,AC-591827,(FD-2023,)
+703�ú���,AC-591830,(FD-2019)
+717�»���,AC-591836,(FD-2053,FD-2019)
+724����������,AC-591840,(FD-2057,FD-2052)
+713������,AC-591858,(FD-2083,FD-2014,FD-2000)
 
-730东环乙线,AC-671531,(FD-2094,)
-729东环甲线,AC-671532,(FD-2093,)
-724创业乙线,AC-671535,(FD-2025,)
-727二支甲线,AC-671534,(FD-2071,)
-714六丰乙线,AC-671537,(FD-2028,)
-728二支乙线,AC-671533,(FD-2084,)
-717创业甲线,AC-671536,(FD-2021,)
-713六丰甲线,AC-671538,(FD-2027,)
+730��������,AC-671531,(FD-2094,)
+729��������,AC-671532,(FD-2093,)
+724��ҵ����,AC-671535,(FD-2025,)
+727��֧����,AC-671534,(FD-2071,)
+714��������,AC-671537,(FD-2028,)
+728��֧����,AC-671533,(FD-2084,)
+717��ҵ����,AC-671536,(FD-2021,)
+713�������,AC-671538,(FD-2027,)
 
-727泰林东乙线,AC-671678,(FD-2096,)
-713泰林东甲线,AC-671669,(FD-2098,FD-2096)
-709泰兴乙线,AC-671665,(FD-1988,)
-702沿江线,AC-803934,(FD-1998,)
-715加利源线,AC-1140123,(FD-65488,)
-701港前南线,AC-671660,(FD-1993,)
-721威特线,AC-671673,(FD-1990,)
-707威奇线,AC-671663,(FD-1986)
-704鸿业线,AC-671662,(FD-1996,FD-2021)
-708泰兴甲线,AC-671664,(FD-1987)
-728泰林西甲线,AC-671679,(FD-2097)
-718发展线,AC-671672,(FD-1997)
-705广水Ⅰ线,AC-831215,(FD-2048)
-719广水Ⅱ线,AC-831217,(FD-2048)
-#704广水Ⅲ线,AC-591831,()无svg
-703港前北线,AC-671661,(FD-1992,FD-1998)
-730泰港乙线,AC-903666,(FD-58442,FD-2025)
-716兴业南线,AC-591810,(FD-1994,FD-58443)
-712洗碗机线,AC-671668,(FD-2042)
-714泰林西乙线,AC-671670,(FD-2103,)
-722洗涤线,AC-671674,(FD-2002)
-726制钢甲线,AC-671677,(FD-2038)
-717兴业北线,AC-671671,(FD-1995)
-729泰港甲线,AC-903667,(FD-58443,FD-1994)
\ No newline at end of file
+727̩�ֶ�����,AC-671678,(FD-2096,)
+713̩�ֶ�����,AC-671669,(FD-2098,FD-2096)
+709̩������,AC-671665,(FD-1988,)
+702�ؽ���,AC-803934,(FD-1998,)
+715����Դ��,AC-1140123,(FD-65488,)
+701��ǰ����,AC-671660,(FD-1993,)
+721������,AC-671673,(FD-1990,)
+707������,AC-671663,(FD-1986)
+704��ҵ��,AC-671662,(FD-1996,FD-2021)
+708̩�˼���,AC-671664,(FD-1987)
+728̩��������,AC-671679,(FD-2097)
+718��չ��,AC-671672,(FD-1997)
+705��ˮ����,AC-831215,(FD-2048)
+719��ˮ����,AC-831217,(FD-2048)
+#704��ˮ����,AC-591831,()��svg
+703��ǰ����,AC-671661,(FD-1992,FD-1998)
+730̩������,AC-903666,(FD-58442,FD-2025)
+716��ҵ����,AC-591810,(FD-1994,FD-58443)
+712ϴ�����,AC-671668,(FD-2042)
+714̩��������,AC-671670,(FD-2103,)
+722ϴ����,AC-671674,(FD-2002)
+726�Ƹּ���,AC-671677,(FD-2038)
+717��ҵ����,AC-671671,(FD-1995)
+729̩�ۼ���,AC-903667,(FD-58443,FD-1994)
\ No newline at end of file
diff --git a/testHasttable/topologyrecorder.cpp b/testHasttable/topologyrecorder.cpp
index 3f9a40f..0040fa4 100644
--- a/testHasttable/topologyrecorder.cpp
+++ b/testHasttable/topologyrecorder.cpp
@@ -59,7 +59,7 @@ void TopologyRecorder::showContainerInfo(QTextStream &stream)
         stream<<"("<<sb->getNamingDescription()<<")";
         QVector<QString> v=s[k];
         foreach (QString n, v) {
-           std::cout<<", "<<n.toStdString();
+           stream<<", "<<n;
            PowerTransformer *pf=static_cast<PowerTransformer *>(ht[n]);
            stream<<"("<<pf->getNamingDescription()<<")";
         }