From 3a555bd2c1d0b41d48ae98f2fc574403b52d37bb Mon Sep 17 00:00:00 2001
From: "facat@lab.com" <facat@lab.com>
Date: Fri, 21 Nov 2014 17:47:58 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=87=8D=E6=96=B0=E7=BB=84=E7=BB=87=E4=BA=86?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E3=80=82=202.=E5=87=86=E5=A4=87=E8=AF=95?=
 =?UTF-8?q?=E8=AF=95=E6=8A=8A=E6=89=80=E6=9C=89=E5=85=83=E7=B4=A0=E9=83=BD?=
 =?UTF-8?q?=E8=AF=BB=E5=85=A5=E5=86=85=E5=AD=98=E4=B8=AD=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: facat@lab.com <facat@lab.com>
---
 .gitignore                                    |  5 ++-
 CIMforReduceLoss.pro                          | 39 ------------------
 Solution.pro                                  |  5 +++
 cimparser/cimparser.pro                       | 24 +++++++++++
 .../cimparserbatch.cpp                        |  0
 .../cimparserbatch.h                          |  0
 .../derivedqthread.cpp                        |  0
 .../derivedqthread.h                          |  0
 main.cpp => cimparser/main.cpp                |  0
 {readxml => core}/DealData.cpp                |  0
 {readxml => core}/Interface.cpp               |  0
 {readxml => core}/callmain.cpp                |  0
 core/core.pro                                 | 41 +++++++++++++++++++
 {readxml => core}/head.h                      |  0
 {readxml => core}/input.cpp                   |  0
 {readxml => core}/linetypeparser.cpp          |  0
 {readxml => core}/linetypeparser.h            |  0
 core/main.cpp                                 |  8 ++++
 {readxml => core}/mainfun.cpp                 |  2 +-
 {readxml => core}/nn06302000.csv              |  0
 {readxml => core}/output.cpp                  |  0
 {readxml => core}/output1.cpp                 |  0
 {readxml => core}/output2.cpp                 |  0
 {readxml => core}/output3.cpp                 |  0
 {readxml => core}/output4.cpp                 |  0
 {readxml => core}/output5.cpp                 |  0
 {readxml => core}/output6.cpp                 |  0
 {readxml => core}/output7.cpp                 |  0
 {readxml => core}/qt_readxml.cpp              |  0
 {readxml => core}/qt_readxml.h                |  0
 {readxml => core}/topology.cpp                |  0
 {readxml => core}/transformerparser.cpp       |  0
 {readxml => core}/transformerparser.h         |  0
 testHasttable/main.cpp                        |  8 ++++
 testHasttable/testHasttable.pro               | 18 ++++++++
 35 files changed, 109 insertions(+), 41 deletions(-)
 delete mode 100644 CIMforReduceLoss.pro
 create mode 100644 Solution.pro
 create mode 100644 cimparser/cimparser.pro
 rename cimparserbatch.cpp => cimparser/cimparserbatch.cpp (100%)
 rename cimparserbatch.h => cimparser/cimparserbatch.h (100%)
 rename derivedqthread.cpp => cimparser/derivedqthread.cpp (100%)
 rename derivedqthread.h => cimparser/derivedqthread.h (100%)
 rename main.cpp => cimparser/main.cpp (100%)
 rename {readxml => core}/DealData.cpp (100%)
 rename {readxml => core}/Interface.cpp (100%)
 rename {readxml => core}/callmain.cpp (100%)
 create mode 100644 core/core.pro
 rename {readxml => core}/head.h (100%)
 rename {readxml => core}/input.cpp (100%)
 rename {readxml => core}/linetypeparser.cpp (100%)
 rename {readxml => core}/linetypeparser.h (100%)
 create mode 100644 core/main.cpp
 rename {readxml => core}/mainfun.cpp (98%)
 rename {readxml => core}/nn06302000.csv (100%)
 rename {readxml => core}/output.cpp (100%)
 rename {readxml => core}/output1.cpp (100%)
 rename {readxml => core}/output2.cpp (100%)
 rename {readxml => core}/output3.cpp (100%)
 rename {readxml => core}/output4.cpp (100%)
 rename {readxml => core}/output5.cpp (100%)
 rename {readxml => core}/output6.cpp (100%)
 rename {readxml => core}/output7.cpp (100%)
 rename {readxml => core}/qt_readxml.cpp (100%)
 rename {readxml => core}/qt_readxml.h (100%)
 rename {readxml => core}/topology.cpp (100%)
 rename {readxml => core}/transformerparser.cpp (100%)
 rename {readxml => core}/transformerparser.h (100%)
 create mode 100644 testHasttable/main.cpp
 create mode 100644 testHasttable/testHasttable.pro

diff --git a/.gitignore b/.gitignore
index a8de601..b6affff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
 *.pro.user*
 *.bak
