xiaohuimin/DHDHSoftware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XIAOHUIMIN

Browse Source
This commit is contained in:
liyaobang 2025-03-07 09:35:57 +08:00
parent 3dde76d00f
commit af2e65dd58
13 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
DH.Do3Think/CameraBase.cs → DH.Devices.Camera/CameraBase.cs
View File

2
DH.Do3Think/DH.Devices.Camera.csproj → DH.Devices.Camera/DH.Devices.Camera.csproj
View File

@ -19,7 +19,7 @@
<ItemGroup> <ItemGroup>
<Reference Include="DVPCameraCS64"> <Reference Include="DVPCameraCS64">
<HintPath>..\..\pudemo\DHControlVision\libs\DVPCameraCS_Net6.0\x64\DVPCameraCS64.dll</HintPath> <HintPath>..\X64\Debug\DVPCameraCS64.dll</HintPath>
</Reference> </Reference>
</ItemGroup> </ItemGroup>

0
DH.Do3Think/Do3ThinkCamera.cs → DH.Devices.Camera/Do3ThinkCamera.cs
View File

2
DH.XinJEPLC/DH.Devices.PLC.csproj → DH.Devices.PLC/DH.Devices.PLC.csproj
View File

@ -22,7 +22,7 @@
<ItemGroup> <ItemGroup>
<Reference Include="HslCommunication"> <Reference Include="HslCommunication">
<HintPath>..\libs\HslCommunication.dll</HintPath> <HintPath>..\X64\Debug\HslCommunication.dll</HintPath>
</Reference> </Reference>
</ItemGroup> </ItemGroup>

0
DH.XinJEPLC/PLCBase.cs → DH.Devices.PLC/PLCBase.cs
View File

0
DH.XinJEPLC/XinJEPLCTcpNet.cs → DH.Devices.PLC/XinJEPLCTcpNet.cs
View File

5
DH.Devices.Vision/DH.Devices.Vision.csproj
View File

@ -13,8 +13,9 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="OpenCvSharp4" Version="4.5.3.20210817" /> <PackageReference Include="OpenCvSharp4" Version="4.10.0.20241108" />
<PackageReference Include="OpenCvSharp4.runtime.win" Version="4.5.3.20210817" /> <PackageReference Include="OpenCvSharp4.Extensions" Version="4.10.0.20241108" />
<PackageReference Include="OpenCvSharp4.runtime.win" Version="4.10.0.20241108" />
</ItemGroup> </ItemGroup>
</Project> </Project>

44
DHSoftware.sln
View File

