diff --git a/bin/xyylMCWEACSystem.exe b/bin/xyylMCWEACSystem.exe index 4963285..277094c 100644 Binary files a/bin/xyylMCWEACSystem.exe and b/bin/xyylMCWEACSystem.exe differ diff --git a/xyylMCWEACSystem/parametersettingswidget.cpp b/xyylMCWEACSystem/parametersettingswidget.cpp index 23abf3e..e7a5fb0 100644 --- a/xyylMCWEACSystem/parametersettingswidget.cpp +++ b/xyylMCWEACSystem/parametersettingswidget.cpp @@ -2,21 +2,21 @@ ParameterSettingsWidget::ParameterSettingsWidget(QWidget *parent ) { - setStyleSheet("background:white;"); + m_PerHighFreqWidget.m_labImage.setStyleSheet("border-image:url(:/image/icon_HighFreq.png);}"); m_PerHighFreqWidget.m_labImage.setFixedSize(QSize(30,30)); m_PerHighFreqWidget.m_labTxt.setText("高频滤波"); m_PerHighFreqWidget.setTextList(QStringList()<<"0.05Hz"<<"0.1Hz"<<"1Hz"<<"2Hz"<<"5Hz", QStringList()<<"fill-in-the-Case" << "case-management" << "leading-scheme" << "Parameter setting" << "hospital-information"); - m_PerLowerFreqWidget.setTextList(QStringList()<<"0.05Hz"<<"0.1Hz"<<"1Hz"<<"2Hz"<<"5Hz", + m_PerLowerFreqWidget.setTextList(QStringList()<<"10Hz"<<"30Hz"<<"50Hz"<<"70Hz"<<"100Hz", QStringList()<<"fill-in-the-Case" << "case-management" << "leading-scheme" << "Parameter setting" << "hospital-information"); m_PerLowerFreqWidget.m_labImage.setStyleSheet("border-image:url(:/image/icon_LowerFreq.png);}"); m_PerLowerFreqWidget.m_labImage.setFixedSize(QSize(30,30)); m_PerLowerFreqWidget.m_labTxt.setText("低频滤波"); - m_PerTimeConst.setTextList(QStringList()<<"0.05Hz"<<"0.1Hz"<<"1Hz"<<"2Hz"<<"5Hz", - QStringList()<<"fill-in-the-Case" << "case-management" << "leading-scheme" << "Parameter setting" << "hospital-information"); + m_PerTimeConst.setTextList(QStringList()<<"0.03Hz"<<"0.1Hz"<<"0.3Hz", + QStringList()<<"fill-in-the-Case" << "case-management" << "leading-scheme" ); m_PerTimeConst.m_labImage.setStyleSheet("border-image:url(:/image/icon_TimeConst.png);}"); m_PerTimeConst.m_labImage.setFixedSize(QSize(30,30)); m_PerTimeConst.m_labTxt.setText("时间常数"); @@ -28,8 +28,9 @@ ParameterSettingsWidget::ParameterSettingsWidget(QWidget *parent ) m_PerPowerFreNotch.m_labImage.setFixedSize(QSize(30,30)); m_PerPowerFreNotch.m_labTxt.setText("工作馅波"); - m_PerAmplitude.setTextList(QStringList()<<"0.05Hz"<<"0.1Hz"<<"1Hz"<<"2Hz"<<"5Hz", - QStringList()<<"fill-in-the-Case" << "case-management" << "leading-scheme" << "Parameter setting" << "hospital-information"); + m_PerAmplitude.setTextList(QStringList()<<"1"<<"2"<<"4"<<"8"<<"16"<<"32"<<"64", + QStringList()<<"fill-in-the-Case" << "case-management" << "leading-scheme" + << "Parameter setting" << "hospital-information"<<"s"<<"h"); m_PerAmplitude.m_labImage.setStyleSheet("border-image:url(:/image/icon_Amplitude.png);}"); m_PerAmplitude.m_labImage.setFixedSize(QSize(30,30)); m_PerAmplitude.m_labTxt.setText("波幅"); @@ -52,7 +53,7 @@ ParameterSettingsWidget::ParameterSettingsWidget(QWidget *parent ) hlay->addWidget(&m_PerWavevelocity); - setContentsMargins(0,0,0,0); + //setContentsMargins(0,0,0,0); m_labSettingTxt.setStyleSheet("QLabel { font-size: 14px;\ color: rgb(13,157,219); }\ "); @@ -75,7 +76,23 @@ ParameterSettingsWidget::ParameterSettingsWidget(QWidget *parent ) vlay->addLayout(hlay); vlay->addLayout(hlay3); - setLayout(vlay); + + + QWidget * w = new QWidget; + + setObjectName("paramawidget"); + this->setStyleSheet("QWidget \ + {\ + background-color:white;\ + border-radius:10px;\ + }"\ + ); + + w->setLayout(vlay); + QHBoxLayout * hlayall = new QHBoxLayout; + hlayall->addWidget(w); + + setLayout(hlayall); } ParameterSettingsWidget::~ParameterSettingsWidget() @@ -112,8 +129,8 @@ void PerWidget::init() void PerWidget::initLay() { - m_NavListWidget.setList(QStringList()<<"0.05Hz"<<"0.1Hz"<<"1Hz"<<"2Hz"<<"5Hz", - QStringList()<<"fill-in-the-Case" << "case-management" << "leading-scheme" << "Parameter setting" << "hospital-information"); + //m_NavListWidget.setList(QStringList()<<"0.05Hz"<<"0.1Hz"<<"1Hz"<<"2Hz"<<"5Hz", + // QStringList()<<"fill-in-the-Case" << "case-management" << "leading-scheme" << "Parameter setting" << "hospital-information"); m_NavListWidget.setObjectName("NavList1"); /* @@ -171,6 +188,7 @@ void PerWidget::initLay() QVBoxLayout * vlay = new QVBoxLayout; vlay->addLayout(hlay2); vlay->addLayout(hlay); + vlay->setContentsMargins(0,0,0,0); setContentsMargins(0,0,0,0); setLayout( vlay); } diff --git a/xyylMCWEACSystem/systemsettingwidget.cpp b/xyylMCWEACSystem/systemsettingwidget.cpp index 8b3d8ec..3e7b20f 100644 --- a/xyylMCWEACSystem/systemsettingwidget.cpp +++ b/xyylMCWEACSystem/systemsettingwidget.cpp @@ -32,7 +32,7 @@ void SystemSettingWidget::init() m_btnRet.setMinimumSize(QSize(100,30)); m_NavListWidget.setList(QStringList()<<"填写病例"<<"病例管理"<<"导联方案"<<"参数设置"<<"医院信息", - QStringList()<<"fill-in-the-Case" << "case-management" << "leading-scheme" << "Parameter setting" << "hospital-information"); + QStringList()<<"fill-in-the-Case" << "case-management" << "leading-scheme" << "Parameter-setting" << "hospital-information"); m_NavListWidget.setObjectName("NavList"); m_NavListWidget.setStyleSheet("QPushButton{\ @@ -130,6 +130,13 @@ void SystemSettingWidget::slotClickedChanged() m_stackedWidget.addWidget(&m_MedicalRecordManagerWidget); m_stackedWidget.setCurrentWidget(&m_MedicalRecordManagerWidget); + }//Parameter setting + else if(strName.compare("Parameter-setting")==0) + { + + m_stackedWidget.addWidget(&m_ParameterSettingsWidget); + m_stackedWidget.setCurrentWidget(&m_ParameterSettingsWidget); + } } diff --git a/xyylMCWEACSystem/systemsettingwidget.h b/xyylMCWEACSystem/systemsettingwidget.h index 1b99f3b..50fe684 100644 --- a/xyylMCWEACSystem/systemsettingwidget.h +++ b/xyylMCWEACSystem/systemsettingwidget.h @@ -11,6 +11,7 @@ #include #include "medicalrecordwidget.h" #include "medicalrecordmanager.h" +#include "parametersettingswidget.h" class SystemSettingWidget: public QWidget { Q_OBJECT @@ -46,5 +47,6 @@ private: MedicalRecordWidget m_MedicalRecordWidget; MedicalRecordManager m_MedicalRecordManagerWidget; + ParameterSettingsWidget m_ParameterSettingsWidget; }; #endif // SYSTEMSETTINGWIDGET_H