upright
/
wheeldetect
mirror of https://gitlab.hzleaper.com:81/bob.pan/wheeldetect.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

1、恢复光栅模块的相关功能

Browse Source 
2、恢复权限管理功能
newClassify
bobpan 5 years ago
parent b86cb3d079
commit d9eeb3a4a2
31 changed files with 682 additions and 620 deletions
Show Stats Download Patch File Download Diff File

BIN
runner17/Enchanter.exe
View File

Binary file not shown.

BIN
runner17/Enchanterd.exe
View File

Binary file not shown.

BIN
runner17/lpCoreCtrl.dll
View File

Binary file not shown.

24
src/RasterSDG20/Raster.cpp
Unescape Escape View File

@ -1,7 +1,10 @@
#include "Raster.h" #include "Raster.h"
#include "ThicknessVector.h" #include "ThicknessVector.h"
#include "QZkJsonParser.h" #include <QDebug>
#include "QDebug" #include <QJsonObject>
#include <QJsonDocument>
#include "QFile"
#pragma execution_character_set("utf-8") #pragma execution_character_set("utf-8")
CRaster::CRaster(QString strPath) CRaster::CRaster(QString strPath)
: m_pThickness(NULL), m_pRasSt(NULL), m_strPath(strPath) : m_pThickness(NULL), m_pRasSt(NULL), m_strPath(strPath)
@ -28,8 +31,15 @@ RasterST * CRaster::getRasterSt() const
bool CRaster::readRasterJson() bool CRaster::readRasterJson()
{ {
//!>读取调试模式信息 是否保存good的图片 是否保存bad的图片 是否使用调试模式 //!>读取调试模式信息 是否保存good的图片 是否保存bad的图片 是否使用调试模式
QFile loadFile(m_strPath);
QJsonObject jsRaster = QZkJsonParser::ReadJsonAuto(m_strPath); if (!loadFile.open(QIODevice::ReadOnly)) {
qWarning("Couldn't open save file.");
return false;
}
QByteArray readData = loadFile.readAll();
QJsonDocument readDoc = QJsonDocument::fromJson(readData);
QJsonObject jsRaster = readDoc.object();
QJsonObject Rsaterobj = jsRaster.value("Raster").toObject(); QJsonObject Rsaterobj = jsRaster.value("Raster").toObject();
if (!Rsaterobj.isEmpty()) { if (!Rsaterobj.isEmpty()) {
m_pRasSt->m_beilv = Rsaterobj.value("beilv").toDouble(5.07); m_pRasSt->m_beilv = Rsaterobj.value("beilv").toDouble(5.07);
@ -60,7 +70,7 @@ bool CRaster::readRasterJson()
bool CRaster::saveRasterJson(emTySaveJsonType emType) bool CRaster::saveRasterJson(emTySaveJsonType emType)
{ {
QJsonObject mObj = QZkJsonParser::ReadJsonAuto(m_strPath); QJsonObject mObj;
switch (emType) switch (emType)
{ {
case EMTYPE_RASTER:{ case EMTYPE_RASTER:{
@ -89,7 +99,11 @@ bool CRaster::saveRasterJson(emTySaveJsonType emType)
default: default:
break; break;
} }
QZkJsonParser::WriteJsonObject(m_strPath, mObj); QFile saveFile(m_strPath);
saveFile.open(QIODevice::WriteOnly);
QJsonDocument saveDoc(mObj);
saveFile.write(saveDoc.toJson());
saveFile.close();
return true; return true;
} }

283
src/RasterSDG20/muban.cpp
Unescape Escape View File

@ -23,7 +23,7 @@
#include "QCheckBox" #include "QCheckBox"
#include "QLabel" #include "QLabel"
#include "qfinddevice.h" #include "qfinddevice.h"
//#include "vld.h"
#pragma execution_character_set("utf-8") #pragma execution_character_set("utf-8")
struct RecvData{ struct RecvData{
quint8 data1; quint8 data1;
@ -36,24 +36,11 @@ struct RecvData{
quint8 data8; quint8 data8;
}; };
muban::muban(QWidget *parent) :QWidget(parent), m_pRasterCom(NULL), m_pRaster(NULL), pDetectStatePtr(NULL), bInsertData(false), m_graph1(NULL) muban::muban(QWidget *parent) :QWidget(parent), m_pRasterCom(NULL), m_pRaster(NULL), bInsertData(false), m_graph1(NULL)
{ {
QString uifilePath = QApplication::applicationDirPath()+"\\ui\\Rester.ui"; ui.setupUi(this);
QUiLoader uiLoader;
QFile file(uifilePath);
file.open(QIODevice::ReadOnly);
QWidget * getwidget = uiLoader.load(&file, parent);
onCreate(getwidget);
QGridLayout *gridOut = new QGridLayout;
gridOut->addWidget(getwidget);
this->setLayout(gridOut);
int a = getwidget->height();
int b = getwidget->width();
this->setBaseSize(a, b); initUI();
resize(getwidget->size());
getwidget->show();
Rasteranalysis = new QRasterAnalysis(); Rasteranalysis = new QRasterAnalysis();
Rasteranalysis->loadAnalyseUpdatefunc(this, &muban::Appanalysis); Rasteranalysis->loadAnalyseUpdatefunc(this, &muban::Appanalysis);
@ -157,18 +144,6 @@ void muban::Appanalysis(Raster_ComFrame m_ComFrame){
} }
} }
bool muban::onCreate(QWidget* parent)
{
if (parent == NULL)
return false;
QList<QWidget*> m_obj = parent->findChildren<QWidget*>();
for (int nIndex = 0; nIndex < m_obj.size(); nIndex++){
OnPolished(m_obj.at(nIndex));
}
OnPolished(parent);
return true;
}
void muban::SlotRecvDataByParent(QByteArray m_data) void muban::SlotRecvDataByParent(QByteArray m_data)
{ {
emit(recvDataSignal(m_data)); emit(recvDataSignal(m_data));
@ -204,59 +179,42 @@ void muban::SlotTxDataByParent(QByteArray m_data)
} }
bool muban::OnPolished(QWidget * watched) void muban::initUI()
{ {
if (watched == NULL) //connect(ui.Raster_SendData, SIGNAL(clicked()), this, SLOT(ButtonClick()));
return false; Raster_ShowlineEdit = ui.Raster_ShowlineEdit;
QString strObj = watched->objectName(); Raster_ShowlineEdit_2 = ui.Raster_ShowlineEdit_2;
if (strObj == "Raster_SendData"||strObj == "Raster_CheckSys"){ Raster_ShowlineEdit_3 = ui.Raster_ShowlineEdit_3;
connect(watched, SIGNAL(clicked()), this, SLOT(ButtonClick())); QGroupBox *pGroup = ui.groupBox_2;
} QHBoxLayout *pGridLayout = new QHBoxLayout;
else if (strObj == "Raster_ShowlineEdit"){ m_switchbp = new SWitchButton;
Raster_ShowlineEdit = qobject_cast<QLineEdit*>(watched); //m_switchbp->resize(150, 100);
} //m_switchbp->setFixedHeight(50);
else if (strObj == "Raster_ShowlineEdit_2"){ m_switchbp->SetOffName(tr("停止采样"));
Raster_ShowlineEdit_2 = qobject_cast<QLineEdit*>(watched); m_switchbp->SetOnName(tr("开始采样"));
} m_switchbp->SetPressOffBkColor1(QColor(230, 10, 10));
else if (strObj == "Raster_ShowlineEdit_3"){ m_switchbp->SetPressOffBkColor2(QColor(230, 10, 10));
Raster_ShowlineEdit_3 = qobject_cast<QLineEdit*>(watched); m_switchbp->SetPressOnBkColor1(QColor(46, 183, 67));
} m_switchbp->SetPressOnBkColor2(QColor(46, 183, 67));
else if (strObj == "Raster_gridLayout"){ m_switchbp->setObjectName("switchBP1");
int a = 0; m_switchbp->SetSwitchState(1);
connect(m_switchbp, SIGNAL(onStateChanged(int)), this, SLOT(onButtonClick(int)));
pGroup->setLayout(pGridLayout);
//pGroup->setFixedHeight(50);
pGridLayout->addWidget(m_switchbp);
pGridLayout->addSpacing(1);
}
else if (strObj == "groupBox_2"){ Raster_textBrowser = ui.Raster_textBrowser;
QGroupBox *pGroup = qobject_cast<QGroupBox*>(watched);
QHBoxLayout *pGridLayout = new QHBoxLayout; Raster_frame = ui.Raster_frame;
m_switchbp = new SWitchButton; QSize ht = Raster_frame->size();
//m_switchbp->resize(150, 100); QRect a= Raster_frame->rect();
//m_switchbp->setFixedHeight(50); m_chart = new myChart1(Raster_frame);
m_switchbp->SetOffName(tr("停止采样")); m_chart->setTitle(tr("光栅数据采样"));
m_switchbp->SetOnName(tr("开始采样"));
m_switchbp->SetPressOffBkColor1(QColor(230, 10, 10)); {
m_switchbp->SetPressOffBkColor2(QColor(230, 10, 10)); QGroupBox *pGroup = ui.Raster_groupBoxSys;
m_switchbp->SetPressOnBkColor1(QColor(46, 183, 67));
m_switchbp->SetPressOnBkColor2(QColor(46, 183, 67));
m_switchbp->setObjectName("switchBP1");
m_switchbp->SetSwitchState(1);
connect(m_switchbp, SIGNAL(onStateChanged(int)), this, SLOT(onButtonClick(int)));
pGroup->setLayout(pGridLayout);
//pGroup->setFixedHeight(50);
pGridLayout->addWidget(m_switchbp);
pGridLayout->addSpacing(1);
}
else if (strObj == "Raster_textBrowser"){
Raster_textBrowser = qobject_cast<QTextBrowser*>(watched);
}
else if (strObj == "Raster_frame"){
Raster_frame = qobject_cast<QFrame*>(watched);
QSize ht = Raster_frame->size();
QRect a= Raster_frame->rect();
m_chart = new myChart1(Raster_frame);
m_chart->setTitle(tr("光栅数据采样"));
}
else if (strObj == "Raster_groupBoxSys"){
QGroupBox *pGroup = qobject_cast<QGroupBox*>(watched);
QHBoxLayout *pGridLayout = new QHBoxLayout; QHBoxLayout *pGridLayout = new QHBoxLayout;
m_switsybp = new SWitchButton; m_switsybp = new SWitchButton;
m_switsybp->resize(150, 50); m_switsybp->resize(150, 50);
@ -274,90 +232,73 @@ bool muban::OnPolished(QWidget * watched)
pGridLayout->addWidget(m_switsybp); pGridLayout->addWidget(m_switsybp);
pGridLayout->addSpacing(1); pGridLayout->addSpacing(1);
} }
else if (strObj == "frame"){ doubleSpinBox_beilv = ui.doubleSpinBox_beilv;
QFrame *widget = qobject_cast<QFrame*>(watched); doubleSpinBox_baseheight = ui.doubleSpinBox_baseheight;
QGridLayout *ppp = new QGridLayout; doubleSpinBox_min = ui.doubleSpinBox_min;
widget->setLayout(ppp);
} connect(ui.Raster_SaveRaster, SIGNAL(clicked()), this, SLOT(onSaveData()));
else if (strObj == "doubleSpinBox_beilv"){
doubleSpinBox_beilv = qobject_cast<QDoubleSpinBox*>(watched); //串口扫描按钮
} connect(ui.Raster_ResScan, SIGNAL(clicked()), this, SLOT(onScanDevice()));
else if (strObj == "doubleSpinBox_baseheight"){
doubleSpinBox_baseheight = qobject_cast<QDoubleSpinBox*>(watched); //串口名
} Raster_ComBox = ui.Raster_ComBox;
else if (strObj == "doubleSpinBox_min"){
doubleSpinBox_min = qobject_cast<QDoubleSpinBox*>(watched); //波特率
} Raster_Baute = ui.Raster_Baute;
else if (strObj == "Raster_SaveRaster"){ Raster_Baute->addItem("115200");
connect(watched, SIGNAL(clicked()), this, SLOT(onSaveData())); Raster_Baute->addItem("38400");
} Raster_Baute->addItem("19200");
else if (strObj == "Raster_ResScan"){//串口扫描按钮 Raster_Baute->addItem("9600");
connect(watched, SIGNAL(clicked()), this, SLOT(onScanDevice()));
} // 打开设备
else if (strObj == "Raster_ComBox"){//串口名 Raster_OpenDevice = ui.Raster_OpenDevice;
Raster_ComBox = qobject_cast<QComboBox*>(watched); connect(Raster_OpenDevice, SIGNAL(clicked()), this, SLOT(onCtrolDevice()));
}
else if (strObj == "Raster_Baute"){//波特率 //关闭设备
Raster_Baute = qobject_cast<QComboBox*>(watched); Raster_CloseDevice = ui.Raster_CloseDevice;
Raster_Baute->addItem("115200"); connect(Raster_CloseDevice, SIGNAL(clicked()), this, SLOT(onCtrolDevice()));
Raster_Baute->addItem("38400");
Raster_Baute->addItem("19200");
Raster_Baute->addItem("9600"); connect(ui.Raster_SaveCombp, SIGNAL(clicked()), this, SLOT(onSaveData()));
}
else if (strObj == "Raster_OpenDevice"){// 打开设备 Raster_checkBox = ui.Raster_checkBox;
Raster_OpenDevice = qobject_cast<QPushButton*>(watched);
connect(Raster_OpenDevice, SIGNAL(clicked()), this, SLOT(onCtrolDevice()));
} Raster_showState_lb = ui.Raster_showState_lb;
else if (strObj == "Raster_CloseDevice"){//关闭设备
Raster_CloseDevice = qobject_cast<QPushButton*>(watched);
connect(Raster_CloseDevice, SIGNAL(clicked()), this, SLOT(onCtrolDevice())); SpinBox_max_size = ui.spinBox_maxsize;
}
else if (strObj == "Raster_SaveCombp"){
connect(watched, SIGNAL(clicked()), this, SLOT(onSaveData())); doubleSpinBox_mid_value = ui.doubleSpinBox_mid_value;
}
else if (strObj == "Raster_checkBox"){
Raster_checkBox = qobject_cast<QCheckBox*>(watched); m_tabWidget = ui.tabWidget;
} m_tabWidget->setCurrentIndex(10);
else if (strObj == "Raster_showState_lb"){
Raster_showState_lb = qobject_cast<QLabel*>(watched);
} Raster_doubleSpinBox_B = ui.Raster_doubleSpinBox_B;
else if (strObj == "spinBox_maxsize"){
SpinBox_max_size = qobject_cast<QSpinBox*>(watched); Raster_doubleSpinBox_K = ui.Raster_doubleSpinBox_K;
}
else if (strObj == "doubleSpinBox_mid_value"){ QPushButton *pBb = ui.Raster_SaveRasterDire;
doubleSpinBox_mid_value = qobject_cast<QDoubleSpinBox*>(watched); connect(pBb, SIGNAL(clicked()), this, SLOT(onSaveData()));
}
else if (strObj == "tabWidget"){ QFrame *pFrame = ui.Raster_frame_2;
m_tabWidget = qobject_cast<QTabWidget*>(watched); QGridLayout *pLayout = new QGridLayout;
m_tabWidget->setCurrentIndex(10); m_graph1 = new QSimpleTickerGraph(pFrame);
}
else if ("Raster_doubleSpinBox_B" == strObj){ m_graph1->setUnits("mm");
Raster_doubleSpinBox_B = qobject_cast<QDoubleSpinBox*>(watched); m_graph1->setRange(0, 300);
} m_graph1->setPointWidth(5);
else if ("Raster_doubleSpinBox_K" == strObj){ m_graph1->setBackgroundBrush(QBrush(QColor(15, 10, 10)));
Raster_doubleSpinBox_K = qobject_cast<QDoubleSpinBox*>(watched); m_graph1->setDataLinePen(QPen(QColor(255, 255, 255), 1));
} m_graph1->setGridPitch(100);
else if ("Raster_SaveRasterDire" == strObj){ m_graph1->setReferencePoints(QList<double>() << 10);
QPushButton *pBb = qobject_cast<QPushButton*>(watched);
connect(pBb, SIGNAL(clicked()), this, SLOT(onSaveData())); pLayout->addWidget(m_graph1);
} pFrame->setLayout(pLayout);
else if ("Raster_frame_2" == strObj){
QFrame *pFrame = qobject_cast<QFrame*>(watched);
QGridLayout *pLayout = new QGridLayout;
m_graph1 = new QSimpleTickerGraph(pFrame);
m_graph1->setUnits("mm");
m_graph1->setRange(0, 300);
m_graph1->setPointWidth(5);
m_graph1->setBackgroundBrush(QBrush(QColor(15, 10, 10)));
m_graph1->setDataLinePen(QPen(QColor(255, 255, 255), 1));
m_graph1->setGridPitch(100);
m_graph1->setReferencePoints(QList<double>() << 10);
pLayout->addWidget(m_graph1);
pFrame->setLayout(pLayout);
}
return true;
} }
void muban::changeEvent(QEvent *event) void muban::changeEvent(QEvent *event)
@ -565,10 +506,12 @@ Q_SLOT void muban::onSaveData()
mB = Raster_doubleSpinBox_B->value(); mB = Raster_doubleSpinBox_B->value();
if (Raster_doubleSpinBox_K) if (Raster_doubleSpinBox_K)
mK = Raster_doubleSpinBox_K->value(); mK = Raster_doubleSpinBox_K->value();
if (pDetectStatePtr) if (setfunc_)
{ {
pDetectStatePtr->setDia2ThPara(mK, mB); Dia2ThPara st;
pDetectStatePtr->save(); st.mb_ = mB;
st.mk_ = mK;
setfunc_(st);
} }
} }
} }
@ -673,10 +616,10 @@ void muban::showEvent(QShowEvent *event)
{ {
int a = 0; int a = 0;
bInsertData = true; bInsertData = true;
if (pDetectStatePtr) if (getfunc_)
{ {
float mB=0.0, mK=0.0; Dia2ThPara st = getfunc_();
pDetectStatePtr->getDia2ThPara(mK, mB); float mB= st.mb_, mK=st.mk_;
if (Raster_doubleSpinBox_B) if (Raster_doubleSpinBox_B)
{ {
Raster_doubleSpinBox_B->setValue(mB); Raster_doubleSpinBox_B->setValue(mB);

20
src/RasterSDG20/muban.h
Unescape Escape View File

@ -3,8 +3,9 @@
#include <QtWidgets/QWidget> #include <QtWidgets/QWidget>
#include "RasterAnalysis.h" #include "RasterAnalysis.h"
#include "IDetectState.h"
#include "qsimpletickergraph.h" #include "qsimpletickergraph.h"
#include "rastersdg20_global.h"
#include "ui_Rester.h"
class muban:public QWidget class muban:public QWidget
{ {
Q_OBJECT Q_OBJECT
@ -30,7 +31,11 @@ public:
Q_SLOT void onAddData2Graph(int nData); Q_SLOT void onAddData2Graph(int nData);
QString getSysState(quint8 nValue); QString getSysState(quint8 nValue);
void setDetectStatePtr(IDetectState *ptr){ if (ptr) { pDetectStatePtr = ptr; } };
void setSetDiaParaFunc(SetDiaParaFunc func) { setfunc_ = func; };
void setGetDiaParaFunc(GetDiaParaFunc func) { getfunc_ = func; };
void initUI();
signals: signals:
void recvDataSignal(QByteArray); void recvDataSignal(QByteArray);
void sgShowSys(QString,int); void sgShowSys(QString,int);
@ -45,13 +50,12 @@ private:
struct RasterST* m_pRaster; struct RasterST* m_pRaster;
struct RasterCom* m_pRasterCom; struct RasterCom* m_pRasterCom;
private: private:
virtual bool OnPolished(QWidget * watched);
virtual bool onCreate(QWidget* parent);
virtual void changeEvent(QEvent *); virtual void changeEvent(QEvent *);
void Appanalysis(Raster_ComFrame m_ComFrame); void Appanalysis(Raster_ComFrame m_ComFrame);
public slots: public slots:
virtual void SlotRecvDataByParent(QByteArray m_data); virtual void SlotRecvDataByParent(QByteArray m_data);
virtual void SlotTxDataByParent(QByteArray m_data); virtual void SlotTxDataByParent(QByteArray m_data);
virtual void SlotRxNumByParent(int num); virtual void SlotRxNumByParent(int num);
virtual void SlotTxNumByParent(int num); virtual void SlotTxNumByParent(int num);
virtual void SlotRxSizeByParent(int num); virtual void SlotRxSizeByParent(int num);
@ -95,15 +99,17 @@ private:
//tab2 //tab2
class QDoubleSpinBox *Raster_doubleSpinBox_K; class QDoubleSpinBox *Raster_doubleSpinBox_K;
class QDoubleSpinBox *Raster_doubleSpinBox_B; class QDoubleSpinBox *Raster_doubleSpinBox_B;
protected:
IDetectState *pDetectStatePtr;
Ui::Raster_Form ui;
protected:
bool bInsertData; bool bInsertData;
class QSimpleTickerGraph *m_graph1; class QSimpleTickerGraph *m_graph1;
protected: protected:
virtual void closeEvent(QCloseEvent *event); virtual void closeEvent(QCloseEvent *event);
virtual void showEvent(QShowEvent *event); virtual void showEvent(QShowEvent *event);
private:
SetDiaParaFunc setfunc_;
GetDiaParaFunc getfunc_;
}; };
#endif // MUBAN_H #endif // MUBAN_H

39
src/RasterSDG20/rastersdg20.cpp
Unescape Escape View File

@ -76,10 +76,14 @@ void RasterSDG20::onStartSampling()
m_pmuBan->onStartSampling(); m_pmuBan->onStartSampling();
} }
void RasterSDG20::onShowWidget() void RasterSDG20::onShowWidget(QWidget* parent)
{ {
m_pmuBan->setParent(parent);
m_pmuBan->SetData2UI(m_pRaster->getRasterSt()); m_pmuBan->SetData2UI(m_pRaster->getRasterSt());
m_pmuBan->SetData2UI(m_pRaster->getRasterCom()); m_pmuBan->SetData2UI(m_pRaster->getRasterCom());
m_pmuBan->setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint);
m_pmuBan->setWindowIcon(QIcon(":/image/leaper"));
m_pmuBan->setAttribute(Qt::WA_ShowModal, true);
m_pmuBan->setWindowModality(Qt::ApplicationModal); m_pmuBan->setWindowModality(Qt::ApplicationModal);
m_pmuBan->show(); m_pmuBan->show();
@ -143,27 +147,28 @@ Q_SLOT void RasterSDG20::onCtrolDevice(int nValue)
} }
} }
void RasterSDG20::setDetectStatePtr(IDetectState *mpDetectState)
{
if (mpDetectState)
{
pDetectState = mpDetectState;
if (m_pmuBan)
{
m_pmuBan->setDetectStatePtr(mpDetectState);
}
}
}
double RasterSDG20::getDiameterValue() double RasterSDG20::getDiameterValue()
{ {
double dDiameter = 0.0; double dDiameter = 0.0;
if (pDetectState) if (getfunc_)
{ {
float mK = 0.0, mB = 0.0; Dia2ThPara st = getfunc_();
pDetectState->getDia2ThPara(mK, mB); float mK = st.mk_, mB = st.mb_;
dDiameter = getThicknessValue()*mK + mB; dDiameter = getThicknessValue()*mK + mB;
} }
return dDiameter; return dDiameter;
} }
void RasterSDG20::setSetDiaParaFunc(SetDiaParaFunc func)
{
setfunc_ = func;
if (m_pmuBan)
m_pmuBan->setSetDiaParaFunc(func);
}
void RasterSDG20::setGetDiaParaFunc(GetDiaParaFunc func)
{
getfunc_ = func;
if (m_pmuBan)
m_pmuBan->setGetDiaParaFunc(func);
}

14
src/RasterSDG20/rastersdg20.h
Unescape Escape View File

@ -10,12 +10,13 @@ public:
RasterSDG20(const QString filepath); RasterSDG20(const QString filepath);
~RasterSDG20(); ~RasterSDG20();
virtual void onStartSampling(); virtual void onStartSampling();
virtual void onShowWidget(); virtual void onShowWidget(QWidget* parent);
virtual void addThicknessValue(double); virtual void addThicknessValue(double);
virtual double getThicknessValue() const; virtual double getThicknessValue() const;
virtual QString getThicknessValueStr() const; virtual QString getThicknessValueStr() const;
virtual void setDetectStatePtr(IDetectState *mpDetectState);
virtual double getDiameterValue(); virtual double getDiameterValue();
virtual void setSetDiaParaFunc(SetDiaParaFunc func);
virtual void setGetDiaParaFunc(GetDiaParaFunc func);
signals: signals:
void sgSendData(const QByteArray); void sgSendData(const QByteArray);
void sgShowComState(QString, int); void sgShowComState(QString, int);
@ -25,9 +26,12 @@ public:
Q_SLOT void onSaveRaster(int ntype); Q_SLOT void onSaveRaster(int ntype);
Q_SLOT void onCtrolDevice(int nValue); Q_SLOT void onCtrolDevice(int nValue);
private: private:
class muban* m_pmuBan; class muban* m_pmuBan{ nullptr };
class CMySerialPort* m_SerialPort; class CMySerialPort* m_SerialPort{ nullptr };
class CRaster *m_pRaster; class CRaster *m_pRaster{ nullptr };
SetDiaParaFunc setfunc_;
GetDiaParaFunc getfunc_;
}; };
#endif // RASTERSDG20_H #endif // RASTERSDG20_H

20
src/RasterSDG20/rastersdg20_global.h
Unescape Escape View File

@ -2,28 +2,34 @@
#define RASTERSDG20_GLOBAL_H #define RASTERSDG20_GLOBAL_H
#include <QtCore/qglobal.h> #include <QtCore/qglobal.h>
#include "QObject" #include <QObject>
//#include "IDetectState.h" #include <functional>
#ifdef RASTERSDG20_LIB #ifdef RASTERSDG20_LIB
# define RASTERSDG20_EXPORT Q_DECL_EXPORT # define RASTERSDG20_EXPORT Q_DECL_EXPORT
#else #else
# define RASTERSDG20_EXPORT Q_DECL_IMPORT # define RASTERSDG20_EXPORT Q_DECL_IMPORT
#endif #endif
typedef struct tagDia2ThPara
{
float mk_{ 0.0 };
float mb_{ 0.0 };
}Dia2ThPara;
typedef std::function<Dia2ThPara(void)> GetDiaParaFunc;
typedef std::function<void(Dia2ThPara)> SetDiaParaFunc;
class IRasterSDG20 :public QObject{ class IRasterSDG20 :public QObject{
Q_OBJECT Q_OBJECT
public: public:
IRasterSDG20(){/* pDetectState = NULL;*/ }; IRasterSDG20(){/* pDetectState = NULL;*/ };
virtual void onStartSampling() = 0; virtual void onStartSampling() = 0;
virtual void onShowWidget() = 0; virtual void onShowWidget(QWidget* parent) = 0;
virtual void addThicknessValue(double) = 0; virtual void addThicknessValue(double) = 0;
virtual double getThicknessValue() const = 0; virtual double getThicknessValue() const = 0;
virtual QString getThicknessValueStr() const = 0; virtual QString getThicknessValueStr() const = 0;
virtual double getDiameterValue() = 0; virtual double getDiameterValue() = 0;
//virtual void setDetectStatePtr(IDetectState *mpDetectState){ pDetectState = mpDetectState; }; virtual void setSetDiaParaFunc(SetDiaParaFunc func) = 0;
signals: virtual void setGetDiaParaFunc(GetDiaParaFunc func) = 0;
void sgThickness(double);
protected: protected:
//IDetectState *pDetectState;
}; };
extern "C" RASTERSDG20_EXPORT IRasterSDG20* RasterSDG20Create(const QString filepath); extern "C" RASTERSDG20_EXPORT IRasterSDG20* RasterSDG20Create(const QString filepath);

3
src/tpMain/IWheelCtrl.h
Unescape Escape View File

@ -11,6 +11,7 @@
#include "qstring.h" #include "qstring.h"
#include "qobject.h" #include "qobject.h"
#include "InfoFile.h" #include "InfoFile.h"
#include <QWidget>
class ModelManager; class ModelManager;
class CChannelInfo; class CChannelInfo;
class DetectState; class DetectState;
@ -62,7 +63,7 @@ public:
//net //net
virtual bool sendModelLib() = 0; virtual bool sendModelLib() = 0;
virtual bool onShowRaster() = 0; virtual bool onShowRaster(QWidget* parent) = 0;
signals: signals:
void sgModelChanged(); void sgModelChanged();
void sgModelChanged(QString); void sgModelChanged(QString);

2
src/tpMain/ProgressView.cpp
Unescape Escape View File

@ -13,7 +13,7 @@ ProgressView::ProgressView(QWidget* parent)
connect(m_pProgressDialog, SIGNAL(canceled()), this, SIGNAL(cancel())); connect(m_pProgressDialog, SIGNAL(canceled()), this, SIGNAL(cancel()));
m_pProgressDialog->setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint); m_pProgressDialog->setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint);
m_pProgressDialog->setWindowIcon(QIcon(":/resource/logo-8.png")); m_pProgressDialog->setWindowIcon(QIcon(":/image/leaper"));
m_pProgressDialog->setWindowModality(Qt::ApplicationModal); m_pProgressDialog->setWindowModality(Qt::ApplicationModal);
m_pProgressDialog->setAttribute(Qt::WA_ShowModal, true); m_pProgressDialog->setAttribute(Qt::WA_ShowModal, true);
} }

