diff --git a/bin/xyylMCWEACSystem.exe b/bin/xyylMCWEACSystem.exe index d161696..74f91d6 100644 Binary files a/bin/xyylMCWEACSystem.exe and b/bin/xyylMCWEACSystem.exe differ diff --git a/xyylMCWEACSystem/SqlCore.cpp b/xyylMCWEACSystem/SqlCore.cpp index 3f159bc..c897042 100644 --- a/xyylMCWEACSystem/SqlCore.cpp +++ b/xyylMCWEACSystem/SqlCore.cpp @@ -1,18 +1,18 @@ -#include "CSqlCore.h" +#include "SqlCore.h" #include #include #include #include -#include "global_log.h" -using namespace UiFramework; -QMap> CSqlCore::mutexMap; -QString CSqlCore::msDriverName; -QString CSqlCore::msPasswd; -QString CSqlCore::msUserName; -QString CSqlCore::msDBFile; -QMutex CSqlCore::mWriteMutex; -void CSqlCore::init(QString sDriver, QString sUser, QString sPasswd, QString sDBFile) + +QMap> SqlCore::mutexMap; + +QString SqlCore::msDriverName; +QString SqlCore::msPasswd; +QString SqlCore::msUserName; +QString SqlCore::msDBFile; +QMutex SqlCore::mWriteMutex; +void SqlCore::init(QString sDriver, QString sUser, QString sPasswd, QString sDBFile) { QByteArray base64User(sUser.toUtf8()); QByteArray base64Passwd(sPasswd.toUtf8()); @@ -22,7 +22,7 @@ void CSqlCore::init(QString sDriver, QString sUser, QString sPasswd, QString sDB msDBFile = sDBFile; } -bool CSqlCore::setKey(QString sDriver,QString sConnect, QString sUser, QString sPasswd, QString sdbFile) +bool SqlCore::setKey(QString sDriver,QString sConnect, QString sUser, QString sPasswd, QString sdbFile) { bool ok = false; QSqlDatabase dataBase = QSqlDatabase::addDatabase(sDriver, sConnect); @@ -37,16 +37,16 @@ bool CSqlCore::setKey(QString sDriver,QString sConnect, QString sUser, QString s if (sPasswd.isEmpty()) { dataBase.setConnectOptions("QSQLITE_REMOVE_KEY"); - logInfo() << QString::fromLocal8Bit("解密") << endl; + //logInfo() << QString::fromLocal8Bit("解密") << endl; } else { dataBase.setConnectOptions("QSQLITE_CREATE_KEY"); - logInfo() << QString::fromLocal8Bit("加密") << endl; + //logInfo() << QString::fromLocal8Bit("加密") << endl; } if (!dataBase.open()) { - logError() << QString::fromLocal8Bit("密码错误") << endl; + //logError() << QString::fromLocal8Bit("密码错误") << endl; ok = false; } else @@ -58,7 +58,7 @@ bool CSqlCore::setKey(QString sDriver,QString sConnect, QString sUser, QString s return ok; } -bool CSqlCore::updateKey(QString NewsPasswd, QString oldPasswd) +bool SqlCore::updateKey(QString NewsPasswd, QString oldPasswd) { bool ok = false; getSqlDataBase().setPassword(oldPasswd); @@ -66,13 +66,13 @@ bool CSqlCore::updateKey(QString NewsPasswd, QString oldPasswd) ok = getSqlDataBase().open(); if (!ok) { - logError() << "updatePasswd: " << getSqlDataBase().lastError().driverText(); + //logError() << "updatePasswd: " << getSqlDataBase().lastError().driverText(); ok = false; } return ok; } -bool CSqlCore::execute(QString sql ) +bool SqlCore::execute(QString sql ) { QMutexLocker lockTemp(&mWriteMutex); QString connName = QString("%1(%2)").arg(msDBFile).arg(QString::number(qint64(QThread::currentThread()), 16));//文件名 + 线程 @@ -85,7 +85,7 @@ bool CSqlCore::execute(QString sql ) bool flag = sqlQuery.exec(sql); if (!flag) { - logError() << connName << sqlQuery.lastError().text() << endl; + //logError() << connName << sqlQuery.lastError().text() << endl; } mutexMap[msDBFile][connName]->unlock(); return flag; @@ -94,7 +94,7 @@ bool CSqlCore::execute(QString sql ) -QSharedPointer CSqlCore::select(QString sql) +QSharedPointer SqlCore::select(QString sql) { //QMutexLocker lockTemp(&mWriteMutex); QString connName = QString("%1(%2)").arg(msDBFile).arg(QString::number(qint64(QThread::currentThread()), 16));//文件名 + 线程 @@ -108,14 +108,14 @@ QSharedPointer CSqlCore::select(QString sql) //QSharedPointer sqlQuery = new QSharedPointer; QSharedPointer sqlQuery = QSharedPointer(new QSqlQuery(t)); if (!sqlQuery->exec(sql)) { - logError() << "CSqlCore::select() sql = " << sql << sqlQuery->lastError().text() << " failed!" << endl; + //logError() << "CSqlCore::select() sql = " << sql << sqlQuery->lastError().text() << " failed!" << endl; } mutexMap[msDBFile][connName]->unlock(); return sqlQuery; } -QSharedPointer CSqlCore::select(QString sql, bool& ok) +QSharedPointer SqlCore::select(QString sql, bool& ok) { //QMutexLocker lockTemp(&mWriteMutex); QString connName = QString("%1(%2)").arg(msDBFile).arg(QString::number(qint64(QThread::currentThread()), 16));//文件名 + 线程 @@ -131,14 +131,14 @@ QSharedPointer CSqlCore::select(QString sql, bool& ok) ok = sqlQuery->exec(sql); if (!ok) { - logError() << "CSqlCore::select() sql = " << sql << sqlQuery->lastError().text() << " failed!" << endl; + //logError() << "CSqlCore::select() sql = " << sql << sqlQuery->lastError().text() << " failed!" << endl; } mutexMap[msDBFile][connName]->unlock(); return sqlQuery; } -void CSqlCore::destroyConn() +void SqlCore::destroyConn() { QString connName = QString("%1(%2)").arg(msDBFile).arg(QString::number(qint64(QThread::currentThread()), 16));//文件名 + 线程 //qDebug() << "destroyConn:" << connName << endl; @@ -154,7 +154,7 @@ void CSqlCore::destroyConn() mutexMap.remove(msDBFile); } -void CSqlCore::destroyOneDBConn() +void SqlCore::destroyOneDBConn() { // foreach (QString i, mutexMap[msDBFile].keys()) { @@ -162,7 +162,7 @@ void CSqlCore::destroyOneDBConn() } } -void CSqlCore::destroyAllDBConn() +void SqlCore::destroyAllDBConn() { // foreach (QString i, mutexMap.keys()) // { @@ -170,7 +170,7 @@ void CSqlCore::destroyAllDBConn() // } } -QSqlDatabase CSqlCore::getSqlDataBase() +QSqlDatabase SqlCore::getSqlDataBase() { QString connName = QString("%1(%2)").arg(msDBFile).arg(QString::number(qint64(QThread::currentThread()), 16));//文件名 + 线程 if (!QSqlDatabase::contains(connName)) @@ -193,7 +193,7 @@ QSqlDatabase CSqlCore::getSqlDataBase() } else { - logWarning() << "DB open failed! " << database.lastError().text() << endl; + //logWarning() << "DB open failed! " << database.lastError().text() << endl; } QMutex *mutex = new QMutex(); mutexMap[msDBFile].insert(connName, mutex); diff --git a/xyylMCWEACSystem/SqlCore.h b/xyylMCWEACSystem/SqlCore.h index 7f414a5..94282e6 100644 --- a/xyylMCWEACSystem/SqlCore.h +++ b/xyylMCWEACSystem/SqlCore.h @@ -1,6 +1,6 @@ 锘#pragma execution_character_set("utf-8") -#ifndef CSqlCore_H -#define CSqlCore_H +#ifndef SqlCore_H +#define SqlCore_H /* \author: zym \brief : @@ -19,9 +19,8 @@ //浣跨敤QMutex 瀵 杩炴帴 鍔犻攣锛岄傜敤浜庡绾跨▼ //浣嗗缓璁粡甯稿悓鏃舵搷浣滃悓涓鏁版嵁搴撶殑绾跨▼ 浣跨敤 涓嶅悓鐨勮繛鎺ュ悕锛屽洜涓洪攣鐨勪簰鏂ョ瓑寰呬細澧炲ぇ澶勭悊鏃堕棿 //锛堟暟鎹簱涓疄闄呯殑杩炴帴鍚嶆槸"dbFile+connName"锛屼絾鑻ヤ娇鐢ㄦ绫荤殑灏佽鍒欎笉鐢ㄥ叧蹇冨疄闄呯殑杩炴帴鍚嶏級 -namespace UiFramework -{ - class CSqlCore : public QObject + + class SqlCore : public QObject { Q_OBJECT public: @@ -53,5 +52,5 @@ namespace UiFramework static QString msDBFile; static QMutex mWriteMutex; }; -} -#endif // CSqlCore_H + +#endif // SqlCore_H diff --git a/xyylMCWEACSystem/egg.qrc b/xyylMCWEACSystem/egg.qrc index 6a3f4be..eae88b1 100644 --- a/xyylMCWEACSystem/egg.qrc +++ b/xyylMCWEACSystem/egg.qrc @@ -47,5 +47,6 @@ image/egg.png image/systemsetting.png image/icon_back_2.png + image/icon_HighFreq.png diff --git a/xyylMCWEACSystem/image/icon_楂橀婊ゆ尝.png b/xyylMCWEACSystem/image/icon_HighFreq.png similarity index 100% rename from xyylMCWEACSystem/image/icon_楂橀婊ゆ尝.png rename to xyylMCWEACSystem/image/icon_HighFreq.png diff --git a/xyylMCWEACSystem/main.cpp b/xyylMCWEACSystem/main.cpp index ad7efec..291bcf5 100644 --- a/xyylMCWEACSystem/main.cpp +++ b/xyylMCWEACSystem/main.cpp @@ -6,7 +6,6 @@ #include "medicalrecordmanager.h" #include "hospitalinfo.h" - #include #include #include @@ -19,7 +18,6 @@ #include - #include #include #include @@ -37,7 +35,7 @@ #include "framelesswindow.h" #include "medicalrecordmanager.h" - +#include "parametersettingswidget.h" #include int main(int argc, char *argv[]) { @@ -56,8 +54,12 @@ int main(int argc, char *argv[]) MedicalRecordManager me; me.show(); + ParameterSettingsWidget mekl; + mekl.show(); + PerWidget kkss; + kkss.show(); #if 0 CurChatWidget w; diff --git a/xyylMCWEACSystem/navlistwidget.cpp b/xyylMCWEACSystem/navlistwidget.cpp index 6120050..df1eb56 100644 --- a/xyylMCWEACSystem/navlistwidget.cpp +++ b/xyylMCWEACSystem/navlistwidget.cpp @@ -9,14 +9,17 @@ NavListWidget::NavListWidget(QFrame * parent ) init(); initLay(); initConnect(); - setObjectName("NavList"); + m_size =QSize(200,60); } NavListWidget::~NavListWidget( ) { } - + void NavListWidget::setCustomSize(QSize tempSize) + { + m_size = tempSize; + } void NavListWidget::init() { @@ -64,7 +67,7 @@ bool NavListWidget::initConnect() btn->setObjectName(strlistObjectName.at(i)); btn->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); pButtonGroup->addButton(btn); - btn->setFixedSize(QSize(200,60)); + //btn->setFixedSize(m_size); // btn->setMinimumSize(QSize(200,80)); //btn->setMaximumSize(QSize(200,180)); btn->setCheckable(true); @@ -73,7 +76,8 @@ bool NavListWidget::initConnect() } //#263749 - +#if 0 + setObjectName("NavList"); setStyleSheet("QPushButton{\ background: rgba(51, 71, 75);\ color: white;\ @@ -95,5 +99,6 @@ border-radius: 30px;\ }"\ "QWidget#NavList{background-color:rgb(47, 61, 82);}"\ ); +#endif } diff --git a/xyylMCWEACSystem/navlistwidget.h b/xyylMCWEACSystem/navlistwidget.h index b537587..cee5f40 100644 --- a/xyylMCWEACSystem/navlistwidget.h +++ b/xyylMCWEACSystem/navlistwidget.h @@ -18,11 +18,13 @@ public: void initLay(); bool initConnect(); void setList(QStringList strlist,QStringList strlistObjectName); + void setCustomSize(QSize tempSize); signals: void SigClicked(QString ); private slots: void onButtonClicked( QAbstractButton *button); private: QList m_listBtns; + QSize m_size; }; #endif // NAVLISTWIDGET_H diff --git a/xyylMCWEACSystem/parametersettingswidget.cpp b/xyylMCWEACSystem/parametersettingswidget.cpp index e69de29..589b128 100644 --- a/xyylMCWEACSystem/parametersettingswidget.cpp +++ b/xyylMCWEACSystem/parametersettingswidget.cpp @@ -0,0 +1,171 @@ +#include "parametersettingswidget.h" + +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", + QStringList()<<"fill-in-the-Case" << "case-management" << "leading-scheme" << "Parameter setting" << "hospital-information"); + + 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_PerPowerFreNotch.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()<<"0.05Hz"<<"0.1Hz"<<"1Hz"<<"2Hz"<<"5Hz", + QStringList()<<"fill-in-the-Case" << "case-management" << "leading-scheme" << "Parameter setting" << "hospital-information"); + m_PerWavevelocity.setTextList(QStringList()<<"0.05Hz"<<"0.1Hz"<<"1Hz"<<"2Hz"<<"5Hz", + QStringList()<<"fill-in-the-Case" << "case-management" << "leading-scheme" << "Parameter setting" << "hospital-information"); + + + +#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); + hlay->addWidget(&m_PerLowerFreqWidget); + hlay->addWidget(&m_PerTimeConst); + hlay->addWidget(&m_PerPowerFreNotch); + hlay->addWidget(&m_PerAmplitude); + hlay->addWidget(&m_PerWavevelocity); + + + setContentsMargins(0,0,0,0); + setLayout(hlay); + +} +ParameterSettingsWidget::~ParameterSettingsWidget() +{ + +} +void ParameterSettingsWidget::init() +{ + +} +void ParameterSettingsWidget::initLay() +{ + +} +bool ParameterSettingsWidget::initConnect() +{ + +} +PerWidget::PerWidget(QWidget * parent):QWidget (parent) +{ + init(); + initLay(); +} +PerWidget::~PerWidget() +{ + + + +} +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.setObjectName("NavList1"); +/* + font-size: 16px;\ + font-weight: bold;\ +*/ + + m_NavListWidget.setCustomSize(QSize(40,30)); + + m_NavListWidget.setStyleSheet("QPushButton{\ + background: rgba(255, 255, 255);\ + color: black;\ + border-radius: 8px;\ + border:0px ; \ + }\ + QPushButton:hover{\ + color: black;\ + background: rgb(255, 255, 255);\ + border-radius: 8px;\ + }\ + QPushButton:pressed{\ + color: black;\ + background: rgb(255, 255, 255);\ + border-radius: 8px;\ + }\ + QPushButton:checked{\ + color: white;\ + background: rgb(51, 144, 76);\ + border-radius: 8px;\ + }"\ + "QWidget#NavList1{background-color:rgb(255, 255, 255);}"\ + ); + // m_NavListWidget.show(); + +//setAttribute(Qt::WA_TranslucentBackground); // 鑳屾櫙閫忔槑 + QHBoxLayout * hlay = new QHBoxLayout; + QFrame *line = new QFrame(); + line->setFrameShape(QFrame::VLine); + //line->setFrameShadow(QFrame::Plain); + + hlay->setSpacing(0); + hlay->addWidget(&m_NavListWidget); + hlay->addWidget(line); + + + + QHBoxLayout * hlay2 = new QHBoxLayout; + hlay2->addStretch(); + hlay2->addWidget(&m_labImage, 1,Qt::AlignRight); + hlay2->addWidget(&m_labTxt, 1,Qt::AlignLeft); + hlay2->addStretch(); + hlay2->setSpacing(0); + + + QVBoxLayout * vlay = new QVBoxLayout; + vlay->addLayout(hlay2); + vlay->addLayout(hlay); + setContentsMargins(0,0,0,0); + setLayout( vlay); +} +void PerWidget::initConnect() +{ + +} + void PerWidget::setTextList(QStringList str,QStringList objNames) + { + m_NavListWidget.setList(str, objNames); + } diff --git a/xyylMCWEACSystem/parametersettingswidget.h b/xyylMCWEACSystem/parametersettingswidget.h index 2f56b43..5586670 100644 --- a/xyylMCWEACSystem/parametersettingswidget.h +++ b/xyylMCWEACSystem/parametersettingswidget.h @@ -1,4 +1,61 @@ #ifndef PARAMETERSETTINGSWIDGET_H #define PARAMETERSETTINGSWIDGET_H +#include +#include +#include +#include +#include "navlistwidget.h" +class PerWidget:public QWidget +{ + Q_OBJECT +public: + PerWidget(QWidget * parent =NULL); + ~PerWidget(); + void init(); + void initLay(); + void initConnect(); + void setTextList(QStringList str,QStringList objNames); + QLabel m_labImage; + QLabel m_labTxt; +private: + QLabel m_labHighFrequencyFiltering; + NavListWidget m_NavListWidget; +}; + +class ParameterSettingsWidget:public QWidget +{ + Q_OBJECT +public: + ParameterSettingsWidget(QWidget *parent = NULL); + virtual ~ParameterSettingsWidget(); + void init(); + void initLay(); + bool initConnect(); + +private: + 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 // PARAMETERSETTINGSWIDGET_H diff --git a/xyylMCWEACSystem/systemsettingwidget.cpp b/xyylMCWEACSystem/systemsettingwidget.cpp index 6f0cc6a..8b3d8ec 100644 --- a/xyylMCWEACSystem/systemsettingwidget.cpp +++ b/xyylMCWEACSystem/systemsettingwidget.cpp @@ -10,8 +10,8 @@ SystemSettingWidget::SystemSettingWidget(QWidget * parent ) initConnect(); //setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint);//鏃犺竟妗 缃《 // setAttribute(Qt::WA_TranslucentBackground);//閫忔槑 - // QString styleSheet = "background-color:rgb(47, 61, 82);border:1px solid white"; - // setStyleSheet(styleSheet); + // QString styleSheet = "background-color:rgb(47, 61, 82);border:1px solid white"; + // setStyleSheet(styleSheet); } SystemSettingWidget::~SystemSettingWidget() @@ -34,7 +34,28 @@ 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);}"\ + ); } void SystemSettingWidget::initLay() { diff --git a/xyylMCWEACSystem/xyylMCWEACSystem.pro b/xyylMCWEACSystem/xyylMCWEACSystem.pro index 1ddb6ea..1a2eb09 100644 --- a/xyylMCWEACSystem/xyylMCWEACSystem.pro +++ b/xyylMCWEACSystem/xyylMCWEACSystem.pro @@ -4,7 +4,7 @@ # #------------------------------------------------- -QT += core gui +QT += core gui sql greaterThan(QT_MAJOR_VERSION, 4): QT += widgets @@ -25,6 +25,7 @@ DEFINES += QT_DEPRECATED_WARNINGS CONFIG += c++11 SOURCES += \ + SqlCore.cpp \ btngroupwidget.cpp \ curchatwidget.cpp \ dataprocesswidget.cpp \ @@ -39,12 +40,14 @@ SOURCES += \ medicalrecordmanager.cpp \ medicalrecordwidget.cpp \ navlistwidget.cpp \ + parametersettingswidget.cpp \ regwidget.cpp \ systemsettingwidget.cpp \ titlewidget.cpp \ widget.cpp HEADERS += \ + SqlCore.h \ btngroupwidget.h \ curchatwidget.h \ dataprocesswidget.h \ @@ -59,6 +62,7 @@ HEADERS += \ medicalrecordwidget.h \ mrmanagement.h \ navlistwidget.h \ + parametersettingswidget.h \ regwidget.h \ systemsettingwidget.h \ titlewidget.h \ diff --git a/xyylMCWEACSystem/xyylMCWEACSystem.pro.user b/xyylMCWEACSystem/xyylMCWEACSystem.pro.user index fb67421..fbc76d8 100644 --- a/xyylMCWEACSystem/xyylMCWEACSystem.pro.user +++ b/xyylMCWEACSystem/xyylMCWEACSystem.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -8,7 +8,7 @@ ProjectExplorer.Project.ActiveTarget - 1 + 0 ProjectExplorer.Project.EditorSettings @@ -63,267 +63,6 @@ ProjectExplorer.Project.Target.0 - - Desktop Qt 5.13.0 MinGW 32-bit - Desktop Qt 5.13.0 MinGW 32-bit - qt.qt5.5130.win32_mingw73_kit - 1 - 0 - 0 - - D:/project/qt-project/build-xyylMCWEACSystem-Desktop_Qt_5_13_0_MinGW_32_bit-Debug - - - true - qmake - - QtProjectManager.QMakeBuildStep - true - - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - true - - - D:/project/qt-project/build-xyylMCWEACSystem-Desktop_Qt_5_13_0_MinGW_32_bit-Release - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - - false - false - true - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - - D:/project/qt-project/build-xyylMCWEACSystem-Desktop_Qt_5_13_0_MinGW_32_bit-Profile - - - true - qmake - - QtProjectManager.QMakeBuildStep - true - - false - true - true - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Profile - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - 3 - - - 0 - 閮ㄧ讲 - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy Configuration - - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - dwarf - - cpu-cycles - - - 250 - -F - true - 4096 - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - kcachegrind - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 2 - - xyylMCWEACSystem - xyylMCWEACSystem2 - Qt4ProjectManager.Qt4RunConfiguration:D:/gitProject/xyylMCWEACSystem/xyylMCWEACSystem.pro - - 3768 - false - true - true - false - false - true - - D:/project/qt-project/build-xyylMCWEACSystem-Desktop_Qt_5_13_0_MinGW_32_bit-Debug - - 1 - - - - ProjectExplorer.Project.Target.1 Desktop Qt 5.13.0 MinGW 64-bit Desktop Qt 5.13.0 MinGW 64-bit @@ -583,6 +322,267 @@ 1 + + ProjectExplorer.Project.Target.1 + + Desktop Qt 5.13.0 MinGW 32-bit + Desktop Qt 5.13.0 MinGW 32-bit + qt.qt5.5130.win32_mingw73_kit + 1 + 0 + 0 + + D:/project/qt-project/build-xyylMCWEACSystem-Desktop_Qt_5_13_0_MinGW_32_bit-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + D:/project/qt-project/build-xyylMCWEACSystem-Desktop_Qt_5_13_0_MinGW_32_bit-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + + D:/project/qt-project/build-xyylMCWEACSystem-Desktop_Qt_5_13_0_MinGW_32_bit-Profile + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 3 + + + 0 + 閮ㄧ讲 + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy Configuration + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + xyylMCWEACSystem + xyylMCWEACSystem2 + Qt4ProjectManager.Qt4RunConfiguration:D:/gitProject/xyylMCWEACSystem/xyylMCWEACSystem.pro + + 3768 + false + true + true + false + false + true + + + + 1 + + ProjectExplorer.Project.TargetCount 2