diff --git a/CMakeLists.txt b/CMakeLists.txt index 041ad98..40aadf5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,7 +36,6 @@ set(PROJECT_SOURCES app.rc ) - add_executable(zfpga_pc WIN32 ${PROJECT_SOURCES} ) diff --git a/src/app/main.cpp b/src/app/main.cpp index 412044a..c8f2bb6 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -18,9 +18,8 @@ #include #include -#include "zqui/appmgr/appmgr.hpp" -#include "zqui/mainpage/mainwindow.h" -#include "zqui/zqui.hpp" +#include "zqui/zqui/mainwindow.h" +#include "zqui/zqui/zqui.hpp" // #include "app/syncbox16ch/syncbox16ch.h" // @@ -37,10 +36,11 @@ int main(int argc, char* argv[]) { WSAStartup(MAKEWORD(2, 2), &wsaData); QApplication a(argc, argv); - AppMgr::ins()->regAppBuilder([](QWidget* p) { return new SyncBox16CH(p); }); + + ZQUI::ins()->regAppBuilder([](QWidget* p) { return new SyncBox16CH(p); }); ZQUI::ins()->initialize(); - DOINUI([]() { ZQUI::ins()->mainW()->setVersionInfo(1, "APP_VERSION", "1.0.0"); }); + // DOINUI([]() { ZQUI::ins()->mainW()->setVersionInfo(1, "APP_VERSION", "1.0.0"); }); return a.exec(); } diff --git a/src/app/syncbox16ch/syncbox16ch.ui b/src/app/syncbox16ch/syncbox16ch.ui index 3b4f075..f4bce80 100644 --- a/src/app/syncbox16ch/syncbox16ch.ui +++ b/src/app/syncbox16ch/syncbox16ch.ui @@ -6,52 +6,228 @@ 0 0 - 400 - 300 + 439 + 323 Form - - - - 80 - 50 - 111 - 41 - - - - PushButton - - - - - - 240 - 120 - 91 - 51 - - - - ... - - - - - - 40 - 170 - 121 - 71 - - - - PushButton - - + + + + + + 1 + 0 + + + + + 0 + 25 + + + + + 16777215 + 25 + + + + 输出模式 + + + + + + + + 1 + 0 + + + + + 0 + 25 + + + + + + + + + 0 + 0 + + + + + 0 + 25 + + + + + 16777215 + 25 + + + + 输出波形类型 + + + + + + + + 0 + 25 + + + + + + + + + 0 + 0 + + + + + 0 + 25 + + + + + 16777215 + 25 + + + + 频率(HZ) + + + + + + + + 0 + 25 + + + + + + + + + 0 + 0 + + + + + 0 + 25 + + + + + 16777215 + 25 + + + + 脉冲宽度(us) + + + + + + + + 0 + 25 + + + + + + + + + 0 + 0 + + + + + 0 + 25 + + + + + 16777215 + 25 + + + + 脉冲数量 + + + + + + + + 0 + 25 + + + + + + + + Qt::Vertical + + + + 20 + 91 + + + + + + + + + 0 + 50 + + + + 发送 + + + + 20 + 20 + + + + + diff --git a/src/zqui/appmgr/appmgr.cpp b/src/zqui/appmgr/appmgr.cpp deleted file mode 100644 index e69de29..0000000 diff --git a/src/zqui/appmgr/appmgr.hpp b/src/zqui/appmgr/appmgr.hpp deleted file mode 100644 index dc2b35a..0000000 --- a/src/zqui/appmgr/appmgr.hpp +++ /dev/null @@ -1,54 +0,0 @@ -#pragma once - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -// - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -typedef std::function appbuilder_fn_t; - -class AppMgr { - public: - appbuilder_fn_t appBuilder; - - public: - static AppMgr *ins() { - static AppMgr instance; - return &instance; - } - - void regAppBuilder(appbuilder_fn_t builder) { appBuilder = builder; } - QWidget *buildApp(QWidget *parent) { - if (appBuilder) return appBuilder(parent); - return nullptr; - } -}; diff --git a/src/zqui/zqui/appnavibar.cpp b/src/zqui/zqui/appnavibar.cpp new file mode 100644 index 0000000..266f504 --- /dev/null +++ b/src/zqui/zqui/appnavibar.cpp @@ -0,0 +1,20 @@ +#include "appnavibar.h" +#include "ui_appnavibar.h" + +AppNaviBar::AppNaviBar(QWidget *parent) : + QMainWindow(parent), + ui(new Ui::AppNaviBar) +{ + ui->setupUi(this); +} + +AppNaviBar::~AppNaviBar() +{ + delete ui; +} + +void AppNaviBar::on_App0_released() +{ + +} + diff --git a/src/zqui/zqui/appnavibar.h b/src/zqui/zqui/appnavibar.h new file mode 100644 index 0000000..124f606 --- /dev/null +++ b/src/zqui/zqui/appnavibar.h @@ -0,0 +1,25 @@ +#ifndef APPNAVIBAR_H +#define APPNAVIBAR_H + +#include + +namespace Ui { +class AppNaviBar; +} + +class AppNaviBar : public QMainWindow +{ + Q_OBJECT + +public: + explicit AppNaviBar(QWidget *parent = nullptr); + ~AppNaviBar(); + +private slots: + void on_App0_released(); + +public: + Ui::AppNaviBar *ui; +}; + +#endif // APPNAVIBAR_H diff --git a/src/zqui/zqui/appnavibar.ui b/src/zqui/zqui/appnavibar.ui new file mode 100644 index 0000000..17332d9 --- /dev/null +++ b/src/zqui/zqui/appnavibar.ui @@ -0,0 +1,155 @@ + + + AppNaviBar + + + + 0 + 0 + 595 + 262 + + + + 产品梦工厂 + + + + + + + + 0 + 0 + + + + + Agency FB + 20 + + + + background-color: rgb(166, 254, 255); + + + + + + + + + + + 0 + 0 + + + + + Agency FB + 20 + + + + background-color: rgb(166, 254, 255); + + + + + + + + + + + 0 + 0 + + + + + Agency FB + 20 + + + + background-color: rgb(166, 254, 255); + + + + + + + + + + + 0 + 0 + + + + + Agency FB + 20 + + + + background-color: rgb(166, 254, 255); + + + + + + + + + + + 0 + 0 + + + + + Agency FB + 20 + + + + background-color: rgb(166, 254, 255); + + + + + + + + + + + 0 + 0 + + + + + Agency FB + 20 + + + + background-color: rgb(166, 254, 255); + + + + + + + + + + + + diff --git a/src/zqui/mainpage/mainwindow.cpp b/src/zqui/zqui/mainwindow.cpp similarity index 96% rename from src/zqui/mainpage/mainwindow.cpp rename to src/zqui/zqui/mainwindow.cpp index 0d8e594..f39137b 100644 --- a/src/zqui/mainpage/mainwindow.cpp +++ b/src/zqui/zqui/mainwindow.cpp @@ -9,10 +9,8 @@ #include "./ui_mainwindow.h" #include "zqui/base/QFunction.hpp" #include "zqui/channelmgr/channelmgr.hpp" -// -#include "zqui/appmgr/appmgr.hpp" -#include "zqui/zqui.hpp" -// #include "app/syncbox16ch.h" + + using namespace iflytop; MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow) { @@ -29,8 +27,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi ui->version_label_po3->hide(); ui->version_pos3->hide(); - QWidget *app = AppMgr::ins()->buildApp(ui->app_content); - if (app) app->show(); + } void MainWindow::buildUI() { diff --git a/src/zqui/mainpage/mainwindow.h b/src/zqui/zqui/mainwindow.h similarity index 100% rename from src/zqui/mainpage/mainwindow.h rename to src/zqui/zqui/mainwindow.h diff --git a/src/zqui/mainpage/mainwindow.ui b/src/zqui/zqui/mainwindow.ui similarity index 98% rename from src/zqui/mainpage/mainwindow.ui rename to src/zqui/zqui/mainwindow.ui index 9ff98d0..11a3419 100644 --- a/src/zqui/mainpage/mainwindow.ui +++ b/src/zqui/zqui/mainwindow.ui @@ -17,7 +17,7 @@ - ZFPGA + 产品梦工厂 /* @@ -654,10 +654,22 @@ QGroupBox:title { 16777215 + + #sidebar{ +background-color: rgb(245, 245, 245); +} + + 0 + + 0 + + + 0 + 0 @@ -952,13 +964,16 @@ QGroupBox:title { 0 - + 0 4 + + APP + @@ -976,7 +991,7 @@ QGroupBox:title { QTabWidget::Rounded - 0 + 1 Qt::ElideLeft diff --git a/src/zqui/zqui.cpp b/src/zqui/zqui/zqui.cpp similarity index 69% rename from src/zqui/zqui.cpp rename to src/zqui/zqui/zqui.cpp index c0e98df..2577984 100644 --- a/src/zqui/zqui.cpp +++ b/src/zqui/zqui/zqui.cpp @@ -1,6 +1,10 @@ #include "zqui.hpp" -#include "zqui/mainpage/mainwindow.h" +#include "ui_appnavibar.h" +#include "ui_mainwindow.h" +// +#include "appnavibar.h" +#include "mainwindow.h" using namespace std; #define TAG "ZQUI" @@ -64,8 +68,35 @@ void ZQUI::initialize() { qRegisterMetaType("QFunction"); connect(this, SIGNAL(doinui_signal(QFunction)), this, SLOT(doinui_slot(QFunction))); +#if 0 + AppNaviBar *appNaviBar = new AppNaviBar(); + appNaviBar->show(); pmainW = new MainWindow(); - pmainW->show(); + + + appNaviBar->ui->App0->setText("十六路同步盒"); + appNaviBar->ui->App1->setText(""); + appNaviBar->ui->App2->setText(""); + appNaviBar->ui->App3->setText(""); + appNaviBar->ui->App4->setText(""); + appNaviBar->ui->App5->setText(""); + + connect(appNaviBar->ui->App0, &QPushButton::clicked, this, [=](bool check) { + QWidget *app = appBuilder(pmainW->ui->app_content); + pmainW->show(); + delete appNaviBar; + }); +#endif + pmainW = new MainWindow(); + DOINUI([this]() { + QVBoxLayout *layout = new QVBoxLayout(pmainW->ui->app_content); + layout->setObjectName(QString::fromUtf8("layout")); + layout->setContentsMargins(0, -1, -1, 0); + + QWidget *app = appBuilder(pmainW->ui->app_content); + layout->addWidget(app); + pmainW->show(); + }); } void ZQUI::doinui(function dowhat) { emit doinui_signal(QFunction([dowhat]() { diff --git a/src/zqui/zqui.hpp b/src/zqui/zqui/zqui.hpp similarity index 87% rename from src/zqui/zqui.hpp rename to src/zqui/zqui/zqui.hpp index 1e9a559..be25c28 100644 --- a/src/zqui/zqui.hpp +++ b/src/zqui/zqui/zqui.hpp @@ -34,8 +34,10 @@ #include #include -#include "base/QFunction.hpp" -#include "mainpage/mainwindow.h" +#include "mainwindow.h" +#include "zqui/base/QFunction.hpp" + +typedef std::function appbuilder_fn_t; class ZQUI : public QObject { Q_OBJECT @@ -43,7 +45,8 @@ class ZQUI : public QObject { typedef std::function display_fn_t; typedef std::function display_clear_fn_t; MainWindow *pmainW = nullptr; - ; + + appbuilder_fn_t appBuilder; public: static ZQUI *ins(); @@ -64,6 +67,8 @@ class ZQUI : public QObject { void setDeviceConnectedStatus(bool connect); + void regAppBuilder(appbuilder_fn_t builder) { appBuilder = builder; } + MainWindow *mainW() { return pmainW; } private slots: