diff --git a/xyylMCWEACSystem/egg.qrc b/xyylMCWEACSystem/egg.qrc
index daece78..0f1a639 100644
--- a/xyylMCWEACSystem/egg.qrc
+++ b/xyylMCWEACSystem/egg.qrc
@@ -41,5 +41,7 @@
image/sunnyou_logo.png
image/icon_exit_checked.png
image/icon_exit_hover.png
+ image/logo_txt.png
+ image/logo_txt2.png
diff --git a/xyylMCWEACSystem/framewindow.cpp b/xyylMCWEACSystem/framewindow.cpp
new file mode 100644
index 0000000..3a2b6e8
--- /dev/null
+++ b/xyylMCWEACSystem/framewindow.cpp
@@ -0,0 +1,36 @@
+#include "framewindow.h"
+#include
+#include
+#include
+#include
+FrameWindow::FrameWindow(QWidget * parent )
+{
+ init();
+ initLay();
+ initConnect();
+}
+FrameWindow::~FrameWindow()
+{
+
+}
+void FrameWindow::init()
+{
+
+ m_stackWidget.addWidget(&m_MainWindow);
+ m_stackWidget.setCurrentWidget(&m_MainWindow);
+}
+void FrameWindow::initLay()
+{
+ QVBoxLayout * vlay = new QVBoxLayout;
+ vlay->addWidget(&m_stackWidget);
+ setLayout(vlay);
+
+}
+bool FrameWindow::initConnect()
+{
+
+}
+void FrameWindow::slotBtnChanged()
+{
+
+}
diff --git a/xyylMCWEACSystem/framewindow.h b/xyylMCWEACSystem/framewindow.h
new file mode 100644
index 0000000..f416bed
--- /dev/null
+++ b/xyylMCWEACSystem/framewindow.h
@@ -0,0 +1,23 @@
+#ifndef FRAMEWINDOW_H
+#define FRAMEWINDOW_H
+#include "mainwindow.h"
+#include
+class FrameWindow:public QWidget
+{
+ Q_OBJECT
+public:
+ FrameWindow(QWidget * parent = NULL);
+ virtual ~FrameWindow();
+
+ void init();
+ void initLay();
+ bool initConnect();
+private slots:
+ void slotBtnChanged();
+private:
+ QStackedWidget m_stackWidget;
+private:
+ MainWindow m_MainWindow;
+
+};
+#endif // FRAMEWINDOW_H
diff --git a/xyylMCWEACSystem/image/logo_txt.png b/xyylMCWEACSystem/image/logo_txt.png
new file mode 100644
index 0000000..f7265d9
Binary files /dev/null and b/xyylMCWEACSystem/image/logo_txt.png differ
diff --git a/xyylMCWEACSystem/image/logo_txt2.png b/xyylMCWEACSystem/image/logo_txt2.png
new file mode 100644
index 0000000..c56e655
Binary files /dev/null and b/xyylMCWEACSystem/image/logo_txt2.png differ
diff --git a/xyylMCWEACSystem/main.cpp b/xyylMCWEACSystem/main.cpp
index 7a582c8..eafc74f 100644
--- a/xyylMCWEACSystem/main.cpp
+++ b/xyylMCWEACSystem/main.cpp
@@ -30,7 +30,8 @@
#include
#include "curchatwidget.h"
#include "DevConWidget.h"
-#include
+#include "framewindow.h"
+#include
int main(int argc, char *argv[])
{
QApplication a(argc, argv);
@@ -38,10 +39,11 @@ int main(int argc, char *argv[])
w.show();
RegWidget re;
re.show();
- MainWindow mainw;
+ FrameWindow mainw;
mainw.resize(1000,800);
mainw.show();
+
#if 0
DevConWidget de;
de.show();
diff --git a/xyylMCWEACSystem/mainwindow.cpp b/xyylMCWEACSystem/mainwindow.cpp
index 1b480b8..40b2ea5 100644
--- a/xyylMCWEACSystem/mainwindow.cpp
+++ b/xyylMCWEACSystem/mainwindow.cpp
@@ -17,9 +17,17 @@ MainWindow::~MainWindow()
void MainWindow::init()
{
+ setWindowTitle(" ");
m_btnSystemSetting.setObjectName("SystemSetting");
m_btnEEG.setObjectName("EEG");
m_btnDataProcess.setObjectName("DataProcess");
+ m_CompanyDes.setText("河南翔宇医疗设备股份有限公司");
+ QFont font ("Microsoft YaHei", 10, 85);
+ m_CompanyDes.setFont(font);
+
+ m_CompanyDes.setStyleSheet("color:Gray;");
+
+
}
void MainWindow::initLay()
{
@@ -48,27 +56,38 @@ void MainWindow::initLay()
m_btnEEG.setMaximumSize(QSize(400,300));
m_btnDataProcess.setMaximumSize(QSize(400,300));
+
+ m_btnSystemSetting.setMinimumSize(QSize(300,200));
+ m_btnEEG.setMinimumSize(QSize(300,300));
+ m_btnDataProcess.setMinimumSize(QSize(300,300));
+
m_btnSystemSetting.setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
m_btnEEG.setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
m_btnDataProcess.setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-
+ hlay->addSpacing(150);
hlay->addWidget(&m_btnSystemSetting);
hlay->addSpacing(50);
hlay->addWidget(&m_btnEEG);
hlay->addSpacing(50);
hlay->addWidget(&m_btnDataProcess);
+ hlay->addSpacing(150);
QVBoxLayout *vLay = new QVBoxLayout;
m_titleWidget.setFixedHeight(100);
- hlay->setContentsMargins(150,100,150,100);
+ //hlay->setContentsMargins(150,100,150,100);
hlay->setSpacing(1);
vLay->addWidget(&m_titleWidget,1,Qt::AlignTop);
vLay->addSpacing(3);
- vLay->addLayout(hlay,9);
+
+ vLay->addLayout(hlay,15);
+
+
+ vLay->addWidget(&m_CompanyDes,1,Qt::AlignBottom | Qt::AlignHCenter);//,
+ vLay->addSpacing(30);
setLayout(vLay);
}
bool MainWindow::initConnect()
diff --git a/xyylMCWEACSystem/mainwindow.h b/xyylMCWEACSystem/mainwindow.h
index c7ae653..817c92d 100644
--- a/xyylMCWEACSystem/mainwindow.h
+++ b/xyylMCWEACSystem/mainwindow.h
@@ -29,6 +29,8 @@ private:
QPushButton m_btnEEG;
//数据处理Datarocessing
QPushButton m_btnDataProcess;
+ //河南翔宇医疗设备股份有限公司
+ QLabel m_CompanyDes;
};
diff --git a/xyylMCWEACSystem/titlewidget.cpp b/xyylMCWEACSystem/titlewidget.cpp
index 7e77735..d77ca89 100644
--- a/xyylMCWEACSystem/titlewidget.cpp
+++ b/xyylMCWEACSystem/titlewidget.cpp
@@ -18,7 +18,8 @@ void TitleWidget::init()
{
m_labDes.setStyleSheet("border-image:url(:/image/sunnyou_logo.png);}");
// m_labSystemName.setStyleSheet("border-image:url(:/image/index_bg_EEG_char.png);}");
- m_labSystemName.setText(tr("Multi-channel wireless EEG acquisition system"));
+ //m_labSystemName.setText(tr("Multi-channel wireless EEG acquisition system"));
+ m_labSystemName.setStyleSheet("border-image:url(:/image/logo_txt.png);}");
m_btnRet.setStyleSheet("background-image:url(:/image/icon_exit.png);}");
@@ -27,13 +28,15 @@ void TitleWidget::init()
"QPushButton:hover{border-image:url(:/image/icon_exit_hover.png);}"
"QPushButton:pressed{border-image:url(:/image/icon_exit_checked.png);}"
);
- m_labDes.setMaximumSize(QSize(250,80));
- // m_labSystemName.setMaximumSize(QSize(100,300));
- m_btnRet.setMaximumSize(QSize(250,80));
- //m_labDes.setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
- //m_labSystemName.setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
- //m_btnRet.setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+
+ m_labDes.setMaximumSize(QSize(300,40));
+ m_labSystemName.setFixedSize(QSize(500,40));
+ m_btnRet.setMaximumSize(QSize(60,60));
+
+ m_labDes.setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+ m_labSystemName.setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+ m_btnRet.setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
}
void TitleWidget::initLay()
diff --git a/xyylMCWEACSystem/xyylMCWEACSystem.pro b/xyylMCWEACSystem/xyylMCWEACSystem.pro
index b054b67..d35cfab 100644
--- a/xyylMCWEACSystem/xyylMCWEACSystem.pro
+++ b/xyylMCWEACSystem/xyylMCWEACSystem.pro
@@ -28,6 +28,7 @@ SOURCES += \
btngroupwidget.cpp \
curchatwidget.cpp \
devconwidget.cpp \
+ framewindow.cpp \
hospitalinfo.cpp \
loginwidget.cpp \
main.cpp \
@@ -42,6 +43,7 @@ HEADERS += \
btngroupwidget.h \
curchatwidget.h \
devconwidget.h \
+ framewindow.h \
hospitalinfo.h \
loginwidget.h \
mainwindow.h \