diff --git a/src/YOLOv6/imgdir/test.jpg b/src/YOLOv6/imgdir/test.jpg index b2b3187..a1fb525 100644 Binary files a/src/YOLOv6/imgdir/test.jpg and b/src/YOLOv6/imgdir/test.jpg differ diff --git a/src/YOLOv6/runs/inference/exp/test.jpg b/src/YOLOv6/runs/inference/exp/test.jpg index 1ddcf3c..aa3b2d9 100644 Binary files a/src/YOLOv6/runs/inference/exp/test.jpg and b/src/YOLOv6/runs/inference/exp/test.jpg differ diff --git a/src/main/loginui.cpp b/src/main/loginui.cpp index ac7e539..d24714f 100644 --- a/src/main/loginui.cpp +++ b/src/main/loginui.cpp @@ -3,6 +3,7 @@ #include #include #include +#include LoginUi::LoginUi(QWidget *parent) : QMainWindow(parent), @@ -82,8 +83,11 @@ bool LoginUi::verifyAccount(string usr, string pwd){ void LoginUi::changetoMainwindow(){ this->close(); - MainWindow CEC(0,0,0); - CEC.show(); + + //MainWindow CEC(0,0,0); + //CEC.show(); + + } diff --git a/src/main/main.cpp b/src/main/main.cpp index 9dcfa16..303674f 100644 --- a/src/main/main.cpp +++ b/src/main/main.cpp @@ -16,7 +16,7 @@ int main(int argc, char** argv) CEC.show(); //LoginUi a(0); //a.show(); - return app.exec(); + app.exec(); return(0); } diff --git a/src/main/mainwindow.cpp b/src/main/mainwindow.cpp index 1181cf9..d9e8ecb 100644 --- a/src/main/mainwindow.cpp +++ b/src/main/mainwindow.cpp @@ -286,8 +286,7 @@ void MainWindow::setBtnStyles(){ * set PushButton state */ - ui->btn_main->setIcon(QIcon("://images/up.png")); - ui->btn_main->setText("mainWidget"); + ui->btn_main->setStyleSheet( "QPushButton:hover{" "background-color:rgb(186, 189, 182);" diff --git a/src/ui/loginui.ui b/src/ui/loginui.ui index 64e9aae..0bb917b 100755 --- a/src/ui/loginui.ui +++ b/src/ui/loginui.ui @@ -841,8 +841,8 @@ background-color:none 0 0 - 205 - 104 + 579 + 196 @@ -902,8 +902,8 @@ background-color:none 0 0 - 88 - 88 + 579 + 196 @@ -926,7 +926,7 @@ background-color:none 0 0 - 267 + 565 312 @@ -1251,8 +1251,8 @@ background-color:none 0 0 - 313 - 133 + 579 + 196 diff --git a/src/ui/mainwindow.ui b/src/ui/mainwindow.ui index 59f3da4..52165bb 100644 --- a/src/ui/mainwindow.ui +++ b/src/ui/mainwindow.ui @@ -47,7 +47,7 @@ - + Main @@ -69,7 +69,7 @@ - + Tello @@ -94,7 +94,7 @@ - + Robo @@ -673,7 +673,7 @@ QProgressBar::chunk - PushButton + 获取目标 @@ -699,7 +699,7 @@ QProgressBar::chunk - shortcut + @@ -1286,7 +1286,7 @@ background-color: rgb(255,255,255); - system + Auto @@ -1299,7 +1299,7 @@ background-color: rgb(255,255,255); - keyboard + Keyboard @@ -1358,7 +1358,7 @@ background-color: rgb(255,255,255); - Logging + Camera