27
src/tpMain/WheelCtrl.cpp
Unescape Escape View File

@ -11,7 +11,7 @@
#include "CamConfig.h" #include "CamConfig.h"
#include "QThread" #include "QThread"
#include "qsaveresult.h" #include "qsaveresult.h"
#include "..\RasterSDG20\rastersdg20_global.h"
#include "QLibrary" #include "QLibrary"
#include "databasesql.h" #include "databasesql.h"
#include "DetectDataDB.h" #include "DetectDataDB.h"
@ -55,7 +55,7 @@ WheelCtrl::WheelCtrl(QString strPath, QMySplashScreen* pScreen)
ShowInitMsg(pScreen, tr("加载光栅通讯模块 ....")); ShowInitMsg(pScreen, tr("加载光栅通讯模块 ...."));
qDebug() << "loadLibRasterSDG20"; qDebug() << "loadLibRasterSDG20";
//loadLibRasterSDG20(strPath); loadLibRasterSDG20(strPath);
qDebug() << "loadLibRasterSDG20 end"; qDebug() << "loadLibRasterSDG20 end";
connect(saveResultThread, &QThread::finished, pSaveResult, &QObject::deleteLater); connect(saveResultThread, &QThread::finished, pSaveResult, &QObject::deleteLater);
connect(this, SIGNAL(operate(Result2Ui*)), pSaveResult, SLOT(doWork(Result2Ui*)),Qt::QueuedConnection); connect(this, SIGNAL(operate(Result2Ui*)), pSaveResult, SLOT(doWork(Result2Ui*)),Qt::QueuedConnection);
@ -108,10 +108,12 @@ void WheelCtrl::loadLibRasterSDG20(QString strPath)
#endif #endif
if (lib.load()){ if (lib.load()){
_RasterSDG20Create func = (_RasterSDG20Create)lib.resolve("RasterSDG20Create"); _RasterSDG20Create func = (_RasterSDG20Create)lib.resolve("RasterSDG20Create");
m_pRasterSDG20 = func(strPath + "\\user\\raster.json"); m_pRasterSDG20 = func(strPath + "\\raster.json");
//connect(m_pRasterSDG20, SIGNAL(sgThickness(double)), this, SIGNAL(onThickness(double))); GetDiaParaFunc getfunc = std::bind(&WheelCtrl::getDiaParam, this);
m_pRasterSDG20->setGetDiaParaFunc(getfunc);
SetDiaParaFunc setfunc = std::bind(&WheelCtrl::setDiaParam, this, std::placeholders::_1);
m_pRasterSDG20->setSetDiaParaFunc(setfunc);
m_pRasterSDG20->onStartSampling(); m_pRasterSDG20->onStartSampling();
//m_pRasterSDG20->setDetectStatePtr(m_pState);
} }
} }
@ -275,10 +277,10 @@ Q_SLOT void WheelCtrl::handleResult(Result2Ui *pResult)
qDebug() << "end thread save Result to DataBase"; qDebug() << "end thread save Result to DataBase";
} }
bool WheelCtrl::onShowRaster() bool WheelCtrl::onShowRaster(QWidget* parent)
{ {
if (m_pRasterSDG20){ if (m_pRasterSDG20){
m_pRasterSDG20->onShowWidget(); m_pRasterSDG20->onShowWidget(parent);
return true; return true;
} }
return false; return false;
@ -305,3 +307,14 @@ void WheelCtrl::ShowInitMsg(QMySplashScreen* p, QString str){
} }
} }
void WheelCtrl::setDiaParam(Dia2ThPara st)
{
DetectState::instance()->setDia2ThPara(st.mk_, st.mb_);
DetectState::instance()->save();
}
Dia2ThPara WheelCtrl::getDiaParam()
{
Dia2ThPara st;
DetectState::instance()->getDia2ThPara(st.mk_, st.mb_);
return st;
}

