diff --git a/src/ScanFormWidget.cpp b/src/ScanFormWidget.cpp index f6d276e..38e6934 100644 --- a/src/ScanFormWidget.cpp +++ b/src/ScanFormWidget.cpp @@ -15,6 +15,7 @@ #include #include #include +#include #ifdef WIN32 #else diff --git a/src/TopBarWidget.cpp b/src/TopBarWidget.cpp index 1f803ca..6cc5a0d 100644 --- a/src/TopBarWidget.cpp +++ b/src/TopBarWidget.cpp @@ -7,22 +7,37 @@ #include #include #include +#include "event/EventCenter.h" TopBarWidget::TopBarWidget(QWidget *parent, Qt::WindowFlags f) : QWidget(parent, f) { QHBoxLayout* layout = new QHBoxLayout(this); + layout->setMargin(0); QLabel * logo = new QLabel(this); + QPixmap img(":/icons/logo.png"); + logo->setPixmap(img.scaledToHeight(33, Qt::SmoothTransformation)); logo->setObjectName("logo"); layout->addWidget(logo); QLabel * company = new QLabel(this); company->setObjectName("company"); layout->addWidget(company); + company->setText(tr("浙江衡玖医疗科技")); + QWidget* spacerLine0 = new QWidget(this); + spacerLine0->setFixedWidth(2); + spacerLine0->setObjectName("spacer_2"); + layout->addWidget(spacerLine0); QLabel * lbl_msglogo = new QLabel(this); lbl_msglogo->setObjectName("lbl_msglogo"); + lbl_msglogo->setPixmap(QPixmap(":/icons/msg.png").scaledToHeight(26, Qt::SmoothTransformation)); layout->addWidget(lbl_msglogo); + + QWidget* widgetMsg = new QWidget(this); + layout->addWidget(widgetMsg); + widgetMsg->setObjectName("need_border"); + QWidget* statusBarWidget = new QWidget(this); layout->addWidget(statusBarWidget); QLabel* hosp = new QLabel(this); - hosp->setText(tr("浙江大学医学院附属第二医院")); +// hosp->setText(tr("浙江大学医学院附属第二医院")); QLabel* nowDate = new QLabel(this); nowDate->setText(QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss")); QLabel* linkIcon = new QLabel(this); @@ -45,10 +60,8 @@ TopBarWidget::TopBarWidget(QWidget *parent, Qt::WindowFlags f) : QWidget(parent, layout->addWidget(linkIcon); layout->addWidget(readyIcon); layout->addWidget(lockIcon); - QWidget* widgetMsg = new QWidget(this); - layout->addWidget(widgetMsg); + QVBoxLayout* l = new QVBoxLayout(widgetMsg); - widgetMsg->setObjectName("need_border"); l->setMargin(0); auto w = new RollingMessageWidget(this); QStringList msgs; @@ -57,4 +70,10 @@ TopBarWidget::TopBarWidget(QWidget *parent, Qt::WindowFlags f) : QWidget(parent, w->setMessageList(msgs, visibleValues); w->setObjectName("need_border"); l->addWidget(w); + connect(EventCenter::Default(), &EventCenter::ResponseDeviceTemperature, [=](QObject*, QObject* msg) { + nowDate->setText(QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss")); + if (!msg) return; + QString* s = (QString*)msg; + lockIcon->setText(QString("%1%2").arg(*s).arg(tr("°C"))); + }); } diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index ae33c89..eabe87b 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -19,6 +19,7 @@ #include #include #include +#include "TopBarWidget.h" @@ -144,8 +145,12 @@ MainWindow::MainWindow(QWidget* parent) : TabFormWidget* verify_form = new TabFormWidget(this); tab->addTab(verify_form, "Verify"); tab->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); - QHBoxLayout* layout = new QHBoxLayout(); + QVBoxLayout* layout = new QVBoxLayout(this); layout->setMargin(0); + layout->setSpacing(0); + QWidget * top = new TopBarWidget(this); + top->setObjectName("topbarWidget"); + layout->addWidget(top); layout->addWidget(tab); ui->centralWidget->setLayout(layout); diff --git a/src/tabformwidget.cpp b/src/tabformwidget.cpp index 75a6258..df20741 100644 --- a/src/tabformwidget.cpp +++ b/src/tabformwidget.cpp @@ -13,56 +13,7 @@ TabFormWidget::TabFormWidget(QWidget* parent) : ui(new Ui::TabFormWidget) { ui->setupUi(this); - QPixmap img(":/icons/logo.png"); - - ui->logo->setPixmap(img.scaledToHeight(33, Qt::SmoothTransformation)); - ui->company->setText(tr("浙江衡玖医疗科技")); - ui->lbl_msglogo->setPixmap(QPixmap(":/icons/msg.png").scaledToHeight(26, Qt::SmoothTransformation)); - // ui->lbl_patlogo->setPixmap(QPixmap(":/icons/patient.png").scaledToHeight(26,Qt::SmoothTransformation)); - ui->spacer_2->setVisible(false); - QLabel* hosp = new QLabel(this); - hosp->setText(tr("浙江大学医学院附属第二医院")); - QLabel* nowDate = new QLabel(this); - nowDate->setText(QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss")); - QLabel* linkIcon = new QLabel(this); - linkIcon->setPixmap(QPixmap(":/icons/link_g.png").scaledToHeight(22, Qt::SmoothTransformation)); - QLabel* readyIcon = new QLabel(this); - readyIcon->setPixmap(QPixmap(":/icons/ready.png").scaledToHeight(22, Qt::SmoothTransformation)); - QLabel* lockIcon = new QLabel(this); - lockIcon->setText(""); - // lockIcon->setPixmap(QPixmap(":/icons/lock.png").scaledToHeight(22,Qt::SmoothTransformation)); - QHBoxLayout* layout = new QHBoxLayout(ui->statusBarWidget); - layout->setMargin(0); - layout->addSpacerItem(new QSpacerItem(10, 10, QSizePolicy::Expanding)); - layout->addWidget(hosp); - layout->addWidget(nowDate); - QWidget* spacerLine = new QWidget(this); - spacerLine->setFixedWidth(2); - spacerLine->setObjectName("spacer_2"); - - layout->addWidget(spacerLine); - layout->addWidget(linkIcon); - layout->addWidget(readyIcon); - layout->addWidget(lockIcon); - connect(EventCenter::Default(), &EventCenter::ResponseDeviceTemperature, [=](QObject*, QObject* msg) { - nowDate->setText(QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss")); - if (!msg) return; - QString* s = (QString*)msg; - lockIcon->setText(QString("%1%2").arg(*s).arg(tr("°C"))); - }); - QVBoxLayout* l = new QVBoxLayout(ui->widgetMsg); - ui->widgetMsg->setObjectName("need_border"); - l->setMargin(0); - auto w = new RollingMessageWidget(this); - QStringList msgs; - msgs<<"message 1!"<<"message 2!"<<"message 3!"<<"message 4!"<<"message 5!"; - QList visibleValues = {true,true,true,true,true}; - w->setMessageList(msgs, visibleValues); - w->setObjectName("need_border"); - l->addWidget(w); - connect(EventCenter::Default(), &EventCenter::WarnStateFlagChange,[=](QObject*, QObject* msg){ - - }); + return; } TabFormWidget::~TabFormWidget() diff --git a/src/tabformwidget.ui b/src/tabformwidget.ui index 436d8d3..3532bc3 100644 --- a/src/tabformwidget.ui +++ b/src/tabformwidget.ui @@ -32,67 +32,6 @@ 0 - - - - - 3 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - LOGO - - - - - - - TextLabel - - - - - - - - - - - - - - - - - - 0 - 0 - - - - - - - - - - - - -