diff --git a/bin/xyylMCWEACSystem.exe b/bin/xyylMCWEACSystem.exe index e36a428..4963285 100644 Binary files a/bin/xyylMCWEACSystem.exe and b/bin/xyylMCWEACSystem.exe differ diff --git a/xyylMCWEACSystem/egg.qrc b/xyylMCWEACSystem/egg.qrc index b5f7c14..ca1ad22 100644 --- a/xyylMCWEACSystem/egg.qrc +++ b/xyylMCWEACSystem/egg.qrc @@ -52,5 +52,6 @@ image/icon_PowerFreNotch.png image/icon_TimeConst.png image/icon_Wavevelocity.png + image/icon_LowerFreq.png diff --git a/xyylMCWEACSystem/image/icon_HighFreq.png b/xyylMCWEACSystem/image/icon_HighFreq.png index abd958f..e7799d5 100644 Binary files a/xyylMCWEACSystem/image/icon_HighFreq.png and b/xyylMCWEACSystem/image/icon_HighFreq.png differ diff --git a/xyylMCWEACSystem/image/icon_LowerFreq.png b/xyylMCWEACSystem/image/icon_LowerFreq.png new file mode 100644 index 0000000..abd958f Binary files /dev/null and b/xyylMCWEACSystem/image/icon_LowerFreq.png differ diff --git a/xyylMCWEACSystem/parametersettingswidget.cpp b/xyylMCWEACSystem/parametersettingswidget.cpp index 31beb86..23abf3e 100644 --- a/xyylMCWEACSystem/parametersettingswidget.cpp +++ b/xyylMCWEACSystem/parametersettingswidget.cpp @@ -13,60 +13,35 @@ ParameterSettingsWidget::ParameterSettingsWidget(QWidget *parent ) 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("b"); + 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.m_labImage.setStyleSheet("border-image:url(:/image/icon_TimeConst.png);}"); m_PerTimeConst.m_labImage.setFixedSize(QSize(30,30)); - m_PerTimeConst.m_labTxt.setText("高频滤波"); + m_PerTimeConst.m_labTxt.setText("时间常数"); m_PerPowerFreNotch.setTextList(QStringList()<<"0.05Hz"<<"0.1Hz"<<"1Hz"<<"2Hz"<<"5Hz", QStringList()<<"fill-in-the-Case" << "case-management" << "leading-scheme" << "Parameter setting" << "hospital-information"); m_PerPowerFreNotch.m_labImage.setStyleSheet("border-image:url(:/image/icon_PowerFreNotch.png);}"); m_PerPowerFreNotch.m_labImage.setFixedSize(QSize(30,30)); - m_PerPowerFreNotch.m_labTxt.setText("高频滤波"); + 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.m_labImage.setStyleSheet("border-image:url(:/image/icon_Amplitude.png);}"); m_PerAmplitude.m_labImage.setFixedSize(QSize(30,30)); - m_PerAmplitude.m_labTxt.setText("高频滤波"); + 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.m_labImage.setStyleSheet("border-image:url(:/image/icon_Wavevelocity.png);}"); m_PerWavevelocity.m_labImage.setFixedSize(QSize(30,30)); - m_PerWavevelocity.m_labTxt.setText("高频滤波"); + m_PerWavevelocity.m_labTxt.setText("波速"); -#if 0 - QLabel m_labHighFrequencyFiltering; - PerWidget m_PerHighFreqWidget; - //低频过滤 - QLabel m_labLowerFrequencyFiltering; - PerWidget m_PerLowerFreqWidget; - - //时间常数 - QLabel m_labTimeConst; - PerWidget m_PerTimeConst; - - //工频馅波 Power-frequency notch - QLabel m_labPowerFreNotch; - PerWidget m_PerPowerFreNotch; - //波幅 - QLabel m_labAmplitude; - PerWidget m_PerAmplitude; - //Wave velocity - //波速 - QLabel m_labWavevelocity; - PerWidget m_PerWavevelocity; -#endif QHBoxLayout * hlay = new QHBoxLayout; - QFrame *line = new QFrame(); - line->setFrameShape(QFrame::VLine); - //line->setFrameShadow(QFrame::Plain); hlay->setSpacing(0); hlay->addWidget(&m_PerHighFreqWidget); @@ -78,7 +53,29 @@ ParameterSettingsWidget::ParameterSettingsWidget(QWidget *parent ) setContentsMargins(0,0,0,0); - setLayout(hlay); + m_labSettingTxt.setStyleSheet("QLabel { font-size: 14px;\ + color: rgb(13,157,219); }\ +"); + m_labSettingTxt.setText("参数设置"); + m_btnOK.setText("保存"); + m_btncanCel.setText("取消"); + QHBoxLayout * hlay2 = new QHBoxLayout; + hlay2->setSpacing(0); + hlay2->addWidget(&m_labSettingTxt); + hlay2->addStretch(); + + QHBoxLayout * hlay3 = new QHBoxLayout; + hlay3->addStretch(); + hlay3->addWidget(&m_btncanCel); + hlay3->addWidget(&m_btnOK); + hlay3->addStretch(); + + QVBoxLayout * vlay = new QVBoxLayout; + vlay->addLayout(hlay2); + vlay->addLayout(hlay); + + vlay->addLayout(hlay3); + setLayout(vlay); } ParameterSettingsWidget::~ParameterSettingsWidget() diff --git a/xyylMCWEACSystem/parametersettingswidget.h b/xyylMCWEACSystem/parametersettingswidget.h index 5586670..aa89466 100644 --- a/xyylMCWEACSystem/parametersettingswidget.h +++ b/xyylMCWEACSystem/parametersettingswidget.h @@ -33,6 +33,9 @@ public: bool initConnect(); private: + //参数设置 + QLabel m_labSettingTxt; + QLabel m_labHighFrequencyFiltering; PerWidget m_PerHighFreqWidget; @@ -54,6 +57,9 @@ private: //波速 QLabel m_labWavevelocity; PerWidget m_PerWavevelocity; + + QPushButton m_btncanCel; + QPushButton m_btnOK; };