11
src/tpMain/WheelCtrl.h
Unescape Escape View File

@ -1,7 +1,10 @@
#pragma once #ifndef _H_WHEELCTRL_H_
#define _H_WHEELCTRL_H_
#include "IWheelCtrl.h" #include "IWheelCtrl.h"
#include "qstring.h" #include "qstring.h"
#include "qmysplashscreen.h" #include "qmysplashscreen.h"
#include "..\RasterSDG20\rastersdg20_global.h"
class CRaster; class CRaster;
class CWheelNet; class CWheelNet;
class CamConfig; class CamConfig;
@ -24,7 +27,7 @@ public:
virtual double getThickness() const; virtual double getThickness() const;
virtual QString getThicknessStr() const; virtual QString getThicknessStr() const;
virtual void appendThicknessValue(double nValue); virtual void appendThicknessValue(double nValue);
virtual bool onShowRaster(); virtual bool onShowRaster(QWidget* parent);
virtual void addLog(QString msg, int nType); virtual void addLog(QString msg, int nType);
virtual void saveResult(Result2Ui *); virtual void saveResult(Result2Ui *);
@ -52,6 +55,8 @@ public:
Q_SLOT void handleResult(Result2Ui *); Q_SLOT void handleResult(Result2Ui *);
void loadLibRasterSDG20(QString strPath); void loadLibRasterSDG20(QString strPath);
void ShowInitMsg(QMySplashScreen* p, QString str); void ShowInitMsg(QMySplashScreen* p, QString str);
void setDiaParam(Dia2ThPara st);
Dia2ThPara getDiaParam();
signals: signals:
void operate(Result2Ui *m_Res); void operate(Result2Ui *m_Res);
private: private:
@ -73,3 +78,5 @@ private:
//QSaveResultObj m_saveObj; //QSaveResultObj m_saveObj;
}; };
#endif

1
src/tpMain/qaddmodel.cpp
Unescape Escape View File

