From b7d0ff4fab084d0a05d82c027fdfa3577a06c9b5 Mon Sep 17 00:00:00 2001 From: Zhengyu Peng Date: Fri, 4 Mar 2022 16:08:54 -0500 Subject: [PATCH] update GUI --- software/pc/mainwindow.ui | 1032 ++++++++++++++++---- software/pc/res/arrow-circle-solid.svg | 60 ++ software/pc/res/arrow-down-down-solid.svg | 74 ++ software/pc/res/arrow-down-left-solid.svg | 53 + software/pc/res/arrow-down-right-solid.svg | 53 + software/pc/res/arrow-down-solid.svg | 53 + software/pc/res/arrow-left-right-solid.svg | 72 ++ software/pc/res/arrow-left-solid.svg | 52 + software/pc/res/arrow-right-solid.svg | 52 + software/pc/res/arrow-turn-left-solid.svg | 109 +++ software/pc/res/arrow-turn-right-solid.svg | 101 ++ software/pc/res/arrow-twist-solid.svg | 72 ++ software/pc/res/arrow-up-down-solid.svg | 72 ++ software/pc/res/arrow-up-left-solid.svg | 53 + software/pc/res/arrow-up-right-solid.svg | 53 + software/pc/res/arrow-up-solid.svg | 53 + software/pc/res/arrow-up-up-solid.svg | 74 ++ software/pc/res/arrows-rotate-solid.svg | 37 + software/pc/res/climb-down-solid.svg | 89 ++ software/pc/res/climb-up-solid.svg | 89 ++ software/pc/res/pause-solid.svg | 55 ++ 21 files changed, 2163 insertions(+), 195 deletions(-) create mode 100644 software/pc/res/arrow-circle-solid.svg create mode 100644 software/pc/res/arrow-down-down-solid.svg create mode 100644 software/pc/res/arrow-down-left-solid.svg create mode 100644 software/pc/res/arrow-down-right-solid.svg create mode 100644 software/pc/res/arrow-down-solid.svg create mode 100644 software/pc/res/arrow-left-right-solid.svg create mode 100644 software/pc/res/arrow-left-solid.svg create mode 100644 software/pc/res/arrow-right-solid.svg create mode 100644 software/pc/res/arrow-turn-left-solid.svg create mode 100644 software/pc/res/arrow-turn-right-solid.svg create mode 100644 software/pc/res/arrow-twist-solid.svg create mode 100644 software/pc/res/arrow-up-down-solid.svg create mode 100644 software/pc/res/arrow-up-left-solid.svg create mode 100644 software/pc/res/arrow-up-right-solid.svg create mode 100644 software/pc/res/arrow-up-solid.svg create mode 100644 software/pc/res/arrow-up-up-solid.svg create mode 100644 software/pc/res/arrows-rotate-solid.svg create mode 100644 software/pc/res/climb-down-solid.svg create mode 100644 software/pc/res/climb-up-solid.svg create mode 100644 software/pc/res/pause-solid.svg diff --git a/software/pc/mainwindow.ui b/software/pc/mainwindow.ui index 40948ac..c7e34ba 100644 --- a/software/pc/mainwindow.ui +++ b/software/pc/mainwindow.ui @@ -6,14 +6,14 @@ 0 0 - 500 - 400 + 587 + 560 500 - 400 + 560 @@ -26,311 +26,953 @@ - + + + 0 + + + + WiFi + + + + + + + + + + + + res/arrows-rotate-solid.svgres/arrows-rotate-solid.svg + + + + + + + + 1 + 0 + + + + + 100 + 0 + + + + + 16777215 + 16777215 + + + + + + + + IP: + + + + + + + 255.255.255.255 + + + + + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 0 + 0 + + + + Robot IP: + + + + + + + + 150 + 0 + + + + + 16777215 + 16777215 + + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + Port: + + + + + + + + 80 + 0 + + + + + 80 + 16777215 + + + + + + + + Connect + + + + + + + + + + Bluetooth + + + + + + + + Robot MAC: + + + + + + + + 1 + 0 + + + + + 150 + 0 + + + + + + + + Port: + + + + + + + + 80 + 0 + + + + + 80 + 16777215 + + + + + + + + Connect + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + + false + + - Connect + Control + + + Qt::AlignCenter + + + false - + - - - - - - 0 - 0 - - + + + 12 + + + - 100 - 0 + 50 + 50 - 200 - 16777215 + 50 + 50 + + + + + + res/arrow-twist-solid.svgres/arrow-twist-solid.svg + + + + 32 + 32 + + + + true + - - - - Qt::Vertical + + + + false + + + + + + true - - + + + + false + - IP: + + + + true - - + + + + + 50 + 50 + + + + + 50 + 50 + + - 255.255.255.255 + + + + + res/arrow-circle-solid.svgres/arrow-circle-solid.svg + + + + 32 + 32 + + + + true - - - - Qt::Horizontal + + + + + 50 + 50 + - + - 40 - 20 + 50 + 50 - + + + + + + res/climb-down-solid.svgres/climb-down-solid.svg + + + + 32 + 32 + + + + true + + - - + + + + + 50 + 50 + + + + + 50 + 50 + + - Refresh + + + + + res/climb-up-solid.svgres/climb-up-solid.svg + + + + 32 + 32 + + + + true + + + + + + + + 0 + 0 + + + + + 50 + 50 + + + + + 50 + 50 + + + + + + + + res/arrow-up-down-solid.svgres/arrow-up-down-solid.svg + + + + 32 + 32 + + + + true + + + + + + + + 50 + 50 + + + + + 50 + 50 + + + + + + + + res/arrow-left-right-solid.svgres/arrow-left-right-solid.svg + + + + 32 + 32 + + + + true - + Qt::Horizontal - + + + 40 + 20 + + + - - - + + + 12 + + + - + 0 0 - 0 - 0 + 50 + 50 + + + + + 50 + 50 - + + + + + + res/arrow-right-solid.svgres/arrow-right-solid.svg + + + true + + + + + + + + 0 + 0 + + + - 0 - 0 + 40 + 150 - Target IP: + + + + + res/arrow-turn-left-solid.svgres/arrow-turn-left-solid.svg + + + + 24 + 64 + + + + true - - + + + + + 0 + 0 + + - 150 - 0 + 50 + 50 - 200 - 16777215 + 50 + 50 + + + + + + res/arrow-down-solid.svgres/arrow-down-solid.svg + + + true + - - - - Qt::Vertical + + + + + 0 + 0 + + + + + 50 + 50 + + + + + 50 + 50 + + + + + + + + res/arrow-down-right-solid.svgres/arrow-down-right-solid.svg + + + true + + + + + + + + 0 + 0 + + + + + 50 + 50 + + + + + 50 + 50 + + + + + + + + res/arrow-down-left-solid.svgres/arrow-down-left-solid.svg + + + true + + + + + + + + 40 + 150 + + + + + + + + res/arrow-turn-right-solid.svgres/arrow-turn-right-solid.svg + + + + 24 + 64 + + + + true - - + + + + true + - + 0 0 - 0 - 0 + 50 + 50 + + + + + 50 + 50 - Port: + + + + + res/arrow-up-right-solid.svgres/arrow-up-right-solid.svg + + + true - - + + + + 0 + + + + + + 150 + 40 + + + + + 150 + 16777215 + + + + + + + + res/arrow-up-up-solid.svgres/arrow-up-up-solid.svg + + + + 24 + 24 + + + + true + + + false + + + false + + + + + + + + + + 0 + 0 + + - 80 - 0 + 50 + 50 - 80 - 16777215 + 50 + 50 + + + + + + res/pause-solid.svgres/pause-solid.svg + + + true + + + true + - - - - Qt::Horizontal + + + + + 0 + 0 + - + - 40 - 20 + 50 + 50 + + + + + 50 + 50 + + + + + + + + res/arrow-left-solid.svgres/arrow-left-solid.svg + + + true + + + + + + + + 0 + 0 + + + + + 50 + 50 - + + + 50 + 50 + + + + + + + + res/arrow-up-left-solid.svgres/arrow-up-left-solid.svg + + + true + + - - + + + + + 0 + 0 + + + + + 50 + 50 + + + + + 50 + 50 + + - Connect + + + + + res/arrow-up-solid.svgres/arrow-up-solid.svg + + + true + + + + 0 + + + + + + 0 + 40 + + + + + 150 + 16777215 + + + + + + + + res/arrow-down-down-solid.svgres/arrow-down-down-solid.svg + + + + 24 + 24 + + + + true + + + + + - + - Control + - - - - - Turn Right (→) - - - - - - - Forward (↑W) - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Backward (↓S) - - - - - - - Fast Forward - - - - - - - Rotate Y - - - - - - - Shift Left (A) - - - - - - - Turn Left (←) - - - - - - - Shift Right (D) - - - - - - - Standby ( ) - - - - - - - Rotate X - - - - - - - Rotate Z - - - - - - - Twist - - - - - - - Climb - - + + + - - - @@ -338,7 +980,7 @@ 0 0 - 500 + 587 22 diff --git a/software/pc/res/arrow-circle-solid.svg b/software/pc/res/arrow-circle-solid.svg new file mode 100644 index 0000000..6a76a0b --- /dev/null +++ b/software/pc/res/arrow-circle-solid.svg @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + diff --git a/software/pc/res/arrow-down-down-solid.svg b/software/pc/res/arrow-down-down-solid.svg new file mode 100644 index 0000000..cfdd931 --- /dev/null +++ b/software/pc/res/arrow-down-down-solid.svg @@ -0,0 +1,74 @@ + + + + + + + + + + diff --git a/software/pc/res/arrow-down-left-solid.svg b/software/pc/res/arrow-down-left-solid.svg new file mode 100644 index 0000000..73d5243 --- /dev/null +++ b/software/pc/res/arrow-down-left-solid.svg @@ -0,0 +1,53 @@ + + + + + + + diff --git a/software/pc/res/arrow-down-right-solid.svg b/software/pc/res/arrow-down-right-solid.svg new file mode 100644 index 0000000..fd3284b --- /dev/null +++ b/software/pc/res/arrow-down-right-solid.svg @@ -0,0 +1,53 @@ + + + + + + + diff --git a/software/pc/res/arrow-down-solid.svg b/software/pc/res/arrow-down-solid.svg new file mode 100644 index 0000000..7683e24 --- /dev/null +++ b/software/pc/res/arrow-down-solid.svg @@ -0,0 +1,53 @@ + + + + + + + diff --git a/software/pc/res/arrow-left-right-solid.svg b/software/pc/res/arrow-left-right-solid.svg new file mode 100644 index 0000000..a4e7cd5 --- /dev/null +++ b/software/pc/res/arrow-left-right-solid.svg @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + diff --git a/software/pc/res/arrow-left-solid.svg b/software/pc/res/arrow-left-solid.svg new file mode 100644 index 0000000..7e3e277 --- /dev/null +++ b/software/pc/res/arrow-left-solid.svg @@ -0,0 +1,52 @@ + + + + + + + diff --git a/software/pc/res/arrow-right-solid.svg b/software/pc/res/arrow-right-solid.svg new file mode 100644 index 0000000..6cba27d --- /dev/null +++ b/software/pc/res/arrow-right-solid.svg @@ -0,0 +1,52 @@ + + + + + + + diff --git a/software/pc/res/arrow-turn-left-solid.svg b/software/pc/res/arrow-turn-left-solid.svg new file mode 100644 index 0000000..ee3d072 --- /dev/null +++ b/software/pc/res/arrow-turn-left-solid.svg @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + diff --git a/software/pc/res/arrow-turn-right-solid.svg b/software/pc/res/arrow-turn-right-solid.svg new file mode 100644 index 0000000..fa09592 --- /dev/null +++ b/software/pc/res/arrow-turn-right-solid.svg @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + diff --git a/software/pc/res/arrow-twist-solid.svg b/software/pc/res/arrow-twist-solid.svg new file mode 100644 index 0000000..fd870fa --- /dev/null +++ b/software/pc/res/arrow-twist-solid.svg @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + diff --git a/software/pc/res/arrow-up-down-solid.svg b/software/pc/res/arrow-up-down-solid.svg new file mode 100644 index 0000000..588a503 --- /dev/null +++ b/software/pc/res/arrow-up-down-solid.svg @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + diff --git a/software/pc/res/arrow-up-left-solid.svg b/software/pc/res/arrow-up-left-solid.svg new file mode 100644 index 0000000..fee5742 --- /dev/null +++ b/software/pc/res/arrow-up-left-solid.svg @@ -0,0 +1,53 @@ + + + + + + + diff --git a/software/pc/res/arrow-up-right-solid.svg b/software/pc/res/arrow-up-right-solid.svg new file mode 100644 index 0000000..5b1df7a --- /dev/null +++ b/software/pc/res/arrow-up-right-solid.svg @@ -0,0 +1,53 @@ + + + + + + + diff --git a/software/pc/res/arrow-up-solid.svg b/software/pc/res/arrow-up-solid.svg new file mode 100644 index 0000000..9255eff --- /dev/null +++ b/software/pc/res/arrow-up-solid.svg @@ -0,0 +1,53 @@ + + + + + + + diff --git a/software/pc/res/arrow-up-up-solid.svg b/software/pc/res/arrow-up-up-solid.svg new file mode 100644 index 0000000..e272bd0 --- /dev/null +++ b/software/pc/res/arrow-up-up-solid.svg @@ -0,0 +1,74 @@ + + + + + + + + + + diff --git a/software/pc/res/arrows-rotate-solid.svg b/software/pc/res/arrows-rotate-solid.svg new file mode 100644 index 0000000..158cef2 --- /dev/null +++ b/software/pc/res/arrows-rotate-solid.svg @@ -0,0 +1,37 @@ + + + + + + + diff --git a/software/pc/res/climb-down-solid.svg b/software/pc/res/climb-down-solid.svg new file mode 100644 index 0000000..4820b08 --- /dev/null +++ b/software/pc/res/climb-down-solid.svg @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/pc/res/climb-up-solid.svg b/software/pc/res/climb-up-solid.svg new file mode 100644 index 0000000..4b23b85 --- /dev/null +++ b/software/pc/res/climb-up-solid.svg @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/pc/res/pause-solid.svg b/software/pc/res/pause-solid.svg new file mode 100644 index 0000000..21d392f --- /dev/null +++ b/software/pc/res/pause-solid.svg @@ -0,0 +1,55 @@ + + + + + + + + + +