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 + +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 #include #include "qt_readxml.h" -int mainfun(const QString &CIMFile) +int mainfun(const QString &CIMFile)//CIMFile是文件路径 { std::cout<<"parseing "< + +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