diff --git a/runner17/Enchanter.exe b/runner17/Enchanter.exe
index 2416ac1..5ad0517 100644
Binary files a/runner17/Enchanter.exe and b/runner17/Enchanter.exe differ
diff --git a/runner17/Enchanterd.exe b/runner17/Enchanterd.exe
index c6706b0..c91b81e 100644
Binary files a/runner17/Enchanterd.exe and b/runner17/Enchanterd.exe differ
diff --git a/runner17/lpCoreCtrl.dll b/runner17/lpCoreCtrl.dll
index dc89c80..7ac97e3 100644
Binary files a/runner17/lpCoreCtrl.dll and b/runner17/lpCoreCtrl.dll differ
diff --git a/src/RasterSDG20/Raster.cpp b/src/RasterSDG20/Raster.cpp
index 8ffe137..c4c7fbb 100644
--- a/src/RasterSDG20/Raster.cpp
+++ b/src/RasterSDG20/Raster.cpp
@@ -1,7 +1,10 @@
 #include "Raster.h"
 #include "ThicknessVector.h"
-#include "QZkJsonParser.h"
-#include "QDebug"
+#include <QDebug>
+#include <QJsonObject>
+#include <QJsonDocument>
+#include "QFile"
+
 #pragma execution_character_set("utf-8")
 CRaster::CRaster(QString strPath)
 	: m_pThickness(NULL), m_pRasSt(NULL), m_strPath(strPath)
@@ -28,8 +31,15 @@ RasterST * CRaster::getRasterSt() const
 bool CRaster::readRasterJson()
 {
 	//!>读取调试模式信息 是否保存good的图片 是否保存bad的图片 是否使用调试模式
-	
-	QJsonObject jsRaster = QZkJsonParser::ReadJsonAuto(m_strPath);
+	QFile loadFile(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();
 	if (!Rsaterobj.isEmpty()) {
 		m_pRasSt->m_beilv = Rsaterobj.value("beilv").toDouble(5.07);
@@ -60,7 +70,7 @@ bool CRaster::readRasterJson()
 
 bool CRaster::saveRasterJson(emTySaveJsonType emType)
 {
-	QJsonObject mObj = QZkJsonParser::ReadJsonAuto(m_strPath);
+	QJsonObject mObj;
 	switch (emType)
 	{
 	case EMTYPE_RASTER:{
@@ -89,7 +99,11 @@ bool CRaster::saveRasterJson(emTySaveJsonType emType)
 	default:
 		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;
 }
 
diff --git a/src/RasterSDG20/muban.cpp b/src/RasterSDG20/muban.cpp
index c98c9d6..482af91 100644
--- a/src/RasterSDG20/muban.cpp
+++ b/src/RasterSDG20/muban.cpp
@@ -23,7 +23,7 @@
 #include "QCheckBox"
 #include "QLabel"
 #include "qfinddevice.h"
-//#include "vld.h"
+
 #pragma execution_character_set("utf-8")
 struct RecvData{
 	quint8 data1;
@@ -36,25 +36,12 @@ struct RecvData{
 	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";
-	QUiLoader uiLoader;
-	QFile file(uifilePath);
-	file.open(QIODevice::ReadOnly);
-	QWidget * getwidget = uiLoader.load(&file, parent);
-	onCreate(getwidget);
+	ui.setupUi(this);
 
-	QGridLayout *gridOut = new QGridLayout;
-	gridOut->addWidget(getwidget);
-	this->setLayout(gridOut);
-	int a = getwidget->height();
-	int b = getwidget->width();
+	initUI();
 
-	this->setBaseSize(a, b);
-	resize(getwidget->size());
-	getwidget->show();
-	
 	Rasteranalysis = new QRasterAnalysis();
 	Rasteranalysis->loadAnalyseUpdatefunc(this, &muban::Appanalysis);
 	connect(this, SIGNAL(recvDataSignal(QByteArray)), Rasteranalysis, SLOT(recvDataByCOM(QByteArray)));
@@ -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)
 {
 	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)
-		return false;
-	QString strObj = watched->objectName();
-	if (strObj == "Raster_SendData"||strObj == "Raster_CheckSys"){
-		connect(watched, SIGNAL(clicked()), this, SLOT(ButtonClick()));
-	}
-	else if (strObj == "Raster_ShowlineEdit"){
-		Raster_ShowlineEdit = qobject_cast<QLineEdit*>(watched);
-	}
-	else if (strObj == "Raster_ShowlineEdit_2"){
-		Raster_ShowlineEdit_2 = qobject_cast<QLineEdit*>(watched);
-	}
-	else if (strObj == "Raster_ShowlineEdit_3"){
-		Raster_ShowlineEdit_3 = qobject_cast<QLineEdit*>(watched);
-	}
-	else if (strObj == "Raster_gridLayout"){
-		int a = 0;		
+	//connect(ui.Raster_SendData, SIGNAL(clicked()), this, SLOT(ButtonClick()));
+	Raster_ShowlineEdit = ui.Raster_ShowlineEdit;
+	Raster_ShowlineEdit_2 = ui.Raster_ShowlineEdit_2;
+	Raster_ShowlineEdit_3 = ui.Raster_ShowlineEdit_3;
+	QGroupBox *pGroup = ui.groupBox_2;
+	QHBoxLayout *pGridLayout = new QHBoxLayout;
+	m_switchbp = new SWitchButton;
+	//m_switchbp->resize(150, 100);
+	//m_switchbp->setFixedHeight(50);
+	m_switchbp->SetOffName(tr("停止采样"));
+	m_switchbp->SetOnName(tr("开始采样"));
+	m_switchbp->SetPressOffBkColor1(QColor(230, 10, 10));
+	m_switchbp->SetPressOffBkColor2(QColor(230, 10, 10));
+	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 == "groupBox_2"){
-		QGroupBox *pGroup = qobject_cast<QGroupBox*>(watched);
-		QHBoxLayout *pGridLayout = new QHBoxLayout;
-		m_switchbp = new SWitchButton;
-		//m_switchbp->resize(150, 100);
-		//m_switchbp->setFixedHeight(50);
-		m_switchbp->SetOffName(tr("停止采样"));
-		m_switchbp->SetOnName(tr("开始采样"));
-		m_switchbp->SetPressOffBkColor1(QColor(230, 10, 10));
-		m_switchbp->SetPressOffBkColor2(QColor(230, 10, 10));
-		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);
+
+	Raster_textBrowser = ui.Raster_textBrowser;
+	
+	Raster_frame = ui.Raster_frame;
+	QSize ht = Raster_frame->size();
+	QRect a= Raster_frame->rect();
+	m_chart = new myChart1(Raster_frame);
+	m_chart->setTitle(tr("光栅数据采样"));
+
+	{
+		QGroupBox *pGroup = ui.Raster_groupBoxSys;
 		QHBoxLayout *pGridLayout = new QHBoxLayout;
 		m_switsybp = new SWitchButton;
 		m_switsybp->resize(150, 50);
@@ -274,90 +232,73 @@ bool muban::OnPolished(QWidget * watched)
 		pGridLayout->addWidget(m_switsybp);
 		pGridLayout->addSpacing(1);
 	}
-	else if (strObj == "frame"){
-		QFrame *widget = qobject_cast<QFrame*>(watched);
-		QGridLayout *ppp = new QGridLayout;
-		widget->setLayout(ppp);
-	}
-	else if (strObj == "doubleSpinBox_beilv"){
-		doubleSpinBox_beilv = qobject_cast<QDoubleSpinBox*>(watched);
-	}
-	else if (strObj == "doubleSpinBox_baseheight"){
-		doubleSpinBox_baseheight = qobject_cast<QDoubleSpinBox*>(watched);
-	}
-	else if (strObj == "doubleSpinBox_min"){
-		doubleSpinBox_min = qobject_cast<QDoubleSpinBox*>(watched);
-	}
-	else if (strObj == "Raster_SaveRaster"){
-		connect(watched, SIGNAL(clicked()), this, SLOT(onSaveData()));
-	}
-	else if (strObj == "Raster_ResScan"){//串口扫描按钮
-		connect(watched, SIGNAL(clicked()), this, SLOT(onScanDevice()));
-	}
-	else if (strObj == "Raster_ComBox"){//串口名
-		Raster_ComBox = qobject_cast<QComboBox*>(watched);
-	}
-	else if (strObj == "Raster_Baute"){//波特率
-		Raster_Baute = qobject_cast<QComboBox*>(watched);
-		Raster_Baute->addItem("115200");
-		Raster_Baute->addItem("38400");
-		Raster_Baute->addItem("19200");
-		Raster_Baute->addItem("9600");
-	}
-	else if (strObj == "Raster_OpenDevice"){// 打开设备
-		Raster_OpenDevice = qobject_cast<QPushButton*>(watched);
-		connect(Raster_OpenDevice, SIGNAL(clicked()), this, SLOT(onCtrolDevice()));
-	}
-	else if (strObj == "Raster_CloseDevice"){//关闭设备
-		Raster_CloseDevice = qobject_cast<QPushButton*>(watched);
-		connect(Raster_CloseDevice, SIGNAL(clicked()), this, SLOT(onCtrolDevice()));
-	}
-	else if (strObj == "Raster_SaveCombp"){
-		connect(watched, SIGNAL(clicked()), this, SLOT(onSaveData()));
-	}
-	else if (strObj == "Raster_checkBox"){
-		Raster_checkBox = qobject_cast<QCheckBox*>(watched);
-	}
-	else if (strObj == "Raster_showState_lb"){
-		Raster_showState_lb = qobject_cast<QLabel*>(watched);
-	}
-	else if (strObj == "spinBox_maxsize"){
-		SpinBox_max_size = qobject_cast<QSpinBox*>(watched);
-	}
-	else if (strObj == "doubleSpinBox_mid_value"){
-		doubleSpinBox_mid_value = qobject_cast<QDoubleSpinBox*>(watched);
-	}
-	else if (strObj == "tabWidget"){
-		m_tabWidget = qobject_cast<QTabWidget*>(watched);
-		m_tabWidget->setCurrentIndex(10);
-	}
-	else if ("Raster_doubleSpinBox_B" == strObj){
-		Raster_doubleSpinBox_B = qobject_cast<QDoubleSpinBox*>(watched);
-	}
-	else if ("Raster_doubleSpinBox_K" == strObj){
-		Raster_doubleSpinBox_K = qobject_cast<QDoubleSpinBox*>(watched);
-	}
-	else if ("Raster_SaveRasterDire" == strObj){
-		QPushButton *pBb = qobject_cast<QPushButton*>(watched);
-		connect(pBb, SIGNAL(clicked()), this, SLOT(onSaveData()));
-	}
-	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;
+	doubleSpinBox_beilv = ui.doubleSpinBox_beilv;
+	doubleSpinBox_baseheight = ui.doubleSpinBox_baseheight;
+	doubleSpinBox_min = ui.doubleSpinBox_min;
+	
+	connect(ui.Raster_SaveRaster, SIGNAL(clicked()), this, SLOT(onSaveData()));
+	
+//串口扫描按钮
+	connect(ui.Raster_ResScan, SIGNAL(clicked()), this, SLOT(onScanDevice()));
+	
+//串口名
+	Raster_ComBox = ui.Raster_ComBox;
+	
+//波特率
+	Raster_Baute = ui.Raster_Baute;
+	Raster_Baute->addItem("115200");
+	Raster_Baute->addItem("38400");
+	Raster_Baute->addItem("19200");
+	Raster_Baute->addItem("9600");
+	
+// 打开设备
+	Raster_OpenDevice = ui.Raster_OpenDevice;
+	connect(Raster_OpenDevice, SIGNAL(clicked()), this, SLOT(onCtrolDevice()));
+	
+//关闭设备
+	Raster_CloseDevice = ui.Raster_CloseDevice;
+	connect(Raster_CloseDevice, SIGNAL(clicked()), this, SLOT(onCtrolDevice()));
+	
+
+	connect(ui.Raster_SaveCombp, SIGNAL(clicked()), this, SLOT(onSaveData()));
+
+	Raster_checkBox = ui.Raster_checkBox;
+	
+
+	Raster_showState_lb = ui.Raster_showState_lb;
+	
+
+	SpinBox_max_size = ui.spinBox_maxsize;
+	
+
+	doubleSpinBox_mid_value = ui.doubleSpinBox_mid_value;
+	
+
+	m_tabWidget = ui.tabWidget;
+	m_tabWidget->setCurrentIndex(10);
+	
+
+	Raster_doubleSpinBox_B = ui.Raster_doubleSpinBox_B;
+
+	Raster_doubleSpinBox_K = ui.Raster_doubleSpinBox_K;
+
+	QPushButton *pBb = ui.Raster_SaveRasterDire;
+	connect(pBb, SIGNAL(clicked()), this, SLOT(onSaveData()));
+
+	QFrame *pFrame = ui.Raster_frame_2;
+	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);
 }
 
 void muban::changeEvent(QEvent *event)
@@ -565,10 +506,12 @@ Q_SLOT void muban::onSaveData()
 			mB = Raster_doubleSpinBox_B->value();
 		if (Raster_doubleSpinBox_K)
 			mK = Raster_doubleSpinBox_K->value();
-		if (pDetectStatePtr)
+		if (setfunc_)
 		{
-			pDetectStatePtr->setDia2ThPara(mK, mB);
-			pDetectStatePtr->save();
+			Dia2ThPara st;
+			st.mb_ = mB;
+			st.mk_ = mK;
+			setfunc_(st);
 		}
 	}
 }
@@ -673,10 +616,10 @@ void muban::showEvent(QShowEvent *event)
 {
 	int a = 0;
 	bInsertData = true;
-	if (pDetectStatePtr)
+	if (getfunc_)
 	{
-		float mB=0.0, mK=0.0;
-		pDetectStatePtr->getDia2ThPara(mK, mB);
+		Dia2ThPara st = getfunc_();
+		float mB= st.mb_, mK=st.mk_;
 		if (Raster_doubleSpinBox_B)
 		{
 			Raster_doubleSpinBox_B->setValue(mB);
diff --git a/src/RasterSDG20/muban.h b/src/RasterSDG20/muban.h
index 2ed69e8..071de60 100644
--- a/src/RasterSDG20/muban.h
+++ b/src/RasterSDG20/muban.h
@@ -3,8 +3,9 @@
 
 #include <QtWidgets/QWidget>
 #include "RasterAnalysis.h"
-#include "IDetectState.h"
 #include "qsimpletickergraph.h"
+#include "rastersdg20_global.h"
+#include "ui_Rester.h"
 class muban:public QWidget
 {
 	Q_OBJECT
@@ -30,7 +31,11 @@ public:
 	Q_SLOT void onAddData2Graph(int nData);
 
 	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:
 	void recvDataSignal(QByteArray);
 	void sgShowSys(QString,int);
@@ -45,13 +50,12 @@ private:
 	struct RasterST* m_pRaster;
 	struct RasterCom* m_pRasterCom;
 private:
-	virtual bool OnPolished(QWidget * watched);
-	virtual bool onCreate(QWidget* parent);
 	virtual void changeEvent(QEvent *);
 	void Appanalysis(Raster_ComFrame m_ComFrame);
 public slots:
 	virtual void SlotRecvDataByParent(QByteArray m_data);
 	virtual void SlotTxDataByParent(QByteArray m_data);
+	
 	virtual void SlotRxNumByParent(int num);
 	virtual void SlotTxNumByParent(int num);
 	virtual void SlotRxSizeByParent(int num);
@@ -95,15 +99,17 @@ private:
 	//tab2
 	class QDoubleSpinBox *Raster_doubleSpinBox_K;
 	class QDoubleSpinBox *Raster_doubleSpinBox_B;
-protected:
-	IDetectState *pDetectStatePtr;
 
+	Ui::Raster_Form ui;
+protected:
 	bool bInsertData;
 	class QSimpleTickerGraph *m_graph1;
 protected:
 	virtual void closeEvent(QCloseEvent *event);
 	virtual void showEvent(QShowEvent *event);
-	
+private:
+	SetDiaParaFunc setfunc_;
+	GetDiaParaFunc getfunc_;
 };
 
 #endif // MUBAN_H
diff --git a/src/RasterSDG20/rastersdg20.cpp b/src/RasterSDG20/rastersdg20.cpp
index 6ea09cc..7f0272c 100644
--- a/src/RasterSDG20/rastersdg20.cpp
+++ b/src/RasterSDG20/rastersdg20.cpp
@@ -76,10 +76,14 @@ void RasterSDG20::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->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->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 dDiameter = 0.0;
-	if (pDetectState)
+	if (getfunc_)
 	{
-		float mK = 0.0, mB = 0.0;
-		pDetectState->getDia2ThPara(mK, mB);
+		Dia2ThPara st = getfunc_();
+		float mK = st.mk_, mB = st.mb_;
 		dDiameter = getThicknessValue()*mK + mB;
 	}
 	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);
+}
diff --git a/src/RasterSDG20/rastersdg20.h b/src/RasterSDG20/rastersdg20.h
index 002fa6b..31df5c5 100644
--- a/src/RasterSDG20/rastersdg20.h
+++ b/src/RasterSDG20/rastersdg20.h
@@ -10,12 +10,13 @@ public:
 	RasterSDG20(const QString filepath);
 	~RasterSDG20();
 	virtual void onStartSampling();
-	virtual void onShowWidget();
+	virtual void onShowWidget(QWidget* parent);
 	virtual void addThicknessValue(double);
 	virtual double getThicknessValue() const;
 	virtual QString getThicknessValueStr() const;
-	virtual void setDetectStatePtr(IDetectState *mpDetectState);
 	virtual double getDiameterValue();
+	virtual void setSetDiaParaFunc(SetDiaParaFunc func);
+	virtual void setGetDiaParaFunc(GetDiaParaFunc func);
 signals:
 	void sgSendData(const QByteArray);
 	void sgShowComState(QString, int);
@@ -25,9 +26,12 @@ public:
 	Q_SLOT void onSaveRaster(int ntype);
 	Q_SLOT void onCtrolDevice(int nValue);
 private:
-	class muban* m_pmuBan;
-	class CMySerialPort* m_SerialPort;
-	class CRaster *m_pRaster;
+	class muban* m_pmuBan{ nullptr };
+	class CMySerialPort* m_SerialPort{ nullptr };
+	class CRaster *m_pRaster{ nullptr };
+
+	SetDiaParaFunc setfunc_;
+	GetDiaParaFunc getfunc_;
 };
 
 #endif // RASTERSDG20_H
diff --git a/src/RasterSDG20/rastersdg20_global.h b/src/RasterSDG20/rastersdg20_global.h
index d72fcf3..7498af9 100644
--- a/src/RasterSDG20/rastersdg20_global.h
+++ b/src/RasterSDG20/rastersdg20_global.h
@@ -2,28 +2,34 @@
 #define RASTERSDG20_GLOBAL_H
 
 #include <QtCore/qglobal.h>
-#include "QObject"
-//#include "IDetectState.h"
+#include <QObject>
+#include <functional>
+
 #ifdef RASTERSDG20_LIB
 # define RASTERSDG20_EXPORT Q_DECL_EXPORT
 #else
 # define RASTERSDG20_EXPORT Q_DECL_IMPORT
 #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{
 	Q_OBJECT
 public:
 	IRasterSDG20(){/* pDetectState = NULL;*/ };
 	virtual void onStartSampling() = 0;
-	virtual void onShowWidget() = 0;
+	virtual void onShowWidget(QWidget* parent) = 0;
 	virtual void addThicknessValue(double) = 0;
 	virtual double getThicknessValue() const = 0;
 	virtual QString getThicknessValueStr() const = 0;
 	virtual double getDiameterValue() = 0;
-	//virtual void setDetectStatePtr(IDetectState *mpDetectState){ pDetectState = mpDetectState; };
-signals:
-	void sgThickness(double);
+	virtual void setSetDiaParaFunc(SetDiaParaFunc func) = 0;
+	virtual void setGetDiaParaFunc(GetDiaParaFunc func) = 0;
 protected:
-	//IDetectState *pDetectState;
 };
 
 extern "C" RASTERSDG20_EXPORT IRasterSDG20* RasterSDG20Create(const QString filepath);
diff --git a/src/tpMain/IWheelCtrl.h b/src/tpMain/IWheelCtrl.h
index 0a49c72..66f2930 100644
--- a/src/tpMain/IWheelCtrl.h
+++ b/src/tpMain/IWheelCtrl.h
@@ -11,6 +11,7 @@
 #include "qstring.h"
 #include "qobject.h"
 #include "InfoFile.h"
+#include <QWidget>
 class ModelManager;
 class CChannelInfo;
 class DetectState;
@@ -62,7 +63,7 @@ public:
 
 	//net
 	virtual bool sendModelLib() = 0;
-	virtual bool onShowRaster() = 0;
+	virtual bool onShowRaster(QWidget* parent) = 0;
 signals:
 	void sgModelChanged();
 	void sgModelChanged(QString);
diff --git a/src/tpMain/ProgressView.cpp b/src/tpMain/ProgressView.cpp
index b1ec8e5..df9fae9 100644
--- a/src/tpMain/ProgressView.cpp
+++ b/src/tpMain/ProgressView.cpp
@@ -13,7 +13,7 @@ ProgressView::ProgressView(QWidget* parent)
 	connect(m_pProgressDialog, SIGNAL(canceled()), this, SIGNAL(cancel()));
 
 	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->setAttribute(Qt::WA_ShowModal, true);
 }
