From 1f2fa3f54d4a7b5a2f601c4c947a06476342e3bd Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期五, 22 一月 2021 09:23:06 +0800
Subject: [PATCH] 1. gocator驱动将system.stop移到system.ReceiveData之后 2. 修改测量完成后状态切换逻辑，避免安全光线等干扰 3. 添加设备异常输出日志记录 4. 产品结果输出时做硬盘文件记录
---
src/Bro.UI.Device.Winform/Bro.UI.Device.Winform.csproj | 47 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 37 insertions(+), 10 deletions(-)
diff --git a/src/Bro.UI.Device.Winform/Bro.UI.Device.Winform.csproj b/src/Bro.UI.Device.Winform/Bro.UI.Device.Winform.csproj
index 0931e4a..4d1cb18 100644
--- a/src/Bro.UI.Device.Winform/Bro.UI.Device.Winform.csproj
+++ b/src/Bro.UI.Device.Winform/Bro.UI.Device.Winform.csproj
@@ -89,11 +89,29 @@
<Compile Include="CtrlCameraRunBase.Designer.cs">
<DependentUpon>CtrlCameraRunBase.cs</DependentUpon>
</Compile>
- <Compile Include="MotionCard\CtrlMotionCardOperation.cs">
+ <Compile Include="MotionCard\CtrlMotionCardAxisOperation.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Include="MotionCard\CtrlMotionCardOperation.Designer.cs">
- <DependentUpon>CtrlMotionCardOperation.cs</DependentUpon>
+ <Compile Include="MotionCard\CtrlMotionCardAxisOperation.Designer.cs">
+ <DependentUpon>CtrlMotionCardAxisOperation.cs</DependentUpon>
+ </Compile>
+ <Compile Include="MotionCard\CtrlMotionCardAxisStatus.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="MotionCard\CtrlMotionCardAxisStatus.Designer.cs">
+ <DependentUpon>CtrlMotionCardAxisStatus.cs</DependentUpon>
+ </Compile>
+ <Compile Include="MotionCard\CtrlMotionCardIOStatus.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="MotionCard\CtrlMotionCardIOStatus.Designer.cs">
+ <DependentUpon>CtrlMotionCardIOStatus.cs</DependentUpon>
+ </Compile>
+ <Compile Include="MotionCard\FrmMotionCardOperationBase.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="MotionCard\FrmMotionCardOperationBase.Designer.cs">
+ <DependentUpon>FrmMotionCardOperationBase.cs</DependentUpon>
</Compile>
<Compile Include="CtrlPLCRunBase.cs">
<SubType>UserControl</SubType>
@@ -101,11 +119,11 @@
<Compile Include="CtrlPLCRunBase.Designer.cs">
<DependentUpon>CtrlPLCRunBase.cs</DependentUpon>
</Compile>
- <Compile Include="MotionCard\CtrlMotionCardAxisStatus.cs">
+ <Compile Include="MotionCard\CtrlMotionCardRunBase.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Include="MotionCard\CtrlMotionCardAxisStatus.Designer.cs">
- <DependentUpon>CtrlMotionCardAxisStatus.cs</DependentUpon>
+ <Compile Include="MotionCard\CtrlMotionCardRunBase.Designer.cs">
+ <DependentUpon>CtrlMotionCardRunBase.cs</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\Resources.Designer.cs">
@@ -118,14 +136,23 @@
<EmbeddedResource Include="CtrlCameraRunBase.resx">
<DependentUpon>CtrlCameraRunBase.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="MotionCard\CtrlMotionCardOperation.resx">
- <DependentUpon>CtrlMotionCardOperation.cs</DependentUpon>
+ <EmbeddedResource Include="MotionCard\CtrlMotionCardAxisOperation.resx">
+ <DependentUpon>CtrlMotionCardAxisOperation.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="MotionCard\CtrlMotionCardAxisStatus.resx">
+ <DependentUpon>CtrlMotionCardAxisStatus.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="MotionCard\CtrlMotionCardIOStatus.resx">
+ <DependentUpon>CtrlMotionCardIOStatus.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="MotionCard\FrmMotionCardOperationBase.resx">
+ <DependentUpon>FrmMotionCardOperationBase.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="CtrlPLCRunBase.resx">
<DependentUpon>CtrlPLCRunBase.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="MotionCard\CtrlMotionCardAxisStatus.resx">
- <DependentUpon>CtrlMotionCardAxisStatus.cs</DependentUpon>
+ <EmbeddedResource Include="MotionCard\CtrlMotionCardRunBase.resx">
+ <DependentUpon>CtrlMotionCardRunBase.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
--
Gitblit v1.8.0