From f26ffd4ab03eccba69af84102d41862674aa3737 Mon Sep 17 00:00:00 2001
From: "dmy@lab" <dmy@lab.lab>
Date: Mon, 9 Mar 2015 21:57:23 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=B8=89=E7=9B=B8=E6=80=BB=E5=8A=9F=E7=8E=87?=
 =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E4=B8=BA=E6=A0=87=E5=B9=BA=E5=80=BC=20=0D2.?=
 =?UTF-8?q?=E8=BE=93=E5=87=BA=E5=8A=9F=E7=8E=87=E5=89=8D=E5=85=88=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E5=8A=9F=E7=8E=87=203.=E8=BE=93=E5=87=BAQG=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=9A=84=E6=97=B6=E5=80=99=E5=B0=91=E4=BA=86=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AAseperator=EF=BC=8C=E8=A1=A5=E4=B8=8A?=
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 | 24 +++++-------------------
 testHasttable/loadinfo.cpp    |  8 ++++++++
 testHasttable/task.cpp        |  1 +
 3 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/testHasttable/cimexporter.cpp b/testHasttable/cimexporter.cpp
index 0102b46..5ae5106 100644
--- a/testHasttable/cimexporter.cpp
+++ b/testHasttable/cimexporter.cpp
@@ -132,28 +132,14 @@ void CIMExporter::exportTo(const QString& path,const QString &rootID)
             {
                 continue;
             }
-//            writer<<elements.first()->length<<"\t"<<elements.first()->id<<"\t";
             writer<<seqN++<<seperator;
             writer<<l.fromNum<<seperator;
             writer<<l.toNum<<seperator;
-//            if(l.id==rootID && static_cast<int>(l.length)==0)
-//            {
-//                writer<<0.01<<seperator;
-//                writer<<0.01<<seperator;
-//                writer<<0<<seperator;
-//                writer<<0<<seperator;
-//            }
-//            else
-//            {
-                writer<<l.line->r<<seperator;
-                writer<<l.line->x<<seperator;
-                writer<<l.line->b1<<seperator;
-                writer<<l.line->b2<<seperator;
-//            }
+            writer<<l.line->r<<seperator;
+            writer<<l.line->x<<seperator;
+            writer<<l.line->b1<<seperator;
+            writer<<l.line->b2<<seperator;
             writer<<endLine;
-//            writer<<"type"<<seperator;
-//            writer<<l.id<<"\t";
-//            writer<<l.length<<"\r\n";
         }
 
         //输出刀闸
@@ -321,7 +307,7 @@ void CIMExporter::exportTo(const QString& path,const QString &rootID)
         writer<<endLine;
         writer<<0<<endLine;//数据间隔
         writer<<0<<endLine;//数据间隔
-        writer<<1<< seperator<<1<< seperator<<balanceNum<<1<< seperator<<1.05<< seperator<< -100<< seperator<<100<< seperator<<0<< seperator<<0<< seperator<<0<< seperator<<0<< seperator;
+        writer<<1<< seperator<<1<< seperator<<balanceNum<<seperator<<1<< seperator<<1.05<< seperator<< -100<< seperator<<100<< seperator<<0<< seperator<<0<< seperator<<0<< seperator<<0<< seperator;
         writer<<endLine;
         writer<<0<<endLine;//数据间隔
         writer<<0<<endLine;//数据间隔
diff --git a/testHasttable/loadinfo.cpp b/testHasttable/loadinfo.cpp
index ff1ebb3..a5c49eb 100644
--- a/testHasttable/loadinfo.cpp
+++ b/testHasttable/loadinfo.cpp
@@ -152,6 +152,10 @@ bool LoadInfo::updateByTime(const QTime& time)
                 {
                     this->ph3P=0;
                 }
+                else
+                {
+                    this->ph3P/=1000;//转换为标幺值
+                }
 //                std::cout<<"nb "<<sep.at(5).toStdString()<<std::endl;
 //                std::cout<<this->ph3P<<std::endl;
                 this->ph3Q=this->trimDoubleQuotation(sep.at(6)).toDouble(&ok3PhQ);
@@ -159,6 +163,10 @@ bool LoadInfo::updateByTime(const QTime& time)
                 {
                     this->ph3Q=0;
                 }
+                else
+                {
+                    this->ph3Q/=1000;
+                }
 //                std::cout<<"nb "<<sep.at(6).toStdString()<<std::endl;
 //                std::cout<<this->ph3Q<<std::endl;
                 ret=true;
diff --git a/testHasttable/task.cpp b/testHasttable/task.cpp
index acabaa6..40e631e 100644
--- a/testHasttable/task.cpp
+++ b/testHasttable/task.cpp
@@ -9,6 +9,7 @@ void Task::doAgainstTaskFile(ElementHashtable &eleHT)
 {
     LoadMapping lm;
     lm.load("D:/Project/佛山项目/数据/搭网架参数文件/","D:/Project/佛山项目/数据/匹配的数据/","D:/Project/佛山项目/数据/exception.txt");//单例，执行一次行了。
+    lm.broadcastUpdateByTime(QTime(0,0,0));
     QFile file(this->taskFile);
     QString line;
     QStringList sep;