diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..7af4a44025b4f4575bddf4dec2e69e2c4c11d171 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +*.user +*.tmp + diff --git a/FunctionalClientTest/FunctionalClientTest.pro b/FunctionalClientTest/FunctionalClientTest.pro index bdc034471401ce827c5a68caf77e75ddab0db014..527229a4a4407d6bd7f3d89f3a2aa460410b3756 100644 --- a/FunctionalClientTest/FunctionalClientTest.pro +++ b/FunctionalClientTest/FunctionalClientTest.pro @@ -8,7 +8,7 @@ QT += core gui network greaterThan(QT_MAJOR_VERSION, 4): QT += widgets -TARGET = FunctionalClientTest +TARGET = $$OUT_PWD/../bin/FunctionalClientTest TEMPLATE = app diff --git a/QTcpClientTest/QTcpClientTest.pro b/QTcpClientTest/QTcpClientTest.pro index 26b16b3d5a707508d94d81a0f3306a03c00badc6..395c516b828fc52c78056e71ee3c34254ea33134 100644 --- a/QTcpClientTest/QTcpClientTest.pro +++ b/QTcpClientTest/QTcpClientTest.pro @@ -7,7 +7,7 @@ QT += core gui network greaterThan(QT_MAJOR_VERSION, 4): QT += widgets -TARGET = QTcpClientTest +TARGET = $$OUT_PWD/../bin/QTcpClientTest TEMPLATE = app # Input HEADERS += qghtcpclient.h qtcpclienttest.h \ diff --git a/ZoomPipeline_FuncSvr/ZoomPipeline_FuncSvr.pro b/ZoomPipeline_FuncSvr/ZoomPipeline_FuncSvr.pro index b7d07b6a736fc826cef9d14c27e4c2cf904f127f..3ddd461769decbdc23cd443541c3bb18ea8c5d6f 100644 --- a/ZoomPipeline_FuncSvr/ZoomPipeline_FuncSvr.pro +++ b/ZoomPipeline_FuncSvr/ZoomPipeline_FuncSvr.pro @@ -9,7 +9,7 @@ unix:QMAKE_CXXFLAGS += -std=c++11 win32-g++: QMAKE_CXXFLAGS += -std=c++11 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets -TARGET = ZoomPipeline_FuncSvr +TARGET = $$OUT_PWD/../bin/ZoomPipeline_FuncSvr TEMPLATE = app diff --git a/ZoomPipeline_FuncSvr/zpmainframe.ui b/ZoomPipeline_FuncSvr/zpmainframe.ui index 8265d4d2f4f94638eac1dd28d039c55ef28b9f84..36eb03f4150c14883449171de226a305562e9815 100644 --- a/ZoomPipeline_FuncSvr/zpmainframe.ui +++ b/ZoomPipeline_FuncSvr/zpmainframe.ui @@ -1036,7 +1036,7 @@ 0 0 640 - 23 + 21 @@ -1203,5 +1203,21 @@ + + dial_plain_trans_threads + valueChanged(int) + progressBar_plain_threads + setValue(int) + + + 252 + 150 + + + 458 + 150 + + + diff --git a/doc/readme_zh_CN.wps b/doc/readme_zh_CN.wps new file mode 100644 index 0000000000000000000000000000000000000000..d57c6561c3ff20d6022d6beca79a83b7ca522227 Binary files /dev/null and b/doc/readme_zh_CN.wps differ diff --git a/doc/techbrief_zh_CN.wps b/doc/techbrief_zh_CN.wps new file mode 100644 index 0000000000000000000000000000000000000000..3531997de5266f0789bf18f2d89595b6c7ddb199 Binary files /dev/null and b/doc/techbrief_zh_CN.wps differ diff --git a/zoomPipeline.pro b/zoomPipeline.pro index 49032e487e2739df3b5451e46388932f7297f332..8792969f10d0b1f058c9b0134efc742c2a7bdb34 100644 --- a/zoomPipeline.pro +++ b/zoomPipeline.pro @@ -2,4 +2,4 @@ TEMPLATE = subdirs SUBDIRS += QTcpClientTest SUBDIRS += FunctionalClientTest SUBDIRS += ZoomPipeline_FuncSvr - +OTHER_FILES += .gitignore