@ -13,16 +13,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Camera", "Camera", "{1591B0
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Vision", "Vision", "{F77AF94C-280D-44C5-B7C0-FC86AA9EC504}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Vision", "Vision", "{F77AF94C-280D-44C5-B7C0-FC86AA9EC504}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DH.Devices.Camera", "DH.Do3Think\DH.Devices.Camera.csproj", "{C32C4F3E-0E84-4F44-B768-6255F8638363}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DH.Devices.PLC", "DH.XinJEPLC\DH.Devices.PLC.csproj", "{81AB7D54-DFF9-493E-B524-E7D6419D4C62}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Commons", "Commons", "{0AB4BB9A-A861-4F80-B549-CD331490942B}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Commons", "Commons", "{0AB4BB9A-A861-4F80-B549-CD331490942B}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DH.Commons", "DH.Commons\DH.Commons.csproj", "{027373EC-C5CB-4161-8D43-AB6009371FDE}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DH.Commons", "DH.Commons\DH.Commons.csproj", "{027373EC-C5CB-4161-8D43-AB6009371FDE}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DH.Devices.Vision", "DH.Devices.Vision\DH.Devices.Vision.csproj", "{97B55FCF-54A3-449E-8437-735E65C35291}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DH.Devices.Vision", "DH.Devices.Vision\DH.Devices.Vision.csproj", "{97B55FCF-54A3-449E-8437-735E65C35291}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DH.Devices.Camera", "DH.Devices.Camera\DH.Devices.Camera.csproj", "{1378A932-1C25-40EF-BA31-A3463B23F4E5}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DH.Devices.PLC", "DH.Devices.PLC\DH.Devices.PLC.csproj", "{458B2CF6-6F1B-4B8B-BB85-C6FD7F453A5D}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
@ -39,22 +39,6 @@ Global
{17CC10DC-9132-4A03-AADA-2D1070418C9B}.Release|Any CPU.Build.0 = Release|Any CPU {17CC10DC-9132-4A03-AADA-2D1070418C9B}.Release|Any CPU.Build.0 = Release|Any CPU
{17CC10DC-9132-4A03-AADA-2D1070418C9B}.Release|X64.ActiveCfg = Release|X64 {17CC10DC-9132-4A03-AADA-2D1070418C9B}.Release|X64.ActiveCfg = Release|X64
{17CC10DC-9132-4A03-AADA-2D1070418C9B}.Release|X64.Build.0 = Release|X64 {17CC10DC-9132-4A03-AADA-2D1070418C9B}.Release|X64.Build.0 = Release|X64
{C32C4F3E-0E84-4F44-B768-6255F8638363}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C32C4F3E-0E84-4F44-B768-6255F8638363}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C32C4F3E-0E84-4F44-B768-6255F8638363}.Debug|X64.ActiveCfg = Debug|X64
{C32C4F3E-0E84-4F44-B768-6255F8638363}.Debug|X64.Build.0 = Debug|X64
{C32C4F3E-0E84-4F44-B768-6255F8638363}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C32C4F3E-0E84-4F44-B768-6255F8638363}.Release|Any CPU.Build.0 = Release|Any CPU
{C32C4F3E-0E84-4F44-B768-6255F8638363}.Release|X64.ActiveCfg = Release|X64
{C32C4F3E-0E84-4F44-B768-6255F8638363}.Release|X64.Build.0 = Release|X64
{81AB7D54-DFF9-493E-B524-E7D6419D4C62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{81AB7D54-DFF9-493E-B524-E7D6419D4C62}.Debug|Any CPU.Build.0 = Debug|Any CPU
{81AB7D54-DFF9-493E-B524-E7D6419D4C62}.Debug|X64.ActiveCfg = Debug|X64
{81AB7D54-DFF9-493E-B524-E7D6419D4C62}.Debug|X64.Build.0 = Debug|X64
{81AB7D54-DFF9-493E-B524-E7D6419D4C62}.Release|Any CPU.ActiveCfg = Release|Any CPU
{81AB7D54-DFF9-493E-B524-E7D6419D4C62}.Release|Any CPU.Build.0 = Release|Any CPU
{81AB7D54-DFF9-493E-B524-E7D6419D4C62}.Release|X64.ActiveCfg = Release|X64
{81AB7D54-DFF9-493E-B524-E7D6419D4C62}.Release|X64.Build.0 = Release|X64
{027373EC-C5CB-4161-8D43-AB6009371FDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {027373EC-C5CB-4161-8D43-AB6009371FDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{027373EC-C5CB-4161-8D43-AB6009371FDE}.Debug|Any CPU.Build.0 = Debug|Any CPU {027373EC-C5CB-4161-8D43-AB6009371FDE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{027373EC-C5CB-4161-8D43-AB6009371FDE}.Debug|X64.ActiveCfg = Debug|X64 {027373EC-C5CB-4161-8D43-AB6009371FDE}.Debug|X64.ActiveCfg = Debug|X64
@ -71,6 +55,22 @@ Global
{97B55FCF-54A3-449E-8437-735E65C35291}.Release|Any CPU.Build.0 = Release|Any CPU {97B55FCF-54A3-449E-8437-735E65C35291}.Release|Any CPU.Build.0 = Release|Any CPU
{97B55FCF-54A3-449E-8437-735E65C35291}.Release|X64.ActiveCfg = Release|X64 {97B55FCF-54A3-449E-8437-735E65C35291}.Release|X64.ActiveCfg = Release|X64
{97B55FCF-54A3-449E-8437-735E65C35291}.Release|X64.Build.0 = Release|X64 {97B55FCF-54A3-449E-8437-735E65C35291}.Release|X64.Build.0 = Release|X64
{1378A932-1C25-40EF-BA31-A3463B23F4E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1378A932-1C25-40EF-BA31-A3463B23F4E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1378A932-1C25-40EF-BA31-A3463B23F4E5}.Debug|X64.ActiveCfg = Debug|x64
{1378A932-1C25-40EF-BA31-A3463B23F4E5}.Debug|X64.Build.0 = Debug|x64
{1378A932-1C25-40EF-BA31-A3463B23F4E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1378A932-1C25-40EF-BA31-A3463B23F4E5}.Release|Any CPU.Build.0 = Release|Any CPU
{1378A932-1C25-40EF-BA31-A3463B23F4E5}.Release|X64.ActiveCfg = Release|x64
{1378A932-1C25-40EF-BA31-A3463B23F4E5}.Release|X64.Build.0 = Release|x64
{458B2CF6-6F1B-4B8B-BB85-C6FD7F453A5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{458B2CF6-6F1B-4B8B-BB85-C6FD7F453A5D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{458B2CF6-6F1B-4B8B-BB85-C6FD7F453A5D}.Debug|X64.ActiveCfg = Debug|x64
{458B2CF6-6F1B-4B8B-BB85-C6FD7F453A5D}.Debug|X64.Build.0 = Debug|x64
{458B2CF6-6F1B-4B8B-BB85-C6FD7F453A5D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{458B2CF6-6F1B-4B8B-BB85-C6FD7F453A5D}.Release|Any CPU.Build.0 = Release|Any CPU
{458B2CF6-6F1B-4B8B-BB85-C6FD7F453A5D}.Release|X64.ActiveCfg = Release|x64
{458B2CF6-6F1B-4B8B-BB85-C6FD7F453A5D}.Release|X64.Build.0 = Release|x64
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
@ -79,10 +79,10 @@ Global
{2560C5A5-0CA2-48AD-B606-6C55BEFD8109} = {8EC33C16-65CE-4C12-9C8D-DB2425F9F7C0} {2560C5A5-0CA2-48AD-B606-6C55BEFD8109} = {8EC33C16-65CE-4C12-9C8D-DB2425F9F7C0}
{1591B03B-0015-42FC-B784-0D9F740E2A23} = {8EC33C16-65CE-4C12-9C8D-DB2425F9F7C0} {1591B03B-0015-42FC-B784-0D9F740E2A23} = {8EC33C16-65CE-4C12-9C8D-DB2425F9F7C0}
{F77AF94C-280D-44C5-B7C0-FC86AA9EC504} = {8EC33C16-65CE-4C12-9C8D-DB2425F9F7C0} {F77AF94C-280D-44C5-B7C0-FC86AA9EC504} = {8EC33C16-65CE-4C12-9C8D-DB2425F9F7C0}
{C32C4F3E-0E84-4F44-B768-6255F8638363} = {1591B03B-0015-42FC-B784-0D9F740E2A23}
{81AB7D54-DFF9-493E-B524-E7D6419D4C62} = {2560C5A5-0CA2-48AD-B606-6C55BEFD8109}
{027373EC-C5CB-4161-8D43-AB6009371FDE} = {0AB4BB9A-A861-4F80-B549-CD331490942B} {027373EC-C5CB-4161-8D43-AB6009371FDE} = {0AB4BB9A-A861-4F80-B549-CD331490942B}
{97B55FCF-54A3-449E-8437-735E65C35291} = {F77AF94C-280D-44C5-B7C0-FC86AA9EC504} {97B55FCF-54A3-449E-8437-735E65C35291} = {F77AF94C-280D-44C5-B7C0-FC86AA9EC504}
{1378A932-1C25-40EF-BA31-A3463B23F4E5} = {1591B03B-0015-42FC-B784-0D9F740E2A23}
{458B2CF6-6F1B-4B8B-BB85-C6FD7F453A5D} = {2560C5A5-0CA2-48AD-B606-6C55BEFD8109}
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {6FC1A8DF-636E-434C-981E-10F20FAD723B} SolutionGuid = {6FC1A8DF-636E-434C-981E-10F20FAD723B}

6
DHSoftware/DHSoftware.csproj
View File

@ -18,14 +18,14 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\DH.Devices.Camera\DH.Devices.Camera.csproj" />
<ProjectReference Include="..\DH.Devices.PLC\DH.Devices.PLC.csproj" />
<ProjectReference Include="..\DH.Devices.Vision\DH.Devices.Vision.csproj" /> <ProjectReference Include="..\DH.Devices.Vision\DH.Devices.Vision.csproj" />
<ProjectReference Include="..\DH.Do3Think\DH.Devices.Camera.csproj" />
<ProjectReference Include="..\DH.XinJEPLC\DH.Devices.PLC.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Reference Include="DVPCameraCS64"> <Reference Include="DVPCameraCS64">
<HintPath>..\..\DHDHSoftware\libs\DVPCameraCS_Net6.0\x64\DVPCameraCS64.dll</HintPath> <HintPath>..\X64\Debug\DVPCameraCS64.dll</HintPath>
</Reference> </Reference>
</ItemGroup> </ItemGroup>

BIN
libs/HikCamera/MvCameraControl.Net.dll
View File

Binary file not shown.

BIN
libs/HslCommunication.dll
View File

Binary file not shown.

BIN
libs/halcon20/halcondotnet.dll
View File

Binary file not shown.

BIN
libs/halcon20/hdevenginedotnet.dll
View File

Binary file not shown.