diff --git a/src/tpMain/WheelCtrl.cpp b/src/tpMain/WheelCtrl.cpp
index 91a9845..092c9fd 100644
--- a/src/tpMain/WheelCtrl.cpp
+++ b/src/tpMain/WheelCtrl.cpp
@@ -11,7 +11,7 @@
 #include "CamConfig.h"
 #include "QThread"
 #include "qsaveresult.h"
-#include "..\RasterSDG20\rastersdg20_global.h"
+
 #include "QLibrary"
 #include "databasesql.h"
 #include "DetectDataDB.h"
@@ -55,7 +55,7 @@ WheelCtrl::WheelCtrl(QString strPath, QMySplashScreen* pScreen)
 
 	ShowInitMsg(pScreen, tr("鍔犺浇鍏夋爡閫氳妯″潡 ...."));
 	qDebug() << "loadLibRasterSDG20";
-	//loadLibRasterSDG20(strPath);
+	loadLibRasterSDG20(strPath);
 	qDebug() << "loadLibRasterSDG20 end";
 	connect(saveResultThread, &QThread::finished, pSaveResult, &QObject::deleteLater);
 	connect(this, SIGNAL(operate(Result2Ui*)), pSaveResult, SLOT(doWork(Result2Ui*)),Qt::QueuedConnection);
@@ -108,10 +108,12 @@ void WheelCtrl::loadLibRasterSDG20(QString strPath)
 #endif
 	if (lib.load()){
 		_RasterSDG20Create func = (_RasterSDG20Create)lib.resolve("RasterSDG20Create");
-		m_pRasterSDG20 = func(strPath + "\\user\\raster.json");
-		//connect(m_pRasterSDG20, SIGNAL(sgThickness(double)), this, SIGNAL(onThickness(double)));
+		m_pRasterSDG20 = func(strPath + "\\raster.json");
+		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->setDetectStatePtr(m_pState);
 	}
 }
 
@@ -275,10 +277,10 @@ Q_SLOT void WheelCtrl::handleResult(Result2Ui *pResult)
 	qDebug() << "end thread save Result to DataBase";
 }
 
-bool WheelCtrl::onShowRaster()
+bool WheelCtrl::onShowRaster(QWidget* parent)
 {
 	if (m_pRasterSDG20){
-		m_pRasterSDG20->onShowWidget();
+		m_pRasterSDG20->onShowWidget(parent);
 		return true;
 	}
 	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;
+}
diff --git a/src/tpMain/WheelCtrl.h b/src/tpMain/WheelCtrl.h
index cec8fc1..3aba146 100644
--- a/src/tpMain/WheelCtrl.h
+++ b/src/tpMain/WheelCtrl.h
@@ -1,7 +1,10 @@
-锘�#pragma once
+锘�#ifndef _H_WHEELCTRL_H_
+#define _H_WHEELCTRL_H_
+
 #include "IWheelCtrl.h"
 #include "qstring.h"
 #include "qmysplashscreen.h"
