From b3bc7ce4b23915905987f534c6f86d2331058b7f Mon Sep 17 00:00:00 2001 From: zhaohe Date: Tue, 23 Apr 2024 21:52:58 +0800 Subject: [PATCH] =?UTF-8?q?V10,=E4=BC=98=E5=8C=96UI=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/settings.json | 3 +- CMakeLists.txt.user | 6 +- app.rc | 2 +- logo.ico | Bin 0 -> 4286 bytes logo32x32.ico | Bin 0 -> 4286 bytes mainwindow.ui | 815 +++++++++++++++++++++++--------------------------- src/version.h | 2 +- 7 files changed, 389 insertions(+), 439 deletions(-) create mode 100644 logo.ico create mode 100644 logo32x32.ico diff --git a/.vscode/settings.json b/.vscode/settings.json index 9476081..061614d 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -88,7 +88,8 @@ "qmessagebox": "cpp", "qgridlayout": "cpp", "qmenu": "cpp", - "qmenubar": "cpp" + "qmenubar": "cpp", + "qtextedit": "cpp" }, "files.autoGuessEncoding": false, } \ No newline at end of file diff --git a/CMakeLists.txt.user b/CMakeLists.txt.user index c316def..cae6e8f 100644 --- a/CMakeLists.txt.user +++ b/CMakeLists.txt.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -94,7 +94,7 @@ Desktop Qt 5.12.12 MinGW 64-bit Desktop Qt 5.12.12 MinGW 64-bit qt.qt5.51212.win64_mingw73_kit - 0 + 2 0 0 @@ -262,7 +262,7 @@ true false true - D:/workspace/p_camera_light_source_timing_controller/build-camera_light_src_timing_controller_pc-Desktop_Qt_5_12_12_MinGW_64_bit-Debug + D:/workspace/p_camera_light_source_timing_controller/build-camera_light_src_timing_controller_pc-Desktop_Qt_5_12_12_MinGW_64_bit-Release 1 diff --git a/app.rc b/app.rc index d668bdc..c309aa1 100644 --- a/app.rc +++ b/app.rc @@ -1 +1 @@ -IDI_ICON1 ICON "applogo.ico" \ No newline at end of file +IDI_ICON1 ICON "logo.ico" \ No newline at end of file diff --git a/logo.ico b/logo.ico new file mode 100644 index 0000000000000000000000000000000000000000..ef96426aea324a9453760ed1e0cc3ce33234648d GIT binary patch literal 4286 zcmc(jTWl0n7{|x>1WyX>?5RY%u?8feVt3iyIdl2@KeHV>t)x%1JI!y;nRCwf z{k}PKb|0!J*YPhoS&^Sg=M9RYDvFXqIHWvArLIksnbogzjbf@{|1y}KY6}@wd-*&I|r3Y90f&_Dnbf$-1 z_Vp3OiN4S)-XKAo2!>vzJC0m=&5OA52K{j)oZ&@WSx>*4bsmJ*sYJHZaMsE3jKtWy zGv>6;oHL)nTx%1!o~^US-Dc76uwF%U`wHks+erIF%YI)w#DNlovlk(pb2CI&6+~w_ zBKb=Y&SWi4d?p=v$%wY3LGOMSdjEdthxbD3$Va5|VT3m@KGWr6TqN5?W&(u&bwGpx zJpzO;1EEX6l`&Yq9z(Pw1(DoEFo${|FL9t4k*vg6jx5%`=^hv-x&V#w@-hv;vSQtl zAw)MXMP!3I)tN)TLv|vx#wUTXbFj{zfoNR=(fka=j%OhnpFp(W7RIVD0&R9qW8h=P zdSdZ!Cc*f+!ydOTpXc*8LED`Mu`d&P?|TrR6d=Mi|G6Az9{m$Ub5&>+_rf}R0vP!b zTJ17Ka~2?)mjF$Y@8Nv{^v|}&p6PVJt|^+!x@(rf8XX44FG6%=(UUL<=OfJRc-(C? z--}5+&`OuU8axR6J^+2ka)^AslLC*8wvm3;A@;4c_trW)2vK&sy+&_%1o-X%tp4|* zm#45+zKw{a%)x!1GM@-hn+j{>2jIdP z=sTA~+qeMww)=tMZs6x07`vW=UdWn?S+_g(YW))W-4rFj__8|oe!uVJoOg2G&c}MT z+{*7mAMnow7#%#Lg*QT!-URbVGw{bLSjRttUVk6-BGy1O=G0^><%=iRRB>PHQz052fcZ-=5E+N@RXs%A-4NAxKyQ2q)=!@Ue-6VsbqHo>4vdz^ zq3>D_{ezXf5GB=u+E)?v40KE!Gk;lt^EG*{frLr93Qjmfn~xx*#%LaG}Tu|{}kw|xeZ2d zJVIFUT`E4uAZzO&jN{qjLuAm3jTh&eOu`NAM};;oRzb6&&hjd-0sVJ7tUHaR>plSV=e4U>^P21$;b72 z#VoLuIo-_UsN&k$pptnVX2@^Ucra^JGq+?WN1Z2V)NxIG2paWjA3>ZrYHnB4NswTU zk1WyX>?5RY%u?8feVt3iyIdl2@KeHV>t)x%1JI!y;nRCwf z{k}PKb|0!J*YPhoS&^Sg=M9RYDvFXqIHWvArLIksnbogzjbf@{|1y}KY6}@wd-*&I|r3Y90f&_Dnbf$-1 z_Vp3OiN4S)-XKAo2!>vzJC0m=&5OA52K{j)oZ&@WSx>*4bsmJ*sYJHZaMsE3jKtWy zGv>6;oHL)nTx%1!o~^US-Dc76uwF%U`wHks+erIF%YI)w#DNlovlk(pb2CI&6+~w_ zBKb=Y&SWi4d?p=v$%wY3LGOMSdjEdthxbD3$Va5|VT3m@KGWr6TqN5?W&(u&bwGpx zJpzO;1EEX6l`&Yq9z(Pw1(DoEFo${|FL9t4k*vg6jx5%`=^hv-x&V#w@-hv;vSQtl zAw)MXMP!3I)tN)TLv|vx#wUTXbFj{zfoNR=(fka=j%OhnpFp(W7RIVD0&R9qW8h=P zdSdZ!Cc*f+!ydOTpXc*8LED`Mu`d&P?|TrR6d=Mi|G6Az9{m$Ub5&>+_rf}R0vP!b zTJ17Ka~2?)mjF$Y@8Nv{^v|}&p6PVJt|^+!x@(rf8XX44FG6%=(UUL<=OfJRc-(C? z--}5+&`OuU8axR6J^+2ka)^AslLC*8wvm3;A@;4c_trW)2vK&sy+&_%1o-X%tp4|* zm#45+zKw{a%)x!1GM@-hn+j{>2jIdP z=sTA~+qeMww)=tMZs6x07`vW=UdWn?S+_g(YW))W-4rFj__8|oe!uVJoOg2G&c}MT z+{*7mAMnow7#%#Lg*QT!-URbVGw{bLSjRttUVk6-BGy1O=G0^><%=iRRB>PHQz052fcZ-=5E+N@RXs%A-4NAxKyQ2q)=!@Ue-6VsbqHo>4vdz^ zq3>D_{ezXf5GB=u+E)?v40KE!Gk;lt^EG*{frLr93Qjmfn~xx*#%LaG}Tu|{}kw|xeZ2d zJVIFUT`E4uAZzO&jN{qjLuAm3jTh&eOu`NAM};;oRzb6&&hjd-0sVJ7tUHaR>plSV=e4U>^P21$;b72 z#VoLuIo-_UsN&k$pptnVX2@^Ucra^JGq+?WN1Z2V)NxIG2paWjA3>ZrYHnB4NswTU zk - 0 + 3 true @@ -4367,6 +4367,19 @@ QGroupBox:title { 快门时序配置 + + + + Qt::Vertical + + + + 20 + 40 + + + + @@ -4410,24 +4423,10 @@ QGroupBox:title { - - - - 光源4 - - - - - - - Qt::Horizontal - - - - - + + - + 1 0 @@ -4440,14 +4439,14 @@ QGroupBox:title { - - + + - 光源1 + 绑定列表 - + @@ -4472,14 +4471,7 @@ QGroupBox:title { - - - - Qt::Horizontal - - - - + Qt::Vertical @@ -4492,42 +4484,23 @@ QGroupBox:title { - - - - 光源2 - - - - - - - 输出极性翻转 - - - - - - - Qt::Horizontal - - - - - - - + + + + + 1 + 0 + - - - - - - 光源3 + + + 0 + 25 + - + @@ -4537,7 +4510,7 @@ QGroupBox:title { - + @@ -4562,34 +4535,69 @@ QGroupBox:title { - - - - - 1 - 0 - - - - - 0 - 25 - + + + + 输出极性翻转 - - + + - 绑定列表 + + + + + + + + 光源1 + + + + + + + 光源2 + + + + + + + 光源3 + + + + + + + 光源4 + + + + + + - - + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + 400 @@ -4603,11 +4611,24 @@ QGroupBox:title { - 快门输出2 + 快门输出3 - - - + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + 1 @@ -4627,32 +4648,12 @@ QGroupBox:title { - 触发模式 - - - - - - - 光源4 - - - - - - - Qt::Horizontal + 触发延迟(100ns) - - - - - 1 - 0 - - + + 0 @@ -4661,18 +4662,11 @@ QGroupBox:title { - - - - 光源1 - - - - - + + - 1 + 0 0 @@ -4689,80 +4683,15 @@ QGroupBox:title { - 触发延迟(100ns) - - - - - - - Qt::Horizontal - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - 光源2 - - - - - - - 输出极性翻转 - - - - - - - Qt::Horizontal - - - - - - - - - - - - - - 光源3 - - - - - - - - 0 - 25 - + 转发信号选择 - - + + - 0 + 1 0 @@ -4779,12 +4708,12 @@ QGroupBox:title { - 转发信号选择 + 触发模式 - + 1 @@ -4799,16 +4728,83 @@ QGroupBox:title { - - - - 绑定列表 + + + + + 1 + 0 + - - - - - + + + 0 + 25 + + + + + + + + 绑定列表 + + + + + + + + + + + + + + 输出极性翻转 + + + + + + + + + + + + + 光源1 + + + + + + + 光源2 + + + + + + + 光源3 + + + + + + + 光源4 + + + + + + + + + @@ -4822,21 +4818,8 @@ QGroupBox:title { - - - - Qt::Vertical - - - - 20 - 40 - - - - - - + + 400 @@ -4850,13 +4833,13 @@ QGroupBox:title { - 快门输出3 + 快门输出4 - - - + + + - + 1 0 @@ -4867,39 +4850,23 @@ QGroupBox:title { 25 - - - 16777215 - 25 - - - - 触发模式 - - - - - 光源4 - - - - - + + - Qt::Horizontal + Qt::Vertical - - - - - - - 1 - 0 - + + + 20 + 40 + + + + + 0 @@ -4908,15 +4875,8 @@ QGroupBox:title { - - - - 光源1 - - - - - + + 1 @@ -4936,77 +4896,12 @@ QGroupBox:title { - 触发延迟(100ns) - - - - - - - Qt::Horizontal - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - 光源2 - - - - - - - 输出极性翻转 - - - - - - - Qt::Horizontal - - - - - - - - - - - - - - 光源3 - - - - - - - - 0 - 25 - + 触发模式 - - + + 0 @@ -5031,7 +4926,7 @@ QGroupBox:title { - + 1 @@ -5046,46 +4941,15 @@ QGroupBox:title { - - + + 绑定列表 - - - - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - - - - - 400 - 400 - - - - - 400 - 16777215 - - - - 快门输出4 - - - - + + 1 @@ -5105,49 +4969,84 @@ QGroupBox:title { - 触发模式 + 触发延迟(100ns) - - + + - 光源4 - - - - - - - Qt::Horizontal + - - - - - 1 - 0 - - - - - 0 - 25 - + + + + 输出极性翻转 - - - - 光源1 + + + + + + + + + 光源1 + + + + + + + 光源2 + + + + + + + 光源3 + + + + + + + 光源4 + + + + - - + + + + + + + + 400 + 400 + + + + + 400 + 16777215 + + + + 快门输出2 + + + + 1 @@ -5171,15 +5070,15 @@ QGroupBox:title { - - - - Qt::Horizontal + + + + - - + + Qt::Vertical @@ -5191,43 +5090,39 @@ QGroupBox:title { - - - - 光源2 + + + + + 0 + 0 + - - - - - - 输出极性翻转 + + + 0 + 25 + - - - - - - Qt::Horizontal + + + 16777215 + 25 + - - - - - + 转发信号选择 - - - - 光源3 + + + + + 1 + 0 + - - - - 0 @@ -5236,11 +5131,11 @@ QGroupBox:title { - - + + - 0 + 1 0 @@ -5257,14 +5152,24 @@ QGroupBox:title { - 转发信号选择 + 触发模式 - - + + + + + 0 + 25 + + + + + + - + 1 0 @@ -5277,13 +5182,57 @@ QGroupBox:title { - - + + 绑定列表 + + + + 输出极性翻转 + + + + + + + + + + + + + 光源1 + + + + + + + 光源2 + + + + + + + 光源3 + + + + + + + 光源4 + + + + + + diff --git a/src/version.h b/src/version.h index 756d3c9..2c84ae8 100644 --- a/src/version.h +++ b/src/version.h @@ -1,4 +1,4 @@ #pragma once -#define VERSION 9 +#define VERSION 10 #define MAUFACTURER "iflytop" \ No newline at end of file