1、继续修复了找圆算法 圆心找不准问题

2、增加权限 相关菜单加入权限等级限制
3、注册权限更改信息记录方式，防止有些情况下出现获取序列号变化问题

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,
+            "width": 3072,
-            "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,
             "zoom": 1
         }
     }

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",

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,
+        "SaveCut_Good": 0,
-        "SaveImgPath": "D:/汽摩轮/分类软件/runner17 -20210706",
+        "SaveImgPath": "F:/ValueProject/wheel/tpvs17/../runner17",
-        "Save_Bad": 1,
+        "Save_Bad": 0,
-        "Save_Good": 0,
+        "Save_Good": 0
-        "UseBackground": 1
     },
     "DetectModl": {
         "UseCutImg": 0,
-        "Virsual_Camera": 1,
+        "Virsual_Camera": 0,
-        "Virsual_Times": 3000
+        "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_IP": "127.0.0.1",
-        "client_port": 2000
+        "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
     }
 }

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;
+		if (EDCircle[i].r > tmpmaxR)
-		centerY = EDCircle[i].center.y * REAIZE;
+		{
+			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)

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

tpvs17/lpReport/lpReport.vcxproj

@@ -219,6 +219,10 @@
   <ItemGroup>
     <Image Include="Resources\log.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="lpreport_en.ts" />
+    <None Include="lpreport_zh.ts" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Condition="Exists('$(QtMsBuild)\qt.targets')">
     <Import Project="$(QtMsBuild)\qt.targets" />

tpvs17/lpReport/lpReport.vcxproj.filters

@@ -28,6 +28,11 @@
       <Extensions>moc;h;cpp</Extensions>
       <SourceControlFiles>False</SourceControlFiles>
     </Filter>
+    <Filter Include="Translation Files">
+      <UniqueIdentifier>{639EADAA-A684-42e4-A9AD-28FC9BCB8F7C}</UniqueIdentifier>
+      <Extensions>ts</Extensions>
+      <ParseFiles>false</ParseFiles>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="main.cpp">
@@ -138,4 +143,12 @@
   <ItemGroup>
     <Image Include="Resources\log.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="lpreport_zh.ts">
+      <Filter>Translation Files</Filter>
+    </None>
+    <None Include="lpreport_en.ts">
+      <Filter>Translation Files</Filter>
+    </None>
+  </ItemGroup>
 </Project>

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)

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