From 6f92829951f3ec228b18df8c157239573edd9cb4 Mon Sep 17 00:00:00 2001 From: xcd <834800634@qq.com> Date: 星期三, 09 九月 2020 15:20:53 +0800 Subject: [PATCH] 1. 取消ImageSet中的HImage释放动作,转移到业务流程中 2. 拆分板卡的IO监听和轴状态,轴位置监听 --- src/Bro.M071.Process/Bro.M071.Process.csproj | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/src/Bro.M071.Process/Bro.M071.Process.csproj b/src/Bro.M071.Process/Bro.M071.Process.csproj index e8c6f29..d744dfa 100644 --- a/src/Bro.M071.Process/Bro.M071.Process.csproj +++ b/src/Bro.M071.Process/Bro.M071.Process.csproj @@ -81,6 +81,9 @@ <Reference Include="Autofac, Version=4.9.4.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL"> <HintPath>..\..\packages\Autofac.4.9.4\lib\net45\Autofac.dll</HintPath> </Reference> + <Reference Include="EPPlus, Version=4.5.3.3, Culture=neutral, PublicKeyToken=ea159fdaa78159a1, processorArchitecture=MSIL"> + <HintPath>..\..\packages\EPPlus.4.5.3.3\lib\net40\EPPlus.dll</HintPath> + </Reference> <Reference Include="halcondotnet, Version=12.0.0.0, Culture=neutral, PublicKeyToken=4973bed59ddbf2b8, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> <HintPath>..\..\libs\halcon12\halcondotnet.dll</HintPath> @@ -95,8 +98,11 @@ <Reference Include="PostSharp, Version=6.2.7.0, Culture=neutral, PublicKeyToken=b13fd38b8f9c99d7, processorArchitecture=MSIL"> <HintPath>..\..\packages\PostSharp.Redist.6.2.7\lib\net45\PostSharp.dll</HintPath> </Reference> + <Reference Include="PresentationCore" /> <Reference Include="System" /> + <Reference Include="System.configuration" /> <Reference Include="System.Core" /> + <Reference Include="System.Security" /> <Reference Include="System.Xml.Linq" /> <Reference Include="System.Data.DataSetExtensions" /> <Reference Include="Microsoft.CSharp" /> @@ -131,6 +137,12 @@ <Compile Include="UI\M071_MainForm.Designer.cs"> <DependentUpon>M071_MainForm.cs</DependentUpon> </Compile> + <Compile Include="UI\M071_PatchInsertMeasurement.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="UI\M071_PatchInsertMeasurement.Designer.cs"> + <DependentUpon>M071_PatchInsertMeasurement.cs</DependentUpon> + </Compile> <Compile Include="UI\M071_ShortcutFrm.cs"> <SubType>Form</SubType> </Compile> @@ -152,6 +164,9 @@ <EmbeddedResource Include="UI\M071_MainForm.resx"> <DependentUpon>M071_MainForm.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="UI\M071_PatchInsertMeasurement.resx"> + <DependentUpon>M071_PatchInsertMeasurement.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="UI\M071_ShortcutFrm.resx"> <DependentUpon>M071_ShortcutFrm.cs</DependentUpon> </EmbeddedResource> -- Gitblit v1.8.0