diff --git a/bin/xyylMCWEACSystem.exe b/bin/xyylMCWEACSystem.exe index 277094c..81bbddb 100644 Binary files a/bin/xyylMCWEACSystem.exe and b/bin/xyylMCWEACSystem.exe differ diff --git a/xyylMCWEACSystem/navlistwidget.cpp b/xyylMCWEACSystem/navlistwidget.cpp index df1eb56..0024d99 100644 --- a/xyylMCWEACSystem/navlistwidget.cpp +++ b/xyylMCWEACSystem/navlistwidget.cpp @@ -46,7 +46,8 @@ bool NavListWidget::initConnect() { QVBoxLayout * vlay = new QVBoxLayout; - QGridLayout * gridlay = new QGridLayout; + // QGridLayout * gridlay = new QGridLayout; + QVBoxLayout * gridlay = new QVBoxLayout; vlay->addLayout(gridlay); vlay->addStretch(); setLayout(vlay); @@ -69,12 +70,14 @@ bool NavListWidget::initConnect() pButtonGroup->addButton(btn); //btn->setFixedSize(m_size); // btn->setMinimumSize(QSize(200,80)); - //btn->setMaximumSize(QSize(200,180)); + //btn->setMaximumSize(QSize(80,20)); + btn->setMaximumHeight(50); btn->setCheckable(true); gridlay->addWidget( btn); gridlay->setSpacing(10); } + gridlay->addStretch(); //#263749 #if 0 setObjectName("NavList"); diff --git a/xyylMCWEACSystem/parametersettingswidget.cpp b/xyylMCWEACSystem/parametersettingswidget.cpp index e7a5fb0..894acc3 100644 --- a/xyylMCWEACSystem/parametersettingswidget.cpp +++ b/xyylMCWEACSystem/parametersettingswidget.cpp @@ -35,8 +35,8 @@ ParameterSettingsWidget::ParameterSettingsWidget(QWidget *parent ) m_PerAmplitude.m_labImage.setFixedSize(QSize(30,30)); m_PerAmplitude.m_labTxt.setText("波幅"); - m_PerWavevelocity.setTextList(QStringList()<<"0.05Hz"<<"0.1Hz"<<"1Hz"<<"2Hz"<<"5Hz", - QStringList()<<"fill-in-the-Case" << "case-management" << "leading-scheme" << "Parameter setting" << "hospital-information"); + m_PerWavevelocity.setTextList(QStringList()<<"100"<<"500"<<"1000"<<"2500"<<"5000"<<"10000"<<"15000", + QStringList()<<"fill-in-the-Case" << "case-management" << "leading-scheme" << "Parameter setting" << "hospital-information"<<"ss"<<"kk"); m_PerWavevelocity.m_labImage.setStyleSheet("border-image:url(:/image/icon_Wavevelocity.png);}"); m_PerWavevelocity.m_labImage.setFixedSize(QSize(30,30)); m_PerWavevelocity.m_labTxt.setText("波速"); @@ -138,7 +138,7 @@ void PerWidget::initLay() font-weight: bold;\ */ - m_NavListWidget.setCustomSize(QSize(40,30)); + m_NavListWidget.setCustomSize(QSize(30,20)); m_NavListWidget.setStyleSheet("QPushButton{\ background: rgba(255, 255, 255);\ diff --git a/xyylMCWEACSystem/systemsettingwidget.cpp b/xyylMCWEACSystem/systemsettingwidget.cpp index 3e7b20f..dc84cd7 100644 --- a/xyylMCWEACSystem/systemsettingwidget.cpp +++ b/xyylMCWEACSystem/systemsettingwidget.cpp @@ -34,28 +34,29 @@ void SystemSettingWidget::init() m_NavListWidget.setList(QStringList()<<"填写病例"<<"病例管理"<<"导联方案"<<"参数设置"<<"医院信息", QStringList()<<"fill-in-the-Case" << "case-management" << "leading-scheme" << "Parameter-setting" << "hospital-information"); - m_NavListWidget.setObjectName("NavList"); - m_NavListWidget.setStyleSheet("QPushButton{\ - background: rgba(51, 71, 75);\ - color: white;\ - border-radius: 30px;\ - font-size: 16px;\ - font-weight: bold;\ - }\ - QPushButton:hover{\ - background: rgb(85, 85, 85);\ - border-radius: 30px;\ - }\ - QPushButton:pressed{\ - background: rgb(80, 80, 80);\ - border-radius: 30px;\ - }\ - QPushButton:checked{\ - background: #0d9ddb;\ - border-radius: 30px;\ - }"\ - "QWidget#NavList{background-color:rgb(47, 61, 82);}"\ - ); + m_NavListWidget.setStyleSheet("QPushButton{\ + background: rgba(51, 71, 75);\ + color: white;\ + border-radius: 8px;\ + border:0px ; \ + }\ + QPushButton:hover{\ + color: black;\ + background: rgb(85, 85, 85);\ + border-radius: 8px;\ + }\ + QPushButton:pressed{\ + color: black;\ + background: rgb(80, 80, 80);\ + border-radius: 8px;\ + }\ + QPushButton:checked{\ + color: white;\ + background: #0d9ddb;\ + border-radius: 8px;\ + }"\ + "QWidget#NavList1{background-color:rgb(47, 61, 82);}"\ +); } void SystemSettingWidget::initLay() { diff --git a/xyylMCWEACSystem/xyylMCWEACSystem.pro.user b/xyylMCWEACSystem/xyylMCWEACSystem.pro.user index fbc76d8..a0458ac 100644 --- a/xyylMCWEACSystem/xyylMCWEACSystem.pro.user +++ b/xyylMCWEACSystem/xyylMCWEACSystem.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId