diff --git a/src/algorithm/ImageProcess.cpp b/src/algorithm/ImageProcess.cpp index 21353f9..ccf6cb0 100644 --- a/src/algorithm/ImageProcess.cpp +++ b/src/algorithm/ImageProcess.cpp @@ -46,10 +46,11 @@ Mat findEdge2(const Mat &Src) cv::Mat ImageProcess::findCircleObject(const Mat &srcImg, const Mat& backgroundImg, bool useBackgroundFlag, int nThres /*= 20*/, luffy_base::luffyCircle *pCircle /*= NULL*/) { #ifdef MOTO_DETECT//摩轮型号识别抠图算法 + //useBackgroundFlag = true; if (!useBackgroundFlag) { Mat detectImg; - Mat src = srcImg(Rect(435, 53, 1721, 1824)); + Mat src = srcImg;// (Rect(435, 53, 1721, 1824)); cv::resize(src, detectImg, cv::Size(src.cols / REAIZE, src.rows / REAIZE)); int bBaseX = detectImg.cols; int bBaseY = detectImg.rows; @@ -113,6 +114,7 @@ cv::Mat ImageProcess::findCircleObject(const Mat &srcImg, const Mat& backgroundI } else { + //结合背景图原始找圆算法 Mat src = srcImg; if (src.empty() || backgroundImg.empty() || src.rows < 500) { return Mat(); @@ -120,13 +122,13 @@ cv::Mat ImageProcess::findCircleObject(const Mat &srcImg, const Mat& backgroundI assert(backgroundImg.type() == CV_8UC1); - Mat imgTmp, imgBinary; - const cv::Size cSize = cv::Size(ALG_RESIZE_IMAGE_WIDTH, floorf(ALG_RESIZE_IMAGE_WIDTH / (float)src.cols*(float)src.rows)); - cv::resize(src, imgTmp, cSize); - Mat foregroundImg = getForeImage(imgTmp, backgroundImg);// 0421 + Mat imgTmp = src, imgBinary; +// const cv::Size cSize = cv::Size(ALG_RESIZE_IMAGE_WIDTH, floorf(ALG_RESIZE_IMAGE_WIDTH / (float)src.cols*(float)src.rows)); +// cv::resize(src, imgTmp, cSize); + //Mat foregroundImg = getForeImage(imgTmp, backgroundImg);// 0421 using namespace luffy_base; - luffy_threshold::Threshold(foregroundImg, imgBinary, nThres);//0421 + luffy_threshold::Threshold(imgTmp, imgBinary, 50);//0421 Mat dilatedImgBin; dilate(imgBinary, dilatedImgBin, Mat::ones(21, 21, CV_32FC1)); @@ -137,20 +139,22 @@ cv::Mat ImageProcess::findCircleObject(const Mat &srcImg, const Mat& backgroundI cv::findContours(imgBinary, conts, RETR_EXTERNAL, CHAIN_APPROX_NONE); imgBinary.setTo(0); + int maxArea = 0; for (int i = 0; i < conts.size(); i++) { const vector &pt = conts.at(i); - if (pt.size() < 20) { + if (pt.size() < 120) { continue; } Rect rt = boundingRect(pt); - if (rt.width < 5 || rt.height < 5) { + if (rt.width < 150 || rt.height < 150) { continue; } + drawContours(imgBinary, conts, i, Scalar::all(255), -1); } Mat hit; vector pts; - luffy_hit::firstHit4Circle(imgBinary, hit, pts, Point(cSize.width / 2, cSize.height / 2), 0, cSize.width / 2, 360, luffy_hit::emHitOut2In); + luffy_hit::firstHit4Circle(imgBinary, hit, pts, Point(imgBinary.cols / 2, imgBinary.rows / 2), 0, imgBinary.cols / 2, 360, luffy_hit::emHitIn2Out); int nMinFitNum = 100; luffy_imageProc::RansacParam rs(0.01, 3, 150, nMinFitNum, 240); diff --git a/src/tpMain/ChannelInfo.cpp b/src/tpMain/ChannelInfo.cpp deleted file mode 100644 index 5aeea78..0000000 --- a/src/tpMain/ChannelInfo.cpp +++ /dev/null @@ -1,219 +0,0 @@ -#include "ChannelInfo.h" -#include "qjsonobject.h" -#include "InfoFile.h" -#include "qjsonarray.h" -#include "QZkJsonParser.h" - -#define JSON_KEY_CHANNELS "channels" -#define JSON_KEY_CHANNEL_MODELS "models" -#define CHANNELINFO_NAME "channel_name" -#define CHANNELINFO_ABOUT "about_name" -#define CHANNELINFO_VALUE "send_value" -#define CHANNELINFO_CH_NUM "channelNum" -#define CHANNELINFO_DEFAULT "defaultChannel" -#pragma execution_character_set("utf-8") -CChannelInfo::CChannelInfo(QString strPath, QMySplashScreen *p) -{ - m_defaultChannel = 1; - m_strPath = strPath; - if (p){ - p->ShowMsg(tr("开始读取json文件数据...")); - } - readChannels(); - - connect(this, SIGNAL(sgChannelChanged()), this, SLOT(saveChannels())); - if (p){ - p->ShowMsg(tr("数据读取完成...")); - } -} - -CChannelInfo::~CChannelInfo() -{ - qDeleteAll(m_mpChannelInfo); -} - -bool CChannelInfo::readChannels() -{ - const QJsonObject jsonChs = QZkJsonParser::ReadJsonAuto(m_strPath);// QJsonObject(); - int channeltotal = jsonChs.value(CHANNELINFO_CH_NUM).toInt(); - m_defaultChannel = jsonChs.value(CHANNELINFO_DEFAULT).toInt(); - QJsonObject m_channelsObj = jsonChs.value(JSON_KEY_CHANNELS).toObject(); - for (QJsonObject::const_iterator it = m_channelsObj.constBegin(); it != m_channelsObj.constEnd(); ++it) - { - bool bOk; - int nkey = it.key().toInt(&bOk); - if (!(bOk&it->isObject())) - { - continue; - } - ChannelInfo *m_info = new ChannelInfo; - QJsonObject jsonCh = it->toObject(); - m_info->m_ChannelName = jsonCh.value(CHANNELINFO_NAME).toString();//.toUtf8(); - m_info->m_AboutName = jsonCh.value(CHANNELINFO_ABOUT).toString(); - m_info->m_value = jsonCh.value(CHANNELINFO_VALUE).toInt(); - - QJsonArray modelsArray = jsonCh.value(JSON_KEY_CHANNEL_MODELS).toArray(); - for each (QJsonValue var in modelsArray) { - m_info->m_strModels.push_back(var.toString()); - } - m_mpChannelInfo.insert(nkey, m_info); - } - return true; -} - -bool CChannelInfo::saveChannels() -{ - QJsonObject objRoot; - QJsonObject objChannels; - - QList lst = m_mpChannelInfo.keys(); - for (int i = 0; i < lst.size(); i++) { - ChannelInfo *pInfo = m_mpChannelInfo.value(lst.at(i)); - QJsonObject objChannel; - objChannel.insert(CHANNELINFO_NAME, pInfo->m_ChannelName); - objChannel.insert(CHANNELINFO_ABOUT, pInfo->m_AboutName); - objChannel.insert(CHANNELINFO_VALUE, pInfo->m_value); - QJsonArray objModel; - for (int j = 0; j < pInfo->m_strModels.size(); j++) { - objModel.append(pInfo->m_strModels.at(j)); - } - objChannel.insert(JSON_KEY_CHANNEL_MODELS, objModel); - objChannels.insert(QString::number(lst.at(i)), objChannel); - } - objRoot.insert(CHANNELINFO_CH_NUM, (int)m_mpChannelInfo.size()); - objRoot.insert(CHANNELINFO_DEFAULT, (int)m_defaultChannel); - objRoot.insert(JSON_KEY_CHANNELS, objChannels); - return QZkJsonParser::WriteJsonObject(m_strPath, objRoot); -} - -ChannelInfo * CChannelInfo::getChannelInfo(int nKey) -{ - if (m_mpChannelInfo.contains(nKey)) - return m_mpChannelInfo.value(nKey); - else - return NULL; -} - -ChannelInfo * CChannelInfo::getChannelInfo(QString strModel) -{ - for each (ChannelInfo* var in m_mpChannelInfo) { - if (var->m_strModels.contains(strModel)) { - return var; - } - } - return NULL; -} - -ChannelInfo * CChannelInfo::rmChannelInfo(QString strModel) -{ - for each (ChannelInfo* var in m_mpChannelInfo) { - if (var->m_strModels.contains(strModel)) { - var->m_strModels.removeOne(strModel); - emit sgChannelChanged(); - return var; - } - } - return NULL; -} - -int CChannelInfo::getChannelInfoKey(QString strModel) -{ - for (QMap::iterator its = m_mpChannelInfo.begin(); its != m_mpChannelInfo.end(); ++its){ - if ((*its)->m_strModels.contains(strModel)){ - (*its)->m_strModels.removeOne(strModel); - emit sgChannelChanged(); - return its.key(); - } - } - return 0; -} -int CChannelInfo::getChannelInfoNum(QString strModel) -{ - for (QMap::iterator its = m_mpChannelInfo.begin(); its != m_mpChannelInfo.end(); ++its){ - if ((*its)->m_strModels.contains(strModel)){ - return its.key(); - } - } - return 0; -} -bool CChannelInfo::SetChannelModelList(int nKey, QStringList m_modelist) -{ - ChannelInfo *pInfo = getChannelInfo(nKey); - if (pInfo){ - pInfo->m_strModels = m_modelist; - } - emit sgChannelChanged(); - return true; -} - -QStringList CChannelInfo::getChannelModelList(int nKey) -{ - ChannelInfo *pInfo = getChannelInfo(nKey); - if (pInfo) { - return pInfo->m_strModels; - } - return QStringList(); -} - -bool CChannelInfo::delChannel(int nChannel) -{ - m_mpChannelInfo.remove(nChannel); - emit sgChannelChanged(); - return true; -} - -int CChannelInfo::channelSize() const -{ - return m_mpChannelInfo.size(); -} - -bool CChannelInfo::addChannel(ChannelInfo &m_info) -{ - ChannelInfo *pInfo = new ChannelInfo; - pInfo->m_ChannelName = m_info.m_ChannelName; - pInfo->m_AboutName = m_info.m_AboutName; - pInfo->m_value = m_info.m_value; - m_mpChannelInfo.insert(m_mpChannelInfo.size()+1, pInfo); - emit sgChannelChanged(); - return true; -} - -QMap CChannelInfo::getChannelModelMap() { - return m_mpChannelInfo; -} - -QStringList CChannelInfo::getAllModels() -{ - QStringList allModels; - for (int nIndex = 0; nIndex <= channelSize(); nIndex++) - allModels.append(getChannelModelList(nIndex)); - return allModels; -} -/*与模板库所有的字符进行匹配，不存在的将删除*/ -bool CChannelInfo::compareStrings(QStringList m_src) -{ - QStringList srcStrList = getAllModels(); - for (int nIndex = 0; nIndex < srcStrList.size(); nIndex++) - { - QString strTemp = srcStrList.at(nIndex); - if(!m_src.contains(strTemp)) - rmChannelInfo(strTemp); - } - emit sgChannelChanged(); - return true; -} - -int CChannelInfo::getDefaultChannel() -{ - int nSize = m_mpChannelInfo.size(); - if (nSize>0&&m_defaultChannel<=(nSize+1)) - return m_defaultChannel; - else - { - m_defaultChannel = 0; - return m_defaultChannel; - } - -} - - diff --git a/src/tpMain/ChannelInfo.h b/src/tpMain/ChannelInfo.h deleted file mode 100644 index 752dc35..0000000 --- a/src/tpMain/ChannelInfo.h +++ /dev/null @@ -1,47 +0,0 @@ -#ifndef _H_CHANNELINFO_H_ -#define _H_CHANNELINFO_H_ - -#include -#include -#include -#include -#include "qmysplashscreen.h" - -struct ChannelInfo; -class CChannelInfo : public QObject -{ - Q_OBJECT -public: - CChannelInfo(QString strPath,QMySplashScreen *p=NULL); - ~CChannelInfo(); - - bool readChannels(); - Q_SLOT bool saveChannels(); - - bool addChannel(ChannelInfo &m_info); - int channelSize() const; - bool delChannel(int nChannel); - bool SetChannelModelList(int nKey, QStringList m_modelist); - ChannelInfo *getChannelInfo(int nChannelKey); - ChannelInfo *getChannelInfo(QString strModel); - ChannelInfo *rmChannelInfo(QString strModel); - int getChannelInfoKey(QString strModel); - int getChannelInfoNum(QString strModel); - QStringList getChannelModelList(int nChannelKey); - QMap getChannelModelMap(); - QStringList getAllModels(); - bool compareStrings(QStringList m_src); - int getDefaultChannel(); - void setDefaultChannel(int channel){ m_defaultChannel = channel; }; -signals: - void sgChannelChanged(); - void sgAddChannel(QString); - void sgDelChannel(QString); -private: - QMap m_mpChannelInfo; - QString m_strPath; - int m_defaultChannel; -}; - -#endif - diff --git a/src/tpMain/ComConfig.cpp b/src/tpMain/ComConfig.cpp deleted file mode 100644 index 2801b91..0000000 --- a/src/tpMain/ComConfig.cpp +++ /dev/null @@ -1,68 +0,0 @@ -#include "ComConfig.h" -#include "QZkJsonParser.h" -#define WHEEL_COMMUNICATE_FILE "\\config\\communicate.json" - -#define WHEEL_APP_FILE "\\ui\\app.json" - -ComConfig::ComConfig(QString filepath) -{ - appPath = filepath; - init(); -} - - -ComConfig::~ComConfig() -{ -} - -void ComConfig::init() -{ - QString filecom = appPath + WHEEL_COMMUNICATE_FILE; - QJsonObject jsMyself = QZkJsonParser::ReadJsonAuto(filecom); - QJsonArray m_deviceArray = jsMyself.value("COM").toArray(); - QJsonObject firstobj=m_deviceArray.first().toObject(); - m_ComName = firstobj.value("name").toString(); - m_Baute = firstobj.value("bound").toInt(); -} - -void ComConfig::save() -{ - QString filecom = appPath + WHEEL_COMMUNICATE_FILE; - QJsonObject jsMyself = QZkJsonParser::ReadJsonAuto(filecom); - QJsonArray m_deviceArray = jsMyself.value("COM").toArray(); - QJsonObject firstobj = m_deviceArray.first().toObject(); - firstobj.insert("name", m_ComName); - firstobj.insert("bound", m_Baute); - m_deviceArray.removeFirst(); - m_deviceArray.append(firstobj); - jsMyself.insert("COM", m_deviceArray); - QZkJsonParser::WriteJsonObject(filecom, jsMyself); - - QString fileApp = appPath + WHEEL_APP_FILE; - QJsonObject appjs = QZkJsonParser::ReadJsonAuto(fileApp); - QJsonObject userObj = appjs.value("user").toObject(); - userObj.insert("comm", m_ComName); - appjs.insert("user", userObj); - QZkJsonParser::WriteJsonObject(fileApp, appjs); - -} - -QString ComConfig::getComName() const -{ - return m_ComName; -} - -QString ComConfig::getComBaute() const -{ - return QString::number(m_Baute); -} - -void ComConfig::setComName(QString str) -{ - m_ComName = str; -} - -void ComConfig::setComBaute(QString str) -{ - m_Baute = str.toInt(); -} diff --git a/src/tpMain/ComConfig.h b/src/tpMain/ComConfig.h deleted file mode 100644 index bd2dd6e..0000000 --- a/src/tpMain/ComConfig.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once -#include "QString" -class ComConfig -{ -public: - ComConfig(QString filepath); - ~ComConfig(); - void init(); - void save(); - QString getComName() const; - QString getComBaute() const; - void setComName(QString str); - void setComBaute(QString str); -private: - QString m_ComName; - int m_Baute; - QString appPath; -}; - diff --git a/src/tpMain/IWheelCtrl.h b/src/tpMain/IWheelCtrl.h index 9b449f4..a74a705 100644 --- a/src/tpMain/IWheelCtrl.h +++ b/src/tpMain/IWheelCtrl.h @@ -13,13 +13,13 @@ #include "InfoFile.h" #include class ModelManager; -class CChannelInfo; +//class CChannelInfo; class lpGlobalConfig; class Result2Ui; class QSqliteGeneral; -class TimeMgrCtrl; +//class TimeMgrCtrl; class CamConfig; -class ComConfig; +//class ComConfig; class IWheelModel; class DataBaseSql; class IWheelCtrl : public QObject @@ -32,11 +32,11 @@ public: virtual ModelManager *getModelMgr() const = 0; virtual QStringList getAllModelName() = 0; virtual QStringList getAllTrainModelName() = 0; - virtual CChannelInfo *getChannelInfo() const = 0; - virtual TimeMgrCtrl *getTimeMgr() const = 0; - virtual QMap* getAllTimePtr() const = 0; +// virtual CChannelInfo *getChannelInfo() const = 0; +// virtual TimeMgrCtrl *getTimeMgr() const = 0; +// virtual QMap* getAllTimePtr() const = 0; virtual CamConfig *getCamConfig() const = 0; - virtual ComConfig *getComConfig() const = 0; +// virtual ComConfig *getComConfig() const = 0; //thickness virtual double getThickness() const = 0; virtual QString getThicknessStr() const =0; diff --git a/src/tpMain/NetProtocol.cpp b/src/tpMain/NetProtocol.cpp deleted file mode 100644 index 5e1f11b..0000000 --- a/src/tpMain/NetProtocol.cpp +++ /dev/null @@ -1,99 +0,0 @@ -#include "NetProtocol.h" -#include "QDebug" -#include "qdatetime.h" - -#define PROTOCOL_HEAD "ca02" -#define PROTOCOL_SPACE " " -#define PROTOCOL_CMD_LEN 3 -#define PROTOCOL_DATA_NUM 8 -#define PROTOCOL_DATA_LEN 5 -#define PROTOCOL_MODEL_LEN 20 -#define PROTOCOL_TOTAL_LEN 78 -#define PROTOCOL_BLOCK_NUM 11 - -NetProtocol::NetProtocol() -{ - -} - - -NetProtocol::~NetProtocol() -{ - -} - -QString NetProtocol::packData(const int nCmd, QList& lstData /*= QList()*/, QString strModel /*= QString()*/) -{ - if (lstData.empty()) { - lstData = genList(); - } - if (lstData.size() != PROTOCOL_DATA_NUM) { - //error - lstData = genList(); - } - - QString strDst = PROTOCOL_HEAD + QString(PROTOCOL_SPACE); - strDst += genCmd(nCmd) + PROTOCOL_SPACE; - for (int i = 0; i < PROTOCOL_DATA_NUM; i++) { - strDst += genData(lstData[i]) + PROTOCOL_SPACE; - } - strDst += genModel(strModel) + PROTOCOL_SPACE; - //sendData(strDst); - //emit sgText(strDst); - return strDst; -} - -QString NetProtocol::genCmd(int nCmd) -{ - QString a = "000" + QString::number(nCmd); - return a.right(PROTOCOL_CMD_LEN); -} - -QString NetProtocol::genData(int nData) -{ - QString a = "00000" + QString::number(nData); - return a.right(PROTOCOL_DATA_LEN); -} - -QString NetProtocol::genModel(QString strModel) -{ - QString a = "####################" + strModel; - return a.right(PROTOCOL_MODEL_LEN); -} - -QList NetProtocol::genList() -{ - QList dst; - for (int i = 0; i < PROTOCOL_DATA_NUM; i++) { - dst.push_back(0); - } - return dst; -} - -QString NetProtocol::genAddressPort(const QString& addr, const QString &nPort) -{ - return QString("%1-%2").arg(addr).arg(nPort); -} - -QByteArray NetProtocol::parseData(const QByteArray dataSrc, int &nCmd, QList&lstData, QString &strModel) -{ - //默认数据包无数据丢失，即第一个一定是ca02 - QString strTmp = dataSrc.left(PROTOCOL_TOTAL_LEN); - QStringList mList = strTmp.split(PROTOCOL_SPACE); - QByteArray dataDst = dataSrc.right(dataSrc.length() - PROTOCOL_TOTAL_LEN); - if (mList.size() < PROTOCOL_BLOCK_NUM) { - qDebug() << "size less than 11"; - return dataDst; - } - if (PROTOCOL_HEAD != mList.at(0)) { - qDebug() << "data head is no ca02"; - return dataDst; - } - nCmd = mList.at(1).toInt(); - for (int i = 0; i < PROTOCOL_DATA_NUM; i++) { - lstData.append(mList.at(i + 2).toInt()); - } - strModel = mList.at(10); - return dataDst; -} - diff --git a/src/tpMain/NetProtocol.h b/src/tpMain/NetProtocol.h deleted file mode 100644 index b631500..0000000 --- a/src/tpMain/NetProtocol.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once -#include "qobject.h" -#include "QVariantMap" -#include "qbytearray.h" -enum EM_NET_TYPE { - emNetClient = 0, emNetServer -}; -class NetProtocol -{ -public: - NetProtocol(); - ~NetProtocol(); - - static QString genAddressPort(const QString& addr, const QString &nPort); -protected: - QString genCmd(int nCmd); - QString genData(int nData = 0); - QString genModel(QString strModel = QString()); - QList genList(); - QString packData(const int nCmd, QList& lstData = QList(), QString strModel = QString()); - QByteArray parseData(const QByteArray dataSrc, int &nCmd, QList&lstData, QString &strModel); -}; - diff --git a/src/tpMain/WheelCtrl.cpp b/src/tpMain/WheelCtrl.cpp index 18fca36..ea68ee7 100644 --- a/src/tpMain/WheelCtrl.cpp +++ b/src/tpMain/WheelCtrl.cpp @@ -1,12 +1,12 @@ #include "WheelCtrl.h" -#include "ChannelInfo.h" +//#include "ChannelInfo.h" #include "ModelManager.h" #include "lpGlobalConfig.h" #include "Result2Ui.h" #include "InfoFile.h" #include -#include "WheelNet.h" -#include "timemgrctrl.h" +//#include "WheelNet.h" +//#include "timemgrctrl.h" #include "QDebug" #include "CamConfig.h" #include "QThread" @@ -15,7 +15,7 @@ #include "QLibrary" #include "databasesql.h" #include "DetectDataDB.h" -#include "ComConfig.h" +//#include "ComConfig.h" #include "HubBase.h" #pragma execution_character_set("utf-8") #define _QSQLITE_WHEELHUBWF_NAME "wheelhubwf.db" @@ -26,7 +26,7 @@ WheelCtrl::WheelCtrl(QString strPath, QMySplashScreen* pScreen) QString strChannelPath = strPath + "\\user\\channels.json.dat"; hubBase::mkdir(strPath + "\\user\\"); ShowInitMsg(pScreen, tr("加载通道模块 ....")); - m_pChannel = new CChannelInfo(strChannelPath, pScreen); +// m_pChannel = new CChannelInfo(strChannelPath, pScreen); ShowInitMsg(pScreen, tr("加载模板库 ....")); m_pModelMgr = new ModelManager(strPath); m_pModelMgr->init(); @@ -38,16 +38,16 @@ WheelCtrl::WheelCtrl(QString strPath, QMySplashScreen* pScreen) m_db = new DetectDataDB(strDbPath); ((DetectDataDB*)m_db)->InitDatabase(); ShowInitMsg(pScreen, tr("加载班次管理模块 ....")); - m_pTimeMgr = new TimeMgrCtrl((DetectDataDB*)m_db); - m_pNet = new CWheelNet(strPath); +// m_pTimeMgr = new TimeMgrCtrl((DetectDataDB*)m_db); +// m_pNet = new CWheelNet(strPath); ShowInitMsg(pScreen, tr("加载其他模块 ....")); m_pCamConfig = new CamConfig(strPath); - m_pComConfig = new ComConfig(m_strPath); +// m_pComConfig = new ComConfig(m_strPath); ShowInitMsg(pScreen, tr("创建子线程 ....")); saveResultThread = new QThread(this); QSaveResult *pSaveResult = new QSaveResult; - pSaveResult->setDBPtr((DetectDataDB*)m_db, m_pChannel); +// pSaveResult->setDBPtr((DetectDataDB*)m_db, m_pChannel); pSaveResult->moveToThread(saveResultThread); pSaveResult->setAppRootPath(strPath); @@ -66,19 +66,19 @@ WheelCtrl::WheelCtrl(QString strPath, QMySplashScreen* pScreen) WheelCtrl::~WheelCtrl() { - delete m_pChannel; +// delete m_pChannel; delete m_pModelMgr; delete m_db; - delete m_pComConfig; +// delete m_pComConfig; delete m_pCamConfig; m_db = NULL; - delete m_pTimeMgr; - delete m_pNet; - m_pNet = NULL; - m_pTimeMgr = NULL; - m_pChannel = NULL; +// delete m_pTimeMgr; +// delete m_pNet; +// m_pNet = NULL; +// m_pTimeMgr = NULL; +// m_pChannel = NULL; m_pModelMgr = NULL; - m_pComConfig = NULL; +// m_pComConfig = NULL; m_pCamConfig = NULL; if (saveResultThread){ qDebug() << "delete saveResultThread"; @@ -120,10 +120,10 @@ ModelManager * WheelCtrl::getModelMgr() const return m_pModelMgr; } -CChannelInfo * WheelCtrl::getChannelInfo() const -{ - return m_pChannel; -} +// CChannelInfo * WheelCtrl::getChannelInfo() const +// { +// return m_pChannel; +// } QString WheelCtrl::getThicknessStr() const { @@ -172,26 +172,26 @@ DataBaseSql *WheelCtrl::getDB() const return m_db; } -TimeMgrCtrl * WheelCtrl::getTimeMgr() const -{ - return m_pTimeMgr; -} +// TimeMgrCtrl * WheelCtrl::getTimeMgr() const +// { +// return m_pTimeMgr; +// } bool WheelCtrl::onStart() { /*把检测的库信息按照对应的序号插入map中并发送至PLC*/ - m_pNet->sendLight(1, 3, 1000, 500);//黄灯 - m_pNet->sendLight(0, 3, 1000, 500);//红灯 - m_pNet->sendLight(2, 3, 1000, 500);//绿灯 + //m_pNet->sendLight(1, 3, 1000, 500);//黄灯 + //m_pNet->sendLight(0, 3, 1000, 500);//红灯 + //m_pNet->sendLight(2, 3, 1000, 500);//绿灯 //m_pNet->sendLight(3, 3, 1000, 500);//蜂鸣 return true; } bool WheelCtrl::onFinish() { - m_pNet->sendLight(2, 2, 1000, 400); - m_pNet->sendLight(0, 2, 1000, 400); - m_pNet->sendLight(1, 2, 1000, 400); + //m_pNet->sendLight(2, 2, 1000, 400); + //m_pNet->sendLight(0, 2, 1000, 400); + //m_pNet->sendLight(1, 2, 1000, 400); //m_pNet->sendLight(3, 3, 1000, 400);//蜂鸣 return true; } @@ -247,16 +247,16 @@ void WheelCtrl::setUser(QString strName, int nlevel) QString WheelCtrl::getCurrentBan() const { - if (m_pTimeMgr) - return m_pTimeMgr->GetCurrentBan(); - else +// if (m_pTimeMgr) +// return m_pTimeMgr->GetCurrentBan(); +// else return QString(); } bool WheelCtrl::sendModelLib() { - if (m_pNet) - m_pNet->sendClearLib(); +// if (m_pNet) +// m_pNet->sendClearLib(); return true; } @@ -291,15 +291,15 @@ QStringList WheelCtrl::getAllTrainModelName() return m_pModelMgr->getAllTrainModelName(); } -QMap* WheelCtrl::getAllTimePtr() const -{ - return m_pTimeMgr->getAllTimePtr(); -} +// QMap* WheelCtrl::getAllTimePtr() const +// { +// return m_pTimeMgr->getAllTimePtr(); +// } -ComConfig * WheelCtrl::getComConfig() const -{ - return m_pComConfig; -} +// ComConfig * WheelCtrl::getComConfig() const +// { +// return m_pComConfig; +// } void WheelCtrl::ShowInitMsg(QMySplashScreen* p, QString str){ if (p){ diff --git a/src/tpMain/WheelCtrl.h b/src/tpMain/WheelCtrl.h index 0269bf4..571bdd9 100644 --- a/src/tpMain/WheelCtrl.h +++ b/src/tpMain/WheelCtrl.h @@ -20,11 +20,11 @@ public: virtual ModelManager *getModelMgr() const; virtual QStringList getAllModelName(); virtual QStringList getAllTrainModelName(); - virtual CChannelInfo *getChannelInfo() const; - virtual TimeMgrCtrl *getTimeMgr() const; - virtual QMap* getAllTimePtr() const; +// virtual CChannelInfo *getChannelInfo() const; +// virtual TimeMgrCtrl *getTimeMgr() const; +// virtual QMap* getAllTimePtr() const; virtual CamConfig *getCamConfig() const; - virtual ComConfig *getComConfig() const; +// virtual ComConfig *getComConfig() const; virtual double getThickness() const; virtual QString getThicknessStr() const; virtual void appendThicknessValue(double nValue); @@ -49,7 +49,7 @@ public: virtual void setUser(QString strName, int nlevel); virtual QString getCurrentBan() const; - CWheelNet *getNet() { return m_pNet; } +// CWheelNet *getNet() { return m_pNet; } CRaster *getRaster() { return m_pRaster; } virtual bool sendModelLib(); @@ -61,16 +61,16 @@ public: signals: void operate(Result2Ui *m_Res); private: - CChannelInfo *m_pChannel{ nullptr }; +// CChannelInfo *m_pChannel{ nullptr }; ModelManager *m_pModelMgr{ nullptr }; CRaster *m_pRaster{ nullptr }; QString m_strPath; //QSqliteGeneral *m_db; DataBaseSql *m_db{ nullptr }; - TimeMgrCtrl *m_pTimeMgr{ nullptr }; - CWheelNet *m_pNet{ nullptr }; + //TimeMgrCtrl *m_pTimeMgr{ nullptr }; + //CWheelNet *m_pNet{ nullptr }; CamConfig *m_pCamConfig{ nullptr }; - ComConfig *m_pComConfig{ nullptr }; + //ComConfig *m_pComConfig{ nullptr }; class QThread *saveResultThread{ nullptr }; class IRasterSDG20* m_pRasterSDG20{ nullptr }; diff --git a/src/tpMain/WheelNet.cpp b/src/tpMain/WheelNet.cpp deleted file mode 100644 index 306ffe8..0000000 --- a/src/tpMain/WheelNet.cpp +++ /dev/null @@ -1,454 +0,0 @@ -#include "WheelNet.h" -#include "InfoFile.h" -#include "..\NetWheel\net4wheel_global.h" -#include "QZkJsonParser.h" -#include "qlibrary.h" -#include "qhostaddress.h" -#include "QDebug" -#include "qipconfigdlg.h" -#include "qdebug.h" -#define JSONG_MYSELF_FILE "\\user\\selfdefine.json" -#pragma execution_character_set("utf-8") - - -//emTypeResultChannel 结果通道 0x16 -//emTypeTriger 设置触发延时相关参数 -CWheelNet::CWheelNet(QString strRoot) - : m_pNet4Wheel(NULL), - m_strRoot(strRoot) -{ - m_pIpConfig = new IPConfig; - loadIpConfig(); - loadNet(); -} - -CWheelNet::~CWheelNet() -{ - qDebug() << "delete CWheelNet"; - if (m_pIpConfig) { - delete m_pIpConfig; - m_pIpConfig = NULL; - } - if (m_pNet4Wheel) { - delete m_pNet4Wheel; - m_pNet4Wheel = NULL; - } - qDebug() << "delete CWheelNet end"; -} - -bool CWheelNet::loadIpConfig() -{ - QString fileMyself = m_strRoot + JSONG_MYSELF_FILE; - QJsonObject jsMyself = QZkJsonParser::ReadJsonAuto(fileMyself); - QJsonObject TcpNetObj = jsMyself.value("TcpNetWork").toObject(); - if (!TcpNetObj.isEmpty()) { - m_pIpConfig->m_TcpAddress = TcpNetObj.value("TCP_Address").toString(); - m_pIpConfig->m_TcpPort = TcpNetObj.value("TCP_port").toInt(); - QString serverStr = TcpNetObj.value("TCP_Type").toString(); - m_pIpConfig->m_ClientAddress = TcpNetObj.value("client_IP").toString(); - m_pIpConfig->m_ClientPort = TcpNetObj.value("client_port").toInt(); - } - return true; -} - -bool CWheelNet::saveIpConfig() -{ - QString fileMyself = m_strRoot + JSONG_MYSELF_FILE; - QJsonObject jsMyself = QZkJsonParser::ReadJsonAuto(fileMyself); - - QJsonObject IPConfigObj; - IPConfigObj.insert("TCP_Address", QJsonValue(m_pIpConfig->m_TcpAddress)); - IPConfigObj.insert("TCP_port", QJsonValue(m_pIpConfig->m_TcpPort)); - IPConfigObj.insert("TCP_Type", QJsonValue("server")); - IPConfigObj.insert("client_IP", QJsonValue(m_pIpConfig->m_ClientAddress)); - IPConfigObj.insert("client_port", QJsonValue(m_pIpConfig->m_ClientPort)); - jsMyself.insert("TcpNetWork", IPConfigObj); - return QZkJsonParser::WriteJsonObject(fileMyself, jsMyself); -} - -Q_SLOT void CWheelNet::onOpenServer(QString IPAddr, int port) -{ - if (m_pNet4Wheel) { - m_pNet4Wheel->OpenServer(IPAddr, port); - emit sgServerState(IPAddr, port, true); - } -} - -Q_SLOT void CWheelNet::onOpenServer() -{ - if (m_pNet4Wheel) { - m_pNet4Wheel->OpenServer(m_pIpConfig->m_TcpAddress, m_pIpConfig->m_TcpPort); - emit sgServerState(m_pIpConfig->m_TcpAddress, m_pIpConfig->m_TcpPort, true); - } -} - -Q_SLOT void CWheelNet::onCloseServer() -{ - if (m_pNet4Wheel) { - m_pNet4Wheel->CloseServer(); - emit sgServerState(m_pIpConfig->m_TcpAddress, m_pIpConfig->m_TcpPort, false); - } -} - -bool CWheelNet::loadNet() -{ -#ifdef _DEBUG - QLibrary lib("Net4Wheeld"); -#else - QLibrary lib("Net4Wheel"); -#endif - if (lib.load()){ - _Net4WheelCreate func = (_Net4WheelCreate)lib.resolve("Net4WheelCreate"); - //QHostAddress *pAdd = new QHostAddress; - QHostAddress pAdd;// = new QHostAddress; - pAdd.setAddress(m_pIpConfig->m_TcpAddress); - //pAdd->setAddress(m_pIpConfig->m_TcpAddress); - //m_pNet4Wheel = func(*pAdd, m_pIpConfig->m_TcpPort); - m_pNet4Wheel = func(pAdd, m_pIpConfig->m_TcpPort); - connect(m_pNet4Wheel, SIGNAL(RecvDatas(QByteArray)), this, SLOT(DataRecvByte(QByteArray))); - connect(m_pNet4Wheel, SIGNAL(SignalConnect(QVariantMap)), this, SLOT(onConnect(QVariantMap))); - connect(this, SIGNAL(sgSendData2Dv(QString, QByteArray)), m_pNet4Wheel, SLOT(sendDatas(QString, QByteArray))); - } - return true; -} - -void CWheelNet::sendData(QString strData) -{ - if (!m_pNet4Wheel) { - return ; - } - QByteArray arr; - arr.append(strData); - if (m_pIpConfig){ - QString strTarget = genAddressPort(m_pIpConfig->m_ClientAddress, QString::number(m_pIpConfig->m_ClientPort)); - //m_pNet4Wheel->sendDatas(strTarget, arr); - emit sgSendData2Dv(strTarget, arr); - } -} - -bool CWheelNet::sendDataFrame(QString strData) -{ - /*调用框架接口 发送网络数据*/ - //m_pCallBack - return true; -} - -void CWheelNet::onShowIpDlg(QWidget* parent) -{ - QIPConfigDlg ipdlg(parent); - ipdlg.setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint); - ipdlg.setWindowModality(Qt::ApplicationModal); - ipdlg.setAttribute(Qt::WA_ShowModal, true); - ipdlg.setWindowTitle(tr("IP参数设置")); - ipdlg.setWindowIcon(QIcon(":/image/leaper")); - ipdlg.SetIPData(m_pIpConfig); - connect(&ipdlg, SIGNAL(SignalCloseServer()), this, SLOT(onCloseServer())); - connect(&ipdlg, SIGNAL(SignalOpenServer(QString, int)), this, SLOT(onOpenServer(QString, int))); - if (ipdlg.exec() == QDialog::Accepted) - { - ipdlg.GetIPData(m_pIpConfig); - saveIpConfig(); - } -} - -QString CWheelNet::getIp(EM_NET_TYPE type) const -{ - if (!m_pIpConfig) { - return QString(); - } - if (type == emNetClient) - { - return m_pIpConfig->m_ClientAddress; - } - return m_pIpConfig->m_TcpAddress; -} - -QString CWheelNet::getPort(EM_NET_TYPE type) const -{ - if (!m_pIpConfig) { - return QString(); - } - if (type == emNetClient ) - { - return QString::number(m_pIpConfig->m_ClientPort); - } - return QString::number(m_pIpConfig->m_TcpPort); -} - -/*心跳包*/ -void CWheelNet::sendPulse(int nInterval, int nState, int nOnline) -{ - QList lstData = genList(); - lstData[0] = nInterval; - lstData[1] = nState; - lstData[2] = nOnline; - QString strDst = packData(emTypePulse, lstData); - sendData(strDst); -} -/*模板数据*/ -/* -strModel 型号名 -dialeter 直径 -dHeight 厚度 -*/ -void CWheelNet::sendModelList(int nIndex, QString strModel, double dDiameter, double dHeight) -{ - QList lstData = genList(); - lstData[0] = nIndex; - lstData[1] = dDiameter; - lstData[2] = dHeight; - QString strDst = packData(emTypeLib, lstData, strModel); - sendData(strDst); -} - -void CWheelNet::sendDetectResult(QString strModel, double dDiameter, double dHeight) -{ - QList lstData = genList(); - lstData[0] = dDiameter; - lstData[1] = dHeight; - QString strDst = packData(emTypeResult, lstData, strModel); - sendData(strDst); -} - -void CWheelNet::sendThickness() -{ - QString strDst = packData(emTypeThickness); - sendData(strDst); -} - -void CWheelNet::sendTrig() -{ - QString strDst = packData(emTypeTrig); - sendData(strDst); -} - -void CWheelNet::sendClearLib() -{ - QString strDst = packData(emTypeClear); - sendData(strDst); -} - -void CWheelNet::sendLight(int nLightType, int nTimes, int nUpTimes, int nDownTimes) -{ - QList lstData = genList(); - lstData[0] = nLightType; - lstData[1] = nTimes; - lstData[2] = nUpTimes; - lstData[3] = nDownTimes; - QString strDst = packData(emTypeLight, lstData); - sendData(strDst); -} - -void CWheelNet::sendDeteStateList(int nIndex, int nIsDetect, QString strModel) -{ - QList lstData = genList(); - lstData[0] = nIndex; - lstData[1] = nIsDetect; - //lstData[2] = dHeight; - QString strDst = packData(emTypeDetState, lstData, strModel); - sendData(strDst); -} - -void CWheelNet::sendCheckDeteStateList(int nIndex, int nIsDetect, QString strModel) -{ - QList lstData = genList(); - lstData[0] = nIndex; - //lstData[1] = nIsDetect; - //lstData[2] = dHeight; - QString strDst = packData(emTypeCheckDete, lstData, strModel); - sendData(strDst); -} - -void CWheelNet::sendModelInitDone() -{ - QString strDst = packData(emTypeInitDone); - sendData(strDst); -} - -void CWheelNet::sendModelNum(int nCount) -{ - QList lstData = genList(); - lstData[0] = nCount; - QString strDst = packData(emTypeModelnum, lstData); - sendData(strDst); -} - -void CWheelNet::sendClearDisLibs() -{ - QList lstData = genList(); - lstData[0] = 1; - QString strDst = packData(emTypeWriteDisOnlineModels, lstData); - sendData(strDst); -} -void CWheelNet::sendDisLibs(int nIndex, QString strModel) -{ - QList lstData = genList(); - lstData[0] = 0; - lstData[1] = nIndex; - QString strDst = packData(emTypeWriteDisOnlineModels, lstData, strModel); - sendData(strDst); -} - -void CWheelNet::sendDisLibsDone() -{ - QList lstData = genList(); - lstData[0] = 2; - QString strDst = packData(emTypeWriteDisOnlineModels, lstData); - sendData(strDst); -} - -void CWheelNet::sendCheckAllModelState()/*查询在线检测状态*/ -{ - QString strDst = packData(emTypeReadOnlineModels); - sendData(strDst); -} - -Q_SLOT void CWheelNet::onConnect(QVariantMap vMap) -{ - // - QString m_type = vMap.value("type").toString(); - QString address, port, peerName, client_State; - QString strPre = m_type + "_"; - address = vMap.value(strPre + "address").toString(); - port = vMap.value(strPre + "port").toString(); - peerName = vMap.value(strPre + "name").toString(); - client_State = vMap.value(strPre + "state").toString(); - - bool bConnect = true; - if (client_State == "Disconnect" || client_State == "close listen ") { - bConnect = false; - } - QString str = QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss"); - str.append(":\n"); - str.append("type=" + m_type + " " + "address:" + address + " sourcePort:" + port + " is " + client_State); - str.append("\n"); - QString Clientobj = genAddressPort(address, port); - emit sgShow2UI(str, bConnect); - emit sgClientConnect(Clientobj, bConnect); -} - -Q_SLOT void CWheelNet::DataRecvByte(QByteArray m_data) -{ - if (m_data.size() <= 0) { - return; - } - - while (m_data.size() != 0) { - int nCmd = -1; - QList lstData; - QString strModel; - m_data = parseData(m_data, nCmd, lstData, strModel); - switch (nCmd) { - case emTypePulse://心跳包应答 - emit(sgPulseRev()); - break; - case emTypeLib://模板库应答 - emit(sgLibRev(true)); - break; - case emTypeResult://检测结果发送应答 - emit(sgResultRev()); - break; - case emTypeThickness: - { - int height = lstData.at(0); - emit sgThickness((double)height); - break; - } - case emTypeTrig: - { - //PLC触发相机 主动上报 - qWarning() << "recv a camera triger time:" << QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss zzz") << ";"; - emit sgCameraTrig(lstData.at(0));// 第几个 索引 - } - break; - case emTypeClear: - emit(sgClearRev(true)); - break; - case emTypeDetState: - emit sgDeteState(true); - //发送1000个勾的应答 - break; - case emTypeCheckDete: - //查询 - emit sgDeteState(true); - emit(sgRecvDetectState(lstData.at(0), lstData.at(1))); - break; - case emTypeInitDone: - break; - case emTypePLCUpdate://11 在线时勾选表主动上报 - emit(sgRecvDetectState(lstData.at(0), lstData.at(1))); - break; - case emTypeModelnum: - break; - case emTypeChangeOnline: - emit(sgChangeOnlineState(lstData.at(0))); - break; - case emTypeWriteDisOnlineModels: - if (lstData.at(0) == 1){ - emit(sgClearDisLibASK()); - } - else if (lstData.at(0) == 0){ - emit(sgSendDisLibASK(true)); - } - break; - case emTypeReadOnlineModels: - if (lstData.at(0) == 0) - { - strModel.remove("#"); - emit(sgReadDetectState(lstData.at(1), strModel)); - } - else if (lstData.at(0) == 1){ - emit(sgReadDetectStateASK()); - } - break; - case emTypeTriger: - emit(sgRecvTrigPara()); - break; - case emShutDown: - emit(sgShutDownComputer()); - default: - break; - } - } -} -//发送结果通道 -void CWheelNet::sendResultChannel(int nChannelValue, double dHeight, double dDiameter, QString str /*QString()*/) -{ - QList lstData = genList(); - - lstData[0] = dHeight; - lstData[1] = dDiameter; - lstData[2] = nChannelValue; - QString strDst = packData(emTypeResult, lstData, str); - sendData(strDst); -} - - -/* -nSignal 传感触发滤波 -nCamTriger 相机触发延时 -nCamPulse 相机触发脉冲宽度 -nLight 光源熄灭延时 -nTrigerType 传感器触发边缘 0-下降沿 1-上升沿 -*/ -void CWheelNet::sendTrigerPara(int nSignal,int nCamTriger,int nCamPulse,int nLight,int nTrigerType,int nResHoldTime) -{ - QList lstData = genList(); - lstData[0] = nSignal; - lstData[1] = nCamTriger; - lstData[2] = nCamPulse; - lstData[3] = nLight; - lstData[4] = nTrigerType; - lstData[5] = nResHoldTime; - QString strDst = packData(emTypeTriger, lstData); - sendData(strDst); -} - -Q_SLOT void CWheelNet::onSendDataByType(int nType, QVariantMap nMap) -{ - switch (nType){ - case emTypePulse: - sendPulse(nMap.value("time").toInt(), nMap.value("detestate").toInt(),nMap.value("onlineStatie").toInt()); - break; - } -} diff --git a/src/tpMain/WheelNet.h b/src/tpMain/WheelNet.h deleted file mode 100644 index 5eba4ab..0000000 --- a/src/tpMain/WheelNet.h +++ /dev/null @@ -1,91 +0,0 @@ -#pragma once -#include "NetProtocol.h" -#include "QThread" -class IMainCallback; -/* -CWheelNet 网络通讯模块，解析和发送数据 -调用框架的接口，接收数据进行解析，对需要发送的数据进行打包和发送 -框架需要支持的网络通讯功能： -（1）支持获取当前服务器的IP地址和开放端口 -（2）支持获取当前连接到服务器的客户端的IP地址和源端口 -（3）支持动态打开和关闭服务器的接口 -（4）支持发送数据和接收数据 -*/ - -enum EM_HEAD_TYPE { - emTypePulse = 1, emTypeLib, emTypeResult, emTypeThickness, - emTypeTrig, emTypeClear, emTypeLight, emTypeDetState, emTypeCheckDete, - emTypeInitDone, emTypePLCUpdate, emTypeModelnum, emTypeChangeOnline, - emTypeWriteDisOnlineModels, emTypeReadOnlineModels, emTypeResultChannel, emTypeTriger, emAngleRst , emShutDown -}; - -class CWheelNet : public QObject, public NetProtocol -{ - Q_OBJECT -public: - CWheelNet(QString strRoot); - ~CWheelNet(); - - Q_SLOT void onOpenServer(QString IPAddr, int port); - Q_SLOT void onOpenServer(); - Q_SLOT void onCloseServer(); - Q_SLOT void onSendDataByType(int nType, QVariantMap nMap); -private: - Q_SLOT void DataRecvByte(QByteArray m_data); - Q_SLOT void onConnect(QVariantMap vMap); -public: - void sendModelInitDone(); - void sendPulse(int nInterval, int nState, int nOnline); - void sendModelList(int nIndex, QString strModel, double dDiameter, double dHeight); - void sendDetectResult(QString strModel, double dHeight, double dDiameter); - void sendResultChannel(int nChannelValue, double dHeight, double dDiameter, QString str = QString()); - void sendThickness(); - void sendTrig();//发送清空触发计数 - void sendClearLib(); - void sendModelNum(int nCount); - void sendLight(int nLightType, int nTimes, int nUpTimes, int nDownTimes); - void sendDeteStateList(int nIndex, int nIsDetect, QString strModel); - void sendCheckDeteStateList(int nIndex, int nIsDetect, QString strModel); - void sendCheckAllModelState(); //查询检测在线检测状态 10s发一次 - void sendClearDisLibs();//清除下位机离线库 - void sendDisLibs(int nIndex, QString strModel); - void sendDisLibsDone(); - void sendTrigerPara(int nSignal, int nCamTriger, int nCamPulse, int nLight, int nTrigerType = 0, int nResHoldTime=1500); -signals: - void sgRecvTrigPara(); - void sgPulseRev();//心跳包应答信号发送 - void sgResultRev();//检测结果发送应答发送 - void sgRecv(const QString &); - void sgThickness(double);//光栅查询的应答 - void sgLibRev(bool);//发送库的应答 - void sgClearRev(bool);//发送清空库的应答 - void sgDeteState(bool);//发送离线时的检测状态的应答 - void sgChangeOnlineState(int);//强制改变离线、在线状态 - void sgRecvDetectState(int nIndex, int value);//在线时接收检测状态 - void sgCameraTrig(int);//PLC触发相机时主动上报 - void sgShow2UI(QString str, bool bConnect); - void sgClientConnect(QString addr, bool bConnect); - void sgServerState(QString, int, bool);//用来传送server打开 关闭状态 - void sgReadDetectState(int nIndex, QString StrModelName);//在线应答信号 - void sgClearDisLibASK(); - void sgSendDisLibASK(bool); - void sgReadDetectStateASK(); - void sgShutDownComputer(); - - void sgSendData2Dv(QString,QByteArray); -public: - void onShowIpDlg(QWidget* parent); - QString getIp(EM_NET_TYPE type) const; - QString getPort(EM_NET_TYPE type) const; -private: - bool loadNet(); - bool loadIpConfig(); - bool saveIpConfig(); - void sendData(QString strData); - bool sendDataFrame(QString strData); -private: - class INet4Wheel *m_pNet4Wheel; - class IPConfig *m_pIpConfig; - QString m_strRoot; -}; - diff --git a/src/tpMain/lpGlobalConfig.cpp b/src/tpMain/lpGlobalConfig.cpp index 22be189..4a6e68c 100644 --- a/src/tpMain/lpGlobalConfig.cpp +++ b/src/tpMain/lpGlobalConfig.cpp @@ -16,12 +16,7 @@ lpGlobalConfig::lpGlobalConfig() { totalDetectNum = 0; totalUnDetectNum = 0; - - //m_bObjAll2A = false; - m_startDetectFlags = false; - //saveGood = 0; - //saveBad = 0; m_Debug = 0; m_k = -0.00077528844; m_b = 0.786244571; @@ -218,10 +213,6 @@ void lpGlobalConfig::saveDeteImage() QJsonObject DetectImage; DetectImage.insert("Debug", m_Debug); -// DetectImage.insert("SaveCut_Bad", saveCutBad); -// DetectImage.insert("SaveCut_Good", saveCutGood); -// DetectImage.insert("Save_Bad", saveBad); -// DetectImage.insert("Save_Good", saveGood); DetectImage.insert("saveCutOKImg",bSaveCutOKImg); DetectImage.insert("saveCutNGImg",bSaveCutNGImg); @@ -234,7 +225,6 @@ void lpGlobalConfig::saveDeteImage() DetectImage.insert("UseBackground", m_UseBackground); jsMyself.insert("DetectImage", DetectImage); - QJsonObject autosystemobj; autosystemobj.insert("AutoSendTick2COM", m_AutoSendTick2COM); autosystemobj.insert("AutoSendTick2Net", m_AutoSendTick2Net); diff --git a/src/tpMain/qaddchanneldlg.cpp b/src/tpMain/qaddchanneldlg.cpp deleted file mode 100644 index 61d7556..0000000 --- a/src/tpMain/qaddchanneldlg.cpp +++ /dev/null @@ -1,46 +0,0 @@ -#include "qaddchanneldlg.h" -#include -#pragma execution_character_set("utf-8") -QAddChannelDlg::QAddChannelDlg(QWidget *parent) - : QDialog(parent) -{ - ui.setupUi(this); - connect(ui.pushButton_Cancle,SIGNAL(clicked()),this,SLOT(SlotFunc())); - connect(ui.pushButton_OK, SIGNAL(clicked()), this, SLOT(SlotFunc())); - setWindowIcon(QIcon(":/image/leaper")); - setWindowFlags(Qt::WindowCloseButtonHint); -} - -QAddChannelDlg::~QAddChannelDlg() -{ - -} -QString QAddChannelDlg::GetData(QString &Channelname,int &m_value) -{ - Channelname = this->m_Channelname; - m_value = this->m_value; - return this->m_AboutName; -} - -Q_SLOT void QAddChannelDlg::SlotFunc() -{ - QWidget *pWdgt = (QWidget*)sender(); - QString strname = pWdgt->objectName(); - if (strname == "pushButton_OK") - { - m_Channelname = ui.lineEdit_name->text(); - m_value = ui.spinBox_value->value(); - m_AboutName = ui.lineEdit_About->text(); - if (m_Channelname.isEmpty()) - { - - QMessageBox::warning(this, tr("警告"), tr("数据不能为空，请输入"), QMessageBox::Yes); - return; - } - QDialog::accept(); - } - else if (strname == "pushButton_Cancle") - { - QDialog::close(); - } -} diff --git a/src/tpMain/qaddchanneldlg.h b/src/tpMain/qaddchanneldlg.h deleted file mode 100644 index d055d85..0000000 --- a/src/tpMain/qaddchanneldlg.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef QADDCHANNELDLG_H -#define QADDCHANNELDLG_H - -#include -#include "ui_qaddchanneldlg.h" -class QAddChannelDlg : public QDialog -{ - Q_OBJECT - -public: - QAddChannelDlg(QWidget *parent = 0); - ~QAddChannelDlg(); - Q_SLOT void SlotFunc(); - QString GetData(QString &Channelname,int &m_value); - -private: - Ui::QAddChannelDlg ui; - QString m_Channelname; - QString m_AboutName; - int m_value; - -}; - -#endif // QADDCHANNELDLG_H diff --git a/src/tpMain/qaddchanneldlg.ui b/src/tpMain/qaddchanneldlg.ui deleted file mode 100644 index 73fc264..0000000 --- a/src/tpMain/qaddchanneldlg.ui +++ /dev/null @@ -1,116 +0,0 @@ - - - QAddChannelDlg - - - - 0 - 0 - 236 - 156 - - - - 新建通道 - - - font: 11pt "Consolas"; - - - - - - - - 发送结果： - - - - - - - 通道名称： - - - - - - - - 0 - 25 - - - - 65536 - - - - - - - - 0 - 25 - - - - - - - - 备注： - - - - - - - - 0 - 25 - - - - - - - - - - - - - 0 - 0 - - - - 确认 - - - true - - - - - - - - 0 - 0 - - - - 取消 - - - - - - - - - - - diff --git a/src/tpMain/qaddtimedlg.cpp b/src/tpMain/qaddtimedlg.cpp deleted file mode 100644 index 60f8e5d..0000000 --- a/src/tpMain/qaddtimedlg.cpp +++ /dev/null @@ -1,61 +0,0 @@ -#include "qaddtimedlg.h" -#include "InfoFile.h" - -QAddTimeDlg::QAddTimeDlg(QWidget *parent) - : QDialog(parent) -{ - ui.setupUi(this); - setWindowFlags(Qt::WindowCloseButtonHint); - connect(ui.pushButton, SIGNAL(clicked()), this, SLOT(SlotOK())); - connect(ui.pushButton_2, SIGNAL(clicked()), this, SLOT(SlotCancle())); - setWindowIcon(QIcon(":/image/leaper")); - ui.timeEdit_Start->setDisplayFormat("hh:mm"); - ui.timeEdit_end->setDisplayFormat("hh:mm"); -} - -QAddTimeDlg::~QAddTimeDlg() -{ - -} - -Q_SLOT void QAddTimeDlg::SlotOK() -{ - if (ui.lineEdit->text() == "") - { - return; - } - QDialog::accept(); -} - -void QAddTimeDlg::SetInfo(TimeStruct m_timeStruct, int model/*=0*/) -{ - if (model == 0) - { - ui.lineEdit->setText(m_timeStruct.m_name); - ui.timeEdit_Start->setTime(m_timeStruct.m_startTime); - ui.timeEdit_end->setTime(m_timeStruct.m_endTime); - ui.comboBox_Start->setCurrentIndex((int)m_timeStruct.time_start); - ui.comboBox_end->setCurrentIndex((int)m_timeStruct.time_end); - } - else - { - ui.lineEdit->setText(""); - } -} - -void QAddTimeDlg::GetInfo(TimeStruct &m_timeStruct) -{ - QString str_name = ui.lineEdit->text(); - QTime startime = ui.timeEdit_Start->time(); - QTime endtime = ui.timeEdit_end->time(); - m_timeStruct.time_start = (AMPMType)ui.comboBox_Start->currentIndex(); - m_timeStruct.time_end = (AMPMType)ui.comboBox_end->currentIndex(); - m_timeStruct.m_name = str_name; - m_timeStruct.m_startTime = startime; - m_timeStruct.m_endTime = endtime; -} - -Q_SLOT void QAddTimeDlg::SlotCancle() -{ - QDialog::close(); -} diff --git a/src/tpMain/qaddtimedlg.h b/src/tpMain/qaddtimedlg.h deleted file mode 100644 index 7aedc73..0000000 --- a/src/tpMain/qaddtimedlg.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef QADDTIMEDLG_H -#define QADDTIMEDLG_H - -#include -#include "ui_qaddtimedlg.h" -struct TimeStruct; -class QAddTimeDlg : public QDialog -{ - Q_OBJECT - -public: - QAddTimeDlg(QWidget *parent = 0); - ~QAddTimeDlg(); - Q_SLOT void SlotOK(); - Q_SLOT void SlotCancle(); - void SetInfo(TimeStruct m_timeStruct, int model=0); - void GetInfo(TimeStruct &m_timeStruct); -private: - Ui::QAddTimeDlg ui; -}; - -#endif // QADDTIMEDLG_H diff --git a/src/tpMain/qaddtimedlg.ui b/src/tpMain/qaddtimedlg.ui deleted file mode 100644 index 919c2f3..0000000 --- a/src/tpMain/qaddtimedlg.ui +++ /dev/null @@ -1,256 +0,0 @@ - - - QAddTimeDlg - - - - 0 - 0 - 282 - 202 - - - - 时间参数设置 - - - font: 11pt "Consolas"; - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - - - 0 - 0 - - - - 确认 - - - true - - - false - - - - - - - - 0 - 0 - - - - 取消 - - - - - - - - - 时间参数： - - - - - - - 0 - 30 - - - - background-color: rgb(170, 170, 127); - - - 起始时间 - - - - - - - - 0 - 30 - - - - background-color: rgb(170, 170, 127); -font: 75 12pt "Consolas"; - - - 班次名称： - - - - - - - - 0 - 30 - - - - QAbstractSpinBox::UpDownArrows - - - - - - - - - QDateTimeEdit::HourSection - - - hh:mm - - - Qt::LocalTime - - - - - - - - 0 - 30 - - - - background-color: rgb(170, 170, 127); - - - 结束时间 - - - - - - - - 0 - 30 - - - - - 0 - 0 - 0 - 2000 - 1 - 1 - - - - - - - hh:mm - - - - - - - - 0 - 30 - - - - - 当天 - - - - - 隔天 - - - - - - - - - 0 - 30 - - - - - 当天 - - - - - 隔天 - - - - - - - - - 0 - 30 - - - - - - - - - - - - lineEdit - timeEdit_Start - timeEdit_end - comboBox_Start - comboBox_end - pushButton - pushButton_2 - - - - diff --git a/src/tpMain/qchannelmanager.cpp b/src/tpMain/qchannelmanager.cpp deleted file mode 100644 index ed0a4bc..0000000 --- a/src/tpMain/qchannelmanager.cpp +++ /dev/null @@ -1,139 +0,0 @@ -#include "qchannelmanager.h" -#include "QStandardItemModel" -#include "ChannelInfo.h" -#include "InfoFile.h" -#include "QHeaderView" -#pragma execution_character_set("utf-8") -QChannelManager::QChannelManager(QWidget *parent) - : QDialog(parent), nChannelFlag(0) -{ - ui.setupUi(this); - setWindowFlags(Qt::WindowMaximizeButtonHint | Qt::WindowMinimizeButtonHint | Qt::WindowCloseButtonHint); - channelMgr_tableView = ui.channelMgr_tableView; - lineEdit_name = ui.lineEdit_name; - lineEdit_About = ui.lineEdit_About; - spinBox_value = ui.spinBox_value; - channelMgr_Default = ui.channelMgr_Default; - channelMgr_OKMody = ui.channelMgr_OKMody; - - tablemodel = new QStandardItemModel(); - tablemodel->setHorizontalHeaderItem(0, new QStandardItem(tr("编号"))); - tablemodel->setHorizontalHeaderItem(1, new QStandardItem(tr("通道名"))); - tablemodel->setHorizontalHeaderItem(2, new QStandardItem(tr("备注"))); - tablemodel->setHorizontalHeaderItem(3, new QStandardItem(tr("发送结果"))); - tablemodel->setHorizontalHeaderItem(4, new QStandardItem(tr("是否为默认"))); - - connect(channelMgr_tableView, SIGNAL(clicked(const QModelIndex &)), this, SLOT(SlotcellClicked(const QModelIndex &))); - connect(channelMgr_OKMody, SIGNAL(clicked()), this, SLOT(onOkMody())); - connect(ui.channelMgr_Exit, SIGNAL(clicked()), this, SLOT(close())); - setWindowIcon(QIcon(":/image/leaper")); -} - -QChannelManager::~QChannelManager() -{ - -} - -void QChannelManager::setTableView() -{ - //this->m_MapTime = m_pTimeMgr->getAllTime(); - channelMgr_tableView->setModel(tablemodel); - channelMgr_tableView->setColumnWidth(0, 50); - channelMgr_tableView->setColumnWidth(1, 100); - channelMgr_tableView->setColumnWidth(2, 100); - channelMgr_tableView->setColumnWidth(3, 100); - channelMgr_tableView->setColumnWidth(4, 100); - - channelMgr_tableView->horizontalHeader()->setStretchLastSection(true);//设置最后一列自动填满剩余的空间 - channelMgr_tableView->horizontalHeader()->sectionResizeMode(QHeaderView::ResizeToContents);//设置按内容调整列宽 - channelMgr_tableView->setSelectionBehavior(QAbstractItemView::SelectRows);//设置单行选择 - - //默认显示行头，如果你觉得不美观的话，我们可以将隐藏 - channelMgr_tableView->setEditTriggers(QAbstractItemView::NoEditTriggers); - //tableView->resizeColumnsToContents(); - //如果你用在QTableView中使用右键菜单，需启用该属性 - //tableView->setContextMenuPolicy(Qt::CustomContextMenu); - channelMgr_tableView->setWordWrap(false); - //tableView->setShowGrid(false);//显示表格线 - channelMgr_tableView->setAlternatingRowColors(true);//设置表格交替填充背景色 - updateShow(); -} - -void QChannelManager::setChannelInfo(class CChannelInfo* pChannelInfo /*= NULL*/) -{ - m_pChannelInfo = pChannelInfo; -} - -Q_SLOT void QChannelManager::SlotcellClicked(const QModelIndex & index) -{ - if (m_pChannelInfo) - { - QModelIndex nindex = tablemodel->index(index.row(), 0); - int nIndex = nindex.data().toInt(); - nChannelFlag = nIndex; - QMap pChannelInfo = m_pChannelInfo->getChannelModelMap(); - ChannelInfo *p = pChannelInfo.value(nIndex); - if (lineEdit_name) - lineEdit_name->setText(p->m_ChannelName); - if (lineEdit_About) - lineEdit_About->setText(p->m_AboutName); - if (spinBox_value) - spinBox_value->setValue(p->m_value); - if (channelMgr_Default) - { - int nchannel = m_pChannelInfo->getDefaultChannel(); - channelMgr_Default->setChecked((nchannel == nIndex || (nchannel==0&&nIndex==1))); - } - } -} - -Q_SLOT void QChannelManager::onOkMody() -{ - if (nChannelFlag == 0) - return; - else - { - if (m_pChannelInfo) - { - ChannelInfo *p = m_pChannelInfo->getChannelModelMap().value(nChannelFlag); - if (lineEdit_name) - p->m_ChannelName = lineEdit_name->text(); - if (lineEdit_About) - p->m_AboutName = lineEdit_About->text(); - if (spinBox_value) - p->m_value = spinBox_value->value(); - if (channelMgr_Default) - { - Qt::CheckState state = channelMgr_Default->checkState(); - if (state == Qt::Checked) - m_pChannelInfo->setDefaultChannel(nChannelFlag); - } - m_pChannelInfo->saveChannels(); - updateShow(); - } - } -} - -void QChannelManager::updateShow() -{ - int nIndex = 0; - if (m_pChannelInfo) - { - QMap pChannelInfo = m_pChannelInfo->getChannelModelMap(); - int defaultChannel = m_pChannelInfo->getDefaultChannel(); - for (QMap::iterator its = pChannelInfo.begin(); its != pChannelInfo.end(); ++its) - { - ChannelInfo *p = *its; - int nchannel = its.key(); - tablemodel->setItem(nIndex, 0, new QStandardItem(QString::number(nchannel))); - tablemodel->setItem(nIndex, 1, new QStandardItem(p->m_ChannelName)); - tablemodel->setItem(nIndex, 2, new QStandardItem(p->m_AboutName)); - tablemodel->setItem(nIndex, 3, new QStandardItem(QString::number(p->m_value))); - if (defaultChannel == nchannel || (defaultChannel == 0 && nchannel == 1))//获取默认通道标志 - tablemodel->setItem(nIndex, 4, new QStandardItem(tr("默认"))); - else - tablemodel->setItem(nIndex, 4, new QStandardItem(QString(""))); - nIndex++; - } - } -} \ No newline at end of file diff --git a/src/tpMain/qchannelmanager.h b/src/tpMain/qchannelmanager.h deleted file mode 100644 index fbefa9e..0000000 --- a/src/tpMain/qchannelmanager.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef QCHANNELMANAGER_H -#define QCHANNELMANAGER_H - -#include -#include "ui_qchannelmanager.h" - -class QChannelManager : public QDialog -{ - Q_OBJECT - -public: - QChannelManager(QWidget *parent = 0); - ~QChannelManager(); - void setTableView(); - void setChannelInfo(class CChannelInfo* pChannelInfo = NULL); - Q_SLOT void SlotcellClicked(const QModelIndex & index); - Q_SLOT void onOkMody(); - void updateShow(); -private: - Ui::QChannelManager ui; - class QTableView *channelMgr_tableView; - class QStandardItemModel *tablemodel; - class CChannelInfo *m_pChannelInfo; - - class QLineEdit *lineEdit_name; - class QLineEdit *lineEdit_About; - class QSpinBox *spinBox_value; - class QCheckBox *channelMgr_Default; - class QPushButton *channelMgr_OKMody; - - int nChannelFlag; -}; - -#endif // QCHANNELMANAGER_H diff --git a/src/tpMain/qchannelmanager.ui b/src/tpMain/qchannelmanager.ui deleted file mode 100644 index 174072f..0000000 --- a/src/tpMain/qchannelmanager.ui +++ /dev/null @@ -1,163 +0,0 @@ - - - QChannelManager - - - - 0 - 0 - 575 - 375 - - - - 通道信息管理 - - - font: 11pt "Consolas"; - - - - 3 - - - 3 - - - 3 - - - 3 - - - - - 所有通道数据 - - - - 3 - - - 3 - - - 3 - - - 3 - - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - 发送结果： - - - - - - - 通道名称： - - - Qt::AlignCenter - - - - - - - 65536 - - - - - - - - - - 备注： - - - - - - - - - - 是否设为默认（NG流向的通道） - - - - - - - - 0 - 0 - - - - - 100 - 0 - - - - 确认修改 - - - true - - - - - - - - 0 - 0 - - - - - 100 - 0 - - - - 退出 - - - - - - - - - - - diff --git a/src/tpMain/qdia2thsetting.cpp b/src/tpMain/qdia2thsetting.cpp deleted file mode 100644 index dff00c8..0000000 --- a/src/tpMain/qdia2thsetting.cpp +++ /dev/null @@ -1,35 +0,0 @@ -#include "qdia2thsetting.h" -#include "QMessageBox" -#pragma execution_character_set("utf-8") -QDia2ThSetting::QDia2ThSetting(QWidget *parent) - : QDialog(parent) -{ - ui.setupUi(this); - setWindowIcon(QIcon(":/image/leaper")); - connect(ui.pushButton_Close, SIGNAL(clicked()), this, SLOT(close())); - connect(ui.pushButton_OK, SIGNAL(clicked()), this, SLOT(onChangeValue())); -} - -QDia2ThSetting::~QDia2ThSetting() -{ - -} - -void QDia2ThSetting::SetValue(float *m_B, float *m_K) -{ - ui.doubleSpinBox_B->setValue(*m_B); - ui.doubleSpinBox_K->setValue(*m_K); - m_nB = m_B; - m_nK = m_K; -} - -Q_SLOT void QDia2ThSetting::onChangeValue() -{ - *m_nB = ui.doubleSpinBox_B->value(); - *m_nK = ui.doubleSpinBox_K->value(); - QMessageBox infobox(QMessageBox::Information, tr("提示"), tr("修改完成，参数已生效！"), QMessageBox::Yes, NULL); - infobox.setWindowIcon(QIcon(":/image/leaper")); - infobox.setButtonText(QMessageBox::Yes, tr("确定")); - infobox.exec(); - emit sgSavePara(); -} diff --git a/src/tpMain/qdia2thsetting.h b/src/tpMain/qdia2thsetting.h deleted file mode 100644 index a3db031..0000000 --- a/src/tpMain/qdia2thsetting.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef QDIA2THSETTING_H -#define QDIA2THSETTING_H - -#include -#include "ui_qdia2thsetting.h" - -class QDia2ThSetting : public QDialog -{ - Q_OBJECT - -public: - QDia2ThSetting(QWidget *parent = 0); - ~QDia2ThSetting(); - void SetValue(float *m_B, float *m_K); - Q_SLOT void onChangeValue(); -signals: - void sgSavePara(); -private: - Ui::QDia2ThSetting ui; - - float *m_nB; - float *m_nK; -}; - -#endif // QDIA2THSETTING_H diff --git a/src/tpMain/qdia2thsetting.ui b/src/tpMain/qdia2thsetting.ui deleted file mode 100644 index 40341a9..0000000 --- a/src/tpMain/qdia2thsetting.ui +++ /dev/null @@ -1,130 +0,0 @@ - - - QDia2ThSetting - - - - 0 - 0 - 324 - 160 - - - - 直径标定 - - - font: 12pt "Consolas"; - - - - - - K:表示斜率，B：基准点，直径=高度*K+B - - - - - - - - - - 0 - 0 - - - - 确认修改 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - 退出 - - - - - - - - - - 0 - 0 - - - - 10 - - - -100.000000000000000 - - - 0.001000000000000 - - - - - - - B： - - - - - - - K: - - - - - - - - 0 - 0 - - - - 10 - - - -100.000000000000000 - - - 99.998999999999995 - - - 0.001000000000000 - - - - - - - - - diff --git a/src/tpMain/qipconfigdlg.cpp b/src/tpMain/qipconfigdlg.cpp deleted file mode 100644 index c706338..0000000 --- a/src/tpMain/qipconfigdlg.cpp +++ /dev/null @@ -1,73 +0,0 @@ -#include "qipconfigdlg.h" -#include "InfoFile.h" - -QIPConfigDlg::QIPConfigDlg(QWidget *parent) - : QDialog(parent) -{ - ui.setupUi(this); - setWindowIcon(QIcon(":/image/leaper")); -// setWindowFlags(Qt::WindowFullscreenButtonHint); -// setWindowFlags(Qt::WindowMinimizeButtonHint); -// setWindowFlags(Qt::WindowTitleHint); - setWindowFlags(Qt::WindowCloseButtonHint); - //setWindowFlags(Qt::Tool); - QRegExp regExpIP("((25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])[\\.]){3}(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])"); - QRegExp regExpNetPort("((6553[0-5])|[655[0-2][0-9]|65[0-4][0-9]{2}|6[0-4][0-9]{3}|[1-5][0-9]{4}|[1-9][0-9]{3}|[1-9][0-9]{2}|[1-9][0-9]|[0-9])"); - QRegExp regExpChannel("[0-5]"); - ui.lineEdit_ServerIP->setValidator(new QRegExpValidator(regExpIP, this)); - ui.lineEdit_ServerPort->setValidator(new QRegExpValidator(regExpNetPort, this)); - ui.lineEdit_ClientIP->setValidator(new QRegExpValidator(regExpIP, this)); - ui.lineEdit_ClientPort->setValidator(new QRegExpValidator(regExpNetPort, this)); - connect(ui.pushButton_Close, SIGNAL(clicked()), this, SLOT(SlotCloseServer())); - connect(ui.pushButton_open, SIGNAL(clicked()), this, SLOT(SlotOpenServer())); - connect(ui.pushButton_OK, SIGNAL(clicked()), this, SLOT(SlotOK())); - ui.lineEdit_ServerIP->setDisabled(true); - ui.lineEdit_ServerPort->setDisabled(true); - ui.pushButton_open->setDisabled(true); -} - -QIPConfigDlg::~QIPConfigDlg() -{ - -} - -void QIPConfigDlg::SetIPData(const IPConfig *m_IPdata) -{ - ui.lineEdit_ServerIP->setText(m_IPdata->m_TcpAddress); - ui.lineEdit_ServerPort->setText(QString::number(m_IPdata->m_TcpPort)); - ui.lineEdit_ClientIP->setText(m_IPdata->m_ClientAddress); - ui.lineEdit_ClientPort->setText(QString::number(m_IPdata->m_ClientPort)); -} - -void QIPConfigDlg::GetIPData(IPConfig *m_IPdata) -{ - m_IPdata->m_TcpAddress = ui.lineEdit_ServerIP->text(); - m_IPdata->m_TcpPort = ui.lineEdit_ServerPort->text().toInt(); - m_IPdata->m_ClientAddress = ui.lineEdit_ClientIP->text(); - m_IPdata->m_ClientPort = ui.lineEdit_ClientPort->text().toInt(); -} - -Q_SLOT void QIPConfigDlg::SlotCloseServer() -{ - emit(SignalCloseServer()); - ui.pushButton_Close->setDisabled(true); - ui.pushButton_open->setDisabled(false); - ui.lineEdit_ServerIP->setDisabled(false); - ui.lineEdit_ServerPort->setDisabled(false); -} - -Q_SLOT void QIPConfigDlg::SlotOpenServer() -{ - QString m_TcpAddress = ui.lineEdit_ServerIP->text(); - int m_TcpPort = ui.lineEdit_ServerPort->text().toInt(); - emit(SignalOpenServer(m_TcpAddress, m_TcpPort)); - ui.pushButton_Close->setDisabled(false); - ui.pushButton_open->setDisabled(true); - ui.lineEdit_ServerIP->setDisabled(true); - ui.lineEdit_ServerPort->setDisabled(true); -} - -Q_SLOT void QIPConfigDlg::SlotOK() -{ - QDialog::accept(); -} diff --git a/src/tpMain/qipconfigdlg.h b/src/tpMain/qipconfigdlg.h deleted file mode 100644 index 7b381eb..0000000 --- a/src/tpMain/qipconfigdlg.h +++ /dev/null @@ -1,40 +0,0 @@ -#ifndef QIPCONFIGDLG_H -#define QIPCONFIGDLG_H - -#include -#include "ui_qipconfigdlg.h" -#include -struct IPConfig -{ - QString m_TcpAddress; - int m_TcpPort; - QString m_ClientAddress; - int m_ClientPort; - IPConfig(){ - m_TcpAddress = "192.168.0.110"; - m_ClientAddress = "192.168.0.119"; - m_TcpPort = 2000; - m_ClientPort = 2000; - }; -}; - -class QIPConfigDlg : public QDialog -{ - Q_OBJECT - -public: - QIPConfigDlg(QWidget *parent = 0); - ~QIPConfigDlg(); - void SetIPData(const IPConfig * m_IPdata); - void GetIPData(IPConfig * m_IPdata); - Q_SLOT void SlotCloseServer(); - Q_SLOT void SlotOpenServer(); - Q_SLOT void SlotOK(); -private: - Ui::QIPConfigDlg ui; -signals: - void SignalCloseServer(); - void SignalOpenServer(QString IPaddr, int port); -}; - -#endif // QIPCONFIGDLG_H diff --git a/src/tpMain/qipconfigdlg.ui b/src/tpMain/qipconfigdlg.ui deleted file mode 100644 index 1057af9..0000000 --- a/src/tpMain/qipconfigdlg.ui +++ /dev/null @@ -1,189 +0,0 @@ - - - QIPConfigDlg - - - Qt::ApplicationModal - - - - 0 - 0 - 400 - 255 - - - - QIPConfigDlg - - - font: 11pt "Consolas"; - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - 本机服务器IP地址设置 - - - - - - IP 地址(I)： - - - - - - - Qt::AlignCenter - - - - - - - 关闭服务 - - - - - - - 开放端口： - - - - - - - Qt::AlignCenter - - - - - - - 打开服务 - - - - - - - - - - 目标客户端IP地址设置 - - - - - - 源端口： - - - - - - - - 0 - 0 - - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - Qt::AlignCenter - - - - - - - IP 地址(I)： - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - 0 - 0 - - - - - 0 - 30 - - - - 确定 - - - true - - - - - - - - - diff --git a/src/tpMain/qnettickthread.cpp b/src/tpMain/qnettickthread.cpp deleted file mode 100644 index e7363e2..0000000 --- a/src/tpMain/qnettickthread.cpp +++ /dev/null @@ -1,12 +0,0 @@ -#include "qnettickthread.h" - -QNetTickThread::QNetTickThread(QObject *parent) - : QObject(parent) -{ - pNet = NULL; -} - -QNetTickThread::~QNetTickThread() -{ - -} diff --git a/src/tpMain/qnettickthread.h b/src/tpMain/qnettickthread.h deleted file mode 100644 index 0a44631..0000000 --- a/src/tpMain/qnettickthread.h +++ /dev/null @@ -1,26 +0,0 @@ -#ifndef QNETTICKTHREAD_H -#define QNETTICKTHREAD_H - -#include -#include "WheelNet.h" - -class QNetTickThread : public QObject -{ - Q_OBJECT - -public: - QNetTickThread(QObject *parent = 0); - ~QNetTickThread(); - void setNetPtr(CWheelNet* ptr){ pNet = ptr; }; -public slots: - void doWork(int nType, QVariantMap m_map) { - emit resultReady(nType, m_map); - } -private: - CWheelNet *pNet; -signals : - - void resultReady(int, QVariantMap); -}; - -#endif // QNETTICKTHREAD_H diff --git a/src/tpMain/qsaveresult.cpp b/src/tpMain/qsaveresult.cpp index e5330fc..3b1bb2c 100644 --- a/src/tpMain/qsaveresult.cpp +++ b/src/tpMain/qsaveresult.cpp @@ -5,7 +5,7 @@ #include "QByteArray" #include "QFile" #include "QDateTime" -#include "ChannelInfo.h" +//#include "ChannelInfo.h" #include "DetectDataDB.h" #pragma execution_character_set("utf-8") QSaveResult::QSaveResult(QObject *parent) @@ -28,7 +28,7 @@ void QSaveResult::doWork(Result2Ui *pResult) map.insert("diameter", pResult->m_dDiameter);//直径 map.insert("hight", pResult->m_dThickness);//高度 map.insert("correlate", pResult->m_dScore);//相似度 - map.insert("channel", m_pChannel->getChannelInfoKey(m_strPath)); +// map.insert("channel", m_pChannel->getChannelInfoKey(m_strPath)); map.insert("detecttime", pResult->m_dRunTime); map.insert("time", QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss")); if (pResult->m_pixResult.isNull()) diff --git a/src/tpMain/qworkmgrui.cpp b/src/tpMain/qworkmgrui.cpp index f3aac60..da5d31f 100644 --- a/src/tpMain/qworkmgrui.cpp +++ b/src/tpMain/qworkmgrui.cpp @@ -13,7 +13,7 @@ #include "IWheelModel.h" #include "qpulpewidget.h" #include "WheelCtrl.h" -#include "WheelNet.h" +//#include "WheelNet.h" #include #include "qworkItemdlg.h" #include @@ -416,9 +416,9 @@ Q_SLOT void QWorkMgrUI::onClickButton() // } // } else if (strObj == "work_SendModelLib_pb"){ - WheelCtrl* m_pWheelCtrl = (WheelCtrl*)m_pCtrl; - m_pWheelCtrl->getNet()->sendClearLib(); - emit(sgShowMsg(tr("发送模板库"))); +// WheelCtrl* m_pWheelCtrl = (WheelCtrl*)m_pCtrl; +// m_pWheelCtrl->getNet()->sendClearLib(); +// emit(sgShowMsg(tr("发送模板库"))); } else if ("workmgr_Mod" == strObj){//修改工作单 QModelIndex mIndex = ptableview->currentIndex(); diff --git a/src/tpMain/timemgrctrl.cpp b/src/tpMain/timemgrctrl.cpp deleted file mode 100644 index f701e5f..0000000 --- a/src/tpMain/timemgrctrl.cpp +++ /dev/null @@ -1,76 +0,0 @@ -#include "timemgrctrl.h" -#include "DetectDataDB.h" - -#pragma execution_character_set("utf-8") - - -TimeMgrCtrl::TimeMgrCtrl(DetectDataDB *m_pDb) -{ - m_DB = m_pDb; - if (m_DB->ReadOutTimeData(m_MapTime)) - return; -} - -TimeMgrCtrl::~TimeMgrCtrl() -{ - -} - -void TimeMgrCtrl::AddNewTime(TimeStruct &m_time) -{ - m_DB->AddOneTime(m_time); - m_MapTime.insert(m_time.m_name, m_time); -} - -void TimeMgrCtrl::DelOldTime(TimeStruct &m_time) -{ - m_DB->DelOneTime(m_time); - m_MapTime.remove(m_time.m_name); -} - -QMap TimeMgrCtrl::getAllTime() -{ - return m_MapTime; -} - -QMap* TimeMgrCtrl::getAllTimePtr() -{ - return &m_MapTime; -} - -void TimeMgrCtrl::ModTime(TimeStruct &m_old, TimeStruct &m_new) -{ - m_DB->DelOneTime(m_old); - m_MapTime.remove(m_old.m_name); - m_DB->AddOneTime(m_new); - m_MapTime.insert(m_new.m_name, m_new); -} - -QString TimeMgrCtrl::GetCurrentBan() -{ - QTime nCurrentTime = QDateTime::currentDateTime().time(); - const QTime starttime = QTime(0, 0, 0); - const QTime endtime = QTime(23, 59, 59); - for (QMap::iterator its = m_MapTime.begin(); its != m_MapTime.end(); ++its) - { - if (its->m_startTime >= its->m_endTime) - { - if (nCurrentTime >= (*its).m_startTime&&nCurrentTime <= endtime) - { - return its.key(); - break; - } - else if (nCurrentTime >= starttime&&nCurrentTime <= its->m_endTime) - { - return its.key(); - break; - } - } - if (nCurrentTime >= its->m_startTime&&nCurrentTime <= its->m_endTime) - { - return its.key(); - break; - } - } - return QString(); -} diff --git a/src/tpMain/timemgrctrl.h b/src/tpMain/timemgrctrl.h deleted file mode 100644 index 37c85a3..0000000 --- a/src/tpMain/timemgrctrl.h +++ /dev/null @@ -1,32 +0,0 @@ -/*! - *FileName: timemgrctrl.h - *Author: Pan Yingdong - *Email: bob.pan@hzleaper.com - *Created:2021/2/10 16:00 - *Note: -*/ -#ifndef TIMEMGRCTRL_H -#define TIMEMGRCTRL_H - -#include -#include -#include "InfoFile.h" -class QSqliteApplication; -class DetectDataDB; -class TimeMgrCtrl -{ -public: - TimeMgrCtrl(DetectDataDB *p); - ~TimeMgrCtrl(); - QMap getAllTime(); - void AddNewTime(TimeStruct &m_time); - void DelOldTime(TimeStruct &m_time); - void ModTime(TimeStruct &m_old, TimeStruct &m_new); - QString GetCurrentBan(); - QMap* getAllTimePtr(); -private: - DetectDataDB* m_DB{ nullptr }; - QMap m_MapTime; -}; - -#endif // TIMEMGRCTRL_H diff --git a/tpvs17/tpMain/QCamSettingDlg.ui b/tpvs17/tpMain/QCamSettingDlg.ui index 5569d50..7e1101a 100644 --- a/tpvs17/tpMain/QCamSettingDlg.ui +++ b/tpvs17/tpMain/QCamSettingDlg.ui @@ -23,7 +23,7 @@ - background-color: rgb(130, 136, 255); + diff --git a/tpvs17/tpMain/QChannelMgrDlg.cpp b/tpvs17/tpMain/QChannelMgrDlg.cpp deleted file mode 100644 index 1dd1cf2..0000000 --- a/tpvs17/tpMain/QChannelMgrDlg.cpp +++ /dev/null @@ -1,13 +0,0 @@ -#include "QChannelMgrDlg.h" -#pragma execution_character_set("utf-8") -/*通道管理*/ -QChannelMgrDlg::QChannelMgrDlg(QWidget *parent) - : QWidget(parent) -{ - ui.setupUi(this); - setWindowIcon(QIcon(":/image/leaper")); -} - -QChannelMgrDlg::~QChannelMgrDlg() -{ -} diff --git a/tpvs17/tpMain/QChannelMgrDlg.h b/tpvs17/tpMain/QChannelMgrDlg.h deleted file mode 100644 index 2647a04..0000000 --- a/tpvs17/tpMain/QChannelMgrDlg.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef _H_QCHANNELMGRDLG_H_ -#define _H_QCHANNELMGRDLG_H_ - -#include -#include "ui_QChannelMgrDlg.h" - -class QChannelMgrDlg : public QWidget -{ - Q_OBJECT - -public: - QChannelMgrDlg(QWidget *parent = Q_NULLPTR); - ~QChannelMgrDlg(); - -private: - Ui::QChannelMgrDlg ui; -}; - -#endif diff --git a/tpvs17/tpMain/QChannelMgrDlg.ui b/tpvs17/tpMain/QChannelMgrDlg.ui deleted file mode 100644 index a9efec4..0000000 --- a/tpvs17/tpMain/QChannelMgrDlg.ui +++ /dev/null @@ -1,352 +0,0 @@ - - - QChannelMgrDlg - - - - 0 - 0 - 1017 - 658 - - - - QChannelMgrDlg - - - - - - - 0 - 0 - - - - font: 12pt "Consolas"; - - - 所有型号及图像 - - - - 0 - - - 0 - - - 0 - - - 3 - - - 5 - - - - - - 0 - 0 - - - - - Consolas - 12 - 50 - false - false - - - - font: 12pt "Consolas"; - - - - - - - - - - - 120 - 120 - - - - - - - - - - - - 0 - 0 - - - - font: 12pt "Consolas"; - - - 型号： - - - - - - - - 0 - 0 - - - - font: 11pt "Consolas"; - - - 通道： - - - - - - - - - - 0 - 0 - - - - 查找： - - - - - - - - 0 - 0 - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - 隐藏 - - - - - - - - - - Consolas - 14 - 50 - false - false - - - - font: 14pt "Consolas"; - - - - - - - - 0 - 0 - - - - - 0 - 40 - - - - 修改 - - - - - - - - 0 - 0 - - - - font: 12pt "Consolas"; - - - 0 - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - font: 12pt "Consolas"; - - - 通道分配： - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 0 - 0 - - - - 删除通道 - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - 0 - 0 - - - - 增加通道 - - - - - - - Qt::ScrollBarAsNeeded - - - Qt::ScrollBarAsNeeded - - - QAbstractScrollArea::AdjustIgnored - - - true - - - - - 0 - 0 - 920 - 239 - - - - - - - - - 刷新 - - - - - - - 通道管理 - - - - - - - 隐藏 - - - - - - - - - - - - diff --git a/tpvs17/tpMain/QTimeMgrDlg.cpp b/tpvs17/tpMain/QTimeMgrDlg.cpp deleted file mode 100644 index ffaf42b..0000000 --- a/tpvs17/tpMain/QTimeMgrDlg.cpp +++ /dev/null @@ -1,209 +0,0 @@ -#include "QTimeMgrDlg.h" -#include -#include "timemgrctrl.h" -#include "qaddtimedlg.h" -#include -#pragma execution_character_set("utf-8") - -struct CmpByValueTime { - bool operator()(const TimeStruct & lhs, const TimeStruct & rhs) - { - return lhs.m_startTime < rhs.m_startTime; - } -}; - -QTimeMgrDlg::QTimeMgrDlg(QWidget *parent) - : QDialog(parent) -{ - ui.setupUi(this); - setWindowIcon(QIcon(":/image/leaper")); - tablemodel = new QStandardItemModel(); - QStringList stringList; - stringList << tr("班次") << tr("起始时间") << tr("结束时间"); - tablemodel->setHorizontalHeaderLabels(stringList); - connect(ui.TimeMgr_tableView, SIGNAL(clicked(const QModelIndex &)), this, SLOT(SlotcellClicked(const QModelIndex &))); - connect(ui.TimeMgr_ADD_Button, SIGNAL(clicked()), this, SLOT(onButtonClicked())); - connect(ui.TimeMgr_Del_Button, SIGNAL(clicked()), this, SLOT(onButtonClicked())); - connect(ui.TimeMgr_Mod_Button, SIGNAL(clicked()), this, SLOT(onButtonClicked())); -} - -QTimeMgrDlg::~QTimeMgrDlg() -{ - if (tablemodel) { - while (tablemodel->rowCount()) - { - QList lptr = tablemodel->takeRow(0); - for (int n = 0; n < lptr.size(); n++) - { - delete lptr.at(n); - } - } - tablemodel->clear(); - delete tablemodel; - tablemodel = NULL; - } -} - -Q_SLOT void QTimeMgrDlg::onButtonClicked() -{ - QObject *obj = sender(); - QString str_name = obj->objectName(); - if (str_name == "TimeMgr_ADD_Button") { - QAddTimeDlg dlg(this); - dlg.setWindowTitle(tr("设置参数")); - dlg.setWindowIcon(QIcon(":/image/leaper")); - dlg.setFocus(); - dlg.setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint); - dlg.setWindowModality(Qt::ApplicationModal); - dlg.setAttribute(Qt::WA_ShowModal, true); - if (dlg.exec() == QDialog::Accepted) - { - TimeStruct m_Timestruct; - dlg.GetInfo(m_Timestruct); - if (m_MapTime.contains(m_Timestruct.m_name)) - { - return; - } - int nIndex = tablemodel->rowCount(); - tablemodel->setItem(nIndex, 0, new QStandardItem(m_Timestruct.m_name)); - QString strStart = QString("%1 %2").arg(m_Timestruct.time_start == AM ? tr("当天") : tr("隔天")).arg(m_Timestruct.m_startTime.toString("hh:mm")); - QString strEnd = QString("%1 %2").arg(m_Timestruct.time_end == AM ? tr("当天") : tr("隔天")).arg(m_Timestruct.m_endTime.toString("hh:mm")); - tablemodel->setItem(nIndex, 1, new QStandardItem(strStart)); - tablemodel->setItem(nIndex, 2, new QStandardItem(strEnd)); - m_Timestruct.m_Index = nIndex; - m_MapTime.insert(m_Timestruct.m_name, m_Timestruct); - TimeMgrCtrl *m_pTimeMgr = m_pCtrl->getTimeMgr(); - m_pTimeMgr->AddNewTime(m_Timestruct); - ui.TimeMgr_label->setText(""); - } - } - else if (str_name == "TimeMgr_Del_Button") { - QString str_name = ui.TimeMgr_label->text(); - if (str_name.isEmpty() || str_name == tr("未选中")) - { - //QMessageBox::information(NULL, QString("提示"), QString("未选择班次，请选择进行修改。"), QMessageBox::Ok); - QMessageBox infobox(QMessageBox::Information, tr("提示"), tr("未选择班次，请选择进行修改。"), QMessageBox::Yes, this); - infobox.setWindowIcon(QIcon(":/image/leaper")); - infobox.setButtonText(QMessageBox::Yes, tr("确认")); - infobox.exec(); - return; - } - - QString str = tr("您确定要删除 %1 班次？").arg(str_name); - - if (str_name.isEmpty()) - return; - QMessageBox infobox(QMessageBox::Information, tr("提示"), str, QMessageBox::Ok | QMessageBox::Cancel, this); - infobox.setWindowIcon(QIcon(":/image/leaper")); - infobox.setButtonText(QMessageBox::Ok, tr("确认")); - infobox.setButtonText(QMessageBox::Cancel, tr("取消")); - if (infobox.exec() == QMessageBox::Ok) - { - if (str_name.isEmpty()) - return; - QModelIndex nIndex = ui.TimeMgr_tableView->currentIndex(); - int row = nIndex.row(); - if (tablemodel->removeRow(nIndex.row())) - int a = 0; - else - int b = 0; - TimeStruct m_TimeStruct; - m_TimeStruct.m_name = str_name; - m_MapTime.remove(str_name); - TimeMgrCtrl *m_pTimeMgr = m_pCtrl->getTimeMgr(); - m_pTimeMgr->DelOldTime(m_TimeStruct); - ui.TimeMgr_label->setText(""); - } - } - else if (str_name == "TimeMgr_Mod_Button") { - QString str_name = ui.TimeMgr_label->text(); - if (str_name.isEmpty() || str_name == tr("未选中")) - { - - QMessageBox infobox(QMessageBox::Information, tr("提示"), tr("未选择班次，请选择进行修改。"), QMessageBox::Yes, this); - infobox.setWindowIcon(QIcon(":/image/leaper")); - infobox.setButtonText(QMessageBox::Yes, tr("确认")); - infobox.exec(); - - return; - } - QAddTimeDlg dlg; - dlg.SetInfo(m_MapTime.value(str_name)); - if (dlg.exec() == QDialog::Accepted) - { - TimeStruct m_tempTime, m_newTime; - m_tempTime.m_name = str_name; - m_MapTime.remove(str_name); - dlg.GetInfo(m_newTime); - TimeMgrCtrl *m_pTimeMgr = m_pCtrl->getTimeMgr(); - m_pTimeMgr->ModTime(m_tempTime, m_newTime); - m_MapTime.insert(m_newTime.m_name, m_newTime); - int nIndex = 0; - - std::vector vec(m_MapTime.begin(), m_MapTime.end()); - std::sort(vec.begin(), vec.end(), CmpByValueTime()); - for (int n = 0; n < vec.size(); n++) - { - TimeStruct tiItem = vec.at(n); - tablemodel->setItem(nIndex, 0, new QStandardItem(tiItem.m_name)); - QString strStart = QString("%1 %2").arg(tiItem.time_start == AM ? tr("当天") : tr("隔天")).arg(tiItem.m_startTime.toString("hh:mm")); - QString strEnd = QString("%1 %2").arg(tiItem.time_end == AM ? tr("当天") : tr("隔天")).arg(tiItem.m_endTime.toString("hh:mm")); - tablemodel->setItem(nIndex, 1, new QStandardItem(strStart)); - tablemodel->setItem(nIndex, 2, new QStandardItem(strEnd)); - nIndex++; - } - - ui.TimeMgr_label->setText(""); - } - } - else if (str_name == "TimeMgr_OK_Button") { - //QDialog::accept(); - } -} - -Q_SLOT void QTimeMgrDlg::onSlotCellClicked(const QModelIndex& index) -{ - if (m_MapTime.size() > 0) - { - QModelIndex nindex = tablemodel->index(index.row(), 0); - QString str = nindex.data().toString(); - ui.TimeMgr_label->setText(str); - } -} - -void QTimeMgrDlg::showEvent(QShowEvent *) -{ - TimeMgrCtrl *m_pTimeMgr = m_pCtrl->getTimeMgr(); - this->m_MapTime = m_pTimeMgr->getAllTime(); - ui.TimeMgr_tableView->setModel(tablemodel); - ui.TimeMgr_tableView->setColumnWidth(0, 100); - ui.TimeMgr_tableView->setColumnWidth(1, 100); - ui.TimeMgr_tableView->setColumnWidth(2, 100); - //默认显示行头，如果你觉得不美观的话，我们可以将隐藏 - //m_tableView->verticalHeader()->hide(); - ui.TimeMgr_tableView->setSelectionBehavior(QAbstractItemView::SelectRows); - ui.TimeMgr_tableView->setEditTriggers(QAbstractItemView::NoEditTriggers); - //tableView->resizeColumnsToContents(); - //如果你用在QTableView中使用右键菜单，需启用该属性 - //tableView->setContextMenuPolicy(Qt::CustomContextMenu); - ui.TimeMgr_tableView->setWordWrap(false); - //tableView->setShowGrid(false);//显示表格线 - ui.TimeMgr_tableView->setAlternatingRowColors(true); - int nIndex = 0; - if (m_MapTime.size() <= 0) - return; - - std::vector vec(m_MapTime.begin(), m_MapTime.end()); - std::sort(vec.begin(), vec.end(), CmpByValueTime()); - for (int n = 0; n < vec.size(); n++) - { - TimeStruct tiItem = vec.at(n); - tablemodel->setItem(nIndex, 0, new QStandardItem(tiItem.m_name)); - QString strStart = QString("%1 %2").arg(tiItem.time_start == AM ? tr("当天") : tr("隔天")).arg(tiItem.m_startTime.toString("hh:mm")); - QString strEnd = QString("%1 %2").arg(tiItem.time_end == AM ? tr("当天") : tr("隔天")).arg(tiItem.m_endTime.toString("hh:mm")); - tablemodel->setItem(nIndex, 1, new QStandardItem(strStart)); - tablemodel->setItem(nIndex, 2, new QStandardItem(strEnd)); - nIndex++; - } - -} diff --git a/tpvs17/tpMain/QTimeMgrDlg.h b/tpvs17/tpMain/QTimeMgrDlg.h deleted file mode 100644 index 2f3c934..0000000 --- a/tpvs17/tpMain/QTimeMgrDlg.h +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef _H_QTIMEMGRDLG_H_ -#define _H_QTIMEMGRDLG_H_ - -#include -#include "ui_QTimeMgrDlg.h" -#include "InfoFile.h" -#include "IWheelCtrl.h" -class TimeMgrCtrl; -/*班次管理窗口页面*/ -class QTimeMgrDlg : public QDialog -{ - Q_OBJECT - -public: - QTimeMgrDlg(QWidget *parent = Q_NULLPTR); - ~QTimeMgrDlg(); - void onSetCtrlPtr(IWheelCtrl *p) { m_pCtrl = p; }; - Q_SLOT void onButtonClicked(); - Q_SLOT void onSlotCellClicked(const QModelIndex&index); -protected: - virtual void showEvent(QShowEvent *); -private: - Ui::QTimeMgrDlg ui; - QMap m_MapTime; - class QStandardItemModel *tablemodel; - IWheelCtrl *m_pCtrl{ nullptr }; -}; - -#endif diff --git a/tpvs17/tpMain/QTimeMgrDlg.ui b/tpvs17/tpMain/QTimeMgrDlg.ui deleted file mode 100644 index 5614bfb..0000000 --- a/tpvs17/tpMain/QTimeMgrDlg.ui +++ /dev/null @@ -1,91 +0,0 @@ - - - QTimeMgrDlg - - - - 0 - 0 - 503 - 271 - - - - 班次管理 - - - - - - - - - - 11 - - - - 未选中 - - - - - - - - 0 - 0 - - - - - 11 - - - - 添加时间 - - - - - - - - 0 - 0 - - - - - 11 - - - - 删除时间 - - - - - - - - 0 - 0 - - - - - 11 - - - - 修改时间 - - - - - - - - - diff --git a/tpvs17/tpMain/lpMainWin.cpp b/tpvs17/tpMain/lpMainWin.cpp index 46cd49b..8c752e1 100644 --- a/tpvs17/tpMain/lpMainWin.cpp +++ b/tpvs17/tpMain/lpMainWin.cpp @@ -9,9 +9,9 @@ #include "qworkmgrui.h" #include "IWheelModel.h" #include -#include "qnettickthread.h" +//#include "qnettickthread.h" #include "QMessageBox" -#include "ChannelInfo.h" +//#include "ChannelInfo.h" #include "HubBase.h" #include #include @@ -129,10 +129,10 @@ lpMainWin::lpMainWin(QWidget *parent) ui.action_userManager->setVisible(false); QMenu *pToolMenu = new QMenu(this); - pToolMenu->addAction(ui.action_ImageCali); - pToolMenu->addAction(ui.action_cali_raster); - pToolMenu->addAction(ui.action_setting_ban); - pToolMenu->addAction(ui.action_setting_ip); + pToolMenu->addAction(ui.action_ImageCali);//图像标定 + //pToolMenu->addAction(ui.action_cali_raster); + //pToolMenu->addAction(ui.action_setting_ban); + //pToolMenu->addAction(ui.action_setting_ip); pToolMenu->addAction(ui.action_debug); pToolMenu->addAction(ui.actionSystemSeting); pToolMenu->addAction(ui.actioncamSetting); @@ -201,14 +201,7 @@ lpMainWin::lpMainWin(QWidget *parent) m_pDebugDlg = new QDebugDlg();//调试界面 connect(m_pDebugDlg, SIGNAL(sgTriggerCam()), this, SLOT(onTriggerCam())); m_pDebugDlg->onSetCtrl(m_pCtrl); - - m_pTimerMgrDlg = new QTimeMgrDlg();//班次管理 - m_pTimerMgrDlg->onSetCtrlPtr(m_pCtrl); - - //m_pSystemSettingDlg = new QSystemSettingDlg();//系统设置 - m_pSystemConfigUI = new lpSystemConfigUI(); - m_CamSettingDlg = new QCamSettingDlg(); m_CamSettingDlg->setCoreCtrlPtr(m_pCoreCtrl); //connect(m_pSystemSettingDlg, SIGNAL(sgChangeLanguage(QString)), this, SLOT(onLanguageChange(QString))); @@ -218,47 +211,11 @@ lpMainWin::lpMainWin(QWidget *parent) ui.tp_main_tabWidget->insertTab(0, m_pixMapList, tr("历史")); ui.tp_main_tabWidget->setCurrentIndex(0); - m_pImageCaliUI = new lpImageCaliUI(); - } - { - /*发送模板库线程*/ - SendModelLibTask = new QMyThread(); - SendModelLibTask->setUser(true); - TaskFunc KuTaskFunc = std::bind(&lpMainWin::SendModelKuTskFun,this); - SendModelLibTask->loadfunc(KuTaskFunc); - SendTiskTsk = new QMyThread(); - TaskFunc TickFunc = std::bind(&lpMainWin::SendTickTskFun, this); - SendTiskTsk->loadfunc(TickFunc); - m_screen.ShowMsg(tr("系统初始化完成...")); - } - { onSetModel(); - /*网络通信加载*/ - m_pNet = ((WheelCtrl*)m_pCtrl)->getNet(); - connect(m_pNet, SIGNAL(sgShow2UI(QString, bool)), this, SLOT(onTcpConnet(QString, bool)));//net - connect(m_pNet, SIGNAL(sgClientConnect(QString, bool)), this, SLOT(onClientConnect(QString, bool)));//net - /*connect(m_pNet, SIGNAL(sgRecv(const QString &)), this, SLOT(onTcpRecv(const QString &)));*/ // net显示 - connect(m_pNet, SIGNAL(sgThickness(double)), this, SLOT(onThickness(double)));//xy height - connect(m_pNet, SIGNAL(sgRecvDetectState(int, int)), this, SLOT(onDetectStateRecv(int, int)));//xy check - connect(m_pNet, SIGNAL(sgClearRev(bool)), this, SLOT(onClearLibRev(bool)));//xy clearlib - connect(m_pNet, SIGNAL(sgPulseRev()), this, SLOT(onPulseRev())); - /*connect(m_pNet, SIGNAL(sgResultRev()), this, SLOT(onResultRev()));*/ - connect(m_pNet, SIGNAL(sgRecvTrigPara()), this, SLOT(onRecvTrigPara())); - connect(m_pNet, SIGNAL(sgReadDetectState(int, QString)), this, SLOT(onReadDetectState(int, QString))); - connect(m_pNet, SIGNAL(sgReadDetectStateASK()), this, SLOT(onReadDetectStateASK())); - connect(m_pNet, SIGNAL(sgCameraTrig(int)), this, SLOT(onTrigRecv(int))); - connect(m_pNet, SIGNAL(sgServerState(QString, int, bool)), this, SLOT(onServerState(QString, int, bool))); - connect(m_pNet, SIGNAL(sgShutDownComputer()), this, SLOT(onShutDownComputer())); - connect(m_pNet, SIGNAL(sgLibRev(bool)), SendModelLibTask, SLOT(WaitSingleIn(bool)));//xy lib - - /*connect(m_pNet, SIGNAL(sgChangeOnlineState(int)), m_pUi, SLOT(onSwitchOnlineModel(int)));*///强制在线 离线 - - QTimer::singleShot(500, m_pNet, SLOT(onOpenServer()));//延迟2s打开网络TCP服务 - } { connect(&m_PulseTimer, SIGNAL(timeout()), this, SLOT(onPulseTimer()));//心跳包 connect(&m_wfPulseTimer, SIGNAL(timeout()), this, SLOT(onwfPulseTimer()));//心跳包 @@ -276,7 +233,6 @@ lpMainWin::lpMainWin(QWidget *parent) connect(this, SIGNAL(sgShowMsgdlg(QString)), this, SLOT(onShowMsg(QString))); connect(this, SIGNAL(sgSendDisLib(int, QString)), this, SLOT(onSendDisLib(int, QString))); connect(this, SIGNAL(sgSendDisLibDone()), this, SLOT(onSendDisLibDone())); - connect(this, SIGNAL(sgShowChannelRes(QString)), this, SLOT(onShowChannel(QString))); } {//PLC tcp 通讯 m_pPlcDevice = new QPLCDevice(); @@ -285,33 +241,14 @@ lpMainWin::lpMainWin(QWidget *parent) connect(m_pPlcDevice, SIGNAL(sgTrigerCam(int)), this, SLOT(onPLCTrigerCam(int))); } { - /*启动之后就一直发送心跳包和厚度查询*/ - if (lpGlobalConfig::instance()->m_AutoSendTick2Net) - { - SendTiskTsk->setSleepTime(1000); - SendTiskTsk->start(); - } - - //if (DetectState::instance()->m_StartAndDetect == 1)//m_sysType 表示万丰科技的 - { - QTimer::singleShot(3000, [&](){ - ui.btn_start_detect->setText(tr("停止检测")); - lpGlobalConfig::instance()->IsDetect = true; - m_pCtrl->onStart(); - }); - } + QTimer::singleShot(3000, [&]() { + ui.btn_start_detect->setText(tr("停止检测")); + lpGlobalConfig::instance()->IsDetect = true; + m_pCtrl->onStart(); + }); + if (lpGlobalConfig::instance()->m_AutoSendTick2COM) m_wfPulseTimer.start(1000); - - - pTickThread = new QThread(this); - QNetTickThread *pNetTick = new QNetTickThread; - pNetTick->setNetPtr(m_pNet); - pNetTick->moveToThread(pTickThread); - connect(pTickThread, &QThread::finished, pNetTick, &QObject::deleteLater); - connect(this, SIGNAL(sgNetData(int, QVariantMap)), pNetTick, SLOT(doWork(int, QVariantMap))); - connect(pNetTick, SIGNAL(resultReady(int, QVariantMap)), m_pNet, SLOT(onSendDataByType(int, QVariantMap))); - pTickThread->start(); } { m_pTableCheck = new ModelsView(ui.tableview_checkstate, m_pCtrl->getAllModelMapPtr()); @@ -324,8 +261,6 @@ lpMainWin::lpMainWin(QWidget *parent) } m_timerID = startTimer(1000); - //m_PulseTimer.start(1000); - connect(this, SIGNAL(sgAutoExposure()), this, SLOT(onAutoExposure())); QString strPath = QApplication::applicationDirPath(); readExposureTimeConfig(strPath); @@ -345,49 +280,12 @@ lpMainWin::~lpMainWin() delete m_pUserCtrl; m_pUserCtrl = NULL; } - if (SendModelLibTask) - { - qDebug() << "delete SendModelLibTak"; - if (SendModelLibTask->isRunning()) - SendModelLibTask->stop(); - SendModelLibTask->wait(50); - delete SendModelLibTask; - SendModelLibTask = NULL; - qDebug() << "delete SendModelLibTak end"; - } - if (SendTiskTsk) - { - qDebug() << "delete SendTiskTsk"; - if (SendTiskTsk->isRunning()) - SendTiskTsk->stop(); - SendTiskTsk->wait(50); - delete SendTiskTsk; - SendTiskTsk = NULL; - qDebug() << "delete SendTiskTsk end"; - } - if (pTickThread) - { - qDebug() << "delete pTickThread"; - if (pTickThread->isRunning()) - { - pTickThread->quit(); - pTickThread->wait(50); - } - delete pTickThread; - pTickThread = NULL; - qDebug() << "delete pTickThread end"; - } { if (m_pLbCurrentTime) { delete m_pLbCurrentTime; m_pLbCurrentTime = nullptr; } - //if (m_pLbBanci) - //{ - // delete m_pLbBanci; - // m_pLbBanci = nullptr; - //} if (m_pLbDetectState) { delete m_pLbDetectState; @@ -423,15 +321,6 @@ lpMainWin::~lpMainWin() delete m_pDebugDlg; m_pDebugDlg = nullptr; } - if (m_pTimerMgrDlg) { - delete m_pTimerMgrDlg; - m_pTimerMgrDlg = nullptr; - } -// if (m_pSystemSettingDlg) -// { -// delete m_pSystemSettingDlg; -// m_pSystemSettingDlg = nullptr; -// } if (m_pSystemConfigUI) { delete m_pSystemConfigUI; @@ -456,16 +345,6 @@ lpMainWin::~lpMainWin() delete m_pImageCaliUI; m_pImageCaliUI = nullptr; } - if (m_pDllCoreCtrl) - { - delete m_pDllCoreCtrl; - m_pDllCoreCtrl = nullptr; - } - if (m_pDllEngineCtrl) - { - delete m_pDllEngineCtrl; - m_pDllEngineCtrl = nullptr; - } if (m_pDesigner) { delete m_pDesigner; @@ -476,6 +355,23 @@ lpMainWin::~lpMainWin() delete m_pPlcDevice; m_pPlcDevice = nullptr; } + + if (m_pDllCoreCtrl) + { + delete m_pDllCoreCtrl; + m_pDllCoreCtrl = nullptr; + } + if (m_pDllDesigner) + { + delete m_pDllDesigner; + m_pDllDesigner = nullptr; + } + if (m_pDllEngineCtrl) + { + delete m_pDllEngineCtrl; + m_pDllEngineCtrl = nullptr; + } + } bool lpMainWin::onInitCoreCtrl() @@ -527,7 +423,6 @@ bool lpMainWin::onInitEngineCtrl() if (m_pDesigner && m_pEngineCtrl) { m_pDesigner->Initialize(m_pEngineCtrl); - //m_pDesigner->ShowMainFrame(); } } } @@ -687,6 +582,7 @@ void lpMainWin::IVariantMapToUI(const QString& camKey, const QVariantMap& vMap) valueRlt.angle = 361; valueRlt.strModel = "NG"; valueRlt.score = 0; + if(!srcImg.isNull()) valueRlt.pixmap = QPixmap::fromImage(srcImg); valueRlt.strRunState = "no task"; onSaveValveResult(valueRlt); @@ -1010,27 +906,12 @@ Q_SLOT void lpMainWin::onActionClicked() m_aboutDlg.setAttribute(Qt::WA_ShowModal, true); m_aboutDlg.show(); } - else if ("action_setting_ip" == strObj) { - if (m_pNet) - m_pNet->onShowIpDlg(this); - } else if ("action_cali_raster" == strObj) {//光栅测试 if (m_pCtrl) { m_pCtrl->onShowRaster(this); } } - else if ("action_setting_ban" == strObj) { - if (m_pTimerMgrDlg) { - m_pTimerMgrDlg->setParent(this); - m_pTimerMgrDlg->setWindowTitle(tr("班次管理")); - m_pTimerMgrDlg->setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint); - m_pTimerMgrDlg->setWindowIcon(QIcon(":/image/leaper")); - m_pTimerMgrDlg->setWindowModality(Qt::ApplicationModal); - m_pTimerMgrDlg->setAttribute(Qt::WA_ShowModal, true); - m_pTimerMgrDlg->show(); - } - } else if ("action_debug" == strObj) { if (m_pDebugDlg) { m_pDebugDlg->setParent(this); @@ -1076,17 +957,6 @@ Q_SLOT void lpMainWin::onActionClicked() } } else if ("actionSystemSeting" == strObj) {//系统参数设置 -// if (m_pSystemSettingDlg) -// { -// m_pSystemSettingDlg->setParent(this); -// m_pSystemSettingDlg->onShowWidget(lpGlobalData::instance()->m_level); -// m_pSystemSettingDlg->setWindowTitle(tr("系统参数设置")); -// m_pSystemSettingDlg->setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint); -// m_pSystemSettingDlg->setWindowIcon(QIcon(":/image/leaper")); -// m_pSystemSettingDlg->setWindowModality(Qt::ApplicationModal); -// m_pSystemSettingDlg->setAttribute(Qt::WA_ShowModal, true); -// m_pSystemSettingDlg->show(); -// } if (m_pSystemConfigUI) { m_pSystemConfigUI->setParent(this); @@ -1161,8 +1031,6 @@ Q_SLOT void lpMainWin::onButtonClicked() infobox.setWindowIcon(QIcon(":/image/leaper")); if (QMessageBox::Cancel != infobox.exec()) { m_pCtrl->onClear(); -// ui.main_lb_res_ok_num->setText(QString::number(0)); -// ui.main_lb_res_ng_num->setText(QString::number(0)); QString str = m_pCtrl->getUserName() + ":" + tr("按下了清零按钮，数据全部清零"); m_pCtrl->addLog(str, emTypeUseState); } @@ -1218,19 +1086,8 @@ void lpMainWin::timerEvent(QTimerEvent *event) } } - //if (m_pLbBanci) { - // QString show_label; - // if (m_pCtrl) - // show_label = m_pCtrl->getCurrentBan(); - // QString strMsg = tr("班次信息：") + (show_label.isEmpty() == true ? tr("该时间段未设置班次") : show_label); - // m_pLbBanci->setText(strMsg); - // m_pLbBanci->setStyleSheet("font: 14px;"); - //} if (m_pLbUser) { QString show_label = m_pCtrl->getUserName(); -// if (strLanguage != "Chinese") -// m_pLbUser->setText(tr("User:") + show_label); -// else m_pLbUser->setText(tr("当前用户：") + show_label); m_pLbUser->setStyleSheet("font: 14px;"); } @@ -1241,59 +1098,6 @@ void lpMainWin::closeEvent(QCloseEvent *event) { } -void lpMainWin::SendModelKuTskFun() -{ - /* - 发送模板库线程 - 把已有的所有模板库全部发送至PLC中 - */ - lpGlobalConfig::instance()->m_ThreadWaitTime = 100; - const int c_nErrorTime = 3; - int nError = 0; - QMap*ptr = m_pCtrl->getAllModelMapPtr(); - QList lst = ptr->keys(); - if (ptr->size() > 0 && lst.size() > 0) - { - int nIndex = 0; - do - { - IWheelModel *p = ptr->value(lst.at(nIndex)); - emit sgTaskSendModels(nIndex + 1, lst.at(nIndex), p->getDiameter(), p->getThickness()); - bool b = this->SendModelLibTask->WaitForSingle(lpGlobalConfig::instance()->m_ThreadWaitTime); - if (!b) { - nError++; - if (lpGlobalConfig::instance()->m_PLC_ASK == 1) { - if (nError > c_nErrorTime) { - ++nIndex; - nError = 0; - qDebug() << "timeout, more than 3 times, cannot rev ask"; - } - } - else { - ++nIndex; - nError = 0; - } - } - else { - nError = 0; - nIndex++; - } - } while (nIndex < lst.size()); - } - - emit(sgShowMsgdlg(tr("模板库发送完成"))); - -} - -void lpMainWin::SendTickTskFun() -{ - //心跳包发送 - if (m_pNet) - { - m_pNet->sendPulse(6000, lpGlobalConfig::instance()->IsDetect, lpGlobalConfig::instance()->IsOnline); - //m_TimerID = startTimer(500); - } -} void lpMainWin::onSetModel() { @@ -1310,19 +1114,6 @@ void lpMainWin::onSetModel() } QString str = QString("%1:%2(%3)").arg(tr("正在检测型号数")).arg(forDefectList.size()).arg(m_pCtrl->getAllTrainModelName().size() - 1); ui.main_showWorkLabel->setText(str); - -// IWheelUi *pMainWidget = m_pUi->getItemWidget(WHEEL_UI_MAINWINDOW); -// if (pMainWidget) { -// pMainWidget->setViewList(forDefectList); -// } - // void* address = (void*)m_pCtrl->getAllModelMapPtr(); - // gpTpCoreCtrl->ISetAlgorithmShared("modelMap", (int)address); - // QVariant filepath = QVariant(QCoreApplication::applicationDirPath()); - // gpTpCoreCtrl->ISetAlgorithmShared("filepath", filepath); - // - // void* pdefectList = (void*)&forDefectList; - // gpTpCoreCtrl->ISetAlgorithmShared("defectList", (int)pdefectList); - } ///******************************************************************************* Q_SLOT void lpMainWin::onUpdateDefect() { @@ -1363,36 +1154,6 @@ Q_SLOT void lpMainWin::onTcpConnet(QString str, bool bConnect) } } -Q_SLOT void lpMainWin::onSendClearLib2PLC() -{ - if (m_pNet) - m_pNet->sendClearLib(); -} -Q_SLOT void lpMainWin::onClientConnect(QString addr, bool bConnect) -{ - /*判断连接的机器IP地址是不是本地设置好的IP，并检测他的连接状态，如果是 默认将发送模板库给他*/ - QString m_addr = NetProtocol::genAddressPort(m_pNet->getIp(emNetClient), m_pNet->getPort(emNetClient)); - if (m_addr == addr && bConnect) - { - QTimer::singleShot(200, this, SLOT(onSendClearLib2PLC())); - - } - if (bConnect == true && 1 == lpGlobalConfig::instance()->IsOnline) { - //m_pUi->onSwitchOnlineModel(m_pState->IsOnline);//在线模式 离线模式切换 - } - QString strMsg; - if (bConnect) - { - strMsg += QString("IP:%1 %2").arg(addr).arg(tr("已连接")); - } - else - { - strMsg += QString("IP:%1 %2").arg(addr).arg(tr("已断开")); - } - m_pCtrl->addLog(strMsg, emTypeRunState); - ui.main_textBrowser->append(strMsg); -} - Q_SLOT void lpMainWin::onThickness(double dValue) { m_pCtrl->appendThicknessValue(dValue); @@ -1415,18 +1176,6 @@ Q_SLOT void lpMainWin::onDetectStateRecv(int nIndex, int value) } } -Q_SLOT void lpMainWin::onClearLibRev(bool state) -{ - /*接收到库清空应答*/ - if (SendModelLibTask) { - if (SendModelLibTask->isRunning()) - SendModelLibTask->stop(); - if (m_pNet) - m_pNet->sendModelNum(m_pCtrl->getAllModelMapPtr()->size()); - SendModelLibTask->start(); - } -} - //接收到心跳包 关闭定时器 Q_SLOT void lpMainWin::onPulseRev() { @@ -1528,33 +1277,6 @@ Q_SLOT void lpMainWin::onShutDownComputer() ExitWindowsEx(EWX_SHUTDOWN, SHTDN_REASON_MAJOR_OTHER); } -//*********************************************************************** -Q_SLOT void lpMainWin::onPulseTimer() -{ - //心跳包发送 - if (m_pNet) - { - m_pNet->sendPulse(6000, lpGlobalConfig::instance()->IsDetect, lpGlobalConfig::instance()->IsOnline); - //m_TimerID = startTimer(500); - } -} - -Q_SLOT void lpMainWin::onTaskSendModels(int nIndex, QString strModel, double dDiameter, double dHeight) -{ - if (m_pNet) - m_pNet->sendModelList(nIndex, strModel, dDiameter, dHeight); -} - -Q_SLOT void lpMainWin::onTaskSendDetectState(int nIndex, QString strModel, int IsState) -{ - if (m_pNet) - m_pNet->sendDeteStateList(nIndex, IsState, strModel); -} -Q_SLOT void lpMainWin::onTaskCheck(int nIndex, int IsState, QString strModel) -{ - if (m_pNet) - m_pNet->sendCheckDeteStateList(nIndex, IsState, strModel); -} Q_SLOT void lpMainWin::onShowImgState(QString str) { ui.main_label_state->setText(str); @@ -1582,21 +1304,6 @@ Q_SLOT void lpMainWin::onShowMsg(QString str) connect(pw, SIGNAL(finished()), this, SLOT(onInitPW())); } -Q_SLOT void lpMainWin::onSendDisLib(int nIndex, QString strModel) -{ - m_pNet->sendDisLibs(nIndex, strModel); -} - -Q_SLOT void lpMainWin::onSendDisLibDone() -{ - m_pNet->sendDisLibsDone(); -} - -Q_SLOT void lpMainWin::onShowChannel(QString str) -{ - //ui.main_lb_res_Channle_Show->setText(str); -} - Q_SLOT void lpMainWin::onTriggerCam() { if (m_pCoreCtrl) @@ -1606,12 +1313,6 @@ Q_SLOT void lpMainWin::onTriggerCam() } } -Q_SLOT void lpMainWin::onChangePLCParam() -{ - if (m_pNet) - m_pNet->sendTrigerPara(lpGlobalConfig::instance()->m_PLC_TrigerFilter, lpGlobalConfig::instance()->m_PLC_CamTrigDelay, lpGlobalConfig::instance()->m_PLC_CamTrigPulse, lpGlobalConfig::instance()->m_PLC_LightDelay, lpGlobalConfig::instance()->m_PLC_TrigerType, lpGlobalConfig::instance()->m_PLC_ResHoldTime); -} - void lpMainWin::onInitAbout() { QString aboutString; @@ -1724,92 +1425,6 @@ void lpMainWin::onShowResult(Result2Ui* pRlt) } } -void lpMainWin::SendResultBee(emTypeBee m_Type, int num) -{ - if (m_Type == LIGHT_REDBEE) { - m_pNet->sendLight(0, 1, 500, 500);//红灯 - } - else if (m_Type == LIGHT_GREENBEE) { - m_pNet->sendLight(2, 1, 500, 500); - } - else if (m_Type == LIGHT_YELLOWBEE) { - m_pNet->sendLight(1, 1, 500, 500); - } - else if (m_Type == LIGHT_BEE) { - m_pNet->sendLight(3, 1, 500, 500); - } -} - -void lpMainWin::SendResultStr2PLC(Result2Ui* m_Res) -{ - qDebug() << "sendResultToPLC resultName=" << m_Res->m_strModel << endl; - if (m_pNet) - m_pNet->sendDetectResult(m_Res->m_strModel, m_Res->m_dDiameter, m_Res->m_dThickness); -} - -void lpMainWin::SendResultChannel2PLC(Result2Ui* m_Res) -{ -// qDebug() << "SendResultChannel2PLC"; -// CChannelInfo *pChannelInfo = m_pCtrl->getChannelInfo(); -// ChannelInfo *npInfo = pChannelInfo->getChannelInfo(m_Res->m_strModel); -// if (npInfo && lpGlobalConfig::instance()->m_bObjAll2A == false) { -// if (m_pNet) -// m_pNet->sendResultChannel(npInfo->m_value, m_Res->m_dDiameter, m_Res->m_dThickness, m_Res->m_strModel); -// emit(sgShowChannelRes(npInfo->m_ChannelName)); -// } -// else -// { -// int defaultChannel = pChannelInfo->getDefaultChannel(); -// ChannelInfo *defaultInfo = pChannelInfo->getChannelInfo(defaultChannel); -// int nResultChannel = 0; -// if (defaultInfo) -// { -// nResultChannel = defaultInfo->m_value; -// emit(sgShowChannelRes(defaultInfo->m_ChannelName + tr("(默认)"))); -// } -// else -// { -// nResultChannel = 1000; -// emit(sgShowChannelRes(tr("默认通道 值1000"))); -// } -// -// if (m_pNet) -// m_pNet->sendResultChannel(nResultChannel, m_Res->m_dDiameter, m_Res->m_dThickness, m_Res->m_strModel); -// } -} - -void lpMainWin::SendResultChannelCOM(Result2Ui* m_Res) -{ - //qDebug() << "SendResultStr2COM"; - //if (!m_pCtrl) - // return; - //CChannelInfo *pChannelInfo = m_pCtrl->getChannelInfo(); - //ChannelInfo *npInfo = pChannelInfo->getChannelInfo(m_Res->m_strModel); - //SComframe frame; - //if (npInfo&&m_pState->m_bObjAll2A == false) { - // frame.data1 = npInfo->m_value; - // SendDataToCom(0x47, frame); - // emit(sgShowChannelRes(npInfo->m_ChannelName)); - //} - //else - //{ - // int defaultChannel = pChannelInfo->getDefaultChannel(); - // ChannelInfo *defaultInfo = pChannelInfo->getChannelInfo(defaultChannel); - // if (defaultInfo) - // { - // frame.data1 = defaultInfo->m_value; - // emit(sgShowChannelRes(defaultInfo->m_ChannelName + QString(tr("(默认)")))); - // } - // else - // { - // frame.data1 = 1000; - // emit(sgShowChannelRes(tr("默认通道 值1000"))); - // } - // SendDataToCom(0x47, frame); - //} -} - - void lpMainWin::saveImage(Result2Ui* pRes) { if (pRes == nullptr) @@ -1895,28 +1510,6 @@ Q_SLOT void lpMainWin::modWorkMgr(QString str) m_pworkUI->modWorkMgr(str); } -Q_SLOT void lpMainWin::onSendReadOnlineLib() -{ - if (m_pNet) - m_pNet->sendCheckAllModelState(); -} - -Q_SLOT void lpMainWin::onThicknessTimer() -{ - //查询厚度 - if (m_pNet) - m_pNet->sendThickness(); -} - -Q_SLOT void lpMainWin::onwfPulseTimer() -{ -// SComframe frame; -// frame.data1 = 0; -// frame.data2 = 0; -// frame.data8 = 50; -// SendDataToCom(0x43, frame); -} - bool lpMainWin::readExposureTimeConfig(const QString& strPath) { QString filePath = strPath + "\\config\\exposure.json"; @@ -1957,7 +1550,6 @@ Q_SLOT void lpMainWin::onAutoExposure() qDebug() << "exp:" << exp; m_pCoreCtrl->ISetExposureTime(m_camKey, exp); } - onTriggerCam(); } @@ -2101,4 +1693,4 @@ void lpMainWin::saveValveImage(QImage image, QString strName) Q_SLOT void lpMainWin::onPLCTrigerCam(int camID) { onTriggerCam(); -} \ No newline at end of file +} diff --git a/tpvs17/tpMain/lpMainWin.h b/tpvs17/tpMain/lpMainWin.h index 41fb317..8090673 100644 --- a/tpvs17/tpMain/lpMainWin.h +++ b/tpvs17/tpMain/lpMainWin.h @@ -10,12 +10,10 @@ #include "QTimer" #include "qmythread.h" #include "lpGlobalConfig.h" -#include "WheelNet.h" #include "ModelTableView.h" #include "QModelMgrDlg.h" #include "Result2Ui.h" #include "QDebugDlg.h" -#include "QTimeMgrDlg.h" #include "RoiImgViewer.h" #include "InfoFile.h" #include "qpixmapbar.h" @@ -82,7 +80,6 @@ private: void onSaveValveResult(ValueResult &rlt); protected: bool onInitCoreCtrl(); - bool onInitEngineCtrl(); void loadUserModel();//加载用户管理模块 @@ -90,19 +87,13 @@ protected: void SearchQmFile(const QString & strDir); void SetTranslator(const QString strPath); void SetLanguage(QString strLangage); - - void SendModelKuTskFun(); - void SendTickTskFun(); void onSetModel(); QString SecondTimeString(quint64 value);//计算运行时常 Q_SLOT void onUpdateDefect();//勾选 更新界面显示窗口 //net slot Q_SLOT void onTcpConnet(QString str, bool bConnect); - Q_SLOT void onSendClearLib2PLC(); - Q_SLOT void onClientConnect(QString addr, bool bConnect); Q_SLOT void onThickness(double dValue); Q_SLOT void onDetectStateRecv(int nIndex, int value); - Q_SLOT void onClearLibRev(bool state); Q_SLOT void onPulseRev(); Q_SLOT void onRecvTrigPara(); Q_SLOT void onReadDetectState(int nIndex, QString strModel); @@ -110,36 +101,18 @@ protected: Q_SLOT void onTrigRecv(int m_value); Q_SLOT void onServerState(QString Addr, int port, bool m_state); Q_SLOT void onShutDownComputer(); - //timer slot - Q_SLOT void onPulseTimer(); - Q_SLOT void onTaskSendModels(int nIndex, QString strModel, double dDiameter, double dHeight); - Q_SLOT void onTaskSendDetectState(int nIndex, QString strModel, int IsState); - Q_SLOT void onTaskCheck(int nIndex, int IsState, QString strModel); Q_SLOT void onShowImgState(QString str); Q_SLOT void onGetImg(); Q_SLOT void onShowMsg(QString str); - Q_SLOT void onSendDisLib(int nIndex, QString strModel); - Q_SLOT void onSendDisLibDone(); - Q_SLOT void onShowChannel(QString str); Q_SLOT void onTriggerCam(); - Q_SLOT void onChangePLCParam(); void onInitAbout(); Q_SLOT void onLanguageChange(QString strLanguage); - - Q_SLOT void onSendReadOnlineLib(); - Q_SLOT void onThicknessTimer(); - Q_SLOT void onwfPulseTimer(); Q_SLOT void modWorkMgr(QString str); Q_SLOT void onPLCTrigerCam(int camID); private: void onShowResult(Result2Ui* pRlt);//展示识别结果 - - void SendResultBee(emTypeBee m_Type, int num); - void SendResultStr2PLC(Result2Ui* m_Res); - void SendResultChannel2PLC(Result2Ui* m_Res); - void SendResultChannelCOM(Result2Ui* m_Res); void saveValveImage(QImage image, QString strName = "NG"); void saveImage(Result2Ui* pRes); @@ -162,7 +135,6 @@ private: RoiImgViewer *m_ImgViewer{ nullptr };//展示检测图像 /*status 状态栏*/ class QLabel* m_pLbCurrentTime{ nullptr };//显示系统时间 - //class QLabel* m_pLbBanci{ nullptr };//显示班次 class QLabel* m_pLbDetectState{ nullptr };//显示检测状态 class QLabel *m_pLbUser{ nullptr };//显示登陆用户信息 private: @@ -170,7 +142,6 @@ private: ICoreCtrl* m_pCoreCtrl{ nullptr }; private: class IWheelCtrl *m_pCtrl{ nullptr }; - class CWheelNet *m_pNet{ nullptr }; class QWorkMgrUI *m_pworkUI{ nullptr }; class QWorkMgrCtlr *pWorkCtrl{ nullptr }; @@ -180,10 +151,6 @@ private: QTimer m_ReadLibTimer; QTimer m_timerDetect; - QMyThread *SendModelLibTask{ nullptr }; - QMyThread *SendTiskTsk{ nullptr }; - QThread *pTickThread{ nullptr }; - int m_nWfThress{ 0 }; int m_TimerID{ 0 };//心跳包定时器 用于记录超时 int m_TimerOutCount{ 0 }; @@ -196,9 +163,7 @@ private: QModelMgrDlg *m_pModelMgrDlg{ nullptr }; QDebugDlg* m_pDebugDlg{ nullptr }; QWidget m_aboutDlg;//关于 - QTimeMgrDlg* m_pTimerMgrDlg{ nullptr }; QPixmapListBar* m_pixMapList{ nullptr };//展示历史检测结果 - //QSystemSettingDlg* m_pSystemSettingDlg{ nullptr }; lpSystemConfigUI* m_pSystemConfigUI{ nullptr }; QCamSettingDlg* m_CamSettingDlg{ nullptr }; lpImageCaliUI* m_pImageCaliUI{ nullptr }; diff --git a/tpvs17/tpMain/tpMain.vcxproj b/tpvs17/tpMain/tpMain.vcxproj index 34325ed..3088897 100644 --- a/tpvs17/tpMain/tpMain.vcxproj +++ b/tpvs17/tpMain/tpMain.vcxproj @@ -22,8 +22,6 @@ - - @@ -35,17 +33,10 @@ - - - - - - - @@ -57,19 +48,14 @@ - - true - - true - true @@ -118,36 +104,18 @@ true - - true - true - - true - true - - true - - - true - true - - true - true - - true - true @@ -160,9 +128,6 @@ true - - true - true @@ -187,9 +152,6 @@ true - - true - true @@ -208,9 +170,6 @@ true - - true - @@ -220,9 +179,6 @@ true - - true - true @@ -271,36 +227,18 @@ true - - true - true - - true - true - - true - - - true - true - - true - true - - true - true @@ -313,9 +251,6 @@ true - - true - true @@ -340,9 +275,6 @@ true - - true - true @@ -361,9 +293,6 @@ true - - true - @@ -372,13 +301,11 @@ - - @@ -504,21 +431,14 @@ - - - - - - - @@ -531,16 +451,6 @@ .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DTPMAIN_LIB -DTPMAIN_EXPORTS -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_SQL_LIB -DQT_PRINTSUPPORT_LIB -DQT_NETWORK_LIB -DQT_SERIALPORT_LIB -D%(PreprocessorDefinitions) "-I." "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\ActiveQt" "-I$(QTDIR)\include\QtSerialPort" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSql" "-I$(QTDIR)\include\QtNetwork" "-I.\..\..\src\algorithm" "-I.\..\..\src\tpMain" "-I.\..\..\src\tpMain\thread" "-I.\..\..\src\tpMain\splashScreen" "-I.\..\..\src\tpMain\LightBoxwidget" "-I.\..\..\src\tpMain\QDiskCleanThread" "-I.\..\..\src\tpMain\QPixmapListBar" "-I.\..\..\src\userCtrl" "-I.\..\..\src\NetWheel" "-I.\..\..\src\RasterSDG20" "-I.\..\..\src\ReportModel" "-I.\..\..\3part\libzkq\include" "-I.\..\..\3part\tadpole\include\tpBase" "-I.\..\..\3part\opencv3.4.1\include" "-I.\..\..\3part\opencv3.4.1\include\opencv" "-I.\..\..\3part\opencv3.4.1\include\opencv2" "-I.\..\..\3part\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" "-I.\..\..\3part\edcircle\include" - - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing %(Identity)... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DTPMAIN_LIB -DTPMAIN_EXPORTS -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_SQL_LIB -DQT_PRINTSUPPORT_LIB -DQT_NETWORK_LIB -DQT_SERIALPORT_LIB -D_WINDOWS -D%(PreprocessorDefinitions) "-I." "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\ActiveQt" "-I$(QTDIR)\include\QtSerialPort" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSql" "-I$(QTDIR)\include\QtNetwork" "-I.\..\..\src\algorithm" "-I.\..\..\src\tpMain" "-I.\..\..\src\tpMain\thread" "-I.\..\..\src\tpMain\splashScreen" "-I.\..\..\src\tpMain\LightBoxwidget" "-I.\..\..\src\tpMain\QDiskCleanThread" "-I.\..\..\src\tpMain\QPixmapListBar" "-I.\..\..\src\userCtrl" "-I.\..\..\src\NetWheel" "-I.\..\..\src\RasterSDG20" "-I.\..\..\src\ReportModel" "-I.\..\..\3part\libzkq\include" "-I.\..\..\3part\tadpole\include\tpBase" "-I.\..\..\3part\opencv3.4.1\include" "-I.\..\..\3part\opencv3.4.1\include\opencv" "-I.\..\..\3part\opencv3.4.1\include\opencv2" "-I.\..\..\3part\edcircle\include" "-I.\..\..\3part\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" "-I.\lpRawTcp" - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing %(Identity)... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DTPMAIN_LIB -DTPMAIN_EXPORTS -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_SQL_LIB -DQT_PRINTSUPPORT_LIB -DQT_NETWORK_LIB -DQT_SERIALPORT_LIB -D%(PreprocessorDefinitions) "-I." "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\ActiveQt" "-I$(QTDIR)\include\QtSerialPort" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSql" "-I$(QTDIR)\include\QtNetwork" "-I.\..\..\src\algorithm" "-I.\..\..\src\tpMain" "-I.\..\..\src\tpMain\thread" "-I.\..\..\src\tpMain\splashScreen" "-I.\..\..\src\tpMain\LightBoxwidget" "-I.\..\..\src\tpMain\QDiskCleanThread" "-I.\..\..\src\tpMain\QPixmapListBar" "-I.\..\..\src\userCtrl" "-I.\..\..\src\NetWheel" "-I.\..\..\src\RasterSDG20" "-I.\..\..\src\ReportModel" "-I.\..\..\3part\libzkq\include" "-I.\..\..\3part\tadpole\include\tpBase" "-I.\..\..\3part\opencv3.4.1\include" "-I.\..\..\3part\opencv3.4.1\include\opencv" "-I.\..\..\3part\opencv3.4.1\include\opencv2" "-I.\..\..\3part\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" "-I.\..\..\3part\edcircle\include" - $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... @@ -551,16 +461,6 @@ .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DTPMAIN_LIB -DTPMAIN_EXPORTS -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_SQL_LIB -DQT_PRINTSUPPORT_LIB -DQT_NETWORK_LIB -DQT_SERIALPORT_LIB -D%(PreprocessorDefinitions) "-I." "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\ActiveQt" "-I$(QTDIR)\include\QtSerialPort" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSql" "-I$(QTDIR)\include\QtNetwork" "-I.\..\..\src\algorithm" "-I.\..\..\src\tpMain" "-I.\..\..\src\tpMain\thread" "-I.\..\..\src\tpMain\splashScreen" "-I.\..\..\src\tpMain\LightBoxwidget" "-I.\..\..\src\tpMain\QDiskCleanThread" "-I.\..\..\src\tpMain\QPixmapListBar" "-I.\..\..\src\userCtrl" "-I.\..\..\src\NetWheel" "-I.\..\..\src\RasterSDG20" "-I.\..\..\src\ReportModel" "-I.\..\..\3part\libzkq\include" "-I.\..\..\3part\tadpole\include\tpBase" "-I.\..\..\3part\opencv3.4.1\include" "-I.\..\..\3part\opencv3.4.1\include\opencv" "-I.\..\..\3part\opencv3.4.1\include\opencv2" "-I.\..\..\3part\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" "-I.\..\..\3part\edcircle\include" - - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing %(Identity)... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DTPMAIN_LIB -DTPMAIN_EXPORTS -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_SQL_LIB -DQT_PRINTSUPPORT_LIB -DQT_NETWORK_LIB -DQT_SERIALPORT_LIB -D_WINDOWS -D%(PreprocessorDefinitions) "-I." "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\ActiveQt" "-I$(QTDIR)\include\QtSerialPort" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSql" "-I$(QTDIR)\include\QtNetwork" "-I.\..\..\src\algorithm" "-I.\..\..\src\tpMain" "-I.\..\..\src\tpMain\thread" "-I.\..\..\src\tpMain\splashScreen" "-I.\..\..\src\tpMain\LightBoxwidget" "-I.\..\..\src\tpMain\QDiskCleanThread" "-I.\..\..\src\tpMain\QPixmapListBar" "-I.\..\..\src\userCtrl" "-I.\..\..\src\NetWheel" "-I.\..\..\src\RasterSDG20" "-I.\..\..\src\ReportModel" "-I.\..\..\3part\libzkq\include" "-I.\..\..\3part\tadpole\include\tpBase" "-I.\..\..\3part\opencv3.4.1\include" "-I.\..\..\3part\opencv3.4.1\include\opencv" "-I.\..\..\3part\opencv3.4.1\include\opencv2" "-I.\..\..\3part\edcircle\include" "-I.\..\..\3part\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" "-I.\lpRawTcp" - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing %(Identity)... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DTPMAIN_LIB -DTPMAIN_EXPORTS -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_SQL_LIB -DQT_PRINTSUPPORT_LIB -DQT_NETWORK_LIB -DQT_SERIALPORT_LIB -D%(PreprocessorDefinitions) "-I." "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\ActiveQt" "-I$(QTDIR)\include\QtSerialPort" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSql" "-I$(QTDIR)\include\QtNetwork" "-I.\..\..\src\algorithm" "-I.\..\..\src\tpMain" "-I.\..\..\src\tpMain\thread" "-I.\..\..\src\tpMain\splashScreen" "-I.\..\..\src\tpMain\LightBoxwidget" "-I.\..\..\src\tpMain\QDiskCleanThread" "-I.\..\..\src\tpMain\QPixmapListBar" "-I.\..\..\src\userCtrl" "-I.\..\..\src\NetWheel" "-I.\..\..\src\RasterSDG20" "-I.\..\..\src\ReportModel" "-I.\..\..\3part\libzkq\include" "-I.\..\..\3part\tadpole\include\tpBase" "-I.\..\..\3part\opencv3.4.1\include" "-I.\..\..\3part\opencv3.4.1\include\opencv" "-I.\..\..\3part\opencv3.4.1\include\opencv2" "-I.\..\..\3part\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" "-I.\..\..\3part\edcircle\include" - $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... @@ -627,7 +527,6 @@ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DTPMAIN_LIB -DTPMAIN_EXPORTS -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_SQL_LIB -DQT_PRINTSUPPORT_LIB -DQT_NETWORK_LIB -DQT_SERIALPORT_LIB -D%(PreprocessorDefinitions) "-I." "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\ActiveQt" "-I$(QTDIR)\include\QtSerialPort" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSql" "-I$(QTDIR)\include\QtNetwork" "-I.\..\..\src\algorithm" "-I.\..\..\src\tpMain" "-I.\..\..\src\tpMain\thread" "-I.\..\..\src\tpMain\splashScreen" "-I.\..\..\src\tpMain\LightBoxwidget" "-I.\..\..\src\tpMain\QDiskCleanThread" "-I.\..\..\src\tpMain\QPixmapListBar" "-I.\..\..\src\userCtrl" "-I.\..\..\src\NetWheel" "-I.\..\..\src\RasterSDG20" "-I.\..\..\src\ReportModel" "-I.\..\..\3part\libzkq\include" "-I.\..\..\3part\tadpole\include\tpBase" "-I.\..\..\3part\opencv3.4.1\include" "-I.\..\..\3part\opencv3.4.1\include\opencv" "-I.\..\..\3part\opencv3.4.1\include\opencv2" "-I.\..\..\3part\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" "-I.\..\..\3part\edcircle\include" - $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing WheelCtrl.h... @@ -639,16 +538,6 @@ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DTPMAIN_LIB -DTPMAIN_EXPORTS -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_SQL_LIB -DQT_PRINTSUPPORT_LIB -DQT_NETWORK_LIB -DQT_SERIALPORT_LIB -D%(PreprocessorDefinitions) "-I." "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\ActiveQt" "-I$(QTDIR)\include\QtSerialPort" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSql" "-I$(QTDIR)\include\QtNetwork" "-I.\..\..\src\algorithm" "-I.\..\..\src\tpMain" "-I.\..\..\src\tpMain\thread" "-I.\..\..\src\tpMain\splashScreen" "-I.\..\..\src\tpMain\LightBoxwidget" "-I.\..\..\src\tpMain\QDiskCleanThread" "-I.\..\..\src\tpMain\QPixmapListBar" "-I.\..\..\src\userCtrl" "-I.\..\..\src\NetWheel" "-I.\..\..\src\RasterSDG20" "-I.\..\..\src\ReportModel" "-I.\..\..\3part\libzkq\include" "-I.\..\..\3part\tadpole\include\tpBase" "-I.\..\..\3part\opencv3.4.1\include" "-I.\..\..\3part\opencv3.4.1\include\opencv" "-I.\..\..\3part\opencv3.4.1\include\opencv2" "-I.\..\..\3part\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" "-I.\..\..\3part\edcircle\include" - - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing WheelNet.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DTPMAIN_LIB -DTPMAIN_EXPORTS -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_SQL_LIB -DQT_PRINTSUPPORT_LIB -DQT_NETWORK_LIB -DQT_SERIALPORT_LIB -D_WINDOWS -D%(PreprocessorDefinitions) "-I." "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\ActiveQt" "-I$(QTDIR)\include\QtSerialPort" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSql" "-I$(QTDIR)\include\QtNetwork" "-I.\..\..\src\algorithm" "-I.\..\..\src\tpMain" "-I.\..\..\src\tpMain\thread" "-I.\..\..\src\tpMain\splashScreen" "-I.\..\..\src\tpMain\LightBoxwidget" "-I.\..\..\src\tpMain\QDiskCleanThread" "-I.\..\..\src\tpMain\QPixmapListBar" "-I.\..\..\src\userCtrl" "-I.\..\..\src\NetWheel" "-I.\..\..\src\RasterSDG20" "-I.\..\..\src\ReportModel" "-I.\..\..\3part\libzkq\include" "-I.\..\..\3part\tadpole\include\tpBase" "-I.\..\..\3part\opencv3.4.1\include" "-I.\..\..\3part\opencv3.4.1\include\opencv" "-I.\..\..\3part\opencv3.4.1\include\opencv2" "-I.\..\..\3part\edcircle\include" "-I.\..\..\3part\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" "-I.\lpRawTcp" - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing WheelNet.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DTPMAIN_LIB -DTPMAIN_EXPORTS -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_SQL_LIB -DQT_PRINTSUPPORT_LIB -DQT_NETWORK_LIB -DQT_SERIALPORT_LIB -D%(PreprocessorDefinitions) "-I." "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\ActiveQt" "-I$(QTDIR)\include\QtSerialPort" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSql" "-I$(QTDIR)\include\QtNetwork" "-I.\..\..\src\algorithm" "-I.\..\..\src\tpMain" "-I.\..\..\src\tpMain\thread" "-I.\..\..\src\tpMain\splashScreen" "-I.\..\..\src\tpMain\LightBoxwidget" "-I.\..\..\src\tpMain\QDiskCleanThread" "-I.\..\..\src\tpMain\QPixmapListBar" "-I.\..\..\src\userCtrl" "-I.\..\..\src\NetWheel" "-I.\..\..\src\RasterSDG20" "-I.\..\..\src\ReportModel" "-I.\..\..\3part\libzkq\include" "-I.\..\..\3part\tadpole\include\tpBase" "-I.\..\..\3part\opencv3.4.1\include" "-I.\..\..\3part\opencv3.4.1\include\opencv" "-I.\..\..\3part\opencv3.4.1\include\opencv2" "-I.\..\..\3part\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" "-I.\..\..\3part\edcircle\include" - $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing QWorkMgrCtlr.h... @@ -669,16 +558,6 @@ .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DTPMAIN_LIB -DTPMAIN_EXPORTS -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_SQL_LIB -DQT_PRINTSUPPORT_LIB -DQT_NETWORK_LIB -DQT_SERIALPORT_LIB -D%(PreprocessorDefinitions) "-I." "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\ActiveQt" "-I$(QTDIR)\include\QtSerialPort" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSql" "-I$(QTDIR)\include\QtNetwork" "-I.\..\..\src\algorithm" "-I.\..\..\src\tpMain" "-I.\..\..\src\tpMain\thread" "-I.\..\..\src\tpMain\splashScreen" "-I.\..\..\src\tpMain\LightBoxwidget" "-I.\..\..\src\tpMain\QDiskCleanThread" "-I.\..\..\src\tpMain\QPixmapListBar" "-I.\..\..\src\userCtrl" "-I.\..\..\src\NetWheel" "-I.\..\..\src\RasterSDG20" "-I.\..\..\src\ReportModel" "-I.\..\..\3part\libzkq\include" "-I.\..\..\3part\tadpole\include\tpBase" "-I.\..\..\3part\opencv3.4.1\include" "-I.\..\..\3part\opencv3.4.1\include\opencv" "-I.\..\..\3part\opencv3.4.1\include\opencv2" "-I.\..\..\3part\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" "-I.\..\..\3part\edcircle\include" - - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing qnettickthread.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DTPMAIN_LIB -DTPMAIN_EXPORTS -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_SQL_LIB -DQT_PRINTSUPPORT_LIB -DQT_NETWORK_LIB -DQT_SERIALPORT_LIB -D_WINDOWS -D%(PreprocessorDefinitions) "-I." "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\ActiveQt" "-I$(QTDIR)\include\QtSerialPort" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSql" "-I$(QTDIR)\include\QtNetwork" "-I.\..\..\src\algorithm" "-I.\..\..\src\tpMain" "-I.\..\..\src\tpMain\thread" "-I.\..\..\src\tpMain\splashScreen" "-I.\..\..\src\tpMain\LightBoxwidget" "-I.\..\..\src\tpMain\QDiskCleanThread" "-I.\..\..\src\tpMain\QPixmapListBar" "-I.\..\..\src\userCtrl" "-I.\..\..\src\NetWheel" "-I.\..\..\src\RasterSDG20" "-I.\..\..\src\ReportModel" "-I.\..\..\3part\libzkq\include" "-I.\..\..\3part\tadpole\include\tpBase" "-I.\..\..\3part\opencv3.4.1\include" "-I.\..\..\3part\opencv3.4.1\include\opencv" "-I.\..\..\3part\opencv3.4.1\include\opencv2" "-I.\..\..\3part\edcircle\include" "-I.\..\..\3part\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" "-I.\lpRawTcp" - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing qnettickthread.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DTPMAIN_LIB -DTPMAIN_EXPORTS -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_SQL_LIB -DQT_PRINTSUPPORT_LIB -DQT_NETWORK_LIB -DQT_SERIALPORT_LIB -D%(PreprocessorDefinitions) "-I." "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\ActiveQt" "-I$(QTDIR)\include\QtSerialPort" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSql" "-I$(QTDIR)\include\QtNetwork" "-I.\..\..\src\algorithm" "-I.\..\..\src\tpMain" "-I.\..\..\src\tpMain\thread" "-I.\..\..\src\tpMain\splashScreen" "-I.\..\..\src\tpMain\LightBoxwidget" "-I.\..\..\src\tpMain\QDiskCleanThread" "-I.\..\..\src\tpMain\QPixmapListBar" "-I.\..\..\src\userCtrl" "-I.\..\..\src\NetWheel" "-I.\..\..\src\RasterSDG20" "-I.\..\..\src\ReportModel" "-I.\..\..\3part\libzkq\include" "-I.\..\..\3part\tadpole\include\tpBase" "-I.\..\..\3part\opencv3.4.1\include" "-I.\..\..\3part\opencv3.4.1\include\opencv" "-I.\..\..\3part\opencv3.4.1\include\opencv2" "-I.\..\..\3part\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" "-I.\..\..\3part\edcircle\include" - $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing qpulpewidget.h... @@ -729,46 +608,6 @@ .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DTPMAIN_LIB -DTPMAIN_EXPORTS -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_SQL_LIB -DQT_PRINTSUPPORT_LIB -DQT_NETWORK_LIB -DQT_SERIALPORT_LIB -D%(PreprocessorDefinitions) "-I." "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\ActiveQt" "-I$(QTDIR)\include\QtSerialPort" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSql" "-I$(QTDIR)\include\QtNetwork" "-I.\..\..\src\algorithm" "-I.\..\..\src\tpMain" "-I.\..\..\src\tpMain\thread" "-I.\..\..\src\tpMain\splashScreen" "-I.\..\..\src\tpMain\LightBoxwidget" "-I.\..\..\src\tpMain\QDiskCleanThread" "-I.\..\..\src\tpMain\QPixmapListBar" "-I.\..\..\src\userCtrl" "-I.\..\..\src\NetWheel" "-I.\..\..\src\RasterSDG20" "-I.\..\..\src\ReportModel" "-I.\..\..\3part\libzkq\include" "-I.\..\..\3part\tadpole\include\tpBase" "-I.\..\..\3part\opencv3.4.1\include" "-I.\..\..\3part\opencv3.4.1\include\opencv" "-I.\..\..\3part\opencv3.4.1\include\opencv2" "-I.\..\..\3part\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" "-I.\..\..\3part\edcircle\include" - - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing qipconfigdlg.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DTPMAIN_LIB -DTPMAIN_EXPORTS -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_SQL_LIB -DQT_PRINTSUPPORT_LIB -DQT_NETWORK_LIB -DQT_SERIALPORT_LIB -D_WINDOWS -D%(PreprocessorDefinitions) "-I." "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\ActiveQt" "-I$(QTDIR)\include\QtSerialPort" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSql" "-I$(QTDIR)\include\QtNetwork" "-I.\..\..\src\algorithm" "-I.\..\..\src\tpMain" "-I.\..\..\src\tpMain\thread" "-I.\..\..\src\tpMain\splashScreen" "-I.\..\..\src\tpMain\LightBoxwidget" "-I.\..\..\src\tpMain\QDiskCleanThread" "-I.\..\..\src\tpMain\QPixmapListBar" "-I.\..\..\src\userCtrl" "-I.\..\..\src\NetWheel" "-I.\..\..\src\RasterSDG20" "-I.\..\..\src\ReportModel" "-I.\..\..\3part\libzkq\include" "-I.\..\..\3part\tadpole\include\tpBase" "-I.\..\..\3part\opencv3.4.1\include" "-I.\..\..\3part\opencv3.4.1\include\opencv" "-I.\..\..\3part\opencv3.4.1\include\opencv2" "-I.\..\..\3part\edcircle\include" "-I.\..\..\3part\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" "-I.\lpRawTcp" - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing qipconfigdlg.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DTPMAIN_LIB -DTPMAIN_EXPORTS -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_SQL_LIB -DQT_PRINTSUPPORT_LIB -DQT_NETWORK_LIB -DQT_SERIALPORT_LIB -D%(PreprocessorDefinitions) "-I." "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\ActiveQt" "-I$(QTDIR)\include\QtSerialPort" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSql" "-I$(QTDIR)\include\QtNetwork" "-I.\..\..\src\algorithm" "-I.\..\..\src\tpMain" "-I.\..\..\src\tpMain\thread" "-I.\..\..\src\tpMain\splashScreen" "-I.\..\..\src\tpMain\LightBoxwidget" "-I.\..\..\src\tpMain\QDiskCleanThread" "-I.\..\..\src\tpMain\QPixmapListBar" "-I.\..\..\src\userCtrl" "-I.\..\..\src\NetWheel" "-I.\..\..\src\RasterSDG20" "-I.\..\..\src\ReportModel" "-I.\..\..\3part\libzkq\include" "-I.\..\..\3part\tadpole\include\tpBase" "-I.\..\..\3part\opencv3.4.1\include" "-I.\..\..\3part\opencv3.4.1\include\opencv" "-I.\..\..\3part\opencv3.4.1\include\opencv2" "-I.\..\..\3part\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" "-I.\..\..\3part\edcircle\include" - - - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing qdia2thsetting.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DTPMAIN_LIB -DTPMAIN_EXPORTS -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_SQL_LIB -DQT_PRINTSUPPORT_LIB -DQT_NETWORK_LIB -DQT_SERIALPORT_LIB -D_WINDOWS -D%(PreprocessorDefinitions) "-I." "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\ActiveQt" "-I$(QTDIR)\include\QtSerialPort" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSql" "-I$(QTDIR)\include\QtNetwork" "-I.\..\..\src\algorithm" "-I.\..\..\src\tpMain" "-I.\..\..\src\tpMain\thread" "-I.\..\..\src\tpMain\splashScreen" "-I.\..\..\src\tpMain\LightBoxwidget" "-I.\..\..\src\tpMain\QDiskCleanThread" "-I.\..\..\src\tpMain\QPixmapListBar" "-I.\..\..\src\userCtrl" "-I.\..\..\src\NetWheel" "-I.\..\..\src\RasterSDG20" "-I.\..\..\src\ReportModel" "-I.\..\..\3part\libzkq\include" "-I.\..\..\3part\tadpole\include\tpBase" "-I.\..\..\3part\opencv3.4.1\include" "-I.\..\..\3part\opencv3.4.1\include\opencv" "-I.\..\..\3part\opencv3.4.1\include\opencv2" "-I.\..\..\3part\edcircle\include" "-I.\..\..\3part\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" "-I.\lpRawTcp" - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing qdia2thsetting.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DTPMAIN_LIB -DTPMAIN_EXPORTS -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_SQL_LIB -DQT_PRINTSUPPORT_LIB -DQT_NETWORK_LIB -DQT_SERIALPORT_LIB -D%(PreprocessorDefinitions) "-I." "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\ActiveQt" "-I$(QTDIR)\include\QtSerialPort" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSql" "-I$(QTDIR)\include\QtNetwork" "-I.\..\..\src\algorithm" "-I.\..\..\src\tpMain" "-I.\..\..\src\tpMain\thread" "-I.\..\..\src\tpMain\splashScreen" "-I.\..\..\src\tpMain\LightBoxwidget" "-I.\..\..\src\tpMain\QDiskCleanThread" "-I.\..\..\src\tpMain\QPixmapListBar" "-I.\..\..\src\userCtrl" "-I.\..\..\src\NetWheel" "-I.\..\..\src\RasterSDG20" "-I.\..\..\src\ReportModel" "-I.\..\..\3part\libzkq\include" "-I.\..\..\3part\tadpole\include\tpBase" "-I.\..\..\3part\opencv3.4.1\include" "-I.\..\..\3part\opencv3.4.1\include\opencv" "-I.\..\..\3part\opencv3.4.1\include\opencv2" "-I.\..\..\3part\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" "-I.\..\..\3part\edcircle\include" - - - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing qchannelmanager.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DTPMAIN_LIB -DTPMAIN_EXPORTS -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_SQL_LIB -DQT_PRINTSUPPORT_LIB -DQT_NETWORK_LIB -DQT_SERIALPORT_LIB -D_WINDOWS -D%(PreprocessorDefinitions) "-I." "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\ActiveQt" "-I$(QTDIR)\include\QtSerialPort" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSql" "-I$(QTDIR)\include\QtNetwork" "-I.\..\..\src\algorithm" "-I.\..\..\src\tpMain" "-I.\..\..\src\tpMain\thread" "-I.\..\..\src\tpMain\splashScreen" "-I.\..\..\src\tpMain\LightBoxwidget" "-I.\..\..\src\tpMain\QDiskCleanThread" "-I.\..\..\src\tpMain\QPixmapListBar" "-I.\..\..\src\userCtrl" "-I.\..\..\src\NetWheel" "-I.\..\..\src\RasterSDG20" "-I.\..\..\src\ReportModel" "-I.\..\..\3part\libzkq\include" "-I.\..\..\3part\tadpole\include\tpBase" "-I.\..\..\3part\opencv3.4.1\include" "-I.\..\..\3part\opencv3.4.1\include\opencv" "-I.\..\..\3part\opencv3.4.1\include\opencv2" "-I.\..\..\3part\edcircle\include" "-I.\..\..\3part\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" "-I.\lpRawTcp" - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing qchannelmanager.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DTPMAIN_LIB -DTPMAIN_EXPORTS -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_SQL_LIB -DQT_PRINTSUPPORT_LIB -DQT_NETWORK_LIB -DQT_SERIALPORT_LIB -D%(PreprocessorDefinitions) "-I." "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\ActiveQt" "-I$(QTDIR)\include\QtSerialPort" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSql" "-I$(QTDIR)\include\QtNetwork" "-I.\..\..\src\algorithm" "-I.\..\..\src\tpMain" "-I.\..\..\src\tpMain\thread" "-I.\..\..\src\tpMain\splashScreen" "-I.\..\..\src\tpMain\LightBoxwidget" "-I.\..\..\src\tpMain\QDiskCleanThread" "-I.\..\..\src\tpMain\QPixmapListBar" "-I.\..\..\src\userCtrl" "-I.\..\..\src\NetWheel" "-I.\..\..\src\RasterSDG20" "-I.\..\..\src\ReportModel" "-I.\..\..\3part\libzkq\include" "-I.\..\..\3part\tadpole\include\tpBase" "-I.\..\..\3part\opencv3.4.1\include" "-I.\..\..\3part\opencv3.4.1\include\opencv" "-I.\..\..\3part\opencv3.4.1\include\opencv2" "-I.\..\..\3part\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" "-I.\..\..\3part\edcircle\include" - - - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing qaddtimedlg.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DTPMAIN_LIB -DTPMAIN_EXPORTS -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_SQL_LIB -DQT_PRINTSUPPORT_LIB -DQT_NETWORK_LIB -DQT_SERIALPORT_LIB -D_WINDOWS -D%(PreprocessorDefinitions) "-I." "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\ActiveQt" "-I$(QTDIR)\include\QtSerialPort" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSql" "-I$(QTDIR)\include\QtNetwork" "-I.\..\..\src\algorithm" "-I.\..\..\src\tpMain" "-I.\..\..\src\tpMain\thread" "-I.\..\..\src\tpMain\splashScreen" "-I.\..\..\src\tpMain\LightBoxwidget" "-I.\..\..\src\tpMain\QDiskCleanThread" "-I.\..\..\src\tpMain\QPixmapListBar" "-I.\..\..\src\userCtrl" "-I.\..\..\src\NetWheel" "-I.\..\..\src\RasterSDG20" "-I.\..\..\src\ReportModel" "-I.\..\..\3part\libzkq\include" "-I.\..\..\3part\tadpole\include\tpBase" "-I.\..\..\3part\opencv3.4.1\include" "-I.\..\..\3part\opencv3.4.1\include\opencv" "-I.\..\..\3part\opencv3.4.1\include\opencv2" "-I.\..\..\3part\edcircle\include" "-I.\..\..\3part\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" "-I.\lpRawTcp" - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing qaddtimedlg.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DTPMAIN_LIB -DTPMAIN_EXPORTS -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_SQL_LIB -DQT_PRINTSUPPORT_LIB -DQT_NETWORK_LIB -DQT_SERIALPORT_LIB -D%(PreprocessorDefinitions) "-I." "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\ActiveQt" "-I$(QTDIR)\include\QtSerialPort" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSql" "-I$(QTDIR)\include\QtNetwork" "-I.\..\..\src\algorithm" "-I.\..\..\src\tpMain" "-I.\..\..\src\tpMain\thread" "-I.\..\..\src\tpMain\splashScreen" "-I.\..\..\src\tpMain\LightBoxwidget" "-I.\..\..\src\tpMain\QDiskCleanThread" "-I.\..\..\src\tpMain\QPixmapListBar" "-I.\..\..\src\userCtrl" "-I.\..\..\src\NetWheel" "-I.\..\..\src\RasterSDG20" "-I.\..\..\src\ReportModel" "-I.\..\..\3part\libzkq\include" "-I.\..\..\3part\tadpole\include\tpBase" "-I.\..\..\3part\opencv3.4.1\include" "-I.\..\..\3part\opencv3.4.1\include\opencv" "-I.\..\..\3part\opencv3.4.1\include\opencv2" "-I.\..\..\3part\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" "-I.\..\..\3part\edcircle\include" - $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing qaddmodel.h... @@ -790,17 +629,6 @@ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DTPMAIN_LIB -DTPMAIN_EXPORTS -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_SQL_LIB -DQT_PRINTSUPPORT_LIB -DQT_NETWORK_LIB -DQT_SERIALPORT_LIB -D%(PreprocessorDefinitions) "-I." "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\ActiveQt" "-I$(QTDIR)\include\QtSerialPort" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSql" "-I$(QTDIR)\include\QtNetwork" "-I.\..\..\src\algorithm" "-I.\..\..\src\tpMain" "-I.\..\..\src\tpMain\thread" "-I.\..\..\src\tpMain\splashScreen" "-I.\..\..\src\tpMain\LightBoxwidget" "-I.\..\..\src\tpMain\QDiskCleanThread" "-I.\..\..\src\tpMain\QPixmapListBar" "-I.\..\..\src\userCtrl" "-I.\..\..\src\NetWheel" "-I.\..\..\src\RasterSDG20" "-I.\..\..\src\ReportModel" "-I.\..\..\3part\libzkq\include" "-I.\..\..\3part\tadpole\include\tpBase" "-I.\..\..\3part\opencv3.4.1\include" "-I.\..\..\3part\opencv3.4.1\include\opencv" "-I.\..\..\3part\opencv3.4.1\include\opencv2" "-I.\..\..\3part\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" "-I.\..\..\3part\edcircle\include" - - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing ChannelInfo.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DTPMAIN_LIB -DTPMAIN_EXPORTS -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_SQL_LIB -DQT_PRINTSUPPORT_LIB -DQT_NETWORK_LIB -DQT_SERIALPORT_LIB -D_WINDOWS -D%(PreprocessorDefinitions) "-I." "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\ActiveQt" "-I$(QTDIR)\include\QtSerialPort" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSql" "-I$(QTDIR)\include\QtNetwork" "-I.\..\..\src\algorithm" "-I.\..\..\src\tpMain" "-I.\..\..\src\tpMain\thread" "-I.\..\..\src\tpMain\splashScreen" "-I.\..\..\src\tpMain\LightBoxwidget" "-I.\..\..\src\tpMain\QDiskCleanThread" "-I.\..\..\src\tpMain\QPixmapListBar" "-I.\..\..\src\userCtrl" "-I.\..\..\src\NetWheel" "-I.\..\..\src\RasterSDG20" "-I.\..\..\src\ReportModel" "-I.\..\..\3part\libzkq\include" "-I.\..\..\3part\tadpole\include\tpBase" "-I.\..\..\3part\opencv3.4.1\include" "-I.\..\..\3part\opencv3.4.1\include\opencv" "-I.\..\..\3part\opencv3.4.1\include\opencv2" "-I.\..\..\3part\edcircle\include" "-I.\..\..\3part\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" "-I.\lpRawTcp" - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing ChannelInfo.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DTPMAIN_LIB -DTPMAIN_EXPORTS -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_SQL_LIB -DQT_PRINTSUPPORT_LIB -DQT_NETWORK_LIB -DQT_SERIALPORT_LIB -D%(PreprocessorDefinitions) "-I." "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\ActiveQt" "-I$(QTDIR)\include\QtSerialPort" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSql" "-I$(QTDIR)\include\QtNetwork" "-I.\..\..\src\algorithm" "-I.\..\..\src\tpMain" "-I.\..\..\src\tpMain\thread" "-I.\..\..\src\tpMain\splashScreen" "-I.\..\..\src\tpMain\LightBoxwidget" "-I.\..\..\src\tpMain\QDiskCleanThread" "-I.\..\..\src\tpMain\QPixmapListBar" "-I.\..\..\src\userCtrl" "-I.\..\..\src\NetWheel" "-I.\..\..\src\RasterSDG20" "-I.\..\..\src\ReportModel" "-I.\..\..\3part\libzkq\include" "-I.\..\..\3part\tadpole\include\tpBase" "-I.\..\..\3part\opencv3.4.1\include" "-I.\..\..\3part\opencv3.4.1\include\opencv" "-I.\..\..\3part\opencv3.4.1\include\opencv2" "-I.\..\..\3part\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" "-I.\..\..\3part\edcircle\include" - - $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing customtableview.h... @@ -867,7 +695,6 @@ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DTPMAIN_LIB -DTPMAIN_EXPORTS -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_SQL_LIB -DQT_PRINTSUPPORT_LIB -DQT_NETWORK_LIB -DQT_SERIALPORT_LIB -D%(PreprocessorDefinitions) "-I." "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\ActiveQt" "-I$(QTDIR)\include\QtSerialPort" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSql" "-I$(QTDIR)\include\QtNetwork" "-I.\..\..\src\algorithm" "-I.\..\..\src\tpMain" "-I.\..\..\src\tpMain\thread" "-I.\..\..\src\tpMain\splashScreen" "-I.\..\..\src\tpMain\LightBoxwidget" "-I.\..\..\src\tpMain\QDiskCleanThread" "-I.\..\..\src\tpMain\QPixmapListBar" "-I.\..\..\src\userCtrl" "-I.\..\..\src\NetWheel" "-I.\..\..\src\RasterSDG20" "-I.\..\..\src\ReportModel" "-I.\..\..\3part\libzkq\include" "-I.\..\..\3part\tadpole\include\tpBase" "-I.\..\..\3part\opencv3.4.1\include" "-I.\..\..\3part\opencv3.4.1\include\opencv" "-I.\..\..\3part\opencv3.4.1\include\opencv2" "-I.\..\..\3part\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" "-I.\..\..\3part\edcircle\include" - $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing ProgressView.h... @@ -878,16 +705,6 @@ .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DTPMAIN_LIB -DTPMAIN_EXPORTS -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_SQL_LIB -DQT_PRINTSUPPORT_LIB -DQT_NETWORK_LIB -DQT_SERIALPORT_LIB -D%(PreprocessorDefinitions) "-I." "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\ActiveQt" "-I$(QTDIR)\include\QtSerialPort" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSql" "-I$(QTDIR)\include\QtNetwork" "-I.\..\..\src\algorithm" "-I.\..\..\src\tpMain" "-I.\..\..\src\tpMain\thread" "-I.\..\..\src\tpMain\splashScreen" "-I.\..\..\src\tpMain\LightBoxwidget" "-I.\..\..\src\tpMain\QDiskCleanThread" "-I.\..\..\src\tpMain\QPixmapListBar" "-I.\..\..\src\userCtrl" "-I.\..\..\src\NetWheel" "-I.\..\..\src\RasterSDG20" "-I.\..\..\src\ReportModel" "-I.\..\..\3part\libzkq\include" "-I.\..\..\3part\tadpole\include\tpBase" "-I.\..\..\3part\opencv3.4.1\include" "-I.\..\..\3part\opencv3.4.1\include\opencv" "-I.\..\..\3part\opencv3.4.1\include\opencv2" "-I.\..\..\3part\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" "-I.\..\..\3part\edcircle\include" - - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing qaddchanneldlg.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DTPMAIN_LIB -DTPMAIN_EXPORTS -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_SQL_LIB -DQT_PRINTSUPPORT_LIB -DQT_NETWORK_LIB -DQT_SERIALPORT_LIB -D_WINDOWS -D%(PreprocessorDefinitions) "-I." "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\ActiveQt" "-I$(QTDIR)\include\QtSerialPort" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSql" "-I$(QTDIR)\include\QtNetwork" "-I.\..\..\src\algorithm" "-I.\..\..\src\tpMain" "-I.\..\..\src\tpMain\thread" "-I.\..\..\src\tpMain\splashScreen" "-I.\..\..\src\tpMain\LightBoxwidget" "-I.\..\..\src\tpMain\QDiskCleanThread" "-I.\..\..\src\tpMain\QPixmapListBar" "-I.\..\..\src\userCtrl" "-I.\..\..\src\NetWheel" "-I.\..\..\src\RasterSDG20" "-I.\..\..\src\ReportModel" "-I.\..\..\3part\libzkq\include" "-I.\..\..\3part\tadpole\include\tpBase" "-I.\..\..\3part\opencv3.4.1\include" "-I.\..\..\3part\opencv3.4.1\include\opencv" "-I.\..\..\3part\opencv3.4.1\include\opencv2" "-I.\..\..\3part\edcircle\include" "-I.\..\..\3part\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" "-I.\lpRawTcp" - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing qaddchanneldlg.h... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DTPMAIN_LIB -DTPMAIN_EXPORTS -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_SQL_LIB -DQT_PRINTSUPPORT_LIB -DQT_NETWORK_LIB -DQT_SERIALPORT_LIB -D%(PreprocessorDefinitions) "-I." "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\ActiveQt" "-I$(QTDIR)\include\QtSerialPort" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSql" "-I$(QTDIR)\include\QtNetwork" "-I.\..\..\src\algorithm" "-I.\..\..\src\tpMain" "-I.\..\..\src\tpMain\thread" "-I.\..\..\src\tpMain\splashScreen" "-I.\..\..\src\tpMain\LightBoxwidget" "-I.\..\..\src\tpMain\QDiskCleanThread" "-I.\..\..\src\tpMain\QPixmapListBar" "-I.\..\..\src\userCtrl" "-I.\..\..\src\NetWheel" "-I.\..\..\src\RasterSDG20" "-I.\..\..\src\ReportModel" "-I.\..\..\3part\libzkq\include" "-I.\..\..\3part\tadpole\include\tpBase" "-I.\..\..\3part\opencv3.4.1\include" "-I.\..\..\3part\opencv3.4.1\include\opencv" "-I.\..\..\3part\opencv3.4.1\include\opencv2" "-I.\..\..\3part\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" "-I.\..\..\3part\edcircle\include" - $(QTDIR)\bin\moc.exe;%(FullPath) @@ -1230,46 +1047,6 @@ .\GeneratedFiles\ui_%(Filename).h;%(Outputs) "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" - - $(QTDIR)\bin\uic.exe;%(AdditionalInputs) - Uic%27ing %(Identity)... - .\GeneratedFiles\ui_%(Filename).h;%(Outputs) - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" - $(QTDIR)\bin\uic.exe;%(AdditionalInputs) - Uic%27ing %(Identity)... - .\GeneratedFiles\ui_%(Filename).h;%(Outputs) - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" - - - $(QTDIR)\bin\uic.exe;%(AdditionalInputs) - Uic%27ing %(Identity)... - .\GeneratedFiles\ui_%(Filename).h;%(Outputs) - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" - $(QTDIR)\bin\uic.exe;%(AdditionalInputs) - Uic%27ing %(Identity)... - .\GeneratedFiles\ui_%(Filename).h;%(Outputs) - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" - - - $(QTDIR)\bin\uic.exe;%(AdditionalInputs) - Uic%27ing %(Identity)... - .\GeneratedFiles\ui_%(Filename).h;%(Outputs) - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" - $(QTDIR)\bin\uic.exe;%(AdditionalInputs) - Uic%27ing %(Identity)... - .\GeneratedFiles\ui_%(Filename).h;%(Outputs) - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" - - - $(QTDIR)\bin\uic.exe;%(AdditionalInputs) - Uic%27ing %(Identity)... - .\GeneratedFiles\ui_%(Filename).h;%(Outputs) - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" - $(QTDIR)\bin\uic.exe;%(AdditionalInputs) - Uic%27ing %(Identity)... - .\GeneratedFiles\ui_%(Filename).h;%(Outputs) - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" - $(QTDIR)\bin\uic.exe;%(AdditionalInputs) Uic%27ing %(Identity)... @@ -1280,28 +1057,6 @@ .\GeneratedFiles\ui_%(Filename).h;%(Outputs) "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" - - $(QTDIR)\bin\uic.exe;%(AdditionalInputs) - Uic%27ing %(Identity)... - .\GeneratedFiles\ui_%(Filename).h;%(Outputs) - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" - $(QTDIR)\bin\uic.exe;%(AdditionalInputs) - Uic%27ing %(Identity)... - .\GeneratedFiles\ui_%(Filename).h;%(Outputs) - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" - - - - - $(QTDIR)\bin\uic.exe;%(AdditionalInputs) - Uic%27ing %(Identity)... - .\GeneratedFiles\ui_%(Filename).h;%(Outputs) - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" - $(QTDIR)\bin\uic.exe;%(AdditionalInputs) - Uic%27ing %(Identity)... - .\GeneratedFiles\ui_%(Filename).h;%(Outputs) - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" - @@ -1315,18 +1070,6 @@ "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" - - - $(QTDIR)\bin\uic.exe;%(AdditionalInputs) - Uic%27ing %(Identity)... - .\GeneratedFiles\ui_%(Filename).h;%(Outputs) - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" - $(QTDIR)\bin\uic.exe;%(AdditionalInputs) - Uic%27ing %(Identity)... - .\GeneratedFiles\ui_%(Filename).h;%(Outputs) - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" - - $(QTDIR)\bin\uic.exe;%(AdditionalInputs) diff --git a/tpvs17/tpMain/tpMain.vcxproj.filters b/tpvs17/tpMain/tpMain.vcxproj.filters index 59cd386..76a0de5 100644 --- a/tpvs17/tpMain/tpMain.vcxproj.filters +++ b/tpvs17/tpMain/tpMain.vcxproj.filters @@ -39,12 +39,6 @@ {312b19f6-47df-4a06-8add-8ddd68fa0099} - - {13f040ba-7cf4-4552-919b-65651536aef7} - - - {f294c213-9a3f-4c3f-a74d-5dfc28bba3c3} - {9e52d532-ebd9-4a72-9d07-596e45df0ece} @@ -142,9 +136,6 @@ Generated Files\Release - - Source Files - Generated Files\Debug @@ -241,9 +232,6 @@ Generated Files\Release - - Source Files - Generated Files\Debug @@ -295,9 +283,6 @@ Source Files - - Source Files - Source Files @@ -316,15 +301,6 @@ Generated Files\Release - - channel - - - WheelNet - - - WheelNet - sql @@ -397,24 +373,9 @@ UIFile - - UIFile - - - UIFile - UIFile - - UIFile - - - UIFile - - - UIFile - Generated Files\Debug @@ -451,15 +412,9 @@ Generated Files\Release - - newUI - newUI - - newUI - newUI @@ -612,9 +567,6 @@ Header Files - - Header Files - Header Files @@ -633,15 +585,9 @@ Header Files - - Header Files - Header Files - - WheelNet - sql @@ -666,39 +612,15 @@ Generated Files - - Generated Files - - - Generated Files - - - Generated Files - - - Generated Files - Generated Files - - Generated Files - - - Generated Files - Generated Files - - Generated Files - Generated Files - - WheelNet - Generated Files @@ -750,6 +672,9 @@ Header Files + + Header Files + @@ -776,12 +701,6 @@ Header Files - - channel - - - WheelNet - Thread @@ -791,9 +710,6 @@ Thread - - Thread - CustomUILib\Model @@ -839,66 +755,24 @@ UIFile - - UIFile - - - UIFile - - - UIFile - - - UIFile - - - UIFile - - - UIFile - - - UIFile - - - UIFile - UIFile UIFile - - UIFile - - - UIFile - - - newUI - newUI newUI - - newUI - - - newUI - newUI newUI - - newUI - newUI @@ -1145,9 +1019,6 @@ Resource Files - - - Translation Files @@ -1156,4 +1027,9 @@ Translation Files + + + Header Files + + \ No newline at end of file diff --git a/tpvs17/valueMainUI/main.cpp b/tpvs17/valueMainUI/main.cpp new file mode 100644 index 0000000..80ccc63 --- /dev/null +++ b/tpvs17/valueMainUI/main.cpp @@ -0,0 +1,10 @@ +#include "valueMainUI.h" +#include + +int main(int argc, char *argv[]) +{ + QApplication a(argc, argv); + valueMainUI w; + w.show(); + return a.exec(); +} diff --git a/tpvs17/valueMainUI/valueMainUI.cpp b/tpvs17/valueMainUI/valueMainUI.cpp new file mode 100644 index 0000000..23af7dd --- /dev/null +++ b/tpvs17/valueMainUI/valueMainUI.cpp @@ -0,0 +1,7 @@ +#include "valueMainUI.h" + +valueMainUI::valueMainUI(QWidget *parent) + : QMainWindow(parent) +{ + ui.setupUi(this); +} diff --git a/tpvs17/valueMainUI/valueMainUI.h b/tpvs17/valueMainUI/valueMainUI.h new file mode 100644 index 0000000..8b78f50 --- /dev/null +++ b/tpvs17/valueMainUI/valueMainUI.h @@ -0,0 +1,15 @@ +#pragma once + +#include +#include "ui_valueMainUI.h" + +class valueMainUI : public QMainWindow +{ + Q_OBJECT + +public: + valueMainUI(QWidget *parent = Q_NULLPTR); + +private: + Ui::valueMainUIClass ui; +}; diff --git a/tpvs17/valueMainUI/valueMainUI.qrc b/tpvs17/valueMainUI/valueMainUI.qrc new file mode 100644 index 0000000..d8308b4 --- /dev/null +++ b/tpvs17/valueMainUI/valueMainUI.qrc @@ -0,0 +1,4 @@ + + + + diff --git a/tpvs17/valueMainUI/valueMainUI.ui b/tpvs17/valueMainUI/valueMainUI.ui new file mode 100644 index 0000000..7d820ca --- /dev/null +++ b/tpvs17/valueMainUI/valueMainUI.ui @@ -0,0 +1,29 @@ + + valueMainUIClass + + + valueMainUIClass + + + + 0 + 0 + 600 + 400 + + + + valueMainUI + + + + + + + + + + + + + diff --git a/tpvs17/valueMainUI/valueMainUI.vcxproj b/tpvs17/valueMainUI/valueMainUI.vcxproj new file mode 100644 index 0000000..40f6878 --- /dev/null +++ b/tpvs17/valueMainUI/valueMainUI.vcxproj @@ -0,0 +1,139 @@ + + + + + Debug + x64 + + + Release + x64 + + + + {1FD21183-3E4D-4A6B-88F3-B7D184868736} + Qt4VSv1.0 + 10.0.17763.0 + + + + Application + v141 + + + Application + v141 + + + + $(MSBuildProjectDirectory)\QtMsBuild + + + $(SolutionDir)$(Platform)\$(Configuration)\ + + + $(SolutionDir)$(Platform)\$(Configuration)\ + + + + + + + + + + + + + + + + + + + true + UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_CORE_LIB;QT_GUI_LIB;QT_WEBSOCKETS_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions) + .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtWebSockets;$(QTDIR)\include\QtWidgets;%(AdditionalIncludeDirectories) + Disabled + ProgramDatabase + MultiThreadedDebugDLL + true + + + Windows + $(OutDir)\$(ProjectName).exe + $(QTDIR)\lib;%(AdditionalLibraryDirectories) + true + qtmaind.lib;Qt5Cored.lib;Qt5Guid.lib;Qt5WebSocketsd.lib;Qt5Widgetsd.lib;%(AdditionalDependencies) + + + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + Moc'ing %(Identity)... + .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtWebSockets;$(QTDIR)\include\QtWidgets;%(AdditionalIncludeDirectories) + UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_CORE_LIB;QT_GUI_LIB;QT_WEBSOCKETS_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions) + + + Uic'ing %(Identity)... + .\GeneratedFiles\ui_%(Filename).h + + + Rcc'ing %(Identity)... + .\GeneratedFiles\qrc_%(Filename).cpp + + + + + true + UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;QT_WEBSOCKETS_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions) + .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtWebSockets;$(QTDIR)\include\QtWidgets;%(AdditionalIncludeDirectories) + + MultiThreadedDLL + true + + + Windows + $(OutDir)\$(ProjectName).exe + $(QTDIR)\lib;%(AdditionalLibraryDirectories) + false + qtmain.lib;Qt5Core.lib;Qt5Gui.lib;Qt5WebSockets.lib;Qt5Widgets.lib;%(AdditionalDependencies) + + + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + Moc'ing %(Identity)... + .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtWebSockets;$(QTDIR)\include\QtWidgets;%(AdditionalIncludeDirectories) + UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;QT_WEBSOCKETS_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions) + + + Uic'ing %(Identity)... + .\GeneratedFiles\ui_%(Filename).h + + + Rcc'ing %(Identity)... + .\GeneratedFiles\qrc_%(Filename).cpp + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tpvs17/valueMainUI/valueMainUI.vcxproj.filters b/tpvs17/valueMainUI/valueMainUI.vcxproj.filters new file mode 100644 index 0000000..a581803 --- /dev/null +++ b/tpvs17/valueMainUI/valueMainUI.vcxproj.filters @@ -0,0 +1,55 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {D9D6E242-F8AF-46E4-B9FD-80ECBC20BA3E} + qrc;* + false + + + {99349809-55BA-4b9d-BF79-8FDBB0286EB3} + ui + + + {D9D6E242-F8AF-46E4-B9FD-80ECBC20BA3E} + qrc;* + false + + + {71ED8ED8-ACB9-4CE9-BBE1-E00B30144E11} + moc;h;cpp + False + + + + + Source Files + + + Source Files + + + + + Header Files + + + + + Form Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/tpvs17/wheel.sln b/tpvs17/wheel.sln index 4e3d525..706ade0 100644 --- a/tpvs17/wheel.sln +++ b/tpvs17/wheel.sln @@ -27,6 +27,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lpCoreCtrl", "lpCoreCtrl\lp EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tpCamVirtual", "tpCamVirtual\tpCamVirtual.vcxproj", "{707DDF6F-B78B-42F7-9EAD-E786C0FCD5FF}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "valueMainUI", "valueMainUI\valueMainUI.vcxproj", "{1FD21183-3E4D-4A6B-88F3-B7D184868736}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Enchanter", "Enchanter\Enchanter.vcxproj", "{7B76D75A-0E01-451E-880E-FB9AC63A914B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -113,12 +117,24 @@ Global {707DDF6F-B78B-42F7-9EAD-E786C0FCD5FF}.Release|x64.Build.0 = Release|x64 {707DDF6F-B78B-42F7-9EAD-E786C0FCD5FF}.Release|x86.ActiveCfg = Release|Win32 {707DDF6F-B78B-42F7-9EAD-E786C0FCD5FF}.Release|x86.Build.0 = Release|Win32 + {1FD21183-3E4D-4A6B-88F3-B7D184868736}.Debug|x64.ActiveCfg = Debug|x64 + {1FD21183-3E4D-4A6B-88F3-B7D184868736}.Debug|x64.Build.0 = Debug|x64 + {1FD21183-3E4D-4A6B-88F3-B7D184868736}.Debug|x86.ActiveCfg = Debug|x64 + {1FD21183-3E4D-4A6B-88F3-B7D184868736}.Release|x64.ActiveCfg = Release|x64 + {1FD21183-3E4D-4A6B-88F3-B7D184868736}.Release|x64.Build.0 = Release|x64 + {1FD21183-3E4D-4A6B-88F3-B7D184868736}.Release|x86.ActiveCfg = Release|x64 + {7B76D75A-0E01-451E-880E-FB9AC63A914B}.Debug|x64.ActiveCfg = Debug|x64 + {7B76D75A-0E01-451E-880E-FB9AC63A914B}.Debug|x64.Build.0 = Debug|x64 + {7B76D75A-0E01-451E-880E-FB9AC63A914B}.Debug|x86.ActiveCfg = Debug|x64 + {7B76D75A-0E01-451E-880E-FB9AC63A914B}.Release|x64.ActiveCfg = Release|x64 + {7B76D75A-0E01-451E-880E-FB9AC63A914B}.Release|x64.Build.0 = Release|x64 + {7B76D75A-0E01-451E-880E-FB9AC63A914B}.Release|x86.ActiveCfg = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - Qt5Version = qt5.9.4-msvc2017-x64 SolutionGuid = {CD365F32-5EAC-4A16-AD47-BFB1D8E5511A} + Qt5Version = qt5.9.4-msvc2017-x64 EndGlobalSection EndGlobal