From fc5d286602be9cc7abbf50d606ad126e3e06a94b Mon Sep 17 00:00:00 2001 From: bobpan Date: Thu, 10 Dec 2020 14:21:47 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=A2=9E=E5=8A=A0=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E5=8C=B9=E9=85=8D=E7=AE=97=E6=B3=95=E6=8E=A5=E5=8F=A3=E7=B1=BB?= =?UTF-8?q?=EF=BC=8C=E4=B8=8Ecyclop=E4=B8=AD=E7=9A=84=E7=AE=97=E6=B3=95?= =?UTF-8?q?=E5=88=86=E7=A6=BB=202=E3=80=81=E6=95=B4=E7=90=86=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=EF=BC=8C=E7=A7=BB=E9=99=A4=E5=8E=9F=E6=9D=A5=E4=B8=8D?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E7=9A=84UI=E9=80=BB=E8=BE=91=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/ImageCompare/ImageCompareModel.h | 7 +- src/RasterSDG20/rastersdg20_global.h | 8 +- src/algorithm/AlgorithmFluorescence.cpp | 24 +- src/algorithm/ImageProcess.cpp | 1 + src/algorithm/tpAlgorithm.cpp | 1 - src/interface/ICompareModel.h | 57 + src/{tpMain => interface}/IWheelModel.h | 14 +- src/{tpMain => interface}/Result2Ui.h | 0 src/tpMain/ConnectModeUi.cpp | 421 ----- src/tpMain/ConnectModeUi.h | 53 - src/tpMain/DetectState.cpp | 7 +- src/tpMain/DetectState.h | 18 +- src/tpMain/DevelopUi.cpp | 1449 ------------------ src/tpMain/DevelopUi.h | 128 -- src/tpMain/HannelUI.cpp | 568 ------- src/tpMain/HannelUI.h | 61 - src/tpMain/IDetectState.h | 16 - src/tpMain/IWheelCtrl.h | 1 - src/tpMain/IWheelUi.h | 28 - src/tpMain/IWheelUis.h | 17 - src/tpMain/MainUi.cpp | 373 ----- src/tpMain/MainUi.h | 50 - src/tpMain/ModelManager.h | 11 +- src/tpMain/ModelMgrUi.cpp | 1184 -------------- src/tpMain/ModelMgrUi.h | 96 -- src/tpMain/ModelResult.cpp | 11 - src/tpMain/ModelResult.h | 15 - src/tpMain/ProgressView.h | 2 +- src/tpMain/StatusBarUi.cpp | 190 --- src/tpMain/StatusBarUi.h | 27 - src/tpMain/ToolBarUi.cpp | 315 ---- src/tpMain/ToolBarUi.h | 33 - src/tpMain/WheelCtrl.cpp | 19 +- src/tpMain/WheelCtrl.h | 2 - src/tpMain/WheelModel.cpp | 4 +- src/tpMain/WheelModel.h | 7 +- src/tpMain/WheelUis.cpp | 206 --- src/tpMain/WheelUis.h | 46 - src/tpMain/lpsingleton.h | 54 + src/tpMain/qmainfilter_wheeldetect.cpp | 72 - src/tpMain/qmainfilter_wheeldetect.h | 60 - src/tpMain/qmainfilter_wheeldetect_child.cpp | 1426 ----------------- src/tpMain/qmainfilter_wheeldetect_child.h | 162 -- src/tpMain/qworkmgrui.cpp | 13 +- src/tpMain/qworkmgrui.h | 1 - src/tpMain/qworkmgrui.ui222 | 402 ----- src/tpMain/timemgrui.cpp | 272 ---- src/tpMain/timemgrui.h | 35 - tpvs17/tpAlgorithmQt/tpAlgorithmQt.vcxproj | 2 +- tpvs17/tpMain/QModelMgrDlg.cpp | 19 +- tpvs17/tpMain/QModelMgrDlg.h | 2 +- tpvs17/tpMain/lpMainWin.cpp | 87 +- tpvs17/tpMain/lpMainWin.h | 1 - tpvs17/tpMain/tpMain.vcxproj | 290 +--- tpvs17/tpMain/tpMain.vcxproj.filters | 87 -- tpvs17/wheel.sln | 6 + 56 files changed, 297 insertions(+), 8164 deletions(-) create mode 100644 src/interface/ICompareModel.h rename src/{tpMain => interface}/IWheelModel.h (84%) rename src/{tpMain => interface}/Result2Ui.h (100%) delete mode 100644 src/tpMain/ConnectModeUi.cpp delete mode 100644 src/tpMain/ConnectModeUi.h delete mode 100644 src/tpMain/DevelopUi.cpp delete mode 100644 src/tpMain/DevelopUi.h delete mode 100644 src/tpMain/HannelUI.cpp delete mode 100644 src/tpMain/HannelUI.h delete mode 100644 src/tpMain/IDetectState.h delete mode 100644 src/tpMain/IWheelUi.h delete mode 100644 src/tpMain/IWheelUis.h delete mode 100644 src/tpMain/MainUi.cpp delete mode 100644 src/tpMain/MainUi.h delete mode 100644 src/tpMain/ModelMgrUi.cpp delete mode 100644 src/tpMain/ModelMgrUi.h delete mode 100644 src/tpMain/ModelResult.cpp delete mode 100644 src/tpMain/ModelResult.h delete mode 100644 src/tpMain/StatusBarUi.cpp delete mode 100644 src/tpMain/StatusBarUi.h delete mode 100644 src/tpMain/ToolBarUi.cpp delete mode 100644 src/tpMain/ToolBarUi.h delete mode 100644 src/tpMain/WheelUis.cpp delete mode 100644 src/tpMain/WheelUis.h create mode 100644 src/tpMain/lpsingleton.h delete mode 100644 src/tpMain/qmainfilter_wheeldetect.cpp delete mode 100644 src/tpMain/qmainfilter_wheeldetect.h delete mode 100644 src/tpMain/qmainfilter_wheeldetect_child.cpp delete mode 100644 src/tpMain/qmainfilter_wheeldetect_child.h delete mode 100644 src/tpMain/qworkmgrui.ui222 delete mode 100644 src/tpMain/timemgrui.cpp delete mode 100644 src/tpMain/timemgrui.h diff --git a/src/ImageCompare/ImageCompareModel.h b/src/ImageCompare/ImageCompareModel.h index 1df503a..622131c 100644 --- a/src/ImageCompare/ImageCompareModel.h +++ b/src/ImageCompare/ImageCompareModel.h @@ -14,6 +14,7 @@ #include #include #include "MultiScaleObj.h" +#include "ICompareModel.h" #define COLS_SCALE (float)(1200.0/ 416.0) using std::set; @@ -23,7 +24,7 @@ using std::string; using namespace cv; class MultiScaleImageCompareModel; -class ImageCompareModel +class ImageCompareModel:public ICompareModel { public: class RotateMatchResult @@ -104,7 +105,7 @@ public: int type = CV_32FC1); static void genCandidateRepeatNums(set& canNums); - static int computeRepeatNum(const Mat& img); + int computeRepeatNum(const Mat& img); static int recognizeLowerExtremes(const Mat& vec, set canNums, int extremeRefineRange = 5, vector *pExtemeIdxVec = 0); static int recognizeRepeatedLocalExtremas(const Mat& vec, const set& canNums, int extremeRefineRange = 5, vector *pExtremeIdxVec = 0); static void genUniformSepIdx(int num, int startIdx, int endIdx, vector& cenVec); @@ -230,7 +231,7 @@ public: Mat getInsideWeightImg() const{ return mInsideWeightMat; } float getInnerR() const { return rInner; } - Mat getBaseImg() const { return mAlignBaseImg; } + virtual Mat getBaseImg() const { return mAlignBaseImg; } void setBaseImg(const Mat& img) { mAlignBaseImg = img; } diff --git a/src/RasterSDG20/rastersdg20_global.h b/src/RasterSDG20/rastersdg20_global.h index d22cf4f..d72fcf3 100644 --- a/src/RasterSDG20/rastersdg20_global.h +++ b/src/RasterSDG20/rastersdg20_global.h @@ -3,7 +3,7 @@ #include #include "QObject" -#include "IDetectState.h" +//#include "IDetectState.h" #ifdef RASTERSDG20_LIB # define RASTERSDG20_EXPORT Q_DECL_EXPORT #else @@ -12,18 +12,18 @@ class IRasterSDG20 :public QObject{ Q_OBJECT public: - IRasterSDG20(){ pDetectState = NULL; }; + IRasterSDG20(){/* pDetectState = NULL;*/ }; virtual void onStartSampling() = 0; virtual void onShowWidget() = 0; virtual void addThicknessValue(double) = 0; virtual double getThicknessValue() const = 0; virtual QString getThicknessValueStr() const = 0; virtual double getDiameterValue() = 0; - virtual void setDetectStatePtr(IDetectState *mpDetectState){ pDetectState = mpDetectState; }; + //virtual void setDetectStatePtr(IDetectState *mpDetectState){ pDetectState = mpDetectState; }; signals: void sgThickness(double); protected: - IDetectState *pDetectState; + //IDetectState *pDetectState; }; extern "C" RASTERSDG20_EXPORT IRasterSDG20* RasterSDG20Create(const QString filepath); diff --git a/src/algorithm/AlgorithmFluorescence.cpp b/src/algorithm/AlgorithmFluorescence.cpp index 6149ee5..62fca2f 100644 --- a/src/algorithm/AlgorithmFluorescence.cpp +++ b/src/algorithm/AlgorithmFluorescence.cpp @@ -1,18 +1,16 @@ #include "AlgorithmFluorescence.h" -#include "ImageCompareModel.h" #include "ImageProcess.h" -#include "..\tpMain\IWheelModel.h" -#include "ImageCompareModel.h" -#include "QVariant" -#include "QImage" -#include "QDebug" -#include "QPixmap" + +#include +#include +#include +#include #include "CVUtils.h" #include "qtcvutils.h" -#include "qfile.h" -#include "qtextstream.h" -#include "qiodevice.h" -#include "..\tpMain\Result2Ui.h" + +#include "Result2Ui.h" +#include "ICompareModel.h" +#include "IWheelModel.h" #pragma execution_character_set("utf-8") using namespace cv; @@ -78,7 +76,7 @@ QString CAlgorithmFluorescence::bestMatch(const QMap* mod } QString name = strModelName;// i.key(); - ImageCompareModel* pModel = pWheel->getImageComModel(); + ICompareModel* pModel = pWheel->getImageComModel(); if (pModel->getBaseImg().data == NULL) { nIndex++; @@ -179,7 +177,7 @@ int CAlgorithmFluorescence::IImageAnalysis(class IImageObject* pImgObj, TP_ALGOR pResult->m_strModel = str; pResult->m_dMinDis = minDisVec[0]; if (ptr->contains(str) && ptr->value(str)->getImageComModel()) { - ImageCompareModel *pModel = ptr->value(str)->getImageComModel(); + ICompareModel *pModel = ptr->value(str)->getImageComModel(); double d = pModel->getDisThre(); double dValue = (d - minDisVec[0]) / d * 0.4 + 0.6; pResult->m_dScore = dValue; diff --git a/src/algorithm/ImageProcess.cpp b/src/algorithm/ImageProcess.cpp index 1218a9a..9eef3af 100644 --- a/src/algorithm/ImageProcess.cpp +++ b/src/algorithm/ImageProcess.cpp @@ -573,3 +573,4 @@ cv::Mat ImageProcess::getForeImage(const Mat & src, const Mat &backgroundImg) } return (src - resizedBackgroundImg); } + diff --git a/src/algorithm/tpAlgorithm.cpp b/src/algorithm/tpAlgorithm.cpp index 5380f23..86196a8 100644 --- a/src/algorithm/tpAlgorithm.cpp +++ b/src/algorithm/tpAlgorithm.cpp @@ -9,7 +9,6 @@ *******************************************************************************/ #include "iAlgorithm.h" #include "AlgorithmFluorescence.h" -//#include "vld.h" ALGORITHM_API IAlgorithm* Algorithm_Create(class IDetectorEngine*) { return new CAlgorithmFluorescence(); diff --git a/src/interface/ICompareModel.h b/src/interface/ICompareModel.h new file mode 100644 index 0000000..d22dad3 --- /dev/null +++ b/src/interface/ICompareModel.h @@ -0,0 +1,57 @@ +#ifndef _H_ICOMPAREMODEL_H_ +#define _H_ICOMPAREMODEL_H_ +#include +#include +#include +#include + +/*ģƥӿ*/ +using namespace cv; +using namespace std; +class ICompareModel +{ +public: + explicit ICompareModel() {}; + virtual ~ICompareModel() {}; + virtual double compare(Mat srcImage, Mat* pRImg = NULL, int levelNum = 1, bool isFilterSize = true, int flag = 0, + double md_diameter = 0, double md_height = 0) = 0; + + virtual Mat getBaseImg() const = 0; + virtual void setIsEnableCache(bool val) = 0; + virtual double getDisThre() const = 0; + virtual void setDisThre(double val) = 0; + virtual void saveImages(string dirPath) = 0; + virtual bool save2file(string filePath) = 0; + virtual bool readFromFile(string filePath) = 0; + virtual void train(const vector& vec) = 0; + + virtual int getRepeatNum() const = 0; + virtual void setRepeatNum(int val) = 0; + + virtual string getName() const = 0; + virtual void setName(string val) = 0; + + virtual double getDisStdDev() const = 0; + virtual double getDisMean() const = 0; + virtual double getDisMin() const = 0; + virtual double getDisMax() const = 0; + + virtual double getFalseSampleMinDis() const = 0; + virtual double getMeanDiamter() const = 0; + + virtual int computeRepeatNum() = 0; + virtual int computeRepeatNum(const Mat& img) = 0; + + virtual double filterTrainImage(const Mat &img) = 0; + virtual void weightOptimization(const vector& falseSamples) = 0; + virtual void calculateAllParams(const vector& imgVec) = 0; + virtual void computeDisThre(const vector& imgVec, double* pMinDis = NULL, double md_diameter = 0, double md_height = 0) = 0; + + virtual cv::Mat getM8uMaskImg() const = 0; + virtual void setM8uMaskImg(cv::Mat val) = 0; + virtual cv::Mat getM32fMaskImg() const = 0; + virtual void setM32fMaskImg(cv::Mat val) = 0; +}; + +#endif + diff --git a/src/tpMain/IWheelModel.h b/src/interface/IWheelModel.h similarity index 84% rename from src/tpMain/IWheelModel.h rename to src/interface/IWheelModel.h index c5f4838..2bd86e5 100644 --- a/src/tpMain/IWheelModel.h +++ b/src/interface/IWheelModel.h @@ -1,7 +1,9 @@ -#pragma once -#include "qstring.h" +#ifndef _H_IWHEELMODEL_H_ +#define _H_IWHEELMODEL_H_ + +#include class TempImage; -class ImageCompareModel; +class ICompareModel; //extern int nGlobalMinImgs = 10; class IWheelModel { @@ -26,8 +28,8 @@ public: virtual QString getPicPath() const = 0; virtual void setPicPath(QString str) = 0; - virtual ImageCompareModel *getImageComModel() const = 0; - virtual void setImageComModel(ImageCompareModel *) = 0; + virtual ICompareModel *getImageComModel() const = 0; + virtual void setImageComModel(ICompareModel *) = 0; virtual TempImage *getTempImage() const = 0; virtual bool initTmpImage(const QString&) = 0; virtual bool reloadTmpImage(const QString&) = 0; @@ -38,3 +40,5 @@ private: }; +#endif + diff --git a/src/tpMain/Result2Ui.h b/src/interface/Result2Ui.h similarity index 100% rename from src/tpMain/Result2Ui.h rename to src/interface/Result2Ui.h diff --git a/src/tpMain/ConnectModeUi.cpp b/src/tpMain/ConnectModeUi.cpp deleted file mode 100644 index 89b9068..0000000 --- a/src/tpMain/ConnectModeUi.cpp +++ /dev/null @@ -1,421 +0,0 @@ -#include "ConnectModeUi.h" -#include "DetectState.h" -#include "IWheelCtrl.h" -#include "qpushbutton.h" -#include "qlabel.h" -#include "qlistview.h" -#include "ModelTableView.h" -#include "qlineedit.h" -#include "ModelManager.h" -#include "InfoFile.h" -#include "QCheckBox" -#include "QListWidget" -#include "IWheelModel.h" -#include "qpulpewidget.h" -#include "WheelCtrl.h" -#include "WheelNet.h" -#pragma execution_character_set("utf-8") - -ConnectModeUi::ConnectModeUi(const QString strUiName, IWheelCtrl *pCtrl) - : m_pCtrl(pCtrl), m_strUiName(strUiName), IWheelUi(strUiName, pCtrl), m_pView(NULL) -{ - m_pState = pCtrl->getDetectState(); - m_pWidgetMain = NULL; - connect(this, SIGNAL(sgShowMsg(QString)), this, SLOT(onShowMsg(QString))); -} - - -ConnectModeUi::~ConnectModeUi() -{ - if (m_pWidgetMain) { - m_pWidgetMain->close(); - } - if (m_pView){ - delete m_pView; - m_pView = NULL; - } -} - -bool ConnectModeUi::onPolished(QWidget* p) -{ - QString str = p->objectName(); - if (str == "CM_Online_button") { - //m_pBtnOnline = qobject_cast(p); - //m_pBtnOnline->setDisabled(m_pState->IsOnline); - //connect(m_pBtnOnline, SIGNAL(clicked()), this, SLOT(onSwitchOnline())); - } - else if (str == "CM_DisOnline_button"){ - //m_pBtnOffline = qobject_cast(p); - //m_pBtnOffline->setDisabled(!m_pState->IsOnline); - //connect(m_pBtnOffline, SIGNAL(clicked()), this, SLOT(onSwitchOnline())); - } - else if (str == "CM_SaveAll_pb"){ - //m_pBtnSendModel = qobject_cast(p); - //m_pBtnSendModel->setDisabled(m_pState->IsOnline); - connect(p, SIGNAL(clicked()), this, SLOT(onClickButton())); - } - else if (str == "label_Online_State") { - m_pLBModelText = qobject_cast(p); - } - else if (str == "CM_mode_UseDiameter") { - m_UseDiameter = qobject_cast(p); - m_UseDiameter->setChecked(m_pState->bUseDiameter == 1); - } - else if (str == "CM_mode_UseThickness") { - m_UseThickness = qobject_cast(p); - m_UseThickness->setChecked(m_pState->bUseThickness == 1); - } - else if (str == "CM_tableView_BaseModel") { - m_pView = new ModelsView(qobject_cast(p), m_pCtrl->getAllModelMapPtr()); - connect(m_pView, SIGNAL(sgItemStateChange(QString)), this, SLOT(onSaveItemState(QString))); - //connect(m_pCtrl, SIGNAL(sgModelChanged()), m_pView, SLOT(update2AllModels())); - connect(m_pCtrl, SIGNAL(sgModelChanged(QString)), m_pView, SIGNAL(sgValueChange(QString))); - connect(m_pView, SIGNAL(sgSelectModel(QString)), this, SLOT(onSelectItem(QString))); - m_pView->setEnable(!m_pState->IsOnline); - } - else if (str == "CM_mode_edit_models_filter") { - m_pEditFilter = qobject_cast(p); - connect(m_pEditFilter, SIGNAL(textChanged(const QString&)), this, SLOT(onTextChanged(const QString&))); - } - else if (str == "ModelUI") { - m_pWidgetMain = qobject_cast(p); - m_pWidgetMain->setWindowIcon(QIcon(":/image/leaper")); - //Qt::WindowFlags flags = Qt::Dialog; - //m_pWidgetMain->setWindowFlags(flags); - } - else if ( "CM_showSelect_pb" == str ||"CM_ShowNoSelect_pb" == str || "CM_ShowALL_pb" == str){ - connect(p, SIGNAL(clicked()), this, SLOT(onClickButton())); - } - else if ("CM_ShowImg_label" == str){ - CM_ShowImg_label = qobject_cast(p); - QPixmap pixnune(":/image/none.jpg"); - CM_ShowImg_label->setPixmap(pixnune.scaled(129, 129)); - } - else if ("CM_ShowName_label" == str){ - CM_ShowName_label = qobject_cast(p); - CM_ShowName_label->setText(tr("无")); - } - else if ("CM_Edit_pb" == str){ - CM_Edit_pb = qobject_cast(p); - CM_Edit_pb->setText(tr("编辑")); - m_pbEditState = false; - connect(p, SIGNAL(clicked()), this, SLOT(onClickButton())); - } - else if ("CM_SelectALL_pb" == str){ - CM_SelectALL_pb = qobject_cast(p); - CM_SelectALL_pb->setDisabled(true); - connect(p, SIGNAL(clicked()), this, SLOT(onClickButton())); - } - else if ("CM_SelectALLR_pb" == str){ - CM_SelectALLR_pb = qobject_cast(p); - CM_SelectALLR_pb->setDisabled(true); - connect(p, SIGNAL(clicked()), this, SLOT(onClickButton())); - } - else if ("CM_onSelectALL_pb" == str){ - CM_onSelectALL_pb = qobject_cast(p); - CM_onSelectALL_pb->setDisabled(true); - connect(p, SIGNAL(clicked()), this, SLOT(onClickButton())); - } - else if (str == "CM_models_listWidget") - { - CM_models_listWidget = qobject_cast(p); - CM_models_listWidget->setViewMode(QListView::IconMode); - CM_models_listWidget->setResizeMode(QListView::Adjust); - CM_models_listWidget->setSpacing(20); - connect(CM_models_listWidget, SIGNAL(itemClicked(QListWidgetItem*)), this, SLOT(onItemDoubleClicked(QListWidgetItem*))); - } - else if (str == "CM_SendModelLib_pb"){ - connect(p, SIGNAL(clicked()), this, SLOT(onClickButton())); - } - else { - return false; - } - return true; -} - -Q_SLOT void ConnectModeUi::onSaveItemState(QString m_str) -{ - if (m_pCtrl) - { - m_pCtrl->getModelMgr()->saveModel(m_str); - emit m_pCtrl->sgModelChanged(); - } -} - -// Q_SLOT void ConnectModeUi::onSwitchOnline() -// { -// //m_pState->IsOnline = !m_pState->IsOnline; -// //onSwitchMode(m_pState->IsOnline); -// } - -Q_SLOT void ConnectModeUi::onTextChanged(QString text) -{ - QStringList models = m_pCtrl->getAllModelMapPtr()->keys(); - if (text.isEmpty() || text == "*") { - m_pView->setModelList(models); - } - else { - m_pView->setModelList(models.filter(text)); - } -} - -Q_SLOT void ConnectModeUi::onSendModelState() -{ - //send -} - -void ConnectModeUi::onSwitchMode(bool bMode) -{ -// m_pBtnOnline->setEnabled(!bMode); -// m_pBtnOffline->setEnabled(bMode); -// m_pBtnSendModel->setEnabled(!bMode); -// m_pView->setEnable(!bMode); -// -// m_pState->IsOnline = bMode; -// if (bMode) { -// QString str = m_pCtrl->getUserName() + ":" + QString("按下了在线模式按钮"); -// m_pCtrl->addLog(str, emTypeUseState); -// } -// else { -// QString str = m_pCtrl->getUserName() + ":" + QString("按下了离线模式按钮"); -// m_pCtrl->addLog(str, emTypeUseState); -// } -} - -bool ConnectModeUi::onExec() -{ - if (m_pWidgetMain) { - onUserRole(); - if (m_pView) - m_pView->update2AllModels(); - UpdateTab2(m_pCtrl->getAllModelMapPtr()->keys()); - m_pWidgetMain->setWindowModality(Qt::ApplicationModal); - m_pWidgetMain->show(); - } - return true; -} - -bool ConnectModeUi::onClose() -{ - if (m_pWidgetMain) { - m_pWidgetMain->close(); - } - return true; -} - -bool ConnectModeUi::onStateChanged(QObject* watched, int state) -{ - if ("CM_mode_UseDiameter" == watched->objectName()) { - m_pState->bUseDiameter = state == 2; - m_pState->save(); - } - else if ("CM_mode_UseThickness" == watched->objectName()) { - m_pState->bUseThickness = state == 2; - m_pState->save(); - } - else { - return false; - } - return true; -} - -bool ConnectModeUi::onUserRole() -{ - int nLevel = m_pCtrl->getUserLevel(); - if (CM_SelectALL_pb&&CM_SelectALLR_pb&&CM_onSelectALL_pb&&CM_Edit_pb){ - CM_SelectALL_pb->setDisabled(true); - CM_SelectALLR_pb->setDisabled(true); - CM_onSelectALL_pb->setDisabled(true); - m_pbEditState = false; - CM_Edit_pb->setText(tr("编辑")); - } - - if (9 == nLevel) { - m_UseDiameter->setVisible(true); - m_UseThickness->setVisible(true); - } - else if (5 == nLevel) { - m_UseDiameter->setVisible(true); - m_UseThickness->setVisible(true); - } - else if (4 == nLevel) { - m_UseDiameter->setVisible(false); - m_UseThickness->setVisible(false); - } - else if (1 == nLevel){ - m_UseDiameter->setVisible(false); - m_UseThickness->setVisible(false); - } - else { - return false; - } - - return true; -} - -Q_SLOT void ConnectModeUi::onClickButton() -{ - QString strObj = sender()->objectName(); - if (strObj == "CM_SelectALL_pb"){ - m_pCtrl->getModelMgr()->setAllModelsState(true); - m_pView->update2AllModels(); - emit m_pCtrl->sgModelChanged(); - UpdateTab2(m_pCtrl->getAllModelMapPtr()->keys()); -// if (m_pCtrl){ -// m_pCtrl->getModelMgr()->saveAllModel(); -// } - } - else if (strObj == "CM_SelectALLR_pb"){ - m_pCtrl->getModelMgr()->setRestDetect(); - m_pView->update2AllModels(); - emit m_pCtrl->sgModelChanged(); - UpdateTab2(m_pCtrl->getAllModelMapPtr()->keys()); -// if (m_pCtrl){ -// m_pCtrl->getModelMgr()->saveAllModel(); -// } - } - else if (strObj == "CM_onSelectALL_pb"){ - m_pCtrl->getModelMgr()->setAllModelsState(false); - m_pView->update2AllModels(); - emit m_pCtrl->sgModelChanged(); - UpdateTab2(m_pCtrl->getAllModelMapPtr()->keys()); -// if (m_pCtrl){ -// m_pCtrl->getModelMgr()->saveAllModel(); -// } - } - else if (strObj == "CM_showSelect_pb"){ - QStringList m_models = m_pCtrl->getModelMgr()->getDetectModelName(); - m_pView->setModelList(m_models); - UpdateTab2(m_models); - } - else if (strObj == "CM_ShowNoSelect_pb"){ - QStringList m_models = m_pCtrl->getModelMgr()->getNoDetectModelName(); - m_pView->setModelList(m_models); - UpdateTab2(m_models); - } - else if (strObj == "CM_ShowALL_pb"){ - QStringList m_models = m_pCtrl->getModelMgr()->getAllModelName(); - m_pView->setModelList(m_models); - UpdateTab2(m_models); - } - else if (strObj == "CM_Edit_pb"){ - if (m_pbEditState == false){ - CM_SelectALL_pb->setDisabled(false); - CM_SelectALLR_pb->setDisabled(false); - CM_onSelectALL_pb->setDisabled(false); - m_pbEditState = true; - CM_Edit_pb->setText(tr("取消")); -// m_pView->setCheckShow(true);//测试代码 用于测试隐藏check -// m_pView->update2CurrentModels(); - } - else{ - m_pbEditState = false; - CM_Edit_pb->setText(tr("编辑")); - CM_SelectALL_pb->setDisabled(true); - CM_SelectALLR_pb->setDisabled(true); - CM_onSelectALL_pb->setDisabled(true); -// m_pView->setCheckShow(false); -// m_pView->update2CurrentModels(); - } - } - else if (strObj == "CM_SaveAll_pb"){ - if (m_pCtrl){ - m_pCtrl->getModelMgr()->saveAllModel(); - emit(sgShowMsg(tr("保存完成"))); - } - } - else if (strObj == "CM_SendModelLib_pb"){ - WheelCtrl* m_pWheelCtrl = (WheelCtrl*)m_pCtrl; - m_pWheelCtrl->getNet()->sendClearLib(); - emit(sgShowMsg(tr("发送模板库"))); - } -} - -Q_SLOT void ConnectModeUi::onSelectItem(QString strModel) -{ - if (m_pCtrl){ - QString nPixpath = m_pCtrl->getModelMgr()->getModelPicPath(strModel); - CM_ShowName_label->setText(strModel); - if (!nPixpath.isEmpty()){ - QString pixpath = m_pCtrl->appRoot() + nPixpath; - QPixmap pix(pixpath); - if (pix.isNull()) { - QPixmap pix(":/image/none.jpg"); - CM_ShowImg_label->setPixmap(pix.scaled(129, 129)); - }else - CM_ShowImg_label->setPixmap(pix.scaled(129, 129)); - } - else{ - QPixmap pix(":/image/none.jpg"); - CM_ShowImg_label->setPixmap(pix.scaled(129, 129)); - } - } -} - -Q_SLOT void ConnectModeUi::onItemDoubleClicked(class QListWidgetItem *p) -{ - -} - -void ConnectModeUi::SetItemBGColor(QListWidgetItem *pItem, bool state) -{ - if (pItem) - { - if (state) - { - pItem->setBackgroundColor(QColor(0, 250, 0, 100)); - } - else - { - pItem->setBackgroundColor(QColor(200, 0, 0, 100)); - } - } -} - -void ConnectModeUi::UpdateTab2(QStringList m_strList) -{ - for (int nIndex = (CM_models_listWidget->count() - 1); nIndex >= 0; nIndex--) { - QListWidgetItem *pItem = CM_models_listWidget->takeItem(nIndex); - delete pItem; - } - QString str; - CM_models_listWidget->setViewMode(QListView::IconMode); - CM_models_listWidget->clear(); - CM_models_listWidget->setProperty("model", str); - CM_models_listWidget->setIconSize(QSize(100, 100)); - CM_models_listWidget->setAcceptDrops(false); - QStringList strList = m_strList; - for (int j = 0; j < strList.size(); j++) - { - QString strName = strList.at(j); - IWheelModel *pModel = m_pCtrl->getModel(strName); - QString strFilePath = pModel->getPicPath(); - if (strFilePath.isEmpty()) - { - strFilePath = ":/image/none.jpg"; - } - else - { - strFilePath = m_pCtrl->appRoot() + pModel->getPicPath(); - } - - QPixmap pix = QPixmap(strFilePath); - if (pix.isNull()) - pix = QPixmap(":/image/none.jpg"); - QIcon icon(pix.scaled(QSize(100, 100))); - QListWidgetItem* pItem = new QListWidgetItem(icon, strName); - SetItemBGColor(pItem, pModel->getDetectState()); - CM_models_listWidget->addItem(pItem); - } - QString m_str = QString("%1 %2 %3").arg(tr("共")).arg(strList.size()).arg(tr("个记录")); - //m_pLabelNumber->setText(m_str); -} - -Q_SLOT void ConnectModeUi::onShowMsg(QString str) -{ - QPulpewidget *pw = new QPulpewidget(); - pw->setParent(m_pWidgetMain); - pw->showmessage(str); - connect(pw, SIGNAL(finished()), pw, SLOT(deleteLater())); -} - diff --git a/src/tpMain/ConnectModeUi.h b/src/tpMain/ConnectModeUi.h deleted file mode 100644 index 976e6d3..0000000 --- a/src/tpMain/ConnectModeUi.h +++ /dev/null @@ -1,53 +0,0 @@ -#pragma once -#include "IWheelUi.h" -class IWheelCtrl; -class ConnectModeUi : - public IWheelUi -{ - Q_OBJECT -public: - ConnectModeUi(const QString strUiName, IWheelCtrl *); - ~ConnectModeUi(); - virtual bool onPolished(QWidget*); - virtual bool onExec(); - virtual bool onClose(); - virtual bool onStateChanged(QObject* watched, int state); - virtual bool onUserRole(); - void onSwitchMode(bool bMode); - Q_SLOT void onTextChanged(QString); - //Q_SLOT void onSwitchOnline(); - Q_SLOT void onSendModelState(); - Q_SLOT void onSaveItemState(QString m_str); - Q_SLOT void onClickButton(); - Q_SLOT void onSelectItem(QString); - Q_SLOT void onItemDoubleClicked(class QListWidgetItem *p); - void UpdateTab2(QStringList m_strList); - void SetItemBGColor(class QListWidgetItem *pItem, bool state); - Q_SLOT void onShowMsg(QString str); - -signals: - void sgShowMsg(QString str); -private: - //class QPushButton *m_pBtnOnline; - //class QPushButton *m_pBtnOffline; - //class QPushButton *m_pBtnSendModel; - class QLabel *m_pLBModelText; - class QLineEdit *m_pEditFilter; - class ModelsView *m_pView; - class QWidget *m_pWidgetMain; - class QCheckBox *m_UseDiameter; - class QCheckBox *m_UseThickness; - class QLabel *CM_ShowImg_label; - class QLabel *CM_ShowName_label; - class QPushButton *CM_Edit_pb; - class QPushButton *CM_SelectALL_pb; - class QPushButton *CM_SelectALLR_pb; - class QPushButton *CM_onSelectALL_pb; - class QListWidget *CM_models_listWidget; -private: - class DetectState *m_pState; - IWheelCtrl *m_pCtrl; - QString m_strUiName; - bool m_pbEditState; -}; - diff --git a/src/tpMain/DetectState.cpp b/src/tpMain/DetectState.cpp index f2f9149..45070aa 100644 --- a/src/tpMain/DetectState.cpp +++ b/src/tpMain/DetectState.cpp @@ -11,14 +11,14 @@ #define WHEEL_D2H_B "b" -DetectState::DetectState(QString strPath) +DetectState::DetectState() : IsOnline(0), IsDetect(0), IsCheck(false) { totalDetectNum = 0; totalUnDetectNum = 0; m_bObjAll2A = false; - m_applicationDirPath = strPath; + m_startDetectFlags = false; saveGood = 0; saveBad = 0; @@ -34,8 +34,9 @@ DetectState::~DetectState() //save(); } -void DetectState::init() +void DetectState::init(QString strPath) { + m_applicationDirPath = strPath; QString fileMyself = m_applicationDirPath + WHEEL_SELFDEFINE_FILE; QJsonObject jsMyself = QZkJsonParser::ReadJsonAuto(fileMyself); QJsonObject algObj = jsMyself.value(WHEEL_SELFDEFINE_ALGPARA).toObject(); diff --git a/src/tpMain/DetectState.h b/src/tpMain/DetectState.h index 90fc78d..4502002 100644 --- a/src/tpMain/DetectState.h +++ b/src/tpMain/DetectState.h @@ -1,13 +1,17 @@ -#pragma once -#include "qstring.h" -#include "IDetectState.h" -class DetectState :public IDetectState +#ifndef _H_DETECTSTATE_H_ +#define _H_DETECTSTATE_H_ + +#include "lpsingleton.h" +#include +#include +/*系统参数管理类 全局调用*/ +class DetectState :public lpsingleton { public: - DetectState(QString strPath); + DetectState(); ~DetectState(); - void init(); + void init(QString strPath); void save(); void saveDeteImage(); void savePLCPara(); @@ -76,3 +80,5 @@ public: bool bLockDetect{ false }; }; +#endif + diff --git a/src/tpMain/DevelopUi.cpp b/src/tpMain/DevelopUi.cpp deleted file mode 100644 index a2bf2c2..0000000 --- a/src/tpMain/DevelopUi.cpp +++ /dev/null @@ -1,1449 +0,0 @@ -#include "DevelopUi.h" -#include "DetectState.h" -#include "qcheckbox.h" -#include "qpushbutton.h" -#include "qlabel.h" -#include "Result2Ui.h" -#include "IWheelCtrl.h" -#include "IWheelModel.h" -#include "QDir" -#include "QDateTime" -#include "QLineEdit" -#include "CamConfig.h" -#include "QThread" -#include "qsaveimg.h" -#include "qdesktopservices.h" -#include "QUrl" -#include "qlogging.h" -#include -#include "saveimgthread.h" -#include "QTreeWidget" -#include "QAbstractItemView" -#include "QStringList" -#include "QHeaderView" -#include "ComConfig.h" -#include "QMessageBox" -#include "qcombobox.h" -#include "InfoFile.h" -#include "QtSerialPort\QSerialPortInfo" -#include "QtSerialPort\QSerialPort" -#include "QSpinBox" -#include "QObjectCleanupHandler" -#include "QListWidget" -#include "qpulpewidget.h" -#include "QFileDialog" -#include "qshowimg.h" -#include "qpixmapbar.h" -#include "qgridlayout.h" - -#pragma execution_character_set("utf-8") - -#define DEVELOP_UI_CHECK_SAVE_GOOD "SaveGoodcheckBox" -#define DEVELOP_UI_CHECK_SAVE_BAD "SaveBadcheckBox" -#define DEVELOP_UI_CHECK_SAVE_CUTGOOD "SaveCutGoodcheckBox" -#define DEVELOP_UI_CHECK_SAVE_CUTBAD "SaveCutBadcheckBox" -#define DEVELOP_UI_CHECK_CHKBOXALL2A "chkBoxAll2A" - -#define DEVELOP_DETECT_CAMERE_VIRSUAL tr("虚拟相机触发") -#define DEVELOP_DETECT_CAMERE_TRUE tr("硬件相机触发") -#define DEVELOP_DETECT_DEBUG_NOUSER tr("调试免登陆") -#define DEVELOP_DETECT_DEBUG_USER tr("正常工作模式") - -#define DEVELOP_DETECT_CAM_OUTTRIGER tr("传感器触发") -#define DEVELOP_DETECT_CAM_SOFTER tr("软件触发") - -#define DEVELOP_PLC_TRIGER_DOWM tr("下降沿触发") -#define DEVELOP_PLC_TRIGER_UP tr("上升沿触发") - -DevelopUi::DevelopUi(const QString strUiName, IWheelCtrl*pCtrl) - : m_pCtrl(pCtrl) - , m_strUiName(strUiName) - , m_setting(NULL) - , pDiskCleanThread(NULL) - , m_pixShowBar(NULL) - , StationSettingDlg(NULL) -{ - qRegisterMetaType("Result2Ui"); - m_pState = pCtrl->getDetectState(); - m_pBtnDetect = NULL; - m_pWidgetMain = NULL; - m_LbShowPath = NULL; - m_setting = new QSettings(".\\user\\systemfile.ini", QSettings::IniFormat); - readSettingFile(); - m_pCamConfig = pCtrl->getCamConfig(); - m_pComConfig = pCtrl->getComConfig(); -// saveImgThread = new QThread(this); -// QSaveImg* saveImg = new QSaveImg; -// saveImg->setDetectPtr(m_pState); -// saveImg->moveToThread(saveImgThread); -// connect(saveImgThread, &QThread::finished, saveImg, &QObject::deleteLater); -// connect(this, SIGNAL(operate(Result2Ui*)), saveImg, SLOT(doWork(Result2Ui*))); -// connect(saveImg, SIGNAL(resultReady(Result2Ui*)), this, SLOT(handleResult(Result2Ui*))); -// connect(this, SIGNAL(sgShowMsg(QString)), this, SLOT(onShowMessage(QString))); -// saveImgThread->start(); - - m_listwidgetItemStr.append(tr("相关设备配置")); - //m_listwidgetItemStr.append("相机参数"); - m_listwidgetItemStr.append(tr("检测图像设置")); - m_listwidgetItemStr.append(tr("PLC相关设置")); - m_listwidgetItemStr.append(tr("报警灯测试")); - m_listwidgetItemStr.append(tr("开发者使用")); - //m_CleanHeader = new QObjectCleanupHandler(); - //workTreadsrc = new SaveImgThread(this); - //workTreadres = new SaveImgThread(this); - //connect(workTreadsrc, &SaveImgThread::finished, workTreadsrc, &QObject::deleteLater); - //connect(workTreadres, &SaveImgThread::finished, workTreadres, &QObject::deleteLater); - - pDiskCleanThread = new QDiskCleanThread; - QString strpath = m_pState->m_SaveImgDirPath + "/Data"; - pDiskCleanThread->SetImgStorageFolder(strpath); - pDiskCleanThread->setDays(nCheckDays); - pDiskCleanThread->setUseFlag(nCheckThreadEable); - pDiskCleanThread->start(); -} - -DevelopUi::~DevelopUi() -{ - writeSettingFile(); - m_pCtrl = NULL; - if (m_pWidgetMain) { - m_pWidgetMain->close(); - } - -// if (saveImgThread){ -// -// qDebug() << "delete saveImgThread "; -// saveImgThread->quit(); -// saveImgThread->wait(50); -// delete saveImgThread; -// saveImgThread = NULL; -// qDebug() << "delete saveImgThread end"; -// } - for (int nIndex = 0; nIndex < developitems.size(); nIndex++){ - QTreeWidgetItem* pItem = developitems.at(nIndex); - delete pItem; - pItem = NULL; - } - for (int nIndex = 0; nIndex < comitems.size(); nIndex++){ - QTreeWidgetItem* pItem = comitems.at(nIndex); - delete pItem; - pItem = NULL; - } - for (int nIndex = 0; nIndex < camitems.size(); nIndex++){ - QTreeWidgetItem* pItem = camitems.at(nIndex); - delete pItem; - pItem = NULL; - } - for (int nIndex = 0; nIndex < picitems.size(); nIndex++){ - QTreeWidgetItem* pItem = picitems.at(nIndex); - delete pItem; - pItem = NULL; - } - for (int nIndex = 0; nIndex < PLCitems.size(); nIndex++){ - QTreeWidgetItem* pItem = PLCitems.at(nIndex); - delete pItem; - pItem = NULL; - } - for (int nIndex = 0; nIndex < lightitems.size(); nIndex++){ - QTreeWidgetItem* pItem = lightitems.at(nIndex); - delete pItem; - pItem = NULL; - } - for (int nIndex = 0; nIndex < m_listObj.size(); nIndex++){ - QObject* p = m_listObj.at(nIndex); - delete p; - p = NULL; - } - for (QMap::iterator its = m_TreeItemMap.begin(); its != m_TreeItemMap.end(); ++its) - { - delete *its; - *its = NULL; - } - m_TreeItemMap.clear(); - if (pDiskCleanThread){ - pDiskCleanThread->ExitThread(); - pDiskCleanThread->quit(); - pDiskCleanThread->wait(50); - delete pDiskCleanThread; - pDiskCleanThread = NULL; - } - if (m_pixShowBar){ - delete m_pixShowBar; - m_pixShowBar = NULL; - } - if (m_setting){ - delete m_setting; - m_setting = NULL; - } -} - -bool DevelopUi::onPolished(QWidget* p) -{ - QString str = p->objectName(); - if (str == DEVELOP_UI_CHECK_SAVE_GOOD) { - QCheckBox *pCheck = qobject_cast(p); - pCheck->setChecked(m_pState->saveGood == 1); - } - else if (str == DEVELOP_UI_CHECK_SAVE_BAD) { - QCheckBox *pCheck = qobject_cast(p); - pCheck->setChecked(m_pState->saveBad == 1); - } - else if (str == DEVELOP_UI_CHECK_SAVE_CUTGOOD){ - QCheckBox *pCheck = qobject_cast(p); - pCheck->setChecked(m_pState->saveCutGood == 1); - } - else if (str == DEVELOP_UI_CHECK_SAVE_CUTBAD){ - QCheckBox *pCheck = qobject_cast(p); - pCheck->setChecked(m_pState->saveCutBad == 1); - } - else if (str == DEVELOP_UI_CHECK_CHKBOXALL2A){ - QCheckBox *pCheck = qobject_cast(p); - pCheck->setChecked(m_pState->m_bObjAll2A == true); - } - else if (str == "Dlp_StartDetect_button") { - m_pBtnDetect = qobject_cast(p); - //moni - } - else if (str == "Dlp_diamer_label") { - m_pLbModelDiameter = qobject_cast(p); - } - else if (str == "Dlp_height_label") { - m_pLbModelThickness = qobject_cast(p); - } - else if (str == "Dlp_model_id_label") { - m_pLbModelId = qobject_cast(p); - } - else if (str == "Dlp_model_rota_label"){ - m_pLbModelRate = qobject_cast(p); - } - else if (str == m_strUiName) { - m_pWidgetMain = p; - m_pWidgetMain->setWindowIcon(QIcon(":/image/leaper")); - } - else if (str == "Debug_OpenDataPath"){ - connect(p, SIGNAL(clicked()), this, SLOT(onOpenDataPath())); - } - else if (str == "Dlp_Result_Img"){ - m_Dlp_Result_Img = qobject_cast(p); - } - else if (str == "treeWidget"){ - m_TreeWidget = qobject_cast(p); - //m_TreeWidget->setcu - InitTreeWidget(m_TreeWidget); - addComRoot(m_TreeWidget, m_listwidgetItemStr.at(0)); - //addCamRoot(m_TreeWidget, m_listwidgetItemStr.at(1)); - addPicRoot(m_TreeWidget, m_listwidgetItemStr.at(1)); - addPLCSettingRoot(m_TreeWidget, m_listwidgetItemStr.at(2)); - addLightRoot(m_TreeWidget, m_listwidgetItemStr.at(3)); - m_TreeWidget->expandAll(); - addDebugRoot(m_TreeWidget, m_listwidgetItemStr.at(4)); - } - else if ("tespushButton" == str){ - connect(p, SIGNAL(clicked()), this, SLOT(onTest())); - } - else if ("Dlp_Setting_listWidget" == str){ - - m_Setting_listWidget = qobject_cast(p); - m_Setting_listWidget->clear(); - m_Setting_listWidget->addItems(m_listwidgetItemStr); - for (int nIndex = 0; nIndex < m_Setting_listWidget->count(); nIndex++) - { - QListWidgetItem *itenn = m_Setting_listWidget->item(nIndex); - itenn->setBackgroundColor(QColor(0, 50, 50, 100)); - QSize s = itenn->sizeHint(); - itenn->setSizeHint(QSize(s.width(), 30)); - } - connect(m_Setting_listWidget, SIGNAL(currentRowChanged(int)), this, SLOT(onSetCurrentIndex(int))); - } - else if ("tp_main_tabWidget" == str){ - QTabWidget *pWidget = qobject_cast(p); - m_pixShowBar = new QPixmapListBar(pWidget); - pWidget->addTab(m_pixShowBar,tr("检测状态")); - } - else if ("StationSettingDlg" == str) - { - StationSettingDlg = qobject_cast(p); - } - else { - return false; - } - return true; -} - -Q_SLOT void DevelopUi::onOpenDataPath() -{ - QString strObj = sender()->objectName(); - if ("pbOpenImgPath" == strObj) - { - QString strpath = m_pState->m_SaveImgDirPath + "/Data"; - bool bFalg = QDesktopServices::openUrl(QUrl(strpath, QUrl::TolerantMode)); - if (!bFalg) - { - bool bFalgs = QDesktopServices::openUrl(QUrl(m_pState->m_SaveImgDirPath, QUrl::TolerantMode)); - if (!bFalgs) - { - - } - } - } - else if ("pbSetSavePath" == strObj) - { - QString dir = QFileDialog::getExistingDirectory(NULL, tr("打开文件夹"), QString(), QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks); - if (!dir.isEmpty()) - { - if (m_LbShowPath) - m_LbShowPath->setText(dir); - if (m_pState) - m_pState->m_SaveImgDirPath = dir; - if (pDiskCleanThread) - pDiskCleanThread->SetImgStorageFolder(dir + "/Data"); - } - } -} - -Q_SLOT void DevelopUi::onClickStartDetect() -{ - if (m_pState->m_startDetectFlags == false) - { - m_pBtnDetect->setText(tr("停止虚拟检测")); - //connect(&m_timer, SIGNAL(timeout()), this, SLOT(Sumulate())); - if (m_pState->m_Visural_Time > 0){ - // m_timer.start(m_pState->m_Visural_Time); - } - else - { - m_pState->m_Visural_Time = 1000; - // m_timer.start(m_pState->m_Visural_Time); - } - } - else - { - m_pState->m_startDetectFlags = false; - m_pBtnDetect->setText(tr("开始虚拟检测")); - //m_timer.stop(); - //CC_Action(CC_AC_STOP); - {//!>点击停止检测时 把表格上统计的数据写入到history中 - //SaveDataToCSV(); - } - } - m_pState->m_startDetectFlags = 1- m_pState->m_startDetectFlags; -} - -bool DevelopUi::onStateChanged(QObject* watched, int state) -{ - if (DEVELOP_UI_CHECK_SAVE_BAD == watched->objectName()) { - m_pState->saveBad = state == 2; - } - else if (DEVELOP_UI_CHECK_SAVE_GOOD == watched->objectName()) { - m_pState->saveGood = state == 2; - } - else if (DEVELOP_UI_CHECK_SAVE_CUTGOOD == watched->objectName()){ - m_pState->saveCutGood = state == 2; - } - else if (DEVELOP_UI_CHECK_SAVE_CUTBAD == watched->objectName()){ - m_pState->saveCutBad = state == 2; - } - else if (DEVELOP_UI_CHECK_CHKBOXALL2A == watched->objectName()){ - m_pState->m_bObjAll2A = ( state == 2?true:false); - } - else { - return false; - } - return true; -} - -Q_SLOT void DevelopUi::onShowModel(Result2Ui* pResult) -{ - // show result - if (!pResult){ - return; - } - if (m_pCtrl&&m_pCtrl!=(IWheelCtrl*)0xfeeefeee){ - IWheelModel *pModel = m_pCtrl->getModel(pResult->m_strModel); - if (pModel) { - m_pLbModelDiameter->setText(QString::number(pModel->getDiameter())); - m_pLbModelThickness->setText(QString::number(pModel->getThickness())); - m_pLbModelId->setText(pModel->getModelID()); - m_pLbModelRate->setText(QString::number(pResult->m_dMinDis)); - - if (m_pState->m_SaveD2HCsv == 1) - { - QString strPath = m_pCtrl->appRoot() + "//user//diameter2thickness.csv"; - QFile qFile(strPath); - qFile.open(QIODevice::Append | QIODevice::WriteOnly | QIODevice::Text); - QTextStream st(&qFile); - st << pResult->m_strModel << ","<m_dThickness<<"," << pResult->m_dDiameter << "," <getDiameter()<< "\n"; - qFile.close(); - } - } - else { - m_pLbModelDiameter->setText("0"); - m_pLbModelThickness->setText("0"); - m_pLbModelId->setText(""); - } - if (pResult->m_strModel.isEmpty()) - pResult->m_strModel = "NG"; - if (pResult->m_pixResult.isNull()) - { - int dhight = pResult->m_pixSrc.height(); - int dwidth = pResult->m_pixSrc.width(); - double nRate = pResult->m_pixSrc.width()*1.0 / pResult->m_pixSrc.height(); - int scarew = 300; - int scareh = 300*1.0 / nRate; - - if (scareh > 300) - { - scarew = 300; - scareh = 300*1.0 / nRate; - } - - m_Dlp_Result_Img->setPixmap(pResult->m_pixSrc.scaled(scarew, scareh)); - } - else - m_Dlp_Result_Img->setPixmap(pResult->m_pixResult.scaled(300, 300)); - - saveImage(pResult); - if (m_pixShowBar) - { - if (pResult->m_pixResult.isNull()) - m_pixShowBar->addItemByLimit(pResult->m_pixSrc, pResult->m_strModel); - else - m_pixShowBar->addItemByLimit(pResult->m_pixResult, pResult->m_strModel); - } - } -} - -void DevelopUi::saveImage(const QPixmap& m_pixmap, QString m_path, QString filename) -{//启动多线程保存图像 - SaveImgThread *workTread = new SaveImgThread(this); - workTread->setPixmap(m_pixmap, m_path, filename); - connect(workTread, &SaveImgThread::finished, workTread,&QObject::deleteLater); - workTread->start(); - -} -void DevelopUi::saveImage(class Result2Ui* m_Res) -{ - qDebug() << "satrt tread save Image"; - QDir testDir; - bool IsTestDir = testDir.exists(m_pState->m_SaveImgDirPath); - if (!IsTestDir) - m_pState->m_SaveImgDirPath = m_pState->m_applicationDirPath; - - QString baseSavePath = m_pState->m_SaveImgDirPath + "\\Data\\"; - - QString dataTime = QDateTime::currentDateTime().toString("yyyy-MM-dd"); - QString fileSavePath = baseSavePath + "\\" + dataTime; - QString filename = m_Res->m_strModel; - if (m_Res->m_strModel != "NG") - { - QString goodsourceDir = fileSavePath + "\\Good"; - filename += QString("_%1_%2_").arg((int)m_Res->m_dThickness).arg((int)m_Res->m_dDiameter); - filename += QDateTime::currentDateTime().toString("hhmmsszzz"); - if (m_pState->saveGood == 1){ - goodsourceDir += "\\Source"; - goodsourceDir += "\\"; - goodsourceDir += m_Res->m_strModel; - QString resultpath = goodsourceDir + "\\" + filename + ".png"; - saveImage(m_Res->m_pixSrc, goodsourceDir + "\\", filename + ".png"); - } - QString goodtargetDir = fileSavePath + "\\Good"; - if (m_pState->saveCutGood == 1){ - goodtargetDir += "\\Target"; - goodtargetDir += "\\"; - goodtargetDir += m_Res->m_strModel; - QString resultpath = goodtargetDir + "\\" + filename + "Res.png"; - saveImage(m_Res->m_pixResult, goodtargetDir + "\\", filename + "Res.png"); - } - } - else - { - QString errorSourceDir = fileSavePath + "\\Error"; - filename += QString("_%1_%2_").arg((int)m_Res->m_dThickness).arg((int)m_Res->m_dDiameter); - filename += QDateTime::currentDateTime().toString("hhmmsszzz"); - if (m_pState->saveBad == 1){ - errorSourceDir += "\\Source"; - QString resultpath = errorSourceDir + "\\" + filename + ".png"; - saveImage(m_Res->m_pixSrc, errorSourceDir + "\\", filename + ".png"); - } - QString errortargetDir = fileSavePath + "\\Error"; - if (m_pState->saveCutBad == 1){ - errortargetDir += "\\Target"; - QString resultpath = errortargetDir + "\\" + filename + "Res.png"; - if (m_Res->m_pixResult.isNull()) - saveImage(m_Res->m_pixSrc, errortargetDir + "\\", filename + "Res.png"); - else - saveImage(m_Res->m_pixResult, errortargetDir + "\\", filename + "Res.png"); - } - } -} - -bool DevelopUi::onExec() -{ - if (!m_pWidgetMain) { - return false; - } - if(!m_pWidgetMain->isHidden()) - m_pWidgetMain->hide(); - m_pWidgetMain->setWindowState(Qt::WindowActive); - m_pWidgetMain->show(); -// if (m_CamSerial_label&& m_CamType_label){ -// m_CamType_label->setText(m_pCamConfig->getCamType()); -// m_CamSerial_label->setText(m_pCamConfig->getCamSerial()); -// -// } -// if (m_ComName&&m_ComBaut){ -// -// m_ComName->setText(m_pComConfig->getComName()); -// m_ComBaut->setText(m_pComConfig->getComBaute()); -// disconnect(m_ComBoxBaut, SIGNAL(currentIndexChanged(int)), this, SLOT(oncurrentIndexChanged(int))); -// disconnect(m_ComBoxName, SIGNAL(currentIndexChanged(int)), this, SLOT(oncurrentIndexChanged(int))); -// m_ComBoxName->setCurrentIndex(-1); -// m_ComBoxBaut->setCurrentIndex(-1); -// m_ComScan->setDisabled(true); -// m_ComBoxName->setDisabled(true); -// m_ComBoxBaut->setDisabled(true); -// pSaveButton->setDisabled(true); -// } - if (m_Language){ - //disconnect(m_Language, SIGNAL(currentTextChanged(const QString &)), this, SLOT(oncurrentChanged(const QString &))); - } - int nLevel = m_pCtrl->getUserLevel(); - if (nLevel == 9||m_pState->m_Debug == 100){ - m_pBtnDetect->setVisible(true); - HidPLCUI(false); - HidDevelopUI(false); - } - else if(nLevel==5){ - m_pBtnDetect->setVisible(false); - HidDevelopUI(true); - HidPLCUI(true); - } - else if (nLevel == 4){ - m_pBtnDetect->setVisible(false); - m_TreeWidget->setItemHidden(picitems.at(7), true); - HidDevelopUI(true); - HidPLCUI(true); - } - if (m_Setting_listWidget){ - m_Setting_listWidget->setCurrentRow(0); - } - // - return true; -} - -bool DevelopUi::onClose() -{ - if (m_pWidgetMain) { - m_pWidgetMain->close(); - } - return true; -} - -void DevelopUi::ReadJson() -{ - -} - -Q_SLOT void DevelopUi::handleResult(Result2Ui* pResult) -{ - delete pResult; - pResult = NULL; - qDebug() << "end tread save Image"; - -} - -bool DevelopUi::InitTreeWidget(QTreeWidget* pTreewidget) -{ - if (pTreewidget == NULL) - return false; - QStringList header; - header.append(tr("属性")); - header.append(tr("值")); - pTreewidget->setHeaderLabels(header); - pTreewidget->header()->setStretchLastSection(true); - pTreewidget->setColumnCount(2); - pTreewidget->setStyleSheet("QTreeView::item:hover{background-color:rgb(0,255,0,50)}" - "QTreeView::item:selected{background-color:rgb(67,101,234,100)}"); - //pTreewidget->setSelectionModel(QAbstractItemView::ExtendedSelection); - pTreewidget->setColumnWidth(0, 180); - //pTreewidget-> - return true; -} - -void DevelopUi::addComRoot(class QTreeWidget *pTreewidget, QString strName /*= QString()*/) -{ - QTreeWidgetItem *m_ComItems = new QTreeWidgetItem(pTreewidget, QStringList(tr("相关设备配置"))); - pStationSetButton = new QPushButton(tr("打开配置页面")); - pTreewidget->setItemWidget(m_ComItems, 1, pStationSetButton); - m_ComItems->setSizeHint(1, QSize(100, 30)); - pStationSetButton->setObjectName("pStationSetButton"); - connect(pStationSetButton, SIGNAL(clicked()), this, SLOT(onTreeWidgetButton())); - m_listObj.append(pStationSetButton); - m_TreeItemMap.insert(strName, m_ComItems); - - QTreeWidgetItem *pLanguage = new QTreeWidgetItem(pTreewidget, QStringList(tr("语言"))); - m_Language = new QComboBox; - pTreewidget->setItemWidget(pLanguage, 1, m_Language); - m_TreeItemMap.insert("language", pLanguage); - - m_Language->setObjectName("m_Language"); - QString strpath = QCoreApplication::applicationDirPath() + "/language/"; - QStringList strList = getDirNames(strpath); - m_Language->addItems(strList); - QSettings languageSetting("hubdetect.ini", QSettings::IniFormat); - QString strLangeage = languageSetting.value("language", "Chinese").toString(); - m_Language->setCurrentText(strLangeage); - connect(m_Language, SIGNAL(currentTextChanged(const QString &)), this, SLOT(oncurrentChanged(const QString &))); - m_listObj.append(m_Language); -} - -void DevelopUi::addCamRoot(QTreeWidget *pTreewidget, QString strName) -{ -// QTreeWidgetItem *m_CamItems = new QTreeWidgetItem(pTreewidget, QStringList(QString("相机参数"))); -// m_TreeItemMap.insert(strName, m_CamItems); -// m_CamItems->setSizeHint(1, QSize(100, 30)); -// //QList camitems; -// camitems.append(new QTreeWidgetItem((QTreeWidget*)0, QStringList(QString("相机类型")))); -// camitems.append(new QTreeWidgetItem((QTreeWidget*)0, QStringList(QString("序列号")))); - /* serveritems.append(new QTreeWidgetItem((QTreeWidget*)0, QStringList(QString("是否修改"))));*/ - -// m_CamItems->addChildren(camitems); -// m_CamType_label = new QLabel; -// m_CamSerial_label = new QLabel; -// -// m_listObj.append(m_CamSerial_label); -// m_listObj.append(m_CamType_label); -// -// pTreewidget->setItemWidget(camitems.at(0), 1, m_CamType_label); -// pTreewidget->setItemWidget(camitems.at(1), 1, m_CamSerial_label); -// camitems.at(0)->setSizeHint(1, QSize(100, 30)); -// camitems.at(1)->setSizeHint(1, QSize(100, 30)); -} - -void DevelopUi::addPicRoot(QTreeWidget *pTreewidget, QString strName) -{ - QTreeWidgetItem *m_RootItems = new QTreeWidgetItem(pTreewidget, QStringList(tr("检测图像设置"))); - m_TreeItemMap.insert(strName, m_RootItems); - m_RootItems->setSizeHint(1, QSize(100, 30)); - //QList picitems; - picitems.append(new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("检测背景更换")))); - picitems.append(new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("抠图后")))); - picitems.append(new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("抠图后")))); - picitems.append(new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("原图")))); - picitems.append(new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("原图")))); - picitems.append(new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("检测结果")))); - picitems.append(new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("图像保存路径")))); - picitems.append(new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("设置保存路径")))); - picitems.append(new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("打开图像路径")))); - picitems.append(new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("保存当前设置")))); - m_RootItems->addChildren(picitems); - QCheckBox *m_saveImgRes_good = new QCheckBox; - m_saveImgRes_good->setText(tr("保存已匹配图")); - m_saveImgRes_good->setObjectName("m_saveImgRes_good"); - connect(m_saveImgRes_good, SIGNAL(stateChanged(int)), this, SLOT(onCheckstateChanged(int))); - m_saveImgRes_good->setChecked(m_pState->saveCutGood == (int)true); - - QCheckBox *m_saveImgRes_bad = new QCheckBox; - m_saveImgRes_bad->setText(tr("保存无匹配图")); - m_saveImgRes_bad->setObjectName("m_saveImgRes_bad"); - connect(m_saveImgRes_bad, SIGNAL(stateChanged(int)), this, SLOT(onCheckstateChanged(int))); - m_saveImgRes_bad->setChecked(m_pState->saveCutBad == (int)true); - - QCheckBox *m_saveImgSrc_good = new QCheckBox; - m_saveImgSrc_good->setText(tr("保存已匹配图")); - m_saveImgSrc_good->setObjectName("m_saveImgSrc_good"); - connect(m_saveImgSrc_good, SIGNAL(stateChanged(int)), this, SLOT(onCheckstateChanged(int))); - m_saveImgSrc_good->setChecked(m_pState->saveGood == (int)true); - - QCheckBox *m_saveImgSrc_bad = new QCheckBox; - m_saveImgSrc_bad->setText(tr("保存无匹配图")); - m_saveImgSrc_bad->setObjectName("m_saveImgSrc_bad"); - connect(m_saveImgSrc_bad, SIGNAL(stateChanged(int)), this, SLOT(onCheckstateChanged(int))); - m_saveImgSrc_bad->setChecked(m_pState->saveBad == (int)true); - - QCheckBox *m_ResAll2A = new QCheckBox; - m_ResAll2A->setText(tr("轮毂全去A通道")); - m_ResAll2A->setObjectName("m_ResAll2A"); - connect(m_ResAll2A, SIGNAL(stateChanged(int)), this, SLOT(onCheckstateChanged(int))); - m_ResAll2A->setChecked(m_pState->m_bObjAll2A == (int)true); - - QPushButton* pChangeBGbp = new QPushButton(tr("查看检测背景")); - connect(pChangeBGbp, SIGNAL(clicked()), this, SLOT(onChangeBackground())); - - m_LbShowPath = new QLabel; - m_LbShowPath->setText(m_pState->m_SaveImgDirPath); - - QPushButton *pbSetSavePath = new QPushButton(tr("设置保存路径")); - pbSetSavePath->setObjectName("pbSetSavePath"); - connect(pbSetSavePath, SIGNAL(clicked()), this, SLOT(onOpenDataPath())); - - QPushButton *pbOpenImgPath = new QPushButton(tr("打开图像路径")); - pbOpenImgPath->setObjectName("pbOpenImgPath"); - connect(pbOpenImgPath, SIGNAL(clicked()), this, SLOT(onOpenDataPath())); - - QPushButton* pSavePara = new QPushButton(tr("保存参数")); - pSavePara->setObjectName("pSavePara"); - connect(pSavePara, SIGNAL(clicked()), this, SLOT(onTreeWidgetButton())); - - pTreewidget->setItemWidget(picitems.at(0), 1, pChangeBGbp); - pTreewidget->setItemWidget(picitems.at(1), 1, m_saveImgRes_good); - pTreewidget->setItemWidget(picitems.at(2), 1, m_saveImgRes_bad); - pTreewidget->setItemWidget(picitems.at(3), 1, m_saveImgSrc_good); - pTreewidget->setItemWidget(picitems.at(4), 1, m_saveImgSrc_bad); - pTreewidget->setItemWidget(picitems.at(5), 1, m_ResAll2A); - pTreewidget->setItemWidget(picitems.at(6), 1, m_LbShowPath); - pTreewidget->setItemWidget(picitems.at(7), 1, pbSetSavePath); - pTreewidget->setItemWidget(picitems.at(8), 1, pbOpenImgPath); - pTreewidget->setItemWidget(picitems.at(9), 1, pSavePara); - - m_listObj.append(pChangeBGbp); - m_listObj.append(m_saveImgRes_bad); - m_listObj.append(m_saveImgRes_good); - m_listObj.append(m_saveImgSrc_bad); - m_listObj.append(m_saveImgSrc_good); - m_listObj.append(m_ResAll2A); - m_listObj.append(m_LbShowPath); - m_listObj.append(pbSetSavePath); - m_listObj.append(pbOpenImgPath); - m_listObj.append(pSavePara); - - picitems.at(0)->setSizeHint(1, QSize(100, 40)); - picitems.at(1)->setSizeHint(1, QSize(100, 30)); - picitems.at(2)->setSizeHint(1, QSize(100, 30)); - picitems.at(3)->setSizeHint(1, QSize(100, 30)); - picitems.at(4)->setSizeHint(1, QSize(100, 30)); - picitems.at(5)->setSizeHint(1, QSize(100, 30)); - picitems.at(6)->setSizeHint(1, QSize(100, 40)); - picitems.at(7)->setSizeHint(1, QSize(100, 40)); - picitems.at(8)->setSizeHint(1, QSize(100, 40)); - picitems.at(9)->setSizeHint(1, QSize(100, 40)); -} - -void DevelopUi::addPLCSettingRoot(QTreeWidget *pTreewidget, QString strName) -{ - QTreeWidgetItem *m_PLCItems = new QTreeWidgetItem(pTreewidget, QStringList(tr("PLC相关设置"))); - m_TreeItemMap.insert(strName, m_PLCItems); - m_PLCItems->setSizeHint(1, QSize(100, 30)); - //QList PLCitems; - PLCitems.append(new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("保存设置")))); - PLCitems.append(new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("传感器触发滤波(ms)")))); - PLCitems.append(new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("相机触发延时(ms)")))); - PLCitems.append(new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("相机触发脉宽(ms)")))); - PLCitems.append(new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("光源熄灭延时时间(ms)")))); - PLCitems.append(new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("传感器触发类型")))); - PLCitems.append(new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("保持结果时长(ms)")))); - PLCitems.append(new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("连接超时次数")))); - PLCitems.append(new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("超时是否显示信息")))); - PLCitems.append(new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("是否自动重启服务器")))); - PLCitems.append(new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("是否保存超时日志")))); - m_PLCItems->addChildren(PLCitems); - QPushButton *savePLCpara = new QPushButton(tr("发送并保存")); - m_PLCTrigerFilter = new QSpinBox(); - m_PLCTrigerFilter->setMinimum(1); - m_PLCTrigerFilter->setMaximum(65536); - m_PLCTrigerFilter->setValue(m_pState->m_PLC_TrigerFilter); - m_PLCCameraDelay = new QSpinBox(); - m_PLCCameraDelay->setMinimum(1); - m_PLCCameraDelay->setMaximum(65536); - m_PLCCameraDelay->setValue(m_pState->m_PLC_CamTrigDelay); - m_PLCCameraPulse = new QSpinBox(); - m_PLCCameraPulse->setMinimum(1); - m_PLCCameraPulse->setMaximum(65536); - m_PLCCameraPulse->setValue(m_pState->m_PLC_CamTrigPulse); - m_PLCLightDelay = new QSpinBox(); - m_PLCLightDelay->setMinimum(1); - m_PLCLightDelay->setMaximum(65536); - m_PLCLightDelay->setValue(m_pState->m_PLC_LightDelay); - m_PLCResHoldTime = new QSpinBox(); - m_PLCResHoldTime->setMinimum(1); - m_PLCResHoldTime->setMaximum(65536); - m_PLCResHoldTime->setValue(m_pState->m_PLC_ResHoldTime); - - m_PLCTrigerType = new QComboBox(); - QStringList strList; - strList.append(DEVELOP_PLC_TRIGER_DOWM); - strList.append(DEVELOP_PLC_TRIGER_UP); - m_PLCTrigerType->addItems(strList); - if (m_pState->m_PLC_TrigerType == 0) - m_PLCTrigerType->setCurrentText(DEVELOP_PLC_TRIGER_DOWM); - else - m_PLCTrigerType->setCurrentText(DEVELOP_PLC_TRIGER_UP); - - savePLCpara->setObjectName("savePLCpara"); - connect(savePLCpara, SIGNAL(clicked()), this, SLOT(onSavePLCPara())); - - m_PLC_RestartSeverCount = new QSpinBox(); - m_PLC_RestartSeverCount->setMinimum(1); - m_PLC_RestartSeverCount->setMaximum(65536); - m_PLC_RestartSeverCount->setToolTip(tr("超时提醒n次后自动重启服务")); - m_PLC_RestartSeverCount->setValue(m_pState->m_PLC_RestartSeverCount); - - QCheckBox *m_PLC_ShowTimerOutMsg = new QCheckBox; - m_PLC_ShowTimerOutMsg->setText(tr("是否显示提示")); - m_PLC_ShowTimerOutMsg->setText(tr("勾选后通信超时时会显示提醒信息")); - m_PLC_ShowTimerOutMsg->setObjectName("m_PLC_ShowTimerOutMsg"); - connect(m_PLC_ShowTimerOutMsg, SIGNAL(stateChanged(int)), this, SLOT(onCheckstateChanged(int))); - m_PLC_ShowTimerOutMsg->setChecked(m_pState->m_PLC_ShowTimerOutMsg == (int)true); - - QCheckBox *m_PLC_IsResServer = new QCheckBox; - m_PLC_IsResServer->setText(tr("是否自动重启服务器")); - m_PLC_IsResServer->setToolTip(tr("勾选后通信超时次数达到后，系统将自动重启服务，PLC会自动重新连接")); - m_PLC_IsResServer->setObjectName("m_PLC_IsResServer"); - connect(m_PLC_IsResServer, SIGNAL(stateChanged(int)), this, SLOT(onCheckstateChanged(int))); - m_PLC_IsResServer->setChecked(m_pState->m_PLC_IsResServer == (int)true); - - QCheckBox *m_PLC_SaveMsgInLog = new QCheckBox; - m_PLC_SaveMsgInLog->setText(tr("保存信息到系统日志")); - m_PLC_SaveMsgInLog->setToolTip(tr("勾选后表示超时信息将自动保存到系统日志中，便于查询")); - m_PLC_SaveMsgInLog->setObjectName("m_PLC_SaveMsgInLog"); - connect(m_PLC_SaveMsgInLog, SIGNAL(stateChanged(int)), this, SLOT(onCheckstateChanged(int))); - m_PLC_SaveMsgInLog->setChecked(m_pState->m_PLC_SaveMsgInLog == (int)true); - - PLCitems.at(0)->setSizeHint(1, QSize(100, 40)); - PLCitems.at(1)->setSizeHint(1, QSize(100, 40)); - PLCitems.at(2)->setSizeHint(1, QSize(100, 40)); - PLCitems.at(3)->setSizeHint(1, QSize(100, 40)); - PLCitems.at(4)->setSizeHint(1, QSize(100, 40)); - PLCitems.at(5)->setSizeHint(1, QSize(100, 40)); - PLCitems.at(6)->setSizeHint(1, QSize(100, 40)); - PLCitems.at(7)->setSizeHint(1, QSize(100, 40)); - PLCitems.at(8)->setSizeHint(1, QSize(100, 40)); - PLCitems.at(9)->setSizeHint(1, QSize(100, 40)); - PLCitems.at(10)->setSizeHint(1, QSize(100, 40)); - pTreewidget->setItemWidget(PLCitems.at(0), 1, savePLCpara); - pTreewidget->setItemWidget(PLCitems.at(1), 1, m_PLCTrigerFilter); - pTreewidget->setItemWidget(PLCitems.at(2), 1, m_PLCCameraDelay); - pTreewidget->setItemWidget(PLCitems.at(3), 1, m_PLCCameraPulse); - pTreewidget->setItemWidget(PLCitems.at(4), 1, m_PLCLightDelay); - pTreewidget->setItemWidget(PLCitems.at(5), 1, m_PLCTrigerType); - pTreewidget->setItemWidget(PLCitems.at(6), 1, m_PLCResHoldTime); - pTreewidget->setItemWidget(PLCitems.at(7), 1, m_PLC_RestartSeverCount); - pTreewidget->setItemWidget(PLCitems.at(8), 1, m_PLC_ShowTimerOutMsg); - pTreewidget->setItemWidget(PLCitems.at(9), 1, m_PLC_IsResServer); - pTreewidget->setItemWidget(PLCitems.at(10), 1, m_PLC_SaveMsgInLog); - m_listObj.append(savePLCpara); - m_listObj.append(m_PLCTrigerFilter); - m_listObj.append(m_PLCCameraDelay); - m_listObj.append(m_PLCCameraPulse); - m_listObj.append(m_PLCLightDelay); - m_listObj.append(m_PLCTrigerType); - m_listObj.append(m_PLC_RestartSeverCount); - m_listObj.append(m_PLC_ShowTimerOutMsg); - m_listObj.append(m_PLC_IsResServer); - m_listObj.append(m_PLC_SaveMsgInLog); - m_listObj.append(m_PLCResHoldTime); -} -void DevelopUi::addLightRoot(QTreeWidget *pTreewidget, QString strName) -{ - QTreeWidgetItem *m_LightItems = new QTreeWidgetItem(pTreewidget, QStringList(tr("报警灯测试"))); - m_TreeItemMap.insert(strName, m_LightItems); - m_LightItems->setSizeHint(1, QSize(100, 30)); - //QList lightitems; - lightitems.append(new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("红灯")))); - lightitems.append(new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("绿灯")))); - lightitems.append(new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("黄灯")))); - lightitems.append(new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("蜂鸣")))); - m_LightItems->addChildren(lightitems); - QPushButton *redLight = new QPushButton(tr("红灯闪一下")); - QPushButton *grenLight = new QPushButton(tr("绿灯闪一下")); - QPushButton *yellLight = new QPushButton(tr("黄灯闪一下")); - QPushButton *beeLight = new QPushButton(tr("蜂鸣响一下")); - redLight->setObjectName("redLight"); - grenLight->setObjectName("grenLight"); - yellLight->setObjectName("yellLight"); - beeLight->setObjectName("beeLight"); - connect(redLight, SIGNAL(clicked()), this, SLOT(onLightTest())); - connect(grenLight, SIGNAL(clicked()), this, SLOT(onLightTest())); - connect(yellLight, SIGNAL(clicked()), this, SLOT(onLightTest())); - connect(beeLight, SIGNAL(clicked()), this, SLOT(onLightTest())); -// QBrush m_b; -// m_b.setColor(Qt::darkGray); - lightitems.at(0)->setSizeHint(1, QSize(100, 40)); - lightitems.at(1)->setSizeHint(1, QSize(100, 40)); - lightitems.at(2)->setSizeHint(1, QSize(100, 40)); - lightitems.at(3)->setSizeHint(1, QSize(100, 40)); - //m_LightItems->setBackground(0, m_b); - //m_LightItems->setSizeHint(1, QSize(100, 100)); - pTreewidget->setItemWidget(lightitems.at(0), 1, redLight); - pTreewidget->setItemWidget(lightitems.at(1), 1, grenLight); - pTreewidget->setItemWidget(lightitems.at(2), 1, yellLight); - pTreewidget->setItemWidget(lightitems.at(3), 1, beeLight); - - m_listObj.append(redLight); - m_listObj.append(grenLight); - m_listObj.append(yellLight); - m_listObj.append(beeLight); -} - -void DevelopUi::addDebugRoot(class QTreeWidget *pTreewidget, QString strName) -{ - QTreeWidgetItem *m_DevelopItems = new QTreeWidgetItem(pTreewidget, QStringList(tr("开发者使用"))); - m_TreeItemMap.insert(strName, m_DevelopItems); - m_DevelopItems->setSizeHint(1, QSize(100, 30)); - - developitems.append(new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("保存设置")))); - developitems.append(new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("相机模式")))); - developitems.append(new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("虚拟相机触发时间")))); - developitems.append(new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("系统模式")))); - developitems.append(new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("相机触发模式")))); - developitems.append(new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("串口发送心跳包")))); - developitems.append(new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("网络发送心跳包")))); - developitems.append(new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("串口发送通道结果")))); - developitems.append(new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("网络发送检测结果")))); - developitems.append(new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("网络发送通道结果")))); - developitems.append(new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("光栅使用标志")))); - developitems.append(new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("保存高度厚度数据")))); - developitems.append(new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("通道分配")))); - developitems.append(new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("启动时是否检测")))); - developitems.append(new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("显示厚度数据")))); - developitems.append(new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("显示厚度采样数据")))); - m_DevelopItems->addChildren(developitems); - - m_cameraTrgType = new QComboBox(); - QStringList m_strList; - m_strList.append(QString(DEVELOP_DETECT_CAMERE_VIRSUAL)); - m_strList.append(QString(DEVELOP_DETECT_CAMERE_TRUE)); - m_cameraTrgType->addItems(m_strList); - m_cameraTrgTimes = new QSpinBox(); - m_cameraTrgTimes->setMaximum(99999); - m_DebugModel = new QComboBox(); - QStringList debug_strlist; - debug_strlist.append(QString(DEVELOP_DETECT_DEBUG_NOUSER)); - debug_strlist.append(QString(DEVELOP_DETECT_DEBUG_USER)); - m_DebugModel->addItems(debug_strlist); - m_Systype = new QComboBox(); - QStringList sysStrList; - sysStrList.append(QString(DEVELOP_DETECT_CAM_OUTTRIGER)); - sysStrList.append(QString(DEVELOP_DETECT_CAM_SOFTER)); - m_Systype->addItems(sysStrList); - - QCheckBox *m_AutoSendTick2COM = new QCheckBox; - m_AutoSendTick2COM->setText(tr("串口发送心跳包")); - m_AutoSendTick2COM->setObjectName("m_AutoSendTick2COM"); - connect(m_AutoSendTick2COM, SIGNAL(stateChanged(int)), this, SLOT(onCheckstateChanged(int))); - m_AutoSendTick2COM->setChecked(m_pState->m_AutoSendTick2COM == (int)true); - - QCheckBox *m_AutoSendTick2Net = new QCheckBox; - m_AutoSendTick2Net->setText(tr("网络发送心跳包")); - m_AutoSendTick2Net->setObjectName("m_AutoSendTick2Net"); - connect(m_AutoSendTick2Net, SIGNAL(stateChanged(int)), this, SLOT(onCheckstateChanged(int))); - m_AutoSendTick2Net->setChecked(m_pState->m_AutoSendTick2Net == (int)true); - - QCheckBox *m_SendChannelRes2COM = new QCheckBox; - m_SendChannelRes2COM->setText(tr("串口发送通道结果")); - m_SendChannelRes2COM->setObjectName("m_SendChannelRes2COM"); - connect(m_SendChannelRes2COM, SIGNAL(stateChanged(int)), this, SLOT(onCheckstateChanged(int))); - m_SendChannelRes2COM->setChecked(m_pState->m_SendChannelRes2COM == (int)true); - - QCheckBox *m_SendDetectStr2Net = new QCheckBox; - m_SendDetectStr2Net->setText(tr("网络发送检测结果")); - m_SendDetectStr2Net->setObjectName("m_SendDetectStr2Net"); - connect(m_SendDetectStr2Net, SIGNAL(stateChanged(int)), this, SLOT(onCheckstateChanged(int))); - m_SendDetectStr2Net->setChecked(m_pState->m_SendDetectStr2Net == (int)true); - - QCheckBox *m_SendChannelRes2Net = new QCheckBox; - m_SendChannelRes2Net->setText(tr("网络发送通道结果")); - m_SendChannelRes2Net->setObjectName("m_SendChannelRes2Net"); - connect(m_SendChannelRes2Net, SIGNAL(stateChanged(int)), this, SLOT(onCheckstateChanged(int))); - m_SendChannelRes2Net->setChecked(m_pState->m_SendChannelRes2Net == (int)true); - - QCheckBox *m_UseRaster = new QCheckBox; - m_UseRaster->setText(tr("使用光栅获取厚度")); - m_UseRaster->setObjectName("m_UseRaster"); - connect(m_UseRaster, SIGNAL(stateChanged(int)), this, SLOT(onCheckstateChanged(int))); - m_UseRaster->setChecked(m_pState->m_IsUseRaster == 1); - - QCheckBox *m_SaveD2HCsv = new QCheckBox; - m_SaveD2HCsv->setText(tr("保存数据用于测试")); - m_SaveD2HCsv->setObjectName("m_SaveD2HCsv"); - connect(m_SaveD2HCsv, SIGNAL(stateChanged(int)), this, SLOT(onCheckstateChanged(int))); - m_SaveD2HCsv->setChecked(m_pState->m_SaveD2HCsv == 1); - - QCheckBox *m_IsUseChannel = new QCheckBox; - m_IsUseChannel->setText(tr("是否使用通道分配")); - m_IsUseChannel->setObjectName("m_IsUseChannel"); - connect(m_IsUseChannel, SIGNAL(stateChanged(int)), this, SLOT(onCheckstateChanged(int))); - m_IsUseChannel->setChecked(m_pState->m_IsUseChannel == 1); - - QCheckBox *m_StartAndDetect = new QCheckBox; - m_StartAndDetect->setText(tr("是否启动就开始检测")); - m_StartAndDetect->setObjectName("m_StartAndDetect"); - connect(m_StartAndDetect, SIGNAL(stateChanged(int)), this, SLOT(onCheckstateChanged(int))); - m_StartAndDetect->setChecked(m_pState->m_StartAndDetect == 1); - - QCheckBox *m_showThressValue = new QCheckBox; - m_showThressValue->setText(tr("是否显示")); - m_showThressValue->setObjectName("m_showThressValue"); - connect(m_showThressValue, SIGNAL(stateChanged(int)), this, SLOT(onCheckstateChanged(int))); - m_showThressValue->setChecked(m_pState->m_showThressValue == 1); - - QCheckBox *m_showThressList = new QCheckBox; - m_showThressList->setText(tr("是否显示")); - m_showThressList->setObjectName("m_showThressList"); - connect(m_showThressList, SIGNAL(stateChanged(int)), this, SLOT(onCheckstateChanged(int))); - m_showThressList->setChecked(m_pState->m_showThressList == 1); - - QPushButton *m_DebugSave = new QPushButton(tr("保存")); - m_DebugSave->setObjectName("m_DebugSave"); - connect(m_DebugSave, SIGNAL(clicked()), this, SLOT(onTreeWidgetButton())); - - pTreewidget->setItemWidget(developitems.at(0), 1, m_DebugSave); - pTreewidget->setItemWidget(developitems.at(1), 1, m_cameraTrgType); - pTreewidget->setItemWidget(developitems.at(2), 1, m_cameraTrgTimes); - pTreewidget->setItemWidget(developitems.at(3), 1, m_DebugModel); - pTreewidget->setItemWidget(developitems.at(4), 1, m_Systype); - pTreewidget->setItemWidget(developitems.at(5), 1, m_AutoSendTick2COM); - pTreewidget->setItemWidget(developitems.at(6), 1, m_AutoSendTick2Net); - pTreewidget->setItemWidget(developitems.at(7), 1, m_SendChannelRes2COM); - pTreewidget->setItemWidget(developitems.at(8), 1, m_SendDetectStr2Net); - pTreewidget->setItemWidget(developitems.at(9), 1, m_SendChannelRes2Net); - pTreewidget->setItemWidget(developitems.at(10), 1, m_UseRaster); - pTreewidget->setItemWidget(developitems.at(11), 1, m_SaveD2HCsv); - pTreewidget->setItemWidget(developitems.at(12), 1, m_IsUseChannel); - pTreewidget->setItemWidget(developitems.at(13), 1, m_StartAndDetect); - pTreewidget->setItemWidget(developitems.at(14), 1, m_showThressValue); - pTreewidget->setItemWidget(developitems.at(15), 1, m_showThressList); - - m_listObj.append(m_DebugSave); - m_listObj.append(m_cameraTrgType); - m_listObj.append(m_cameraTrgTimes); - m_listObj.append(m_DebugModel); - m_listObj.append(m_Systype); - m_listObj.append(m_AutoSendTick2COM); - m_listObj.append(m_AutoSendTick2Net); - m_listObj.append(m_SendChannelRes2COM); - m_listObj.append(m_SendDetectStr2Net); - m_listObj.append(m_SendChannelRes2Net); - m_listObj.append(m_UseRaster); - m_listObj.append(m_SaveD2HCsv); - m_listObj.append(m_IsUseChannel); - m_listObj.append(m_StartAndDetect); - m_listObj.append(m_showThressValue); - m_listObj.append(m_showThressList); - - developitems.at(0)->setSizeHint(1, QSize(100, 30)); - developitems.at(1)->setSizeHint(1, QSize(100, 30)); - developitems.at(2)->setSizeHint(1, QSize(100, 30)); - developitems.at(3)->setSizeHint(1, QSize(100, 30)); - developitems.at(4)->setSizeHint(1, QSize(100, 30)); - developitems.at(5)->setSizeHint(1, QSize(100, 30)); - developitems.at(6)->setSizeHint(1, QSize(100, 30)); - developitems.at(7)->setSizeHint(1, QSize(100, 30)); - developitems.at(8)->setSizeHint(1, QSize(100, 30)); - developitems.at(9)->setSizeHint(1, QSize(100, 30)); - developitems.at(10)->setSizeHint(1, QSize(100, 30)); - developitems.at(11)->setSizeHint(1, QSize(100, 30)); - developitems.at(12)->setSizeHint(1, QSize(100, 30)); - developitems.at(13)->setSizeHint(1, QSize(100, 30)); - developitems.at(14)->setSizeHint(1, QSize(100, 30)); - developitems.at(15)->setSizeHint(1, QSize(100, 30)); - InitDebugTree(); -} - -void DevelopUi::HidPLCUI(bool nflag) -{ - if (m_TreeWidget){ - m_TreeWidget->setItemHidden(PLCitems.at(7), nflag); - m_TreeWidget->setItemHidden(PLCitems.at(8), nflag); - m_TreeWidget->setItemHidden(PLCitems.at(9), nflag); - m_TreeWidget->setItemHidden(PLCitems.at(10), nflag); - - } -} - -void DevelopUi::HidDevelopUI(bool nflag) -{ - if (m_TreeWidget){ - m_TreeWidget->setItemHidden(developitems.at(0), nflag); - m_TreeWidget->setItemHidden(developitems.at(1), nflag); - m_TreeWidget->setItemHidden(developitems.at(2), nflag); - m_TreeWidget->setItemHidden(developitems.at(3), nflag); - m_TreeWidget->setItemHidden(developitems.at(4), nflag); - m_TreeWidget->setItemHidden(developitems.at(5), nflag); - m_TreeWidget->setItemHidden(developitems.at(6), nflag); - m_TreeWidget->setItemHidden(developitems.at(7), nflag); - m_TreeWidget->setItemHidden(developitems.at(8), nflag); - m_TreeWidget->setItemHidden(developitems.at(9), nflag); - m_TreeWidget->setItemHidden(developitems.at(10), nflag); - m_TreeWidget->setItemHidden(developitems.at(11), nflag); - m_TreeWidget->setItemHidden(developitems.at(12), nflag); - m_TreeWidget->setItemHidden(developitems.at(13), nflag); - m_TreeWidget->setItemHidden(developitems.at(14), nflag); - m_TreeWidget->setItemHidden(developitems.at(15), nflag); - } -} -Q_SLOT void DevelopUi::onTreeWidgetButton() -{ - QString strObj = sender()->objectName(); - if (strObj == "pStationSetButton") - { - if (StationSettingDlg) - StationSettingDlg->show(); - } - else if (strObj == "m_IsModfy") - { -// m_ComScan->setDisabled(false); -// m_ComBoxName->setDisabled(false); -// m_ComBoxBaut->setDisabled(false); -// pSaveButton->setDisabled(false); - } - else if (strObj == "m_ComScan") - { -// disconnect(m_ComBoxBaut,0,0,0); -// disconnect(m_ComBoxName,0,0,0); -// m_ComBoxName->clear(); -// QStringList m_NameList; -// foreach(const QSerialPortInfo &info, QSerialPortInfo::availablePorts()) -// { -// QString comportInfo = info.portName(); -// if (!m_NameList.contains(comportInfo)) -// m_NameList.append(comportInfo); -// } -// m_ComBoxName->addItems(m_NameList); -// -// if (m_ComName){ -// m_ComBoxName->setCurrentText(m_ComName->text()); -// } -// if (m_ComBaut){ -// m_ComBoxBaut->setCurrentText(m_ComBaut->text()); -// } -// connect(m_ComBoxBaut, SIGNAL(currentIndexChanged(int)), this, SLOT(oncurrentIndexChanged(int))); -// connect(m_ComBoxName, SIGNAL(currentIndexChanged(int)), this, SLOT(oncurrentIndexChanged(int))); - - } - else if (strObj == "m_Language"){ - - } - else if (strObj == "m_DebugSave"||strObj =="pSavePara") - { - if (m_cameraTrgType){ - if (m_cameraTrgType->currentText() == DEVELOP_DETECT_CAMERE_VIRSUAL) - m_pState->m_Virtual_Camera = 1; - else - m_pState->m_Virtual_Camera = 0; - } - if (m_cameraTrgTimes){ - m_pState->m_Visural_Time = m_cameraTrgTimes->value(); - } - if (m_DebugModel){ - if (m_DebugModel->currentText() == DEVELOP_DETECT_DEBUG_NOUSER) - m_pState->m_Debug = 100; - else - m_pState->m_Debug = 1001; - } - if (m_Systype){ - if (m_Systype->currentText() == DEVELOP_DETECT_CAM_OUTTRIGER) - m_pState->m_CameraTrigeType = 1; - else - m_pState->m_CameraTrigeType = 0; - } - m_pState->saveDeteImage(); - emit sgShowMsg(tr("保存完成")); - } -} - -void DevelopUi::InitDebugTree(void) -{ - if (m_pState) - { - if (m_cameraTrgType) - { - if (m_pState->m_Virtual_Camera == 1) - m_cameraTrgType->setCurrentText(DEVELOP_DETECT_CAMERE_VIRSUAL); - else - m_cameraTrgType->setCurrentText(DEVELOP_DETECT_CAMERE_TRUE); - } - if (m_cameraTrgTimes) - m_cameraTrgTimes->setValue(m_pState->m_Visural_Time); - if (m_DebugModel) - { - if (m_pState->m_Debug == 100) - m_DebugModel->setCurrentText(DEVELOP_DETECT_DEBUG_NOUSER); - else - m_DebugModel->setCurrentText(DEVELOP_DETECT_DEBUG_USER); - } - if (m_Systype) - { - if (m_pState->m_CameraTrigeType == 1) - m_Systype->setCurrentText(DEVELOP_DETECT_CAM_OUTTRIGER); - else - m_Systype->setCurrentText(DEVELOP_DETECT_CAM_SOFTER); - } - } -} - -Q_SLOT void DevelopUi::oncurrentIndexChanged(int nIndex) -{ -// QString strObj = sender()->objectName(); -// if (strObj == "m_ComBoxName") -// { -// m_ComName->setText(m_ComBoxName->currentText()); -// } -// else if (strObj == "m_ComBoxBaut") -// { -// m_ComBaut->setText(m_ComBoxBaut->currentText()); -// } -} - -Q_SLOT void DevelopUi::oncurrentChanged(const QString &str) -{ - QString strObjName = sender()->objectName(); - if ("m_Language" == strObjName){ - emit (sgGenalData("languageSeting", str)); - } -} - -Q_SLOT void DevelopUi::onCheckstateChanged(int state) -{ - QString strObj = sender()->objectName(); - if (strObj == "m_saveImgRes_good"){ - m_pState->saveCutGood = int(state == 2); - } - else if (strObj == "m_saveImgRes_bad"){ - m_pState->saveCutBad = int(state == 2); - } - else if (strObj == "m_saveImgSrc_good"){ - m_pState->saveGood = int(state == 2); - } - else if (strObj == "m_saveImgSrc_bad"){ - m_pState->saveBad = int(state == 2); - } - else if (strObj == "m_ResAll2A"){ - m_pState->m_bObjAll2A = (state == 2 ? true : false); - } - else if (strObj == "m_AutoSendTick2COM"){ - m_pState->m_AutoSendTick2COM = int(state == 2); - m_pState->saveDeteImage(); - } - else if (strObj == "m_AutoSendTick2Net"){ - m_pState->m_AutoSendTick2Net = int(state == 2); - m_pState->saveDeteImage(); - } - else if (strObj == "m_SendDetectStr2Net"){ - m_pState->m_SendDetectStr2Net = int(state == 2); - m_pState->saveDeteImage(); - } - else if (strObj == "m_SendChannelRes2Net"){ - m_pState->m_SendChannelRes2Net = int(state == 2); - m_pState->saveDeteImage(); - } - else if (strObj == "m_SendChannelRes2COM"){ - m_pState->m_SendChannelRes2COM = int(state == 2); - m_pState->saveDeteImage(); - } - else if (strObj == "m_UseRaster"){ - m_pState->m_IsUseRaster = int(state == 2); - m_pState->saveDeteImage(); - } - else if (strObj == "m_SaveD2HCsv"){ - m_pState->m_SaveD2HCsv = int(state == 2); - - } - else if (strObj == "m_IsUseChannel"){ - m_pState->m_IsUseChannel = int(state == 2); - m_pState->saveDeteImage(); - } - else if (strObj == "m_StartAndDetect"){ - m_pState->m_StartAndDetect = int(state == 2); - m_pState->saveDeteImage(); - } - else if (strObj == "m_PLC_RestartSeverCount"){ - m_pState->m_PLC_RestartSeverCount = int(state == 2); - m_pState->savePLCPara(); - } - else if (strObj == "m_PLC_ShowTimerOutMsg"){ - m_pState->m_PLC_ShowTimerOutMsg = int(state == 2); - m_pState->savePLCPara(); - } - else if (strObj == "m_PLC_IsResServer"){ - m_pState->m_PLC_IsResServer = int(state == 2); - m_pState->savePLCPara(); - } - else if (strObj == "m_PLC_SaveMsgInLog"){ - m_pState->m_PLC_SaveMsgInLog = int(state == 2); - m_pState->savePLCPara(); - } - else if (strObj == "m_showThressValue"){ - m_pState->m_showThressValue = int(state == 2); - } - else if (strObj == "m_showThressList"){ - m_pState->m_showThressList = int(state == 2); - } -} - -Q_SLOT void DevelopUi::onLightTest() -{ - QVariant nType = QVariant(WF_LIFHT); - QString strObj = sender()->objectName(); - if (strObj == "redLight") - { - emit(sgGenalData(nType, LIGHT_REDBEE)); - } - else if (strObj == "grenLight"){ - emit(sgGenalData(nType, LIGHT_GREENBEE)); - } - else if (strObj == "yellLight"){ - emit(sgGenalData(nType, LIGHT_YELLOWBEE)); - } - else if (strObj == "beeLight"){ - emit(sgGenalData(nType, LIGHT_BEE)); - } -} - -Q_SLOT void DevelopUi::onSavePLCPara() -{ - if (m_pState) - { - m_pState->m_PLC_TrigerFilter = m_PLCTrigerFilter->value(); - m_pState->m_PLC_CamTrigDelay = m_PLCCameraDelay->value(); - m_pState->m_PLC_CamTrigPulse = m_PLCCameraPulse->value(); - m_pState->m_PLC_LightDelay = m_PLCLightDelay->value(); - m_pState->m_PLC_RestartSeverCount=m_PLC_RestartSeverCount->value(); - m_pState->m_PLC_ResHoldTime = m_PLCResHoldTime->value(); - if (m_PLCTrigerType->currentText() == DEVELOP_PLC_TRIGER_DOWM) - m_pState->m_PLC_TrigerType = 0; - else if (m_PLCTrigerType->currentText() == DEVELOP_PLC_TRIGER_UP) - m_pState->m_PLC_TrigerType = 1; - - m_pState->savePLCPara(); - QVariant nType = QVariant(WF_PLCPARA); - emit(sgGenalData(nType, WF_PARASET)); - emit sgShowMsg(tr("数据已发送并保存")); - } -} - -Q_SLOT void DevelopUi::onSetCurrentIndex(int nIndex) -{ - for (QMap::iterator pp = m_TreeItemMap.begin(); pp != m_TreeItemMap.end(); ++pp) - { - (*pp)->setExpanded(false); - } - QString strname = m_Setting_listWidget->item(nIndex)->data(0).toString(); - if (m_TreeItemMap.contains(strname)) - { - QTreeWidgetItem *p = m_TreeItemMap.value(strname); - //p->setExpanded(false); - if (p){ - if (m_TreeWidget){ - m_TreeWidget->setCurrentItem(p, QItemSelectionModel::SelectCurrent); - p->setExpanded(true); - } - } - } -} -Q_SLOT void DevelopUi::onTest() -{ - //m_TreeWidget->setCurrentItem(m_PLCItems, QItemSelectionModel::SelectCurrent); - -} - -Q_SLOT void DevelopUi::onShowMessage(QString str) -{ - QPulpewidget *pw = new QPulpewidget(); - pw->showmessage(str); - pw->setParent(m_pWidgetMain); - connect(pw, SIGNAL(finished()), pw, SLOT(deleteLater()));//完成后自动删除内存 - //connect(pw, SIGNAL(finishshow(QWidget*)), this, SLOT(onDeleteShow(QWidget*))); -} - -void DevelopUi::onChangeBackground() -{ - QShowImg m_showImgDlg; - m_showImgDlg.setWindowIcon(QIcon(":/image/leaper")); - QString DstPath = m_pCtrl->appRoot() + "\\user\\background.png"; - connect(&m_showImgDlg, SIGNAL(sgChangeImg()), this, SLOT(onChangeBG())); - connect(this, SIGNAL(sgChangeBG(QString)), &m_showImgDlg, SLOT(setPicPath(QString))); - m_showImgDlg.setPicPath(DstPath); - m_showImgDlg.exec(); - return; -} - -Q_SLOT void DevelopUi::onChangeBG() -{ - QFileDialog fileDialog; - fileDialog.setWindowTitle(tr("请选择您的背景图")); - fileDialog.setNameFilter("Picture(*.bmp *.jpg *.png)"); - fileDialog.setFileMode(QFileDialog::ExistingFiles); - if (fileDialog.exec() == QDialog::Accepted) - { - QStringList backgroundFile = fileDialog.selectedFiles(); - if (backgroundFile.size() > 0) - { - QString DstPath = m_pCtrl->appRoot() + "\\user\\background.png"; - QString sourcePath = backgroundFile.at(0); - DstPath.replace("\\", "/"); - if (sourcePath == DstPath){ - // //return; - // //return true; - } - if (!QFile::exists(sourcePath)){ - //return false; - } - QDir *createfile = new QDir; - bool exist = createfile->exists(DstPath); - if (exist){ - //if (converFileIfExist){ - createfile->remove(DstPath); - //} - } - if (!QFile::copy(sourcePath, DstPath)){ - //return false; - } - emit sgChangeBG(DstPath); - QMessageBox infobox(QMessageBox::Information, tr("提示"), tr("背景图更新完成，请重启本软件."), QMessageBox::Yes, NULL); - infobox.setWindowIcon(QIcon(":/image/leaper")); - infobox.setButtonText(QMessageBox::Yes, tr("确认")); - infobox.exec(); - } - } -} - -void DevelopUi::readSettingFile() -{ - if (m_setting){ - QString m_str = "/CheckThread/"; - nCheckDays = m_setting->value(m_str + "days",7).toInt(); - nCheckThreadEable = m_setting->value(m_str + "IsUse",true).toBool(); - } -} - -void DevelopUi::writeSettingFile() -{ - if (m_setting){ - QString m_str = "/CheckThread/"; - m_setting->setValue(m_str + "days", nCheckDays); - m_setting->setValue(m_str + "IsUse", nCheckThreadEable); - } -} - -QStringList DevelopUi::getDirNames(QString strPath) -{ - QStringList strDirNames; - QDir dir(strPath); - if (!dir.exists()) - { - return strDirNames; - } - dir.setFilter(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot); - dir.setSorting(QDir::DirsFirst); // 文件夹优先 - // 转换成一个List - QFileInfoList list = dir.entryInfoList(); - if (list.size() < 1) - { - return strDirNames; - } - int i = 0; - do - { - QFileInfo fileInfo = list.at(i); - QString tt = fileInfo.fileName(); - // 如果是文件夹 - bool bisDir = fileInfo.isDir(); - if (bisDir) - { - strDirNames.append(fileInfo.fileName()); - } - i++; - } while (i < list.size()); - return strDirNames; -} \ No newline at end of file diff --git a/src/tpMain/DevelopUi.h b/src/tpMain/DevelopUi.h deleted file mode 100644 index 9181dc2..0000000 --- a/src/tpMain/DevelopUi.h +++ /dev/null @@ -1,128 +0,0 @@ -#pragma once -#include "IWheelUi.h" -#include "QPixmap" -#include "QList" -#include "QDiskCleanThread.h" -#include "qsettings.h" -class DevelopUi : public IWheelUi -{ - Q_OBJECT -public: - DevelopUi(const QString strUiName, class IWheelCtrl *p); - ~DevelopUi(); - virtual bool onExec(); - virtual bool onPolished(QWidget *p); - virtual bool onStateChanged(QObject *watched, int state); - virtual bool onClose(); - - Q_SLOT void onClickStartDetect(); - Q_SLOT void onShowModel(class Result2Ui *p); - void saveImage(class Result2Ui*); - void saveImage(const QPixmap& m_pixmap, QString m_path, QString filename); - void ReadJson(); - Q_SLOT void onChangeBackground();//更换检测背景 - - Q_SLOT void onSetCurrentIndex(int nIndex); - Q_SLOT void onTest(); - Q_SLOT void handleResult(Result2Ui *p); - Q_SLOT void onOpenDataPath(); - Q_SLOT void onTreeWidgetButton(); - Q_SLOT void onLightTest(); - Q_SLOT void oncurrentIndexChanged(int nIndex); - Q_SLOT void oncurrentChanged(const QString &str); - Q_SLOT void onCheckstateChanged(int state); - Q_SLOT void onSavePLCPara(); - Q_SLOT void onShowMessage(QString str); - Q_SLOT void onChangeBG(); - - void InitDebugTree(void); - void HidDevelopUI(bool nflag); - void HidPLCUI(bool nflag); - bool InitTreeWidget(class QTreeWidget* pTreewidget); - void addComRoot(class QTreeWidget *pTreewidget, QString strName = QString()); - void addCamRoot(class QTreeWidget *pTreewidget, QString strName = QString()); - void addPicRoot(class QTreeWidget *pTreewidget, QString strName = QString()); - void addLightRoot(class QTreeWidget *pTreewidget, QString strName = QString()); - void addDebugRoot(class QTreeWidget *pTreewidget, QString strName = QString()); - void addPLCSettingRoot(class QTreeWidget *pTreewidget, QString strName = QString()); - - void readSettingFile(); - void writeSettingFile(); - QStringList getDirNames(QString strPath); -signals: - void operate(class Result2Ui *p); - void sgShowMsg(QString); - void sgChangeBG(QString); -private: - QList m_listObj; - QMap m_TreeItemMap; - class QLabel *m_pLbModelThickness; - class QLabel *m_pLbModelDiameter; - class QLabel *m_pLbModelId; - class QLabel *m_pLbModelRate; - class DetectState *m_pState; - class IWheelCtrl *m_pCtrl; - class QPushButton *m_pBtnDetect; - class QWidget *m_pWidgetMain; -// class QLabel *m_CamType_label; -// class QLabel *m_CamSerial_label; - - class CamConfig *m_pCamConfig; - class ComConfig *m_pComConfig; - class QLabel *m_Dlp_Result_Img; - - //class QThread *saveImgThread; - QString m_strUiName; - - class QTreeWidget *m_TreeWidget; - -// class QLabel *m_ComName; -// class QLabel *m_ComBaut; -// class QPushButton *m_IsModfy; -// class QPushButton *m_ComScan; -// class QComboBox *m_ComBoxName; -// class QComboBox *m_ComBoxBaut; - class QPushButton *pStationSetButton{NULL}; - class QComboBox *m_Language{NULL}; - - //debug - class QComboBox *m_cameraTrgType; - class QSpinBox *m_cameraTrgTimes; - class QComboBox *m_DebugModel; - class QComboBox *m_Systype; - - QList developitems; - QList comitems; - QList camitems; - QList picitems; - QList PLCitems; - QList lightitems; - //class SaveImgThread *workTreadsrc; - //class SaveImgThread *workTreadres; - - class QSpinBox *m_PLCTrigerFilter; - class QSpinBox *m_PLCCameraDelay; - class QSpinBox *m_PLCCameraPulse; - class QSpinBox *m_PLCLightDelay; - class QSpinBox *m_PLCResHoldTime; - class QComboBox *m_PLCTrigerType; - class QSpinBox *m_PLC_RestartSeverCount; - - class QTreeWidgetItem *m_PLCItems; - class QListWidget *m_Setting_listWidget; - QStringList m_listwidgetItemStr; - //class QObjectCleanupHandler *m_CleanHeader; - - QDiskCleanThread *pDiskCleanThread; - QSettings *m_setting; - int nCheckDays; - bool nCheckThreadEable; - - class QPixmapListBar* m_pixShowBar; - //class QGridLayout *m_mainLayout; - - class QDialog* StationSettingDlg; - - class QLabel* m_LbShowPath; -}; - diff --git a/src/tpMain/HannelUI.cpp b/src/tpMain/HannelUI.cpp deleted file mode 100644 index 08280a9..0000000 --- a/src/tpMain/HannelUI.cpp +++ /dev/null @@ -1,568 +0,0 @@ -#include "HannelUI.h" -#include "qscrollarea.h" -#include "qboxlayout.h" -#include "qwidget.h" -#include "qlistview.h" -#include "qstringlistmodel.h" -#include "qgroupbox.h" -#include "qtableview.h" -#include "qtabwidget.h" -#include "ChannelInfo.h" -#include "qlist.h" -#include "InfoFile.h" -#include "qaddchanneldlg.h" -#include "qmessagebox.h" -#include "qstring.h" -#include "qcombobox.h" -#include "qobject.h" -#include "qlistwidget.h" -#include "qpixmap.h" -#include "IWheelCtrl.h" -#include "QPixmap" -#include "QIcon" -#include "QListWidget" -#include "IWheelModel.h" -#include "QLineEdit" -#include "QStringListModel" -#include "qchannelmanager.h" -#include "qpulpewidget.h" -#pragma execution_character_set("utf-8") -#define ITEMSIZE 100 -CHannelUI::CHannelUI(const QString, IWheelCtrl *pCtrl) - : m_pChannelInfo(pCtrl->getChannelInfo()) -{ - m_pCtrl = pCtrl; - m_pSrcArea = NULL; - m_pComBoxChannel = NULL; - m_pListWidget = NULL; - m_TotalLayout = NULL; - connect(m_pCtrl, SIGNAL(sgModelChanged()), this, SLOT(updateTableShow())); - connect(this, SIGNAL(sgGenalData(QVariant, QVariant)), this, SLOT(onRecvSg(QVariant, QVariant))); - connect(this, SIGNAL(sgShowMsg(QString)), this, SLOT(onShowMessage(QString))); -} - - -CHannelUI::~CHannelUI() -{ - for (QMap::iterator its = m_mpListModel.begin(); its != m_mpListModel.end(); ++its){ - QStringListModel *p = (*its); - delete p; - p = NULL; - } - m_mpListModel.clear(); - - for (QMap::iterator its = m_mpGroupBox.begin(); its != m_mpGroupBox.end(); ++its){ - QWidget *p = (*its); - delete p; - p = NULL; - } - m_mpGroupBox.clear(); - if (m_TotalLayout){ - delete m_TotalLayout; - m_TotalLayout = NULL; - } -} - -Q_SLOT void CHannelUI::updateTableShow() -{ - updateCombox(); - UpdateTab2(m_pCtrl->getAllModelMapPtr()->keys()); - for (QMap::iterator its = m_mpListModel.begin(); its != m_mpListModel.end(); ++its) - { - (*its)->setStringList(m_pChannelInfo->getChannelModelList(its.key())); - } -} - -bool CHannelUI::initScroll(class QScrollArea* pArea) -{ - if (!pArea) { - return false; - } - m_pSrcArea = pArea; - m_TotalLayout = new QHBoxLayout; - m_pSrcArea->setLayout(m_TotalLayout); - initChannel(); - return true; -} - -bool CHannelUI::addChannel(QString strName, int nChannel) -{ - if (!m_pSrcArea || !m_pSrcArea->widget()) { - return false; - } - //QLayout *pLayOut = m_pSrcArea->widget()->layout(); - QLayout *pLayOut=m_pSrcArea->layout(); - if (!pLayOut) { - return false; - } - QGridLayout *m = new QGridLayout; - m->setMargin(0); - QListView *plistView = new QListView; - plistView->setEditTriggers(QAbstractItemView::NoEditTriggers); - QStringListModel *strListmodel = new QStringListModel; - int nIndex = m_mpGroupBox.size() + 1; - QString m_objName = QString("list%1").arg(nIndex); - plistView->setObjectName(m_objName); - plistView->setWordWrap(false); - plistView->setAlternatingRowColors(true); - m->addWidget(plistView); - QGroupBox *g = new QGroupBox; - //g->setMaximumWidth(120); - g->setMinimumWidth(120); - g->setTitle(strName); - g->setLayout(m); - pLayOut->addWidget(g); - m_mpListModel.insert(nIndex, strListmodel); - m_mpGroupBox.insert(nIndex, g); - plistView->setModel(strListmodel); - QString str; - if(nChannel==1) - str = QString("QListView{border: 5px solid rgb(180,0,0,100);}"); - else if (nChannel == 2) - str = QString("QListView{border: 5px solid rgb(0,180,0,100);}"); - else if (nChannel == 3) - str = QString("QListView{border: 5px solid rgb(0,0,180,100);}"); - else if (nChannel == 4) - str = QString("QListView{border: 5px solid rgb(180,180,0,100);}"); - else if (nChannel == 5) - str = QString("QListView{border: 5px solid rgb(180,0,180,100);}"); - else if (nChannel == 6) - str = QString("QListView{border: 5px solid rgb(0,180,180,100);}"); - else - str = QString("QListView{border: 5px solid rgb(0,0,0,0);}"); - plistView->setStyleSheet(str);//不同的通道显示不同的边框颜色 - - connect(plistView, SIGNAL(clicked(QModelIndex)), this, SLOT(onListViewItem(QModelIndex))); - return true; -} - -bool CHannelUI::delChannel() -{ - if (!m_pSrcArea) { - return false; - } - //QLayout *pLayOut = m_pSrcArea->widget()->layout(); - QLayout *pLayOut = m_pSrcArea->layout(); - if (!pLayOut) { - return false; - } - int nIndex = m_mpGroupBox.size(); - QWidget* pwidget = m_mpGroupBox.value(nIndex); - pLayOut->removeWidget(pwidget); - m_mpListModel.remove(nIndex); - m_mpGroupBox.remove(nIndex); - delete pwidget; - return true; -} - -Q_SLOT bool CHannelUI::onShowAddChannel() -{ - QAddChannelDlg dlg; - dlg.setWindowIcon(QIcon(":/image/leaper")); - dlg.setWindowTitle(tr("通道信息")); - dlg.setWindowModality(Qt::ApplicationModal); - dlg.show(); - if (dlg.exec() == QDialog::Accepted) { - ChannelInfo m_info; - m_info.m_AboutName = dlg.GetData(m_info.m_ChannelName, m_info.m_value); - m_pChannelInfo->addChannel(m_info); - m_pChannelInfo->saveChannels(); - addChannel(m_info.m_ChannelName, m_pChannelInfo->channelSize()); - updateCombox(); - } - return true; -} - -Q_SLOT bool CHannelUI::OnShowDelChannel() -{ - QMessageBox infobox(QMessageBox::Warning, tr("提示"), tr("你确定要删除通道？"), QMessageBox::Ok| QMessageBox::Cancel); - infobox.setWindowIcon(QIcon(":/image/leaper")); - infobox.setButtonText(QMessageBox::Ok, tr("确认")); - infobox.setButtonText(QMessageBox::Cancel, tr("取消")); - if (QMessageBox::Cancel == infobox.exec()) - return false; - m_pChannelInfo->delChannel(m_pChannelInfo->channelSize()); - m_pChannelInfo->saveChannels(); - delChannel(); - updateCombox(); - UpdateTab2(m_pCtrl->getAllModelMapPtr()->keys()); - return true; -} - -bool CHannelUI::initChannel() -{ - QMap& mapInfo = m_pChannelInfo->getChannelModelMap(); - for (int i = 1; i <= mapInfo.size(); i++) { - addChannel(mapInfo.value(i)->m_ChannelName, i); - } - return true; -} - -bool CHannelUI::updateCombox() -{ - QMap &mapInfo = m_pChannelInfo->getChannelModelMap(); - if (m_pComBoxChannel) { - m_pComBoxChannel->clear(); - m_pComBoxChannel->addItem(tr("未分配"), 0); - } - - for (QMap::iterator its = mapInfo.begin(); its != mapInfo.end(); ++its) { - if (m_pComBoxChannel) { - m_pComBoxChannel->addItem(mapInfo.value(its.key())->m_ChannelName, its.key()); - } - } - return true; -} - -Q_SLOT void CHannelUI::onItemDoubleClicked(class QListWidgetItem * item) -{ - QString itemText = item->text(); - onShowModelInfo(itemText); -} - -bool CHannelUI::onPolished(QWidget *p) -{ - QString str = p->objectName(); - if (str == "listWidget_tab2") { - m_pListWidget = qobject_cast(p); - connect(m_pListWidget, SIGNAL(itemClicked(QListWidgetItem*)), this, SLOT(onItemDoubleClicked(QListWidgetItem*))); - m_pListWidget->setResizeMode(QListWidget::Adjust); - } - else if (str == "ModelMgr_label_ModelPic") { - m_pLbModelPic = qobject_cast(p); - QString pic_path = ":/image/none.jpg"; - QPixmap pic = QPixmap(pic_path); - m_pLbModelPic->setPixmap(pic.scaled(WS_PICSIZELIST, WS_PICSIZELIST)); - } - else if (str == "ModelMgr_comboBox_Model_Path") { - m_pComBoxChannel = qobject_cast(p); - } - else if (str == "label_ModelName") { - m_pLbModelName = qobject_cast(p); - } - else if (str == "ModelMgr_scrollArea") { - initScroll((QScrollArea*)p); - } - else if (str == "ModelMgr_listWidget_tab2") { - m_pListWgt_Models_Images = qobject_cast(p); - m_pListWgt_Models_Images->setViewMode(QListView::IconMode); - m_pListWgt_Models_Images->setResizeMode(QListView::Adjust); - m_pListWgt_Models_Images->setSpacing(20); - connect(m_pListWgt_Models_Images, SIGNAL(itemClicked(QListWidgetItem*)), this, SLOT(onItemDoubleClicked(QListWidgetItem*))); - } - else if (str == "ModelMgr_lineEdit_TabFind"){ - m_pEdit_find = qobject_cast(p); - connect(m_pEdit_find, SIGNAL(textChanged(const QString&)), this, SLOT(onTextChanged(const QString&))); - } - else if (str == "ModelMgr_pushButton_Modify"){ - connect(p, SIGNAL(clicked()), this, SLOT(onChangeChanngel())); - } - else if (str == "ModelMgr_label_Number"){ - m_pLabelNumber = qobject_cast(p); - } - else if (str == "ModelMgr_AddChannel_button"){ - connect(p, SIGNAL(clicked()), this, SLOT(onShowAddChannel())); - } - else if (str == "ModelMgr_DelChannel_button"){ - connect(p, SIGNAL(clicked()), this, SLOT(OnShowDelChannel())); - } - else if (str == "ModelMgr_UpdateChannel_button"){ - connect(p, SIGNAL(clicked()), this, SLOT(OnUpdateShow())); - } - else if (str == "ModelMgr_ManageChannel_button"){ - connect(p, SIGNAL(clicked()), this, SLOT(onManageChannelValue())); - } - else if (str == "ModelMgr_pushButton_Hide"){ - connect(p, SIGNAL(clicked()), this, SLOT(onSlotHide())); - } - else if (str == "ModelMgr_pushButton_Hide2"){ - connect(p, SIGNAL(clicked()), this, SLOT(onSlotHide2())); - } - else if (str == "ModelMgr_groupBox_6"){ - ModelMgr_groupBox_6 = qobject_cast(p); - } - else if (str == "ModelMgr_groupBox_4"){ - ModelMgr_groupBox_4 = qobject_cast(p); - } -// else if (str == "tab"){ -// m_pDlgMain = qobject_cast(p); -// } - else { - return false; - } - return true; -} - -void CHannelUI::UpdateTab2(QStringList m_strList) -{ - for (int nIndex = (m_pListWgt_Models_Images->count() - 1); nIndex >= 0; nIndex--) { - QListWidgetItem *pItem = m_pListWgt_Models_Images->takeItem(nIndex); - delete pItem; - } - QString str; - m_pListWgt_Models_Images->setViewMode(QListView::IconMode); - m_pListWgt_Models_Images->clear(); - m_pListWgt_Models_Images->setProperty("model", str); - m_pListWgt_Models_Images->setIconSize(QSize(ITEMSIZE, ITEMSIZE)); - m_pListWgt_Models_Images->setAcceptDrops(false); - QStringList strList = m_strList; - for (int j = 0; j < strList.size(); j++) - { - QString strName = strList.at(j); - IWheelModel *pModel = m_pCtrl->getModel(strName); - QString strFilePath = pModel->getPicPath(); - if (strFilePath.isEmpty()) - { - strFilePath = ":/image/none.jpg"; - } - else - { - strFilePath = m_pCtrl->appRoot() + pModel->getPicPath(); - } - - QPixmap pix = QPixmap(strFilePath); - QIcon icon(pix.scaled(QSize(ITEMSIZE, ITEMSIZE))); - QListWidgetItem* pItem = new QListWidgetItem(icon, strName); - SetItemBGColor(pItem, strName); - m_pListWgt_Models_Images->addItem(pItem); - } - QString m_str = tr("共 %1 个记录").arg(strList.size()); - m_pLabelNumber->setText(m_str); -} - -Q_SLOT void CHannelUI::onShowModelInfo(QString str) -{ - if (m_pLbModelName) { - m_pLbModelName->setText(str); - } - if (str.isEmpty()) - { - QPixmap pic = QPixmap(":/image/none.jpg"); - m_pLbModelPic->setPixmap(pic.scaled(WS_PICSIZELIST, WS_PICSIZELIST)); - m_pComBoxChannel->setCurrentIndex(0); - } - else - { - IWheelModel *pModel = m_pCtrl->getModel(str); - if (pModel) { - QString picPath = pModel->getPicPath(); - QString pic_path; - if (!picPath.isEmpty()){ - pic_path = m_pCtrl->appRoot() + picPath; - } - else - { - pic_path = ":/image/none.jpg"; - } - QPixmap pic = QPixmap(pic_path); - m_pLbModelPic->setPixmap(pic.scaled(WS_PICSIZELIST, WS_PICSIZELIST)); - ChannelInfo* pInfo=m_pChannelInfo->getChannelInfo(str); - if (pInfo) - m_pComBoxChannel->setCurrentText(pInfo->m_ChannelName); - else - m_pComBoxChannel->setCurrentIndex(0); - } - } -} - -void CHannelUI::UpdateListViewItem(QString strModel) -{//当个Item刷新状态 - if (m_pListWgt_Models_Images) - { - QListWidgetItem *item = m_pListWgt_Models_Images->currentItem(); - if (item) - { - QString str = item->text(); - if (str == strModel)//双重保险，只有添加符合者才可以刷新显示 - SetItemBGColor(item, strModel); - } - } -} -Q_SLOT void CHannelUI::onChangeChanngel() -{ - QString strModel = m_pLbModelName->text(); - int nIndex = m_pComBoxChannel->currentIndex(); - if (nIndex == -1) - return; - onUpdateListViewShow(strModel, nIndex);//更新list列表的显示 - UpdateListViewItem(strModel);//刷新单个Item的显示 背景色 状态刷新 - emit sgShowMsg(tr("修改成功")); -} - -void CHannelUI::onUpdateListViewShow(QString strModel, int nIndex) -{ - int nChannel = m_pChannelInfo->getChannelInfoKey(strModel); - QStringList strList = m_pChannelInfo->getChannelModelList(nChannel); - if (m_mpListModel.contains(nChannel)) - { - QMap::iterator p = m_mpListModel.find(nChannel); - (*p)->setStringList(strList); - } - strList = m_pChannelInfo->getChannelModelList(nIndex); - if (m_mpListModel.contains(nIndex)) - { - strList.append(strModel); - QMap::iterator p = m_mpListModel.find(nIndex); - (*p)->setStringList(strList); - m_pChannelInfo->SetChannelModelList(nIndex, strList); - } -} - -Q_SLOT void CHannelUI::onListViewItem(const QModelIndex &nIndex) -{ - QString str = nIndex.data().toString(); - onShowModelInfo(str); -} - -Q_SLOT void CHannelUI::onTextChanged(const QString& str) -{ - QStringList models = m_pCtrl->getAllModelMapPtr()->keys(); - if (str.isEmpty() || str == "*") { - UpdateTab2(models); - } - else { - QStringList strFilter = models.filter(str); - UpdateTab2(strFilter); - } -} - -bool CHannelUI::onExec() -{ - return true; -} - -Q_SLOT void CHannelUI::onRecvSg(QVariant nType, QVariant nData) -{ - QString strType = nType.toString(); - if (strType == "tabchange") - { - static int nflags = false; - if (nflags == false) - { - UpdateTab2(m_pCtrl->getAllModelMapPtr()->keys()); - m_pChannelInfo->compareStrings(m_pCtrl->getAllModelMapPtr()->keys()); - updateTableShow(); - nflags = true; - } - } - else if (strType == "removeModel") - { - QString strModel = nData.toString(); - onUpdateListViewShow(strModel, 0); - OnUpdateShow(); - } -} - -void CHannelUI::OnUpdateShow() -{ - UpdateTab2(m_pCtrl->getAllModelMapPtr()->keys()); -} - -//设置图标的背景色 -void CHannelUI::SetItemBGColor(QListWidgetItem *pItem, QString strName) -{ - if (pItem) - { - int nColor = m_pChannelInfo->getChannelInfoNum(strName); - if (nColor == 1) - { - pItem->setBackgroundColor(QColor(180, 0, 0, 100)); - } - else if (nColor == 2) - { - pItem->setBackgroundColor(QColor(0, 180, 0, 100)); - } - else if (nColor == 3) - { - pItem->setBackgroundColor(QColor(0, 0, 180, 100)); - } - else if (nColor == 4) - { - pItem->setBackgroundColor(QColor(180, 180, 0, 100)); - } - else if (nColor == 5) - { - pItem->setBackgroundColor(QColor(180, 0, 180, 100)); - } - else if (nColor == 6) - { - pItem->setBackgroundColor(QColor(0, 180, 180, 100)); - } - else - { - pItem->setBackgroundColor(QColor(0, 0, 0, 0)); - } - } -} - -Q_SLOT void CHannelUI::onManageChannelValue() -{ - QChannelManager dialog; - dialog.setChannelInfo(m_pChannelInfo); - dialog.setTableView(); - dialog.exec(); - updateChannelListSHow(); -} - -void CHannelUI::updateChannelListSHow() -{ - if (m_pChannelInfo) - { - QMap pChannelInfo = m_pChannelInfo->getChannelModelMap(); - if (m_mpGroupBox.size() == pChannelInfo.size()) - { - for (QMap::iterator p = pChannelInfo.begin(); p != pChannelInfo.end(); p++) - { - ChannelInfo *pchannel = *p; - QGroupBox *pGroupBox = (QGroupBox*)m_mpGroupBox.value(p.key()); - if (pGroupBox) - { - pGroupBox->setTitle(pchannel->m_ChannelName); - } - } - updateCombox(); - } - } -} - -Q_SLOT void CHannelUI::onSlotHide() -{ - static bool flags = false; - if (flags == false) - { - if (ModelMgr_groupBox_6) - ModelMgr_groupBox_6->setVisible(false); - flags = true; - } - else - { - if (ModelMgr_groupBox_6) - ModelMgr_groupBox_6->setVisible(true); - flags = false; - } -} - -Q_SLOT void CHannelUI::onSlotHide2() -{ - static bool flags = false; - if (flags == false) - { - if (ModelMgr_groupBox_4) - ModelMgr_groupBox_4->setVisible(false); - flags = true; - } - else - { - if (ModelMgr_groupBox_4) - ModelMgr_groupBox_4->setVisible(true); - flags = false; - } -} -Q_SLOT void CHannelUI::onShowMessage(QString str) -{ - QPulpewidget *pw = new QPulpewidget(); - pw->showmessage(str); - pw->setParent(); - connect(pw, SIGNAL(finished()), pw, SLOT(deleteLater()));//完成后自动删除内存 - //connect(pw, SIGNAL(finishshow(QWidget*)), this, SLOT(onDeleteShow(QWidget*))); -} \ No newline at end of file diff --git a/src/tpMain/HannelUI.h b/src/tpMain/HannelUI.h deleted file mode 100644 index 21a4850..0000000 --- a/src/tpMain/HannelUI.h +++ /dev/null @@ -1,61 +0,0 @@ -#pragma once -#include "qmap.h" -#include "IWheelUi.h" -#include "QAbstractItemModel" -class CHannelUI : public IWheelUi -{ - Q_OBJECT -public: - CHannelUI(const QString, class IWheelCtrl *); - ~CHannelUI(); - virtual bool onPolished(QWidget*); - virtual bool onExec(); - virtual bool onClose(){ return true; }; - bool initScroll(class QScrollArea*); - bool initChannel(); - bool addChannel(QString strName, int nChannel); - bool delChannel(); - bool updateCombox(); - void UpdateTab2(QStringList m_strList); - void onUpdateListViewShow(QString strModel, int nIndex = 0); - void UpdateListViewItem(QString strModel); - void SetItemBGColor(class QListWidgetItem *pItem, QString strName);//设置背景色 - void updateChannelListSHow(); - - Q_SLOT void onSlotHide(); - Q_SLOT void onSlotHide2(); - Q_SLOT void onManageChannelValue(); - Q_SLOT void OnUpdateShow(); - Q_SLOT void onItemDoubleClicked(class QListWidgetItem * item); - Q_SLOT void onShowModelInfo(QString); - Q_SLOT bool onShowAddChannel(); - Q_SLOT bool OnShowDelChannel(); - Q_SLOT void updateTableShow(); - Q_SLOT void onTextChanged(const QString& str); - Q_SLOT void onListViewItem(const QModelIndex &nIndex); - Q_SLOT void onChangeChanngel(); - Q_SLOT void onRecvSg(QVariant nType, QVariant nData); - Q_SLOT void onShowMessage(QString str); -private: - QMap m_mpListModel; -signals: - void sgListViewItem(QModelIndex); - void sgShowMsg(QString); -public: - QMap m_mpGroupBox; - class QScrollArea *m_pSrcArea; - class CChannelInfo *m_pChannelInfo; - class QComboBox *m_pComBoxChannel; - class QListWidget *m_pListWidget; - class QLabel *m_pLbModelName; - class QLabel *m_pLbModelPic; - class QListWidget *m_pListWgt_Models_Images; - class QLineEdit *m_pEdit_find; - class QLabel *m_pLabelNumber; - class IWheelCtrl *m_pCtrl; - class QGroupBox *ModelMgr_groupBox_6; - class QGroupBox *ModelMgr_groupBox_4; - class QWidget * m_pDlgMain; - class QHBoxLayout *m_TotalLayout; -}; - diff --git a/src/tpMain/IDetectState.h b/src/tpMain/IDetectState.h deleted file mode 100644 index 76500c3..0000000 --- a/src/tpMain/IDetectState.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef _IDETECTSTATE_H_ -#define _IDETECTSTATE_H_ - -class IDetectState -{ -public: - IDetectState(){}; - ~IDetectState(){}; - virtual void save() = 0; - virtual void getDia2ThPara(float &mk, float &mb){}; - virtual void setDia2ThPara(float mk, float mb){}; - -}; - - -#endif diff --git a/src/tpMain/IWheelCtrl.h b/src/tpMain/IWheelCtrl.h index 4bc06b9..603ef08 100644 --- a/src/tpMain/IWheelCtrl.h +++ b/src/tpMain/IWheelCtrl.h @@ -22,7 +22,6 @@ public: virtual ModelManager *getModelMgr() const = 0; virtual QStringList getAllModelName() = 0; virtual CChannelInfo *getChannelInfo() const = 0; - virtual DetectState *getDetectState() const = 0; virtual TimeMgrCtrl *getTimeMgr() const = 0; virtual QMap* getAllTimePtr() const = 0; virtual CamConfig *getCamConfig() const = 0; diff --git a/src/tpMain/IWheelUi.h b/src/tpMain/IWheelUi.h deleted file mode 100644 index ad404ce..0000000 --- a/src/tpMain/IWheelUi.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef _IWHEELUI_H_ -#define _IWHEELUI_H_ -#include "qobject.h" -#include "qwidget.h" -#include "qstring.h" -#include "QVariant" -class IWheelUi :public QObject -{ - Q_OBJECT -public: - IWheelUi(const QString = QString(), class IWheelCtrl *p = NULL){}; - virtual ~IWheelUi(){}; - - virtual bool onExec() = 0; - virtual bool onPolished(QWidget*) = 0; - virtual bool onStateChanged(QObject* watched, int state){ return false; } - virtual bool onButtonClicked(class QObject* pButton, bool bChecked) { return false; } - virtual bool ActionTrigger(class QAction* pAction, bool bChecked){ return false; } - virtual QWidget* onMainWidget() { return NULL; } - virtual bool onClose() = 0;// { return false; } - virtual bool onUserRole(){ return false; } - virtual void setViewList(QStringList strList){}; - Q_SLOT void onGenalData(QVariant nType, QVariant nData){}; -signals: - void sgGenalData(QVariant nType, QVariant nData); -}; - -#endif diff --git a/src/tpMain/IWheelUis.h b/src/tpMain/IWheelUis.h deleted file mode 100644 index 16d2617..0000000 --- a/src/tpMain/IWheelUis.h +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once -#include "qobject.h" -#include "qstring.h" -#include "qobjectdefs.h" -#include "QVariant" -class IWheelUis :public QObject -{ - Q_OBJECT -public: - IWheelUis(){}; - virtual ~IWheelUis(){}; - - virtual bool IExec(const QString&) = 0; -signals: - void sgGenalData(QVariant nType, QVariant nData); -}; - diff --git a/src/tpMain/MainUi.cpp b/src/tpMain/MainUi.cpp deleted file mode 100644 index b5ba9d8..0000000 --- a/src/tpMain/MainUi.cpp +++ /dev/null @@ -1,373 +0,0 @@ -#include "MainUi.h" -#include "qwidget.h" -#include "qlabel.h" -#include "qpushbutton.h" -#include "qmessagebox.h" -#include "DetectState.h" -#include "IWheelCtrl.h" -#include "HubBase.h" -#include "Result2Ui.h" -#include "IWheelModel.h" -#include "qtableview.h" -#include "ModelTableView.h" -#include "InfoFile.h" -#include "qmainwindow.h" -#include "qlightboxwidget.h" -#include "QAction" -#include "QGridLayout" -#include "QPushButton" -#include "QLabel" -#include "qmovie.h" -#include "main_gloabl.h" -#include "QTextEdit" -#include "QFile" -#include - -#pragma execution_character_set("utf-8") -#define APP_VERSION "2.3.8.0" -#define APP_LASTUPDATE "2020-04-23 17:35:00 " - -#define ALGOTYPE "摩托车轮毂识别算法" -const QString strDefaultTxt = QObject::tr("本软件是基于机器学习的基础开发而来，用户可通过本软件采集汽轮的图像进行轮毂型号训练，训练后的模型用于型号识别。"); -const QString strHubAlgoType = QObject::tr("汽车轮毂识别算法 更新时间:20190523 16:04:00"); -const QString strWhelAlgoType = QObject::tr("摩托车轮毂识别算法 更新时间:20190523 17:04:00"); - - -MainUi::MainUi(const QString strUiName, IWheelCtrl* pCtrl) - : m_pCtrl(pCtrl), m_lightBox(NULL), m_pTableCheck(NULL) -{ - m_pState = pCtrl->getDetectState(); - readTxtFile(); -} - - -MainUi::~MainUi() -{ - if (m_lightBox){ - delete m_lightBox; - m_lightBox = NULL; - } - if (m_pTableCheck){ - delete m_pTableCheck; - m_pTableCheck = NULL; - } -} - -bool MainUi::onPolished(QWidget* p) -{ - QString str = p->objectName(); - - if (str == "main_lb_res_model_pic") { - m_pLbResPic = qobject_cast(p); - } - else if (str == "main_lb_res_model_id") { - m_pLbResModelId = qobject_cast(p); - } - else if (str == "main_lb_res_okng") { - m_pLbResOkNg = qobject_cast(p); - } - else if (str == "main_lb_res_model_score") { - m_pLbResScore = qobject_cast(p); - } - else if (str == "main_lb_res_model_diameter") { - m_pLbResDiameter = qobject_cast(p); - } - else if (str == "main_lb_res_model_thickness") { - m_pLbResThickness = qobject_cast(p); - } - else if (str == "main_lb_res_model_time") { - m_pLbResTime = qobject_cast(p); - } - else if (str == "main_lb_res_ok_num") { - m_pLbResOkNum = qobject_cast(p); - } - else if (str == "main_lb_res_ng_num") { - m_pLbResNgNum = qobject_cast(p); - } - else if (str == "main_btn_clear_data") { - m_pBtnClear = qobject_cast(p); - connect(m_pBtnClear, SIGNAL(clicked()), this, SLOT(onClearData())); - if (m_pState->m_Debug!=100) - m_pBtnClear->setDisabled(true); - } - else if (str == "main_btn_start_detect") { - m_pBtnDetect = qobject_cast(p); - if (m_pState->m_Debug != 100) - m_pBtnDetect->setDisabled(true); - connect(m_pBtnDetect, SIGNAL(clicked()), this, SLOT(onStartDetect())); - //if (m_pState->m_sysType == 1) - // m_pBtnDetect->setVisible(false); - } - else if (str == "wf_main_tableview_checkstate") { - m_pTableCheck = new ModelsView(qobject_cast(p), m_pCtrl->getAllModelMapPtr()); - m_pTableCheck->setEnable(false); - connect(m_pCtrl, SIGNAL(sgModelChanged()), m_pTableCheck, SLOT(updateModels())); - m_pTableCheck->setModelList(strDefectList); - } - else if (str == "MainWindow"){ - QMainWindow *m_pDlgMain = qobject_cast(p); - m_pDlgMain->setWindowIcon(QIcon(":/image/leaper")); - m_pDlgMain->setContextMenuPolicy(Qt::NoContextMenu); - if (m_pDlgMain) - { - //if (!m_lightBox) - { - m_mainWidget.setWindowIcon(QIcon(":/image/leaper")); - m_mainWidget.setWindowTitle(tr("关于")); - //m_mainWidget.setSizeIncrement(m_pDlgMain->size()); - //m_lightBox = new QLightBoxWidget(&m_mainWidget); - InitLightBox(); - } - } - - } - else if (str == "MainWindow"){ - QMainWindow *m_pMainWindow = qobject_cast(p); - if (m_pMainWindow){ - m_pMainWindow->setWindowTitle(tr("轮毂型号识别系统")); - } - } - else { - return false; - } - return true; -} - -void MainUi::showRes(Result2Ui* pResult) -{ - if (!pResult) { - return; - } - int scareh = m_pLbResPic->height(); - int scarew = m_pLbResPic->width(); - int scare = 0; - if (scareh > scarew) - scare = scarew; - else - scare = scareh; - if (pResult->m_strModel.isEmpty()) { - m_pState->totalUnDetectNum++; - QPixmap pix(":/image/none.jpg"); - - m_pLbResPic->setPixmap(pix.scaled(scare - 15, scare - 15)); - m_pLbResPic->setStyleSheet(QString("QLabel{border: 5px solid rgb(250,0,0,250);background-color: rgb(200, 200, 200);}")); - pResult->m_strModel = "NG"; -// QFont ft; -// ft.setPointSize(20); -// m_pLbResOkNg->setFont(ft); - m_pLbResOkNg->setText("NG"); - //QSize sizes = m_pLbResOkNg->size(); - //m_pLbResOkNg->setFixedSize(QSize(sizes.rwidth(), 60)); - m_pLbResOkNg->setStyleSheet("background-color: rgb(255, 0, 0);"); - IWheelModel *pModel = m_pCtrl->getModel("NG"); - if (pModel){ - pModel->increCount(); - emit m_pTableCheck->sgValueChange(pModel->getModelID()); - } - } - else { - IWheelModel *pModel = m_pCtrl->getModel(pResult->m_strModel); - if (pModel) { - QString filepath = m_pCtrl->appRoot() + pModel->getPicPath(); - QPixmap pix(filepath); - m_pLbResPic->setPixmap(pix.scaled(scare - 15, scare - 15)); - pModel->increCount(); - //QFont ft; - //ft.setPointSize(20); - m_pLbResOkNg->setText("OK"); - //m_pLbResOkNg->setFont(ft); - //m_pLbResOkNg->setFixedSize(QSize(100, 30)); - m_pLbResOkNg->setStyleSheet("background-color: rgb(0, 255, 0);"); - m_pLbResPic->setStyleSheet(QString("QLabel{border: 5px solid rgb(0,250,0,250);background-color: rgb(200, 200, 200);}")); - emit m_pTableCheck->sgValueChange(pModel->getModelID()); - } - } - m_pState->totalDetectNum++; - - //show - m_pLbResNgNum->setText(QString::number(m_pState->totalUnDetectNum)); - m_pLbResOkNum->setText(QString::number(m_pState->totalDetectNum)); - m_pLbResTime->setText(QString::number(pResult->m_dRunTime, 'f', 2)); - m_pLbResThickness->setText(QString::number((int)pResult->m_dThickness)); - m_pLbResDiameter->setText(QString::number((int)pResult->m_dDiameter)); - m_pLbResModelId->setText(pResult->m_strModel); - - m_pLbResScore->setText(QString::number(pResult->m_dScore*100, 'f', 1) + "%"); - return ; -} - -void MainUi::onClearData() -{ - QMessageBox infobox(QMessageBox::Warning, tr("提示"), tr("将清空所有数据"), QMessageBox::Yes | QMessageBox::Cancel, NULL); - infobox.setButtonText(QMessageBox::Yes, tr("确定")); - infobox.setButtonText(QMessageBox::Cancel, tr("取消")); - infobox.setWindowIcon(QIcon(":/image/leaper")); - if (QMessageBox::Cancel != infobox.exec()) { - m_pCtrl->onClear(); - m_pLbResOkNum->setText(QString::number(0)); - m_pLbResNgNum->setText(QString::number(0)); - QString str = m_pCtrl->getUserName() + ":" + tr("按下了清零按钮，数据全部清零"); - m_pCtrl->addLog(str, emTypeUseState); - } -} - -Q_SLOT void MainUi::onStartDetect() -{ - //开始检测按钮 - if (m_pState->IsDetect == false) { - m_pBtnDetect->setText(tr("停止检测")); - m_pCtrl->onStart(); - QString str = tr("按下了开始检测按钮，检测功能开启"); - m_pCtrl->addLog(str, emTypeRunState); - - //QTimer::singleShot(3000, [&](){m_pState->bLockDetect = true; }); - QTimer::singleShot(3000, this, SLOT(onChangeDetect())); - } - else { - m_pCtrl->onFinish(); - m_pBtnDetect->setText(tr("开始检测")); - QString str = tr("按下了停止检测按钮，检测功能关闭"); - m_pCtrl->addLog(str, emTypeRunState); - m_pState->bLockDetect = false; - } - m_pState->IsDetect = !m_pState->IsDetect; -} - -Q_SLOT void MainUi::onChangeDetect() -{ - if (m_pState){ - m_pState->bLockDetect = true; - } -} -bool MainUi::onExec() -{ - onUserRole(); - return true; -} - -bool MainUi::onClose() -{ - return true; -} - -bool MainUi::onUserRole() -{ - int nLevel = m_pCtrl->getUserLevel(); - if (9 == nLevel) { - m_pBtnDetect->setDisabled(false); - m_pBtnClear->setDisabled(false); - } - else if (5 == nLevel) { - m_pBtnDetect->setDisabled(false); - m_pBtnClear->setDisabled(false); - } - else if (4 == nLevel) { - m_pBtnDetect->setDisabled(false); - m_pBtnClear->setDisabled(false); - } - else if (1 == nLevel){ - m_pBtnDetect->setDisabled(true); - m_pBtnClear->setDisabled(true); - } - else { - return false; - } - return true; -} - -bool MainUi::ActionTrigger(class QAction* pAction, bool bChecked) -{ - if (pAction->objectName() == "main_toolbar_action_about") - { - m_mainWidget.setWindowModality(Qt::ApplicationModal); - m_mainWidget.show(); - return true; - } - return false; -} - -void MainUi::InitLightBox() -{ - QString aboutString; - aboutString = QString( - "

%1

" - "

%2.

" - "

%3:www.hzleaper.com

" - "

%4:%5

" - "

%6:%7

" - "

%8：%9

" - "

" - ).arg(tr("轮毂型号识别系统")) - .arg(tr("本软件由杭州利珀科技开发，用于轮毂型号识别和分类，可搭配流水线运输系统使用")) - .arg(tr("若需要进一步了解该产品的相关信息，请访问我们的网站")) - .arg(tr("软件版本")).arg(APP_VERSION) - //.arg(tr("算法版本")).arg(strWhelAlgoType) - .arg(tr("算法版本")).arg(strHubAlgoType) - .arg(tr("最后更新时间")).arg(APP_LASTUPDATE) - .arg(tr("版权 (c) 属 杭州利珀科技有限公司 所有")); - m_mainWidget.setFixedSize(500, 300); - QTextEdit* pEdit = new QTextEdit(&m_mainWidget); - pEdit->setReadOnly(true); - pEdit->append(aboutString); - pEdit->setAttribute(Qt::WA_TranslucentBackground, true); - QPalette pl = pEdit->palette(); - pl.setBrush(QPalette::Base, QBrush(QColor(255, 0, 0, 0))); - pEdit->setPalette(pl); - QPushButton* lbClose = new QPushButton(tr("关闭")); - QGridLayout* lbLayout = new QGridLayout(&m_mainWidget); - lbLayout->addWidget(pEdit, 2, 1,1,3); - lbLayout->addWidget(lbClose, 3, 2); - lbClose->setMaximumSize(QSize(100, 50)); - connect(lbClose, SIGNAL(clicked()), &m_mainWidget, SLOT(hide())); -} - -void MainUi::readTxtFile() -{ - /*QFile file(m_pCtrl->appRoot() + "\\user\\about.txt"); - bool m_openFileFlags = false; - if (!file.fileName().isEmpty()) - { - if (!file.open(QFile::ReadOnly | QIODevice::Text)) - { - m_openFileFlags = false; - } - else - { - m_openFileFlags = true; - } - - if (file.size() > 1000) - { - ; - } - QByteArray line; - QByteArray m_string; - while (!file.atEnd()) - { - - line = file.readLine(); - m_string.append(line); - } - m_strContent = QString::fromLocal8Bit(m_string); - file.close(); - } - if (!m_openFileFlags) - { - file.open(QFile::ReadWrite | QIODevice::Text); - file.write(QString(DEFAULTTXT).toLocal8Bit()); - file.close(); - }*/ -} - -void MainUi::setViewList(QStringList strList) -{ - if (!strList.contains("NG")) - strList.append("NG"); - strDefectList = strList; - if (m_pTableCheck){ - m_pTableCheck->setModelList(strList); - // m_pTableCheck->update2AllModels(); - } -} - - diff --git a/src/tpMain/MainUi.h b/src/tpMain/MainUi.h deleted file mode 100644 index a1a6ce5..0000000 --- a/src/tpMain/MainUi.h +++ /dev/null @@ -1,50 +0,0 @@ -#pragma once -#include "qobject.h" -#include "qstring.h" -#include "IWheelUi.h" - -class IWheelCtrl; -class MainUi : - public IWheelUi -{ - Q_OBJECT -public: - MainUi(const QString strUiName, IWheelCtrl*); - ~MainUi(); - virtual bool onPolished(QWidget*); - virtual bool onExec(); - virtual bool onClose(); - virtual bool onUserRole(); - virtual bool ActionTrigger(class QAction* pAction, bool bChecked); - virtual void setViewList(QStringList strList); - void showRes(class Result2Ui*); - Q_SLOT void onClearData(); - Q_SLOT void onStartDetect(); - Q_SLOT void onChangeDetect(); - void InitLightBox(); - void readTxtFile(); -signals: - void sgModelCountChanged(QString); -private: - class QLabel* m_pLbResDiameter; - class QLabel* m_pLbResThickness; - class QLabel* m_pLbResModelId; - class QLabel* m_pLbResOkNum; - class QLabel* m_pLbResNgNum; - class QLabel* m_pLbResScore; - class QLabel* m_pLbResOkNg; - class QLabel* m_pLbResPic; - class QLabel* m_pLbResTime; - class QPushButton *m_pBtnDetect; - class QPushButton *m_pBtnClear; - class ModelsView *m_pTableCheck; - class QLightBoxWidget* m_lightBox; - - QWidget m_mainWidget; -private: - IWheelCtrl *m_pCtrl; - class DetectState *m_pState; - QString m_strContent; - QStringList strDefectList; -}; - diff --git a/src/tpMain/ModelManager.h b/src/tpMain/ModelManager.h index 574fcb4..d7558e5 100644 --- a/src/tpMain/ModelManager.h +++ b/src/tpMain/ModelManager.h @@ -1,4 +1,7 @@ -#pragma once + +#ifndef _H_MODELMANAGER_H_ +#define _H_MODELMANAGER_H_ + #include "qstring.h" #include "qmap.h" #include @@ -25,8 +28,8 @@ struct modelInfo class ModelManager { public: - ModelManager(QString strRoot); - ~ModelManager(); + explicit ModelManager(QString strRoot); + virtual ~ModelManager(); bool init(); IWheelModel *getModel(QString str); @@ -62,5 +65,7 @@ private: }; +#endif + diff --git a/src/tpMain/ModelMgrUi.cpp b/src/tpMain/ModelMgrUi.cpp deleted file mode 100644 index 1699098..0000000 --- a/src/tpMain/ModelMgrUi.cpp +++ /dev/null @@ -1,1184 +0,0 @@ -/*#include "ModelMgrUi.h" -#include "qlistwidget.h" -#include "ModelTableView.h" -#include "ModelManager.h" -#include "IWheelCtrl.h" -#include "qfiledialog.h" -#include "qdialog.h" -#include "qlineedit.h" -#include "IWheelModel.h" -#include "qlabel.h" -#include "TempImage.h" -#include "qfileinfo.h" -#include "qmessagebox.h" -#include "ProgressView.h" -#include "qstring.h" -#include "ImageCompareModel.h" -#include "CVUtils.h" -#include "qtcvutils.h" -#include "qpushbutton.h" -#include "ModelTrain.h" -#include "qaddmodel.h" -#include "InfoFile.h" -#include "HubBase.h" -#include "DetectState.h" -#include "QSlider" -#include "QTabWidget" -#include "ChannelInfo.h" -#include "HannelUI.h" -#include "qmythread.h" -#include "QDateTime" -#include "QSpinBox" -#include "qpulpewidget.h" -#include -#include -#include "qmodnamedlg.h" -#include -#include - -#define WS_PICSIZE 129 //!>缩放大小 -#define WS_PICSIZELIST_ITEM 100 -#define MODEL_UI_ICON_NONE ":/image/none.jpg" -#define MODEL_UI_ICON_LEAPER ":/image/leaper" -#define WHEEL_CHANNEL_FILE "\\pattern\\channels.json.dat" -#define MINIMG_NUM 10 -#pragma execution_character_set("utf-8") - -enum EM_TYPE_PROCESSMODEL -{ - emPross_Init = 0, - emPross_SetValue, - emPross_SetLable, - emPross_Finish, - emPross_enable, - emPross_Disable -}; - -ModelMgrUi::ModelMgrUi(const QString strUiName, IWheelCtrl*p) - : m_pCtrl(p), m_strUiName(strUiName), m_pModelLists(NULL) -{ - m_pBtnTrain = NULL; - m_pDlgMain = NULL; - m_pModelMgr = m_pCtrl->getModelMgr(); - m_pState = m_pCtrl->getDetectState(); - m_pLbListWidgetNum = NULL; - m_modLib = false; - - m_pProgressView = new ProgressView(); - Qt::WindowFlags flags = Qt::Dialog; - m_pProgressView->setUseCancel(true); - connect(m_pProgressView, SIGNAL(cancel()), this, SLOT(onProgassCancel())); - m_trainAllTsk = new QMyThread(); - m_trainAllTsk->setUser(true); - m_trainAllTsk->loadfunc(this, &ModelMgrUi::TrainAllTskFunc); - - m_trainOneTsk = new QMyThread(); - m_trainOneTsk->setUser(true); - m_trainOneTsk->loadfunc(this, &ModelMgrUi::TrainOneTskFunc); - connect(this, SIGNAL(sgPrograssShow(QString, QString, int, int)), this, SLOT(onPrograssShow(QString, QString, int, int))); - connect(this, SIGNAL(sgShowMsg(QString)), this, SLOT(onShowMessage(QString))); - - QString strApp = QApplication::applicationDirPath(); - QSettings setting(strApp + "\\user\\systemfile.ini", QSettings::IniFormat); - nGlobalMinImgs = setting.value("/MinImgs/MinNum", 10).toInt(); -} - -ModelMgrUi::~ModelMgrUi() -{ - if (m_trainAllTsk) { - if (m_trainAllTsk->isRunning()) - { - m_trainAllTsk->stop(); - m_trainAllTsk->quit(); - m_trainAllTsk->wait(); - } - delete m_trainAllTsk; - m_trainAllTsk = NULL; - } - if (m_trainOneTsk) { - if (m_trainOneTsk->isRunning()) - { - m_trainOneTsk->stop(); - } - delete m_trainOneTsk; - m_trainOneTsk = NULL; - } - if (m_pProgressView) { - delete m_pProgressView; - m_pProgressView = NULL; - } - if (m_pDlgMain) { - m_pDlgMain->close(); - } - if (m_pModelLists){ - delete m_pModelLists; - m_pModelLists = NULL; - } -} - -bool ModelMgrUi::onPolished(QWidget *p) -{ - QString str = p->objectName(); - if (str == "ModelMgr_showPic_listWidget_tab1") { - m_pListWgtImages = qobject_cast(p); - connect(m_pListWgtImages, SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, SLOT(onItemDoubleClicked(QListWidgetItem*))); - } - else if (str == "ModelMgr_Models_tableView") { - m_pModelLists = new ModelsView(qobject_cast(p), m_pModelMgr->getAllModelMapPtr()); - m_pModelLists->setHideItems(QStringList() << "NG"); - connect(m_pModelLists, SIGNAL(sgSelectModel(QString)), this, SLOT(onShowModelInfo(QString))); - connect(m_pModelLists, SIGNAL(sgSelectModel(QString)), this, SLOT(onShowModelPic(QString))); - connect(this, SIGNAL(sgTrainShowInfo(QString)), this, SLOT(onShowModelInfo(QString))); - } - else if (str == "ModelMgr_AddNewModel_button") { - m_pAddMolBp = qobject_cast(p); - connect(m_pAddMolBp, SIGNAL(clicked()), this, SLOT(onAddModel())); - } - else if (str == "ModelMgr_DelModel_button") { - m_pDelMolBp = qobject_cast(p); - connect(m_pDelMolBp, SIGNAL(clicked()), this, SLOT(onDelModel())); - } - else if (str == "ModelMgr_ModModel_button") { - m_pModMolBp = qobject_cast(p); - connect(m_pModMolBp, SIGNAL(clicked()), this, SLOT(onModifyModel())); - } - else if (str == "ModelMgr_AddPic_button") { - m_pAddPicBp = qobject_cast(p); - connect(m_pAddPicBp, SIGNAL(clicked()), this, SLOT(onAddPic2Model())); - } - else if (str == "ModelMgr_Onekey_button") { - m_pOnekeyBp = qobject_cast(p); - connect(m_pOnekeyBp, SIGNAL(clicked()), this, SLOT(onTrainAllModels())); - } - else if (str == "ModelMgr_ResTrain_button") { - m_pTrainBp = qobject_cast(p); - connect(m_pTrainBp, SIGNAL(clicked()), this, SLOT(onTrainModel())); - } - else if (str == "ModelMgr_DelModelOneKey_button") { - connect(p, SIGNAL(clicked()), this, SLOT(onDelAllModels())); - m_ModelMgr_DelModelOneKey_button = qobject_cast(p); - } - else if (str == "ModelMgr_model_edit") { - m_pEditModelId = qobject_cast(p); - } - else if (str == "ModelMgr_model_edit_diameter") { - m_pEditModelDiameter = qobject_cast(p); - QRegExp regExpNum("((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])"); - m_pEditModelDiameter->setValidator(new QRegExpValidator(regExpNum, this)); - - } - else if (str == "ModelMgr_model_edit_height") { - m_pEditModelThickness = qobject_cast(p); - QRegExp regExpNum("((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])"); - m_pEditModelThickness->setValidator(new QRegExpValidator(regExpNum, this)); - } - else if (str == "ModelMgr_modelpic_lable") { - m_pLbModelPic = qobject_cast(p); - } - else if (str == "ModelMgr_label_Pic_Number"){ - m_pLbListWidgetNum = qobject_cast(p); - } - else if (str == "ModelMgr_label_Model_number") - { - m_pLbListviewNum = qobject_cast(p); - } - else if (str == "ModelMgr_WarningMsg"){ - m_WarningMsg = qobject_cast(p); - } - else if (str == "ModelMgr_find_lineEdit") { - m_pEditFilter = qobject_cast(p); - connect(m_pEditFilter, SIGNAL(textChanged(const QString&)), this, SLOT(onTextChanged(const QString&))); - } - else if (str == "ModelMgr_label_DisMin"){ - m_pLbDisMin = qobject_cast(p); - } - else if (str == "ModelMgr_label"){ - p->setVisible(false); - } - else if (str == "ModelMgr_channels_combobox"){//channel - p->setVisible(false); - } - else if (str == "ModelMgr_model_Repet_spinBox"){ - m_RepetBox = qobject_cast(p); - } - else if (str == "ModelMgr_tabWidget"){//tab - QTabWidget * tabwidget = qobject_cast(p); - if (m_pState->m_IsUseChannel!=1) - tabwidget->removeTab(1); - connect(tabwidget, SIGNAL(currentChanged(int)), this, SLOT(onTableWidget(int))); - } - else if (str == "ModelMgr_label_DisMax"){ - m_pLbDisMax = qobject_cast(p); - } - else if (str == "ModelMgr_horizontalSlider"){ - m_pLbdisThre = qobject_cast(p); - connect(m_pLbdisThre, SIGNAL(valueChanged(int)),this, SLOT(setValue(int))); - } - else if (str == "QWfModelManage") { - m_pDlgMain = qobject_cast(p); - m_pDlgMain->setWindowIcon(QIcon(":/image/leaper")); - //Qt::WindowFlags flags = Qt::Dialog; - m_pDlgMain->setWindowFlags(Qt::WindowMaximizeButtonHint|Qt::WindowMinimizeButtonHint|Qt::WindowCloseButtonHint); - //m_pDlgMain->move((QApplication::desktop()->width() - m_pDlgMain->width()) / 2, (QApplication::desktop()->height() - m_pDlgMain->height()) / 2); - } - else if (str == "ModelMgr_Num"){ - m_pLbNum = qobject_cast(p); - } - else if (str == "ModelMgr_ModNamel_button"){ - m_ModelMgr_ModNamel_button = qobject_cast(p); - connect(m_ModelMgr_ModNamel_button, SIGNAL(clicked()), this, SLOT(onChangeModelName())); - //m_ModelMgr_ModNamel_button->setVisible(false); - } - else { - return false; - } - return true; -} - -Q_SLOT void ModelMgrUi::setValue(int value) -{ - m_pLbNum->setText(QString::number(value) + "%"); -} - -void ModelMgrUi::TestAddModel() -{ - int m_nIndex = m_pModelMgr->getAllModelName().size(); - for (int nIndex = m_nIndex; nIndex < 1000; nIndex++){ - QMap m_map; - m_map.insert(WF_HUBMODEL_ID, nIndex); - m_map.insert(WF_HUBMODEL_HEIGHT, nIndex); - m_map.insert(WF_HUBMODEL_DIAMETER, nIndex); - m_map.insert(WF_HUBMODEL_CHANNELS, 0); - - IWheelModel *pModel = m_pModelMgr->createModel(); - pModel->setModelID(m_map.value(WF_HUBMODEL_ID).toString()); - pModel->setChannel(m_map.value(WF_HUBMODEL_CHANNELS).toInt()); - pModel->setDiameter(m_map.value(WF_HUBMODEL_DIAMETER).toDouble()); - pModel->setThickness(m_map.value(WF_HUBMODEL_HEIGHT).toDouble()); - pModel->setRepeatNum(m_map.value("rotate").toInt()); - QString strPath2 = m_pCtrl->appRoot() + "\\pattern\\template\\"; - hubBase::mkdir(strPath2); - hubBase::mkdir(strPath2 + pModel->getModelID()); - - m_pModelMgr->addModel(pModel); - m_pModelLists->update2AllModels("NG"); - emit m_pCtrl->sgModelChanged(); - } -} - -Q_SLOT void ModelMgrUi::onAddModel() -{ - //TestAddModel(); - - QString str = m_pCtrl->getUserName() + ":" + tr("按下了添加模板按钮"); - m_pCtrl->addLog(str, emTypeUseState); - - QAddModel m_AddModel; - m_AddModel.SetClearData(); - m_AddModel.setWindowIcon(QIcon(MODEL_UI_ICON_LEAPER)); - m_AddModel.setWindowTitle(tr("产品信息设置")); - m_AddModel.setFocus(); - if (m_AddModel.exec() == QDialog::Accepted) { - QMap m_map = m_AddModel.getData(); - IWheelModel *pModel = m_pModelMgr->createModel(); - pModel->setDetectState(true); - pModel->setModelID(m_map.value(WF_HUBMODEL_ID).toString()); - pModel->setChannel(m_map.value(WF_HUBMODEL_CHANNELS).toInt()); - pModel->setDiameter(m_map.value(WF_HUBMODEL_DIAMETER).toDouble()); - pModel->setThickness(m_map.value(WF_HUBMODEL_HEIGHT).toDouble()); - pModel->setRepeatNum(m_map.value("rotate").toInt()); - QString strPath2 = m_pCtrl->appRoot() + "\\pattern\\template\\"; - hubBase::mkdir(strPath2); - hubBase::mkdir(strPath2 + pModel->getModelID()); - - m_pModelMgr->addModel(pModel); - m_pModelMgr->saveModel(pModel->getModelID()); - m_pModelLists->update2AllModels("NG"); - emit m_pCtrl->sgModelChanged(); - QString str = m_pCtrl->getUserName() + ":" + QString("%1:%2").arg(tr("添加了一个新的模型")).arg(pModel->getModelID()); - m_pCtrl->addLog(str, emTypeUseState); - onShowModelInfo(pModel->getModelID()); - onShowModelPic(pModel->getModelID()); - - QStringList strFilter = m_pCtrl->getAllModelMapPtr()->keys(); - strFilter.removeAll("NG"); - m_pModelLists->setModelList(strFilter); - QString m_str = QString("%1 %2 %3").arg(tr("共")).arg(strFilter.size()).arg(tr("个型号")); - m_pLbListviewNum->setText(m_str); - } - return; -} - -Q_SLOT void ModelMgrUi::onAddPic2Model() -{ - QString strModel = m_pListWgtImages->property("model").toString(); - if (strModel.isEmpty()) { - onMessageBox(QMessageBox::Information, tr("提示"), tr("请选择一个您要追加图像的型号！"), 0); - return; - } - if (!m_pModelMgr->getAllModelName().contains(strModel)) - { - onMessageBox(QMessageBox::Information, tr("提示"), tr("请选择一个您要追加图像的型号！"), 0); - return; - } - QStringList lstFiles = FileOper::selectFiles(QString("%1 Add Picture").arg(strModel), "Picture(*.bmp *.jpg *.png)", m_strAddPicPath);// m_pCtrl->appRoot() + "//Data//"); - if (lstFiles.empty()) { - return; - } - m_strAddPicPath = lstFiles.at(0); - int size = lstFiles.size(); - int nSuc = 0; - int oldImgsCnt = m_pModelMgr->getModel(strModel)->getTempImage()->getImgCount(); - ProgressView progress(tr("加载图像"), - tr("图像加载中,请稍后....."), size, MODEL_UI_ICON_LEAPER); - for (int nIndex = 0; nIndex < size; ++nIndex) { - QString filepath = lstFiles.value(nIndex); - if (appImage2Widget(filepath, strModel)) { - nSuc++; - progress.setValue(nSuc); - qApp->processEvents(); - } - else{ - emit(sgShowMsg(tr("添加失败，不能添加带检测背景的图片作为模板！！！"))); - break; - } - } - int newImgCnt = m_pModelMgr->getModel(strModel)->getTempImage()->getImgCount(); - if (oldImgsCnt <= 0 && newImgCnt>oldImgsCnt){ - if (m_RepetBox){ - - cv::Mat srcRepet = imread(string((const char *)m_strAddPicPath.toLocal8Bit()), 0); - int IRepet = m_pModelMgr->getModel(strModel)->getImageComModel()->computeRepeatNum(srcRepet); - m_pModelMgr->getModel(strModel)->getImageComModel()->setRepeatNum(IRepet); - m_RepetBox->setValue(IRepet); - } - } - progress.setLabel(tr("加载完成")); - qApp->processEvents(); - progress.finish(); -} - -Q_SLOT void ModelMgrUi::onModifyModel() -{ - QString strModel = m_pListWgtImages->property("model").toString(); - if (strModel.isEmpty()) { - onMessageBox(QMessageBox::Information, tr("提示"), tr("请选择一个您要修改的型号！"), 0); - return; - } - if (!m_pModelMgr->getAllModelName().contains(strModel)) - { - onMessageBox(QMessageBox::Information, tr("提示"), tr("请选择一个您要修改的型号！"), 0); - return; - } - IWheelModel*pModel = m_pModelMgr->getModel(strModel); - if (!pModel) { - return; - } - pModel->setThickness(m_pEditModelThickness->text().toDouble()); - pModel->setDiameter(m_pEditModelDiameter->text().toDouble()); - double thisvalue = pModel->getImageComModel()->getDisThre(); - double falsMinDis = pModel->getImageComModel()->getFalseSampleMinDis(); - double disMax = pModel->getImageComModel()->getDisMax(); - int pthrevalue = m_pLbdisThre->value(); - double value = (falsMinDis - disMax) / 100.0*pthrevalue; - pModel->getImageComModel()->setDisThre(value + disMax); - if (m_RepetBox) - pModel->setRepeatNum(m_RepetBox->value()); - QString templatepath = m_pCtrl->appRoot() + "\\pattern\\template\\"; - templatepath += strModel; - templatepath += "\\model.yml"; - std::string strS = templatepath.toLocal8Bit().toStdString(); - pModel->getImageComModel()->save2file(strS); - m_pModelMgr->modModel(strModel); - m_pModelMgr->saveModel(strModel); - QString str = m_pCtrl->getUserName() + ":" + QString("%1:%2 %3").arg(tr("修改了模板")).arg(strModel).arg(tr("的参数")); - m_pCtrl->addLog(str, emTypeUseState); - m_modLib = true; - emit sgShowMsg(tr("修改成功！")); -} - -Q_SLOT void ModelMgrUi::onDelModel() -{ - QString strModel = m_pListWgtImages->property("model").toString(); - if (strModel.isEmpty()) { - onMessageBox(QMessageBox::Information, tr("提示"), tr("请选择一个您要删除的型号"), 0); - return; - } - if (!m_pModelMgr->getAllModelName().contains(strModel)) - { - onMessageBox(QMessageBox::Information, tr("提示"), tr("请选择一个您要删除的型号"), 0); - return; - } - QString str = m_pCtrl->getUserName() + ":" + tr("按下了删除模板按钮"); - m_pCtrl->addLog(str, emTypeUseState); - if (onMessageBox(QMessageBox::Information, tr("提示"), QString("%1 %2 %3").arg(tr("是否删除型号")).arg(strModel).arg(tr("产品模板")), 1) == false) - return; - m_pModelLists->removeModel(strModel); - m_pModelMgr->delModel(strModel); - m_pModelLists->update2AllModels("NG"); - emit(m_pCtrl->sgModelChanged()); - emit(sgGenalData(QVariant("removeModel"), QVariant(strModel))); - str = m_pCtrl->getUserName()+":"+QString("%1:%2").arg(tr("删除了模板")).arg(strModel); - m_pCtrl->addLog(str, emTypeUseState); - QStringList strFilter = m_pCtrl->getAllModelMapPtr()->keys(); - strFilter.removeAll("NG"); - m_pModelLists->setModelList(strFilter); - QString m_str = QString("%1 %2 %3").arg(tr("共")).arg(strFilter.size()).arg(tr("个型号")); - m_pLbListviewNum->setText(m_str); - onClearShow(); -} - -Q_SLOT void ModelMgrUi::onItemDoubleClicked(QListWidgetItem * item) -{ - QObject *obj = sender(); - QString objName = obj->objectName(); - if ("ModelMgr_showPic_listWidget_tab1" == objName) - { - if (m_pCtrl->getDetectState()->m_Debug != 100) - if (m_pCtrl->getUserLevel() <= 0) - return; - QString strModel = m_pListWgtImages->property("model").toString(); - QString itemText = item->text(); - QString strWarning = tr("确定删除该图像?"); - if (onMessageBox(QMessageBox::Warning, tr("模板图片删除"), strWarning, 1) == false) - return; - TempImage *pImg = m_pModelMgr->getTmpImage(strModel); - if (pImg) { - pImg->remove(itemText); - } - delete item; - QString m_str = QString("%1 %2 %3").arg(tr("共")).arg(m_pListWgtImages->count()).arg(tr("个图像")); - if (m_pLbListWidgetNum) - m_pLbListWidgetNum->setText(m_str); - } - else if ("ModelMgr_listWidget_tab2" == objName) - { - int a = 0; - } -} - -void ModelMgrUi::onClearShow() -{ - m_pEditModelId->setText(""); - m_pEditModelDiameter->setText(""); - m_pEditModelThickness->setText(""); - QPixmap pix(MODEL_UI_ICON_NONE); - m_pLbModelPic->setPixmap(pix.scaled(WS_PICSIZE, WS_PICSIZE)); - m_pLbdisThre->setValue(0); - m_pListWgtImages->setProperty("model", ""); - m_pListWgtImages->clear(); -} - -void ModelMgrUi::onShowModelPic(QString str) -{ - QString nPixpath = m_pModelMgr->getModel(str)->getPicPath(); - if (!nPixpath.isEmpty()) { - QString pixpath = m_pCtrl->appRoot() + nPixpath; - QPixmap pix(pixpath); - QSize m_size = pix.size(); - qreal width = pix.width(); - qreal height = pix.height(); - if (pix.isNull()) { - QString filepath; - if (m_pModelMgr->getModel(str)->getTempImage()->getImgCount() > 0) - { - QString n_Pic_path = "\\pattern\\Models\\" + str + ".jpg"; - QString strSavePath = m_pCtrl->appRoot(); - filepath = strSavePath + n_Pic_path; - imwrite(string((const char *)filepath.toLocal8Bit()), m_pModelMgr->getModel(str)->getTempImage()->getImgVector().at(0)); - } - - QPixmap pixnuw(filepath); - if (pixnuw.isNull()) - { - QPixmap pixnune(MODEL_UI_ICON_NONE); - m_pLbModelPic->setPixmap(pixnune.scaled(129, 129)); - } - else{ - m_pLbModelPic->setPixmap(pixnuw.scaled(129, 129)); - } - - } - else - m_pLbModelPic->setPixmap(pix.scaled(WS_PICSIZE, WS_PICSIZE)); - } - else { - QPixmap pix(MODEL_UI_ICON_NONE); - m_pLbModelPic->setPixmap(pix.scaled(WS_PICSIZE, WS_PICSIZE)); - } -} - -void ModelMgrUi::onShowModelInfo(QString str) -{ - m_pLbdisThre->setDisabled(false); - m_pEditModelId->setText(m_pModelMgr->getModel(str)->getModelID()); - m_pEditModelDiameter->setText(QString::number(m_pModelMgr->getModel(str)->getDiameter())); - m_pEditModelThickness->setText(QString::number(m_pModelMgr->getModel(str)->getThickness())); - double disThred = m_pModelMgr->getModel(str)->getImageComModel()->getDisThre(); - double FalseMinDis = m_pModelMgr->getModel(str)->getImageComModel()->getFalseSampleMinDis(); - double disMax = m_pModelMgr->getModel(str)->getImageComModel()->getDisMax(); - - if (m_RepetBox){ - m_RepetBox->setValue(m_pModelMgr->getModel(str)->getRepeatNum()); - } - if (disThred >= 1.7976931348623157e+308) - { - disThred = FalseMinDis; - } - int vvv = 0; - if (disMax <= FalseMinDis) - { - double vv = (FalseMinDis - disMax) / 100.0; - vvv = (disThred - disMax)*1.0 / vv; - } - - if (-4.8366978272229995e-026 >= FalseMinDis) - { - m_pLbdisThre->setDisabled(true); - FalseMinDis = 0; - vvv = 0; - } - m_pLbdisThre->setRange(0, 100); - m_pLbdisThre->setValue(vvv); - m_pLbNum->setText(QString::number(vvv) + "%"); - updateWidget(str); - if (m_pLbListWidgetNum) - { - int IImgNum = m_pListWgtImages->count(); - QString strShow = QString("%1 %2 %3").arg(tr("共")).arg(IImgNum).arg(tr("个图像")); - if (IImgNum > 0 && IImgNum < nGlobalMinImgs) - strShow += QString(",%1 %2 %3.").arg(tr("图像数量少于")).arg(nGlobalMinImgs).arg(tr("个,请及时补充训练样本")); - m_pLbListWidgetNum->setText(strShow); - } - if (m_WarningMsg) - { - int nTypeModel = m_pModelMgr->getModel(str)->getImageModel(); - if (nTypeModel == 0) - m_WarningMsg->setText(tr("该模板训练成功，可以正常使用")); - else if (nTypeModel == 1) - m_WarningMsg->setText(tr("该模板没有训练，并且没有图像")); - else if (nTypeModel == 2) - m_WarningMsg->setText(tr("该模板训练失败，请检查模板图片中是否有其他类型的图像或该模板是否被重复添加")); - else - m_WarningMsg->setText(QString("。。。。。。")); - } -} - -Q_SLOT void ModelMgrUi::onTextChanged(const QString& str) -{ - QStringList models = m_pModelMgr->getAllModelName(); - models.removeAll("NG"); - if (str.isEmpty() || str == "*") { - m_pModelLists->setModelList(models); - QString m_str = QString("%1 %2 %3").arg(tr("共")).arg(models.size()).arg(tr("个型号")); - m_pLbListviewNum->setText(m_str); - //m_FindModel = models; - } - else { - QStringList strFilter = models.filter(str); - m_pModelLists->setModelList(strFilter); - QString m_str = QString("%1 %2 个型号").arg(tr("共")).arg(strFilter.size()).arg(tr("个型号")); - m_pLbListviewNum->setText(m_str); - } -} - -void ModelMgrUi::updateWidget(QString str) -{ - // update images - for (int nIndex = (m_pListWgtImages->count() - 1); nIndex >= 0; nIndex--) { - QListWidgetItem *pItem = m_pListWgtImages->takeItem(nIndex); - delete pItem; - } - m_pListWgtImages->setViewMode(QListView::IconMode); - m_pListWgtImages->clear(); - m_pListWgtImages->setProperty("model", str); - m_pListWgtImages->setIconSize(QSize(WS_PICSIZELIST_ITEM, WS_PICSIZELIST_ITEM)); - m_pListWgtImages->setAcceptDrops(false); - std::vector imgTemplateLib = m_pModelMgr->getTmpImage(str)->getVectors(); - for (int j = 0; j < imgTemplateLib.size(); j++) - { - cv::Mat dst; - cv::Mat src = imgTemplateLib.at(j)->m_img; - cv::resize(src, dst, cv::Size(int(src.cols * 1.5) / 4 * 4, src.rows*1.5)); - QImage img(dst.data, dst.cols, dst.rows, QImage::Format_Indexed8); - QPixmap pix = QPixmap::fromImage(img); - QIcon icon(pix.scaled(QSize(WS_PICSIZELIST_ITEM, WS_PICSIZELIST_ITEM))); - QListWidgetItem* pItem = new QListWidgetItem(icon, imgTemplateLib.at(j)->m_strFileName); - m_pListWgtImages->addItem(pItem); - } -} - -bool ModelMgrUi::appImage2Widget(QString strPath, QString strModel) -{ - //抠图+ - //cv::Mat dst = ModelTrain::findCircleObject(strPath); - cv::Mat dst = imread(string((const char *)strPath.toLocal8Bit()), 0); - //cv::Mat dst = imread(strPath.toLatin1().data(), 0); - if (dst.empty()) { - return false; - } - if (dst.rows >= 900 || dst.cols >= 900) - return false; - //显示 - QString strFileName = strModel + "_" + hubBase::genDateTime("MMddhhmmzzz"); - cv::Mat show; - cv::resize(dst, show, cv::Size(int(dst.cols * 1.5) / 4 * 4, dst.rows*1.5)); - QImage img(show.data, show.cols, show.rows, QImage::Format_Indexed8); - QPixmap pix = QPixmap::fromImage(img); - QIcon icon(pix.scaled(QSize(WS_PICSIZELIST_ITEM, WS_PICSIZELIST_ITEM))); - QFileInfo fi; - fi = QFileInfo(strPath); - QListWidgetItem *pItem = new QListWidgetItem(icon, strFileName); - if (m_pListWgtImages != NULL) { - m_pListWgtImages->insertItem(m_pListWgtImages->count(), pItem); - m_pListWgtImages->setViewMode(QListView::IconMode); - m_pListWgtImages->setIconSize(QSize(WS_PICSIZELIST_ITEM, WS_PICSIZELIST_ITEM)); - m_pListWgtImages->setAcceptDrops(false); - } - //add 2 lib - IWheelModel *pModel = m_pModelMgr->getModel(strModel); - QString strPath2 = m_pCtrl->appRoot() + "\\pattern\\template\\"; - hubBase::mkdir(strPath2); - hubBase::mkdir(strPath2 + strModel); - strPath2 += strModel + "\\" + strFileName + ".png"; - - cv::imwrite(string((const char *)strPath2.toLocal8Bit()), dst); - //cv::imwrite(strPath2.toLatin1().data(), dst); - pModel->getTempImage()->add(dst, strFileName, strPath2); - QString m_str = QString("%1 %2 %3").arg(tr("共")).arg(m_pListWgtImages->count()).arg(tr("个图像")); - if (m_pLbListWidgetNum) - m_pLbListWidgetNum->setText(m_str); - return true; -} -QTime m_ticktimer; - -Q_SLOT void ModelMgrUi::onTrainModel() -{ - if (m_trainOneTsk){ - if (!m_trainOneTsk->isRunning()){ - QString strModel = m_pListWgtImages->property("model").toString(); - if (strModel.isEmpty()) { - onMessageBox(QMessageBox::Information, tr("提示"), tr("请选择一个您要训练的型号！"), 0); - return; - } - m_strTrainModel = strModel; - m_ticktimer.start(); - m_trainOneTsk->InitStopFlag(); - m_trainOneTsk->start(); - } - else { - m_trainOneTsk->stop(); - m_trainOneTsk->quit(); - emit sgShowMsg(tr("训练模板线程未退出，请稍等")); - } - } -} - -Q_SLOT void ModelMgrUi::onTrainAllModels() -{ - if (m_trainAllTsk){ - if (!m_trainAllTsk->isRunning()){ - if (onMessageBox(QMessageBox::Warning, tr("提示"), tr("将对所有型号模板进行重新训练，期间系统的检测功能将不能正常运行直到模板训练完成，全部重新训练模板将需要很长时间，期间将不能进行其他工作，是否继续执行？"), 1) == false) - return; - m_ticktimer.start(); - m_trainAllTsk->InitStopFlag(); - m_trainAllTsk->start(); - } - else { - m_trainAllTsk->stop(); - m_trainAllTsk->quit(); - emit sgShowMsg(tr("训练模板线程未退出，请稍等")); - } - } -} - -bool ModelMgrUi::onExec() -{ - if (m_pCtrl->getDetectState()->IsDetect == true &&m_pCtrl->getDetectState()->m_Debug == 1001) { - onMessageBox(QMessageBox::Warning, tr("提示"), tr("正在检测，请停止检测后再操作！！！"), 0); - return false; - } - onUserRole(); - if (!m_pDlgMain) { - return false; - } - - emit m_pCtrl->sgModelChanged(); - onClearShow(); - m_pEditFilter->clear(); - QStringList strFilter = m_pCtrl->getAllModelMapPtr()->keys(); - strFilter.removeAll("NG"); - m_pModelLists->setModelList(strFilter); - QString m_str = QString("%1 %2 %3").arg(tr("共")).arg(strFilter.size()).arg(tr("个型号")); - m_pLbListviewNum->setText(m_str); - - QStringList strOld = m_pCtrl->getAllModelMapPtr()->keys(); - m_pDlgMain->setWindowModality(Qt::ApplicationModal); - - QDesktopWidget* desktop = QApplication::desktop();// - m_pDlgMain->move((desktop->width() - m_pDlgMain->width()) / 2, (desktop->height() - m_pDlgMain->height()) / 2); - - int r = m_pDlgMain->exec(); - QStringList strNew = m_pCtrl->getAllModelMapPtr()->keys(); - //compare - if (strOld.size() != strNew.size() || m_modLib==true) { - m_pCtrl->sendModelLib(); - m_modLib = false; - } - else { - // - for (int i = 0; i < strNew.size(); i++) { - if (strOld.at(i) != strNew.at(i)) { - // - } - } - } - m_modLib = false; - - return true; -} - -bool ModelMgrUi::onClose() -{ - if (m_pDlgMain) { - m_pDlgMain->close(); - } - return true; -} - -bool ModelMgrUi::onUserRole() -{ - int nLevel = m_pCtrl->getUserLevel(); - if (9 == nLevel) { - m_pTrainBp->setDisabled(false); - m_pOnekeyBp->setDisabled(false); - m_pModMolBp->setDisabled(false); - m_pAddMolBp->setDisabled(false); - m_pDelMolBp->setDisabled(false); - m_pAddPicBp->setDisabled(false); - m_ModelMgr_ModNamel_button->setDisabled(false); - m_ModelMgr_DelModelOneKey_button->setVisible(true); - } - else if (5 == nLevel) { - m_pTrainBp->setDisabled(false); - m_pOnekeyBp->setDisabled(false); - m_pModMolBp->setDisabled(false); - m_pAddMolBp->setDisabled(false); - m_pDelMolBp->setDisabled(false); - m_pAddPicBp->setDisabled(false); - m_ModelMgr_ModNamel_button->setDisabled(false); - m_ModelMgr_DelModelOneKey_button->setVisible(false); - } - else if (4 == nLevel) { - m_pTrainBp->setDisabled(true); - m_pOnekeyBp->setDisabled(true); - m_pModMolBp->setDisabled(true); - m_pAddMolBp->setDisabled(true); - m_pDelMolBp->setDisabled(true); - m_pAddPicBp->setDisabled(true); - m_ModelMgr_ModNamel_button->setDisabled(true); - m_ModelMgr_DelModelOneKey_button->setVisible(false); - - } - else { - return false; - } - return true; -} - -void ModelMgrUi::TrainAllTskFunc() -{ - QStringList lstAll = m_pModelMgr->getAllModelName(); - QMap> mpAllImage = m_pModelMgr->getAllModelImage(); - emit sgPrograssShow(tr("模板更新进度"), tr("正在初始化所有模板 共需要训练%1个模板,请稍后.....").arg(lstAll.size()), lstAll.size(), emPross_Init); - int nIndex = 0; - for (; nIndex < lstAll.size()&&(!m_trainAllTsk->getStopFlag()); nIndex++) { - emit sgPrograssShow(tr("模板更新进度"), "", nIndex, emPross_SetValue); - QString m_modelName = lstAll.at(nIndex); - TempImage *pImg = m_pModelMgr->getTmpImage(m_modelName); - if (!pImg) { - continue; - } - QString str = tr("正在训练%1的模板 已完成%2/%3,请稍后.....").arg(m_modelName).arg(nIndex + 1).arg(m_pModelMgr->getAllModelName().size()); - emit sgPrograssShow(tr("模板更新进度"), str, lstAll.size(), emPross_SetLable); - IWheelModel *pModel = m_pModelMgr->getModel(m_modelName); - std::vector mMat = pImg->getImgVector(); - ImageCompareModel *m_compareModel = pModel->getImageComModel(); - if (mMat.size() <= 0) - { - continue; - } - if (m_trainAllTsk->getStopFlag()) - break; - m_compareModel->train(mMat); - QMap imgVec = m_pModelMgr->getAllImgsExcSelf(pModel->getModelID()); - QMap::iterator it; - vector names; - std::map disMap; - - for (it = imgVec.begin(); it != imgVec.end(); it++) - { - QString strName = it.key(); - double dis = m_compareModel->filterTrainImage(it.value()); - disMap[strName.toStdString()] = dis; - } - vector > vec(disMap.begin(), disMap.end()); - std::sort(vec.begin(), vec.end(), CmpByValue()); - disMap.clear(); - for (int j = 0; j < ceil(vec.size() / 2.0); j++) - { - names.push_back(QString::fromStdString(vec[j].first)); - } - - //vector falseSamples = m_pModelMgr->getAllModelImageExcSelf(pModel->getModelID()); - std::vector m_modelInfo = m_pModelMgr->getAllTarImgs(names); - vector falseSamples; - for (int k = 0; k < m_modelInfo.size(); k++) - { - const modelInfo& m_struct = m_modelInfo[k]; - const vector& vecMats = m_struct.mpAllImage; - falseSamples.insert(falseSamples.end(), vecMats.begin(), vecMats.end()); - } - - names.clear(); - m_compareModel->weightOptimization(falseSamples); - m_compareModel->calculateAllParams(mMat); - if (m_trainAllTsk->getStopFlag()) - break; - if (pModel->getPicPath().isEmpty()) - { - QString modelName = pModel->getModelID(); - QString strSavePath = m_pCtrl->appRoot(); - QString n_Pic_path = "\\pattern\\Models\\" + modelName + ".jpg"; - QString filepath = strSavePath + n_Pic_path; - imwrite(string((const char *)filepath.toLocal8Bit()), mMat.at(0)); - pModel->setPicPath(n_Pic_path); - m_pModelMgr->modModel(m_modelName); - } - str = tr("%1的模板获取特征 已完成%2/%3,请稍后.....").arg(m_modelName).arg(nIndex + 1).arg(m_pModelMgr->getAllModelName().size()); - emit sgPrograssShow(tr("模板更新进度"), str, lstAll.size(), emPross_SetLable); - - m_compareModel->setIsEnableCache(true); - if (m_trainAllTsk->getStopFlag()) - break; - //if (pModel->getDiameter() && pModel->getThickness()) - //{ - // m_compareModel->setRealWidth(pModel->getDiameter()); - // m_compareModel->setRealHeight(pModel->getThickness()); - //} - - //for (int h = 0; h < m_modelInfo.size(); h++) - //{ - //const vector& vectorMats = m_modelInfo[h].mpAllImage; - //double md_diameter = m_modelInfo[h].md_diameter; - //double md_height = m_modelInfo[h].md_height; - m_compareModel->computeDisThre(falseSamples, NULL); - //} - - if (m_trainAllTsk->getStopFlag()) - break; - double m_double = m_compareModel->getDisThre(); - qWarning() << m_modelName << ":" << "disthre" << m_double; - - - QString templatepath = m_pCtrl->appRoot() + "\\pattern\\template\\"; - templatepath += m_modelName; - templatepath += "\\model.yml"; - std::string strS = templatepath.toLocal8Bit().toStdString(); - m_compareModel->save2file(strS); - cv::Mat dst = m_compareModel->getM8uMaskImg(); - QImage img(dst.data, dst.cols, dst.rows, dst.cols, QImage::Format_Indexed8); - QPixmap pix = QPixmap::fromImage(img); - m_pLbModelPic->setPixmap(pix.scaled(129, 129)); - emit sgTrainShowInfo(m_modelName); - - str = tr("%1的模板训练完成 已完成%2/%3,请稍后.....").arg(m_modelName).arg(nIndex + 1).arg(m_pModelMgr->getAllModelName().size()); - emit sgPrograssShow(tr("模板更新进度"), "", nIndex, emPross_SetValue); - } - if (!m_trainAllTsk->getStopFlag()) - { - emit sgPrograssShow(tr("模板更新进度"), "", nIndex, emPross_Finish); - emit sgPrograssShow(tr("模板更新进度"), tr("全部模板更新完成！%1s").arg(m_ticktimer.elapsed()/1000.0), nIndex, emPross_enable); - QString str = m_pCtrl->getUserName() + ":" + tr("对全部模板进行了重新训练，共%1个模板").arg(lstAll.size()); - m_pCtrl->addLog(str, emTypeUseState); - } -} - -Q_SLOT void ModelMgrUi::onDelAllModels() -{ - if (onMessageBox(QMessageBox::Warning, tr("警告"), tr("即将删除模板库里的所有模板，是否继续？"), 1) == false) - return; - if (onMessageBox(QMessageBox::Warning, tr("提示"), tr("再次确认，是否全部删除？"), 1) == false) - return; - QStringList ModeStrList = m_pModelMgr->getAllModelName(); - if (ModeStrList.size() <= 0){ - onMessageBox(QMessageBox::Warning, tr("提示"), tr("没有模板!!!"), 0); - return; - } - for (int nIndex = 0; nIndex < ModeStrList.size(); nIndex++){ - QString strModel = ModeStrList.at(nIndex); - if (m_pModelMgr->getAllModelName().contains(strModel)) - { - m_pModelLists->removeModel(strModel); - m_pModelMgr->delModel(strModel); - m_pModelLists->update2AllModels("NG"); - emit m_pCtrl->sgModelChanged(); - } - } - onClearShow(); - onMessageBox(QMessageBox::Warning, tr("提示"), tr("全部删除完成!!!"), 0); -} - -Q_SLOT void ModelMgrUi::onPrograssShow(QString title, QString strValue, int size, int model) -{ - switch (model) - { - case emPross_Init: - { - m_pProgressView->show(title, strValue, size, MODEL_UI_ICON_LEAPER); - } - break; - case emPross_SetValue: - { - m_pProgressView->setValue(size); - } - break; - case emPross_SetLable: - m_pProgressView->setLabel(strValue); - break; - case emPross_Finish: - { - m_pProgressView->finish(); - } - break; - case emPross_enable: - onMessageBox(QMessageBox::Information, tr("提示"), strValue, 0); - break; - case emPross_Disable: - break; - } -} - -void ModelMgrUi::TrainOneTskFunc() -{ - if (m_strTrainModel.isEmpty()) - return; - int m_step = 5; - QString str = tr("模板正在准备请稍后....."); - emit sgPrograssShow(tr("模板训练进度"), str, m_step, emPross_Init); - - IWheelModel*pModel = m_pModelMgr->getModel(m_strTrainModel); - if (!pModel) { - return; - } - - emit sgPrograssShow(tr("模板训练进度"), str, 0, emPross_SetValue); - if (m_trainOneTsk->getStopFlag()) - return; - TempImage *pTempImg = pModel->getTempImage(); - std::vector m_MatVec = pTempImg->getImgVector(); - if (m_MatVec.size() <= 0) - { - emit sgPrograssShow(tr("模板训练进度"), tr("%1型号没有图片不能训练！").arg(m_strTrainModel), 6, emPross_enable); - emit sgPrograssShow(tr("模板训练进度"), tr("%1型号没有图片不能训练！").arg(m_strTrainModel), 6, emPross_Finish); - return; - } - if (m_trainOneTsk->getStopFlag()) - return; - emit sgPrograssShow(tr("模板训练进度"), str, 1, emPross_SetValue); - - ImageCompareModel *m_compareModel = pModel->getImageComModel(); - //std::vector firstFalseSample = m_pModelMgr->getFirstImgFromFalse(pModel->getModelID()); - m_compareModel->train(m_MatVec); //////////////////////////////////////////// tain model - - QMap imgVec = m_pModelMgr->getAllImgsExcSelf(pModel->getModelID()); - QMap::iterator it; - vector names; - std::map disMap; - if (m_trainOneTsk->getStopFlag()) - return; - for (it = imgVec.begin(); it != imgVec.end(); it++) - { - QString strName = it.key(); - double dis = m_compareModel->filterTrainImage(it.value()); - if (dis != DBL_MAX) - { - disMap[strName.toStdString()] = dis; - names.push_back(strName); - } - } - if (m_trainOneTsk->getStopFlag()) - return; -// vector > vec(disMap.begin(), disMap.end()); -// std::sort(vec.begin(), vec.end(), CmpByValue()); -// disMap.clear(); -// for (int j = 0; j < ceil(vec.size() / 2.0); j++) -// { -// names.push_back(QString::fromStdString(vec[j].first)); -// } -// if (m_trainOneTsk->getStopFlag()) -// return; - //vector falseSamples = m_pModelMgr->getAllModelImageExcSelf(pModel->getModelID()); - std::vector m_modelInfo = m_pModelMgr->getAllTarImgs(names); - vector falseSamples; - for (int k = 0; k < m_modelInfo.size(); k++) - { - const modelInfo& m_struct = m_modelInfo[k]; - const vector& vecMats = m_struct.mpAllImage; - falseSamples.insert(falseSamples.end(), vecMats.begin(), vecMats.end()); - } - names.clear(); - m_compareModel->weightOptimization(falseSamples); - m_compareModel->calculateAllParams(m_MatVec); - if (m_trainOneTsk->getStopFlag()) - return; - emit sgPrograssShow(tr("模板训练进度"), str, 2, emPross_SetValue); - hubBase::mkdir(m_pCtrl->appRoot() + "\\pattern"); - QString templatepath = m_pCtrl->appRoot() + "\\pattern\\template\\"; - hubBase::mkdir(templatepath); - templatepath += m_strTrainModel; - templatepath += "\\model.yml"; - m_compareModel->setName(m_strTrainModel.toLatin1().data()); - std::string strS = templatepath.toLocal8Bit().toStdString(); - m_compareModel->save2file(strS);//////////////////////////////save params - if (pModel->getPicPath().isEmpty()) - { - QString modelName = pModel->getModelID(); - QString strSavePath = m_pCtrl->appRoot(); - //hubBase::mkdir(strSavePath); - QString n_Pic_path = "\\pattern\\Models\\" + modelName + ".jpg"; - QString filepath = strSavePath + n_Pic_path; - imwrite(string((const char *)filepath.toLocal8Bit()), m_MatVec.at(0)); - pModel->setPicPath(n_Pic_path); - m_pModelMgr->modModel(m_strTrainModel); - } - if (m_trainOneTsk->getStopFlag()) - return; - emit sgPrograssShow(tr("模板训练进度"), str, 3, emPross_SetValue); - emit sgPrograssShow(tr("模板训练进度"), str, 4, emPross_SetValue); - emit sgPrograssShow(tr("模板训练进度"), tr("%1的模板 正在获取特征值,请稍后....").arg(m_strTrainModel), 4, emPross_SetLable); - - m_compareModel->setIsEnableCache(false); - //if (pModel->getDiameter() && pModel->getThickness()) - //{ - // m_compareModel->setRealWidth(pModel->getDiameter()); - // m_compareModel->setRealHeight(pModel->getThickness()); - //} - //for (int h = 0; h < m_modelInfo.size(); h++) - //{ - //const vector& vectorMats = m_modelInfo[h].mpAllImage; - m_compareModel->computeDisThre(falseSamples, NULL); - //} - strS = templatepath.toLocal8Bit().toStdString(); - m_compareModel->save2file(strS); - if (m_trainOneTsk->getStopFlag()) - return; - emit sgPrograssShow(tr("模板训练进度"), str, 6, emPross_SetValue); - emit sgPrograssShow(tr("模板训练进度"), str, 6, emPross_Finish); - emit sgPrograssShow(tr("模板训练进度"), tr("训练完成！%1s").arg(m_ticktimer.elapsed()/1000.0), 6, emPross_enable); - emit sgTrainShowInfo(m_strTrainModel); - str = m_pCtrl->getUserName() + ":" + tr("训练了模板:%1").arg(m_strTrainModel); - m_pCtrl->addLog(str, emTypeUseState); - m_strTrainModel.clear(); -} - -Q_SLOT void ModelMgrUi::onProgassCancel() -{ - if (m_trainAllTsk){ - m_trainAllTsk->stop(); - m_trainAllTsk->quit(); - } - if (m_trainOneTsk){ - m_trainOneTsk->stop(); - m_trainOneTsk->quit(); - } - m_ticktimer.elapsed(); -} - -Q_SLOT void ModelMgrUi::onTableWidget(int nIndex) -{ - if (nIndex==1) - emit sgGenalData(QVariant("tabchange"), QVariant(1)); -} - -//modify model name -Q_SLOT void ModelMgrUi::onChangeModelName() -{ - QString strModel = m_pListWgtImages->property("model").toString(); - if (strModel.isEmpty()) - { - onMessageBox(QMessageBox::Information, tr("提示"), tr("请选择一个您要修改的型号！"), 0); - return; - } - QModNamedlg dlg; - QString m_newName; - IWheelModel *pModel = m_pModelMgr->getModel(strModel); - QString strPath = m_pCtrl->appRoot() + pModel->getPicPath(); - dlg.setPixmap(strPath); - dlg.setOldModelName(strModel); - dlg.SetModelsStr(m_pModelMgr->getAllModelName()); - if (QDialog::Accepted == dlg.exec()) - { - m_newName = dlg.getNewModelName(); - if (m_newName.isEmpty()) - return; - } - else - return; - m_pModelMgr->reName(strModel,m_newName); - m_pModelLists->update2AllModels("NG"); - emit(m_pCtrl->sgModelChanged()); - onShowModelInfo(m_newName); - onShowModelPic(m_newName); -} - -Q_SLOT void ModelMgrUi::onShowMessage(QString str) -{ - QPulpewidget *pw = new QPulpewidget(); - pw->showmessage(str); - pw->setParent(m_pDlgMain); - connect(pw, SIGNAL(finished()), pw, SLOT(deleteLater()));// -} - -Q_SLOT void ModelMgrUi::onDeleteShow(QWidget* p) -{ - delete p; - p = NULL; -} -//copy file to new filename -bool ModelMgrUi::copyDirectoryFiles(const QString &fromDir, const QString &toDir, bool coverFileIfExist) -{ - QDir sourceDir(fromDir); - QDir targetDir(toDir); - if (!targetDir.exists()){ - if (!targetDir.mkdir(targetDir.absolutePath())) - return false; - } - sourceDir.setFilter(QDir::Files); - QFileInfoList fileInfoList = sourceDir.entryInfoList(); - foreach(QFileInfo fileInfo, fileInfoList){ - QString str = fileInfo.fileName(); - - QString filefpath = fileInfo.filePath(); - QString newfile = targetDir.filePath(fileInfo.fileName()); - if (!QFile::copy(filefpath, newfile)){ - return false; - } - } - return true; -} - -bool ModelMgrUi::onMessageBox(QMessageBox::Icon ntype, QString strTitle, QString strAtl, int onlyOK) -{ - QMessageBox::StandardButton button = QMessageBox::Ok; - - if (onlyOK == 1) - button = QMessageBox::Cancel; - QMessageBox infobox(ntype, strTitle, strAtl, QMessageBox::Ok | button, NULL); - infobox.setWindowIcon(QIcon(":/image/leaper")); - infobox.setButtonText(QMessageBox::Ok, tr("确认")); - infobox.setButtonText(QMessageBox::Cancel, tr("取消")); - return (infobox.exec() == QMessageBox::Ok); -} - -*/ \ No newline at end of file diff --git a/src/tpMain/ModelMgrUi.h b/src/tpMain/ModelMgrUi.h deleted file mode 100644 index e1c82e4..0000000 --- a/src/tpMain/ModelMgrUi.h +++ /dev/null @@ -1,96 +0,0 @@ -/*#pragma once -#include "qlistwidget.h" -#include "IWheelUi.h" -#include "QObjectCleanupHandler" -#include "QMessageBox" -class IWheelCtrl; -class ModelMgrUi : public IWheelUi -{ - Q_OBJECT -public: - ModelMgrUi(const QString, IWheelCtrl*); - ~ModelMgrUi(); - virtual bool onPolished(QWidget *p); - virtual bool onExec(); - virtual bool onClose(); - virtual bool onUserRole(); - - Q_SLOT void onAddPic2Model(); - Q_SLOT void onModifyModel(); - Q_SLOT void onDelModel(); - Q_SLOT void onAddModel(); - Q_SLOT void onTrainModel(); - - Q_SLOT void onTrainAllModels(); - Q_SLOT void onItemDoubleClicked(QListWidgetItem * item); - Q_SLOT void onPrograssShow(QString title, QString strValue, int size, int model); - Q_SLOT void setValue(int value); - Q_SLOT void onDelAllModels(); - Q_SLOT void onChangeModelName(); - Q_SLOT void onProgassCancel(); - Q_SLOT void onTableWidget(int nIndex); - Q_SLOT void onTextChanged(const QString&); - Q_SLOT void onShowModelInfo(QString str); - Q_SLOT void onShowModelPic(QString str); - void onClearShow(); - - void TrainAllTskFunc(); - void TrainOneTskFunc(); -signals: - void sgPrograssShow(QString title, QString strValue, int size, int model); - void sgTrainShowInfo(QString str); - void sgShowMsg(QString); -private: - void updateWidget(QString str); - bool appImage2Widget(QString strPath, QString strModel); - void TestAddModel(); - Q_SLOT void onShowMessage(QString str); - Q_SLOT void onDeleteShow(QWidget* p); - bool copyDirectoryFiles(const QString &fromDir, const QString &toDir, bool coverFileIfExist); - bool onMessageBox(QMessageBox::Icon ntype, QString strTitle, QString strAtl, int onlyOK); - -private: - class QListWidget *m_pListWgtImages; - - class ModelsView *m_pModelLists; - class IWheelCtrl* m_pCtrl; - class ModelManager *m_pModelMgr; - class QPushButton *m_pBtnTrain; - class QLineEdit* m_pEditFilter; - class QSpinBox *m_RepetBox; - class QLineEdit *m_pEditModelId; - class QLineEdit *m_pEditModelDiameter; - class QLineEdit *m_pEditModelThickness; - class QLabel * m_pLbModelPic; - class QLabel * m_pLbListWidgetNum; - class QLabel * m_pLbListviewNum; - class QLabel * m_WarningMsg; - class QLabel * m_pLbDisMin; - class QLabel * m_pLbDisMax; - class QLabel * m_pLbNum; - class QDialog * m_pDlgMain; - class QSlider * m_pLbdisThre; - class QPushButton *m_pAddMolBp; - class QPushButton *m_pDelMolBp; - class QPushButton *m_pModMolBp; - class QPushButton *m_pTrainBp; - class QPushButton *m_pOnekeyBp; - class QPushButton *m_pAddPicBp; - class QPushButton *m_ModelMgr_DelModelOneKey_button; - class QPushButton *m_ModelMgr_ModNamel_button; - class QTabWidget *tabwidget; - QString m_strUiName; -// class QPulpewidget *www; - QString m_strTrainModel; - QString m_strAddPicPath; - class QMyThread *m_trainAllTsk; - class QMyThread *m_trainOneTsk; - class ProgressView *m_pProgressView; - - class DetectState *m_pState; -// QObjectCleanupHandler *cleaner;// = new QObjectCleanupHandler; - int nGlobalMinImgs; - bool m_modLib; -}; - -*/ \ No newline at end of file diff --git a/src/tpMain/ModelResult.cpp b/src/tpMain/ModelResult.cpp deleted file mode 100644 index a09562a..0000000 --- a/src/tpMain/ModelResult.cpp +++ /dev/null @@ -1,11 +0,0 @@ -#include "ModelResult.h" - - -ModelResult::ModelResult() -{ -} - - -ModelResult::~ModelResult() -{ -} diff --git a/src/tpMain/ModelResult.h b/src/tpMain/ModelResult.h deleted file mode 100644 index 187d50e..0000000 --- a/src/tpMain/ModelResult.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once -#include "qstring.h" -class ModelResult -{ -public: - ModelResult(); - ~ModelResult(); - - QString m_strModel; - double m_dDiameter; - double m_dHeight; - double m_dScore; - -}; - diff --git a/src/tpMain/ProgressView.h b/src/tpMain/ProgressView.h index 6b65fb4..f638c94 100644 --- a/src/tpMain/ProgressView.h +++ b/src/tpMain/ProgressView.h @@ -21,7 +21,7 @@ public: signals: void cancel(); private: - class QProgressDialog *m_pProgressDialog; + class QProgressDialog *m_pProgressDialog{nullptr}; bool nCancel; }; diff --git a/src/tpMain/StatusBarUi.cpp b/src/tpMain/StatusBarUi.cpp deleted file mode 100644 index df3d1b2..0000000 --- a/src/tpMain/StatusBarUi.cpp +++ /dev/null @@ -1,190 +0,0 @@ -#include "StatusBarUi.h" -#include "qlabel.h" -#include "IWheelCtrl.h" -#include "qstatusbar.h" -#include "qcoreevent.h" -#include "DetectState.h" -#include "HubBase.h" -#include "qsettings.h" -#pragma execution_character_set("utf-8") - -StatusBarUi::StatusBarUi(const QString strUiName, IWheelCtrl*pCtrl) -{ - m_pCtrl = pCtrl; - m_pLbCurrentTime = NULL; - m_pState = pCtrl->getDetectState(); - m_pLbBanci = NULL; - m_pLbDetectState = NULL; - m_pLbUser = NULL; - - QSettings languageSetting("hubdetect.ini", QSettings::IniFormat); - strLanguage = languageSetting.value("language", "Chinese").toString(); -} - - -StatusBarUi::~StatusBarUi() -{ - m_pCtrl = NULL; - m_pState = NULL; - killTimer(m_nTimerID); - if (m_pLbCurrentTime) - { - delete m_pLbCurrentTime; - m_pLbCurrentTime = NULL; - } - if (m_pLbBanci) - { - delete m_pLbBanci; - m_pLbBanci = NULL; - } - if (m_pLbDetectState) - { - delete m_pLbDetectState; - m_pLbDetectState = NULL; - } -// if (m_pLbOnLine) -// { -// delete m_pLbOnLine; -// m_pLbOnLine = NULL; -// } - if (m_pLbUser) - { - delete m_pLbUser; - m_pLbUser = NULL; - } -} - - -void StatusBarUi::initStatusBar() -{ - const int c_nWidth = 200; - if (strLanguage != "Chinese") - { - m_pLbCurrentTime = new QLabel(tr("Time:")); - m_pLbBanci = new QLabel(tr("Classes:")); - m_pLbDetectState = new QLabel(tr("State:")); - m_pLbUser = new class QLabel(tr("User:")); - } - else - { - m_pLbCurrentTime = new QLabel(tr("系统时间")); - m_pLbBanci = new QLabel(tr("班次信息")); - m_pLbDetectState = new QLabel(tr("检测状态")); - m_pLbUser = new class QLabel(tr("用户：")); - } - - QFont m_font; - m_font.setBold(true); - m_font.setPixelSize(12); - - m_pLbCurrentTime->setFont(m_font); - m_pLbCurrentTime->setMinimumHeight(40); - m_pLbCurrentTime->setMinimumWidth(c_nWidth); - m_pLbCurrentTime->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter); - - - m_pLbBanci->setMinimumWidth(c_nWidth); - m_pLbBanci->setFont(m_font); - m_pLbBanci->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter); - - - m_pLbDetectState->setMinimumWidth(c_nWidth); - m_pLbDetectState->setFont(m_font); - m_pLbDetectState->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter); - - //m_pLbOnLine = new class QLabel("模式："); - //m_pLbOnLine->setMinimumWidth(c_nWidth); - - m_pLbUser->setFont(m_font); - m_pLbUser->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter); - - m_pStatusBar->addWidget(m_pLbDetectState,1); - m_pStatusBar->addWidget(m_pLbUser,1); - m_pStatusBar->addWidget(m_pLbBanci); - m_pStatusBar->addPermanentWidget(m_pLbCurrentTime); - //m_pStatusBar->addWidget(m_pLbCurrentTime); -} - -bool StatusBarUi::onExec() -{ - return true; -} - -bool StatusBarUi::onPolished(QWidget* p) -{ - QString str = p->objectName(); - if ("wheel_main_statusbar_status" == str) { - m_pStatusBar = qobject_cast(p); - initStatusBar(); - m_nTimerID = startTimer(500); - } - else { - return false; - } - return true; -} - -void StatusBarUi::timerEvent(QTimerEvent *pEvent) -{ - if (pEvent->timerId() == m_nTimerID) { - // time - - QString str = tr("系统时间： "); - QString strDetectState = tr("检测状态:")+ (m_pState->IsDetect == true ? tr("检测中...") : tr("未检测...")); - if (strLanguage != "Chinese") - { - str = "Time:"; - strDetectState = tr("State:") + (m_pState->IsDetect == true ? tr("Detecting...") : tr("Undetect...")); - } - - if (m_pLbCurrentTime) { - QString m_currentTimerString = hubBase::genDateTime(); - - m_pLbCurrentTime->setText(str + m_currentTimerString + " "); - m_pLbCurrentTime->setStyleSheet("font: 14px;"); - } - - // state - if (m_pLbDetectState) { - - m_pLbDetectState->setText(strDetectState); - if (m_pState->IsDetect) { - m_pLbDetectState->setStyleSheet("font: bold 14px;background-color: green;"); - } - else { - m_pLbDetectState->setStyleSheet("font: bold 14px;background-color: red;"); - } - } - - // online -// if (m_pLbOnLine) { -// QString strOnlineState = QString("检测模式：") -// + (m_pState->IsOnline == true ? "在线模式" : "离线模式"); -// m_pLbOnLine->setText(strOnlineState); -// m_pLbOnLine->setStyleSheet("font: bold 14px;"); -// } - if (m_pLbBanci) { - QString show_label; - if (m_pCtrl) - show_label = m_pCtrl->getCurrentBan(); - - QString strMsg = tr("班次信息：") - + (show_label.isEmpty() == true ? tr("该时间段未设置班次") : show_label); - if (strLanguage != "Chinese") - { - strMsg = tr("Classes:") - + (show_label.isEmpty() == true ? tr("No set Times") : 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;"); - } - } -} diff --git a/src/tpMain/StatusBarUi.h b/src/tpMain/StatusBarUi.h deleted file mode 100644 index d8f74ea..0000000 --- a/src/tpMain/StatusBarUi.h +++ /dev/null @@ -1,27 +0,0 @@ -#pragma once -#include "IWheelUi.h" -class StatusBarUi : - public IWheelUi -{ -public: - StatusBarUi(const QString strUiName, IWheelCtrl*); - ~StatusBarUi(); - void initStatusBar(); - virtual bool onExec(); - virtual bool onPolished(QWidget*); - virtual bool onClose(){ return true; }; -private: - virtual void timerEvent(QTimerEvent *); - IWheelCtrl *m_pCtrl; - class DetectState *m_pState; -private: - class QStatusBar*m_pStatusBar; - class QLabel* m_pLbCurrentTime; - class QLabel* m_pLbBanci; - class QLabel* m_pLbDetectState; - //class QLabel *m_pLbOnLine; - class QLabel *m_pLbUser; - int m_nTimerID; - QString strLanguage; -}; - diff --git a/src/tpMain/ToolBarUi.cpp b/src/tpMain/ToolBarUi.cpp deleted file mode 100644 index c8df69e..0000000 --- a/src/tpMain/ToolBarUi.cpp +++ /dev/null @@ -1,315 +0,0 @@ -#include "ToolBarUi.h" -#include "qtoolbar.h" -#include "qaction.h" -#include "qicon.h" -#include "qmenu.h" -#include "qtoolbutton.h" -#include "IWheelCtrl.h" -#include "qpixmap.h" -#include "qobject.h" -#include "InfoFile.h" -#include "IWheelUis.h" -#include "QFileDialog" -#include "QDir" -#include "QMessageBox" -#include "DetectState.h" -#include "QImage" -#include "QPixmap" -#include "main_gloabl.h" -#include "QFormLayout" -#include "QLabel" -//#include "qdia2thsetting.h" -#pragma execution_character_set("utf-8") -#define WHEEL_UI_TOOLBAR_USER "main_toolbar_action_user" -#define WHEEL_UI_TOOLBAR_MGRMODEL "main_toolbar_action_modelmgr" -#define WHEEL_UI_TOOLBAR_SERVER "main_toolbar_action_setting_ip" -#define WHEEL_UI_TOOLBAR_RASTER "main_toolbar_action_cali_raster" -//#define WHEEL_UI_TOOLBAR_BKGD "main_toolbar_action_cali_background" -//#define WHEEL_UI_TOOLBAR_SENDML "main_toolbar_action_sendmodels" -#define WHEEL_UI_TOOLBAR_SETBC "main_toolbar_action_setting_ban" -#define WHEEL_UI_TOOLBAR_CKBT "main_toolbar_action_data" -#define WHEEL_UI_TOOLBAR_DEBUGUI "main_toolbar_action_develop" -#define WHEEL_UI_TOOLBAR_MODELUI "main_toolbar_action_connect_mode" -//#define WHEEL_UI_TOOLBAR_DIAMER "main_toolbar_action_cali_diameter" -#define WHEEL_UI_TOOLBAR_ABOUT "main_toolbar_action_about" -#define WHEEL_UI_TOOLBAR_MANAGER "main_toolbar_action_userManager" - -ToolBarUi::ToolBarUi(const QString, class IWheelCtrl *pCtrl, class IWheelUis*pUi) -{ - m_pCtrl = pCtrl; - m_pUi = pUi; - m_pState = m_pCtrl->getDetectState(); - readTxtFile(); -} - -ToolBarUi::~ToolBarUi() -{ - -} - -void ToolBarUi::initToolBar() -{ - QList p = m_pToolBar->actions(); - for (int i = 0; i < p.size(); i++) { - if (p.at(i)->objectName().contains("main_toolbar_action_")) { - m_mpActions.insert(p.at(i)->objectName(), p.at(i)); - } - } - if(m_pState->m_Debug!=100) - onInitAction(); -} - -void ToolBarUi::onInitAction() -{ - //m_mpActions.value(WHEEL_UI_TOOLBAR_USER)->setDisabled(false); - m_mpActions.value(WHEEL_UI_TOOLBAR_MGRMODEL)->setDisabled(true); - m_mpActions.value(WHEEL_UI_TOOLBAR_SERVER)->setDisabled(true); - m_mpActions.value(WHEEL_UI_TOOLBAR_RASTER)->setDisabled(true); - //m_mpActions.value(WHEEL_UI_TOOLBAR_BKGD)->setDisabled(true); - //m_mpActions.value(WHEEL_UI_TOOLBAR_SENDML)->setDisabled(true); - m_mpActions.value(WHEEL_UI_TOOLBAR_SETBC)->setDisabled(true); - m_mpActions.value(WHEEL_UI_TOOLBAR_CKBT)->setDisabled(true); - m_mpActions.value(WHEEL_UI_TOOLBAR_DEBUGUI)->setVisible(true); - m_mpActions.value(WHEEL_UI_TOOLBAR_DEBUGUI)->setDisabled(true); - m_mpActions.value(WHEEL_UI_TOOLBAR_MODELUI)->setDisabled(true); - m_mpActions.value(WHEEL_UI_TOOLBAR_MANAGER)->setVisible(false); - //m_mpActions.value(WHEEL_UI_TOOLBAR_DIAMER)->setDisabled(true); -} - -bool ToolBarUi::onPolished(QWidget*p) -{ - QString str = p->objectName(); - if (str == "wheel_main_toolbar_tools") { - m_pToolBar = qobject_cast(p); - initToolBar(); - /*m_pToolBar->*/ - } - else { - return false; - } - return true; -} - -bool ToolBarUi::onExec() -{ - onUserRole(); - return true; -} - -bool ToolBarUi::onUserRole() -{ - int nLevel = m_pCtrl->getUserLevel(); - if (9 == nLevel) { - m_mpActions.value(WHEEL_UI_TOOLBAR_MGRMODEL)->setDisabled(false); - m_mpActions.value(WHEEL_UI_TOOLBAR_SERVER)->setDisabled(false); - m_mpActions.value(WHEEL_UI_TOOLBAR_RASTER)->setDisabled(false); - //m_mpActions.value(WHEEL_UI_TOOLBAR_BKGD)->setDisabled(false); - //m_mpActions.value(WHEEL_UI_TOOLBAR_SENDML)->setDisabled(false); - m_mpActions.value(WHEEL_UI_TOOLBAR_SETBC)->setDisabled(false); - m_mpActions.value(WHEEL_UI_TOOLBAR_CKBT)->setDisabled(false); - m_mpActions.value(WHEEL_UI_TOOLBAR_DEBUGUI)->setDisabled(false); - m_mpActions.value(WHEEL_UI_TOOLBAR_DEBUGUI)->setVisible(true); - m_mpActions.value(WHEEL_UI_TOOLBAR_MODELUI)->setDisabled(false); - m_mpActions.value(WHEEL_UI_TOOLBAR_MANAGER)->setVisible(true); - //m_mpActions.value(WHEEL_UI_TOOLBAR_DIAMER)->setDisabled(false); - } - else if (5 == nLevel) { - m_mpActions.value(WHEEL_UI_TOOLBAR_MGRMODEL)->setDisabled(false); - m_mpActions.value(WHEEL_UI_TOOLBAR_SERVER)->setDisabled(false); - m_mpActions.value(WHEEL_UI_TOOLBAR_RASTER)->setDisabled(false); - //m_mpActions.value(WHEEL_UI_TOOLBAR_BKGD)->setDisabled(false); - //m_mpActions.value(WHEEL_UI_TOOLBAR_SENDML)->setDisabled(false); - m_mpActions.value(WHEEL_UI_TOOLBAR_SETBC)->setDisabled(false); - m_mpActions.value(WHEEL_UI_TOOLBAR_CKBT)->setDisabled(false); - m_mpActions.value(WHEEL_UI_TOOLBAR_DEBUGUI)->setVisible(true); - m_mpActions.value(WHEEL_UI_TOOLBAR_DEBUGUI)->setDisabled(false); - m_mpActions.value(WHEEL_UI_TOOLBAR_MODELUI)->setDisabled(false); - m_mpActions.value(WHEEL_UI_TOOLBAR_MANAGER)->setVisible(true); - //m_mpActions.value(WHEEL_UI_TOOLBAR_DIAMER)->setDisabled(false); - } - else if (4 == nLevel) { - m_mpActions.value(WHEEL_UI_TOOLBAR_MGRMODEL)->setDisabled(false); - m_mpActions.value(WHEEL_UI_TOOLBAR_SERVER)->setDisabled(true); - m_mpActions.value(WHEEL_UI_TOOLBAR_RASTER)->setDisabled(true); - //m_mpActions.value(WHEEL_UI_TOOLBAR_BKGD)->setDisabled(true); - //m_mpActions.value(WHEEL_UI_TOOLBAR_SENDML)->setDisabled(true); - m_mpActions.value(WHEEL_UI_TOOLBAR_SETBC)->setDisabled(true); - m_mpActions.value(WHEEL_UI_TOOLBAR_CKBT)->setDisabled(false); - m_mpActions.value(WHEEL_UI_TOOLBAR_DEBUGUI)->setVisible(true); - m_mpActions.value(WHEEL_UI_TOOLBAR_DEBUGUI)->setDisabled(false); - m_mpActions.value(WHEEL_UI_TOOLBAR_MODELUI)->setDisabled(false); - m_mpActions.value(WHEEL_UI_TOOLBAR_MANAGER)->setVisible(false); - //m_mpActions.value(WHEEL_UI_TOOLBAR_DIAMER)->setDisabled(true); - } - else if (nLevel<=2){ - //m_mpActions.value(WHEEL_UI_TOOLBAR_USER)->setDisabled(false); - m_mpActions.value(WHEEL_UI_TOOLBAR_MGRMODEL)->setDisabled(true); - m_mpActions.value(WHEEL_UI_TOOLBAR_SERVER)->setDisabled(true); - m_mpActions.value(WHEEL_UI_TOOLBAR_RASTER)->setDisabled(true); - //m_mpActions.value(WHEEL_UI_TOOLBAR_BKGD)->setDisabled(true); - //m_mpActions.value(WHEEL_UI_TOOLBAR_SENDML)->setDisabled(true); - m_mpActions.value(WHEEL_UI_TOOLBAR_SETBC)->setDisabled(true); - m_mpActions.value(WHEEL_UI_TOOLBAR_CKBT)->setDisabled(true); - m_mpActions.value(WHEEL_UI_TOOLBAR_DEBUGUI)->setVisible(true); - m_mpActions.value(WHEEL_UI_TOOLBAR_DEBUGUI)->setDisabled(true); - m_mpActions.value(WHEEL_UI_TOOLBAR_MODELUI)->setDisabled(true); - m_mpActions.value(WHEEL_UI_TOOLBAR_MANAGER)->setVisible(false); - //m_mpActions.value(WHEEL_UI_TOOLBAR_DIAMER)->setDisabled(true); - } - else { - return false; - } - return true; -} - -bool ToolBarUi::ActionTrigger(class QAction* pAction, bool bChecked) -{ -// if (pAction->objectName() == WHEEL_UI_TOOLBAR_BKGD) { -// onChangeBackground(); -// return true; -// } - QString strName = pAction->objectName(); - //if (strName == WHEEL_UI_TOOLBAR_DIAMER) - { -// QDia2ThSetting m_dialog; -// m_dialog.SetValue(&m_pState->m_b, &m_pState->m_k); -// connect(&m_dialog, SIGNAL(sgSavePara()), this, SLOT(onSavePara())); -// m_dialog.exec(); -// int a = 0; - } -// if (pAction->objectName() == WHEEL_UI_TOOLBAR_ABOUT){ -// SlotAbout(); -// return true; -// } - QString strProp = pAction->property("wheel_prop_string_clicked_to_open_ui_file").toString(); - if (!strProp.isEmpty()) { - m_pUi->IExec(strProp); - } - else { - return false; - } - return true; -} - -void ToolBarUi::onChangeBackground() -{ - QFileDialog fileDialog; - fileDialog.setWindowTitle(tr("请选择您的背景图")); - fileDialog.setNameFilter("Picture(*.bmp *.jpg *.png)"); - fileDialog.setFileMode(QFileDialog::ExistingFiles); - if (fileDialog.exec() == QDialog::Accepted) - { - QStringList backgroundFile = fileDialog.selectedFiles(); - if (backgroundFile.size() > 0) - { - QString DstPath =m_pCtrl->appRoot() + "\\user\\background.png"; - QString sourcePath = backgroundFile.at(0); - DstPath.replace("\\", "/"); - if (sourcePath == DstPath){ - // //return; - // //return true; - } - if (!QFile::exists(sourcePath)){ - //return false; - } - QDir *createfile = new QDir; - bool exist = createfile->exists(DstPath); - if (exist){ - //if (converFileIfExist){ - createfile->remove(DstPath); - //} - } - if (!QFile::copy(sourcePath, DstPath)){ - //return false; - } - QMessageBox infobox(QMessageBox::Information, tr("提示"), tr("背景图更新完成，请重启本软件."), QMessageBox::Yes, NULL); - infobox.setWindowIcon(QIcon(":/image/leaper")); - infobox.setButtonText(QMessageBox::Yes, tr("确认")); - infobox.exec(); - } - } -} - -void ToolBarUi::readTxtFile() -{ -// QFile file(m_pCtrl->appRoot()+"\\user\\about.txt"); -// bool m_openFileFlags = false; -// if (!file.fileName().isEmpty()) -// { -// if (!file.open(QFile::ReadOnly | QIODevice::Text)) -// { -// m_openFileFlags = false; -// } -// else -// { -// m_openFileFlags = true; -// } -// -// if (file.size() > 1000) -// { -// ; -// } -// QByteArray line; -// QByteArray m_string; -// while (!file.atEnd()) -// { -// -// line = file.readLine(); -// m_string.append(line); -// } -// int m_size = file.size(); -// if (m_size <= 0) -// { -// m_openFileFlags = false; -// m_strContent = QString(DEFAULTTXT); -// } -// else -// m_strContent = QString::fromLocal8Bit(m_string); -// file.close(); -// } -// if (!m_openFileFlags) -// { -// file.open(QFile::ReadWrite | QIODevice::Text); -// file.write(QString(DEFAULTTXT).toLocal8Bit()); -// file.close(); -// } -} - - -void ToolBarUi::SlotAbout() -{ -// QString aboutString; -// QImage tiLogo(":/image/leaper"); -// QMessageBox mb; -// mb.setWindowFlags(Qt::Tool); -// mb.setWindowIcon(QIcon(":/image/leaper")); -// mb.setWindowTitle(tr("关于本软件")); -// -// aboutString = QString( -// "杭州利珀科技

" -// "

汽轮型号识别系统 版本. " APP_VERSION " 最后更新时间: " APP_LASTUPDATE "

" -// "

本软件由杭州利珀科技开发，用于汽轮型号分类检测." -// "杭州利珀科技有限公司是一家致力于机器视觉产品的研发、生产和销售的高科技公司." -// "若需要进一步了解杭州利珀的产品信息，请与我们联系或访问我们的网站:
" -// "www.hzleaper.com/" -// "

本软件简介.

" -// "

"DEFAULTTXT"

" -// "

版权 (c) 属 杭州利珀科技有限公司 所有

" -// "

联系人：

" -// "

%1

" -// ).arg(m_strContent); -// -// QPixmap pm = QPixmap::fromImage(tiLogo); -// if (!pm.isNull()) -// mb.setIconPixmap(pm.scaled(100,100)); -// mb.setText(aboutString); -// mb.addButton(QMessageBox::Ok); -// mb.setButtonText(QMessageBox::Ok, tr("确认")); -// mb.exec(); -} - -Q_SLOT void ToolBarUi::onSavePara() -{ - if (m_pState) - m_pState->save(); -} diff --git a/src/tpMain/ToolBarUi.h b/src/tpMain/ToolBarUi.h deleted file mode 100644 index aa7cf70..0000000 --- a/src/tpMain/ToolBarUi.h +++ /dev/null @@ -1,33 +0,0 @@ -#pragma once -#include "IWheelUi.h" -#include "qmap.h" -class ToolBarUi : - public IWheelUi -{ - Q_OBJECT -public: - ToolBarUi(const QString , class IWheelCtrl *, class IWheelUis* p = NULL); - ~ToolBarUi(); - virtual bool onPolished(QWidget*); - virtual bool ActionTrigger(class QAction* pAction, bool bChecked); - virtual bool onExec(); - virtual bool onUserRole(); - virtual bool onClose(){ return true; }; - void initToolBar(); - void onChangeBackground(); - void onInitAction(); - void SlotAbout(); - void readTxtFile(); - Q_SLOT void onSavePara(); -private: - class IWheelCtrl*m_pCtrl; - class IWheelUis* m_pUi; - class QToolBar *m_pToolBar; - class DetectState *m_pState; - //class QToolButton *m_pBtnTool; - //class QMenu* m_pMenu; - QMap m_mpActions; - - QString m_strContent; -}; - diff --git a/src/tpMain/WheelCtrl.cpp b/src/tpMain/WheelCtrl.cpp index 312d7b9..91a9845 100644 --- a/src/tpMain/WheelCtrl.cpp +++ b/src/tpMain/WheelCtrl.cpp @@ -31,8 +31,9 @@ WheelCtrl::WheelCtrl(QString strPath, QMySplashScreen* pScreen) m_pModelMgr = new ModelManager(strPath); m_pModelMgr->init(); ShowInitMsg(pScreen, tr("加载检测设置模块 ....")); - m_pState = new DetectState(strPath); - m_pState->init(); + + DetectState::instance()->init(strPath); + //m_db = new QSqliteApplication(strPath + "\\" + _QSQLITE_WHEELHUBWF_NAME); QString strDbPath = strPath + "\\" + _QSQLITE_WHEELHUBWF_NAME; ShowInitMsg(pScreen, tr("加载数据库 ....")); @@ -67,8 +68,6 @@ WheelCtrl::WheelCtrl(QString strPath, QMySplashScreen* pScreen) WheelCtrl::~WheelCtrl() { - - delete m_pState; delete m_pChannel; delete m_pModelMgr; delete m_db; @@ -79,7 +78,6 @@ WheelCtrl::~WheelCtrl() delete m_pNet; m_pNet = NULL; m_pTimeMgr = NULL; - m_pState = NULL; m_pChannel = NULL; m_pModelMgr = NULL; m_pComConfig = NULL; @@ -113,7 +111,7 @@ void WheelCtrl::loadLibRasterSDG20(QString strPath) m_pRasterSDG20 = func(strPath + "\\user\\raster.json"); //connect(m_pRasterSDG20, SIGNAL(sgThickness(double)), this, SIGNAL(onThickness(double))); m_pRasterSDG20->onStartSampling(); - m_pRasterSDG20->setDetectStatePtr(m_pState); + //m_pRasterSDG20->setDetectStatePtr(m_pState); } } @@ -153,11 +151,6 @@ QString WheelCtrl::appRoot() const return m_strPath; } -DetectState * WheelCtrl::getDetectState() const -{ - return m_pState; -} - void WheelCtrl::addLog(QString msg, int nType) { WarnMessage m_warning; @@ -209,8 +202,8 @@ bool WheelCtrl::onFinish() /*统计清零*/ bool WheelCtrl::onClear() { - getDetectState()->totalDetectNum = 0; - getDetectState()->totalUnDetectNum = 0; + DetectState::instance()->totalDetectNum = 0; + DetectState::instance()->totalUnDetectNum = 0; getModelMgr()->ClearAllCount(); return true; } diff --git a/src/tpMain/WheelCtrl.h b/src/tpMain/WheelCtrl.h index c6c3d89..cec8fc1 100644 --- a/src/tpMain/WheelCtrl.h +++ b/src/tpMain/WheelCtrl.h @@ -17,7 +17,6 @@ public: virtual ModelManager *getModelMgr() const; virtual QStringList getAllModelName(); virtual CChannelInfo *getChannelInfo() const; - virtual DetectState *getDetectState() const; virtual TimeMgrCtrl *getTimeMgr() const; virtual QMap* getAllTimePtr() const; virtual CamConfig *getCamConfig() const; @@ -58,7 +57,6 @@ signals: private: CChannelInfo *m_pChannel{ nullptr }; ModelManager *m_pModelMgr{ nullptr }; - DetectState *m_pState{ nullptr }; CRaster *m_pRaster{ nullptr }; QString m_strPath; //QSqliteGeneral *m_db; diff --git a/src/tpMain/WheelModel.cpp b/src/tpMain/WheelModel.cpp index 5a99ce9..6fbd915 100644 --- a/src/tpMain/WheelModel.cpp +++ b/src/tpMain/WheelModel.cpp @@ -156,7 +156,7 @@ int WheelModel::getRepeatNum() const //return m_nRotate; } -ImageCompareModel * WheelModel::getImageComModel() const +ICompareModel * WheelModel::getImageComModel() const { // if (!m_pDetectModel) // { @@ -165,7 +165,7 @@ ImageCompareModel * WheelModel::getImageComModel() const return m_pDetectModel; } -void WheelModel::setImageComModel(ImageCompareModel *p) +void WheelModel::setImageComModel(ICompareModel *p) { m_pDetectModel = p; } diff --git a/src/tpMain/WheelModel.h b/src/tpMain/WheelModel.h index 4e8ebee..b2c05f7 100644 --- a/src/tpMain/WheelModel.h +++ b/src/tpMain/WheelModel.h @@ -1,5 +1,6 @@ #pragma once #include "IWheelModel.h" +#include "ICompareModel.h" class WheelModel : public IWheelModel { public: @@ -31,8 +32,8 @@ public: virtual QString getPicPath() const; virtual void setPicPath(QString str); - virtual ImageCompareModel *getImageComModel() const; - virtual void setImageComModel(ImageCompareModel *); + virtual ICompareModel *getImageComModel() const; + virtual void setImageComModel(ICompareModel *); virtual TempImage *getTempImage() const; virtual int getImageModel()const; virtual int getImgCount() const; @@ -48,5 +49,5 @@ public: int m_nCount; class ChannelInfo *m_pChannelInfo; class TempImage *m_pTempImage; - class ImageCompareModel *m_pDetectModel; + class ICompareModel *m_pDetectModel; }; diff --git a/src/tpMain/WheelUis.cpp b/src/tpMain/WheelUis.cpp deleted file mode 100644 index a929b05..0000000 --- a/src/tpMain/WheelUis.cpp +++ /dev/null @@ -1,206 +0,0 @@ -#include "WheelUis.h" -#include "IWheelCtrl.h" -#include "HannelUI.h" -#include "ModelMgrUi.h" -#include "DevelopUi.h" -#include "ConnectModeUi.h" -#include "MainUi.h" -#include "timemgrui.h" -#include "StatusBarUi.h" -#include "ToolBarUi.h" -#include "WheelCtrl.h" -#include "WheelNet.h" -#include "QAction.h" -#include "..\ReportModel\reportmodel_global.h" -#include "QLibrary" -#pragma execution_character_set("utf-8") -//#define MGR -WheelUis::WheelUis(IWheelCtrl *pCtrl) - : m_pCtrl(pCtrl) -{ - m_mpUis.insert(WHEEL_UI_DEVELOP, new DevelopUi(WHEEL_UI_DEVELOP, m_pCtrl)); - m_mpUis.insert(WHEEL_UI_CHANNEL, new CHannelUI(WHEEL_UI_CHANNEL, m_pCtrl)); -// m_mpUis.insert(WHEEL_UI_MODELMGR, new ModelMgrUi(WHEEL_UI_MODELMGR, m_pCtrl)); - m_mpUis.insert(WHEEL_UI_CONMODE, new ConnectModeUi(WHEEL_UI_CONMODE, m_pCtrl)); - m_mpUis.insert(WHEEL_UI_MAINWINDOW, new MainUi(WHEEL_UI_MAINWINDOW, m_pCtrl)); - m_mpUis.insert(WHEEL_UI_TIMEMGR, new TimeMgrUi(WHEEL_UI_TIMEMGR, m_pCtrl)); - m_mpUis.insert(WHEEL_UI_STATUS, new StatusBarUi(WHEEL_UI_STATUS, m_pCtrl)); - m_mpUis.insert(WHEEL_UI_TOOL, new ToolBarUi(WHEEL_UI_TOOL, m_pCtrl, this)); - loadReportModel(); - - if (m_mpUis.contains(WHEEL_UI_DEVELOP)) - connect(m_mpUis.value(WHEEL_UI_DEVELOP), SIGNAL(sgGenalData(QVariant, QVariant)), this, SIGNAL(sgGenalData(QVariant, QVariant))); - if (m_mpUis.contains(WHEEL_UI_CHANNEL) && m_mpUis.contains(WHEEL_UI_MODELMGR)) - connect(m_mpUis.value(WHEEL_UI_MODELMGR), SIGNAL(sgGenalData(QVariant, QVariant)), m_mpUis.value(WHEEL_UI_CHANNEL), SIGNAL(sgGenalData(QVariant, QVariant))); - setup(); -} - -WheelUis::~WheelUis() -{ - qDeleteAll(m_mpUis); - m_mpUis.clear(); -} - -bool WheelUis::loadReportModel() -{ -#ifdef _DEBUG - QLibrary lib("ReportModeld"); -#else - QLibrary lib("ReportModel"); -#endif - if (lib.load()){ - _ReportModelCreate func = (_ReportModelCreate)lib.resolve("ReportModelCreate"); - IWheelUi *pCheckui = func(WHEEL_UI_CHECKDB,m_pCtrl); - m_mpUis.insert(WHEEL_UI_CHECKDB, pCheckui); - } - return true; -} - -bool WheelUis::OnPolished(QWidget * watched, class QEvent * event) -{ - bool bFlag = false; - for each (IWheelUi *var in m_mpUis) { - if (var && var->onPolished(watched)) { - //connect(var, SIGNAL(sgGenalData(QVariant, QVariant)), this, SIGNAL(sgGenalData(QVariant, QVariant))); - return true; - } - } - - return false; -} - -bool WheelUis::OnStateChanged(QObject* watched, int state) -{ - bool bFlag = false; - for each (IWheelUi *var in m_mpUis) { - if (var && var->onStateChanged(watched, state)) { - return true; - } - } - return false; -} - -bool WheelUis::processResult(Result2Ui*pResult) -{ - if (m_mpUis.contains(WHEEL_UI_MAINWINDOW)) { - ((MainUi*)m_mpUis.value(WHEEL_UI_MAINWINDOW))->showRes(pResult); - } - if (m_mpUis.contains(WHEEL_UI_DEVELOP)) { - ((DevelopUi*)m_mpUis.value(WHEEL_UI_DEVELOP))->onShowModel(pResult); - } - return true; -} - -Q_SLOT void WheelUis::onSwitchOnlineModel(int nMode) -{ - if (m_mpUis.contains(WHEEL_UI_CONMODE)) { - ((ConnectModeUi*)m_mpUis.value(WHEEL_UI_CONMODE))->onSwitchMode(nMode); - } -} - -bool WheelUis::exec(const QString strUi) -{ - if (m_mpUis.contains(strUi)) { - IWheelUi* pUI = m_mpUis.value(strUi); - if (pUI!=NULL) - pUI->onExec(); - } - else { - //临时 - WheelCtrl *p = (WheelCtrl*)m_pCtrl; - if (strUi == "qipconfigdlg") { - p->getNet()->onShowIpDlg(); - } - else if (strUi == "qrasterdlg") { - p->onShowRaster(); - //p->getRaster()->showRasterDlg(); - } - else { - return false; - } - } - return true; -} - -bool WheelUis::onRegister(const QString) -{ - return true; -} - -bool WheelUis::onClose(const QString str /*= QString()*/) -{ - if (str.isEmpty()) { - for each (IWheelUi *var in m_mpUis) { - var->onClose(); - } - } - else { - if (m_mpUis.contains(str)) { - m_mpUis.value(str)->onClose(); - } - else { - return false; - } - } - return true; -} - -bool WheelUis::setup() -{ - return true; -} - -bool WheelUis::onUserRole(const QString str) -{ - if (str.isEmpty()) { - for each (IWheelUi* var in m_mpUis) { - var->onUserRole(); - } - } - else { - if (m_mpUis.contains(str)) { - m_mpUis.value(str)->onUserRole(); - } - else { - return false; - } - } - return true; -} - -bool WheelUis::IExec(const QString& strUi) -{ - return exec(strUi); -} - -bool WheelUis::ActionTrigger(class QAction* pAction, bool bChecked) -{ -// if ("main_toolbar_action_sendmodels" == pAction->objectName()) { -//// WheelCtrl* m_pWheelCtrl = (WheelCtrl*)m_pCtrl; -//// m_pWheelCtrl->getNet()->sendClearLib(); -// return true; -// } - - bool bFlag = false; - for each (IWheelUi *var in m_mpUis) { - if (var && var->ActionTrigger(pAction, bChecked)) { - return true; - } - } - return false; -} - -Q_SLOT void WheelUis::onStartDetect() -{ - if (m_mpUis.contains(WHEEL_UI_MAINWINDOW)) { - ((MainUi*)m_mpUis.value(WHEEL_UI_MAINWINDOW))->onStartDetect(); - } -} - -IWheelUi * WheelUis::getItemWidget(QString strKey) -{ - if (m_mpUis.contains(strKey)) - return m_mpUis.value(strKey); - else - return NULL; -} diff --git a/src/tpMain/WheelUis.h b/src/tpMain/WheelUis.h deleted file mode 100644 index c08f0cd..0000000 --- a/src/tpMain/WheelUis.h +++ /dev/null @@ -1,46 +0,0 @@ -#pragma once -#include "qmap.h" -#include "IWheelUis.h" -#include "IWheelUi.h" - -const QString c_strUiName[10] = { "" }; -#define WHEEL_UI_DEVELOP "DebugUI" -#define WHEEL_UI_CHANNEL "Channel" -#define WHEEL_UI_MODELMGR "QWfModelManage" -#define WHEEL_UI_CONMODE "ModelUI" -//#define WHEEL_UI_CONMODE "WorkMgr" -#define WHEEL_UI_MAINWINDOW "mainWindow" -#define WHEEL_UI_TIMEMGR "TimeMgr" -#define WHEEL_UI_STATUS "StatusBar" -#define WHEEL_UI_TOOL "ToolBar" -#define WHEEL_UI_CHECKDB "qformcheckdlg" -class IWheelCtrl; -class IWheelUi; -class WheelUis : public IWheelUis -{ - Q_OBJECT -public: - WheelUis(IWheelCtrl *pCtrl); - ~WheelUis(); - virtual bool IExec(const QString&); - //channel - virtual bool OnPolished(QWidget * watched, class QEvent * event); - virtual bool OnStateChanged(QObject* watched, int state); - virtual bool ActionTrigger(class QAction* pAction, bool bChecked); - virtual bool exec(const QString); - virtual bool onClose(const QString str = QString()); - virtual bool onRegister(const QString); - virtual bool onUserRole(const QString str = QString()); - bool processResult(class Result2Ui*pResult); - Q_SLOT void onSwitchOnlineModel(int nMode); - Q_SLOT virtual void onStartDetect(); - IWheelUi *getItemWidget(QString strKey); -private: - bool setup(); - bool loadReportModel(); -private: - QMap m_mpUis; -private: - IWheelCtrl *m_pCtrl; -}; - diff --git a/src/tpMain/lpsingleton.h b/src/tpMain/lpsingleton.h new file mode 100644 index 0000000..43c815f --- /dev/null +++ b/src/tpMain/lpsingleton.h @@ -0,0 +1,54 @@ +#ifndef _H_LPSINGLETON_H_ +#define _H_LPSINGLETON_H_ + +#include +#include + +template +class lpsingleton +{ +public: + static T* instance() + { + T *sin = s_this.load(std::memory_order_acquire); + + if (!sin) { + std::lock_guard locker(s_mutex); + sin = s_this.load(std::memory_order_relaxed); + if (!sin) { + sin = new T; + s_this.store(sin, std::memory_order_release); + } + } + + return sin; + } + + static void uninstance() + { + T *sin = s_this.load(std::memory_order_relaxed); + if (sin) { + std::lock_guard locker(s_mutex); + delete sin; + sin = nullptr; + } + } + +protected: + lpsingleton() = default; + virtual ~lpsingleton() = default; +private: + lpsingleton(const T&) = delete; + T& operator=(const T&) = delete; + + static std::atomic s_this; + static std::mutex s_mutex; +}; + +template +std::atomic lpsingleton::s_this; + +template +std::mutex lpsingleton::s_mutex; + +#endif \ No newline at end of file diff --git a/src/tpMain/qmainfilter_wheeldetect.cpp b/src/tpMain/qmainfilter_wheeldetect.cpp deleted file mode 100644 index ce4977a..0000000 --- a/src/tpMain/qmainfilter_wheeldetect.cpp +++ /dev/null @@ -1,72 +0,0 @@ -#include "qmainfilter_wheeldetect.h" -#include "QZkJsonParser.h" -#include "HubBase.h" -#include "InfoFile.h" -#include "qtablewidget.h" -#include "qmessagebox.h" -#include "QApplication" -//#include "qcustomtime.h" - -#pragma execution_character_set("utf-8") - -QMainFilter_WheelDetect::QMainFilter_WheelDetect() -{ -} - -QMainFilter_WheelDetect::~QMainFilter_WheelDetect() -{ -} - - -bool QMainFilter_WheelDetect::OnInitMainWindow(QObject * watched) -{ - //!>读取串口数据 - QString fileComFile = QApplication::applicationDirPath() + JSON_FILE_COM; - QJsonObject jsUser = QZkJsonParser::ReadJsonAuto(fileComFile); - QVariantMap mt = jsUser.value("COM").toArray().toVariantList().at(0).toMap(); - m_commName = mt.value("name").toString().toUtf8(); - return true; -} - -bool QMainFilter_WheelDetect::ButtonClicked(class QObject* pButton, bool bChecked) -{ - if ("wf_model_modefy_button" == pButton->objectName()) - { - QString szModel; - QString szdiameter; - QString szply; - QVariant vId; -// if (tpfunc_get_lineedit_text(szModel, gpCallback, WF_LINEEDIT_MODEL, pButton->parent()) && -// tpfunc_get_combobox_current_data(vId, gpCallback, WF_COMBOBOX_CHANNELS, pButton->parent()) && -// tpfunc_get_lineedit_text(szdiameter, gpCallback, "wf_model_edit_diameter", pButton->parent()) && -// tpfunc_get_lineedit_text(szply, gpCallback, "wf_model_edit_height", pButton->parent())) -// { -// if (szModel.isEmpty() || szdiameter.isEmpty() || szply.isEmpty()) -// { -// QMessageBox infoBox(QMessageBox::Warning,tr("提示"), tr("输入的信息不能为空！！！"), QMessageBox::Yes,NULL); -// infoBox.setWindowIcon(QIcon(":/image/leaper")); -// infoBox.exec(); -// return false; -// } -// } - } - - return true; -} - -void QMainFilter_WheelDetect::swapData(SComframe &frame) -{ -// frame.data1 = SWAP_WORD(frame.data1); -// frame.data2 = SWAP_WORD(frame.data2); -// frame.data3 = SWAP_WORD(frame.data3); -// frame.data4 = SWAP_WORD(frame.data4); -// frame.data5 = SWAP_WORD(frame.data5); -// frame.data6 = SWAP_WORD(frame.data6); -// frame.data7 = SWAP_WORD(frame.data7); -// frame.data8 = SWAP_WORD(frame.data8); -} - -QVariant QMainFilter_WheelDetect::IGetVariantById(int id) -{ - return QVariant(); -} diff --git a/src/tpMain/qmainfilter_wheeldetect.h b/src/tpMain/qmainfilter_wheeldetect.h deleted file mode 100644 index 6fa0869..0000000 --- a/src/tpMain/qmainfilter_wheeldetect.h +++ /dev/null @@ -1,60 +0,0 @@ -#ifndef QMAINFILTER_WHEELDETECT_H -#define QMAINFILTER_WHEELDETECT_H -#include -#define SHARED_KEY_MODELS "models" -#define WF_TREEWIDGET_CHANNELS "wf_channels" -#define WF_TABELWIDGET_MODELS_1 "wf_models_table1" -#define WF_TABELWIDGET_MODELS_2 "wf_models_table2" -#define WF_TABELWIDGET_MODELS_3 "wf_models_table3" -#define WF_TABELWIDGET_MODELS_4 "wf_models_table4" - -#define WF_COMBOBOX_CHANNELS "wf_channels_combobox" -#define WF_LINEEDIT_MODEL "wf_model_edit" -#define WF_PUSHBUTTON_MODEL_ADD "wf_model_add_button" -#define WF_WIDGET_CHANNELS "wf_channels_widget" -#define WF_GROUPBOX_CHANNEL_PREFIX "wf_channel_group_" // + channel_id [1|2|3...] -#define WF_LISTWIDGET_MODEL_PREFIX "wf_model_list_" - -#define JSONG_MYSELF_FILE "\\user\\selfdefine.json" -#define JSON_FILE "\\user\\channels.json" -#define JSON_FILE_WHEEL "\\user\\whellHub.json" -#define JSON_FILE_CAMERA "\\config\\camera.json" -#define JSON_FILE_COM "\\config\\communicate.json" - -#define JSON_PATTERN_MODELS "\\Models"//!>缩略图保存位置 -#define JSON_PATTERN_WHEEL "\\whellHub.json"//!>模型数据文件 -#define JSON_PATTERN_TEMPLATE "\\template" - -#define JSON_KEY_CHANNELS "channels" -#define JSON_KEY_CHANNEL_MODELS "models" -#define _PRE_WF_MODEL_TABLE_ "wf_models_table" - -struct SComframe{/*用于数据发送的结构体*/ - quint16 data1; - quint16 data2; - quint16 data3; - quint16 data4; - quint16 data5; - quint16 data6; - quint16 data7; - quint16 data8; - SComframe(){ data1 = data2 = data3 = data4 = data5 = data6 = data7 = data8 = 0; }; -}; - -class QMainFilter_WheelDetect : public QObject -{ - Q_OBJECT - -public: - QMainFilter_WheelDetect(); - ~QMainFilter_WheelDetect(); - /*继承*/ - virtual bool OnInitMainWindow(QObject * watched);//系统窗口初始化 - virtual bool ButtonClicked(class QObject* pButton, bool bChecked);//UI界面按钮点击事件设置 - virtual QVariant IGetVariantById(int id); -public: - void swapData(SComframe &frame); - QString m_commName; -}; - -#endif // QMAINFILTER_WHEELDETECT_H diff --git a/src/tpMain/qmainfilter_wheeldetect_child.cpp b/src/tpMain/qmainfilter_wheeldetect_child.cpp deleted file mode 100644 index 92ac09a..0000000 --- a/src/tpMain/qmainfilter_wheeldetect_child.cpp +++ /dev/null @@ -1,1426 +0,0 @@ -#include "qmainfilter_wheeldetect_child.h" -#include "QZkJsonParser.h" -#include -#include "InfoFile.h" -#include "WheelNet.h" -#include "qtextbrowser.h" -#include "qtextdocument.h" -#include "HubBase.h" -#include "qmythread.h" -#include "IWheelModel.h" -#include "ModelManager.h" -#include "DetectState.h" -#include "ModelTableView.h" -#include "WheelCtrl.h" -#include "WheelUis.h" -#include "Result2Ui.h" -#include "qdialog.h" -#include "InfoFile.h" - -#include "ChannelInfo.h" -#include "..\RasterSDG20\rastersdg20_global.h" -#include "qpulpewidget.h" -#include "QMainWindow" -#include "qmysplashscreen.h" -#include "QProcess" -#include "QApplication" -#include "..\NetWheel\qnettcpserver.h" -#include "qnettickthread.h" -#include "QToolBar" -#include -#include -#include "QLibrary" -#include "QCoreApplication" -#include -#pragma execution_character_set("utf-8") - -QMainFilter_WheelDetect_Child::QMainFilter_WheelDetect_Child() - : QMainFilter_WheelDetect(), - m_nWfThress(0), - m_TimerOutCount(0), - m_TimerID(0), - m_RestartServerCount(0), - m_IsDetected(0), - m_nDiffTrigNum(0), - pTickThread(NULL) -{ - //SetLanguage("English"); -// QSettings languageSetting("hubdetect.ini", QSettings::IniFormat); -// QString strLangeage = languageSetting.value("language", "Chinese").toString(); -// SetLanguage(strLangeage); - - QMySplashScreen m_screen; - m_screen.show(); - m_pw = NULL; - qRegisterMetaType("TimeStruct"); - m_screen.ShowMsg(tr("加载必要模块.....")); - //m_screen.ShowMsg("加载所有模板库....."); - m_pCtrl = new WheelCtrl(QCoreApplication::applicationDirPath(),&m_screen); - qDebug() << "create whellCtrl end"; - m_screen.ShowMsg(tr("初始化UI.....")); - - m_pUi = new WheelUis(m_pCtrl); - - qDebug() << "create WheelUis end"; - connect(m_pUi, SIGNAL(sgGenalData(QVariant, QVariant)), this, SLOT(onGetUiValue(QVariant, QVariant))); - m_pState = m_pCtrl->getDetectState(); - m_pNet = NULL; - m_screen.ShowMsg(tr("绑定信号槽信息...")); - connect(this, SIGNAL(sgTickTsk()), this, SLOT(onPulseTimer())); - connect(&m_PulseTimer, SIGNAL(timeout()), this, SLOT(onPulseTimer()));//心跳包 - connect(&m_wfPulseTimer, SIGNAL(timeout()), this, SLOT(onwfPulseTimer()));//心跳包 - connect(&m_ThicknessTimer, SIGNAL(timeout()), this, SLOT(onThicknessTimer()));// 厚度查询 - connect(&m_ReadLibTimer, SIGNAL(timeout()), this, SLOT(onSendReadOnlineLib())); - - connect(this, SIGNAL(sgShowMsg(QString, bool)), this, SLOT(onTcpConnet(QString, bool))); - connect(this, SIGNAL(sgTaskSendModels(int, QString, double, double)), this, SLOT(onTaskSendModels(int, QString, double, double)));//用于发送莫板库 - connect(this, SIGNAL(sgTskSendDetectState(int, QString, int)), this, SLOT(onTaskSendDetectState(int, QString, int)));//离线检测发送 用于发送检测状态 - connect(this, SIGNAL(sgTskSendCheck(int, int,QString)), this, SLOT(onTaskCheck(int,int, QString)));//在线检测状态查询 用于查询线程 - connect(this, SIGNAL(sgCheckEnd()), this, SLOT(onCheckEnd())); - connect(this, SIGNAL(sgShowImgState(QString)), this, SLOT(onShowImgState(QString))); - connect(this, SIGNAL(sgGetImg()), this, SLOT(onGetImg())); - connect(this, SIGNAL(sgShowMsgdlg(QString)), this, SLOT(onShowMsg(QString))); - m_screen.ShowMsg(tr("创建线程...")); - { - /*发送模板库线程*/ - qDebug() << "create SendModelLibTak Thread"; - SendModelLibTask = new QMyThread(); - SendModelLibTask->setUser(true); - SendModelLibTask->loadfunc(this, &QMainFilter_WheelDetect_Child::SendModelKuTskFun); - - qDebug() << "create SendTiskTsk Thread"; - SendTiskTsk = new QMyThread(); - SendTiskTsk->loadfunc(this, &QMainFilter_WheelDetect_Child::SendTickTskFun); - } - m_screen.ShowMsg(tr("系统初始化完成...")); - - pWorkCtrl = new QWorkMgrCtlr(m_pCtrl); - pWorkCtrl->readManageFile(); - pworkUI = new QWorkMgrUI(pWorkCtrl, m_pCtrl); - pworkUI->InitUI(); - connect(pworkUI, SIGNAL(sgUpdatedefect()), this, SLOT(onUpdateDefect())); - - //userctrel -#ifdef _DEBUG - QLibrary lib("QUserInfod"); -#else - QLibrary lib("QUserInfo"); -#endif - _UserCtrlCreate func = (_UserCtrlCreate)lib.resolve("UserCtrlCreate"); - if (func){ - m_pUserCtrl = func(); - connect(m_pUserCtrl, SIGNAL(sgCurrentUserInfo(QString, int, int)), this, SLOT(onLogInOut(QString, int, int))); - } - -} - -QMainFilter_WheelDetect_Child::~QMainFilter_WheelDetect_Child() -{ - m_timer.stop(); - if (m_VecTranPtr.size() > 0){ - while(m_VecTranPtr.size()){ - QTranslator *pTrans = m_VecTranPtr.takeFirst(); - qApp->removeTranslator(pTrans); - delete pTrans; - } - } - if (m_pUserCtrl){ - delete m_pUserCtrl; - m_pUserCtrl = NULL; - } - if (pworkUI){ - delete pworkUI; - pworkUI = NULL; - } - if (pWorkCtrl){ - delete pWorkCtrl; - pWorkCtrl = NULL; - } - - m_pState->IsDetect = false; - //emit(sgTickTsk()); - - - QString str = QString(tr("程序退出,所有数据清零,服务器关闭,断开所有连接.")); - m_pCtrl->addLog(m_pCtrl->getUserName() + ":" + str, emTypeRunState); - if (m_IsDetected > 0)//如果还有图像在算法中进行检测，执行相关自杀程序 - { - // QEventLoop eventloop; - // connect(this, SIGNAL(sgFinish()), &eventloop, SLOT(quit())); - // eventloop.exec(); - onProcessKillSelf();//自杀进程 - } - 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_pUi) - { - delete m_pUi; - m_pUi = NULL; - } - if (m_pCtrl) - { - delete m_pCtrl; - m_pCtrl = NULL; - m_pNet = NULL; - m_pState = NULL; - } - if (m_pw){ - delete m_pw; - m_pw = NULL; - } -// if (_pdarkStyle) -// { -// delete _pdarkStyle; -// _pdarkStyle = NULL; -// } - //onProcessKillSelf(); -} - -int QMainFilter_WheelDetect_Child::InitMain() -{ -// QMainFilter_WheelDetect::InitMain(); -// QSubFilterStationSetting *pStation = new QSubFilterStationSetting(m_pCoreCtrl); -// mSubFilters.append(pStation); -// -// gpCallback->IGetWidget(WHEEL_UI_DEVELOP); -// gpCallback->IGetWidget(WHEEL_UI_CONMODE); -// gpCallback->IGetWidget(WHEEL_UI_MODELMGR); -// gpCallback->IGetWidget(WHEEL_UI_TIMEMGR); -// gpCallback->IGetWidget(WHEEL_UI_CHECKDB); -// gpCallback->IGetWidget("StationSetting"); - return 1; -} - -bool QMainFilter_WheelDetect_Child::OnInitMainWindow(QObject * watched) -{ - QMainFilter_WheelDetect::OnInitMainWindow(watched); -// forDefectList = pWorkCtrl->getItem() - - 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(sgLibRev(bool)), SendModelLibTask, SLOT(WaitSingleIn(bool)));//xy lib - 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(this, SIGNAL(sgSendDisLib(int, QString)), this, SLOT(onSendDisLib(int, QString))); - connect(this, SIGNAL(sgSendDisLibDone()), this, SLOT(onSendDisLibDone())); - connect(m_pNet, SIGNAL(sgReadDetectState(int, QString)), this, SLOT(onReadDetectState(int, QString))); - connect(m_pNet, SIGNAL(sgReadDetectStateASK()), this, SLOT(onReadDetectStateASK())); - connect(m_pNet, SIGNAL(sgChangeOnlineState(int)), m_pUi, SLOT(onSwitchOnlineModel(int)));//强制在线 离线 - 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(this, SIGNAL(sgShowChannelRes(QString)), this, SLOT(onShowChannel(QString))); - QTimer::singleShot(500, m_pNet, SLOT(onOpenServer()));//延迟2s打开网络TCP服务 - - /*启动之后就一直发送心跳包和厚度查询*/ - if (m_pState->m_AutoSendTick2Net) - { - SendTiskTsk->setSleepTime(1000); - SendTiskTsk->start(); - } - - if (m_pState->m_StartAndDetect == 1)//m_sysType 表示万丰科技的 - { -// m_timerDetect.setSingleShot(true); -// connect(&m_timerDetect, SIGNAL(timeout()), m_pUi, SLOT(onStartDetect())); -// m_timerDetect.start(5000); - QTimer::singleShot(1000, m_pUi, SLOT(onStartDetect())); -// QTimer::singleShot(3000, [&](){ -// m_pState->bLockDetect = true; -// m_pCtrl->onStart(); -// }); - } - if (m_pState->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(); - - -// QStringList camKeys = gpTpCoreCtrl->ICameraKeys(); -// for (QStringList::iterator it = camKeys.begin(); it != camKeys.end(); ++it) -// { -// TP_CAMERA_OPTION camOpt; -// if (!gpTpCoreCtrl->ICameraOptionByKey(*it, camOpt)){ -// continue; -// } -// szCamKey = camOpt.uniqueName; -// } -// { -// QStringList strList = gpTpCoreCtrl->ICameraKeys(); -// for (int nIndex = 0; nIndex < strList.size(); nIndex++) -// { -// QString strkeyCam = strList.at(nIndex); -// TP_CAMERA_OPTION optCam; -// gpTpCoreCtrl->ICameraOptionByKey(strkeyCam, optCam); -// if (optCam.status != TP_CAMERA_STATUS_OPENED&&optCam.status != TP_CAMERA_STATUS_STARTED) -// { -// gpTpCoreCtrl->IOpenCamera(strkeyCam); -// gpTpCoreCtrl->IStartCamera(strkeyCam); -// } -// } -// } - - return false; -} - -Q_SLOT void QMainFilter_WheelDetect_Child::onServerState(QString Addr, int port, bool m_state) -{ - QString str; - if (m_state== true) - str = QString(tr("已打开")); - else - str = QString(tr("已关闭")); - QString strMsg = QString("serverIP %1 port %2 %3.").arg(Addr).arg(port).arg(str); - m_pCtrl->addLog(m_pCtrl->getUserName() + ":" + strMsg, emTypeRunState); -} - -Q_SLOT void QMainFilter_WheelDetect_Child::onDetectStateRecv(int nIndex, int value) -{ - nIndex -= 1; - QMap *ptr = m_pCtrl->getAllModelMapPtr(); - if (ptr) { - QList lst = ptr->keys(); - if (nIndex < lst.size() && nIndex >= 0) { - IWheelModel*pModel = ptr->value(lst.at(nIndex)); - pModel->setDetectState(value); - emit(m_pCtrl->sgModelChanged(lst.at(nIndex))); - } - else { - qDebug() << "rev detect state, index big than lst size"; - } - } -} - -Q_SLOT void QMainFilter_WheelDetect_Child::onModel2PLCInitDone() -{ - if(m_pNet) - m_pNet->sendModelInitDone(); -} - -Q_SLOT void QMainFilter_WheelDetect_Child::onClearLibRev(bool state) -{ - /*接收到库清空应答*/ - if (SendModelLibTask){ - if (SendModelLibTask->isRunning()) - SendModelLibTask->stop(); - if (m_pNet) - m_pNet->sendModelNum(m_pCtrl->getAllModelMapPtr()->size()); - SendModelLibTask->start(); - } -} - -/*在线状态，获取PLC发上来的数据，并进行更新显示的数据*/ -void QMainFilter_WheelDetect_Child::onCheckEnd() -{ - static bool change = false; - int a = 1; -} - -Q_SLOT void QMainFilter_WheelDetect_Child::onSendClearLib2PLC() -{ - if (m_pNet) - m_pNet->sendClearLib(); -} - -Q_SLOT void QMainFilter_WheelDetect_Child::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 == m_pState->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); -} - -bool QMainFilter_WheelDetect_Child::ButtonClicked(class QObject* pButton, bool bChecked) -{ - QMainFilter_WheelDetect::ButtonClicked(pButton, bChecked); - QAbstractButton* pBtn = qobject_cast(pButton); - QString str = QString(); - if ("tp_button_manage" == pButton->objectName()) { - m_pUi->exec(WHEEL_UI_MODELMGR); - str = m_pCtrl->getUserName() + ":" + QString(tr("按下了模板管理按钮")); - - //close(); - } - else if ("pushButton_Raster" == pButton->objectName()) - { - str = m_pCtrl->getUserName() + ":" + QString(tr("按下了光栅标定按钮")); - } - else if ("pushButton_Server" == pButton->objectName()) - { - if (m_pNet) - m_pNet->onShowIpDlg(); - str = m_pCtrl->getUserName() + ":" + QString(tr("按下了IP设置按钮")); - } - else if ("pushButton_SendModel" == pButton->objectName()) - { - if(m_pNet) - m_pNet->sendClearLib(); - QString str = m_pCtrl->getUserName() + ":" + QString(tr("按下了发送模板库按钮")); - - } - else if ("CM_SetModel_button" == pButton->objectName()) - { - str = m_pCtrl->getUserName() + ":" + QString(tr("按下了设置生效按钮")); - /* 设置生效按钮*/ - onSendClearDisModel(); - } - else if ("Dlp_StartDetect_button" == pButton->objectName()) - { - QPushButton *m_pBtnDetect = (QPushButton *)pButton; - if (m_pState->m_startDetectFlags == false) - { - m_pBtnDetect->setText(tr("停止虚拟检测")); - connect(&m_timer, SIGNAL(timeout()), this, SLOT(Sumulate())); - if (m_pState->m_Visural_Time > 0){ - m_timer.start(m_pState->m_Visural_Time); - } - else - { - m_pState->m_Visural_Time = 1000; - m_timer.start(m_pState->m_Visural_Time); - } - } - else - { - m_pBtnDetect->setText(tr("开始虚拟检测")); - m_timer.stop(); - } - m_pState->m_startDetectFlags = 1 - m_pState->m_startDetectFlags; - } - else if ("Debug_RedBeeTest" == pButton->objectName()){//红灯测试按钮 - SendResultBee(LIGHT_REDBEE, 1); - } - else if ("Debug_GreenBeeTest" == pButton->objectName()){ - SendResultBee(LIGHT_GREENBEE, 1); - } - else if ("Debug_YellowBeeTest" == pButton->objectName()){ - SendResultBee(LIGHT_YELLOWBEE, 1); - } - else if ("Debug_BeeTest" == pButton->objectName()){ - SendResultBee(LIGHT_BEE, 1); - } - else if ("Dlp_Next_button" == pButton->objectName()||"Dlp_Next_button_2" == pButton->objectName()){ -// CC_Action(CC_AC_NEXT); -// CC_Action(CC_AC_STOP); - trigerCamera(); - -// gpTpCoreCtrl->IStopCamera(szCamKey); -/* gpTpCoreCtrl->ISetTriggerMode(szCamKey, DEV_TRIGGER_MODE_OUT);*/ -/* gpTpCoreCtrl->IStartCamera(szCamKey);*/ - } -// if (TP_OBJ_NAME_PUSHBUTTON_NEXT == pButton->objectName()) -// { -// trigerCamera(); -// } - if (!str.isEmpty()) - m_pCtrl->addLog(str, emTypeUseState); - - else if (pButton->objectName() == "main_btn_start_detect"){ - //QTimer::singleShot(3000, [&](){m_pState->bLockDetect = true; }); - } - return true; -} - -void QMainFilter_WheelDetect_Child::onSetModel() -{ - /* - 重新加载模板 - 重新设置模板到算法中使用 - */ - forDefectList = pWorkCtrl->getDefectList(); - IWheelUi *pMainWidget = m_pUi->getItemWidget(WHEEL_UI_MAINWINDOW); - if (pMainWidget){ - pMainWidget->setViewList(forDefectList); - } -// -// gpTpCoreCtrl->ISetAlgorithmShared("modelMap", (int)address); -// QVariant filepath = QVariant(QCoreApplication::applicationDirPath()); -// gpTpCoreCtrl->ISetAlgorithmShared("filepath", filepath); -// -// -// gpTpCoreCtrl->ISetAlgorithmShared("defectList", (int)pdefectList); - -} - -void QMainFilter_WheelDetect_Child::VariantMapToUI(const QString camKey, const QVariantMap vMap) -{ - //return; - qWarning() << "Alg result send result:" << "(" << QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss zzz") << ")"; - qDebug() << "result start"; - emit(sgShowImgState(tr("显示识别结果"))); - if (vMap.contains("error")) - { - emit(sgShowMsgdlg(tr("相机图像和背景图不一样，请更换检测背景！"))); - return; - } - Result2Ui *pResult = (Result2Ui*)vMap.value("result").toInt(); - m_pUi->processResult(pResult); - static int ErrorNum = 0; - if (m_pNet){ - if (pResult->m_strModel=="NG") { - //m_pNet->sendLight(0, 1, 1000, 10);//红灯 - - SendResultBee(LIGHT_REDBEE, 1); - SendResultBee(LIGHT_BEE, 1); - ErrorNum++; - } - else { - //m_pNet->sendLight(2, 1, 1000, 100); - SendResultBee(LIGHT_GREENBEE, 1); - ErrorNum=0; - } - if (ErrorNum >= 3) { - QString str = tr("警告!!!连续出现%1个未识别型号").arg(ErrorNum); - if (m_pState->IsDetect == false) - str += tr(",未开启检测功能造成的"); - m_pCtrl->addLog(str, emTypeWaring); - //m_pNet->sendLight(0, 1, 2000, 100); - //m_pNet->sendLight(3, 1, 3000, 100); - SendResultBee(LIGHT_REDBEE, 3); - SendResultBee(LIGHT_BEE, 3); - } - } - if (m_pState->m_SendDetectStr2Net) - SendResultStr2PLC(pResult);//发送检测结果字符到PLC - if (m_pState->m_SendChannelRes2COM) - SendResultChannelCOM(pResult);//发送检测结果通道到串口 - if (m_pState->m_SendChannelRes2Net) - SendResultChannel2PLC(pResult);//发送检测结果通道到PLC - - m_pCtrl->saveResult(pResult); - - delete pResult; - qDebug() << "result finish"; - - m_IsDetected--; - if (m_IsDetected <= 0) - { - m_IsDetected = 0; - //emit(sgFinish()); - } -} - - -Q_SLOT void QMainFilter_WheelDetect_Child::Sumulate() -{ - //CC_Action(CC_AC_NEXT); - trigerCamera(); -} - -bool QMainFilter_WheelDetect_Child::OnStateChanged(QObject* watched, int state) -{ - //QMainFilter_WheelDetect::OnStateChanged(watched, state); - return m_pUi->OnStateChanged(watched, state); -} - -/* 从此处获得厚度值并传送值算法区*/ -QVariant QMainFilter_WheelDetect_Child::IGetVariantById(int id) -{ - m_IsDetected++; - m_nDiffTrigNum--;//进入到这里 表示获取到了图片 - - qWarning() << "Alg get An Image:" << "(" << QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss zzz") << ")"; - emit(sgShowImgState(tr("获得图像,正在计算中..."))); - emit(sgGetImg()); - qDebug() << "get one Pic ,id=" << id ; - if (m_pState->m_showThressList==1){ - QString str = m_pCtrl->getThicknessStr(); - emit(sgShowMsg(str, true)); - } - QVariantMap vMap; - int nThickness = 0; - if (m_pState->m_IsUseRaster == 0) - nThickness = m_nWfThress; - else - nThickness = m_pCtrl->getThickness();// m_houduVec.first(); - //nThickness = 209; - vMap.insert("thickness", QVariant(nThickness)); - double dDiameter;// = (-794.25 * nThickness / 1000000.0 + 0.775960); - dDiameter = (m_pState->m_k * nThickness + m_pState->m_b); - vMap.insert("d2h", dDiameter); - vMap.insert("useThickness", m_pState->bUseThickness); - vMap.insert("useDiameter", m_pState->bUseDiameter); - vMap.insert("Threshold", m_pState->m_AlgThres); - vMap.insert("IsCutImg", m_pState->m_UseCutImg); - qDebug() << "end get one pic" << id; - if (m_pState->m_showThressValue==1){ - QString str = QString("thickness value = %1,dDiameter value = %2").arg(nThickness).arg(dDiameter); - emit(sgShowMsg(str, true)); - } - return vMap; -} - -Q_SLOT void QMainFilter_WheelDetect_Child::onGetImg() -{ -// QLabel *m_pLbResPic = GET_WIDGET_POINTER("main_lb_res_model_pic", QLabel); -// if (m_pLbResPic) -// m_pLbResPic->setStyleSheet(QString("QLabel{border: 1px solid rgb(0,0,0,250);background-color: rgb(200, 200, 200);}")); -} - -Q_SLOT void QMainFilter_WheelDetect_Child::onPulseTimer() -{ - //心跳包发送 - if (m_pNet) - { - m_pNet->sendPulse(6000, m_pState->IsDetect, m_pState->IsOnline); - //m_TimerID = startTimer(500); - } -} - -Q_SLOT void QMainFilter_WheelDetect_Child::onThicknessTimer() -{ - //查询厚度 - if (m_pNet) - m_pNet->sendThickness(); -} - -Q_SLOT void QMainFilter_WheelDetect_Child::onTaskSendModels(int nIndex, QString strModel, double dDiameter, double dHeight) -{ - if (m_pNet) - m_pNet->sendModelList(nIndex, strModel, dDiameter, dHeight); -} - -Q_SLOT void QMainFilter_WheelDetect_Child::onTaskSendDetectState(int nIndex, QString strModel,int IsState) -{ - if (m_pNet) - m_pNet->sendDeteStateList(nIndex, IsState, strModel); -} - -Q_SLOT void QMainFilter_WheelDetect_Child::onTaskCheck(int nIndex, int IsState,QString strModel) -{ - if (m_pNet) - m_pNet->sendCheckDeteStateList(nIndex, IsState, strModel); -} - -void QMainFilter_WheelDetect_Child::SendModelKuTskFun() -{ - /* - 发送模板库线程 - 把已有的所有模板库全部发送至PLC中 - */ - m_pState->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(m_pState->m_ThreadWaitTime); - if (!b) { - nError++; - if (m_pState->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("模板库发送完成"))); - -} - -Q_SLOT void QMainFilter_WheelDetect_Child::onTcpContent(const QString & strContent) -{ -// QLabel *label_test = GET_WIDGET_POINTER("label_TCP_State", QLabel); -// label_test->setText(strContent); -} - -Q_SLOT void QMainFilter_WheelDetect_Child::onTcpRecv(const QString & strRecv) -{ -// QLabel *label_test = GET_WIDGET_POINTER("label_15", QLabel); -// label_test->setText(strRecv); -} - -Q_SLOT void QMainFilter_WheelDetect_Child::onThickness(double dValue) -{ - m_pCtrl->appendThicknessValue(dValue); -} - -Q_SLOT void QMainFilter_WheelDetect_Child::onTcpConnet(QString str, bool bConnect) -{ - static bool nTcpConnetSetting = true; - QTextBrowser *m_Tcp_textbrower = nullptr;// GET_WIDGET_POINTER("main_textBrowser", QTextBrowser); - if (m_Tcp_textbrower && nTcpConnetSetting == true) { - m_Tcp_textbrower->clear(); - QTextDocument *pDoc = m_Tcp_textbrower->document(); - pDoc->setMaximumBlockCount(10244); - nTcpConnetSetting = false; - } - if (m_Tcp_textbrower) { - if (!bConnect) { - QColor m_color(255, 0, 0); - m_Tcp_textbrower->setTextColor(m_color); - } - else { - QColor m_color(16, 67, 24); - m_Tcp_textbrower->setTextColor(m_color); - } - m_Tcp_textbrower->append(str); - QTextCursor cursor = m_Tcp_textbrower->textCursor(); - cursor.movePosition(QTextCursor::End); - m_Tcp_textbrower->setTextCursor(cursor); - } -} - -bool QMainFilter_WheelDetect_Child::OnWidgetClosed(QWidget* watched, QCloseEvent* event) -{ - //return false; - - QString strName = watched->objectName(); - if (strName == "MainWindow") { - m_pUi->onClose(); - //QSubFilterStationSetting *pSub = (QSubFilterStationSetting*)mSubFilters.first(); - //if (pSub) - // pSub->CloseUI(); - } - else{ - m_pUi->onClose(strName); - } - return false;// QMainFilter_WheelDetect::OnWidgetClosed(watched, event);; -} - -Q_SLOT void QMainFilter_WheelDetect_Child::onTrigRecv(int m_value) -{ - /*用于接收PLC触发相机的信号 自检是否收到图像 */ - qDebug() << "recv a camera trig :" << QString::number(m_value); - qWarning() << "recv a Triger signal from PLC:" << "("<m_CameraTrigeType == 0)//软件触发模式 - { - if (m_pState->bLockDetect == true){ - //CC_Action(CC_AC_NEXT); - trigerCamera(); - qWarning() << "soft ctrol camera :" << "(" << QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss zzz") << ")"; - } - } - } -} - -bool QMainFilter_WheelDetect_Child::OnPolished(QWidget * watched, QEvent * event) -{ - if (m_pUi->OnPolished(watched, event)) { - // return true; - } - QString strObj = watched->objectName(); - if (strObj == "main_lb_res_Channle"){ - main_lb_res_Channle = qobject_cast(watched); - if (m_pState->m_IsUseChannel ==0 ) - main_lb_res_Channle->setVisible(false); - } - else if (strObj == "main_lb_res_Channle_Show") - { - main_lb_res_Channle_Show = qobject_cast(watched); - if (m_pState->m_IsUseChannel == 0) - main_lb_res_Channle_Show->setVisible(false); - } - else if (strObj == "main_label_state") - { - main_label_state = qobject_cast(watched); - main_label_state->setText(tr("检测状态")); - } - else if (strObj == "Dlp_Next_button") - { - watched->setVisible(false); - } - else if ("tp_user_manager" == strObj) - { - QDialog *pDlg = qobject_cast(watched); - if (pDlg) - { - pDlg->setWindowIcon(QIcon(":/image/leaper")); - } - } - else if ("main_showWorkLabel" == strObj){ - main_showWorkLabel = qobject_cast(watched); - if (main_showWorkLabel){ - QString str = QString("%1:%2(%3)").arg(tr("正在检测型号数")).arg(forDefectList.size()).arg(m_pCtrl->getAllModelName().size() - 1); - main_showWorkLabel->setText(str); - } - } - else if ("wheel_main_toolbar_tools" == strObj){ - QToolBar *pToolBar = qobject_cast(watched); - if (pToolBar){ - QList p = pToolBar->actions(); - for (int i = 0; i < p.size(); i++) { - if (p.at(i)->objectName()=="main_Login_action") - { - main_loginIn = p.at(i); - main_loginIn->setText(tr("登 录")); - } - } - } - } - return false;// QMainFilter_WheelDetect::OnPolished(watched, event); -} - -Q_SLOT void QMainFilter_WheelDetect_Child::onShowImgState(QString str) -{ - if (main_label_state) - main_label_state->setText(str); -} - -Q_SLOT void QMainFilter_WheelDetect_Child::onSaveLog(QString str, int m_Type) -{ - m_pCtrl->addLog(str, m_Type); -} - -bool QMainFilter_WheelDetect_Child::ActionTrigger(class QAction* pAction, bool bChecked) -{ - //QMainFilter_WheelDetect::ActionTrigger(pAction, bChecked); - if (pAction->objectName() == "workSelect_action"){ - pworkUI->onExec(); - } - if (pAction->objectName() == "tp_global_action_login") { - QString loginName = m_pCtrl->getUserName(); - static QString strName = loginName; - if (loginName == "nouser") - { - QString str = strName + QString(tr(":已注销")); - onSaveLog(str, emTypeUseState); - } - else - { - QString str = loginName + QString(tr(":已登录")); - onSaveLog(str, emTypeUseState); - strName = loginName; - } - m_pUi->onUserRole(); - } - else if (pAction->objectName() == "main_toolbar_action_cali_raster"){ - } - - else if (pAction->objectName() == "main_Login_action"){ - if (m_pUserCtrl){ - if (m_pUserCtrl->getLoginState() == EM_LOGIN) - { - QMessageBox infobox(QMessageBox::Information, tr("提示"), QString("%1 %2 ?").arg(tr("你确定要注销")).arg(m_pUserCtrl->CurUser()), QMessageBox::Yes|QMessageBox::No, NULL); - infobox.setWindowIcon(QIcon(":/image/leaper")); - infobox.setButtonText(QMessageBox::Yes, tr("确认")); - infobox.setButtonText(QMessageBox::No, tr("取消")); - if (infobox.exec() == QMessageBox::Yes){ - m_pUserCtrl->LogOutUser(); - } - } - else - m_pUserCtrl->CheckLogin(); - } - else - { - QMessageBox infobox(QMessageBox::Information, tr("提示"), tr("该功能未启用."), QMessageBox::Yes, NULL); - infobox.setWindowIcon(QIcon(":/image/leaper")); - infobox.setButtonText(QMessageBox::Yes, tr("确认")); - infobox.exec(); - } - } - else if (pAction->objectName() == "main_toolbar_action_userManager") - { - if (m_pUserCtrl){ - m_pUserCtrl->ShowUserMgrDlg(); - } - else - { - QMessageBox infobox(QMessageBox::Information, tr("提示"), tr("该功能未启用."), QMessageBox::Yes, NULL); - infobox.setWindowIcon(QIcon(":/image/leaper")); - infobox.setButtonText(QMessageBox::Yes, tr("确认")); - infobox.exec(); - } - } - return m_pUi->ActionTrigger(pAction, bChecked); -} - -void QMainFilter_WheelDetect_Child::SendDataToCom(int cmd, SComframe &sendFrame) -{ -// IImageObject::DATA_TO_COMM_HEAD head; -// head.cmd = cmd; -// head.commNames = m_commName.data(); -// head.pContext = NULL; -// head.pfCallback = NULL; -// WORD pData[8]; -// memset(pData, 0, sizeof(pData)); -// swapData(sendFrame); -// memcpy(pData, &sendFrame, sizeof(SComframe)); -// if (gpTpCoreCtrl != (ICoreCtrl*)0xfeeefeee && gpTpCoreCtrl) -// gpTpCoreCtrl->IDataToComm(head, (char*)pData, sizeof(pData)); -} - -void QMainFilter_WheelDetect_Child::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 QMainFilter_WheelDetect_Child::SendResultChannel2PLC(Result2Ui* m_Res) -{ - qDebug() << "SendResultChannel2PLC"; - CChannelInfo *pChannelInfo = m_pCtrl->getChannelInfo(); - ChannelInfo *npInfo = pChannelInfo->getChannelInfo(m_Res->m_strModel); - //npInfo->m_value = 5; - if (npInfo&&m_pState->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 QMainFilter_WheelDetect_Child::SendResultChannelCOM(Result2Ui* m_Res) -{ - qDebug() << "SendResultStr2COM"; - 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 QMainFilter_WheelDetect_Child::SendResultBee(emTypeBee m_Type, int num) -{ - qDebug() << "sendResultBeeLight"; - SComframe frame; - if (m_Type == LIGHT_REDBEE){ - frame.data1 = 1; - frame.data2 = num; - SendDataToCom(0x46, frame); - } - else if (m_Type == LIGHT_GREENBEE){ - frame.data1 = 2; - frame.data2 = 0; - frame.data3 = num; - SendDataToCom(0x46, frame); - } - else if (m_Type == LIGHT_YELLOWBEE){ - frame.data1 = 4; - frame.data2 = 0; - frame.data3 = 0; - frame.data4 = num; - SendDataToCom(0x46, frame); - } - else if (m_Type == LIGHT_BEE){ - frame.data1 = 8; - frame.data2 = 0; - frame.data3 = 0; - frame.data4 = 0; - frame.data5 = num; - SendDataToCom(0x46, frame); - } - - 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); - } -} - -Q_SLOT void QMainFilter_WheelDetect_Child::onSendClearDisModel() -{ - m_pNet->sendClearDisLibs(); -} - -Q_SLOT void QMainFilter_WheelDetect_Child::onRecvDisModelClearASK() -{ - -} - -Q_SLOT void QMainFilter_WheelDetect_Child::onSendDisLib(int nIndex, QString strModel) -{ - m_pNet->sendDisLibs(nIndex, strModel); -} - -Q_SLOT void QMainFilter_WheelDetect_Child::onSendDisLibDone() -{ - m_pNet->sendDisLibsDone(); -} - -Q_SLOT void QMainFilter_WheelDetect_Child::onSendReadOnlineLib() -{ - m_pNet->sendCheckAllModelState(); -} - -Q_SLOT void QMainFilter_WheelDetect_Child::onReadDetectStateASK() -{ - QMap *ptr = m_pCtrl->getAllModelMapPtr(); - if (ptr) { - QList lst = ptr->keys(); - for (int nIndex = 0; nIndex < lst.size(); nIndex++){ - IWheelModel*pModel = ptr->value(lst.at(nIndex)); - pModel->setDetectState(0); - emit(m_pCtrl->sgModelChanged(lst.at(nIndex))); - } - } -} - -Q_SLOT void QMainFilter_WheelDetect_Child::onReadDetectState(int nIndex, QString strModel) -{ - nIndex -= 1; - QMap *ptr = m_pCtrl->getAllModelMapPtr(); - if (ptr) { - QList lst = ptr->keys(); - /*if (nIndex < lst.size() && nIndex >= 0)*/ { - IWheelModel*pModel = ptr->value(strModel); - if (pModel){ - pModel->setDetectState(1); - emit(m_pCtrl->sgModelChanged(strModel)); - } - } - } -} - -Q_SLOT void QMainFilter_WheelDetect_Child::onShowChannel(QString str) -{ - if (main_lb_res_Channle_Show){ - main_lb_res_Channle_Show->setText(str); - } -} - -void QMainFilter_WheelDetect_Child::ICommAchieved(const char* szCom, int nCmd, BYTE* pData, int nDataLen) -{ - SComframe frame; - switch (nCmd) - { - case 0x45: - { - memcpy(&frame, pData, sizeof(SComframe)); - m_nWfThress = frame.data8; - } - break; - default: - break; - } -} - -void QMainFilter_WheelDetect_Child::ICommInterval(const char* szCom, int nCmd, BYTE* pData, int nDataLen) -{ - SComframe frame; - switch (nCmd) - { - case 0x45: - { - memcpy(&frame, pData, sizeof(SComframe)); - swapData(frame); - m_nWfThress = frame.data8; - } - break; - default: - break; - } -} - -Q_SLOT void QMainFilter_WheelDetect_Child::onwfPulseTimer() -{ - SComframe frame; - frame.data1 = 0; - frame.data2 = 0; - frame.data8 = 50; - SendDataToCom(0x43, frame); -} - -Q_SLOT void QMainFilter_WheelDetect_Child::onGetUiValue(QVariant nType, QVariant nData) -{ - if (nType.toString() == WF_LIFHT) - { - emTypeBee nLightType = (emTypeBee)nData.toInt(); - switch (nLightType){ - case LIGHT_REDBEE: - case LIGHT_BEE: - case LIGHT_GREENBEE: - case LIGHT_YELLOWBEE: - SendResultBee(nLightType, 1); - break; - default: - break; - } - } - else if (nType.toString() == WF_PLCPARA) - { - if (WF_PARASET == nData.toString()) - m_pNet->sendTrigerPara(m_pState->m_PLC_TrigerFilter, m_pState->m_PLC_CamTrigDelay, m_pState->m_PLC_CamTrigPulse, m_pState->m_PLC_LightDelay, m_pState->m_PLC_TrigerType,m_pState->m_PLC_ResHoldTime); - } - else if (nType.toString() == "languageSeting") - { - QString strLanguage = nData.toString(); - //SetLanguage(strLanguage); - QSettings languageSetting("hubdetect.ini", QSettings::IniFormat); - languageSetting.setValue("language", strLanguage); - } -} - -Q_SLOT void QMainFilter_WheelDetect_Child::onShowMsg(QString str) -{ - QPulpewidget *pw = new QPulpewidget(); - m_pw = pw; - QMainWindow *m_pDlgMain = nullptr;// GET_WIDGET_POINTER("MainWindow", QMainWindow); - pw->setParent(m_pDlgMain); - pw->showmessage(str); - connect(pw, SIGNAL(finished()), pw, SLOT(deleteLater())); - connect(pw, SIGNAL(finished()), this, SLOT(onInitPW())); -} - -Q_SLOT void QMainFilter_WheelDetect_Child::onInitPW() -{ - m_pw = NULL; -} - -void QMainFilter_WheelDetect_Child::timerEvent(QTimerEvent * event) -{ - if (event->timerId() == m_TimerID){ - if (m_TimerOutCount >= 6) - { - if (m_pState->m_PLC_ShowTimerOutMsg==1) - emit sgShowMsg(tr("心跳包接收超时"),false); - m_TimerOutCount = 0; - if (m_pState->m_PLC_IsResServer){//是否自动重启服务器 - if (m_RestartServerCount >= m_pState->m_PLC_RestartSeverCount)//重启的时间是否合适 - { - QString strMsg = tr("准备重启TCP服务"); - onSaveLog(strMsg, emTypeRunState); - QTimer::singleShot(100, m_pNet, SLOT(onCloseServer())); - QTimer::singleShot(500, m_pNet, SLOT(onOpenServer())); - m_RestartServerCount = 0; - } - } - m_RestartServerCount++; - QString strMsg = QString("%1 %2 %3").arg(tr("心跳包超时")).arg(m_RestartServerCount).arg(tr("次")); - onSaveLog(strMsg, emTypeRunState); - } - m_TimerOutCount++; - killTimer(m_TimerID); - } -} -//接收到心跳包 关闭定时器 -Q_SLOT void QMainFilter_WheelDetect_Child::onPulseRev() -{ - if (m_TimerID != 0) - { - killTimer(m_TimerID); - m_TimerOutCount = 0; - m_RestartServerCount = 0; - } -} - -//接收写入结果应答 其他事情另外处理 -Q_SLOT void QMainFilter_WheelDetect_Child::onResultRev() -{ - -} - -Q_SLOT void QMainFilter_WheelDetect_Child::onRecvTrigPara() -{ - emit(sgShowMsgdlg(tr("PLC已收到相关设置参数！"))); -} - -void QMainFilter_WheelDetect_Child::SendTickTskFun() -{ - //心跳包发送 - //emit(sgTickTsk()); - - onPulseTimer(); -} - -void QMainFilter_WheelDetect_Child::onProcessKillSelf() -{ - QString strapp = QApplication::applicationName(); - QProcess proc; - QStringList params; - params << "-f" << "-im" << QString("%1.exe").arg(strapp); - proc.startDetached("taskkill", params); -} - -void QMainFilter_WheelDetect_Child::trigerCamera() -{ -// qWarning() << "start trigger camera"; -// QStringList strList = gpTpCoreCtrl->ICameraKeys(); -// qWarning() << "finish trigger camera"; -// if (!strList.contains(szCamKey)) -// return; -// TP_CAMERA_OPTION optCam; -// gpTpCoreCtrl->ICameraOptionByKey(szCamKey, optCam); -// if (optCam.status != TP_CAMERA_STATUS_OPENED&&optCam.status != TP_CAMERA_STATUS_STARTED) -// { -// qWarning() << "ERROR: restart camera except the cam initialization"; -// if (gpTpCoreCtrl->IOpenCamera(szCamKey)) -// gpTpCoreCtrl->IStartCamera(szCamKey); -// else -// return; -// qWarning() << "finish restart"; -// } -// -// -// m_nDiffTrigNum++; -// gpTpCoreCtrl->ISnapImage(QStringList()<= 5){//次数多于5次 表示相机获取图像失败，应该重新打开相机 -// reOpenCamrea(); -// m_nDiffTrigNum = 0; -// //emit(sgShowMsgdlg("相机已掉线，正在重新打开相机！！")); -// //QString strMsg = QString("收到多于5次的触发信号但未获得图像，正在重新打开相机！"); -// //m_pCtrl->addLog(strMsg, emTypeRunState); -// } -} - -void QMainFilter_WheelDetect_Child::reOpenCamrea() -{ -// QStringList strList = gpTpCoreCtrl->ICameraKeys(); -// if (!strList.contains(szCamKey)) -// { -// return; -// } -// gpTpCoreCtrl->ICloseCamera(szCamKey);//出现相机掉线问题时，先关闭相机模块 -} - -Q_SLOT void QMainFilter_WheelDetect_Child::onUpdateDefect(){ - forDefectList = pWorkCtrl->getDefectList(); - IWheelUi *pMainWidget = m_pUi->getItemWidget(WHEEL_UI_MAINWINDOW); - if (pMainWidget){ - pMainWidget->setViewList(forDefectList); - - if (main_showWorkLabel){ - QString str = QString("%1:%2(%3)").arg(tr("正在检测型号数")).arg(forDefectList.size()).arg(m_pCtrl->getAllModelName().size() - 1); - main_showWorkLabel->setText(str); - } - } -} - -Q_SLOT void QMainFilter_WheelDetect_Child::onLogInOut(QString strName, int level, int state) -{ - if (state == 0) { - - m_pCtrl->setUser(strName, level); - if (main_loginIn) - main_loginIn->setText(tr("注 销")); - m_pUi->onUserRole(); - } - else - { - m_pCtrl->setUser(strName, level); - if (main_loginIn) - main_loginIn->setText(tr("登 录")); - m_pUi->onUserRole(); - } -} - -Q_SLOT void QMainFilter_WheelDetect_Child::onShutDownComputer() -{ - qApp->closeAllWindows(); - - HANDLE hToken; - TOKEN_PRIVILEGES tkp; - OSVERSIONINFO osvi; - osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - if (GetVersionEx(&osvi) == 0) - return; - if (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT) { - // Windows NT 3.51, Windows NT 4.0, Windows 2000, - // Windows XP, Windows .NET Server - if (!OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, &hToken)) - return; - LookupPrivilegeValue(NULL, SE_SHUTDOWN_NAME, &tkp.Privileges[0].Luid); - tkp.PrivilegeCount = 1; - tkp.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; - AdjustTokenPrivileges(hToken, FALSE, &tkp, 0, NULL, NULL); - } - ExitWindowsEx(EWX_SHUTDOWN, SHTDN_REASON_MAJOR_OTHER); -} -/* -void QMainFilter_WheelDetect_Child::SearchQmFile(const QString & strDir) -{ - QDir dir(strDir); - if (!dir.exists()) - { - return; - } - dir.setFilter(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot); - dir.setSorting(QDir::DirsFirst); // 文件夹优先 - // 转换成一个List - QFileInfoList list = dir.entryInfoList(); - if (list.size() < 1) - { - return; - } - int i = 0; - do - { - QFileInfo fileInfo = list.at(i); - QString tt = fileInfo.fileName(); - // 如果是文件夹 - bool bisDir = fileInfo.isDir(); - if (bisDir) - { - SearchQmFile(fileInfo.filePath()); - } - else - { - bool bQm = fileInfo.fileName().endsWith(".qm"); - SetTranslator(fileInfo.filePath()); - } - i++; - } while (i < list.size()); -} - -void QMainFilter_WheelDetect_Child::SetTranslator(const QString strPath) -{ - if (strPath.isEmpty()) - { - return; - } - QTranslator *pTrans = new QTranslator; - if (pTrans->load(strPath)) // 如果加载成功 - { - qApp->installTranslator(pTrans); - m_VecTranPtr.append(pTrans); - } - else - { - delete pTrans; - pTrans = NULL; - } -} - -void QMainFilter_WheelDetect_Child::SetLanguage(QString strLangage) -{ - QString strDirPath = QString(QCoreApplication::applicationDirPath() + "/language/"); - QString translatorFileName = strLangage; - if (!translatorFileName.isEmpty()) - { - if (m_VecTranPtr.size() > 0) - { - while (m_VecTranPtr.size()) - { - QTranslator *pVa = m_VecTranPtr.takeFirst(); - qApp->removeTranslator(pVa); - delete pVa; - pVa = NULL; - } - } - //if (strLangage == "Chinese") - // return; - QLocale::setDefault(QLocale(translatorFileName)); - - QString transDir = strDirPath + translatorFileName; - SearchQmFile(transDir); - } -}*/ \ No newline at end of file diff --git a/src/tpMain/qmainfilter_wheeldetect_child.h b/src/tpMain/qmainfilter_wheeldetect_child.h deleted file mode 100644 index 2fa68cd..0000000 --- a/src/tpMain/qmainfilter_wheeldetect_child.h +++ /dev/null @@ -1,162 +0,0 @@ -#ifndef QMAINFILTER_WHEELDETECT_CHILD_H -#define QMAINFILTER_WHEELDETECT_CHILD_H - -#include "QMainFilter_WheelDetect.h" -#include -#include "InfoFile.h" -#include "qworkmgrui.h" -#include "quserinfo_global.h" -#include -#include "baseDefine.h" -class QMyThread; -class QMainFilter_WheelDetect_Child : public QMainFilter_WheelDetect -{ - Q_OBJECT -public: - QMainFilter_WheelDetect_Child(); - ~QMainFilter_WheelDetect_Child(); - virtual void timerEvent(QTimerEvent * event); - virtual int InitMain(); - virtual bool OnInitMainWindow(QObject * watched); - virtual bool ActionTrigger(class QAction* pAction, bool bChecked); - virtual bool ButtonClicked(class QObject* pButton, bool bChecked); - virtual void VariantMapToUI(const QString camKey, const QVariantMap vMap); - virtual bool OnStateChanged(QObject* watched, int state); - virtual QVariant IGetVariantById(int id); - virtual bool OnWidgetClosed(QWidget* watched, QCloseEvent* event); - virtual bool OnPolished(QWidget * watched, QEvent * event); - virtual void ICommAchieved(const char* szCom, int nCmd, BYTE* pData, int nDataLen); - virtual void ICommInterval(const char* szCom, int nCmd, BYTE* pData, int nDataLen); - void onSetModel(); - class DetectState *m_pState{ nullptr }; - class IWheelCtrl *m_pCtrl{ nullptr }; - class WheelUis *m_pUi{ nullptr }; - class QPulpewidget *m_pw{ nullptr }; - QMyThread *SendModelLibTask{ nullptr }; - QMyThread *SendTiskTsk{ nullptr }; - //QMyThread *CheckModelStateTsk; - class CWheelNet *m_pNet{ nullptr }; - - void SendResultStr2PLC(class Result2Ui* m_Res); - void SendResultBee(emTypeBee m_Type, int num); - Q_SLOT void Sumulate(); - void trigerCamera(); - void reOpenCamrea(); -signals: - void sgTaskSendModels(int nIndex, QString strModel, double dDiameter, double dHeight); - void sgTskSendDetectState(int nIndex, QString strModel, int IsDetect); - void sgShowMsg(QString, bool); //show2ui - void sgCheckEnd(); - void sgTskSendCheck(int, int, QString); - void sgModelStateChanged(QString); - void sgModelLibSendInitDone(); - void sgStartDetect(); - - void sgSendClearDislib(); - void sgSendDisLib(int nIndex, QString strModel); - void sgSendDisLibDone(); - void sgSendReadOnlineLib(); - - void sgShowChannelRes(QString); - void sgShowImgState(QString); - void sgGetImg(); - void sgShowMsgdlg(QString); - - void sgTickTsk(); - void sgFinish(); - - void operate(); - void sgNetData(int, QVariantMap); -public: - Q_SLOT void onGetUiValue(QVariant nType, QVariant nData); - Q_SLOT void onTcpConnet(QString str, bool bConnect); - Q_SLOT void onTcpContent(const QString & strContent); - Q_SLOT void onPulseTimer();//天和心跳包 通过网络 - Q_SLOT void onwfPulseTimer();//万丰心跳包 通过串口 - Q_SLOT void onThicknessTimer();//旧的光栅数据查询 通过网络 保留备用 - Q_SLOT void onThickness(double ); - Q_SLOT void onTrigRecv(int); - Q_SLOT void onPulseRev();//心跳包发送应答 - Q_SLOT void onResultRev();//发送检测结果字符应答 - - Q_SLOT void onSendClearDisModel(); - Q_SLOT void onRecvDisModelClearASK();//接收发送清空离线库应答 - Q_SLOT void onSendDisLib(int nIndex, QString strModel); - Q_SLOT void onSendDisLibDone(); - Q_SLOT void onSendReadOnlineLib(); - Q_SLOT void onReadDetectState(int nIndex, QString strModel); - Q_SLOT void onReadDetectStateASK(); - Q_SLOT void onShutDownComputer(); -// void SearchQmFile(const QString & strDir); -// void SetTranslator(const QString strPath); -// void SetLanguage(QString strLangage); - QTimer m_PulseTimer, m_ThicknessTimer; - QTimer m_wfPulseTimer; - QTimer m_timer; - QTimer m_ReadLibTimer; - QTimer m_timerDetect; - - void SendModelKuTskFun(); - void SendTickTskFun(); - //void RunSendDetectStateTask(); - - //com - void SendDataToCom(int cmd, SComframe &sendFrame); - void SendResultChannelCOM(Result2Ui* m_Res); - void SendResultChannel2PLC(Result2Ui* m_Res); - - void onProcessKillSelf(); -private: - //void CheckModelStateTskFun(); - Q_SLOT void onTaskSendModels(int nIndex, QString strModel, double dDiameter, double dHeight); - Q_SLOT void onTcpRecv(const QString & strRecv); - Q_SLOT void onClientConnect(QString addr, bool bConnect); - Q_SLOT void onCheckEnd(); - Q_SLOT void onClearLibRev(bool state); - Q_SLOT void onTaskSendDetectState(int nIndex, QString strModel, int IsState); - Q_SLOT void onDetectStateRecv(int nIndex, int value); - //Q_SLOT void onCheckTimer(); - Q_SLOT void onTaskCheck(int nIndex, int IsState, QString strModel); - Q_SLOT void onSendClearLib2PLC();//net - Q_SLOT void onModel2PLCInitDone(); - Q_SLOT void onSaveLog(QString str, int m_Type); - Q_SLOT void onServerState(QString Addr, int port, bool state); - - Q_SLOT void onShowChannel(QString str); - Q_SLOT void onShowImgState(QString str); - Q_SLOT void onGetImg(); - Q_SLOT void onShowMsg(QString str); - Q_SLOT void onInitPW(); - Q_SLOT void onRecvTrigPara(); - - Q_SLOT void onUpdateDefect(); - Q_SLOT void onLogInOut(QString, int, int); -private: - class QLabel* main_lb_res_Channle{ nullptr }; - class QLabel* main_lb_res_Channle_Show{ nullptr }; - class QLabel* main_label_state{ nullptr }; - class QLabel* main_showWorkLabel{ nullptr }; - class QAction* main_loginIn{ nullptr }; - - int m_nWfThress; - int m_TimerID;//心跳包定时器 用于记录超时 - int m_TimerOutCount; - int m_RestartServerCount; - - int m_IsDetected; - - QThread *pTickThread{ nullptr }; - - QString szCamKey; - - QWorkMgrUI *pworkUI{ nullptr }; - QWorkMgrCtlr *pWorkCtrl{ nullptr }; - - QStringList forDefectList; - int m_nDiffTrigNum{0};//触发次数 用于判断相机是否正常打开 - - IUserCtrl *m_pUserCtrl{nullptr}; - QVector m_VecTranPtr; -}; - -#endif // QMAINFILTER_WHEELDETECT_CHILD_H diff --git a/src/tpMain/qworkmgrui.cpp b/src/tpMain/qworkmgrui.cpp index a055771..79e0cde 100644 --- a/src/tpMain/qworkmgrui.cpp +++ b/src/tpMain/qworkmgrui.cpp @@ -23,7 +23,6 @@ QWorkMgrUI::QWorkMgrUI(QWorkMgrCtlr *pWork, IWheelCtrl *pCtrl) : m_pCtrl(pCtrl), m_pWorkCtrl(pWork), ptrModel(NULL), tableModel(NULL) { ui.setupUi(this); - m_pState = pCtrl->getDetectState(); m_pWidgetMain = NULL; connect(this, SIGNAL(sgShowMsg(QString)), this, SLOT(onShowMsg(QString))); bEdit = false; @@ -68,10 +67,10 @@ void QWorkMgrUI::InitUI() { //connect(ui.work_SaveAll_pb, SIGNAL(clicked()), this, SLOT(onClickButton())); m_UseDiameter = ui.work_mode_UseDiameter; - m_UseDiameter->setChecked(m_pState->bUseDiameter == 1); + m_UseDiameter->setChecked(DetectState::instance()->bUseDiameter == 1); m_UseThickness = ui.work_mode_UseThickness; - m_UseThickness->setChecked(m_pState->bUseThickness == 1); + m_UseThickness->setChecked(DetectState::instance()->bUseThickness == 1); m_pEditFilter = ui.work_mode_edit_models_filter; connect(m_pEditFilter, SIGNAL(textChanged(const QString&)), this, SLOT(onTextChanged(const QString&))); @@ -247,12 +246,12 @@ bool QWorkMgrUI::onClose() bool QWorkMgrUI::onStateChanged(QObject* watched, int state) { if ("work_mode_UseDiameter" == watched->objectName()) { - m_pState->bUseDiameter = state == 2; - m_pState->save(); + DetectState::instance()->bUseDiameter = state == 2; + DetectState::instance()->save(); } else if ("work_mode_UseThickness" == watched->objectName()) { - m_pState->bUseThickness = state == 2; - m_pState->save(); + DetectState::instance()->bUseThickness = state == 2; + DetectState::instance()->save(); } else { return false; diff --git a/src/tpMain/qworkmgrui.h b/src/tpMain/qworkmgrui.h index 2638657..0feca31 100644 --- a/src/tpMain/qworkmgrui.h +++ b/src/tpMain/qworkmgrui.h @@ -65,7 +65,6 @@ private: //QStringListModel *pStrModel; QStandardItemModel *tableModel; private: - class DetectState *m_pState; IWheelCtrl *m_pCtrl; QString m_strUiName; bool m_pbEditState; diff --git a/src/tpMain/qworkmgrui.ui222 b/src/tpMain/qworkmgrui.ui222 deleted file mode 100644 index b297225..0000000 --- a/src/tpMain/qworkmgrui.ui222 +++ /dev/null @@ -1,402 +0,0 @@ - - - QWorkMgrUI - - - - 0 - 0 - 963 - 655 - - - - Form - - - - - - Qt::Horizontal - - - - - 1 - 0 - - - - - 180 - 16777215 - - - - 工作任务表 - - - - - - - 0 - 0 - - - - - 160 - 16777215 - - - - - - - - - - 添加任务单 - - - 添加 - - - - - - - 删除任务单 - - - 删除 - - - - - - - 修改任务单名称或备注信息 - - - 修改 - - - - - - - 使用任务单 - - - 应用 - - - - - - - - - - - 5 - 0 - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - - - - - 当前选择的任务表： - - - - - - - false - - - - - - - - - - 160 - 16777215 - - - - - - - - 数量 - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - 0 - 0 - - - - - 0 - 30 - - - - - 50 - 30 - - - - 添加型号到检测列表 - - - <<< - - - - - - - - 0 - 0 - - - - - 0 - 30 - - - - - 50 - 30 - - - - 从检测列表移除所选型号 - - - >>> - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - 0 - - - - 缩略图 - - - - - - - 0 - 0 - - - - 只看已选 - - - - - - - - 0 - 0 - - - - 只看未选 - - - - - - - - 0 - 0 - - - - 显示全部 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - 0 - 0 - - - - - - - - 查找： - - - Qt::AlignCenter - - - - - - - - - - - - 数量 - - - - - - - - 其他 - - - - - 10 - 10 - 121 - 16 - - - - 按照直径检测 - - - - - - 10 - 30 - 121 - 16 - - - - 按照厚度检测 - - - - - - 10 - 50 - 121 - 41 - - - - 手动发送模板库 - - - - - - - - - - - - - false - - - - - - - - CustomTableView - QTableView -
customtableview.h
- - - - - diff --git a/src/tpMain/timemgrui.cpp b/src/tpMain/timemgrui.cpp deleted file mode 100644 index 0e89855..0000000 --- a/src/tpMain/timemgrui.cpp +++ /dev/null @@ -1,272 +0,0 @@ -#include "timemgrui.h" -#include -#include -#include -#include -#include -#include "InfoFile.h" -#include "timemgrctrl.h" -#include "qaddtimedlg.h" -#include -#include "IWheelCtrl.h" -#include -#include -#pragma execution_character_set("utf-8") - -struct CmpByValueTime { - bool operator()(const TimeStruct & lhs, const TimeStruct & rhs) - { - return lhs.m_startTime < rhs.m_startTime; - } -}; - -TimeMgrUi::TimeMgrUi(const QString strUiName, IWheelCtrl *p) :m_pCtrl(p), m_strUiName(strUiName) -{ - tablemodel = new QStandardItemModel(); - QStringList stringList; - stringList << tr("班次") << tr("起始时间") << tr("结束时间"); - tablemodel->setHorizontalHeaderLabels(stringList); - //tablemodel->setHorizontalHeaderItem(0, new QStandardItem(tr("班次"))); - //tablemodel->setHorizontalHeaderItem(1, new QStandardItem(tr("起始时间"))); - //tablemodel->setHorizontalHeaderItem(2, new QStandardItem(tr("结束时间"))); - m_pTimeMgr = m_pCtrl->getTimeMgr(); -} - -TimeMgrUi::~TimeMgrUi() -{ - 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; - } -} - -bool TimeMgrUi::onPolished(QWidget* p) -{ - QString str = p->objectName(); - if (str == "TimeMgr_tableView") { - tableView = qobject_cast(p); - connect(tableView, SIGNAL(clicked(const QModelIndex &)), this, SLOT(SlotcellClicked(const QModelIndex &))); - } - else if (str == "TimeMgr_ADD_Button") { - connect(p, SIGNAL(clicked()), this, SLOT(SlotButtonClick())); - } - else if (str == "TimeMgr_Del_Button") { - connect(p, SIGNAL(clicked()), this, SLOT(SlotButtonClick())); - } - else if (str == "TimeMgr_Mod_Button") { - connect(p, SIGNAL(clicked()), this, SLOT(SlotButtonClick())); - } - else if (str == "TimeMgr_OK_Button") { - connect(p, SIGNAL(clicked()), this, SLOT(SlotButtonClick())); - } - else if (str == "TimeMgr_label"){ - m_label = qobject_cast(p); - } - else if (m_strUiName == str) { - m_pDlgMain = (QDialog*)p; - m_pDlgMain->setWindowTitle(tr("班次时间管理")); - m_pDlgMain->setWindowIcon(QIcon(":/image/leaper")); - } - else { - return false; - } - return true; -} - -Q_SLOT void TimeMgrUi::SlotButtonClick() -{ - QObject *obj = sender(); - QString str_name = obj->objectName(); - if (str_name == "TimeMgr_ADD_Button"){ - QAddTimeDlg dlg; - dlg.setWindowTitle(tr("设置参数")); - dlg.setWindowIcon(QIcon(":/image/leaper")); - dlg.setFocus(); - 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); - m_pTimeMgr->AddNewTime(m_Timestruct); - m_label->setText(""); - } - } - else if (str_name == "TimeMgr_Del_Button"){ - QString str_name = m_label->text(); - if (str_name.isEmpty() || str_name == tr("未选中")) - { - //QMessageBox::information(NULL, QString("提示"), QString("未选择班次，请选择进行修改。"), QMessageBox::Ok); - QMessageBox infobox(QMessageBox::Information, tr("提示"), tr("未选择班次，请选择进行修改。"), QMessageBox::Yes, NULL); - 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, NULL); - 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 = 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); - m_pTimeMgr->DelOldTime(m_TimeStruct); - m_label->setText(""); - } - } - else if (str_name == "TimeMgr_Mod_Button"){ - QString str_name = m_label->text(); - if (str_name.isEmpty()||str_name==tr("未选中")) - { - //QMessageBox::information(NULL, QString("提示"), QString("未选择班次，请选择进行修改。"), QMessageBox::Ok); - - QMessageBox infobox(QMessageBox::Information, tr("提示"), tr("未选择班次，请选择进行修改。"), QMessageBox::Yes, NULL); - 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); - 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++; - } - -// for (QMap::iterator its = m_MapTime.begin(); its != m_MapTime.end(); ++its) -// { -// tablemodel->setItem(nIndex, 0, new QStandardItem(its->m_name)); -// QString strStart = QString("%1 %2").arg(its->time_start == AM ? tr("当天") : tr("隔天")).arg(its->m_startTime.toString("hh:mm")); -// QString strEnd = QString("%1 %2").arg(its->time_end == AM ? tr("当天") : tr("隔天")).arg(its->m_endTime.toString("hh:mm")); -// tablemodel->setItem(nIndex, 1, new QStandardItem(strStart)); -// tablemodel->setItem(nIndex, 2, new QStandardItem(strEnd)); -// -// // tablemodel->setItem(nIndex, 1, new QStandardItem(its->m_startTime.toString("hh:mm"))); -// // tablemodel->setItem(nIndex, 2, new QStandardItem(its->m_endTime.toString("hh:mm"))); -// nIndex++; -// } - m_label->setText(""); - } - } - else if (str_name == "TimeMgr_OK_Button"){ - //QDialog::accept(); - } -} -Q_SLOT void TimeMgrUi::SlotcellClicked(const QModelIndex & index) -{ - if (m_MapTime.size() > 0) - { - QModelIndex nindex = tablemodel->index(index.row(), 0); - QString str = nindex.data().toString(); - m_label->setText(str); - } -} - -void TimeMgrUi::SetTimeLable() -{ - this->m_MapTime = m_pTimeMgr->getAllTime(); - tableView->setModel(tablemodel); - tableView->setColumnWidth(0, 100); - tableView->setColumnWidth(1, 100); - tableView->setColumnWidth(2, 100); - //默认显示行头，如果你觉得不美观的话，我们可以将隐藏 - //m_tableView->verticalHeader()->hide(); - tableView->setSelectionBehavior(QAbstractItemView::SelectRows); - tableView->setEditTriggers(QAbstractItemView::NoEditTriggers); - //tableView->resizeColumnsToContents(); - //如果你用在QTableView中使用右键菜单，需启用该属性 - //tableView->setContextMenuPolicy(Qt::CustomContextMenu); - tableView->setWordWrap(false); - //tableView->setShowGrid(false);//显示表格线 - tableView->setAlternatingRowColors(true); - int nIndex = 0; - if (m_MapTime.size() <= 0) - return; - -// for (QMap::iterator its = m_MapTime.begin(); its != m_MapTime.end(); ++its) -// { -// tablemodel->setItem(nIndex, 0, new QStandardItem(its->m_name)); -// QString strStart = QString("%1 %2").arg(its->time_start == AM ? tr("当天") : tr("隔天")).arg(its->m_startTime.toString("hh:mm")); -// QString strEnd = QString("%1 %2").arg(its->time_end == AM ? tr("当天") : tr("隔天")).arg(its->m_endTime.toString("hh:mm")); -// tablemodel->setItem(nIndex, 1, new QStandardItem(strStart)); -// tablemodel->setItem(nIndex, 2, new QStandardItem(strEnd)); -// nIndex++; -// } - - 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++; - } -} - -bool TimeMgrUi::onExec() -{ - SetTimeLable(); - if (m_pDlgMain) { - QDesktopWidget* desktop = QApplication::desktop();// - m_pDlgMain->move((desktop->width() - m_pDlgMain->width()) / 2, (desktop->height() - m_pDlgMain->height()) / 2); - m_pDlgMain->exec(); - } - return true; -} diff --git a/src/tpMain/timemgrui.h b/src/tpMain/timemgrui.h deleted file mode 100644 index fc5d28b..0000000 --- a/src/tpMain/timemgrui.h +++ /dev/null @@ -1,35 +0,0 @@ -#ifndef TIMEMGRUI_H -#define TIMEMGRUI_H - -#include -#include -#include "IWheelUi.h" -#include "InfoFile.h" -#include "IWheelUi.h" -class QAddTimeDlg; -class IWheelCtrl; -class TimeMgrCtrl; -class TimeMgrUi : public IWheelUi -{ - Q_OBJECT -public: - TimeMgrUi(const QString, IWheelCtrl *); - ~TimeMgrUi(); - virtual bool onExec(); - virtual bool onPolished(QWidget *p); - virtual bool onClose(){ return true; }; - Q_SLOT void SlotButtonClick(); - Q_SLOT void SlotcellClicked(const QModelIndex & index); - void SetTimeLable(); -private: - IWheelCtrl* m_pCtrl; - TimeMgrCtrl *m_pTimeMgr; - class QTableView* tableView; - class QStandardItemModel *tablemodel; - class QLabel *m_label; - QMap m_MapTime; - class QDialog *m_pDlgMain; - QString m_strUiName; -}; - -#endif // TIMEMGRUI_H diff --git a/tpvs17/tpAlgorithmQt/tpAlgorithmQt.vcxproj b/tpvs17/tpAlgorithmQt/tpAlgorithmQt.vcxproj index edc5fbb..0d49f62 100644 --- a/tpvs17/tpAlgorithmQt/tpAlgorithmQt.vcxproj +++ b/tpvs17/tpAlgorithmQt/tpAlgorithmQt.vcxproj @@ -57,7 +57,7 @@ UNICODE;WIN32;WIN64;QT_CORE_LIB;TPALGORITHMQT_LIB;%(PreprocessorDefinitions);ALGORITHM_EXPORTS;QT_GUI_LIB;_WINDOWS - .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;..\..\3part\tadpole\include\tpBase;..\..\3part\opencv3.4.1\include;..\..\3part\opencv3.4.1\include\opencv;..\..\3part\opencv3.4.1\include\opencv2;..\..\3part\libzkq\include;..\..\3part\libzkq\include\syswin;..\..\3part\Cyclops\include;..\..\3part\edcircle\include;%(AdditionalIncludeDirectories) + .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;..\..\3part\tadpole\include\tpBase;..\..\3part\opencv3.4.1\include;..\..\3part\opencv3.4.1\include\opencv;..\..\3part\opencv3.4.1\include\opencv2;..\..\3part\libzkq\include;..\..\3part\libzkq\include\syswin;..\..\3part\Cyclops\include;..\..\3part\edcircle\include;..\..\src\interface;%(AdditionalIncludeDirectories) Disabled ProgramDatabase MultiThreadedDebugDLL diff --git a/tpvs17/tpMain/QModelMgrDlg.cpp b/tpvs17/tpMain/QModelMgrDlg.cpp index 034f31d..a6aa9b7 100644 --- a/tpvs17/tpMain/QModelMgrDlg.cpp +++ b/tpvs17/tpMain/QModelMgrDlg.cpp @@ -6,11 +6,11 @@ #include "HubBase.h" #include "IWheelModel.h" #include "TempImage.h" -#include "ImageCompareModel.h" #include "qaddmodel.h" #include "qmodnamedlg.h" #include #include "QSettings.h" +#include "ICompareModel.h" #define WS_PICSIZE 129 //!>ŴС #define WS_PICSIZELIST_ITEM 100 @@ -603,7 +603,7 @@ void QModelMgrDlg::TrainAllTskFunc() emit sgPrograssShow(tr("ģ½"), str, lstAll.size(), emPross_SetLable); IWheelModel *pModel = m_pModelMgr->getModel(m_modelName); std::vector mMat = pImg->getImgVector(); - ImageCompareModel *m_compareModel = pModel->getImageComModel(); + ICompareModel *m_compareModel = pModel->getImageComModel(); if (mMat.size() <= 0) { continue; @@ -733,7 +733,7 @@ void QModelMgrDlg::TrainOneTskFunc() /*Ҫʾ ˵ģѵ*/ emit sgPrograssShow(tr("ģѵ"), str, 1, emPross_SetValue); - ImageCompareModel *m_compareModel = pModel->getImageComModel(); + ICompareModel *m_compareModel = pModel->getImageComModel(); //std::vector firstFalseSample = m_pModelMgr->getFirstImgFromFalse(pModel->getModelID()); m_compareModel->train(m_MatVec); //////////////////////////////////////////// tain model @@ -1010,3 +1010,16 @@ Q_SLOT void QModelMgrDlg::onButtonClicked() onDelAllModels(); } } + +void QModelMgrDlg::showEvent(QShowEvent *event) +{ + if (m_pModelLists&&m_pModelMgr) + { + QStringList strModels = m_pModelMgr->getAllModelMapPtr()->keys(); + strModels.removeAll("NG"); + m_pModelLists->setModelList(strModels); + + QString m_str = QString("%1 %2 ͺ").arg(tr("")).arg(strModels.size()).arg(tr("ͺ")); + ui.ModelMgr_label_Model_number->setText(m_str); + } +} diff --git a/tpvs17/tpMain/QModelMgrDlg.h b/tpvs17/tpMain/QModelMgrDlg.h index bb9530f..408d9c4 100644 --- a/tpvs17/tpMain/QModelMgrDlg.h +++ b/tpvs17/tpMain/QModelMgrDlg.h @@ -54,7 +54,7 @@ private: protected: Q_SLOT void onButtonClicked(); - + virtual void showEvent(QShowEvent *event); private: Ui::QModelMgrDlg ui; diff --git a/tpvs17/tpMain/lpMainWin.cpp b/tpvs17/tpMain/lpMainWin.cpp index d2c7dcc..5159808 100644 --- a/tpvs17/tpMain/lpMainWin.cpp +++ b/tpvs17/tpMain/lpMainWin.cpp @@ -72,7 +72,6 @@ lpMainWin::lpMainWin(QWidget *parent) m_pLbBanci->setFont(m_font); m_pLbBanci->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter); - m_pLbDetectState->setMinimumWidth(200); m_pLbDetectState->setFont(m_font); m_pLbDetectState->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter); @@ -98,7 +97,6 @@ lpMainWin::lpMainWin(QWidget *parent) m_pworkUI = new QWorkMgrUI(pWorkCtrl, m_pCtrl); m_pworkUI->InitUI(); connect(m_pworkUI, SIGNAL(sgUpdatedefect()), this, SLOT(onUpdateDefect())); - m_pState = m_pCtrl->getDetectState(); m_pModelMgrDlg = new QModelMgrDlg(m_pCtrl); m_pDebugDlg = new QDebugDlg(); @@ -169,13 +167,13 @@ lpMainWin::lpMainWin(QWidget *parent) } { /*֮һֱͺȲѯ*/ - if (m_pState->m_AutoSendTick2Net) + if (DetectState::instance()->m_AutoSendTick2Net) { SendTiskTsk->setSleepTime(1000); SendTiskTsk->start(); } - if (m_pState->m_StartAndDetect == 1)//m_sysType ʾƼ + if (DetectState::instance()->m_StartAndDetect == 1)//m_sysType ʾƼ { // m_timerDetect.setSingleShot(true); // connect(&m_timerDetect, SIGNAL(timeout()), m_pUi, SLOT(onStartDetect())); @@ -186,7 +184,7 @@ lpMainWin::lpMainWin(QWidget *parent) // m_pCtrl->onStart(); // }); } - if (m_pState->m_AutoSendTick2COM) + if (DetectState::instance()->m_AutoSendTick2COM) m_wfPulseTimer.start(1000); @@ -203,7 +201,10 @@ lpMainWin::lpMainWin(QWidget *parent) m_pTableCheck = new ModelsView(ui.tableview_checkstate, m_pCtrl->getAllModelMapPtr()); m_pTableCheck->setEnable(false); connect(m_pCtrl, SIGNAL(sgModelChanged()), m_pTableCheck, SLOT(updateModels())); - m_pTableCheck->setModelList(forDefectList); + QStringList strList = forDefectList; + if (!strList.contains("NG")) + strList.append("NG"); + m_pTableCheck->setModelList(strList); } m_timerID = startTimer(1000); @@ -491,7 +492,7 @@ void lpMainWin::IVariantMapToUI(const QString& camKey, const QVariantMap& vMap) } if (ErrorNum >= 3) { QString str = tr("!!!%1δʶͺ").arg(ErrorNum); - if (m_pState->IsDetect == false) + if (DetectState::instance()->IsDetect == false) str += tr(",δ⹦ɵ"); m_pCtrl->addLog(str, emTypeWaring); //m_pNet->sendLight(0, 1, 2000, 100); @@ -500,11 +501,11 @@ void lpMainWin::IVariantMapToUI(const QString& camKey, const QVariantMap& vMap) SendResultBee(LIGHT_BEE, 3); } } - if (m_pState->m_SendDetectStr2Net) + if (DetectState::instance()->m_SendDetectStr2Net) SendResultStr2PLC(pResult);//ͼַPLC - if (m_pState->m_SendChannelRes2COM) + if (DetectState::instance()->m_SendChannelRes2COM) SendResultChannelCOM(pResult);//ͼͨ - if (m_pState->m_SendChannelRes2Net) + if (DetectState::instance()->m_SendChannelRes2Net) SendResultChannel2PLC(pResult);//ͼͨPLC m_pCtrl->saveResult(pResult); @@ -529,25 +530,25 @@ QVariant lpMainWin::IGetVariantById(int id) emit(sgShowImgState(tr("ͼ,ڼ..."))); emit(sgGetImg()); qDebug() << "get one Pic ,id=" << id; - if (m_pState->m_showThressList == 1) { + if (DetectState::instance()->m_showThressList == 1) { QString str = m_pCtrl->getThicknessStr(); emit(sgShowMsg(str, true)); } QVariantMap vMap; int nThickness = 0; - if (m_pState->m_IsUseRaster == 0) + if (DetectState::instance()->m_IsUseRaster == 0) nThickness = m_nWfThress; else nThickness = m_pCtrl->getThickness();// m_houduVec.first(); //nThickness = 209; vMap.insert("thickness", QVariant(nThickness)); double dDiameter;// = (-794.25 * nThickness / 1000000.0 + 0.775960); - dDiameter = (m_pState->m_k * nThickness + m_pState->m_b); + dDiameter = (DetectState::instance()->m_k * nThickness + DetectState::instance()->m_b); vMap.insert("d2h", dDiameter); - vMap.insert("useThickness", m_pState->bUseThickness); - vMap.insert("useDiameter", m_pState->bUseDiameter); - vMap.insert("Threshold", m_pState->m_AlgThres); - vMap.insert("IsCutImg", m_pState->m_UseCutImg); + vMap.insert("useThickness", DetectState::instance()->bUseThickness); + vMap.insert("useDiameter", DetectState::instance()->bUseDiameter); + vMap.insert("Threshold", DetectState::instance()->m_AlgThres); + vMap.insert("IsCutImg", DetectState::instance()->m_UseCutImg); void* address = (void*)m_pCtrl->getAllModelMapPtr(); long long varadr = (long long)address; @@ -558,7 +559,7 @@ QVariant lpMainWin::IGetVariantById(int id) vMap.insert("defectList", val); qDebug() << "end get one pic" << id; - if (m_pState->m_showThressValue == 1) { + if (DetectState::instance()->m_showThressValue == 1) { QString str = QString("thickness value = %1,dDiameter value = %2").arg(nThickness).arg(dDiameter); emit(sgShowMsg(str, true)); } @@ -587,12 +588,14 @@ Q_SLOT void lpMainWin::onActionClicked() { QString strObj = sender()->objectName(); if ("action_userManager" == strObj) { + /*û*/ if (m_pUserCtrl) { m_pUserCtrl->ShowUserMgrDlg(this); } } else if ("action_Login" == strObj) { + /*û½*/ if (m_pUserCtrl) { m_pUserCtrl->CheckLogin(this); @@ -669,7 +672,7 @@ Q_SLOT void lpMainWin::onButtonClicked() if ("btn_start_detect" == strObj)//ʼ { //ʼⰴť - if (m_pState->IsDetect == false) { + if (DetectState::instance()->IsDetect == false) { ui.btn_start_detect->setText(tr("ֹͣ")); m_pCtrl->onStart(); QString str = tr("˿ʼⰴť⹦ܿ"); @@ -683,9 +686,9 @@ Q_SLOT void lpMainWin::onButtonClicked() ui.btn_start_detect->setText(tr("ʼ")); QString str = tr("ֹͣⰴť⹦ܹر"); m_pCtrl->addLog(str, emTypeRunState); - m_pState->bLockDetect = false; + DetectState::instance()->bLockDetect = false; } - m_pState->IsDetect = !m_pState->IsDetect; + DetectState::instance()->IsDetect = !DetectState::instance()->IsDetect; } else if ("btn_clear_data" == strObj) {// QMessageBox infobox(QMessageBox::Warning, tr("ʾ"), tr(""), QMessageBox::Yes | QMessageBox::Cancel, this); @@ -706,7 +709,7 @@ void lpMainWin::timerEvent(QTimerEvent *event) { if (event->timerId() == m_timerID) { QString str = tr("ϵͳʱ䣺 "); - QString strDetectState = tr("״̬:") + (m_pState->IsDetect == true ? tr("...") : tr("δ...")); + QString strDetectState = tr("״̬:") + (DetectState::instance()->IsDetect == true ? tr("...") : tr("δ...")); // if (strLanguage != "Chinese") // { // str = "Time:"; @@ -723,7 +726,7 @@ void lpMainWin::timerEvent(QTimerEvent *event) if (m_pLbDetectState) { m_pLbDetectState->setText(strDetectState); - if (m_pState->IsDetect) { + if (DetectState::instance()->IsDetect) { m_pLbDetectState->setStyleSheet("font: bold 14px;background-color: green;"); } else { @@ -766,7 +769,7 @@ void lpMainWin::SendModelKuTskFun() ģ߳ еģȫPLC */ - m_pState->m_ThreadWaitTime = 100; + DetectState::instance()->m_ThreadWaitTime = 100; const int c_nErrorTime = 3; int nError = 0; QMap*ptr = m_pCtrl->getAllModelMapPtr(); @@ -778,10 +781,10 @@ void lpMainWin::SendModelKuTskFun() { IWheelModel *p = ptr->value(lst.at(nIndex)); emit sgTaskSendModels(nIndex + 1, lst.at(nIndex), p->getDiameter(), p->getThickness()); - bool b = this->SendModelLibTask->WaitForSingle(m_pState->m_ThreadWaitTime); + bool b = this->SendModelLibTask->WaitForSingle(DetectState::instance()->m_ThreadWaitTime); if (!b) { nError++; - if (m_pState->m_PLC_ASK == 1) { + if (DetectState::instance()->m_PLC_ASK == 1) { if (nError > c_nErrorTime) { ++nIndex; nError = 0; @@ -809,7 +812,7 @@ void lpMainWin::SendTickTskFun() // if (m_pNet) { - m_pNet->sendPulse(6000, m_pState->IsDetect, m_pState->IsOnline); + m_pNet->sendPulse(6000, DetectState::instance()->IsDetect, DetectState::instance()->IsOnline); //m_TimerID = startTimer(500); } } @@ -822,7 +825,10 @@ void lpMainWin::onSetModel() */ forDefectList = pWorkCtrl->getDefectList(); if (m_pTableCheck) { - m_pTableCheck->setModelList(forDefectList); + QStringList strList = forDefectList; + if (!strList.contains("NG")) + strList.append("NG"); + m_pTableCheck->setModelList(strList); } QString str = QString("%1:%2(%3)").arg(tr("ڼͺ")).arg(forDefectList.size()).arg(m_pCtrl->getAllModelName().size() - 1); ui.main_showWorkLabel->setText(str); @@ -844,7 +850,10 @@ void lpMainWin::onSetModel() Q_SLOT void lpMainWin::onUpdateDefect() { forDefectList = pWorkCtrl->getDefectList(); if (m_pTableCheck) { - m_pTableCheck->setModelList(forDefectList); + QStringList strList = forDefectList; + if (!strList.contains("NG")) + strList.append("NG"); + m_pTableCheck->setModelList(strList); } QString str = QString("%1:%2(%3)").arg(tr("ڼͺ")).arg(forDefectList.size()).arg(m_pCtrl->getAllModelName().size() - 1); ui.main_showWorkLabel->setText(str); @@ -885,7 +894,7 @@ Q_SLOT void lpMainWin::onClientConnect(QString addr, bool bConnect) QTimer::singleShot(200, this, SLOT(onSendClearLib2PLC())); } - if (bConnect == true && 1 == m_pState->IsOnline) { + if (bConnect == true && 1 == DetectState::instance()->IsOnline) { //m_pUi->onSwitchOnlineModel(m_pState->IsOnline);//ģʽ ģʽл } QString strMsg; @@ -985,11 +994,11 @@ Q_SLOT void lpMainWin::onTrigRecv(int m_value) /*ڽPLCź ԼǷյͼ */ qDebug() << "recv a camera trig :" << QString::number(m_value); qWarning() << "recv a Triger signal from PLC:" << "(" << QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss zzz") << ")"; - if (m_pState)//ʹ + //if (m_pState)//ʹ { - if (m_pState->m_CameraTrigeType == 0)//ģʽ + if (DetectState::instance()->m_CameraTrigeType == 0)//ģʽ { - if (m_pState->bLockDetect == true) { + if (DetectState::instance()->bLockDetect == true) { //CC_Action(CC_AC_NEXT); onTriggerCam(); qWarning() << "soft ctrol camera :" << "(" << QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss zzz") << ")"; @@ -1038,7 +1047,7 @@ Q_SLOT void lpMainWin::onPulseTimer() // if (m_pNet) { - m_pNet->sendPulse(6000, m_pState->IsDetect, m_pState->IsOnline); + m_pNet->sendPulse(6000, DetectState::instance()->IsDetect, DetectState::instance()->IsOnline); //m_TimerID = startTimer(500); } } @@ -1173,7 +1182,7 @@ void lpMainWin::onShowResult(Result2Ui* pRlt) else scare = scareh; if (pRlt->m_strModel.isEmpty()) { - m_pState->totalUnDetectNum++; + DetectState::instance()->totalUnDetectNum++; QPixmap pix(":/image/none.jpg"); ui.main_lb_res_model_pic->setPixmap(pix.scaled(scare - 15, scare - 15)); @@ -1200,11 +1209,11 @@ void lpMainWin::onShowResult(Result2Ui* pRlt) emit m_pTableCheck->sgValueChange(pModel->getModelID()); } } - m_pState->totalDetectNum++; + DetectState::instance()->totalDetectNum++; //show - ui.main_lb_res_ng_num->setText(QString::number(m_pState->totalUnDetectNum)); - ui.main_lb_res_ok_num->setText(QString::number(m_pState->totalDetectNum)); + ui.main_lb_res_ng_num->setText(QString::number(DetectState::instance()->totalUnDetectNum)); + ui.main_lb_res_ok_num->setText(QString::number(DetectState::instance()->totalDetectNum)); ui.main_lb_res_model_time->setText(QString::number(pRlt->m_dRunTime, 'f', 2)); ui.main_lb_res_model_thickness->setText(QString::number((int)pRlt->m_dThickness)); ui.main_lb_res_model_diameter->setText(QString::number((int)pRlt->m_dDiameter)); @@ -1279,7 +1288,7 @@ void lpMainWin::SendResultChannel2PLC(Result2Ui* m_Res) CChannelInfo *pChannelInfo = m_pCtrl->getChannelInfo(); ChannelInfo *npInfo = pChannelInfo->getChannelInfo(m_Res->m_strModel); //npInfo->m_value = 5; - if (npInfo&&m_pState->m_bObjAll2A == false) { + if (npInfo&&DetectState::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)); diff --git a/tpvs17/tpMain/lpMainWin.h b/tpvs17/tpMain/lpMainWin.h index c7de6bc..6e4f4ff 100644 --- a/tpvs17/tpMain/lpMainWin.h +++ b/tpvs17/tpMain/lpMainWin.h @@ -142,7 +142,6 @@ private: class CWheelNet *m_pNet{ nullptr }; class QWorkMgrUI *m_pworkUI{ nullptr }; class QWorkMgrCtlr *pWorkCtrl{ nullptr }; - class DetectState *m_pState{ nullptr }; QTimer m_PulseTimer, m_ThicknessTimer; QTimer m_wfPulseTimer; diff --git a/tpvs17/tpMain/tpMain.vcxproj b/tpvs17/tpMain/tpMain.vcxproj index f9cfa0c..f458a57 100644 --- a/tpvs17/tpMain/tpMain.vcxproj +++ b/tpvs17/tpMain/tpMain.vcxproj @@ -24,20 +24,14 @@ - - - - - - @@ -49,8 +43,6 @@ - - @@ -62,26 +54,19 @@ - - - - true - - true - true @@ -91,24 +76,12 @@ true - - true - - - true - true true - - true - - - true - true @@ -118,9 +91,6 @@ true - - true - true @@ -160,12 +130,6 @@ true - - true - - - true - true @@ -217,21 +181,12 @@ true - - true - - - true - true true - - true - @@ -241,9 +196,6 @@ true - - true - true @@ -253,24 +205,12 @@ true - - true - - - true - true true - - true - - - true - true @@ -280,9 +220,6 @@ true - - true - true @@ -322,12 +259,6 @@ true - - true - - - true - true @@ -379,21 +310,12 @@ true - - true - - - true - true true - - true - @@ -407,7 +329,7 @@ $(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" + "$(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp @@ -417,7 +339,7 @@ $(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" + "$(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp @@ -427,7 +349,7 @@ $(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" + "$(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp @@ -462,7 +384,7 @@ $(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" + "$(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp @@ -472,7 +394,7 @@ $(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" + "$(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp @@ -482,7 +404,7 @@ $(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" + "$(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp @@ -492,7 +414,7 @@ $(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" + "$(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp @@ -502,7 +424,7 @@ $(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" + "$(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp @@ -514,7 +436,7 @@ $(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" + "$(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp @@ -525,7 +447,7 @@ $(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" + "$(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp @@ -535,7 +457,7 @@ $(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" + "$(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp @@ -545,7 +467,7 @@ $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing qworkmgrui.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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" + "$(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing qworkmgrui.h... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp @@ -557,41 +479,20 @@ $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing saveimgthread.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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" + "$(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing saveimgthread.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.\..\..\..\spider\libZK" "-I.\..\..\..\tadpole\include" "-I.\..\..\..\tadpole\src\SubFilters" "-I.\..\..\..\tadpole\src\SubFilters\tpSubFilterDemo" "-I.\..\..\..\tadpole\src\tpGui" "-I.\..\..\..\tadpole\src\tpBase" "-I.\..\..\..\tadpole\src\lpbengine" "-I.\..\..\..\tadpole\src\tpNet" "-I.\..\..\..\tadpole\src\lpdesigner" "-I.\..\..\..\tadpole\src\tpMain" "-I.\..\..\..\tadpole\src\tpSubFilter" "-I.\..\..\..\tadpole\src\libzkq" "-I.\..\..\..\tadpole\src\tpAssister" "-I.\..\..\include\tpMain" "-I.\..\..\include\tpMain\SubFilters" "-I.\..\include" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include\opencv2" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include\opencv" "-I.\..\..\..\Cyclops\include" "-I.\..\..\src\algorithm" "-I.\..\..\include" "-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" - - - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing timemgrui.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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing timemgrui.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.\..\..\..\spider\libZK" "-I.\..\..\..\tadpole\include" "-I.\..\..\..\tadpole\src\SubFilters" "-I.\..\..\..\tadpole\src\SubFilters\tpSubFilterDemo" "-I.\..\..\..\tadpole\src\tpGui" "-I.\..\..\..\tadpole\src\tpBase" "-I.\..\..\..\tadpole\src\lpbengine" "-I.\..\..\..\tadpole\src\tpNet" "-I.\..\..\..\tadpole\src\lpdesigner" "-I.\..\..\..\tadpole\src\tpMain" "-I.\..\..\..\tadpole\src\tpSubFilter" "-I.\..\..\..\tadpole\src\libzkq" "-I.\..\..\..\tadpole\src\tpAssister" "-I.\..\..\include\tpMain" "-I.\..\..\include\tpMain\SubFilters" "-I.\..\include" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include\opencv2" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include\opencv" "-I.\..\..\..\Cyclops\include" "-I.\..\..\src\algorithm" "-I.\..\..\include" "-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" - - - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing ToolBarUi.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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing ToolBarUi.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.\..\..\..\spider\libZK" "-I.\..\..\..\tadpole\include" "-I.\..\..\..\tadpole\src\SubFilters" "-I.\..\..\..\tadpole\src\SubFilters\tpSubFilterDemo" "-I.\..\..\..\tadpole\src\tpGui" "-I.\..\..\..\tadpole\src\tpBase" "-I.\..\..\..\tadpole\src\lpbengine" "-I.\..\..\..\tadpole\src\tpNet" "-I.\..\..\..\tadpole\src\lpdesigner" "-I.\..\..\..\tadpole\src\tpMain" "-I.\..\..\..\tadpole\src\tpSubFilter" "-I.\..\..\..\tadpole\src\libzkq" "-I.\..\..\..\tadpole\src\tpAssister" "-I.\..\..\include\tpMain" "-I.\..\..\include\tpMain\SubFilters" "-I.\..\include" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include\opencv2" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include\opencv" "-I.\..\..\..\Cyclops\include" "-I.\..\..\src\algorithm" "-I.\..\..\include" "-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" - $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing WheelCtrl.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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" + "$(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing WheelCtrl.h... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp @@ -602,27 +503,17 @@ $(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" + "$(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" $(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.\..\..\..\spider\libZK" "-I.\..\..\..\tadpole\include" "-I.\..\..\..\tadpole\src\SubFilters" "-I.\..\..\..\tadpole\src\SubFilters\tpSubFilterDemo" "-I.\..\..\..\tadpole\src\tpGui" "-I.\..\..\..\tadpole\src\tpBase" "-I.\..\..\..\tadpole\src\lpbengine" "-I.\..\..\..\tadpole\src\tpNet" "-I.\..\..\..\tadpole\src\lpdesigner" "-I.\..\..\..\tadpole\src\tpMain" "-I.\..\..\..\tadpole\src\tpSubFilter" "-I.\..\..\..\tadpole\src\libzkq" "-I.\..\..\..\tadpole\src\tpAssister" "-I.\..\..\include\tpMain" "-I.\..\..\include\tpMain\SubFilters" "-I.\..\include" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include\opencv2" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include\opencv" "-I.\..\..\..\Cyclops\include" "-I.\..\..\src\algorithm" "-I.\..\..\include" "-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" - - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing WheelUis.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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing WheelUis.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.\..\..\..\spider\libZK" "-I.\..\..\..\tadpole\include" "-I.\..\..\..\tadpole\src\SubFilters" "-I.\..\..\..\tadpole\src\SubFilters\tpSubFilterDemo" "-I.\..\..\..\tadpole\src\tpGui" "-I.\..\..\..\tadpole\src\tpBase" "-I.\..\..\..\tadpole\src\lpbengine" "-I.\..\..\..\tadpole\src\tpNet" "-I.\..\..\..\tadpole\src\lpdesigner" "-I.\..\..\..\tadpole\src\tpMain" "-I.\..\..\..\tadpole\src\tpSubFilter" "-I.\..\..\..\tadpole\src\libzkq" "-I.\..\..\..\tadpole\src\tpAssister" "-I.\..\..\include\tpMain" "-I.\..\..\include\tpMain\SubFilters" "-I.\..\include" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include\opencv2" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include\opencv" "-I.\..\..\..\Cyclops\include" "-I.\..\..\src\algorithm" "-I.\..\..\include" "-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" - $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing QWorkMgrCtlr.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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" + "$(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing QWorkMgrCtlr.h... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp @@ -632,7 +523,7 @@ $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing qworkItemdlg.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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" + "$(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing qworkItemdlg.h... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp @@ -642,7 +533,7 @@ $(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" + "$(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing qnettickthread.h... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp @@ -652,7 +543,7 @@ $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing qpulpewidget.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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" + "$(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing qpulpewidget.h... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp @@ -662,7 +553,7 @@ $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing qsaveimg.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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" + "$(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing qsaveimg.h... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp @@ -672,7 +563,7 @@ $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing qsaveresult.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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" + "$(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing qsaveresult.h... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp @@ -682,37 +573,17 @@ $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing qshowimg.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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" + "$(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing qshowimg.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.\..\..\..\spider\libZK" "-I.\..\..\..\tadpole\include" "-I.\..\..\..\tadpole\src\SubFilters" "-I.\..\..\..\tadpole\src\SubFilters\tpSubFilterDemo" "-I.\..\..\..\tadpole\src\tpGui" "-I.\..\..\..\tadpole\src\tpBase" "-I.\..\..\..\tadpole\src\lpbengine" "-I.\..\..\..\tadpole\src\tpNet" "-I.\..\..\..\tadpole\src\lpdesigner" "-I.\..\..\..\tadpole\src\tpMain" "-I.\..\..\..\tadpole\src\tpSubFilter" "-I.\..\..\..\tadpole\src\libzkq" "-I.\..\..\..\tadpole\src\tpAssister" "-I.\..\..\include\tpMain" "-I.\..\..\include\tpMain\SubFilters" "-I.\..\include" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include\opencv2" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include\opencv" "-I.\..\..\..\Cyclops\include" "-I.\..\..\src\algorithm" "-I.\..\..\include" "-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" - - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing qmainfilter_wheeldetect.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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing qmainfilter_wheeldetect.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.\..\..\..\spider\libZK" "-I.\..\..\..\tadpole\include" "-I.\..\..\..\tadpole\src\SubFilters" "-I.\..\..\..\tadpole\src\SubFilters\tpSubFilterDemo" "-I.\..\..\..\tadpole\src\tpGui" "-I.\..\..\..\tadpole\src\tpBase" "-I.\..\..\..\tadpole\src\lpbengine" "-I.\..\..\..\tadpole\src\tpNet" "-I.\..\..\..\tadpole\src\lpdesigner" "-I.\..\..\..\tadpole\src\tpMain" "-I.\..\..\..\tadpole\src\tpSubFilter" "-I.\..\..\..\tadpole\src\libzkq" "-I.\..\..\..\tadpole\src\tpAssister" "-I.\..\..\include\tpMain" "-I.\..\..\include\tpMain\SubFilters" "-I.\..\include" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include\opencv2" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include\opencv" "-I.\..\..\..\Cyclops\include" "-I.\..\..\src\algorithm" "-I.\..\..\include" "-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" - - - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing qmainfilter_wheeldetect_child.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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing qmainfilter_wheeldetect_child.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.\..\..\..\spider\libZK" "-I.\..\..\..\tadpole\include" "-I.\..\..\..\tadpole\src\SubFilters" "-I.\..\..\..\tadpole\src\SubFilters\tpSubFilterDemo" "-I.\..\..\..\tadpole\src\tpGui" "-I.\..\..\..\tadpole\src\tpBase" "-I.\..\..\..\tadpole\src\lpbengine" "-I.\..\..\..\tadpole\src\tpNet" "-I.\..\..\..\tadpole\src\lpdesigner" "-I.\..\..\..\tadpole\src\tpMain" "-I.\..\..\..\tadpole\src\tpSubFilter" "-I.\..\..\..\tadpole\src\libzkq" "-I.\..\..\..\tadpole\src\tpAssister" "-I.\..\..\include\tpMain" "-I.\..\..\include\tpMain\SubFilters" "-I.\..\include" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include\opencv2" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include\opencv" "-I.\..\..\..\Cyclops\include" "-I.\..\..\src\algorithm" "-I.\..\..\include" "-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" - $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing qmodnamedlg.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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" + "$(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing qmodnamedlg.h... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp @@ -722,7 +593,7 @@ $(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" + "$(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing qipconfigdlg.h... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp @@ -732,7 +603,7 @@ $(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" + "$(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing qdia2thsetting.h... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp @@ -742,7 +613,7 @@ $(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" + "$(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing qchannelmanager.h... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp @@ -752,7 +623,7 @@ $(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" + "$(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing qaddtimedlg.h... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp @@ -762,7 +633,7 @@ $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing qaddmodel.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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" + "$(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing qaddmodel.h... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp @@ -772,7 +643,7 @@ $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing QDiskCleanThread.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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" + "$(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing QDiskCleanThread.h... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp @@ -783,28 +654,18 @@ $(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" + "$(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" $(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.\..\..\..\spider\libZK" "-I.\..\..\..\tadpole\include" "-I.\..\..\..\tadpole\src\SubFilters" "-I.\..\..\..\tadpole\src\SubFilters\tpSubFilterDemo" "-I.\..\..\..\tadpole\src\tpGui" "-I.\..\..\..\tadpole\src\tpBase" "-I.\..\..\..\tadpole\src\lpbengine" "-I.\..\..\..\tadpole\src\tpNet" "-I.\..\..\..\tadpole\src\lpdesigner" "-I.\..\..\..\tadpole\src\tpMain" "-I.\..\..\..\tadpole\src\tpSubFilter" "-I.\..\..\..\tadpole\src\libzkq" "-I.\..\..\..\tadpole\src\tpAssister" "-I.\..\..\include\tpMain" "-I.\..\..\include\tpMain\SubFilters" "-I.\..\include" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include\opencv2" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include\opencv" "-I.\..\..\..\Cyclops\include" "-I.\..\..\src\algorithm" "-I.\..\..\include" "-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" - - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing ConnectModeUi.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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing ConnectModeUi.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.\..\..\..\spider\libZK" "-I.\..\..\..\tadpole\include" "-I.\..\..\..\tadpole\src\SubFilters" "-I.\..\..\..\tadpole\src\SubFilters\tpSubFilterDemo" "-I.\..\..\..\tadpole\src\tpGui" "-I.\..\..\..\tadpole\src\tpBase" "-I.\..\..\..\tadpole\src\lpbengine" "-I.\..\..\..\tadpole\src\tpNet" "-I.\..\..\..\tadpole\src\lpdesigner" "-I.\..\..\..\tadpole\src\tpMain" "-I.\..\..\..\tadpole\src\tpSubFilter" "-I.\..\..\..\tadpole\src\libzkq" "-I.\..\..\..\tadpole\src\tpAssister" "-I.\..\..\include\tpMain" "-I.\..\..\include\tpMain\SubFilters" "-I.\..\include" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include\opencv2" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include\opencv" "-I.\..\..\..\Cyclops\include" "-I.\..\..\src\algorithm" "-I.\..\..\include" "-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" - $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing customtableview.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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" + "$(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing customtableview.h... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp @@ -814,7 +675,7 @@ $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing databasesql.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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" + "$(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing databasesql.h... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp @@ -824,110 +685,43 @@ $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing DetectDataDB.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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" + "$(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing DetectDataDB.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.\..\..\..\spider\libZK" "-I.\..\..\..\tadpole\include" "-I.\..\..\..\tadpole\src\SubFilters" "-I.\..\..\..\tadpole\src\SubFilters\tpSubFilterDemo" "-I.\..\..\..\tadpole\src\tpGui" "-I.\..\..\..\tadpole\src\tpBase" "-I.\..\..\..\tadpole\src\lpbengine" "-I.\..\..\..\tadpole\src\tpNet" "-I.\..\..\..\tadpole\src\lpdesigner" "-I.\..\..\..\tadpole\src\tpMain" "-I.\..\..\..\tadpole\src\tpSubFilter" "-I.\..\..\..\tadpole\src\libzkq" "-I.\..\..\..\tadpole\src\tpAssister" "-I.\..\..\include\tpMain" "-I.\..\..\include\tpMain\SubFilters" "-I.\..\include" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include\opencv2" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include\opencv" "-I.\..\..\..\Cyclops\include" "-I.\..\..\src\algorithm" "-I.\..\..\include" "-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" - - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing DevelopUi.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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing DevelopUi.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.\..\..\..\spider\libZK" "-I.\..\..\..\tadpole\include" "-I.\..\..\..\tadpole\src\SubFilters" "-I.\..\..\..\tadpole\src\SubFilters\tpSubFilterDemo" "-I.\..\..\..\tadpole\src\tpGui" "-I.\..\..\..\tadpole\src\tpBase" "-I.\..\..\..\tadpole\src\lpbengine" "-I.\..\..\..\tadpole\src\tpNet" "-I.\..\..\..\tadpole\src\lpdesigner" "-I.\..\..\..\tadpole\src\tpMain" "-I.\..\..\..\tadpole\src\tpSubFilter" "-I.\..\..\..\tadpole\src\libzkq" "-I.\..\..\..\tadpole\src\tpAssister" "-I.\..\..\include\tpMain" "-I.\..\..\include\tpMain\SubFilters" "-I.\..\include" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include\opencv2" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include\opencv" "-I.\..\..\..\Cyclops\include" "-I.\..\..\src\algorithm" "-I.\..\..\include" "-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" - - - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing HannelUI.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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing HannelUI.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.\..\..\..\spider\libZK" "-I.\..\..\..\tadpole\include" "-I.\..\..\..\tadpole\src\SubFilters" "-I.\..\..\..\tadpole\src\SubFilters\tpSubFilterDemo" "-I.\..\..\..\tadpole\src\tpGui" "-I.\..\..\..\tadpole\src\tpBase" "-I.\..\..\..\tadpole\src\lpbengine" "-I.\..\..\..\tadpole\src\tpNet" "-I.\..\..\..\tadpole\src\lpdesigner" "-I.\..\..\..\tadpole\src\tpMain" "-I.\..\..\..\tadpole\src\tpSubFilter" "-I.\..\..\..\tadpole\src\libzkq" "-I.\..\..\..\tadpole\src\tpAssister" "-I.\..\..\include\tpMain" "-I.\..\..\include\tpMain\SubFilters" "-I.\..\include" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include\opencv2" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include\opencv" "-I.\..\..\..\Cyclops\include" "-I.\..\..\src\algorithm" "-I.\..\..\include" "-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" - - $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing IWheelCtrl.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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" + "$(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing IWheelCtrl.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.\..\..\..\spider\libZK" "-I.\..\..\..\tadpole\include" "-I.\..\..\..\tadpole\src\SubFilters" "-I.\..\..\..\tadpole\src\SubFilters\tpSubFilterDemo" "-I.\..\..\..\tadpole\src\tpGui" "-I.\..\..\..\tadpole\src\tpBase" "-I.\..\..\..\tadpole\src\lpbengine" "-I.\..\..\..\tadpole\src\tpNet" "-I.\..\..\..\tadpole\src\lpdesigner" "-I.\..\..\..\tadpole\src\tpMain" "-I.\..\..\..\tadpole\src\tpSubFilter" "-I.\..\..\..\tadpole\src\libzkq" "-I.\..\..\..\tadpole\src\tpAssister" "-I.\..\..\include\tpMain" "-I.\..\..\include\tpMain\SubFilters" "-I.\..\include" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include\opencv2" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include\opencv" "-I.\..\..\..\Cyclops\include" "-I.\..\..\src\algorithm" "-I.\..\..\include" "-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" - - - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing IWheelUi.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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing IWheelUi.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.\..\..\..\spider\libZK" "-I.\..\..\..\tadpole\include" "-I.\..\..\..\tadpole\src\SubFilters" "-I.\..\..\..\tadpole\src\SubFilters\tpSubFilterDemo" "-I.\..\..\..\tadpole\src\tpGui" "-I.\..\..\..\tadpole\src\tpBase" "-I.\..\..\..\tadpole\src\lpbengine" "-I.\..\..\..\tadpole\src\tpNet" "-I.\..\..\..\tadpole\src\lpdesigner" "-I.\..\..\..\tadpole\src\tpMain" "-I.\..\..\..\tadpole\src\tpSubFilter" "-I.\..\..\..\tadpole\src\libzkq" "-I.\..\..\..\tadpole\src\tpAssister" "-I.\..\..\include\tpMain" "-I.\..\..\include\tpMain\SubFilters" "-I.\..\include" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include\opencv2" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include\opencv" "-I.\..\..\..\Cyclops\include" "-I.\..\..\src\algorithm" "-I.\..\..\include" "-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" - - - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing IWheelUis.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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing IWheelUis.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.\..\..\..\spider\libZK" "-I.\..\..\..\tadpole\include" "-I.\..\..\..\tadpole\src\SubFilters" "-I.\..\..\..\tadpole\src\SubFilters\tpSubFilterDemo" "-I.\..\..\..\tadpole\src\tpGui" "-I.\..\..\..\tadpole\src\tpBase" "-I.\..\..\..\tadpole\src\lpbengine" "-I.\..\..\..\tadpole\src\tpNet" "-I.\..\..\..\tadpole\src\lpdesigner" "-I.\..\..\..\tadpole\src\tpMain" "-I.\..\..\..\tadpole\src\tpSubFilter" "-I.\..\..\..\tadpole\src\libzkq" "-I.\..\..\..\tadpole\src\tpAssister" "-I.\..\..\include\tpMain" "-I.\..\..\include\tpMain\SubFilters" "-I.\..\include" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include\opencv2" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include\opencv" "-I.\..\..\..\Cyclops\include" "-I.\..\..\src\algorithm" "-I.\..\..\include" "-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" - - - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing MainUi.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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing MainUi.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.\..\..\..\spider\libZK" "-I.\..\..\..\tadpole\include" "-I.\..\..\..\tadpole\src\SubFilters" "-I.\..\..\..\tadpole\src\SubFilters\tpSubFilterDemo" "-I.\..\..\..\tadpole\src\tpGui" "-I.\..\..\..\tadpole\src\tpBase" "-I.\..\..\..\tadpole\src\lpbengine" "-I.\..\..\..\tadpole\src\tpNet" "-I.\..\..\..\tadpole\src\lpdesigner" "-I.\..\..\..\tadpole\src\tpMain" "-I.\..\..\..\tadpole\src\tpSubFilter" "-I.\..\..\..\tadpole\src\libzkq" "-I.\..\..\..\tadpole\src\tpAssister" "-I.\..\..\include\tpMain" "-I.\..\..\include\tpMain\SubFilters" "-I.\..\include" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include\opencv2" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include\opencv" "-I.\..\..\..\Cyclops\include" "-I.\..\..\src\algorithm" "-I.\..\..\include" "-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" - $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing modelmgrdb.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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" + "$(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing modelmgrdb.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.\..\..\..\spider\libZK" "-I.\..\..\..\tadpole\include" "-I.\..\..\..\tadpole\src\SubFilters" "-I.\..\..\..\tadpole\src\SubFilters\tpSubFilterDemo" "-I.\..\..\..\tadpole\src\tpGui" "-I.\..\..\..\tadpole\src\tpBase" "-I.\..\..\..\tadpole\src\lpbengine" "-I.\..\..\..\tadpole\src\tpNet" "-I.\..\..\..\tadpole\src\lpdesigner" "-I.\..\..\..\tadpole\src\tpMain" "-I.\..\..\..\tadpole\src\tpSubFilter" "-I.\..\..\..\tadpole\src\libzkq" "-I.\..\..\..\tadpole\src\tpAssister" "-I.\..\..\include\tpMain" "-I.\..\..\include\tpMain\SubFilters" "-I.\..\include" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include\opencv2" "-I.\..\..\..\lpOpenCV\opencv2.4.9\build\include\opencv" "-I.\..\..\..\Cyclops\include" "-I.\..\..\src\algorithm" "-I.\..\..\include" "-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" - - - - - - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing ModelTableView.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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" + "$(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing ModelTableView.h... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp @@ -939,7 +733,7 @@ $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing ProgressView.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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" + "$(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing ProgressView.h... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp @@ -949,7 +743,7 @@ $(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" + "$(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing qaddchanneldlg.h... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp @@ -960,7 +754,7 @@ $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing qpixmapbar.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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" + "$(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing qpixmapbar.h... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp @@ -970,7 +764,7 @@ $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing qmysplashscreen.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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" + "$(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing qmysplashscreen.h... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp @@ -982,7 +776,7 @@ $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing qmythread.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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" + "$(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\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing qmythread.h... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp @@ -1459,7 +1253,7 @@ UNICODE;WIN32;WIN64;QT_CORE_LIB;TPMAIN_LIB;TPMAIN_EXPORTS;QT_GUI_LIB;QT_WIDGETS_LIB;QT_SQL_LIB;QT_PRINTSUPPORT_LIB;QT_NETWORK_LIB;QT_SERIALPORT_LIB;_WINDOWS;%(PreprocessorDefinitions) - .;.\GeneratedFiles;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\ActiveQt;$(QTDIR)\include\QtSerialPort;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtPrintSupport;$(QTDIR)\include\QtSql;$(QTDIR)\include\QtNetwork;..\..\src\algorithm;..\..\src\tpMain;..\..\src\tpMain\thread;..\..\src\tpMain\splashScreen;..\..\src\tpMain\LightBoxwidget;..\..\src\tpMain\QDiskCleanThread;..\..\src\tpMain\QPixmapListBar;..\..\src\userCtrl;..\..\src\NetWheel;..\..\src\RasterSDG20;..\..\src\ReportModel;..\..\3part\libzkq\include;..\..\3part\tadpole\include\tpBase;..\..\3part\opencv3.4.1\include;..\..\3part\opencv3.4.1\include\opencv;..\..\3part\opencv3.4.1\include\opencv2;..\..\3part\lpCoreCtrl\include;..\..\src\tpMain\algela;..\..\src\ImageCompare;%(AdditionalIncludeDirectories) + .;.\GeneratedFiles;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\ActiveQt;$(QTDIR)\include\QtSerialPort;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtPrintSupport;$(QTDIR)\include\QtSql;$(QTDIR)\include\QtNetwork;..\..\src\algorithm;..\..\src\tpMain;..\..\src\tpMain\thread;..\..\src\tpMain\splashScreen;..\..\src\tpMain\LightBoxwidget;..\..\src\tpMain\QDiskCleanThread;..\..\src\tpMain\QPixmapListBar;..\..\src\userCtrl;..\..\src\NetWheel;..\..\src\RasterSDG20;..\..\src\ReportModel;..\..\3part\libzkq\include;..\..\3part\tadpole\include\tpBase;..\..\3part\opencv3.4.1\include;..\..\3part\opencv3.4.1\include\opencv;..\..\3part\opencv3.4.1\include\opencv2;..\..\3part\lpCoreCtrl\include;..\..\src\tpMain\algela;..\..\src\ImageCompare;..\..\src\interface;%(AdditionalIncludeDirectories) Disabled ProgramDatabase MultiThreadedDebugDLL diff --git a/tpvs17/tpMain/tpMain.vcxproj.filters b/tpvs17/tpMain/tpMain.vcxproj.filters index 05dbba2..67f638b 100644 --- a/tpvs17/tpMain/tpMain.vcxproj.filters +++ b/tpvs17/tpMain/tpMain.vcxproj.filters @@ -33,9 +33,6 @@ cpp;moc False - - {5d06a994-0075-4a2e-9d46-9742e9cdc49e} - {cfbadce6-ec61-4f13-af7e-03e2f7f8dae4} @@ -209,9 +206,6 @@ Generated Files\Release - - Source Files - Generated Files\Debug @@ -371,51 +365,21 @@ Generated Files\Release - - Source Files - Generated Files\Debug Generated Files\Release - - MyUI - - - MyUI - channel - - channel - - - UI - - - UI - - - UI - - - UI - WheelNet WheelNet - - UI - - - UI - sql @@ -437,9 +401,6 @@ UI - - UI - Model @@ -640,21 +601,12 @@ Header Files - - Header Files - - - Header Files - Header Files Header Files - - Header Files - Header Files @@ -673,9 +625,6 @@ Header Files - - UI - WheelNet @@ -786,51 +735,21 @@ Thread - - Header Files - Resource Files Header Files - - Header Files - - - Header Files - Header Files Header Files - - Header Files - - - MyUI - - - MyUI - - - channel - channel - - UI - - - UI - - - UI - WheelNet @@ -849,9 +768,6 @@ Thread - - UI - Model @@ -861,9 +777,6 @@ UI - - UI - sql diff --git a/tpvs17/wheel.sln b/tpvs17/wheel.sln index 2206ca1..dd78d12 100644 --- a/tpvs17/wheel.sln +++ b/tpvs17/wheel.sln @@ -7,6 +7,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lpMain", "tpMain\tpMain.vcx EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tpAlgorithmQt", "tpAlgorithmQt\tpAlgorithmQt.vcxproj", "{B12702AD-ABFB-343A-A199-8E24837244A3}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QUserInfo", "QUserInfo\QUserInfo.vcxproj", "{D7AF8AA1-0F2C-407F-B135-FBDA4448EE16}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -21,6 +23,10 @@ Global {B12702AD-ABFB-343A-A199-8E24837244A3}.Debug|x64.Build.0 = Debug|x64 {B12702AD-ABFB-343A-A199-8E24837244A3}.Release|x64.ActiveCfg = Release|x64 {B12702AD-ABFB-343A-A199-8E24837244A3}.Release|x64.Build.0 = Release|x64 + {D7AF8AA1-0F2C-407F-B135-FBDA4448EE16}.Debug|x64.ActiveCfg = Debug|x64 + {D7AF8AA1-0F2C-407F-B135-FBDA4448EE16}.Debug|x64.Build.0 = Debug|x64 + {D7AF8AA1-0F2C-407F-B135-FBDA4448EE16}.Release|x64.ActiveCfg = Release|x64 + {D7AF8AA1-0F2C-407F-B135-FBDA4448EE16}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE