sunwen/GUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Topbar layout change

Browse Source
This commit is contained in:
Krad
2021-12-17 10:24:05 +08:00
parent 2b6eea9145
commit b6c272181e
5 changed files with 31 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/ScanFormWidget.cpp
View File

@@ -15,6 +15,7 @@
#include <QPainter> #include <QPainter>
#include <qdebug.h> #include <qdebug.h>
#include <src/log/UserOperationLog.h> #include <src/log/UserOperationLog.h>
#include <QLabel>
#ifdef WIN32 #ifdef WIN32
#else #else

27
src/TopBarWidget.cpp
View File

@@ -7,22 +7,37 @@
#include <QHBoxLayout> #include <QHBoxLayout>
#include <src/components/RollingMessageWidget.h> #include <src/components/RollingMessageWidget.h>
#include <QDateTime> #include <QDateTime>
#include "event/EventCenter.h"
TopBarWidget::TopBarWidget(QWidget *parent, Qt::WindowFlags f) : QWidget(parent, f) { TopBarWidget::TopBarWidget(QWidget *parent, Qt::WindowFlags f) : QWidget(parent, f) {
QHBoxLayout* layout = new QHBoxLayout(this); QHBoxLayout* layout = new QHBoxLayout(this);
layout->setMargin(0);
QLabel * logo = new QLabel(this); QLabel * logo = new QLabel(this);
QPixmap img(":/icons/logo.png");
logo->setPixmap(img.scaledToHeight(33, Qt::SmoothTransformation));
logo->setObjectName("logo"); logo->setObjectName("logo");
layout->addWidget(logo); layout->addWidget(logo);
QLabel * company = new QLabel(this); QLabel * company = new QLabel(this);
company->setObjectName("company"); company->setObjectName("company");
layout->addWidget(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); QLabel * lbl_msglogo = new QLabel(this);
lbl_msglogo->setObjectName("lbl_msglogo"); lbl_msglogo->setObjectName("lbl_msglogo");
lbl_msglogo->setPixmap(QPixmap(":/icons/msg.png").scaledToHeight(26, Qt::SmoothTransformation));
layout->addWidget(lbl_msglogo); layout->addWidget(lbl_msglogo);
QWidget* widgetMsg = new QWidget(this);
layout->addWidget(widgetMsg);
widgetMsg->setObjectName("need_border");
QWidget* statusBarWidget = new QWidget(this); QWidget* statusBarWidget = new QWidget(this);
layout->addWidget(statusBarWidget); layout->addWidget(statusBarWidget);
QLabel* hosp = new QLabel(this); QLabel* hosp = new QLabel(this);
hosp->setText(tr("浙江大学医学院附属第二医院")); // hosp->setText(tr("浙江大学医学院附属第二医院"));
QLabel* nowDate = new QLabel(this); QLabel* nowDate = new QLabel(this);
nowDate->setText(QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss")); nowDate->setText(QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss"));
QLabel* linkIcon = new QLabel(this); QLabel* linkIcon = new QLabel(this);
@@ -45,10 +60,8 @@ TopBarWidget::TopBarWidget(QWidget *parent, Qt::WindowFlags f) : QWidget(parent,
layout->addWidget(linkIcon); layout->addWidget(linkIcon);
layout->addWidget(readyIcon); layout->addWidget(readyIcon);
layout->addWidget(lockIcon); layout->addWidget(lockIcon);
QWidget* widgetMsg = new QWidget(this);
layout->addWidget(widgetMsg);
QVBoxLayout* l = new QVBoxLayout(widgetMsg); QVBoxLayout* l = new QVBoxLayout(widgetMsg);
widgetMsg->setObjectName("need_border");
l->setMargin(0); l->setMargin(0);
auto w = new RollingMessageWidget(this); auto w = new RollingMessageWidget(this);
QStringList msgs; QStringList msgs;
@@ -57,4 +70,10 @@ TopBarWidget::TopBarWidget(QWidget *parent, Qt::WindowFlags f) : QWidget(parent,
w->setMessageList(msgs, visibleValues); w->setMessageList(msgs, visibleValues);
w->setObjectName("need_border"); w->setObjectName("need_border");
l->addWidget(w); 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")));
});
} }

7
src/mainwindow.cpp
View File

@@ -19,6 +19,7 @@
#include <fstream> #include <fstream>
#include <sstream> #include <sstream>
#include <QDateTime> #include <QDateTime>
#include "TopBarWidget.h"
@@ -144,8 +145,12 @@ MainWindow::MainWindow(QWidget* parent) :
TabFormWidget* verify_form = new TabFormWidget(this); TabFormWidget* verify_form = new TabFormWidget(this);
tab->addTab(verify_form, "Verify"); tab->addTab(verify_form, "Verify");
tab->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); tab->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
QHBoxLayout* layout = new QHBoxLayout(); QVBoxLayout* layout = new QVBoxLayout(this);
layout->setMargin(0); layout->setMargin(0);
layout->setSpacing(0);
QWidget * top = new TopBarWidget(this);
top->setObjectName("topbarWidget");
layout->addWidget(top);
layout->addWidget(tab); layout->addWidget(tab);
ui->centralWidget->setLayout(layout); ui->centralWidget->setLayout(layout);

51
src/tabformwidget.cpp
View File

@@ -13,56 +13,7 @@ TabFormWidget::TabFormWidget(QWidget* parent) :
ui(new Ui::TabFormWidget) ui(new Ui::TabFormWidget)
{ {
ui->setupUi(this); ui->setupUi(this);
QPixmap img(":/icons/logo.png"); return;
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<bool> 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){
});
} }
TabFormWidget::~TabFormWidget() TabFormWidget::~TabFormWidget()

61
src/tabformwidget.ui
View File

@@ -32,67 +32,6 @@
<property name="bottomMargin"> <property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item>
<widget class="QWidget" name="topbarWidget" native="true">
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>3</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="logo">
<property name="text">
<string>LOGO</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="company">
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
<item>
<widget class="QWidget" name="spacer_1" native="true"/>
</item>
<item>
<widget class="QLabel" name="lbl_msglogo">
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<widget class="QWidget" name="widgetMsg" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item>
<widget class="QWidget" name="spacer_2" native="true"/>
</item>
<item>
<widget class="QWidget" name="statusBarWidget" native="true"/>
</item>
</layout>
</widget>
</item>
<item> <item>
<widget class="QWidget" name="contentWidget" native="true"/> <widget class="QWidget" name="contentWidget" native="true"/>
</item> </item>