-*.orig
\ No newline at end of file
+*.orig
+debug
+release
+Makefile*
\ No newline at end of file
diff --git a/CIMforReduceLoss.pro b/CIMforReduceLoss.pro
deleted file mode 100644
index 9217b26..0000000
--- a/CIMforReduceLoss.pro
+++ /dev/null
@@ -1,39 +0,0 @@
-QT       += core
-
-QT       -= gui
-
-TARGET = Qt_AsyCallExtApp
-CONFIG   += console
-CONFIG   -= app_bundle
-
-TEMPLATE = app
-
-
-SOURCES += main.cpp \
-    derivedqthread.cpp \
-    cimparserbatch.cpp \
-    readxml/transformerparser.cpp \
-    readxml/topology.cpp \
-    readxml/qt_readxml.cpp \
-    readxml/output5.cpp \
-    readxml/output4.cpp \
-    readxml/output3.cpp \
-    readxml/output2.cpp \
-    readxml/output1.cpp \
-    readxml/output.cpp \
-    readxml/mainfun.cpp \
-    readxml/linetypeparser.cpp \
-    readxml/input.cpp \
-    readxml/DealData.cpp \
-    readxml/callmain.cpp \
-    readxml/Interface.cpp \
-    readxml/output6.cpp \
-    readxml/output7.cpp
-
-HEADERS += \
-    derivedqthread.h \
-    cimparserbatch.h \
-    readxml/transformerparser.h \
-    readxml/qt_readxml.h \
-    readxml/linetypeparser.h \
-    readxml/head.h
diff --git a/Solution.pro b/Solution.pro
new file mode 100644
index 0000000..0b100ae
--- /dev/null
+++ b/Solution.pro
@@ -0,0 +1,5 @@
+TEMPLATE = subdirs
+
+SUBDIRS=cimparser \
+    core \
+    testHasttable
diff --git a/cimparser/cimparser.pro b/cimparser/cimparser.pro
new file mode 100644
index 0000000..33ed5dc
--- /dev/null
+++ b/cimparser/cimparser.pro
@@ -0,0 +1,24 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator 2014-11-21T17:41:46
+#
+#-------------------------------------------------
+
+QT       += core
+
+QT       -= gui
+
+TARGET = cimparser
+CONFIG   += console
+CONFIG   -= app_bundle
+
+TEMPLATE = app
+
+
+SOURCES += main.cpp \
+    cimparserbatch.cpp \
+    derivedqthread.cpp
+
+HEADERS += \
+    cimparserbatch.h \
+    derivedqthread.h
diff --git a/cimparserbatch.cpp b/cimparser/cimparserbatch.cpp
similarity index 100%
rename from cimparserbatch.cpp
rename to cimparser/cimparserbatch.cpp
diff --git a/cimparserbatch.h b/cimparser/cimparserbatch.h
similarity index 100%
rename from cimparserbatch.h
rename to cimparser/cimparserbatch.h
diff --git a/derivedqthread.cpp b/cimparser/derivedqthread.cpp
similarity index 100%
rename from derivedqthread.cpp
rename to cimparser/derivedqthread.cpp
diff --git a/derivedqthread.h b/cimparser/derivedqthread.h
similarity index 100%
rename from derivedqthread.h
rename to cimparser/derivedqthread.h
diff --git a/main.cpp b/cimparser/main.cpp
similarity index 100%
rename from main.cpp
rename to cimparser/main.cpp
diff --git a/readxml/DealData.cpp b/core/DealData.cpp
similarity index 100%
rename from readxml/DealData.cpp
rename to core/DealData.cpp
diff --git a/readxml/Interface.cpp b/core/Interface.cpp
similarity index 100%
rename from readxml/Interface.cpp
rename to core/Interface.cpp
diff --git a/readxml/callmain.cpp b/core/callmain.cpp
similarity index 100%
rename from readxml/callmain.cpp
rename to core/callmain.cpp
diff --git a/core/core.pro b/core/core.pro
new file mode 100644
index 0000000..060259d
--- /dev/null
+++ b/core/core.pro
@@ -0,0 +1,41 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator 2014-11-21T17:45:18
+#
+#-------------------------------------------------
+
+QT       += core
+
+QT       -= gui
+
+TARGET = core
+CONFIG   += console
+CONFIG   -= app_bundle
+
+TEMPLATE = app
+
+
+SOURCES += main.cpp \
+    callmain.cpp \
+    DealData.cpp \
+    input.cpp \
+    Interface.cpp \
+    linetypeparser.cpp \
+    mainfun.cpp \
+    output.cpp \
+    output1.cpp \
+    output2.cpp \
+    output3.cpp \
+    output4.cpp \
+    output5.cpp \
+    output6.cpp \
+    output7.cpp \
+    qt_readxml.cpp \
+    topology.cpp \
+    transformerparser.cpp
+
+HEADERS += \
+    head.h \
+    linetypeparser.h \
+    qt_readxml.h \
+    transformerparser.h
diff --git a/readxml/head.h b/core/head.h
similarity index 100%
rename from readxml/head.h
rename to core/head.h
diff --git a/readxml/input.cpp b/core/input.cpp
similarity index 100%
rename from readxml/input.cpp
rename to core/input.cpp
diff --git a/readxml/linetypeparser.cpp b/core/linetypeparser.cpp
similarity index 100%
rename from readxml/linetypeparser.cpp
rename to core/linetypeparser.cpp
diff --git a/readxml/linetypeparser.h b/core/linetypeparser.h
similarity index 100%
rename from readxml/linetypeparser.h
rename to core/linetypeparser.h
diff --git a/core/main.cpp b/core/main.cpp
new file mode 100644
index 0000000..470a030
--- /dev/null
+++ b/core/main.cpp
@@ -0,0 +1,8 @@
+#include <QCoreApplication>
+
+int main(int argc, char *argv[])
+{
+    QCoreApplication a(argc, argv);
+
+    return a.exec();
+}
diff --git a/readxml/mainfun.cpp b/core/mainfun.cpp
similarity index 98%
rename from readxml/mainfun.cpp
rename to core/mainfun.cpp
index 5143739..2f0098d 100644
--- a/readxml/mainfun.cpp
+++ b/core/mainfun.cpp
@@ -8,7 +8,7 @@
 #include <fstream>
 #include <QTextStream>
 #include "qt_readxml.h"