@ -8,6 +8,7 @@ QAddModel::QAddModel(QWidget *parent)
: QDialog(parent) : QDialog(parent)
{ {
ui.setupUi(this); ui.setupUi(this);
setWindowIcon(QIcon(":/image/leaper"));
setWindowFlags(Qt::WindowCloseButtonHint); setWindowFlags(Qt::WindowCloseButtonHint);
connect(ui.wf_model_add_button, SIGNAL(clicked()), this, SLOT(SlotAccept())); connect(ui.wf_model_add_button, SIGNAL(clicked()), this, SLOT(SlotAccept()));
connect(ui.wf_cancel, SIGNAL(clicked()), this, SLOT(SlotCancel())); connect(ui.wf_cancel, SIGNAL(clicked()), this, SLOT(SlotCancel()));

1
src/tpMain/qipconfigdlg.cpp
Unescape Escape View File

@ -5,6 +5,7 @@ QIPConfigDlg::QIPConfigDlg(QWidget *parent)
: QDialog(parent) : QDialog(parent)
{ {
ui.setupUi(this); ui.setupUi(this);
setWindowIcon(QIcon(":/image/leaper"));
// setWindowFlags(Qt::WindowFullscreenButtonHint); // setWindowFlags(Qt::WindowFullscreenButtonHint);
// setWindowFlags(Qt::WindowMinimizeButtonHint); // setWindowFlags(Qt::WindowMinimizeButtonHint);
// setWindowFlags(Qt::WindowTitleHint); // setWindowFlags(Qt::WindowTitleHint);

BIN
src/tpMain/tpMain.aps
View File

Binary file not shown.

117
tpvs17/RasterSDG20/RasterSDG20.vcxproj
Unescape Escape View File

@ -47,7 +47,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile> <ClCompile>
<PreprocessorDefinitions>UNICODE;WIN32;WIN64;QT_CORE_LIB;RASTERSDG20_LIB;QT_GUI_LIB;QT_UITOOLS_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>UNICODE;WIN32;WIN64;QT_CORE_LIB;RASTERSDG20_LIB;QT_GUI_LIB;QT_UITOOLS_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtUiTools;$(QTDIR)\include\QtWidgets;.\..\..\3part\libzkq\include;.\..\..\.\src\RasterSDG20\Analysis;.\..\..\.\src\RasterSDG20\Commom;.\..\..\.\src\RasterSDG20\mythread;.\..\..\.\src\RasterSDG20\widget;.\..\..\.\src\tpMain;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtUiTools;$(QTDIR)\include\QtWidgets;.\..\..\.\src\RasterSDG20\Analysis;.\..\..\.\src\RasterSDG20\Commom;.\..\..\.\src\RasterSDG20\mythread;.\..\..\.\src\RasterSDG20\widget;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@ -56,16 +56,16 @@
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
<OutputFile>$(SolutionDir)..\runner17\$(TargetName)$(TargetExt)</OutputFile> <OutputFile>$(SolutionDir)..\runner17\$(TargetName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(QTDIR)\lib;..\..\3part\libzkq\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>$(QTDIR)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>qtmaind.lib;Qt5Cored.lib;Qt5Guid.lib;Qt5UiToolsd.lib;Qt5Widgetsd.lib;libzkqd.lib;Qt5SerialPortd.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>qtmaind.lib;Qt5Cored.lib;Qt5Guid.lib;Qt5UiToolsd.lib;Qt5Widgetsd.lib;Qt5SerialPortd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<Profile>true</Profile> <Profile>true</Profile>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile> <ClCompile>
<PreprocessorDefinitions>UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;RASTERSDG20_LIB;QT_GUI_LIB;QT_UITOOLS_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;RASTERSDG20_LIB;QT_GUI_LIB;QT_UITOOLS_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtUiTools;$(QTDIR)\include\QtWidgets;.\..\..\.\src\RasterSDG20\Analysis;.\..\..\.\src\RasterSDG20\Commom;.\..\..\.\src\RasterSDG20\mythread;.\..\..\.\src\RasterSDG20\widget;.\..\..\..\frogs\include\libzkq;.\..\..\.\src\tpMain;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtUiTools;$(QTDIR)\include\QtWidgets;.\..\..\.\src\RasterSDG20\Analysis;.\..\..\.\src\RasterSDG20\Commom;.\..\..\.\src\RasterSDG20\mythread;.\..\..\.\src\RasterSDG20\widget;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DebugInformationFormat> <DebugInformationFormat>
</DebugInformationFormat> </DebugInformationFormat>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@ -73,10 +73,10 @@
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
<OutputFile>$(SolutionDir)..\runner13\$(TargetName)$(TargetExt)</OutputFile> <OutputFile>$(SolutionDir)..\runner17\$(TargetName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(QTDIR)\lib;..\..\..\frogs\win32\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>$(QTDIR)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>
<AdditionalDependencies>qtmain.lib;Qt5Core.lib;Qt5Gui.lib;Qt5UiTools.lib;Qt5Widgets.lib;libzkq.lib;Qt5SerialPort.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>qtmain.lib;Qt5Core.lib;Qt5Gui.lib;Qt5UiTools.lib;Qt5Widgets.lib;Qt5SerialPort.lib;%(AdditionalDependencies)</AdditionalDependencies>
<Profile>true</Profile> <Profile>true</Profile>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
@ -168,155 +168,112 @@
<ClCompile Include="GeneratedFiles\Release\moc_switchbutton.cpp"> <ClCompile Include="GeneratedFiles\Release\moc_switchbutton.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="GeneratedFiles\Release_xp\moc_CMySerialPort.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="GeneratedFiles\Release_xp\moc_muban.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="GeneratedFiles\Release_xp\moc_mychart1.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="GeneratedFiles\Release_xp\moc_myhelper.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="GeneratedFiles\Release_xp\moc_qextserialport.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="GeneratedFiles\Release_xp\moc_qfinddevice.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="GeneratedFiles\Release_xp\moc_qmythread.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="GeneratedFiles\Release_xp\moc_qsimpletickergraph.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="GeneratedFiles\Release_xp\moc_RasterAnalysis.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="GeneratedFiles\Release_xp\moc_rastersdg20.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="GeneratedFiles\Release_xp\moc_rastersdg20_global.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<CustomBuild Include="..\..\src\RasterSDG20\Commom\CMySerialPort.h"> <CustomBuild Include="..\..\src\RasterSDG20\Commom\CMySerialPort.h">
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing CMySerialPort.h...</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing CMySerialPort.h...</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DRASTERSDG20_LIB -DQT_GUI_LIB -DQT_UITOOLS_LIB -DQT_WIDGETS_LIB -D%(PreprocessorDefinitions) "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWidgets" "-I.\..\..\3part\libzkq\include" "-I.\..\..\.\src\RasterSDG20\Analysis" "-I.\..\..\.\src\RasterSDG20\Commom" "-I.\..\..\.\src\RasterSDG20\mythread" "-I.\..\..\.\src\RasterSDG20\widget" "-I.\..\..\.\src\tpMain"</Command> <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DRASTERSDG20_LIB -DQT_GUI_LIB -DQT_UITOOLS_LIB -DQT_WIDGETS_LIB -D%(PreprocessorDefinitions) "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWidgets" "-I.\..\..\.\src\RasterSDG20\Analysis" "-I.\..\..\.\src\RasterSDG20\Commom" "-I.\..\..\.\src\RasterSDG20\mythread" "-I.\..\..\.\src\RasterSDG20\widget"</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing CMySerialPort.h...</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing CMySerialPort.h...</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DRASTERSDG20_LIB -DQT_GUI_LIB -DQT_UITOOLS_LIB -DQT_WIDGETS_LIB -D%(PreprocessorDefinitions) "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWidgets" "-I.\..\..\.\src\RasterSDG20\Analysis" "-I.\..\..\.\src\RasterSDG20\Commom" "-I.\..\..\.\src\RasterSDG20\mythread" "-I.\..\..\.\src\RasterSDG20\widget" "-I.\..\..\..\frogs\include\libzkq" "-I.\..\..\.\src\tpMain"</Command> <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DRASTERSDG20_LIB -DQT_GUI_LIB -DQT_UITOOLS_LIB -DQT_WIDGETS_LIB -D%(PreprocessorDefinitions) "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWidgets" "-I.\..\..\.\src\RasterSDG20\Analysis" "-I.\..\..\.\src\RasterSDG20\Commom" "-I.\..\..\.\src\RasterSDG20\mythread" "-I.\..\..\.\src\RasterSDG20\widget"</Command>
</CustomBuild> </CustomBuild>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\src\RasterSDG20\Raster.h" /> <ClInclude Include="..\..\src\RasterSDG20\Raster.h" />
<ClInclude Include="..\..\src\RasterSDG20\ThicknessVector.h" /> <ClInclude Include="..\..\src\RasterSDG20\ThicknessVector.h" />
<ClInclude Include="GeneratedFiles\ui_Rester.h" />
<CustomBuild Include="..\..\src\RasterSDG20\rastersdg20_global.h"> <CustomBuild Include="..\..\src\RasterSDG20\rastersdg20_global.h">
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing rastersdg20_global.h...</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing rastersdg20_global.h...</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DRASTERSDG20_LIB -DQT_GUI_LIB -DQT_UITOOLS_LIB -DQT_WIDGETS_LIB -D%(PreprocessorDefinitions) "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWidgets" "-I.\..\..\3part\libzkq\include" "-I.\..\..\.\src\RasterSDG20\Analysis" "-I.\..\..\.\src\RasterSDG20\Commom" "-I.\..\..\.\src\RasterSDG20\mythread" "-I.\..\..\.\src\RasterSDG20\widget" "-I.\..\..\.\src\tpMain"</Command> <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DRASTERSDG20_LIB -DQT_GUI_LIB -DQT_UITOOLS_LIB -DQT_WIDGETS_LIB -D%(PreprocessorDefinitions) "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWidgets" "-I.\..\..\.\src\RasterSDG20\Analysis" "-I.\..\..\.\src\RasterSDG20\Commom" "-I.\..\..\.\src\RasterSDG20\mythread" "-I.\..\..\.\src\RasterSDG20\widget"</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing rastersdg20_global.h...</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing rastersdg20_global.h...</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DRASTERSDG20_LIB -DQT_GUI_LIB -DQT_UITOOLS_LIB -DQT_WIDGETS_LIB -D%(PreprocessorDefinitions) "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWidgets" "-I.\..\..\.\src\RasterSDG20\Analysis" "-I.\..\..\.\src\RasterSDG20\Commom" "-I.\..\..\.\src\RasterSDG20\mythread" "-I.\..\..\.\src\RasterSDG20\widget" "-I.\..\..\..\frogs\include\libzkq" "-I.\..\..\.\src\tpMain"</Command> <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DRASTERSDG20_LIB -DQT_GUI_LIB -DQT_UITOOLS_LIB -DQT_WIDGETS_LIB -D%(PreprocessorDefinitions) "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWidgets" "-I.\..\..\.\src\RasterSDG20\Analysis" "-I.\..\..\.\src\RasterSDG20\Commom" "-I.\..\..\.\src\RasterSDG20\mythread" "-I.\..\..\.\src\RasterSDG20\widget"</Command>
</CustomBuild> </CustomBuild>
<CustomBuild Include="..\..\src\RasterSDG20\rastersdg20.h"> <CustomBuild Include="..\..\src\RasterSDG20\rastersdg20.h">
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing rastersdg20.h...</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing rastersdg20.h...</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DRASTERSDG20_LIB -DQT_GUI_LIB -DQT_UITOOLS_LIB -DQT_WIDGETS_LIB -D%(PreprocessorDefinitions) "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWidgets" "-I.\..\..\3part\libzkq\include" "-I.\..\..\.\src\RasterSDG20\Analysis" "-I.\..\..\.\src\RasterSDG20\Commom" "-I.\..\..\.\src\RasterSDG20\mythread" "-I.\..\..\.\src\RasterSDG20\widget" "-I.\..\..\.\src\tpMain"</Command> <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DRASTERSDG20_LIB -DQT_GUI_LIB -DQT_UITOOLS_LIB -DQT_WIDGETS_LIB -D%(PreprocessorDefinitions) "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWidgets" "-I.\..\..\.\src\RasterSDG20\Analysis" "-I.\..\..\.\src\RasterSDG20\Commom" "-I.\..\..\.\src\RasterSDG20\mythread" "-I.\..\..\.\src\RasterSDG20\widget"</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing rastersdg20.h...</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing rastersdg20.h...</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DRASTERSDG20_LIB -DQT_GUI_LIB -DQT_UITOOLS_LIB -DQT_WIDGETS_LIB -D%(PreprocessorDefinitions) "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWidgets" "-I.\..\..\.\src\RasterSDG20\Analysis" "-I.\..\..\.\src\RasterSDG20\Commom" "-I.\..\..\.\src\RasterSDG20\mythread" "-I.\..\..\.\src\RasterSDG20\widget" "-I.\..\..\..\frogs\include\libzkq" "-I.\..\..\.\src\tpMain"</Command> <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DRASTERSDG20_LIB -DQT_GUI_LIB -DQT_UITOOLS_LIB -DQT_WIDGETS_LIB -D%(PreprocessorDefinitions) "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWidgets" "-I.\..\..\.\src\RasterSDG20\Analysis" "-I.\..\..\.\src\RasterSDG20\Commom" "-I.\..\..\.\src\RasterSDG20\mythread" "-I.\..\..\.\src\RasterSDG20\widget"</Command>
</CustomBuild> </CustomBuild>
<CustomBuild Include="..\..\src\RasterSDG20\qsimpletickergraph.h"> <CustomBuild Include="..\..\src\RasterSDG20\qsimpletickergraph.h">
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing qsimpletickergraph.h...</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing qsimpletickergraph.h...</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DRASTERSDG20_LIB -DQT_GUI_LIB -DQT_UITOOLS_LIB -DQT_WIDGETS_LIB -D%(PreprocessorDefinitions) "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWidgets" "-I.\..\..\3part\libzkq\include" "-I.\..\..\.\src\RasterSDG20\Analysis" "-I.\..\..\.\src\RasterSDG20\Commom" "-I.\..\..\.\src\RasterSDG20\mythread" "-I.\..\..\.\src\RasterSDG20\widget" "-I.\..\..\.\src\tpMain"</Command> <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DRASTERSDG20_LIB -DQT_GUI_LIB -DQT_UITOOLS_LIB -DQT_WIDGETS_LIB -D%(PreprocessorDefinitions) "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWidgets" "-I.\..\..\.\src\RasterSDG20\Analysis" "-I.\..\..\.\src\RasterSDG20\Commom" "-I.\..\..\.\src\RasterSDG20\mythread" "-I.\..\..\.\src\RasterSDG20\widget"</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing qsimpletickergraph.h...</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing qsimpletickergraph.h...</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DRASTERSDG20_LIB -DQT_GUI_LIB -DQT_UITOOLS_LIB -DQT_WIDGETS_LIB -D%(PreprocessorDefinitions) "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWidgets" "-I.\..\..\.\src\RasterSDG20\Analysis" "-I.\..\..\.\src\RasterSDG20\Commom" "-I.\..\..\.\src\RasterSDG20\mythread" "-I.\..\..\.\src\RasterSDG20\widget" "-I.\..\..\..\frogs\include\libzkq" "-I.\..\..\.\src\tpMain"</Command> <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DRASTERSDG20_LIB -DQT_GUI_LIB -DQT_UITOOLS_LIB -DQT_WIDGETS_LIB -D%(PreprocessorDefinitions) "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWidgets" "-I.\..\..\.\src\RasterSDG20\Analysis" "-I.\..\..\.\src\RasterSDG20\Commom" "-I.\..\..\.\src\RasterSDG20\mythread" "-I.\..\..\.\src\RasterSDG20\widget"</Command>
</CustomBuild> </CustomBuild>
<CustomBuild Include="..\..\src\RasterSDG20\qfinddevice.h"> <CustomBuild Include="..\..\src\RasterSDG20\qfinddevice.h">
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing qfinddevice.h...</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing qfinddevice.h...</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DRASTERSDG20_LIB -DQT_GUI_LIB -DQT_UITOOLS_LIB -DQT_WIDGETS_LIB -D%(PreprocessorDefinitions) "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWidgets" "-I.\..\..\3part\libzkq\include" "-I.\..\..\.\src\RasterSDG20\Analysis" "-I.\..\..\.\src\RasterSDG20\Commom" "-I.\..\..\.\src\RasterSDG20\mythread" "-I.\..\..\.\src\RasterSDG20\widget" "-I.\..\..\.\src\tpMain"</Command> <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DRASTERSDG20_LIB -DQT_GUI_LIB -DQT_UITOOLS_LIB -DQT_WIDGETS_LIB -D%(PreprocessorDefinitions) "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWidgets" "-I.\..\..\.\src\RasterSDG20\Analysis" "-I.\..\..\.\src\RasterSDG20\Commom" "-I.\..\..\.\src\RasterSDG20\mythread" "-I.\..\..\.\src\RasterSDG20\widget"</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing qfinddevice.h...</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing qfinddevice.h...</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DRASTERSDG20_LIB -DQT_GUI_LIB -DQT_UITOOLS_LIB -DQT_WIDGETS_LIB -D%(PreprocessorDefinitions) "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWidgets" "-I.\..\..\.\src\RasterSDG20\Analysis" "-I.\..\..\.\src\RasterSDG20\Commom" "-I.\..\..\.\src\RasterSDG20\mythread" "-I.\..\..\.\src\RasterSDG20\widget" "-I.\..\..\..\frogs\include\libzkq" "-I.\..\..\.\src\tpMain"</Command> <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DRASTERSDG20_LIB -DQT_GUI_LIB -DQT_UITOOLS_LIB -DQT_WIDGETS_LIB -D%(PreprocessorDefinitions) "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWidgets" "-I.\..\..\.\src\RasterSDG20\Analysis" "-I.\..\..\.\src\RasterSDG20\Commom" "-I.\..\..\.\src\RasterSDG20\mythread" "-I.\..\..\.\src\RasterSDG20\widget"</Command>
</CustomBuild> </CustomBuild>
<CustomBuild Include="..\..\src\RasterSDG20\muban.h"> <CustomBuild Include="..\..\src\RasterSDG20\muban.h">
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing muban.h...</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing muban.h...</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DRASTERSDG20_LIB -DQT_GUI_LIB -DQT_UITOOLS_LIB -DQT_WIDGETS_LIB -D%(PreprocessorDefinitions) "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWidgets" "-I.\..\..\3part\libzkq\include" "-I.\..\..\.\src\RasterSDG20\Analysis" "-I.\..\..\.\src\RasterSDG20\Commom" "-I.\..\..\.\src\RasterSDG20\mythread" "-I.\..\..\.\src\RasterSDG20\widget" "-I.\..\..\.\src\tpMain"</Command> <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DRASTERSDG20_LIB -DQT_GUI_LIB -DQT_UITOOLS_LIB -DQT_WIDGETS_LIB -D%(PreprocessorDefinitions) "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWidgets" "-I.\..\..\.\src\RasterSDG20\Analysis" "-I.\..\..\.\src\RasterSDG20\Commom" "-I.\..\..\.\src\RasterSDG20\mythread" "-I.\..\..\.\src\RasterSDG20\widget"</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing muban.h...</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing muban.h...</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DRASTERSDG20_LIB -DQT_GUI_LIB -DQT_UITOOLS_LIB -DQT_WIDGETS_LIB -D%(PreprocessorDefinitions) "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWidgets" "-I.\..\..\.\src\RasterSDG20\Analysis" "-I.\..\..\.\src\RasterSDG20\Commom" "-I.\..\..\.\src\RasterSDG20\mythread" "-I.\..\..\.\src\RasterSDG20\widget" "-I.\..\..\..\frogs\include\libzkq" "-I.\..\..\.\src\tpMain"</Command> <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DRASTERSDG20_LIB -DQT_GUI_LIB -DQT_UITOOLS_LIB -DQT_WIDGETS_LIB -D%(PreprocessorDefinitions) "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWidgets" "-I.\..\..\.\src\RasterSDG20\Analysis" "-I.\..\..\.\src\RasterSDG20\Commom" "-I.\..\..\.\src\RasterSDG20\mythread" "-I.\..\..\.\src\RasterSDG20\widget"</Command>
</CustomBuild> </CustomBuild>
<CustomBuild Include="..\..\src\RasterSDG20\widget\switchbutton.h"> <CustomBuild Include="..\..\src\RasterSDG20\widget\switchbutton.h">
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing switchbutton.h...</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing switchbutton.h...</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DRASTERSDG20_LIB -DQT_GUI_LIB -DQT_UITOOLS_LIB -DQT_WIDGETS_LIB -D%(PreprocessorDefinitions) "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWidgets" "-I.\..\..\3part\libzkq\include" "-I.\..\..\.\src\RasterSDG20\Analysis" "-I.\..\..\.\src\RasterSDG20\Commom" "-I.\..\..\.\src\RasterSDG20\mythread" "-I.\..\..\.\src\RasterSDG20\widget" "-I.\..\..\.\src\tpMain"</Command> <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DRASTERSDG20_LIB -DQT_GUI_LIB -DQT_UITOOLS_LIB -DQT_WIDGETS_LIB -D%(PreprocessorDefinitions) "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWidgets" "-I.\..\..\.\src\RasterSDG20\Analysis" "-I.\..\..\.\src\RasterSDG20\Commom" "-I.\..\..\.\src\RasterSDG20\mythread" "-I.\..\..\.\src\RasterSDG20\widget"</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing switchbutton.h...</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing switchbutton.h...</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DRASTERSDG20_LIB -DQT_GUI_LIB -DQT_UITOOLS_LIB -DQT_WIDGETS_LIB -D%(PreprocessorDefinitions) "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWidgets" "-I.\..\..\.\src\RasterSDG20\Analysis" "-I.\..\..\.\src\RasterSDG20\Commom" "-I.\..\..\.\src\RasterSDG20\mythread" "-I.\..\..\.\src\RasterSDG20\widget" "-I.\..\..\..\frogs\include\libzkq" "-I.\..\..\.\src\tpMain"</Command> <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DRASTERSDG20_LIB -DQT_GUI_LIB -DQT_UITOOLS_LIB -DQT_WIDGETS_LIB -D%(PreprocessorDefinitions) "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWidgets" "-I.\..\..\.\src\RasterSDG20\Analysis" "-I.\..\..\.\src\RasterSDG20\Commom" "-I.\..\..\.\src\RasterSDG20\mythread" "-I.\..\..\.\src\RasterSDG20\widget"</Command>
</CustomBuild> </CustomBuild>
<CustomBuild Include="..\..\src\RasterSDG20\widget\mychart1.h"> <CustomBuild Include="..\..\src\RasterSDG20\widget\mychart1.h">
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing mychart1.h...</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing mychart1.h...</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DRASTERSDG20_LIB -DQT_GUI_LIB -DQT_UITOOLS_LIB -DQT_WIDGETS_LIB -D%(PreprocessorDefinitions) "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWidgets" "-I.\..\..\3part\libzkq\include" "-I.\..\..\.\src\RasterSDG20\Analysis" "-I.\..\..\.\src\RasterSDG20\Commom" "-I.\..\..\.\src\RasterSDG20\mythread" "-I.\..\..\.\src\RasterSDG20\widget" "-I.\..\..\.\src\tpMain"</Command> <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DRASTERSDG20_LIB -DQT_GUI_LIB -DQT_UITOOLS_LIB -DQT_WIDGETS_LIB -D%(PreprocessorDefinitions) "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWidgets" "-I.\..\..\.\src\RasterSDG20\Analysis" "-I.\..\..\.\src\RasterSDG20\Commom" "-I.\..\..\.\src\RasterSDG20\mythread" "-I.\..\..\.\src\RasterSDG20\widget"</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing mychart1.h...</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing mychart1.h...</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DRASTERSDG20_LIB -DQT_GUI_LIB -DQT_UITOOLS_LIB -DQT_WIDGETS_LIB -D%(PreprocessorDefinitions) "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWidgets" "-I.\..\..\.\src\RasterSDG20\Analysis" "-I.\..\..\.\src\RasterSDG20\Commom" "-I.\..\..\.\src\RasterSDG20\mythread" "-I.\..\..\.\src\RasterSDG20\widget" "-I.\..\..\..\frogs\include\libzkq" "-I.\..\..\.\src\tpMain"</Command> <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DRASTERSDG20_LIB -DQT_GUI_LIB -DQT_UITOOLS_LIB -DQT_WIDGETS_LIB -D%(PreprocessorDefinitions) "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWidgets" "-I.\..\..\.\src\RasterSDG20\Analysis" "-I.\..\..\.\src\RasterSDG20\Commom" "-I.\..\..\.\src\RasterSDG20\mythread" "-I.\..\..\.\src\RasterSDG20\widget"</Command>
</CustomBuild> </CustomBuild>
<CustomBuild Include="..\..\src\RasterSDG20\mythread\qmythread.h"> <CustomBuild Include="..\..\src\RasterSDG20\mythread\qmythread.h">
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing qmythread.h...</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing qmythread.h...</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DRASTERSDG20_LIB -DQT_GUI_LIB -DQT_UITOOLS_LIB -DQT_WIDGETS_LIB -D%(PreprocessorDefinitions) "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWidgets" "-I.\..\..\3part\libzkq\include" "-I.\..\..\.\src\RasterSDG20\Analysis" "-I.\..\..\.\src\RasterSDG20\Commom" "-I.\..\..\.\src\RasterSDG20\mythread" "-I.\..\..\.\src\RasterSDG20\widget" "-I.\..\..\.\src\tpMain"</Command> <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DRASTERSDG20_LIB -DQT_GUI_LIB -DQT_UITOOLS_LIB -DQT_WIDGETS_LIB -D%(PreprocessorDefinitions) "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWidgets" "-I.\..\..\.\src\RasterSDG20\Analysis" "-I.\..\..\.\src\RasterSDG20\Commom" "-I.\..\..\.\src\RasterSDG20\mythread" "-I.\..\..\.\src\RasterSDG20\widget"</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing qmythread.h...</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing qmythread.h...</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DRASTERSDG20_LIB -DQT_GUI_LIB -DQT_UITOOLS_LIB -DQT_WIDGETS_LIB -D%(PreprocessorDefinitions) "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWidgets" "-I.\..\..\.\src\RasterSDG20\Analysis" "-I.\..\..\.\src\RasterSDG20\Commom" "-I.\..\..\.\src\RasterSDG20\mythread" "-I.\..\..\.\src\RasterSDG20\widget" "-I.\..\..\..\frogs\include\libzkq" "-I.\..\..\.\src\tpMain"</Command> <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DRASTERSDG20_LIB -DQT_GUI_LIB -DQT_UITOOLS_LIB -DQT_WIDGETS_LIB -D%(PreprocessorDefinitions) "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWidgets" "-I.\..\..\.\src\RasterSDG20\Analysis" "-I.\..\..\.\src\RasterSDG20\Commom" "-I.\..\..\.\src\RasterSDG20\mythread" "-I.\..\..\.\src\RasterSDG20\widget"</Command>
</CustomBuild> </CustomBuild>
<CustomBuild Include="..\..\src\RasterSDG20\Analysis\RasterAnalysis.h"> <CustomBuild Include="..\..\src\RasterSDG20\Analysis\RasterAnalysis.h">
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing RasterAnalysis.h...</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing RasterAnalysis.h...</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DRASTERSDG20_LIB -DQT_GUI_LIB -DQT_UITOOLS_LIB -DQT_WIDGETS_LIB -D%(PreprocessorDefinitions) "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWidgets" "-I.\..\..\3part\libzkq\include" "-I.\..\..\.\src\RasterSDG20\Analysis" "-I.\..\..\.\src\RasterSDG20\Commom" "-I.\..\..\.\src\RasterSDG20\mythread" "-I.\..\..\.\src\RasterSDG20\widget" "-I.\..\..\.\src\tpMain"</Command> <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DRASTERSDG20_LIB -DQT_GUI_LIB -DQT_UITOOLS_LIB -DQT_WIDGETS_LIB -D%(PreprocessorDefinitions) "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWidgets" "-I.\..\..\.\src\RasterSDG20\Analysis" "-I.\..\..\.\src\RasterSDG20\Commom" "-I.\..\..\.\src\RasterSDG20\mythread" "-I.\..\..\.\src\RasterSDG20\widget"</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing RasterAnalysis.h...</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing RasterAnalysis.h...</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DRASTERSDG20_LIB -DQT_GUI_LIB -DQT_UITOOLS_LIB -DQT_WIDGETS_LIB -D%(PreprocessorDefinitions) "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWidgets" "-I.\..\..\.\src\RasterSDG20\Analysis" "-I.\..\..\.\src\RasterSDG20\Commom" "-I.\..\..\.\src\RasterSDG20\mythread" "-I.\..\..\.\src\RasterSDG20\widget" "-I.\..\..\..\frogs\include\libzkq" "-I.\..\..\.\src\tpMain"</Command> <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DRASTERSDG20_LIB -DQT_GUI_LIB -DQT_UITOOLS_LIB -DQT_WIDGETS_LIB -D%(PreprocessorDefinitions) "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWidgets" "-I.\..\..\.\src\RasterSDG20\Analysis" "-I.\..\..\.\src\RasterSDG20\Commom" "-I.\..\..\.\src\RasterSDG20\mythread" "-I.\..\..\.\src\RasterSDG20\widget"</Command>
</CustomBuild> </CustomBuild>
<ClInclude Include="..\..\src\RasterSDG20\Commom\ctransform.h" /> <ClInclude Include="..\..\src\RasterSDG20\Commom\ctransform.h" />
<ClInclude Include="..\..\src\RasterSDG20\Commom\FastDelegate.h" /> <ClInclude Include="..\..\src\RasterSDG20\Commom\FastDelegate.h" />
@ -327,24 +284,34 @@
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing qextserialport.h...</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing qextserialport.h...</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DRASTERSDG20_LIB -DQT_GUI_LIB -DQT_UITOOLS_LIB -DQT_WIDGETS_LIB -D%(PreprocessorDefinitions) "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWidgets" "-I.\..\..\3part\libzkq\include" "-I.\..\..\.\src\RasterSDG20\Analysis" "-I.\..\..\.\src\RasterSDG20\Commom" "-I.\..\..\.\src\RasterSDG20\mythread" "-I.\..\..\.\src\RasterSDG20\widget" "-I.\..\..\.\src\tpMain"</Command> <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DRASTERSDG20_LIB -DQT_GUI_LIB -DQT_UITOOLS_LIB -DQT_WIDGETS_LIB -D%(PreprocessorDefinitions) "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWidgets" "-I.\..\..\.\src\RasterSDG20\Analysis" "-I.\..\..\.\src\RasterSDG20\Commom" "-I.\..\..\.\src\RasterSDG20\mythread" "-I.\..\..\.\src\RasterSDG20\widget"</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing qextserialport.h...</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing qextserialport.h...</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DRASTERSDG20_LIB -DQT_GUI_LIB -DQT_UITOOLS_LIB -DQT_WIDGETS_LIB -D%(PreprocessorDefinitions) "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWidgets" "-I.\..\..\.\src\RasterSDG20\Analysis" "-I.\..\..\.\src\RasterSDG20\Commom" "-I.\..\..\.\src\RasterSDG20\mythread" "-I.\..\..\.\src\RasterSDG20\widget" "-I.\..\..\..\frogs\include\libzkq" "-I.\..\..\.\src\tpMain"</Command> <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DRASTERSDG20_LIB -DQT_GUI_LIB -DQT_UITOOLS_LIB -DQT_WIDGETS_LIB -D%(PreprocessorDefinitions) "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWidgets" "-I.\..\..\.\src\RasterSDG20\Analysis" "-I.\..\..\.\src\RasterSDG20\Commom" "-I.\..\..\.\src\RasterSDG20\mythread" "-I.\..\..\.\src\RasterSDG20\widget"</Command>
</CustomBuild> </CustomBuild>
<CustomBuild Include="..\..\src\RasterSDG20\Commom\myhelper.h"> <CustomBuild Include="..\..\src\RasterSDG20\Commom\myhelper.h">
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing myhelper.h...</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing myhelper.h...</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DRASTERSDG20_LIB -DQT_GUI_LIB -DQT_UITOOLS_LIB -DQT_WIDGETS_LIB -D%(PreprocessorDefinitions) "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWidgets" "-I.\..\..\3part\libzkq\include" "-I.\..\..\.\src\RasterSDG20\Analysis" "-I.\..\..\.\src\RasterSDG20\Commom" "-I.\..\..\.\src\RasterSDG20\mythread" "-I.\..\..\.\src\RasterSDG20\widget" "-I.\..\..\.\src\tpMain"</Command> <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DRASTERSDG20_LIB -DQT_GUI_LIB -DQT_UITOOLS_LIB -DQT_WIDGETS_LIB -D%(PreprocessorDefinitions) "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWidgets" "-I.\..\..\.\src\RasterSDG20\Analysis" "-I.\..\..\.\src\RasterSDG20\Commom" "-I.\..\..\.\src\RasterSDG20\mythread" "-I.\..\..\.\src\RasterSDG20\widget"</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing myhelper.h...</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing myhelper.h...</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DRASTERSDG20_LIB -DQT_GUI_LIB -DQT_UITOOLS_LIB -DQT_WIDGETS_LIB -D%(PreprocessorDefinitions) "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWidgets" "-I.\..\..\.\src\RasterSDG20\Analysis" "-I.\..\..\.\src\RasterSDG20\Commom" "-I.\..\..\.\src\RasterSDG20\mythread" "-I.\..\..\.\src\RasterSDG20\widget" "-I.\..\..\..\frogs\include\libzkq" "-I.\..\..\.\src\tpMain"</Command> <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DRASTERSDG20_LIB -DQT_GUI_LIB -DQT_UITOOLS_LIB -DQT_WIDGETS_LIB -D%(PreprocessorDefinitions) "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWidgets" "-I.\..\..\.\src\RasterSDG20\Analysis" "-I.\..\..\.\src\RasterSDG20\Commom" "-I.\..\..\.\src\RasterSDG20\mythread" "-I.\..\..\.\src\RasterSDG20\widget"</Command>
</CustomBuild> </CustomBuild>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<CustomBuild Include="..\..\src\RasterSDG20\Rester.ui">
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Uic%27ing %(Identity)...</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\GeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Uic%27ing %(Identity)...</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>
</CustomBuild>
<None Include="rastersdg20_en.ts" /> <None Include="rastersdg20_en.ts" />
<None Include="rastersdg20_zh.ts" /> <None Include="rastersdg20_zh.ts" />
</ItemGroup> </ItemGroup>

44
tpvs17/RasterSDG20/RasterSDG20.vcxproj.filters
Unescape Escape View File

@ -42,11 +42,6 @@
<Filter Include="Rasterdlg"> <Filter Include="Rasterdlg">
<UniqueIdentifier>{a59fc7d7-edee-4333-83e2-834c6a540f67}</UniqueIdentifier> <UniqueIdentifier>{a59fc7d7-edee-4333-83e2-834c6a540f67}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Generated Files\Release_xp">
<UniqueIdentifier>{7bb7450f-10a5-47f0-bb6e-2e3f139ae9cf}</UniqueIdentifier>
<Extensions>cpp;moc</Extensions>
<SourceControlFiles>False</SourceControlFiles>
</Filter>
<Filter Include="widget"> <Filter Include="widget">
<UniqueIdentifier>{f44e5ba7-5926-41f9-b16b-0aa2b4cc97e1}</UniqueIdentifier> <UniqueIdentifier>{f44e5ba7-5926-41f9-b16b-0aa2b4cc97e1}</UniqueIdentifier>
</Filter> </Filter>
@ -66,9 +61,6 @@
<ClCompile Include="GeneratedFiles\Release\moc_CMySerialPort.cpp"> <ClCompile Include="GeneratedFiles\Release\moc_CMySerialPort.cpp">
<Filter>Generated Files\Release</Filter> <Filter>Generated Files\Release</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="GeneratedFiles\Release_xp\moc_CMySerialPort.cpp">
<Filter>Generated Files\Release_xp</Filter>
</ClCompile>
<ClCompile Include="..\..\src\RasterSDG20\Commom\ctransform.cpp"> <ClCompile Include="..\..\src\RasterSDG20\Commom\ctransform.cpp">
<Filter>Comm</Filter> <Filter>Comm</Filter>
</ClCompile> </ClCompile>
@ -78,9 +70,6 @@
<ClCompile Include="GeneratedFiles\Release\moc_myhelper.cpp"> <ClCompile Include="GeneratedFiles\Release\moc_myhelper.cpp">
<Filter>Generated Files\Release</Filter> <Filter>Generated Files\Release</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="GeneratedFiles\Release_xp\moc_myhelper.cpp">
<Filter>Generated Files\Release_xp</Filter>
</ClCompile>
<ClCompile Include="..\..\src\RasterSDG20\Commom\qextserialport.cpp"> <ClCompile Include="..\..\src\RasterSDG20\Commom\qextserialport.cpp">
<Filter>Comm</Filter> <Filter>Comm</Filter>
</ClCompile> </ClCompile>
@ -90,9 +79,6 @@
<ClCompile Include="GeneratedFiles\Release\moc_qextserialport.cpp"> <ClCompile Include="GeneratedFiles\Release\moc_qextserialport.cpp">
<Filter>Generated Files\Release</Filter> <Filter>Generated Files\Release</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="GeneratedFiles\Release_xp\moc_qextserialport.cpp">
<Filter>Generated Files\Release_xp</Filter>
</ClCompile>
<ClCompile Include="..\..\src\RasterSDG20\Commom\qextserialport_win.cpp"> <ClCompile Include="..\..\src\RasterSDG20\Commom\qextserialport_win.cpp">
<Filter>Comm</Filter> <Filter>Comm</Filter>
</ClCompile> </ClCompile>
@ -105,9 +91,6 @@
<ClCompile Include="GeneratedFiles\Release\moc_RasterAnalysis.cpp"> <ClCompile Include="GeneratedFiles\Release\moc_RasterAnalysis.cpp">
<Filter>Generated Files\Release</Filter> <Filter>Generated Files\Release</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="GeneratedFiles\Release_xp\moc_RasterAnalysis.cpp">
<Filter>Generated Files\Release_xp</Filter>
</ClCompile>
<ClCompile Include="..\..\src\RasterSDG20\mythread\qmythread.cpp"> <ClCompile Include="..\..\src\RasterSDG20\mythread\qmythread.cpp">
<Filter>Comm</Filter> <Filter>Comm</Filter>
</ClCompile> </ClCompile>
@ -117,9 +100,6 @@
<ClCompile Include="GeneratedFiles\Release\moc_qmythread.cpp"> <ClCompile Include="GeneratedFiles\Release\moc_qmythread.cpp">
<Filter>Generated Files\Release</Filter> <Filter>Generated Files\Release</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="GeneratedFiles\Release_xp\moc_qmythread.cpp">
<Filter>Generated Files\Release_xp</Filter>
</ClCompile>
<ClCompile Include="..\..\src\RasterSDG20\widget\mychart1.cpp"> <ClCompile Include="..\..\src\RasterSDG20\widget\mychart1.cpp">
<Filter>widget</Filter> <Filter>widget</Filter>
</ClCompile> </ClCompile>
@ -129,9 +109,6 @@
<ClCompile Include="GeneratedFiles\Release\moc_mychart1.cpp"> <ClCompile Include="GeneratedFiles\Release\moc_mychart1.cpp">
<Filter>Generated Files\Release</Filter> <Filter>Generated Files\Release</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="GeneratedFiles\Release_xp\moc_mychart1.cpp">
<Filter>Generated Files\Release_xp</Filter>
</ClCompile>
<ClCompile Include="..\..\src\RasterSDG20\widget\switchbutton.cpp"> <ClCompile Include="..\..\src\RasterSDG20\widget\switchbutton.cpp">
<Filter>widget</Filter> <Filter>widget</Filter>
</ClCompile> </ClCompile>
@ -150,18 +127,12 @@
<ClCompile Include="GeneratedFiles\Release\moc_muban.cpp"> <ClCompile Include="GeneratedFiles\Release\moc_muban.cpp">
<Filter>Generated Files\Release</Filter> <Filter>Generated Files\Release</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="GeneratedFiles\Release_xp\moc_muban.cpp">
<Filter>Generated Files\Release_xp</Filter>
</ClCompile>
<ClCompile Include="GeneratedFiles\Debug\moc_qfinddevice.cpp"> <ClCompile Include="GeneratedFiles\Debug\moc_qfinddevice.cpp">
<Filter>Generated Files\Debug</Filter> <Filter>Generated Files\Debug</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="GeneratedFiles\Release\moc_qfinddevice.cpp"> <ClCompile Include="GeneratedFiles\Release\moc_qfinddevice.cpp">
<Filter>Generated Files\Release</Filter> <Filter>Generated Files\Release</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="GeneratedFiles\Release_xp\moc_qfinddevice.cpp">
<Filter>Generated Files\Release_xp</Filter>
</ClCompile>
<ClCompile Include="..\..\src\RasterSDG20\qsimpletickergraph.cpp"> <ClCompile Include="..\..\src\RasterSDG20\qsimpletickergraph.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
@ -171,9 +142,6 @@
<ClCompile Include="GeneratedFiles\Release\moc_qsimpletickergraph.cpp"> <ClCompile Include="GeneratedFiles\Release\moc_qsimpletickergraph.cpp">
<Filter>Generated Files\Release</Filter> <Filter>Generated Files\Release</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="GeneratedFiles\Release_xp\moc_qsimpletickergraph.cpp">
<Filter>Generated Files\Release_xp</Filter>
</ClCompile>
<ClCompile Include="..\..\src\RasterSDG20\Raster.cpp"> <ClCompile Include="..\..\src\RasterSDG20\Raster.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
@ -186,18 +154,12 @@
<ClCompile Include="GeneratedFiles\Release\moc_rastersdg20.cpp"> <ClCompile Include="GeneratedFiles\Release\moc_rastersdg20.cpp">
<Filter>Generated Files\Release</Filter> <Filter>Generated Files\Release</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="GeneratedFiles\Release_xp\moc_rastersdg20.cpp">
<Filter>Generated Files\Release_xp</Filter>
</ClCompile>
<ClCompile Include="GeneratedFiles\Debug\moc_rastersdg20_global.cpp"> <ClCompile Include="GeneratedFiles\Debug\moc_rastersdg20_global.cpp">
<Filter>Generated Files\Debug</Filter> <Filter>Generated Files\Debug</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="GeneratedFiles\Release\moc_rastersdg20_global.cpp"> <ClCompile Include="GeneratedFiles\Release\moc_rastersdg20_global.cpp">
<Filter>Generated Files\Release</Filter> <Filter>Generated Files\Release</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="GeneratedFiles\Release_xp\moc_rastersdg20_global.cpp">
<Filter>Generated Files\Release_xp</Filter>
</ClCompile>
<ClCompile Include="..\..\src\RasterSDG20\ThicknessVector.cpp"> <ClCompile Include="..\..\src\RasterSDG20\ThicknessVector.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
@ -239,6 +201,9 @@
<CustomBuild Include="..\..\src\RasterSDG20\rastersdg20_global.h"> <CustomBuild Include="..\..\src\RasterSDG20\rastersdg20_global.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</CustomBuild> </CustomBuild>
<CustomBuild Include="..\..\src\RasterSDG20\Rester.ui">
<Filter>Form Files</Filter>
</CustomBuild>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\src\RasterSDG20\Commom\ctransform.h"> <ClInclude Include="..\..\src\RasterSDG20\Commom\ctransform.h">
@ -262,6 +227,9 @@
<ClInclude Include="..\..\src\RasterSDG20\ThicknessVector.h"> <ClInclude Include="..\..\src\RasterSDG20\ThicknessVector.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="GeneratedFiles\ui_Rester.h">
<Filter>Generated Files</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="rastersdg20_en.ts"> <None Include="rastersdg20_en.ts">

1
tpvs17/tpMain/QCamSettingDlg.cpp
Unescape Escape View File

@ -4,6 +4,7 @@ QCamSettingDlg::QCamSettingDlg(QWidget *parent)
: QWidget(parent) : QWidget(parent)
{ {
ui.setupUi(this); ui.setupUi(this);
setWindowIcon(QIcon(":/image/leaper"));
QGridLayout *pLayout = new QGridLayout(ui.widget); QGridLayout *pLayout = new QGridLayout(ui.widget);
m_pImgViewer = new RoiImgViewer(ui.widget); m_pImgViewer = new RoiImgViewer(ui.widget);
m_pImgViewer->setObjectName("Imageview_Setting"); m_pImgViewer->setObjectName("Imageview_Setting");

1
tpvs17/tpMain/QChannelMgrDlg.cpp
Unescape Escape View File

@ -5,6 +5,7 @@ QChannelMgrDlg::QChannelMgrDlg(QWidget *parent)
: QWidget(parent) : QWidget(parent)
{ {
ui.setupUi(this); ui.setupUi(this);
setWindowIcon(QIcon(":/image/leaper"));
} }
QChannelMgrDlg::~QChannelMgrDlg() QChannelMgrDlg::~QChannelMgrDlg()

1
tpvs17/tpMain/QDebugDlg.cpp
Unescape Escape View File

@ -7,6 +7,7 @@ QDebugDlg::QDebugDlg(QWidget *parent)
: QWidget(parent) : QWidget(parent)
{ {
ui.setupUi(this); ui.setupUi(this);
setWindowIcon(QIcon(":/image/leaper"));
connect(ui.Dlp_Next_button_2, SIGNAL(clicked()), this, SLOT(onButtonClicked())); connect(ui.Dlp_Next_button_2, SIGNAL(clicked()), this, SLOT(onButtonClicked()));
connect(ui.Dlp_StartDetect_button, SIGNAL(clicked()), this, SLOT(onButtonClicked())); connect(ui.Dlp_StartDetect_button, SIGNAL(clicked()), this, SLOT(onButtonClicked()));
connect(&m_simuliter, SIGNAL(timeout()), this, SLOT(onTimeOut())); connect(&m_simuliter, SIGNAL(timeout()), this, SLOT(onTimeOut()));

20
tpvs17/tpMain/QModelMgrDlg.cpp
Unescape Escape View File

@ -35,6 +35,7 @@ QModelMgrDlg::QModelMgrDlg(IWheelCtrl *ptr, QWidget *parent)
: QWidget(parent),m_pCtrl(ptr) : QWidget(parent),m_pCtrl(ptr)
{ {
ui.setupUi(this); ui.setupUi(this);
setWindowIcon(QIcon(":/image/leaper"));
connect(ui.m_pbAdd, SIGNAL(clicked()), this, SLOT(onButtonClicked())); connect(ui.m_pbAdd, SIGNAL(clicked()), this, SLOT(onButtonClicked()));
connect(ui.m_pbDel, SIGNAL(clicked()), this, SLOT(onButtonClicked())); connect(ui.m_pbDel, SIGNAL(clicked()), this, SLOT(onButtonClicked()));
connect(ui.m_pbMod, SIGNAL(clicked()), this, SLOT(onButtonClicked())); connect(ui.m_pbMod, SIGNAL(clicked()), this, SLOT(onButtonClicked()));
@ -82,6 +83,8 @@ QModelMgrDlg::QModelMgrDlg(IWheelCtrl *ptr, QWidget *parent)
ui.ModelMgr_model_edit_height->setValidator(new QRegExpValidator(regExpNum, this)); ui.ModelMgr_model_edit_height->setValidator(new QRegExpValidator(regExpNum, this));
ui.ModelMgr_model_edit_diameter->setValidator(new QRegExpValidator(regExpNum, this)); ui.ModelMgr_model_edit_diameter->setValidator(new QRegExpValidator(regExpNum, this));
} }
ui.m_pbDelAll->setVisible(false);
} }
QModelMgrDlg::~QModelMgrDlg() QModelMgrDlg::~QModelMgrDlg()
@ -251,11 +254,11 @@ Q_SLOT void QModelMgrDlg::onAddModel()
QAddModel m_AddModel(this); QAddModel m_AddModel(this);
m_AddModel.setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint); m_AddModel.setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint);
m_AddModel.setWindowIcon(QIcon(":/resource/logo-8.png")); m_AddModel.setWindowIcon(QIcon(":/image/leaper"));
m_AddModel.setWindowModality(Qt::ApplicationModal); m_AddModel.setWindowModality(Qt::ApplicationModal);
m_AddModel.setAttribute(Qt::WA_ShowModal, true); m_AddModel.setAttribute(Qt::WA_ShowModal, true);
m_AddModel.SetClearData(); m_AddModel.SetClearData();
m_AddModel.setWindowIcon(QIcon(MODEL_UI_ICON_LEAPER)); m_AddModel.setWindowIcon(QIcon(":/image/leaper"));
m_AddModel.setWindowTitle(tr("产品信息设置")); m_AddModel.setWindowTitle(tr("产品信息设置"));
m_AddModel.setFocus(); m_AddModel.setFocus();
if (m_AddModel.exec() == QDialog::Accepted) { if (m_AddModel.exec() == QDialog::Accepted) {
@ -433,7 +436,7 @@ Q_SLOT void QModelMgrDlg::onChangeModelName()
} }
QModNamedlg dlg(this); QModNamedlg dlg(this);
dlg.setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint); dlg.setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint);
dlg.setWindowIcon(QIcon(":/resource/logo-8.png")); dlg.setWindowIcon(QIcon(":/image/leaper"));
dlg.setWindowModality(Qt::ApplicationModal); dlg.setWindowModality(Qt::ApplicationModal);
dlg.setAttribute(Qt::WA_ShowModal, true); dlg.setAttribute(Qt::WA_ShowModal, true);
QString m_newName; QString m_newName;
@ -842,6 +845,17 @@ void QModelMgrDlg::TrainOneTskFunc()
m_strTrainModel.clear(); m_strTrainModel.clear();
} }
void QModelMgrDlg::onUserLevel(int level)
{
if (level > 4)
{
ui.m_pbDelAll->setVisible(true);
}
else {
ui.m_pbDelAll->setVisible(false);
}
}
void QModelMgrDlg::updateWidget(QString str) void QModelMgrDlg::updateWidget(QString str)
{ {
// update images // update images

2
tpvs17/tpMain/QModelMgrDlg.h
Unescape Escape View File

@ -38,6 +38,8 @@ public:
void TrainAllTskFunc(); void TrainAllTskFunc();
void TrainOneTskFunc(); void TrainOneTskFunc();
void onUserLevel(int level);
signals: signals:
void sgPrograssShow(QString title, QString strValue, int size, int model); void sgPrograssShow(QString title, QString strValue, int size, int model);
void sgTrainShowInfo(QString str); void sgTrainShowInfo(QString str);

1
tpvs17/tpMain/QSettingDlg.cpp
Unescape Escape View File

@ -4,6 +4,7 @@ QSettingDlg::QSettingDlg(QWidget *parent)
: QWidget(parent) : QWidget(parent)
{ {
ui.setupUi(this); ui.setupUi(this);
setWindowIcon(QIcon(":/image/leaper"));
} }
QSettingDlg::~QSettingDlg() QSettingDlg::~QSettingDlg()

1
tpvs17/tpMain/QSystemSettingDlg.cpp
Unescape Escape View File

@ -34,6 +34,7 @@ QSystemSettingDlg::QSystemSettingDlg(QWidget *parent)
: QWidget(parent) : QWidget(parent)
{ {
ui.setupUi(this); ui.setupUi(this);
setWindowIcon(QIcon(":/image/leaper"));
m_setting = new QSettings(".\\user\\systemfile.ini", QSettings::IniFormat); m_setting = new QSettings(".\\user\\systemfile.ini", QSettings::IniFormat);
readSettingFile(); readSettingFile();
m_listwidgetItemStr.append(tr("相关设备配置")); m_listwidgetItemStr.append(tr("相关设备配置"));

1
tpvs17/tpMain/QTimeMgrDlg.cpp
Unescape Escape View File

@ -16,6 +16,7 @@ QTimeMgrDlg::QTimeMgrDlg(QWidget *parent)
: QDialog(parent) : QDialog(parent)
{ {
ui.setupUi(this); ui.setupUi(this);
setWindowIcon(QIcon(":/image/leaper"));
tablemodel = new QStandardItemModel(); tablemodel = new QStandardItemModel();
QStringList stringList; QStringList stringList;
stringList << tr("班次") << tr("起始时间") << tr("结束时间"); stringList << tr("班次") << tr("起始时间") << tr("结束时间");

155
tpvs17/tpMain/lpMainWin.cpp
Unescape Escape View File

@ -17,11 +17,15 @@
#include <QMenu> #include <QMenu>
#include "saveimgthread.h" #include "saveimgthread.h"
#include "lpGlobalData.h" #include "lpGlobalData.h"
#define VERSION_HUB "3.0.0.1"
#define VERSION_ALG "3.0.0.1"
#define UPDATE_TIME "2021-02-20"
#pragma execution_character_set("utf-8") #pragma execution_character_set("utf-8")
lpMainWin::lpMainWin(QWidget *parent) lpMainWin::lpMainWin(QWidget *parent)
: QMainWindow(parent) : QMainWindow(parent)
{ {
this->setWindowIcon(QIcon(":/image/leaper"));
QMySplashScreen m_screen; QMySplashScreen m_screen;
m_screen.show(); m_screen.show();
qRegisterMetaType<TimeStruct>("TimeStruct"); qRegisterMetaType<TimeStruct>("TimeStruct");
@ -54,6 +58,7 @@ lpMainWin::lpMainWin(QWidget *parent)
connect(ui.btn_start_detect, SIGNAL(clicked()), this, SLOT(onButtonClicked())); connect(ui.btn_start_detect, SIGNAL(clicked()), this, SLOT(onButtonClicked()));
connect(ui.btn_clear_data, SIGNAL(clicked()), this, SLOT(onButtonClicked())); connect(ui.btn_clear_data, SIGNAL(clicked()), this, SLOT(onButtonClicked()));
ui.action_userManager->setVisible(false);
QMenu *pToolMenu = new QMenu(this); QMenu *pToolMenu = new QMenu(this);
// QFont font; // QFont font;
// font.setPixelSize(24); // font.setPixelSize(24);
@ -112,7 +117,7 @@ lpMainWin::lpMainWin(QWidget *parent)
ui.statusBar->addWidget(m_pLbDetectState, 1); ui.statusBar->addWidget(m_pLbDetectState, 1);
ui.statusBar->addWidget(m_pLbUser, 1); ui.statusBar->addWidget(m_pLbUser, 1);
ui.statusBar->addWidget(m_pLbBanci); ui.statusBar->addWidget(m_pLbBanci,1);
ui.statusBar->addPermanentWidget(m_pLbCurrentTime); ui.statusBar->addPermanentWidget(m_pLbCurrentTime);
} }
//加载用户管理模块 //加载用户管理模块
@ -565,16 +570,7 @@ void lpMainWin::IVariantMapToUI(const QString& camKey, const QVariantMap& vMap)
m_pCtrl->saveResult(pResult); m_pCtrl->saveResult(pResult);
saveImage(pResult); saveImage(pResult);
delete pResult; delete pResult;
// m_IsDetected--;
// if (m_IsDetected <= 0)
// {
// m_IsDetected = 0;
// //emit(sgFinish());
// }
} }
/*多线程获取算法参数*/ /*多线程获取算法参数*/
@ -637,6 +633,10 @@ Q_SLOT void lpMainWin::onLogInOut(QString strName, int level, int state)
ui.action_Login->setText(tr("登 录")); ui.action_Login->setText(tr("登 录"));
} }
onUpdateByLevel(level); onUpdateByLevel(level);
if (m_pModelMgrDlg)
{
m_pModelMgrDlg->onUserLevel(level);
}
} }
Q_SLOT void lpMainWin::onActionClicked() Q_SLOT void lpMainWin::onActionClicked()
@ -648,19 +648,46 @@ Q_SLOT void lpMainWin::onActionClicked()
{ {
m_pUserCtrl->ShowUserMgrDlg(this); m_pUserCtrl->ShowUserMgrDlg(this);
} }
else
{
QMessageBox infobox(QMessageBox::Information, tr("提示"), tr("该功能未启用."), QMessageBox::Yes, this);
infobox.setWindowIcon(QIcon(":/image/leaper"));
infobox.setButtonText(QMessageBox::Yes, tr("确认"));
infobox.exec();
}
} }
else if ("action_Login" == strObj) { else if ("action_Login" == strObj) {
/*用户登陆*/ /*用户登陆*/
if (m_pUserCtrl) if (m_pUserCtrl)
{ {
m_pUserCtrl->CheckLogin(this); if (m_pUserCtrl->getLoginState() == EM_LOGIN)
{
QMessageBox infobox(QMessageBox::Information, tr("提示"), QString("%1 %2 ?").arg(tr("你确定要注销")).arg(m_pUserCtrl->CurUser()), QMessageBox::Yes | QMessageBox::No, this);
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(this);
}
}
else
{
QMessageBox infobox(QMessageBox::Information, tr("提示"), tr("该功能未启用."), QMessageBox::Yes, this);
infobox.setWindowIcon(QIcon(":/image/leaper"));
infobox.setButtonText(QMessageBox::Yes, tr("确认"));
infobox.exec();
} }
} }
else if ("action_about" == strObj) { else if ("action_about" == strObj) {
m_aboutDlg.setWindowIcon(QIcon(":/image/leaper"));
m_aboutDlg.setParent(this); m_aboutDlg.setParent(this);
m_aboutDlg.setWindowTitle(tr("关于")); m_aboutDlg.setWindowTitle(tr("关于"));
m_aboutDlg.setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint); m_aboutDlg.setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint);
m_aboutDlg.setWindowIcon(QIcon(":/resource/logo-8.png"));
m_aboutDlg.setWindowModality(Qt::ApplicationModal); m_aboutDlg.setWindowModality(Qt::ApplicationModal);
m_aboutDlg.setAttribute(Qt::WA_ShowModal, true); m_aboutDlg.setAttribute(Qt::WA_ShowModal, true);
m_aboutDlg.show(); m_aboutDlg.show();
@ -670,14 +697,17 @@ Q_SLOT void lpMainWin::onActionClicked()
m_pNet->onShowIpDlg(this); m_pNet->onShowIpDlg(this);
} }
else if ("action_cali_raster" == strObj) {//光栅测试 else if ("action_cali_raster" == strObj) {//光栅测试
if (m_pCtrl)
{
m_pCtrl->onShowRaster(this);
}
} }
else if ("action_setting_ban" == strObj) { else if ("action_setting_ban" == strObj) {
if (m_pTimerMgrDlg) { if (m_pTimerMgrDlg) {
m_pTimerMgrDlg->setParent(this); m_pTimerMgrDlg->setParent(this);
m_pTimerMgrDlg->setWindowTitle(tr("班次管理")); m_pTimerMgrDlg->setWindowTitle(tr("班次管理"));
m_pTimerMgrDlg->setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint); m_pTimerMgrDlg->setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint);
m_pTimerMgrDlg->setWindowIcon(QIcon(":/resource/logo-8.png")); m_pTimerMgrDlg->setWindowIcon(QIcon(":/image/leaper"));
m_pTimerMgrDlg->setWindowModality(Qt::ApplicationModal); m_pTimerMgrDlg->setWindowModality(Qt::ApplicationModal);
m_pTimerMgrDlg->setAttribute(Qt::WA_ShowModal, true); m_pTimerMgrDlg->setAttribute(Qt::WA_ShowModal, true);
m_pTimerMgrDlg->show(); m_pTimerMgrDlg->show();
@ -688,7 +718,7 @@ Q_SLOT void lpMainWin::onActionClicked()
m_pDebugDlg->setParent(this); m_pDebugDlg->setParent(this);
m_pDebugDlg->setWindowTitle(tr("调试工具")); m_pDebugDlg->setWindowTitle(tr("调试工具"));
m_pDebugDlg->setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint); m_pDebugDlg->setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint);
m_pDebugDlg->setWindowIcon(QIcon(":/resource/logo-8.png")); m_pDebugDlg->setWindowIcon(QIcon(":/image/leaper"));
m_pDebugDlg->setWindowModality(Qt::ApplicationModal); m_pDebugDlg->setWindowModality(Qt::ApplicationModal);
m_pDebugDlg->setAttribute(Qt::WA_ShowModal, true); m_pDebugDlg->setAttribute(Qt::WA_ShowModal, true);
m_pDebugDlg->show(); m_pDebugDlg->show();
@ -699,7 +729,7 @@ Q_SLOT void lpMainWin::onActionClicked()
{ {
m_pworkUI->setParent(this); m_pworkUI->setParent(this);
m_pworkUI->setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint); m_pworkUI->setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint);
m_pworkUI->setWindowIcon(QIcon(":/resource/logo-8.png")); m_pworkUI->setWindowIcon(QIcon(":/image/leaper"));
m_pworkUI->setWindowModality(Qt::ApplicationModal); m_pworkUI->setWindowModality(Qt::ApplicationModal);
m_pworkUI->setAttribute(Qt::WA_ShowModal, true); m_pworkUI->setAttribute(Qt::WA_ShowModal, true);
m_pworkUI->onExec(); m_pworkUI->onExec();
@ -714,7 +744,7 @@ Q_SLOT void lpMainWin::onActionClicked()
m_pModelMgrDlg->setParent(this); m_pModelMgrDlg->setParent(this);
m_pModelMgrDlg->setWindowTitle(tr("模板管理")); m_pModelMgrDlg->setWindowTitle(tr("模板管理"));
m_pModelMgrDlg->setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint); m_pModelMgrDlg->setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint);
m_pModelMgrDlg->setWindowIcon(QIcon(":/resource/logo-8.png")); m_pModelMgrDlg->setWindowIcon(QIcon(":/image/leaper"));
m_pModelMgrDlg->setWindowModality(Qt::ApplicationModal); m_pModelMgrDlg->setWindowModality(Qt::ApplicationModal);
m_pModelMgrDlg->setAttribute(Qt::WA_ShowModal, true); m_pModelMgrDlg->setAttribute(Qt::WA_ShowModal, true);
m_pModelMgrDlg->show(); m_pModelMgrDlg->show();
@ -727,7 +757,7 @@ Q_SLOT void lpMainWin::onActionClicked()
m_pSystemSettingDlg->onShowWidget(lpGlobalData::instance()->m_level); m_pSystemSettingDlg->onShowWidget(lpGlobalData::instance()->m_level);
m_pSystemSettingDlg->setWindowTitle(tr("系统参数设置")); m_pSystemSettingDlg->setWindowTitle(tr("系统参数设置"));
m_pSystemSettingDlg->setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint); m_pSystemSettingDlg->setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint);
m_pSystemSettingDlg->setWindowIcon(QIcon(":/resource/logo-8.png")); m_pSystemSettingDlg->setWindowIcon(QIcon(":/image/leaper"));
m_pSystemSettingDlg->setWindowModality(Qt::ApplicationModal); m_pSystemSettingDlg->setWindowModality(Qt::ApplicationModal);
m_pSystemSettingDlg->setAttribute(Qt::WA_ShowModal, true); m_pSystemSettingDlg->setAttribute(Qt::WA_ShowModal, true);
m_pSystemSettingDlg->show(); m_pSystemSettingDlg->show();
@ -740,7 +770,7 @@ Q_SLOT void lpMainWin::onActionClicked()
//m_CamSettingDlg->onShowWidget(lpGlobalData::instance()->m_level); //m_CamSettingDlg->onShowWidget(lpGlobalData::instance()->m_level);
m_CamSettingDlg->setWindowTitle(tr("相机配置")); m_CamSettingDlg->setWindowTitle(tr("相机配置"));
m_CamSettingDlg->setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint); m_CamSettingDlg->setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint);
m_CamSettingDlg->setWindowIcon(QIcon(":/resource/logo-8.png")); m_CamSettingDlg->setWindowIcon(QIcon(":/image/leaper"));
m_CamSettingDlg->setWindowModality(Qt::ApplicationModal); m_CamSettingDlg->setWindowModality(Qt::ApplicationModal);
m_CamSettingDlg->setAttribute(Qt::WA_ShowModal, true); m_CamSettingDlg->setAttribute(Qt::WA_ShowModal, true);
m_CamSettingDlg->onInitWidget(); m_CamSettingDlg->onInitWidget();
@ -788,26 +818,42 @@ Q_SLOT void lpMainWin::onButtonClicked()
} }
} }
QString lpMainWin::SecondTimeString(quint64 value)
{
QString strTime;
int seconds = value % 60;
int minutes = value / 60;
strTime = QString("%1分%2秒").arg(minutes).arg(seconds);
if (minutes >= 60) {
minutes = (value / 60) % 60;
int hours = (value / 60) / 60;
strTime = QString("%1时%2分%3秒").arg(hours).arg(minutes).arg(seconds);
if (hours >= 24) {
hours = ((value / 60) / 60) % 24;
int day = ((value / 60) / 60) / 24;
strTime = QString("%1天%2时%3分%4秒").arg(day).arg(hours).arg(minutes).arg(seconds);
}
}
return strTime;
}
void lpMainWin::timerEvent(QTimerEvent *event) void lpMainWin::timerEvent(QTimerEvent *event)
{ {
if (event->timerId() == m_timerID) { if (event->timerId() == m_timerID) {
QString str = tr("系统时间： "); m_runTimeCount++;
QString strDetectState = tr("检测状态:") + (DetectState::instance()->IsDetect == true ? tr("检测中...") : tr("未检测..."));
// if (strLanguage != "Chinese")
// {
// str = "Time:";
// strDetectState = tr("State:") + (m_pState->IsDetect == true ? tr("Detecting...") : tr("Undetect..."));
// }
if (m_pLbCurrentTime) { if (m_pLbCurrentTime) {
QString m_currentTimerString = hubBase::genDateTime(); QString strTitle = tr("系统时间:");
m_pLbCurrentTime->setText(str + m_currentTimerString + " "); QString m_currentTime = hubBase::genDateTime();
QString strlong = SecondTimeString(m_runTimeCount);
QString strTimeTitle = tr("运行时长:");
QString strShow = QString("%1%2 %3%4").arg(strTitle).arg(m_currentTime).arg(strTimeTitle).arg(strlong);
m_pLbCurrentTime->setText(strShow);
m_pLbCurrentTime->setStyleSheet("font: 14px;"); m_pLbCurrentTime->setStyleSheet("font: 14px;");
} }
// state // state
if (m_pLbDetectState) { if (m_pLbDetectState) {
QString strDetectState = tr("检测状态:") + (DetectState::instance()->IsDetect == true ? tr("检测中...") : tr("未检测..."));
m_pLbDetectState->setText(strDetectState); m_pLbDetectState->setText(strDetectState);
if (DetectState::instance()->IsDetect) { if (DetectState::instance()->IsDetect) {
m_pLbDetectState->setStyleSheet("font: bold 14px;background-color: green;"); m_pLbDetectState->setStyleSheet("font: bold 14px;background-color: green;");
@ -1207,38 +1253,25 @@ void lpMainWin::onInitAbout()
).arg(tr("轮毂型号识别系统")) ).arg(tr("轮毂型号识别系统"))
.arg(tr("本软件由杭州利珀科技开发，用于轮毂型号识别和分类，可搭配流水线运输系统使用")) .arg(tr("本软件由杭州利珀科技开发，用于轮毂型号识别和分类，可搭配流水线运输系统使用"))
.arg(tr("若需要进一步了解该产品的相关信息，请访问我们的网站")) .arg(tr("若需要进一步了解该产品的相关信息，请访问我们的网站"))
.arg(tr("软件版本")).arg(111) .arg(tr("软件版本")).arg(VERSION_HUB)
//.arg(tr("算法版本")).arg(strWhelAlgoType) .arg(tr("算法版本")).arg(VERSION_ALG)
.arg(tr("算法版本")).arg(111) .arg(tr("最后更新时间")).arg(UPDATE_TIME)
.arg(tr("最后更新时间")).arg(111)
.arg(tr("版权 (c) 属 杭州利珀科技有限公司 所有")); .arg(tr("版权 (c) 属 杭州利珀科技有限公司 所有"));
m_aboutDlg.setFixedSize(500, 300); m_aboutDlg.setFixedSize(500, 300);
//QLabel* lbTitle = new QLabel(m_lightBox);
//QLabel* lbTitle = new QLabel(&m_mainWidget);
//lbTitle->setPixmap(QPixmap(":/image/Resource/logo-8.png").scaled(50,50));
//lbTitle->setStyleSheet("font-size: 28px; font-weight: bold; color: white");
//QTextEdit* pEdit = new QTextEdit(m_lightBox);
QTextEdit* pEdit = new QTextEdit(&m_aboutDlg); QTextEdit* pEdit = new QTextEdit(&m_aboutDlg);
//QLabel* pEdit = new QLabel(&m_mainWidget);
pEdit->setReadOnly(true); pEdit->setReadOnly(true);
pEdit->append(aboutString); pEdit->append(aboutString);
//pEdit->setText(aboutString);
//pEdit->setStyleSheet("background-color: rgb(0, 0, 0, 255);color:#1E296B;border:0px solid gray;color: black");
pEdit->setAttribute(Qt::WA_TranslucentBackground, true); pEdit->setAttribute(Qt::WA_TranslucentBackground, true);
QPalette pl = pEdit->palette(); QPalette pl = pEdit->palette();
pl.setBrush(QPalette::Base, QBrush(QColor(255, 0, 0, 0))); pl.setBrush(QPalette::Base, QBrush(QColor(255, 0, 0, 0)));
pEdit->setPalette(pl); pEdit->setPalette(pl);
QPushButton* lbClose = new QPushButton(tr("关闭")); QPushButton* lbClose = new QPushButton(tr("关闭"));
//QGridLayout* lbLayout = new QGridLayout(m_lightBox);
QGridLayout* lbLayout = new QGridLayout(&m_aboutDlg); QGridLayout* lbLayout = new QGridLayout(&m_aboutDlg);
//lbLayout->addWidget(lbTitle, 1, 1);
lbLayout->addWidget(pEdit, 2, 1, 1, 3); lbLayout->addWidget(pEdit, 2, 1, 1, 3);
lbLayout->addWidget(lbClose, 3, 2); lbLayout->addWidget(lbClose, 3, 2);
lbClose->setMaximumSize(QSize(100, 50)); lbClose->setMaximumSize(QSize(100, 50));
//connect(lbClose, SIGNAL(clicked()), m_lightBox, SLOT(hide()));
connect(lbClose, SIGNAL(clicked()), &m_aboutDlg, SLOT(hide())); connect(lbClose, SIGNAL(clicked()), &m_aboutDlg, SLOT(hide()));
//m_lightBox->setLayout(lbLayout);
} }
Q_SLOT void lpMainWin::onLanguageChange(QString strLanguage) Q_SLOT void lpMainWin::onLanguageChange(QString strLanguage)
@ -1377,8 +1410,7 @@ void lpMainWin::SendResultChannel2PLC(Result2Ui* m_Res)
qDebug() << "SendResultChannel2PLC"; qDebug() << "SendResultChannel2PLC";
CChannelInfo *pChannelInfo = m_pCtrl->getChannelInfo(); CChannelInfo *pChannelInfo = m_pCtrl->getChannelInfo();
ChannelInfo *npInfo = pChannelInfo->getChannelInfo(m_Res->m_strModel); ChannelInfo *npInfo = pChannelInfo->getChannelInfo(m_Res->m_strModel);
//npInfo->m_value = 5; if (npInfo && DetectState::instance()->m_bObjAll2A == false) {
if (npInfo&&DetectState::instance()->m_bObjAll2A == false) {
if (m_pNet) if (m_pNet)
m_pNet->sendResultChannel(npInfo->m_value, m_Res->m_dDiameter, m_Res->m_dThickness, m_Res->m_strModel); m_pNet->sendResultChannel(npInfo->m_value, m_Res->m_dDiameter, m_Res->m_dThickness, m_Res->m_strModel);
emit(sgShowChannelRes(npInfo->m_ChannelName)); emit(sgShowChannelRes(npInfo->m_ChannelName));
@ -1407,6 +1439,8 @@ void lpMainWin::SendResultChannel2PLC(Result2Ui* m_Res)
void lpMainWin::SendResultChannelCOM(Result2Ui* m_Res) void lpMainWin::SendResultChannelCOM(Result2Ui* m_Res)
{ {
qDebug() << "SendResultStr2COM"; qDebug() << "SendResultStr2COM";
if (!m_pCtrl)
return;
CChannelInfo *pChannelInfo = m_pCtrl->getChannelInfo(); CChannelInfo *pChannelInfo = m_pCtrl->getChannelInfo();
ChannelInfo *npInfo = pChannelInfo->getChannelInfo(m_Res->m_strModel); ChannelInfo *npInfo = pChannelInfo->getChannelInfo(m_Res->m_strModel);
//SComframe frame; //SComframe frame;
@ -1501,5 +1535,30 @@ void lpMainWin::saveImage(const QPixmap& m_pixmap, QString m_path, QString filen
void lpMainWin::onUpdateByLevel(int nlevel) void lpMainWin::onUpdateByLevel(int nlevel)
{ {
if(nlevel>4)
ui.action_userManager->setVisible(true);
else
ui.action_userManager->setVisible(false);
}
Q_SLOT void lpMainWin::onSendReadOnlineLib()
{
if (m_pNet)
m_pNet->sendCheckAllModelState();
}
Q_SLOT void lpMainWin::onThicknessTimer()
{
//查询厚度
if (m_pNet)
m_pNet->sendThickness();
}
Q_SLOT void lpMainWin::onwfPulseTimer()
{
// SComframe frame;
// frame.data1 = 0;
// frame.data2 = 0;
// frame.data8 = 50;
// SendDataToCom(0x43, frame);
} }

9
tpvs17/tpMain/lpMainWin.h
Unescape Escape View File

@ -66,6 +66,7 @@ private:
Q_SLOT void onLogInOut(QString strName, int level, int state); Q_SLOT void onLogInOut(QString strName, int level, int state);
Q_SLOT void onActionClicked(); Q_SLOT void onActionClicked();
Q_SLOT void onButtonClicked(); Q_SLOT void onButtonClicked();
protected: protected:
bool onInitCoreCtrl(); bool onInitCoreCtrl();
@ -79,7 +80,7 @@ protected:
void SendModelKuTskFun(); void SendModelKuTskFun();
void SendTickTskFun(); void SendTickTskFun();
void onSetModel(); void onSetModel();
QString SecondTimeString(quint64 value);//计算运行时常
Q_SLOT void onUpdateDefect();//勾选 更新界面显示窗口 Q_SLOT void onUpdateDefect();//勾选 更新界面显示窗口
//net slot //net slot
Q_SLOT void onTcpConnet(QString str, bool bConnect); Q_SLOT void onTcpConnet(QString str, bool bConnect);
@ -110,6 +111,10 @@ protected:
void onInitAbout(); void onInitAbout();
Q_SLOT void onLanguageChange(QString strLanguage); Q_SLOT void onLanguageChange(QString strLanguage);
Q_SLOT void onSendReadOnlineLib();
Q_SLOT void onThicknessTimer();
Q_SLOT void onwfPulseTimer();
private: private:
void onShowResult(Result2Ui* pRlt);//展示识别结果 void onShowResult(Result2Ui* pRlt);//展示识别结果
@ -120,6 +125,7 @@ private:
void saveImage(Result2Ui* pRes); void saveImage(Result2Ui* pRes);
void saveImage(const QPixmap& m_pixmap, QString m_path, QString filename); void saveImage(const QPixmap& m_pixmap, QString m_path, QString filename);
void onUpdateByLevel(int nlevel); void onUpdateByLevel(int nlevel);
protected: protected:
virtual void timerEvent(QTimerEvent *event); virtual void timerEvent(QTimerEvent *event);
virtual void closeEvent(QCloseEvent *event); virtual void closeEvent(QCloseEvent *event);
@ -181,6 +187,7 @@ private:
QVector<QTranslator* > m_VecTranPtr;//国际化语言包管理 QVector<QTranslator* > m_VecTranPtr;//国际化语言包管理
int m_timerID{ 0 };//定时器 更新状态栏信息 int m_timerID{ 0 };//定时器 更新状态栏信息
quint64 m_runTimeCount{ 0 };
}; };
#endif #endif

484
tpvs17/tpMain/lpmain_en.ts
View File

File diff suppressed because it is too large Load Diff

2
tpvs17/tpMain/tpMain.vcxproj
Unescape Escape View File

@ -1357,7 +1357,7 @@
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Console</SubSystem> <SubSystem>Windows</SubSystem>
<OutputFile>$(SolutionDir)..\runner17\$(TargetName)$(TargetExt)</OutputFile> <OutputFile>$(SolutionDir)..\runner17\$(TargetName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(QTDIR)\lib;$(OutDir);..\..\3part\opencv3.4.1\x64\vc15\lib;..\..\3part\Cyclops\lib;..\..\3part\libzkq\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>$(QTDIR)\lib;$(OutDir);..\..\3part\opencv3.4.1\x64\vc15\lib;..\..\3part\Cyclops\lib;..\..\3part\libzkq\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>

12
tpvs17/wheel.sln
Unescape Escape View File

@ -5,6 +5,10 @@ VisualStudioVersion = 15.0.28307.1267
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lpMain", "tpMain\tpMain.vcxproj", "{A229CF5C-81EF-4909-AB6E-49C746F1ED4C}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lpMain", "tpMain\tpMain.vcxproj", "{A229CF5C-81EF-4909-AB6E-49C746F1ED4C}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tpAlgorithmQt", "tpAlgorithmQt\tpAlgorithmQt.vcxproj", "{B12702AD-ABFB-343A-A199-8E24837244A3}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RasterSDG20", "RasterSDG20\RasterSDG20.vcxproj", "{CE765894-2106-48FE-99C3-D8D7624889A0}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64 Debug|x64 = Debug|x64
@ -15,6 +19,14 @@ Global
{A229CF5C-81EF-4909-AB6E-49C746F1ED4C}.Debug|x64.Build.0 = Debug|x64 {A229CF5C-81EF-4909-AB6E-49C746F1ED4C}.Debug|x64.Build.0 = Debug|x64
{A229CF5C-81EF-4909-AB6E-49C746F1ED4C}.Release|x64.ActiveCfg = Release|x64 {A229CF5C-81EF-4909-AB6E-49C746F1ED4C}.Release|x64.ActiveCfg = Release|x64
{A229CF5C-81EF-4909-AB6E-49C746F1ED4C}.Release|x64.Build.0 = Release|x64 {A229CF5C-81EF-4909-AB6E-49C746F1ED4C}.Release|x64.Build.0 = Release|x64
{B12702AD-ABFB-343A-A199-8E24837244A3}.Debug|x64.ActiveCfg = Debug|x64
{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
{CE765894-2106-48FE-99C3-D8D7624889A0}.Debug|x64.ActiveCfg = Debug|x64
{CE765894-2106-48FE-99C3-D8D7624889A0}.Debug|x64.Build.0 = Debug|x64
{CE765894-2106-48FE-99C3-D8D7624889A0}.Release|x64.ActiveCfg = Release|x64
{CE765894-2106-48FE-99C3-D8D7624889A0}.Release|x64.Build.0 = Release|x64
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

Write Preview
Loading…
Cancel
Save