From 8a5d392450933a22d6fb310914ce63836ee17882 Mon Sep 17 00:00:00 2001
From: "dmy@lab" <dmy@lab.lab>
Date: Mon, 9 Mar 2015 22:31:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B2=A1=E6=9C=89=E8=B4=9F?=
 =?UTF-8?q?=E8=8D=B7=E6=97=B6=EF=BC=8C=E8=BF=9E=E5=8F=98=E5=8E=8B=E5=99=A8?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=83=BD=E6=B2=A1=E6=9C=89=E7=9A=84bug?=
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 | 31 +++++++++++++++++--------------
 testHasttable/task.cpp        |  2 +-
 testHasttable/task.txt        |  2 +-
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/testHasttable/cimexporter.cpp b/testHasttable/cimexporter.cpp
index 5ae5106..1950d11 100644
--- a/testHasttable/cimexporter.cpp
+++ b/testHasttable/cimexporter.cpp
@@ -189,7 +189,6 @@ void CIMExporter::exportTo(const QString& path,const QString &rootID)
         //把接地支路准备一下
         QList<CIMExporter::GroundBranch > groudBranch;//first is g, second is b.
         QList<CIMExporter::NodePQ> nodePQ;//节点注入功率，也就是负荷或者发电机
-
         QStringList usedLoad;
         for(QList<TransformerStru>::iterator ite=this->tf.begin();
             ite!=this->tf.end();
@@ -209,6 +208,22 @@ void CIMExporter::exportTo(const QString& path,const QString &rootID)
                 continue;
             }
 //            std::cout<<"sub id"<< subID.toStdString()<<" "<<sub->getID().toStdString()<<std::endl;
+
+            writer<<seqN++<<seperator;
+            writer<<0<<seperator;//变压器区域
+            writer<<ite->fromNum<<seperator;
+            writer<<ite->toNum<<seperator;
+            writer<<ite->tf->r<<seperator;
+            writer<<ite->tf->x<<seperator;
+            writer<<ite->tf->ratio<<seperator;
+            writer<<1<<seperator;
+            writer<<1<<seperator;
+            writer<<1<<seperator;
+            writer<<endLine;
+            //保存接地支路
+            groudBranch.push_back(CIMExporter::GroundBranch(ite->toNum, ite->tf->g1,ite->tf->b1));//都只用g1,b1的数据
+
+
             LoadMapping loadMapping;
             QVector<QSharedPointer<LoadInfo> > vecLoadInfo=loadMapping.getSubstationLoad(sub->getID());
             foreach(QSharedPointer<LoadInfo> p,vecLoadInfo)
@@ -220,19 +235,6 @@ void CIMExporter::exportTo(const QString& path,const QString &rootID)
                 {
 //                    std::cout<<targetBasename.baseName().toLocal8Bit().data()<<" used "<<std::endl;
                     usedLoad<<targetBasename.baseName();
-                    writer<<seqN++<<seperator;
-                    writer<<0<<seperator;//变压器区域
-                    writer<<ite->fromNum<<seperator;
-                    writer<<ite->toNum<<seperator;
-                    writer<<ite->tf->r<<seperator;
-                    writer<<ite->tf->x<<seperator;
-                    writer<<ite->tf->ratio<<seperator;
-                    writer<<1<<seperator;
-                    writer<<1<<seperator;
-                    writer<<1<<seperator;
-                    writer<<endLine;
-                    //保存接地支路
-                    groudBranch.push_back(CIMExporter::GroundBranch(ite->toNum, ite->tf->g1,ite->tf->b1));//都只用g1,b1的数据
                     //保存节点注入功率
                     nodePQ.push_back(CIMExporter::NodePQ(ite->toNum,p->get3PhP(),p->get3PhQ()));
 //                    writer<<"type"<<"\t";
@@ -372,6 +374,7 @@ void CIMExporter::idToNumber(QList<T> &s)//把所有元件的标识进行编号
         T _t=*ite;
         _t.fromNum=this->numberIt(_t.fromID);
         _t.toNum=this->numberIt(_t.toID);
+        std::cout<<"id "<<_t.id.toStdString()<<" "<<_t.fromNum<<" "<<_t.toNum<<std::endl;
         *ite=_t;
     }
 }
diff --git a/testHasttable/task.cpp b/testHasttable/task.cpp
index 40e631e..399460f 100644
--- a/testHasttable/task.cpp
+++ b/testHasttable/task.cpp
@@ -72,7 +72,7 @@ void Task::doAgainstTaskFile(ElementHashtable &eleHT)
             eleHT.GoPath();
             eleHT.ExportTo(QString("D:/MyPro/cimforreduceloss/testHasttable/output/pan/")+sep.at(0)+".txt");
             eleHT.ShowContainerInfo(lineName);
-//            break;
+            break;
         }
         file.close();
     }
diff --git a/testHasttable/task.txt b/testHasttable/task.txt
index 9df1e1c..b05fc0b 100644
--- a/testHasttable/task.txt
+++ b/testHasttable/task.txt
@@ -1,4 +1,4 @@
-713̩�ֶ�����,AC-671669,D:\Project\��ɽ��Ŀ\����\�����ܲ����ļ�\̩��\̩������\713̩�ֶ�����,(FD-2098,FD-2096)
+726�Ƹּ���,AC-671677,D:\Project\��ɽ��Ŀ\����\�����ܲ����ļ�\̩��\̩������\726�Ƹּ���,(FD-2038)
 
 
 709���ļ���,AC-671399,D:\Project\��ɽ��Ŀ\����\�����ܲ����ļ�\����\���򸺺�\709���ļ��ߡ�720��������,(FD-2003,)