-int mainfun(const QString &CIMFile)
+int mainfun(const QString &CIMFile)//CIMFile是文件路径
 {
     std::cout<<"parseing "<<CIMFile.toLocal8Bit().data()<<std::endl;
 	QFile file(CIMFile);
diff --git a/readxml/nn06302000.csv b/core/nn06302000.csv
similarity index 100%
rename from readxml/nn06302000.csv
rename to core/nn06302000.csv
diff --git a/readxml/output.cpp b/core/output.cpp
similarity index 100%
rename from readxml/output.cpp
rename to core/output.cpp
diff --git a/readxml/output1.cpp b/core/output1.cpp
similarity index 100%
rename from readxml/output1.cpp
rename to core/output1.cpp
diff --git a/readxml/output2.cpp b/core/output2.cpp
similarity index 100%
rename from readxml/output2.cpp
rename to core/output2.cpp
diff --git a/readxml/output3.cpp b/core/output3.cpp
similarity index 100%
rename from readxml/output3.cpp
rename to core/output3.cpp
diff --git a/readxml/output4.cpp b/core/output4.cpp
similarity index 100%
rename from readxml/output4.cpp
rename to core/output4.cpp
diff --git a/readxml/output5.cpp b/core/output5.cpp
similarity index 100%
rename from readxml/output5.cpp
rename to core/output5.cpp
diff --git a/readxml/output6.cpp b/core/output6.cpp
similarity index 100%
rename from readxml/output6.cpp
rename to core/output6.cpp
diff --git a/readxml/output7.cpp b/core/output7.cpp
similarity index 100%
rename from readxml/output7.cpp
rename to core/output7.cpp
diff --git a/readxml/qt_readxml.cpp b/core/qt_readxml.cpp
similarity index 100%
rename from readxml/qt_readxml.cpp
rename to core/qt_readxml.cpp
diff --git a/readxml/qt_readxml.h b/core/qt_readxml.h
similarity index 100%
rename from readxml/qt_readxml.h
rename to core/qt_readxml.h
diff --git a/readxml/topology.cpp b/core/topology.cpp
similarity index 100%
rename from readxml/topology.cpp
rename to core/topology.cpp
diff --git a/readxml/transformerparser.cpp b/core/transformerparser.cpp
similarity index 100%
rename from readxml/transformerparser.cpp
rename to core/transformerparser.cpp
diff --git a/readxml/transformerparser.h b/core/transformerparser.h
similarity index 100%
rename from readxml/transformerparser.h
rename to core/transformerparser.h
diff --git a/testHasttable/main.cpp b/testHasttable/main.cpp
new file mode 100644
index 0000000..470a030
--- /dev/null
+++ b/testHasttable/main.cpp
@@ -0,0 +1,8 @@
+#include <QCoreApplication>
+
+int main(int argc, char *argv[])
+{
+    QCoreApplication a(argc, argv);
+
+    return a.exec();
+}
diff --git a/testHasttable/testHasttable.pro b/testHasttable/testHasttable.pro
new file mode 100644
index 0000000..144d657
--- /dev/null
+++ b/testHasttable/testHasttable.pro
@@ -0,0 +1,18 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator 2014-11-21T17:47:12
+#
+#-------------------------------------------------
+
+QT       += core
+
+QT       -= gui
+
+TARGET = testHasttable
+CONFIG   += console
+CONFIG   -= app_bundle
+
+TEMPLATE = app
+
+
+SOURCES += main.cpp