diff --git a/runner17/Net4Wheeld.dll b/runner17/Net4Wheeld.dll index 5dc1da4..4fd4cd4 100644 Binary files a/runner17/Net4Wheeld.dll and b/runner17/Net4Wheeld.dll differ diff --git a/runner17/QUserInfo.dll b/runner17/QUserInfo.dll index e8af179..d0afa03 100644 Binary files a/runner17/QUserInfo.dll and b/runner17/QUserInfo.dll differ diff --git a/runner17/QUserInfod.dll b/runner17/QUserInfod.dll index 5973f63..2b5a315 100644 Binary files a/runner17/QUserInfod.dll and b/runner17/QUserInfod.dll differ diff --git a/runner17/Qt5Core.dll b/runner17/Qt5Core.dll index 239b4af..e964016 100644 Binary files a/runner17/Qt5Core.dll and b/runner17/Qt5Core.dll differ diff --git a/runner17/config/camera.json b/runner17/config/camera.json index c5e5182..63c323e 100644 --- a/runner17/config/camera.json +++ b/runner17/config/camera.json @@ -1,14 +1,14 @@ { "devices": { - "DMK 33GP031 25614072": { + "MV-CA050-10GC 00C27808759": { "algorithm": 0, "board_num": 0, "board_type": 0, "exposure": 26000, - "folder": "E:\\Leaper\\Documents\\wheel\\WF1\\WF\\DH151079", + "folder": "C:\\Users\\Administrator\\Source(6)\\", "format": "GRAY8", "gain": 8, - "height": 1200, + "height": 2048, "id": 2, "loop": 1, "rely_on_camera": "", @@ -16,26 +16,7 @@ "save_img_suffix": ".BMP", "showname": "工位2", "type": 100, - "width": 1920, - "zoom": 1 - }, - "MV-CA050-10GC 00C27808759": { - "algorithm": 0, - "board_num": 0, - "board_type": 0, - "exposure": 160000, - "folder": ".\\testimg\\", - "format": "GRAY8", - "gain": 8, - "height": 1944, - "id": 1, - "loop": 1, - "rely_on_camera": "", - "save": 0, - "save_img_suffix": ".BMP", - "showname": "工位1", - "type": 100, - "width": 2592, + "width": 3072, "zoom": 1 } } diff --git a/runner17/lpCoreCtrl.dll b/runner17/lpCoreCtrl.dll index a13a722..2426f9e 100644 Binary files a/runner17/lpCoreCtrl.dll and b/runner17/lpCoreCtrl.dll differ diff --git a/runner17/lpCoreCtrld.dll b/runner17/lpCoreCtrld.dll index cc5d661..c56bb5f 100644 Binary files a/runner17/lpCoreCtrld.dll and b/runner17/lpCoreCtrld.dll differ diff --git a/runner17/tpCam_100.dll b/runner17/tpCam_100.dll index 871a661..5e6ac21 100644 Binary files a/runner17/tpCam_100.dll and b/runner17/tpCam_100.dll differ diff --git a/runner17/tpCam_100d.dll b/runner17/tpCam_100d.dll index cb851a2..b7fdc7b 100644 Binary files a/runner17/tpCam_100d.dll and b/runner17/tpCam_100d.dll differ diff --git a/runner17/tpCam_140.dll b/runner17/tpCam_140.dll index 7133c32..f610125 100644 Binary files a/runner17/tpCam_140.dll and b/runner17/tpCam_140.dll differ diff --git a/runner17/tpCam_140d.dll b/runner17/tpCam_140d.dll index 5b8b31d..c7535b4 100644 Binary files a/runner17/tpCam_140d.dll and b/runner17/tpCam_140d.dll differ diff --git a/runner17/tpCam_160.dll b/runner17/tpCam_160.dll index 10de5b8..784003c 100644 Binary files a/runner17/tpCam_160.dll and b/runner17/tpCam_160.dll differ diff --git a/runner17/tpCam_160d.dll b/runner17/tpCam_160d.dll index ec94249..cc2aa84 100644 Binary files a/runner17/tpCam_160d.dll and b/runner17/tpCam_160d.dll differ diff --git a/runner17/user/WorkManager.json b/runner17/user/WorkManager.json index 1c7b011..62a218b 100644 --- a/runner17/user/WorkManager.json +++ b/runner17/user/WorkManager.json @@ -10,14 +10,17 @@ }, "test": { "DefectList": [ - "1", + "DK151050", "JC151013", - "JK131044", - "JZ131011", "JZ131261", - "PA131204", + "1", "DK151079", - "DK151050" + "JK131044", + "PA131204", + "222", + "3", + "2", + "4" ], "about": "", "key": "test", diff --git a/runner17/user/background.png b/runner17/user/background.png index 1353c73..c4a303b 100644 Binary files a/runner17/user/background.png and b/runner17/user/background.png differ diff --git a/runner17/user/selfdefine.json b/runner17/user/selfdefine.json index 0f46753..5c8e328 100644 --- a/runner17/user/selfdefine.json +++ b/runner17/user/selfdefine.json @@ -1,19 +1,26 @@ { "AlgPara": { - "Threshold": 60 + "RatioType": 0, + "Threshold": 150, + "bEqual": false, + "circle_acthres": 3, + "circle_edgewidth": 6, + "circle_polarity": 0, + "filterSize": 200, + "useBackground": 0 }, "AutoSystem": { "AutoSendTick2COM": 1, "AutoSendTick2Net": 1, - "CameraTrigerType": 0, + "CameraTrigerType": 1, "IsUseChannel": 0, "IsUseRaster": 1, "SaveD2HCsv": 0, "SendChannelRes2COM": 1, - "SendChannelRes2Net": 1, + "SendChannelRes2Net": 0, "SendDetectStr2Net": 1, "StartAndDetect": 1, - "showThressList": 0, + "showThressList": 1886040416, "showThressValue": 0 }, "CheckDB": { @@ -25,45 +32,32 @@ "DetectImage": { "Debug": 1001, "SaveCut_Bad": 1, - "SaveCut_Good": 1, - "SaveImgPath": "D:/汽摩轮/分类软件/runner17 -20210706", - "Save_Bad": 1, - "Save_Good": 0, - "UseBackground": 1 + "SaveCut_Good": 0, + "SaveImgPath": "F:/ValueProject/wheel/tpvs17/../runner17", + "Save_Bad": 0, + "Save_Good": 0 }, "DetectModl": { "UseCutImg": 0, - "Virsual_Camera": 1, - "Virsual_Times": 3000 + "Virsual_Camera": 0, + "Virsual_Times": 1000 }, "Dia2Th": { "b": 0.7862445712089539, "k": -0.0007752884412184358 }, "TcpNetWork": { - "TCP_Address": "192.168.0.240", + "TCP_Address": "127.0.0.1", "TCP_Type": "server", "TCP_port": 2000, - "client_IP": "192.168.0.119", - "client_port": 2000 + "client_IP": "127.0.0.1", + "client_port": 2001 }, "alg": { - "useDiameter": 1, + "useDiameter": 0, "useThickness": 0 }, "detectState": { "isOnline": false - }, - "plcPara": { - "CamTrigDelay": 2000, - "CamTrigPulse": 10, - "IsRestartServer": 0, - "IsSaveMsgInlog": 0, - "LightDelay": 10, - "ResHoldTime": 5, - "ShowTimeOutMsg": 0, - "TimeOutCount": 1, - "TrigerFilter": 10, - "TrigerType": 1 } } diff --git a/src/algorithm/ImageProcess.cpp b/src/algorithm/ImageProcess.cpp index 843ad12..8da6382 100644 --- a/src/algorithm/ImageProcess.cpp +++ b/src/algorithm/ImageProcess.cpp @@ -73,12 +73,18 @@ cv::Mat ImageProcess::findCircle(const Mat &srcImg, Point2f& center, double &rad int nIndex = -1; float centerX = 0; float centerY = 0; + double tmpmaxR = 0; for (int i = 0; i < EDCircle.size(); i++) { int startX = EDCircle[i].center.x - EDCircle[i].r; int startY = EDCircle[i].center.y - EDCircle[i].r; - centerX = EDCircle[i].center.x * REAIZE; - centerY = EDCircle[i].center.y * REAIZE; + if (EDCircle[i].r > tmpmaxR) + { + centerX = EDCircle[i].center.x * REAIZE; + centerY = EDCircle[i].center.y * REAIZE; + tmpmaxR = EDCircle[i].r; + } + if (startX < 0 || startY < 0) continue; if (EDCircle[i].center.x + EDCircle[i].r > bBaseX || EDCircle[i].center.y + EDCircle[i].r > bBaseY) @@ -209,12 +215,19 @@ cv::Mat ImageProcess::findCircleByBackground(const Mat &srcImg, const Mat& backg int nIndex = -1; float centerX = 0; float centerY = 0; + double tmpmaxR = 0; for (int i = 0; i < EDCircle.size(); i++) { - centerX = EDCircle[i].center.x * REAIZE; - centerY = EDCircle[i].center.y * REAIZE; int startX = EDCircle[i].center.x - EDCircle[i].r; int startY = EDCircle[i].center.y - EDCircle[i].r; + + if (EDCircle[i].r > tmpmaxR) + { + centerX = EDCircle[i].center.x * REAIZE; + centerY = EDCircle[i].center.y * REAIZE; + tmpmaxR = EDCircle[i].r; + } + if (startX < 0 || startY < 0) continue; if (EDCircle[i].center.x + EDCircle[i].r > bBaseX || EDCircle[i].center.y + EDCircle[i].r > bBaseY) diff --git a/src/tpMain/cryptokey/lpCryptokey.cpp b/src/tpMain/cryptokey/lpCryptokey.cpp index 6ed59e5..b2ca685 100644 --- a/src/tpMain/cryptokey/lpCryptokey.cpp +++ b/src/tpMain/cryptokey/lpCryptokey.cpp @@ -87,7 +87,15 @@ bool lpCheckKey::checkLinese() } QSettings settingKey("Leaper_Register"); QString strKey = settingKey.value("key").toString(); - + bool bRegister = settingKey.value("register",false).toBool(); + QString serialNo = settingKey.value("serialNo").toString(); + if (m_SerialNo != serialNo) + { + if (bRegister == true) + { + return true; + } + } QByteArray lineseData = genLinese(m_SerialNo.toLatin1()); if (lineseData == strKey) return true; @@ -102,6 +110,8 @@ bool lpCheckKey::checkLinese(QString serialNo, QString linese) { QSettings settingKey("Leaper_Register"); settingKey.setValue("key", linese); + settingKey.setValue("register", true); + settingKey.setValue("serialNo",serialNo); return true; } else diff --git a/tpvs17/lpReport/lpReport.vcxproj b/tpvs17/lpReport/lpReport.vcxproj index fa6fb06..9bf83fd 100644 --- a/tpvs17/lpReport/lpReport.vcxproj +++ b/tpvs17/lpReport/lpReport.vcxproj @@ -219,6 +219,10 @@ + + + + diff --git a/tpvs17/lpReport/lpReport.vcxproj.filters b/tpvs17/lpReport/lpReport.vcxproj.filters index bac7b7f..f56db66 100644 --- a/tpvs17/lpReport/lpReport.vcxproj.filters +++ b/tpvs17/lpReport/lpReport.vcxproj.filters @@ -28,6 +28,11 @@ moc;h;cpp False + + {639EADAA-A684-42e4-A9AD-28FC9BCB8F7C} + ts + false + @@ -138,4 +143,12 @@ + + + Translation Files + + + Translation Files + + \ No newline at end of file diff --git a/tpvs17/lpReport/lpreport_zh.ts b/tpvs17/lpReport/lpreport_zh.ts index 1ab3e4e..dfd1418 100644 --- a/tpvs17/lpReport/lpreport_zh.ts +++ b/tpvs17/lpReport/lpreport_zh.ts @@ -7,23 +7,23 @@ 型号 - + Model 数量 - + Num 编号 - + Index 请选择对应时间并查询数据！ - + Please select the corresponding time and query data! @@ -31,351 +31,351 @@ 时间设置 - + Time Setting 0 - + 1 - + 2 - + 3 - + 4 - + 5 - + 6 - + 7 - + 8 - + 9 - + 10 - + 11 - + 12 - + 13 - + 14 - + 15 - + 16 - + 17 - + 18 - + 19 - + 20 - + 21 - + 22 - + 23 - + 24 - + 25 - + 26 - + 27 - + 28 - + 29 - + 30 - + 31 - + 32 - + 33 - + 34 - + 35 - + 36 - + 37 - + 38 - + 39 - + 40 - + 41 - + 42 - + 43 - + 44 - + 45 - + 46 - + 47 - + 48 - + 49 - + 50 - + 51 - + 52 - + 53 - + 54 - + 55 - + 56 - + 57 - + 58 - + 59 - + 小时 - + Hour 分钟 - + M 2017/00/00 00:00 - + 确定 - + OK @@ -383,7 +383,7 @@ TestWidget - + @@ -391,7 +391,7 @@ 数据记录查看 - + Data record viewing @@ -402,7 +402,7 @@ 共显示%1条记录 - + A total of %1 records are displayed @@ -416,7 +416,7 @@ 第%1页 共%2页 - + Page %1 total pages %2 @@ -437,45 +437,45 @@ 提示 - + Info 您选择的班次时间是隔夜的，请您重新选择一下当前查询的日期，再查询 - + The time you selected is overnight,please reselect the query date, and then query. 您选择的日期不合理，请您重新选择一下当前查询的日期，再查询 - + The date you selected is not reasonable, please select the current query date again 查询了%1-%2的生产数据 - + Query production data for %1-%2 起始时间:%1 到 结束时间:%2 的历史记录 - + Start time :%1 To end time :%2 History 全部 - + All 正在查询数据，请稍后 - + Querying data, please wait @@ -483,229 +483,229 @@ 没有数据，请重新查询 - + No data, please query again 请选择保存文件的路径 - + Select a path to save the file 正在导出数据，请稍等 - + Please wait while exporting data 导出了%1-%2的生产数据 - + The production data for %1-%2 is exported 数据导出完成 - + Data export completed 查询了%1-%2的日志数据 - + Query log data for %1-%2 使用记录查询 - + Usage Record 报警记录查询 - + Alarm record query 运行状态查询 - + Running Status 导出了%1-%2的日志数据 - + Export log data for %1-%2 您选择的日期不合理，请您重新起始日期，再查询 - + The date you selected is not reasonable, please restart the date and check again 查询了%1-%2的统计数据 - + Query statistics for %1-%2 导出了%1-%2的统计数据 - + The statistics for %1-%2 are exported 确认 - + OK 取消 - + Cancel 从%1到%2统计的数据如下 - + The statistics from %1 to %2 are as follows 序号 - + Index 型号 - + Model 数量 - + Num 总数 - + Sum 时间: - + Time: 用户: - + User: 查询进度 - + Query the progress 数据查询中,请稍后..... - + Data query, please wait..... 系统自动进行清理完成 - + The system automatically clears the data 正在查询数据 - + Querying data 起始时间:%1 到 结束时间:%2 的历史记录 共%3条 - + Start time :%1 To end time :%2 There are %3 historical records 数据查询完成 - + Data query completed 操作已生效 - + Operation has taken effect 统计结果 - + The statistical results 统计完成 - + Statistics to complete 日期时间 - + Datetime 匹配型号 - + Model 相似度 - + Score 消耗时间s - + time 直径mm - + diameter 厚度mm - + thickness 缩略图 - + Image uid - + 正在查询记录，请稍等 - + Please wait while records are being queried 从%1 到 %2 的记录 共%3条 - + There are %3 records from %1 to %2 时间 - + Time 信息 - + Info @@ -713,17 +713,17 @@ 全天 - + Hold Day 生产数据查询 - + Production Data NG - + @@ -731,41 +731,41 @@ lpReport - + 生产数据查询 - + Production data 生产数据统计 - + Statistics 日志记录 - + Log Record 显示数据数(条) - + Show Num 50 - + 上一页 - + Preview @@ -773,29 +773,29 @@ TextLabel - + 下一页 - + Next 标题 - + Title 双击单条记录显示图片 - + Double show Image 开始日期时间： - + Start Time: @@ -805,93 +805,93 @@ 2017-11-11 11:11:11 - + 设置开始时间 - + SetTime 结束日期时间： - + End Time: 设置结束时间 - + SetTime 筛选型号 - + Type 所有 - + All 生产班次 - + classes 全天 - + Hold Day 查询数量 - + Num 0 - + 查询 - + Query 导出CSV - + Export CSV 数据类型查询 - + Data type query 起始日期时间： - + Start Time: 设置起始时间 - + SetTime 报警记录查询 - + Alarm record diff --git a/tpvs17/tpMain/lpMainWin.cpp b/tpvs17/tpMain/lpMainWin.cpp index b92ef60..febe486 100644 --- a/tpvs17/tpMain/lpMainWin.cpp +++ b/tpvs17/tpMain/lpMainWin.cpp @@ -111,7 +111,7 @@ lpMainWin::lpMainWin(QWidget *parent) m_pLabelInfo->setStyleSheet("font: bold 14px; color: red;"); ui.mainToolBar->addWidget(m_pLabelInfo); } - + {//状态栏初始化配置 m_pLbCurrentTime = new QLabel(tr("系统时间")); m_pLbBanci = new QLabel(tr("班次信息")); @@ -272,7 +272,7 @@ lpMainWin::lpMainWin(QWidget *parent) m_pCheckLineseUI = new QCryptokeyUI(); connect(m_pCheckLineseUI, SIGNAL(sgRegisterFinish(bool)), this, SLOT(onLineseCheck(bool))); onLineseCheck(lpGlobalData::instance()->m_bCheckLinese); - + onUpdateByLevel(0); /*启动之后就一直发送心跳包和厚度查询*/ if (DetectState::instance()->m_AutoSendTick2Net) @@ -1771,6 +1771,32 @@ void lpMainWin::onUpdateByLevel(int nlevel) ui.action_userManager->setVisible(true); else ui.action_userManager->setVisible(false); + + if (nlevel == 4) + { + ui.action_setting_ban->setDisabled(false); + ui.actionSystemSeting->setDisabled(false); + ui.action_algParam->setDisabled(false); + ui.action_debug->setDisabled(false); + } + else if (nlevel > 4) { + ui.action_cali_raster->setDisabled(false); + ui.action_setting_ban->setDisabled(false); + ui.action_setting_ip->setDisabled(false); + ui.actioncamSetting->setDisabled(false); + ui.actionSystemSeting->setDisabled(false); + ui.action_algParam->setDisabled(false); + ui.action_debug->setDisabled(false); + } + else { + ui.action_cali_raster->setDisabled(true); + ui.action_setting_ban->setDisabled(true); + ui.action_setting_ip->setDisabled(true); + ui.actioncamSetting->setDisabled(true); + ui.actionSystemSeting->setDisabled(true); + ui.action_algParam->setDisabled(true); + ui.action_debug->setDisabled(true); + } } Q_SLOT void lpMainWin::modWorkMgr(QString str) { @@ -1873,12 +1899,11 @@ Q_SLOT void lpMainWin::onShowRatioVal(double val) Q_SLOT void lpMainWin::onLineseCheck(bool bFlag) { + ui.action_Login->setDisabled(!bFlag); ui.action_modelmgr->setDisabled(!bFlag); ui.action_checkdata->setDisabled(!bFlag); ui.action_connect_mode->setDisabled(!bFlag); - ui.action_debug->setDisabled(!bFlag); - ui.action_algParam->setDisabled(!bFlag); - ui.actioncamSetting->setDisabled(!bFlag); + if (m_pLabelInfo) { if (bFlag) diff --git a/tpvs17/wheel.sln b/tpvs17/wheel.sln index e0febb3..f68d60b 100644 --- a/tpvs17/wheel.sln +++ b/tpvs17/wheel.sln @@ -9,20 +9,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tpAlgorithmQt", "tpAlgorith EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RasterSDG20", "RasterSDG20\RasterSDG20.vcxproj", "{CE765894-2106-48FE-99C3-D8D7624889A0}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lpCoreCtrl", "..\..\Valve\tpvs17\lpCoreCtrl\lpCoreCtrl.vcxproj", "{784071A9-BF94-4D27-B62E-588ACD7E0633}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QUserInfo", "QUserInfo\QUserInfo.vcxproj", "{D7AF8AA1-0F2C-407F-B135-FBDA4448EE16}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tpCamHik", "..\..\Valve\tpvs17\tpCamHik\tpCamHik.vcxproj", "{64C9A32D-82E8-4C36-9AA6-52D58B23F687}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tpCamBaumer", "..\..\Valve\tpvs17\tpCamBaumer\tpCamBaumer.vcxproj", "{4CB8DBEB-EE73-4CEA-B662-E18B79EE113C}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lpReport", "lpReport\lpReport.vcxproj", "{0E042214-1B06-40D6-9D20-C6D5FA3D7A51}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Net4Wheel", "Net4Wheel\Net4Wheel.vcxproj", "{9B718379-3719-4D4E-A903-EDE7EFB4DC65}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tpCamVirtual", "..\..\Valve\tpvs17\tpCamVirtual\tpCamVirtual.vcxproj", "{707DDF6F-B78B-42F7-9EAD-E786C0FCD5FF}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -49,32 +41,12 @@ Global {CE765894-2106-48FE-99C3-D8D7624889A0}.Release|x64.ActiveCfg = Release|x64 {CE765894-2106-48FE-99C3-D8D7624889A0}.Release|x64.Build.0 = Release|x64 {CE765894-2106-48FE-99C3-D8D7624889A0}.Release|x86.ActiveCfg = Release|x64 - {784071A9-BF94-4D27-B62E-588ACD7E0633}.Debug|x64.ActiveCfg = Debug|x64 - {784071A9-BF94-4D27-B62E-588ACD7E0633}.Debug|x64.Build.0 = Debug|x64 - {784071A9-BF94-4D27-B62E-588ACD7E0633}.Debug|x86.ActiveCfg = Debug|x64 - {784071A9-BF94-4D27-B62E-588ACD7E0633}.Release|x64.ActiveCfg = Release|x64 - {784071A9-BF94-4D27-B62E-588ACD7E0633}.Release|x64.Build.0 = Release|x64 - {784071A9-BF94-4D27-B62E-588ACD7E0633}.Release|x86.ActiveCfg = Release|x64 {D7AF8AA1-0F2C-407F-B135-FBDA4448EE16}.Debug|x64.ActiveCfg = Debug|x64 {D7AF8AA1-0F2C-407F-B135-FBDA4448EE16}.Debug|x64.Build.0 = Debug|x64 {D7AF8AA1-0F2C-407F-B135-FBDA4448EE16}.Debug|x86.ActiveCfg = Debug|x64 {D7AF8AA1-0F2C-407F-B135-FBDA4448EE16}.Release|x64.ActiveCfg = Release|x64 {D7AF8AA1-0F2C-407F-B135-FBDA4448EE16}.Release|x64.Build.0 = Release|x64 {D7AF8AA1-0F2C-407F-B135-FBDA4448EE16}.Release|x86.ActiveCfg = Release|x64 - {64C9A32D-82E8-4C36-9AA6-52D58B23F687}.Debug|x64.ActiveCfg = Debug|x64 - {64C9A32D-82E8-4C36-9AA6-52D58B23F687}.Debug|x64.Build.0 = Debug|x64 - {64C9A32D-82E8-4C36-9AA6-52D58B23F687}.Debug|x86.ActiveCfg = Debug|Win32 - {64C9A32D-82E8-4C36-9AA6-52D58B23F687}.Debug|x86.Build.0 = Debug|Win32 - {64C9A32D-82E8-4C36-9AA6-52D58B23F687}.Release|x64.ActiveCfg = Release|x64 - {64C9A32D-82E8-4C36-9AA6-52D58B23F687}.Release|x64.Build.0 = Release|x64 - {64C9A32D-82E8-4C36-9AA6-52D58B23F687}.Release|x86.ActiveCfg = Release|Win32 - {64C9A32D-82E8-4C36-9AA6-52D58B23F687}.Release|x86.Build.0 = Release|Win32 - {4CB8DBEB-EE73-4CEA-B662-E18B79EE113C}.Debug|x64.ActiveCfg = Debug|x64 - {4CB8DBEB-EE73-4CEA-B662-E18B79EE113C}.Debug|x64.Build.0 = Debug|x64 - {4CB8DBEB-EE73-4CEA-B662-E18B79EE113C}.Debug|x86.ActiveCfg = Debug|x64 - {4CB8DBEB-EE73-4CEA-B662-E18B79EE113C}.Release|x64.ActiveCfg = Release|x64 - {4CB8DBEB-EE73-4CEA-B662-E18B79EE113C}.Release|x64.Build.0 = Release|x64 - {4CB8DBEB-EE73-4CEA-B662-E18B79EE113C}.Release|x86.ActiveCfg = Release|x64 {0E042214-1B06-40D6-9D20-C6D5FA3D7A51}.Debug|x64.ActiveCfg = Debug|x64 {0E042214-1B06-40D6-9D20-C6D5FA3D7A51}.Debug|x64.Build.0 = Debug|x64 {0E042214-1B06-40D6-9D20-C6D5FA3D7A51}.Debug|x86.ActiveCfg = Debug|x64 @@ -87,20 +59,12 @@ Global {9B718379-3719-4D4E-A903-EDE7EFB4DC65}.Release|x64.ActiveCfg = Release|x64 {9B718379-3719-4D4E-A903-EDE7EFB4DC65}.Release|x64.Build.0 = Release|x64 {9B718379-3719-4D4E-A903-EDE7EFB4DC65}.Release|x86.ActiveCfg = Release|x64 - {707DDF6F-B78B-42F7-9EAD-E786C0FCD5FF}.Debug|x64.ActiveCfg = Debug|x64 - {707DDF6F-B78B-42F7-9EAD-E786C0FCD5FF}.Debug|x64.Build.0 = Debug|x64 - {707DDF6F-B78B-42F7-9EAD-E786C0FCD5FF}.Debug|x86.ActiveCfg = Debug|Win32 - {707DDF6F-B78B-42F7-9EAD-E786C0FCD5FF}.Debug|x86.Build.0 = Debug|Win32 - {707DDF6F-B78B-42F7-9EAD-E786C0FCD5FF}.Release|x64.ActiveCfg = Release|x64 - {707DDF6F-B78B-42F7-9EAD-E786C0FCD5FF}.Release|x64.Build.0 = Release|x64 - {707DDF6F-B78B-42F7-9EAD-E786C0FCD5FF}.Release|x86.ActiveCfg = Release|Win32 - {707DDF6F-B78B-42F7-9EAD-E786C0FCD5FF}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {CD365F32-5EAC-4A16-AD47-BFB1D8E5511A} Qt5Version = qt5.9.4-msvc2017-x64 + SolutionGuid = {CD365F32-5EAC-4A16-AD47-BFB1D8E5511A} EndGlobalSection EndGlobal