+#include "..\RasterSDG20\rastersdg20_global.h"
 class CRaster;
 class CWheelNet;
 class CamConfig;
@@ -24,7 +27,7 @@ public:
 	virtual double getThickness() const;
 	virtual QString getThicknessStr() const;
 	virtual void appendThicknessValue(double nValue);
-	virtual bool onShowRaster();
+	virtual bool onShowRaster(QWidget* parent);
 
 	virtual void addLog(QString msg, int nType);
 	virtual void saveResult(Result2Ui *);
@@ -52,6 +55,8 @@ public:
 	Q_SLOT void handleResult(Result2Ui *);
 	void loadLibRasterSDG20(QString strPath);
 	void ShowInitMsg(QMySplashScreen* p, QString str);
+	void setDiaParam(Dia2ThPara st);
+	Dia2ThPara getDiaParam();
 signals:
 	void operate(Result2Ui *m_Res);
 private:
@@ -73,3 +78,5 @@ private:
 	//QSaveResultObj m_saveObj;
 };
 
+#endif
+
diff --git a/src/tpMain/qaddmodel.cpp b/src/tpMain/qaddmodel.cpp
index 06258d7..00388d0 100644
--- a/src/tpMain/qaddmodel.cpp
+++ b/src/tpMain/qaddmodel.cpp
@@ -8,6 +8,7 @@ QAddModel::QAddModel(QWidget *parent)
 	: QDialog(parent)
 {
 	ui.setupUi(this);
+	setWindowIcon(QIcon(":/image/leaper"));
 	setWindowFlags(Qt::WindowCloseButtonHint);
 	connect(ui.wf_model_add_button, SIGNAL(clicked()), this, SLOT(SlotAccept()));
 	connect(ui.wf_cancel, SIGNAL(clicked()), this, SLOT(SlotCancel()));
diff --git a/src/tpMain/qipconfigdlg.cpp b/src/tpMain/qipconfigdlg.cpp
index 8370c65..c706338 100644
--- a/src/tpMain/qipconfigdlg.cpp
+++ b/src/tpMain/qipconfigdlg.cpp
@@ -5,6 +5,7 @@ QIPConfigDlg::QIPConfigDlg(QWidget *parent)
 	: QDialog(parent)
 {
 	ui.setupUi(this);
+	setWindowIcon(QIcon(":/image/leaper"));
 // 	setWindowFlags(Qt::WindowFullscreenButtonHint);
 // 	setWindowFlags(Qt::WindowMinimizeButtonHint);
 // 	setWindowFlags(Qt::WindowTitleHint);
diff --git a/src/tpMain/tpMain.aps b/src/tpMain/tpMain.aps
index c7c7e63..f317c6a 100644
Binary files a/src/tpMain/tpMain.aps and b/src/tpMain/tpMain.aps differ
diff --git a/tpvs17/RasterSDG20/RasterSDG20.vcxproj b/tpvs17/RasterSDG20/RasterSDG20.vcxproj
index c730ea9..79744a3 100644
--- a/tpvs17/RasterSDG20/RasterSDG20.vcxproj
+++ b/tpvs17/RasterSDG20/RasterSDG20.vcxproj
@@ -47,7 +47,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <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>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -56,16 +56,16 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <OutputFile>$(SolutionDir)..\runner17\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalLibraryDirectories>$(QTDIR)\lib;..\..\3part\libzkq\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(QTDIR)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <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>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <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>
-      <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>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -73,10 +73,10 @@
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
-      <OutputFile>$(SolutionDir)..\runner13\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalLibraryDirectories>$(QTDIR)\lib;..\..\..\frogs\win32\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <OutputFile>$(SolutionDir)..\runner17\$(TargetName)$(TargetExt)</OutputFile>
+      <AdditionalLibraryDirectories>$(QTDIR)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <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>
     </Link>
   </ItemDefinitionGroup>
@@ -168,155 +168,112 @@
     <ClCompile Include="GeneratedFiles\Release\moc_switchbutton.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </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>
     <CustomBuild Include="..\..\src\RasterSDG20\Commom\CMySerialPort.h">
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing CMySerialPort.h...</Message>
       <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>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing CMySerialPort.h...</Message>
       <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>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\RasterSDG20\Raster.h" />
     <ClInclude Include="..\..\src\RasterSDG20\ThicknessVector.h" />
+    <ClInclude Include="GeneratedFiles\ui_Rester.h" />
     <CustomBuild Include="..\..\src\RasterSDG20\rastersdg20_global.h">
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing rastersdg20_global.h...</Message>
       <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>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing rastersdg20_global.h...</Message>
       <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 Include="..\..\src\RasterSDG20\rastersdg20.h">
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing rastersdg20.h...</Message>
       <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>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing rastersdg20.h...</Message>
       <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 Include="..\..\src\RasterSDG20\qsimpletickergraph.h">
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing qsimpletickergraph.h...</Message>
       <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>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing qsimpletickergraph.h...</Message>
       <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 Include="..\..\src\RasterSDG20\qfinddevice.h">
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing qfinddevice.h...</Message>
       <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>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing qfinddevice.h...</Message>
       <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 Include="..\..\src\RasterSDG20\muban.h">
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing muban.h...</Message>
       <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>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing muban.h...</Message>
       <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 Include="..\..\src\RasterSDG20\widget\switchbutton.h">
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing switchbutton.h...</Message>
       <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>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing switchbutton.h...</Message>
       <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 Include="..\..\src\RasterSDG20\widget\mychart1.h">
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing mychart1.h...</Message>
       <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>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing mychart1.h...</Message>
       <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 Include="..\..\src\RasterSDG20\mythread\qmythread.h">
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing qmythread.h...</Message>
       <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>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing qmythread.h...</Message>
       <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 Include="..\..\src\RasterSDG20\Analysis\RasterAnalysis.h">
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing RasterAnalysis.h...</Message>
       <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>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing RasterAnalysis.h...</Message>
       <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>
     <ClInclude Include="..\..\src\RasterSDG20\Commom\ctransform.h" />
     <ClInclude Include="..\..\src\RasterSDG20\Commom\FastDelegate.h" />
@@ -327,24 +284,34 @@
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing qextserialport.h...</Message>
       <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>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing qextserialport.h...</Message>
       <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 Include="..\..\src\RasterSDG20\Commom\myhelper.h">
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing myhelper.h...</Message>
       <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>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing myhelper.h...</Message>
       <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>
   </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_zh.ts" />
   </ItemGroup>
diff --git a/tpvs17/RasterSDG20/RasterSDG20.vcxproj.filters b/tpvs17/RasterSDG20/RasterSDG20.vcxproj.filters
index 4503e53..2487a32 100644
--- a/tpvs17/RasterSDG20/RasterSDG20.vcxproj.filters
+++ b/tpvs17/RasterSDG20/RasterSDG20.vcxproj.filters
@@ -42,11 +42,6 @@
     <Filter Include="Rasterdlg">
       <UniqueIdentifier>{a59fc7d7-edee-4333-83e2-834c6a540f67}</UniqueIdentifier>
     </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">
       <UniqueIdentifier>{f44e5ba7-5926-41f9-b16b-0aa2b4cc97e1}</UniqueIdentifier>
     </Filter>
@@ -66,9 +61,6 @@
     <ClCompile Include="GeneratedFiles\Release\moc_CMySerialPort.cpp">
       <Filter>Generated Files\Release</Filter>
     </ClCompile>
-    <ClCompile Include="GeneratedFiles\Release_xp\moc_CMySerialPort.cpp">
-      <Filter>Generated Files\Release_xp</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\RasterSDG20\Commom\ctransform.cpp">
       <Filter>Comm</Filter>
     </ClCompile>
@@ -78,9 +70,6 @@
     <ClCompile Include="GeneratedFiles\Release\moc_myhelper.cpp">
       <Filter>Generated Files\Release</Filter>
     </ClCompile>
-    <ClCompile Include="GeneratedFiles\Release_xp\moc_myhelper.cpp">
-      <Filter>Generated Files\Release_xp</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\RasterSDG20\Commom\qextserialport.cpp">
       <Filter>Comm</Filter>
     </ClCompile>
@@ -90,9 +79,6 @@
     <ClCompile Include="GeneratedFiles\Release\moc_qextserialport.cpp">
       <Filter>Generated Files\Release</Filter>
     </ClCompile>
-    <ClCompile Include="GeneratedFiles\Release_xp\moc_qextserialport.cpp">
-      <Filter>Generated Files\Release_xp</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\RasterSDG20\Commom\qextserialport_win.cpp">
       <Filter>Comm</Filter>
     </ClCompile>
@@ -105,9 +91,6 @@
     <ClCompile Include="GeneratedFiles\Release\moc_RasterAnalysis.cpp">
       <Filter>Generated Files\Release</Filter>
     </ClCompile>
-    <ClCompile Include="GeneratedFiles\Release_xp\moc_RasterAnalysis.cpp">
-      <Filter>Generated Files\Release_xp</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\RasterSDG20\mythread\qmythread.cpp">
       <Filter>Comm</Filter>
     </ClCompile>
@@ -117,9 +100,6 @@
     <ClCompile Include="GeneratedFiles\Release\moc_qmythread.cpp">
       <Filter>Generated Files\Release</Filter>
     </ClCompile>
-    <ClCompile Include="GeneratedFiles\Release_xp\moc_qmythread.cpp">
-      <Filter>Generated Files\Release_xp</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\RasterSDG20\widget\mychart1.cpp">
       <Filter>widget</Filter>
     </ClCompile>
@@ -129,9 +109,6 @@
     <ClCompile Include="GeneratedFiles\Release\moc_mychart1.cpp">
       <Filter>Generated Files\Release</Filter>
     </ClCompile>
-    <ClCompile Include="GeneratedFiles\Release_xp\moc_mychart1.cpp">
-      <Filter>Generated Files\Release_xp</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\RasterSDG20\widget\switchbutton.cpp">
       <Filter>widget</Filter>
     </ClCompile>
@@ -150,18 +127,12 @@
     <ClCompile Include="GeneratedFiles\Release\moc_muban.cpp">
       <Filter>Generated Files\Release</Filter>
     </ClCompile>
-    <ClCompile Include="GeneratedFiles\Release_xp\moc_muban.cpp">
-      <Filter>Generated Files\Release_xp</Filter>
-    </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_qfinddevice.cpp">
       <Filter>Generated Files\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_qfinddevice.cpp">
       <Filter>Generated Files\Release</Filter>
     </ClCompile>
-    <ClCompile Include="GeneratedFiles\Release_xp\moc_qfinddevice.cpp">
-      <Filter>Generated Files\Release_xp</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\RasterSDG20\qsimpletickergraph.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -171,9 +142,6 @@
     <ClCompile Include="GeneratedFiles\Release\moc_qsimpletickergraph.cpp">
       <Filter>Generated Files\Release</Filter>
     </ClCompile>
-    <ClCompile Include="GeneratedFiles\Release_xp\moc_qsimpletickergraph.cpp">
-      <Filter>Generated Files\Release_xp</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\RasterSDG20\Raster.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -186,18 +154,12 @@
     <ClCompile Include="GeneratedFiles\Release\moc_rastersdg20.cpp">
       <Filter>Generated Files\Release</Filter>
     </ClCompile>
-    <ClCompile Include="GeneratedFiles\Release_xp\moc_rastersdg20.cpp">
-      <Filter>Generated Files\Release_xp</Filter>
-    </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_rastersdg20_global.cpp">
       <Filter>Generated Files\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_rastersdg20_global.cpp">
       <Filter>Generated Files\Release</Filter>
     </ClCompile>
-    <ClCompile Include="GeneratedFiles\Release_xp\moc_rastersdg20_global.cpp">
-      <Filter>Generated Files\Release_xp</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\RasterSDG20\ThicknessVector.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -239,6 +201,9 @@
     <CustomBuild Include="..\..\src\RasterSDG20\rastersdg20_global.h">
       <Filter>Header Files</Filter>
     </CustomBuild>
+    <CustomBuild Include="..\..\src\RasterSDG20\Rester.ui">
+      <Filter>Form Files</Filter>
+    </CustomBuild>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\RasterSDG20\Commom\ctransform.h">
@@ -262,6 +227,9 @@
     <ClInclude Include="..\..\src\RasterSDG20\ThicknessVector.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="GeneratedFiles\ui_Rester.h">
+      <Filter>Generated Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="rastersdg20_en.ts">
diff --git a/tpvs17/tpMain/QCamSettingDlg.cpp b/tpvs17/tpMain/QCamSettingDlg.cpp
index 244266b..6f1d770 100644
--- a/tpvs17/tpMain/QCamSettingDlg.cpp
+++ b/tpvs17/tpMain/QCamSettingDlg.cpp
@@ -4,6 +4,7 @@ QCamSettingDlg::QCamSettingDlg(QWidget *parent)
 	: QWidget(parent)
 {
 	ui.setupUi(this);
+	setWindowIcon(QIcon(":/image/leaper"));
 	QGridLayout *pLayout = new QGridLayout(ui.widget);
 	m_pImgViewer = new RoiImgViewer(ui.widget);
 	m_pImgViewer->setObjectName("Imageview_Setting");
diff --git a/tpvs17/tpMain/QChannelMgrDlg.cpp b/tpvs17/tpMain/QChannelMgrDlg.cpp
index 59a6fd7..1dd1cf2 100644
--- a/tpvs17/tpMain/QChannelMgrDlg.cpp
+++ b/tpvs17/tpMain/QChannelMgrDlg.cpp
@@ -5,6 +5,7 @@ QChannelMgrDlg::QChannelMgrDlg(QWidget *parent)
 	: QWidget(parent)
 {
 	ui.setupUi(this);
+	setWindowIcon(QIcon(":/image/leaper"));
 }
 
 QChannelMgrDlg::~QChannelMgrDlg()
diff --git a/tpvs17/tpMain/QDebugDlg.cpp b/tpvs17/tpMain/QDebugDlg.cpp
index a35c23a..dcf0bf5 100644
--- a/tpvs17/tpMain/QDebugDlg.cpp
+++ b/tpvs17/tpMain/QDebugDlg.cpp
@@ -7,6 +7,7 @@ QDebugDlg::QDebugDlg(QWidget *parent)
 	: QWidget(parent)
 {
 	ui.setupUi(this);
+	setWindowIcon(QIcon(":/image/leaper"));
 	connect(ui.Dlp_Next_button_2, SIGNAL(clicked()), this, SLOT(onButtonClicked()));
 	connect(ui.Dlp_StartDetect_button, SIGNAL(clicked()), this, SLOT(onButtonClicked()));
 	connect(&m_simuliter, SIGNAL(timeout()), this, SLOT(onTimeOut()));
diff --git a/tpvs17/tpMain/QModelMgrDlg.cpp b/tpvs17/tpMain/QModelMgrDlg.cpp
index 0b7de94..7edc558 100644
--- a/tpvs17/tpMain/QModelMgrDlg.cpp
+++ b/tpvs17/tpMain/QModelMgrDlg.cpp
@@ -35,6 +35,7 @@ QModelMgrDlg::QModelMgrDlg(IWheelCtrl *ptr, QWidget *parent)
 	: QWidget(parent),m_pCtrl(ptr)
 {
 	ui.setupUi(this);
+	setWindowIcon(QIcon(":/image/leaper"));
 	connect(ui.m_pbAdd, SIGNAL(clicked()), this, SLOT(onButtonClicked()));
 	connect(ui.m_pbDel, 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_diameter->setValidator(new QRegExpValidator(regExpNum, this));
 	}
+
+	ui.m_pbDelAll->setVisible(false);
 }
 
 QModelMgrDlg::~QModelMgrDlg()
@@ -251,11 +254,11 @@ Q_SLOT void QModelMgrDlg::onAddModel()
 
 	QAddModel m_AddModel(this);
 	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.setAttribute(Qt::WA_ShowModal, true);
 	m_AddModel.SetClearData();
-	m_AddModel.setWindowIcon(QIcon(MODEL_UI_ICON_LEAPER));
+	m_AddModel.setWindowIcon(QIcon(":/image/leaper"));
 	m_AddModel.setWindowTitle(tr("浜у搧淇℃伅璁剧疆"));
 	m_AddModel.setFocus();
 	if (m_AddModel.exec() == QDialog::Accepted) {
@@ -433,7 +436,7 @@ Q_SLOT void QModelMgrDlg::onChangeModelName()
 	}
 	QModNamedlg dlg(this);
 	dlg.setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint);
-	dlg.setWindowIcon(QIcon(":/resource/logo-8.png"));
+	dlg.setWindowIcon(QIcon(":/image/leaper"));
 	dlg.setWindowModality(Qt::ApplicationModal);
 	dlg.setAttribute(Qt::WA_ShowModal, true);
 	QString m_newName;
@@ -842,6 +845,17 @@ void QModelMgrDlg::TrainOneTskFunc()
 	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)
 {
 	// update images
diff --git a/tpvs17/tpMain/QModelMgrDlg.h b/tpvs17/tpMain/QModelMgrDlg.h
index 408d9c4..8cbcd1c 100644
--- a/tpvs17/tpMain/QModelMgrDlg.h
+++ b/tpvs17/tpMain/QModelMgrDlg.h
@@ -38,6 +38,8 @@ public:
 
 	void TrainAllTskFunc();
 	void TrainOneTskFunc();
+
+	void onUserLevel(int level);
 signals:
 	void sgPrograssShow(QString title, QString strValue, int size, int model);
 	void sgTrainShowInfo(QString str);
diff --git a/tpvs17/tpMain/QSettingDlg.cpp b/tpvs17/tpMain/QSettingDlg.cpp
index fe2ab0a..d61a33e 100644
--- a/tpvs17/tpMain/QSettingDlg.cpp
+++ b/tpvs17/tpMain/QSettingDlg.cpp
@@ -4,6 +4,7 @@ QSettingDlg::QSettingDlg(QWidget *parent)
 	: QWidget(parent)
 {
 	ui.setupUi(this);
+	setWindowIcon(QIcon(":/image/leaper"));
 }
 
 QSettingDlg::~QSettingDlg()
diff --git a/tpvs17/tpMain/QSystemSettingDlg.cpp b/tpvs17/tpMain/QSystemSettingDlg.cpp
index a3e97fe..9975498 100644
--- a/tpvs17/tpMain/QSystemSettingDlg.cpp
+++ b/tpvs17/tpMain/QSystemSettingDlg.cpp
@@ -34,6 +34,7 @@ QSystemSettingDlg::QSystemSettingDlg(QWidget *parent)
 	: QWidget(parent)
 {
 	ui.setupUi(this);
+	setWindowIcon(QIcon(":/image/leaper"));
 	m_setting = new QSettings(".\\user\\systemfile.ini", QSettings::IniFormat);
 	readSettingFile();
 	m_listwidgetItemStr.append(tr("鐩稿叧璁惧閰嶇疆"));
diff --git a/tpvs17/tpMain/QTimeMgrDlg.cpp b/tpvs17/tpMain/QTimeMgrDlg.cpp
index bb527bc..ffaf42b 100644
--- a/tpvs17/tpMain/QTimeMgrDlg.cpp
+++ b/tpvs17/tpMain/QTimeMgrDlg.cpp
@@ -16,6 +16,7 @@ QTimeMgrDlg::QTimeMgrDlg(QWidget *parent)
 	: QDialog(parent)
 {
 	ui.setupUi(this);
+	setWindowIcon(QIcon(":/image/leaper"));
 	tablemodel = new QStandardItemModel();
 	QStringList stringList;
 	stringList << tr("鐝") << tr("璧峰鏃堕棿") << tr("缁撴潫鏃堕棿");
diff --git a/tpvs17/tpMain/lpMainWin.cpp b/tpvs17/tpMain/lpMainWin.cpp
index d46e34c..2d125c5 100644
--- a/tpvs17/tpMain/lpMainWin.cpp
+++ b/tpvs17/tpMain/lpMainWin.cpp
@@ -17,11 +17,15 @@
 #include <QMenu>
 #include "saveimgthread.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")
 lpMainWin::lpMainWin(QWidget *parent)
 	: QMainWindow(parent)
 {
+	this->setWindowIcon(QIcon(":/image/leaper"));
 	QMySplashScreen m_screen;
 	m_screen.show();
 	qRegisterMetaType<TimeStruct>("TimeStruct");
@@ -53,7 +57,8 @@ lpMainWin::lpMainWin(QWidget *parent)
 
 		connect(ui.btn_start_detect, 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);
 // 		QFont font;
 // 		font.setPixelSize(24);
@@ -112,7 +117,7 @@ lpMainWin::lpMainWin(QWidget *parent)
 
 		ui.statusBar->addWidget(m_pLbDetectState, 1);
 		ui.statusBar->addWidget(m_pLbUser, 1);
-		ui.statusBar->addWidget(m_pLbBanci);
+		ui.statusBar->addWidget(m_pLbBanci,1);
 		ui.statusBar->addPermanentWidget(m_pLbCurrentTime);
 	}
 	//鍔犺浇鐢ㄦ埛绠＄悊妯″潡
@@ -565,16 +570,7 @@ void lpMainWin::IVariantMapToUI(const QString& camKey, const QVariantMap& vMap)
 	m_pCtrl->saveResult(pResult);
 	saveImage(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("鐧� 褰�"));
 	}
 	onUpdateByLevel(level);
+	if (m_pModelMgrDlg)
+	{
+		m_pModelMgrDlg->onUserLevel(level);
+	}
 }
 
 Q_SLOT void lpMainWin::onActionClicked()
@@ -648,19 +648,46 @@ Q_SLOT void lpMainWin::onActionClicked()
 		{
 			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) {
 		/*鐢ㄦ埛鐧婚檰*/
 		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) {
+		m_aboutDlg.setWindowIcon(QIcon(":/image/leaper"));
 		m_aboutDlg.setParent(this);
 		m_aboutDlg.setWindowTitle(tr("鍏充簬"));
 		m_aboutDlg.setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint);
-		m_aboutDlg.setWindowIcon(QIcon(":/resource/logo-8.png"));
 		m_aboutDlg.setWindowModality(Qt::ApplicationModal);
 		m_aboutDlg.setAttribute(Qt::WA_ShowModal, true);
 		m_aboutDlg.show();
@@ -670,14 +697,17 @@ Q_SLOT void lpMainWin::onActionClicked()
 			m_pNet->onShowIpDlg(this);
 	}
 	else if ("action_cali_raster" == strObj) {//鍏夋爡娴嬭瘯
-
+		if (m_pCtrl)
+		{
+			m_pCtrl->onShowRaster(this);
+		}
 	}
 	else if ("action_setting_ban" == strObj) {
 		if (m_pTimerMgrDlg) {
 			m_pTimerMgrDlg->setParent(this);
 			m_pTimerMgrDlg->setWindowTitle(tr("鐝绠＄悊"));
 			m_pTimerMgrDlg->setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint);
-			m_pTimerMgrDlg->setWindowIcon(QIcon(":/resource/logo-8.png"));
+			m_pTimerMgrDlg->setWindowIcon(QIcon(":/image/leaper"));
 			m_pTimerMgrDlg->setWindowModality(Qt::ApplicationModal);
 			m_pTimerMgrDlg->setAttribute(Qt::WA_ShowModal, true);
 			m_pTimerMgrDlg->show();
@@ -688,7 +718,7 @@ Q_SLOT void lpMainWin::onActionClicked()
 			m_pDebugDlg->setParent(this);
 			m_pDebugDlg->setWindowTitle(tr("璋冭瘯宸ュ叿"));
 			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->setAttribute(Qt::WA_ShowModal, true);
 			m_pDebugDlg->show();
@@ -699,7 +729,7 @@ Q_SLOT void lpMainWin::onActionClicked()
 		{
 			m_pworkUI->setParent(this);
 			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->setAttribute(Qt::WA_ShowModal, true);
 			m_pworkUI->onExec();
@@ -714,7 +744,7 @@ Q_SLOT void lpMainWin::onActionClicked()
 			m_pModelMgrDlg->setParent(this);
 			m_pModelMgrDlg->setWindowTitle(tr("妯℃澘绠＄悊"));
 			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->setAttribute(Qt::WA_ShowModal, true);
 			m_pModelMgrDlg->show();
@@ -727,7 +757,7 @@ Q_SLOT void lpMainWin::onActionClicked()
 			m_pSystemSettingDlg->onShowWidget(lpGlobalData::instance()->m_level);
 			m_pSystemSettingDlg->setWindowTitle(tr("绯荤粺鍙傛暟璁剧疆"));
 			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->setAttribute(Qt::WA_ShowModal, true);
 			m_pSystemSettingDlg->show();
@@ -740,7 +770,7 @@ Q_SLOT void lpMainWin::onActionClicked()
 			//m_CamSettingDlg->onShowWidget(lpGlobalData::instance()->m_level);
 			m_CamSettingDlg->setWindowTitle(tr("鐩告満閰嶇疆"));
 			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->setAttribute(Qt::WA_ShowModal, true);
 			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)
 {
 	if (event->timerId() == m_timerID) {
-		QString str = tr("绯荤粺鏃堕棿锛� ");
-		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..."));
-// 		}
-
+		m_runTimeCount++;
+		
 		if (m_pLbCurrentTime) {
-			QString m_currentTimerString = hubBase::genDateTime();
-			m_pLbCurrentTime->setText(str + m_currentTimerString + "  ");
+			QString strTitle = tr("绯荤粺鏃堕棿:");
+			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;");
 		}
-
 		// state
 		if (m_pLbDetectState) {
-
+			QString strDetectState = tr("妫�娴嬬姸鎬�:") + (DetectState::instance()->IsDetect == true ? tr("妫�娴嬩腑...") : tr("鏈娴�..."));
 			m_pLbDetectState->setText(strDetectState);
 			if (DetectState::instance()->IsDetect) {
 				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(111)
-		//.arg(tr("绠楁硶鐗堟湰")).arg(strWhelAlgoType)
-		.arg(tr("绠楁硶鐗堟湰")).arg(111)
-		.arg(tr("鏈�鍚庢洿鏂版椂闂�")).arg(111)
+		.arg(tr("杞欢鐗堟湰")).arg(VERSION_HUB)
+		.arg(tr("绠楁硶鐗堟湰")).arg(VERSION_ALG)
+		.arg(tr("鏈�鍚庢洿鏂版椂闂�")).arg(UPDATE_TIME)
 		.arg(tr("鐗堟潈 (c) 灞� 鏉窞鍒╃弨绉戞妧鏈夐檺鍏徃 鎵�鏈�"));
 	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);
-	//QLabel* pEdit = new QLabel(&m_mainWidget);
 	pEdit->setReadOnly(true);
 	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);
 	QPalette pl = pEdit->palette();
 	pl.setBrush(QPalette::Base, QBrush(QColor(255, 0, 0, 0)));
 	pEdit->setPalette(pl);
 	QPushButton* lbClose = new QPushButton(tr("鍏抽棴"));
-	//QGridLayout* lbLayout = new QGridLayout(m_lightBox);
 	QGridLayout* lbLayout = new QGridLayout(&m_aboutDlg);
-	//lbLayout->addWidget(lbTitle, 1, 1);
 	lbLayout->addWidget(pEdit, 2, 1, 1, 3);
 
 	lbLayout->addWidget(lbClose, 3, 2);
 	lbClose->setMaximumSize(QSize(100, 50));
-	//connect(lbClose, SIGNAL(clicked()), m_lightBox, SLOT(hide()));
 	connect(lbClose, SIGNAL(clicked()), &m_aboutDlg, SLOT(hide()));
-	//m_lightBox->setLayout(lbLayout);
 }
 
 Q_SLOT void lpMainWin::onLanguageChange(QString strLanguage)
@@ -1377,8 +1410,7 @@ void lpMainWin::SendResultChannel2PLC(Result2Ui* m_Res)
 	qDebug() << "SendResultChannel2PLC";
 	CChannelInfo *pChannelInfo = m_pCtrl->getChannelInfo();
 	ChannelInfo *npInfo = pChannelInfo->getChannelInfo(m_Res->m_strModel);
-	//npInfo->m_value = 5;
-	if (npInfo&&DetectState::instance()->m_bObjAll2A == false) {
+	if (npInfo && DetectState::instance()->m_bObjAll2A == false) {
 		if (m_pNet)
 			m_pNet->sendResultChannel(npInfo->m_value, m_Res->m_dDiameter, m_Res->m_dThickness, m_Res->m_strModel);
 		emit(sgShowChannelRes(npInfo->m_ChannelName));
@@ -1407,6 +1439,8 @@ void lpMainWin::SendResultChannel2PLC(Result2Ui* m_Res)
 void lpMainWin::SendResultChannelCOM(Result2Ui* m_Res)
 {
 	qDebug() << "SendResultStr2COM";
+	if (!m_pCtrl)
+		return;
 	CChannelInfo *pChannelInfo = m_pCtrl->getChannelInfo();
 	ChannelInfo *npInfo = pChannelInfo->getChannelInfo(m_Res->m_strModel);
 	//SComframe frame;
@@ -1501,5 +1535,30 @@ void lpMainWin::saveImage(const QPixmap& m_pixmap, QString m_path, QString filen
 
 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);
+}
\ No newline at end of file
diff --git a/tpvs17/tpMain/lpMainWin.h b/tpvs17/tpMain/lpMainWin.h
index a3cdfda..23a3776 100644
--- a/tpvs17/tpMain/lpMainWin.h
+++ b/tpvs17/tpMain/lpMainWin.h
@@ -66,6 +66,7 @@ private:
 	Q_SLOT void onLogInOut(QString strName, int level, int state);
 	Q_SLOT void onActionClicked();
 	Q_SLOT void onButtonClicked();
+	
 protected:
 	bool onInitCoreCtrl();
 
@@ -79,7 +80,7 @@ protected:
 	void SendModelKuTskFun();
 	void SendTickTskFun();
 	void onSetModel();
-
+	QString SecondTimeString(quint64 value);//璁＄畻杩愯鏃跺父
 	Q_SLOT void onUpdateDefect();//鍕鹃�� 鏇存柊鐣岄潰鏄剧ず绐楀彛
 	//net slot
 	Q_SLOT void onTcpConnet(QString str, bool bConnect);
@@ -110,6 +111,10 @@ protected:
 	void onInitAbout();
 
 	Q_SLOT void onLanguageChange(QString strLanguage);
+	
+	Q_SLOT void onSendReadOnlineLib();
+	Q_SLOT void onThicknessTimer();
+	Q_SLOT void onwfPulseTimer();
 private:
 	void onShowResult(Result2Ui* pRlt);//灞曠ず璇嗗埆缁撴灉
 
@@ -120,6 +125,7 @@ private:
 	void saveImage(Result2Ui* pRes);
 	void saveImage(const QPixmap& m_pixmap, QString m_path, QString filename);
 	void onUpdateByLevel(int nlevel);
+	
 protected:
 	virtual void timerEvent(QTimerEvent *event);
 	virtual void closeEvent(QCloseEvent *event);
@@ -181,6 +187,7 @@ private:
 	QVector<QTranslator* > m_VecTranPtr;//鍥介檯鍖栬瑷�鍖呯鐞�
 
 	int m_timerID{ 0 };//瀹氭椂鍣� 鏇存柊鐘舵�佹爮淇℃伅
+	quint64 m_runTimeCount{ 0 };
 };
 
 #endif
diff --git a/tpvs17/tpMain/lpmain_en.ts b/tpvs17/tpMain/lpmain_en.ts
index de8eb06..baf1f47 100644
--- a/tpvs17/tpMain/lpmain_en.ts
+++ b/tpvs17/tpMain/lpmain_en.ts
@@ -211,85 +211,121 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QCamSettingDlg.ui" line="48"/>
+        <location filename="QCamSettingDlg.ui" line="185"/>
         <source>搴忓垪鍙凤細</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QCamSettingDlg.ui" line="58"/>
+        <location filename="QCamSettingDlg.ui" line="119"/>
         <source>鏄剧ず鍚嶇О锛�</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QCamSettingDlg.ui" line="68"/>
+        <location filename="QCamSettingDlg.ui" line="140"/>
         <source>鐩告満绫诲瀷锛�</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QCamSettingDlg.ui" line="78"/>
+        <location filename="QCamSettingDlg.ui" line="153"/>
+        <source>铏氭嫙鐩告満</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="QCamSettingDlg.ui" line="158"/>
+        <source>娴峰悍鐩告満</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="QCamSettingDlg.ui" line="163"/>
+        <source>鍫＄洘鐩告満</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="QCamSettingDlg.ui" line="192"/>
+        <location filename="QCamSettingDlg.ui" line="251"/>
+        <location filename="QCamSettingDlg.ui" line="318"/>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="QCamSettingDlg.ui" line="206"/>
         <source>璺緞锛�</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QCamSettingDlg.ui" line="88"/>
+        <location filename="QCamSettingDlg.ui" line="227"/>
         <source>璁剧疆</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QCamSettingDlg.ui" line="95"/>
+        <location filename="QCamSettingDlg.ui" line="339"/>
         <source>鍥惧儚楂樺害锛�</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QCamSettingDlg.ui" line="105"/>
+        <location filename="QCamSettingDlg.ui" line="373"/>
+        <source>Gray8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="QCamSettingDlg.ui" line="378"/>
+        <source>RGB32</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="QCamSettingDlg.ui" line="275"/>
         <source>鍥惧儚瀹藉害锛�</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QCamSettingDlg.ui" line="115"/>
+        <location filename="QCamSettingDlg.ui" line="360"/>
         <source>鍥惧儚鏍煎紡锛�</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QCamSettingDlg.ui" line="122"/>
+        <location filename="QCamSettingDlg.ui" line="263"/>
         <source>澧炵泭锛�</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QCamSettingDlg.ui" line="129"/>
+        <location filename="QCamSettingDlg.ui" line="296"/>
         <source>鏇濆厜锛�</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QCamSettingDlg.ui" line="136"/>
-        <source>搴旂敤</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="QCamSettingDlg.ui" line="144"/>
+        <location filename="QCamSettingDlg.ui" line="68"/>
         <source>鍐呰Е鍙�</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QCamSettingDlg.ui" line="149"/>
+        <location filename="QCamSettingDlg.ui" line="73"/>
         <source>澶栬Е鍙�</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QCamSettingDlg.ui" line="154"/>
+        <location filename="QCamSettingDlg.ui" line="78"/>
         <source>杞Е鍙�</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QCamSettingDlg.ui" line="162"/>
+        <location filename="QCamSettingDlg.ui" line="91"/>
+        <location filename="QCamSettingDlg.cpp" line="108"/>
+        <location filename="QCamSettingDlg.cpp" line="151"/>
         <source>鎵撳紑</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QCamSettingDlg.ui" line="169"/>
+        <location filename="QCamSettingDlg.ui" line="103"/>
         <source>瑙﹀彂</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="QCamSettingDlg.cpp" line="104"/>
+        <location filename="QCamSettingDlg.cpp" line="148"/>
+        <location filename="QCamSettingDlg.cpp" line="158"/>
+        <source>鍏抽棴</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QChannelManager</name>
@@ -477,6 +513,8 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="QDebugDlg.ui" line="179"/>
+        <location filename="QDebugDlg.cpp" line="97"/>
+        <location filename="QDebugDlg.cpp" line="102"/>
         <source>寮�濮嬫ā鎷熸娴�</source>
         <translation type="unfinished"></translation>
     </message>
@@ -485,15 +523,9 @@ p, li { white-space: pre-wrap; }
         <source>閲囬泦涓�寮�</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="QDebugDlg.cpp" line="97"/>
-        <location filename="QDebugDlg.cpp" line="102"/>
-        <source>锟斤拷始模锟斤拷锟斤拷锟斤拷</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="QDebugDlg.cpp" line="98"/>
-        <source>停止</source>
+        <source>鍋滄</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -829,81 +861,81 @@ p, li { white-space: pre-wrap; }
         <location filename="QModelMgrDlg.cpp" line="409"/>
         <location filename="QModelMgrDlg.cpp" line="423"/>
         <location filename="QModelMgrDlg.cpp" line="431"/>
-        <source>锟斤拷示</source>
+        <source>鎻愮ず</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QModelMgrDlg.cpp" line="131"/>
         <location filename="QModelMgrDlg.cpp" line="136"/>
-        <source>锟斤拷选锟斤拷一锟斤拷锟斤拷要追锟斤拷图锟斤拷锟斤拷锟酵号ｏ拷</source>
+        <source>璇烽�夋嫨涓�涓偍瑕佽拷鍔犲浘鍍忕殑鍨嬪彿锛�</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QModelMgrDlg.cpp" line="147"/>
-        <source>锟斤拷锟斤拷图锟斤拷</source>
+        <source>鍔犺浇鍥惧儚</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QModelMgrDlg.cpp" line="148"/>
-        <source>图锟斤拷锟斤拷锟斤拷锟斤拷,锟斤拷锟皆猴拷.....</source>
+        <source>鍥惧儚鍔犺浇涓�,璇风◢鍚�.....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QModelMgrDlg.cpp" line="157"/>
-        <source>锟斤拷锟斤拷失锟杰ｏ拷锟斤拷锟斤拷锟斤拷锟接达拷锟斤拷锟解背锟斤拷锟斤拷图片锟斤拷为模锟藉！锟斤拷锟斤拷</source>
+        <source>娣诲姞澶辫触锛屼笉鑳芥坊鍔犲甫妫�娴嬭儗鏅殑鍥剧墖浣滀负妯℃澘锛侊紒锛�</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QModelMgrDlg.cpp" line="172"/>
-        <source>锟斤拷锟斤拷锟斤拷锟斤拷</source>
+        <source>鍔犺浇瀹屾垚</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QModelMgrDlg.cpp" line="181"/>
         <location filename="QModelMgrDlg.cpp" line="186"/>
         <location filename="QModelMgrDlg.cpp" line="431"/>
-        <source>锟斤拷选锟斤拷一锟斤拷锟斤拷要锟睫改碉拷锟酵号ｏ拷</source>
+        <source>璇烽�夋嫨涓�涓偍瑕佷慨鏀圭殑鍨嬪彿锛�</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QModelMgrDlg.cpp" line="210"/>
-        <source>锟睫革拷锟斤拷模锟斤拷</source>
+        <source>淇敼浜嗘ā鏉�</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QModelMgrDlg.cpp" line="210"/>
-        <source>锟侥诧拷锟斤拷</source>
+        <source>鐨勫弬鏁�</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QModelMgrDlg.cpp" line="213"/>
-        <source>锟睫改成癸拷锟斤拷</source>
+        <source>淇敼鎴愬姛锛�</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QModelMgrDlg.cpp" line="220"/>
         <location filename="QModelMgrDlg.cpp" line="225"/>
-        <source>锟斤拷选锟斤拷一锟斤拷锟斤拷要删锟斤拷锟斤拷锟酵猴拷</source>
+        <source>璇烽�夋嫨涓�涓偍瑕佸垹闄ょ殑鍨嬪彿</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QModelMgrDlg.cpp" line="228"/>
-        <source>锟斤拷锟斤拷锟斤拷删锟斤拷模锟藉按钮</source>
+        <source>鎸変笅浜嗗垹闄ゆā鏉挎寜閽�</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QModelMgrDlg.cpp" line="230"/>
-        <source>锟角凤拷删锟斤拷锟酵猴拷</source>
+        <source>鏄惁鍒犻櫎鍨嬪彿</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QModelMgrDlg.cpp" line="230"/>
-        <source>锟斤拷品模锟斤拷</source>
+        <source>浜у搧妯℃澘</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QModelMgrDlg.cpp" line="237"/>
-        <source>删锟斤拷锟斤拷模锟斤拷</source>
+        <source>鍒犻櫎浜嗘ā鏉�</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -915,7 +947,7 @@ p, li { white-space: pre-wrap; }
         <location filename="QModelMgrDlg.cpp" line="531"/>
         <location filename="QModelMgrDlg.cpp" line="909"/>
         <location filename="QModelMgrDlg.cpp" line="1034"/>
-        <source>锟斤拷</source>
+        <source>鍏�</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -924,90 +956,90 @@ p, li { white-space: pre-wrap; }
         <location filename="QModelMgrDlg.cpp" line="485"/>
         <location filename="QModelMgrDlg.cpp" line="492"/>
         <location filename="QModelMgrDlg.cpp" line="1034"/>
-        <source>锟斤拷锟酵猴拷</source>
+        <source>涓瀷鍙�</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QModelMgrDlg.cpp" line="249"/>
-        <source>锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷模锟藉按钮</source>
+        <source>鎸変笅浜嗘坊鍔犳ā鏉挎寜閽�</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QModelMgrDlg.cpp" line="259"/>
-        <source>锟斤拷品锟斤拷息锟斤拷锟斤拷</source>
+        <source>浜у搧淇℃伅璁剧疆</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QModelMgrDlg.cpp" line="278"/>
-        <source>锟斤拷锟斤拷锟斤拷一锟斤拷锟铰碉拷模锟斤拷</source>
+        <source>娣诲姞浜嗕竴涓柊鐨勬ā鍨�</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QModelMgrDlg.cpp" line="297"/>
-        <source>锟斤拷选锟斤拷一锟斤拷锟斤拷要训锟斤拷锟斤拷锟酵号ｏ拷</source>
+        <source>璇烽�夋嫨涓�涓偍瑕佽缁冪殑鍨嬪彿锛�</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QModelMgrDlg.cpp" line="308"/>
         <location filename="QModelMgrDlg.cpp" line="326"/>
-        <source>训锟斤拷模锟斤拷锟竭筹拷未锟剿筹拷锟斤拷锟斤拷锟皆碉拷</source>
+        <source>璁粌妯℃澘绾跨▼鏈��鍑猴紝璇风◢绛�</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QModelMgrDlg.cpp" line="317"/>
-        <source>锟斤拷锟斤拷锟斤拷锟斤拷锟酵猴拷模锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷训锟斤拷锟斤拷锟节硷拷系统锟侥硷拷锟解功锟杰斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷直锟斤拷模锟斤拷训锟斤拷锟斤拷锟缴ｏ拷全锟斤拷锟斤拷锟斤拷训锟斤拷模锟藉将锟斤拷要锟杰筹拷时锟戒，锟节间将锟斤拷锟杰斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟角凤拷锟斤拷锟斤拷执锟叫ｏ拷</source>
+        <source>灏嗗鎵�鏈夊瀷鍙锋ā鏉胯繘琛岄噸鏂拌缁冿紝鏈熼棿绯荤粺鐨勬娴嬪姛鑳藉皢涓嶈兘姝ｅ父杩愯鐩村埌妯℃澘璁粌瀹屾垚锛屽叏閮ㄩ噸鏂拌缁冩ā鏉垮皢闇�瑕佸緢闀挎椂闂达紝鏈熼棿灏嗕笉鑳借繘琛屽叾浠栧伐浣滐紝鏄惁缁х画鎵ц锛�</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QModelMgrDlg.cpp" line="342"/>
-        <source>确锟斤拷删锟斤拷锟斤拷图锟斤拷?</source>
+        <source>纭畾鍒犻櫎璇ュ浘鍍�?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QModelMgrDlg.cpp" line="343"/>
-        <source>模锟斤拷图片删锟斤拷</source>
+        <source>妯℃澘鍥剧墖鍒犻櫎</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QModelMgrDlg.cpp" line="350"/>
         <location filename="QModelMgrDlg.cpp" line="531"/>
         <location filename="QModelMgrDlg.cpp" line="909"/>
-        <source>锟斤拷图锟斤拷</source>
+        <source>涓浘鍍�</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QModelMgrDlg.cpp" line="403"/>
-        <source>锟斤拷锟斤拷</source>
+        <source>璀﹀憡</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QModelMgrDlg.cpp" line="403"/>
-        <source>锟斤拷锟斤拷删锟斤拷模锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷模锟藉，锟角凤拷锟斤拷锟斤拷锟斤拷</source>
+        <source>鍗冲皢鍒犻櫎妯℃澘搴撻噷鐨勬墍鏈夋ā鏉匡紝鏄惁缁х画锛�</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QModelMgrDlg.cpp" line="405"/>
-        <source>锟劫达拷确锟较ｏ拷锟角凤拷全锟斤拷删锟斤拷锟斤拷</source>
+        <source>鍐嶆纭锛屾槸鍚﹀叏閮ㄥ垹闄わ紵</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QModelMgrDlg.cpp" line="409"/>
-        <source>没锟斤拷模锟斤拷!!!</source>
+        <source>娌℃湁妯℃澘!!!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QModelMgrDlg.cpp" line="423"/>
-        <source>全锟斤拷删锟斤拷锟斤拷锟斤拷!!!</source>
+        <source>鍏ㄩ儴鍒犻櫎瀹屾垚!!!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QModelMgrDlg.cpp" line="533"/>
-        <source>图锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷</source>
+        <source>鍥惧儚鏁伴噺灏戜簬</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QModelMgrDlg.cpp" line="533"/>
-        <source>锟斤拷,锟诫及时锟斤拷锟斤拷训锟斤拷锟斤拷锟斤拷</source>
+        <source>涓�,璇峰強鏃惰ˉ鍏呰缁冩牱鏈�</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1018,42 +1050,42 @@ p, li { white-space: pre-wrap; }
         <location filename="QModelMgrDlg.cpp" line="708"/>
         <location filename="QModelMgrDlg.cpp" line="712"/>
         <location filename="QModelMgrDlg.cpp" line="713"/>
-        <source>模锟斤拷锟斤拷锟铰斤拷锟斤拷</source>
+        <source>妯℃澘鏇存柊杩涘害</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QModelMgrDlg.cpp" line="605"/>
-        <source>锟斤拷锟节筹拷始锟斤拷锟斤拷锟斤拷模锟斤拷 锟斤拷锟斤拷要训锟斤拷%1锟斤拷模锟斤拷,锟斤拷锟皆猴拷.....</source>
+        <source>姝ｅ湪鍒濆鍖栨墍鏈夋ā鏉� 鍏遍渶瑕佽缁�%1涓ā鏉�,璇风◢鍚�.....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QModelMgrDlg.cpp" line="614"/>
-        <source>锟斤拷锟斤拷训锟斤拷%1锟斤拷模锟斤拷 锟斤拷锟斤拷锟斤拷%2/%3,锟斤拷锟皆猴拷.....</source>
+        <source>姝ｅ湪璁粌%1鐨勬ā鏉� 宸插畬鎴�%2/%3,璇风◢鍚�.....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QModelMgrDlg.cpp" line="670"/>
-        <source>%1锟斤拷模锟斤拷锟斤拷取锟斤拷锟斤拷 锟斤拷锟斤拷锟斤拷%2/%3,锟斤拷锟皆猴拷.....</source>
+        <source>%1鐨勬ā鏉胯幏鍙栫壒寰� 宸插畬鎴�%2/%3,璇风◢鍚�.....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QModelMgrDlg.cpp" line="707"/>
-        <source>%1锟斤拷模锟斤拷训锟斤拷锟斤拷锟斤拷 锟斤拷锟斤拷锟斤拷%2/%3,锟斤拷锟皆猴拷.....</source>
+        <source>%1鐨勬ā鏉胯缁冨畬鎴� 宸插畬鎴�%2/%3,璇风◢鍚�.....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QModelMgrDlg.cpp" line="713"/>
-        <source>全锟斤拷模锟斤拷锟斤拷锟斤拷锟斤拷锟缴ｏ拷%1s</source>
+        <source>鍏ㄩ儴妯℃澘鏇存柊瀹屾垚锛�%1s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QModelMgrDlg.cpp" line="714"/>
-        <source>锟斤拷全锟斤拷模锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷训锟斤拷锟斤拷锟斤拷%1锟斤拷模锟斤拷</source>
+        <source>瀵瑰叏閮ㄦā鏉胯繘琛屼簡閲嶆柊璁粌锛屽叡%1涓ā鏉�</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QModelMgrDlg.cpp" line="724"/>
-        <source>模锟斤拷锟斤拷锟斤拷准锟斤拷锟斤拷锟皆猴拷.....</source>
+        <source>妯℃澘姝ｅ湪鍑嗗璇风◢鍚�.....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1069,38 +1101,38 @@ p, li { white-space: pre-wrap; }
         <location filename="QModelMgrDlg.cpp" line="836"/>
         <location filename="QModelMgrDlg.cpp" line="837"/>
         <location filename="QModelMgrDlg.cpp" line="838"/>
-        <source>模锟斤拷训锟斤拷锟斤拷锟斤拷</source>
+        <source>妯℃澘璁粌杩涘害</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QModelMgrDlg.cpp" line="739"/>
         <location filename="QModelMgrDlg.cpp" line="740"/>
-        <source>%1锟酵猴拷没锟斤拷图片锟斤拷锟斤拷训锟斤拷锟斤拷</source>
+        <source>%1鍨嬪彿娌℃湁鍥剧墖涓嶈兘璁粌锛�</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QModelMgrDlg.cpp" line="817"/>
-        <source>%1锟斤拷模锟斤拷 锟斤拷锟节伙拷取锟斤拷锟斤拷值,锟斤拷锟皆猴拷....</source>
+        <source>%1鐨勬ā鏉� 姝ｅ湪鑾峰彇鐗瑰緛鍊�,璇风◢鍚�....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QModelMgrDlg.cpp" line="838"/>
-        <source>训锟斤拷锟斤拷锟缴ｏ拷%1s</source>
+        <source>璁粌瀹屾垚锛�%1s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QModelMgrDlg.cpp" line="840"/>
-        <source>训锟斤拷锟斤拷模锟斤拷:%1</source>
+        <source>璁粌浜嗘ā鏉�:%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QModelMgrDlg.cpp" line="984"/>
-        <source>确锟斤拷</source>
+        <source>纭</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QModelMgrDlg.cpp" line="985"/>
-        <source>取锟斤拷</source>
+        <source>鍙栨秷</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1576,7 +1608,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QSystemSettingDlg.cpp" line="979"/>
+        <location filename="QSystemSettingDlg.cpp" line="981"/>
         <source>鎵撳紑鏂囦欢澶�</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1598,6 +1630,8 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="QTimeMgrDlg.ui" line="28"/>
+        <location filename="QTimeMgrDlg.cpp" line="81"/>
+        <location filename="QTimeMgrDlg.cpp" line="119"/>
         <source>鏈�変腑</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1618,64 +1652,72 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="QTimeMgrDlg.cpp" line="21"/>
-        <location filename="QTimeMgrDlg.cpp" line="68"/>
-        <location filename="QTimeMgrDlg.cpp" line="69"/>
-        <location filename="QTimeMgrDlg.cpp" line="148"/>
-        <location filename="QTimeMgrDlg.cpp" line="149"/>
-        <location filename="QTimeMgrDlg.cpp" line="201"/>
-        <location filename="QTimeMgrDlg.cpp" line="202"/>
-        <source>锟斤拷锟斤拷</source>
+        <source>鐝</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QTimeMgrDlg.cpp" line="21"/>
-        <source>锟斤拷始时锟斤拷</source>
+        <source>璧峰鏃堕棿</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QTimeMgrDlg.cpp" line="21"/>
-        <source>锟斤拷锟斤拷时锟斤拷</source>
+        <source>缁撴潫鏃堕棿</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QTimeMgrDlg.cpp" line="52"/>
-        <source>锟斤拷锟矫诧拷锟斤拷</source>
+        <source>璁剧疆鍙傛暟</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QTimeMgrDlg.cpp" line="81"/>
-        <location filename="QTimeMgrDlg.cpp" line="119"/>
-        <source>未选锟斤拷</source>
+        <location filename="QTimeMgrDlg.cpp" line="68"/>
+        <location filename="QTimeMgrDlg.cpp" line="69"/>
+        <location filename="QTimeMgrDlg.cpp" line="148"/>
+        <location filename="QTimeMgrDlg.cpp" line="149"/>
+        <location filename="QTimeMgrDlg.cpp" line="201"/>
+        <location filename="QTimeMgrDlg.cpp" line="202"/>
+        <source>褰撳ぉ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="QTimeMgrDlg.cpp" line="68"/>
+        <location filename="QTimeMgrDlg.cpp" line="69"/>
+        <location filename="QTimeMgrDlg.cpp" line="148"/>
+        <location filename="QTimeMgrDlg.cpp" line="149"/>
+        <location filename="QTimeMgrDlg.cpp" line="201"/>
+        <location filename="QTimeMgrDlg.cpp" line="202"/>
+        <source>闅斿ぉ</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QTimeMgrDlg.cpp" line="84"/>
         <location filename="QTimeMgrDlg.cpp" line="95"/>
         <location filename="QTimeMgrDlg.cpp" line="122"/>
-        <source>锟斤拷示</source>
+        <source>鎻愮ず</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QTimeMgrDlg.cpp" line="84"/>
         <location filename="QTimeMgrDlg.cpp" line="122"/>
-        <source>未选锟斤拷锟斤拷锟轿ｏ拷锟斤拷选锟斤拷锟斤拷锟斤拷锟睫改★拷</source>
+        <source>鏈�夋嫨鐝锛岃閫夋嫨杩涜淇敼銆�</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QTimeMgrDlg.cpp" line="86"/>
         <location filename="QTimeMgrDlg.cpp" line="97"/>
         <location filename="QTimeMgrDlg.cpp" line="124"/>
-        <source>确锟斤拷</source>
+        <source>纭</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QTimeMgrDlg.cpp" line="91"/>
-        <source>锟斤拷确锟斤拷要删锟斤拷 %1 锟斤拷锟轿ｏ拷</source>
+        <source>鎮ㄧ‘瀹氳鍒犻櫎 %1 鐝锛�</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QTimeMgrDlg.cpp" line="98"/>
-        <source>取锟斤拷</source>
+        <source>鍙栨秷</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -2027,6 +2069,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="lpMainWin.ui" line="252"/>
+        <location filename="lpMainWin.cpp" line="768"/>
         <source>寮�濮嬫娴�</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2088,6 +2131,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="lpMainWin.ui" line="645"/>
+        <location filename="lpMainWin.cpp" line="87"/>
         <source>妫�娴嬬姸鎬�</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2123,6 +2167,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="lpMainWin.ui" line="872"/>
+        <location filename="lpMainWin.cpp" line="714"/>
         <source>妯℃澘绠＄悊</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2158,295 +2203,276 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="lpMainWin.ui" line="970"/>
+        <location filename="lpMainWin.cpp" line="660"/>
         <source>鍏充簬</source>
-        <translation type="unfinished"></translation>
+        <translation>About</translation>
     </message>
     <message>
         <location filename="lpMainWin.ui" line="984"/>
         <source>鐧诲綍</source>
-        <translation type="unfinished"></translation>
+        <translation>Login</translation>
     </message>
     <message>
         <location filename="lpMainWin.ui" line="998"/>
         <source>鐢ㄦ埛绠＄悊</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="lpMainWin.ui" line="1012"/>
         <source>绯荤粺璁剧疆</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="lpMainWin.ui" line="1026"/>
+        <location filename="lpMainWin.cpp" line="740"/>
         <source>鐩告満閰嶇疆</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="lpMainWin.cpp" line="28"/>
-        <source>锟斤拷锟截憋拷要模锟斤拷.....</source>
-        <translation type="unfinished"></translation>
+        <source>鍔犺浇蹇呰妯″潡.....</source>
+        <translation></translation>
     </message>
     <message>
         <location filename="lpMainWin.cpp" line="72"/>
         <location filename="lpMainWin.cpp" line="73"/>
-        <location filename="lpMainWin.cpp" line="653"/>
-        <source>锟斤拷锟斤拷</source>
-        <translation type="unfinished"></translation>
+        <source>宸ュ叿</source>
+        <translation></translation>
     </message>
     <message>
         <location filename="lpMainWin.cpp" line="85"/>
-        <source>系统时锟斤拷</source>
-        <translation type="unfinished"></translation>
+        <source>绯荤粺鏃堕棿</source>
+        <translation></translation>
     </message>
     <message>
         <location filename="lpMainWin.cpp" line="86"/>
-        <source>锟斤拷锟斤拷锟斤拷息</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="lpMainWin.cpp" line="87"/>
-        <source>锟斤拷锟斤拷状态</source>
-        <translation type="unfinished"></translation>
+        <source>鐝淇℃伅</source>
+        <translation></translation>
     </message>
     <message>
         <location filename="lpMainWin.cpp" line="88"/>
-        <source>锟矫伙拷锟斤拷</source>
-        <translation type="unfinished"></translation>
+        <source>鐢ㄦ埛锛�</source>
+        <translation></translation>
     </message>
     <message>
         <location filename="lpMainWin.cpp" line="143"/>
-        <source>锟斤拷史</source>
-        <translation type="unfinished"></translation>
+        <source>鍘嗗彶</source>
+        <translation></translation>
     </message>
     <message>
         <location filename="lpMainWin.cpp" line="158"/>
-        <source>系统锟斤拷始锟斤拷锟斤拷锟斤拷...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="lpMainWin.cpp" line="513"/>
-        <source>锟斤拷示识锟斤拷锟斤拷锟斤拷</source>
-        <translation type="unfinished"></translation>
+        <source>绯荤粺鍒濆鍖栧畬鎴�...</source>
+        <translation></translation>
     </message>
     <message>
-        <location filename="lpMainWin.cpp" line="516"/>
-        <source>锟斤拷锟斤拷图锟斤拷锟酵憋拷锟斤拷图锟斤拷一锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟解背锟斤拷锟斤拷</source>
-        <translation type="unfinished"></translation>
+        <location filename="lpMainWin.cpp" line="520"/>
+        <source>鏄剧ず璇嗗埆缁撴灉</source>
+        <translation></translation>
     </message>
     <message>
-        <location filename="lpMainWin.cpp" line="540"/>
-        <source>锟斤拷锟斤拷!!!锟斤拷锟斤拷锟斤拷锟斤拷%1锟斤拷未识锟斤拷锟酵猴拷</source>
-        <translation type="unfinished"></translation>
+        <location filename="lpMainWin.cpp" line="523"/>
+        <source>鐩告満鍥惧儚鍜岃儗鏅浘涓嶄竴鏍凤紝璇锋洿鎹㈡娴嬭儗鏅紒</source>
+        <translation></translation>
     </message>
     <message>
-        <location filename="lpMainWin.cpp" line="542"/>
-        <source>,未锟斤拷锟斤拷锟斤拷锟解功锟斤拷锟斤拷锟缴碉拷</source>
-        <translation type="unfinished"></translation>
+        <location filename="lpMainWin.cpp" line="547"/>
+        <source>璀﹀憡!!!杩炵画鍑虹幇%1涓湭璇嗗埆鍨嬪彿</source>
+        <translation></translation>
     </message>
     <message>
-        <location filename="lpMainWin.cpp" line="578"/>
-        <source>锟斤拷锟斤拷图锟斤拷,锟斤拷锟节硷拷锟斤拷锟斤拷...</source>
-        <translation type="unfinished"></translation>
+        <location filename="lpMainWin.cpp" line="549"/>
+        <source>,鏈紑鍚娴嬪姛鑳介�犳垚鐨�</source>
+        <translation></translation>
     </message>
     <message>
-        <location filename="lpMainWin.cpp" line="624"/>
-        <source>注 锟斤拷</source>
-        <translation type="unfinished"></translation>
+        <location filename="lpMainWin.cpp" line="585"/>
+        <source>鑾峰緱鍥惧儚,姝ｅ湪璁＄畻涓�...</source>
+        <translation></translation>
     </message>
     <message>
-        <location filename="lpMainWin.cpp" line="629"/>
-        <source>锟斤拷 录</source>
-        <translation type="unfinished"></translation>
+        <location filename="lpMainWin.cpp" line="631"/>
+        <source>娉� 閿�</source>
+        <translation>Logout</translation>
     </message>
     <message>
-        <location filename="lpMainWin.cpp" line="670"/>
-        <source>锟斤拷锟轿癸拷锟斤拷</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="lpMainWin.cpp" line="681"/>
-        <source>锟斤拷锟皆癸拷锟斤拷</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="lpMainWin.cpp" line="707"/>
-        <source>模锟斤拷锟斤拷锟斤拷</source>
-        <translation type="unfinished"></translation>
+        <location filename="lpMainWin.cpp" line="636"/>
+        <source>鐧� 褰�</source>
+        <translation>Login</translation>
     </message>
     <message>
-        <location filename="lpMainWin.cpp" line="720"/>
-        <source>系统锟斤拷锟斤拷锟斤拷锟斤拷</source>
-        <translation type="unfinished"></translation>
+        <location filename="lpMainWin.cpp" line="677"/>
+        <source>鐝绠＄悊</source>
+        <translation></translation>
     </message>
     <message>
-        <location filename="lpMainWin.cpp" line="733"/>
-        <source>锟斤拷锟斤拷锟斤拷锟斤拷</source>
-        <translation type="unfinished"></translation>
+        <location filename="lpMainWin.cpp" line="688"/>
+        <source>璋冭瘯宸ュ叿</source>
+        <translation>DebugTool</translation>
     </message>
     <message>
-        <location filename="lpMainWin.cpp" line="750"/>
-        <source>停止锟斤拷锟斤拷</source>
-        <translation type="unfinished"></translation>
+        <location filename="lpMainWin.cpp" line="727"/>
+        <source>绯荤粺鍙傛暟璁剧疆</source>
+        <translation></translation>
     </message>
     <message>
-        <location filename="lpMainWin.cpp" line="752"/>
-        <source>锟斤拷锟斤拷锟剿匡拷始锟斤拷锟解按钮锟斤拷锟斤拷锟解功锟杰匡拷锟斤拷</source>
-        <translation type="unfinished"></translation>
+        <location filename="lpMainWin.cpp" line="758"/>
+        <source>鍋滄妫�娴�</source>
+        <translation></translation>
     </message>
     <message>
         <location filename="lpMainWin.cpp" line="760"/>
-        <source>锟斤拷始锟斤拷锟斤拷</source>
+        <source>鎸変笅浜嗗紑濮嬫娴嬫寜閽紝妫�娴嬪姛鑳藉紑鍚�</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="lpMainWin.cpp" line="761"/>
-        <source>锟斤拷锟斤拷锟斤拷停止锟斤拷锟解按钮锟斤拷锟斤拷锟解功锟杰关憋拷</source>
+        <location filename="lpMainWin.cpp" line="769"/>
+        <source>鎸変笅浜嗗仠姝㈡娴嬫寜閽紝妫�娴嬪姛鑳藉叧闂�</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="lpMainWin.cpp" line="768"/>
-        <source>锟斤拷示</source>
+        <location filename="lpMainWin.cpp" line="776"/>
+        <source>鎻愮ず</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="lpMainWin.cpp" line="768"/>
-        <source>锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷</source>
+        <location filename="lpMainWin.cpp" line="776"/>
+        <source>灏嗘竻绌烘墍鏈夋暟鎹�</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="lpMainWin.cpp" line="769"/>
-        <source>确锟斤拷</source>
+        <location filename="lpMainWin.cpp" line="777"/>
+        <source>纭畾</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="lpMainWin.cpp" line="770"/>
-        <source>取锟斤拷</source>
+        <location filename="lpMainWin.cpp" line="778"/>
+        <source>鍙栨秷</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="lpMainWin.cpp" line="776"/>
-        <source>锟斤拷锟斤拷锟斤拷锟斤拷锟姐按钮锟斤拷锟斤拷锟斤拷全锟斤拷锟斤拷锟斤拷</source>
+        <location filename="lpMainWin.cpp" line="784"/>
+        <source>鎸変笅浜嗘竻闆舵寜閽紝鏁版嵁鍏ㄩ儴娓呴浂</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="lpMainWin.cpp" line="785"/>
-        <source>系统时锟戒： </source>
+        <location filename="lpMainWin.cpp" line="793"/>
+        <source>绯荤粺鏃堕棿锛� </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="lpMainWin.cpp" line="786"/>
-        <source>锟斤拷锟斤拷状态:</source>
+        <location filename="lpMainWin.cpp" line="794"/>
+        <source>妫�娴嬬姸鎬�:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="lpMainWin.cpp" line="786"/>
-        <source>锟斤拷锟斤拷锟斤拷...</source>
+        <location filename="lpMainWin.cpp" line="794"/>
+        <source>妫�娴嬩腑...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="lpMainWin.cpp" line="786"/>
-        <source>未锟斤拷锟斤拷...</source>
+        <location filename="lpMainWin.cpp" line="794"/>
+        <source>鏈娴�...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="lpMainWin.cpp" line="816"/>
-        <source>锟斤拷锟斤拷锟斤拷息锟斤拷</source>
+        <location filename="lpMainWin.cpp" line="824"/>
+        <source>鐝淇℃伅锛�</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="lpMainWin.cpp" line="816"/>
-        <source>锟斤拷时锟斤拷锟斤拷未锟斤拷锟矫帮拷锟斤拷</source>
+        <location filename="lpMainWin.cpp" line="824"/>
+        <source>璇ユ椂闂存鏈缃彮娆�</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="lpMainWin.cpp" line="830"/>
-        <source>锟斤拷前锟矫伙拷锟斤拷</source>
+        <location filename="lpMainWin.cpp" line="838"/>
+        <source>褰撳墠鐢ㄦ埛锛�</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="lpMainWin.cpp" line="880"/>
-        <source>模锟斤拷锟解发锟斤拷锟斤拷锟斤拷</source>
+        <location filename="lpMainWin.cpp" line="888"/>
+        <source>妯℃澘搴撳彂閫佸畬鎴�</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="lpMainWin.cpp" line="907"/>
-        <location filename="lpMainWin.cpp" line="932"/>
-        <source>锟斤拷锟节硷拷锟斤拷锟酵猴拷锟斤拷</source>
+        <location filename="lpMainWin.cpp" line="915"/>
+        <location filename="lpMainWin.cpp" line="940"/>
+        <source>姝ｅ湪妫�娴嬪瀷鍙锋暟</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="lpMainWin.cpp" line="977"/>
-        <source>锟斤拷锟斤拷锟斤拷</source>
+        <location filename="lpMainWin.cpp" line="985"/>
+        <source>宸茶繛鎺�</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="lpMainWin.cpp" line="981"/>
-        <source>锟窖断匡拷</source>
+        <location filename="lpMainWin.cpp" line="989"/>
+        <source>宸叉柇寮�</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="lpMainWin.cpp" line="1034"/>
-        <source>PLC锟斤拷锟秸碉拷锟斤拷锟斤拷锟斤拷锟矫诧拷锟斤拷锟斤拷</source>
+        <location filename="lpMainWin.cpp" line="1042"/>
+        <source>PLC宸叉敹鍒扮浉鍏宠缃弬鏁帮紒</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="lpMainWin.cpp" line="1088"/>
-        <source>锟窖达拷锟斤拷</source>
+        <location filename="lpMainWin.cpp" line="1096"/>
+        <source>宸叉墦寮�</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="lpMainWin.cpp" line="1090"/>
-        <source>锟窖关憋拷</source>
+        <location filename="lpMainWin.cpp" line="1098"/>
+        <source>宸插叧闂�</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="lpMainWin.cpp" line="1198"/>
-        <source>锟斤拷锟斤拷锟酵猴拷识锟斤拷系统</source>
+        <location filename="lpMainWin.cpp" line="1206"/>
+        <source>杞瘋鍨嬪彿璇嗗埆绯荤粺</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="lpMainWin.cpp" line="1199"/>
-        <source>锟斤拷锟斤拷锟斤拷锟缴猴拷锟斤拷锟斤拷锟斤拷锟狡硷拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟酵猴拷识锟斤拷锟酵凤拷锟洁，锟缴达拷锟斤拷锟斤拷水锟斤拷锟斤拷锟斤拷系统使锟斤拷</source>
+        <location filename="lpMainWin.cpp" line="1207"/>
+        <source>鏈蒋浠剁敱鏉窞鍒╃弨绉戞妧寮�鍙戯紝鐢ㄤ簬杞瘋鍨嬪彿璇嗗埆鍜屽垎绫伙紝鍙惌閰嶆祦姘寸嚎杩愯緭绯荤粺浣跨敤</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="lpMainWin.cpp" line="1200"/>
-        <source>锟斤拷锟斤拷要锟斤拷一锟斤拷锟剿斤拷锟矫诧拷品锟斤拷锟斤拷锟斤拷锟斤拷息锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟角碉拷锟斤拷站</source>
+        <location filename="lpMainWin.cpp" line="1208"/>
+        <source>鑻ラ渶瑕佽繘涓�姝ヤ簡瑙ｈ浜у搧鐨勭浉鍏充俊鎭紝璇疯闂垜浠殑缃戠珯</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="lpMainWin.cpp" line="1201"/>
-        <source>锟斤拷锟斤拷锟芥本</source>
+        <location filename="lpMainWin.cpp" line="1209"/>
+        <source>杞欢鐗堟湰</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="lpMainWin.cpp" line="1203"/>
-        <source>锟姐法锟芥本</source>
+        <location filename="lpMainWin.cpp" line="1211"/>
+        <source>绠楁硶鐗堟湰</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="lpMainWin.cpp" line="1204"/>
-        <source>锟斤拷锟斤拷锟斤拷锟斤拷时锟斤拷</source>
+        <location filename="lpMainWin.cpp" line="1212"/>
+        <source>鏈�鍚庢洿鏂版椂闂�</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="lpMainWin.cpp" line="1205"/>
-        <source>锟斤拷权 (c) 锟斤拷 锟斤拷锟斤拷锟斤拷锟斤拷锟狡硷拷锟斤拷锟睫癸拷司 锟斤拷锟斤拷</source>
+        <location filename="lpMainWin.cpp" line="1213"/>
+        <source>鐗堟潈 (c) 灞� 鏉窞鍒╃弨绉戞妧鏈夐檺鍏徃 鎵�鏈�</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="lpMainWin.cpp" line="1222"/>
-        <source>锟截憋拷</source>
+        <location filename="lpMainWin.cpp" line="1230"/>
+        <source>鍏抽棴</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="lpMainWin.cpp" line="1378"/>
-        <source>(默锟斤拷)</source>
+        <location filename="lpMainWin.cpp" line="1386"/>
+        <source>(榛樿)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="lpMainWin.cpp" line="1383"/>
-        <source>默锟斤拷通锟斤拷 值1000</source>
+        <location filename="lpMainWin.cpp" line="1391"/>
+        <source>榛樿閫氶亾 鍊�1000</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/tpvs17/tpMain/tpMain.vcxproj b/tpvs17/tpMain/tpMain.vcxproj
index 6cbff70..e6de626 100644
--- a/tpvs17/tpMain/tpMain.vcxproj
+++ b/tpvs17/tpMain/tpMain.vcxproj
@@ -1357,7 +1357,7 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
     </ClCompile>
     <Link>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Windows</SubSystem>
       <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>
       <GenerateDebugInformation>true</GenerateDebugInformation>
diff --git a/tpvs17/wheel.sln b/tpvs17/wheel.sln
index 1ddec6e..95f801e 100644
--- a/tpvs17/wheel.sln
+++ b/tpvs17/wheel.sln
@@ -5,6 +5,10 @@ VisualStudioVersion = 15.0.28307.1267
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lpMain", "tpMain\tpMain.vcxproj", "{A229CF5C-81EF-4909-AB6E-49C746F1ED4C}"
 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
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		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}.Release|x64.ActiveCfg = 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
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE