Skip to content

刘韬 / SO815-AutoInOutStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 4ec0cea8 由 几米阳光
选项

1

1 个父辈 03f4a83b
内嵌 并排
正在显示 16 个修改的文件 包含 34 行增加 和 17 行删除
source/ACSingleStore/FrmIOStatus.cs
...@@ -53,6 +53,7 @@ namespace OnlineStore.AutoInOutStore ...@@ -53,6 +53,7 @@ namespace OnlineStore.AutoInOutStore
IOTextControl control = new IOTextControl(); IOTextControl control = new IOTextControl();
control.IOName = ioValue.ElectricalDefinition + "_" + ResourceCulture.GetString(ioValue.ElectricalDefinition, ioValue.Explain); control.IOName = ioValue.ElectricalDefinition + "_" + ResourceCulture.GetString(ioValue.ElectricalDefinition, ioValue.Explain);
control.IOValue = 0; control.IOValue = 0;
control.IoType = ioValue.ProName;
control.isCanClick = false; control.isCanClick = false;
control.Name = "IO_" + ioValue.ProName; control.Name = "IO_" + ioValue.ProName;
control.Size = new System.Drawing.Size(260, 25); control.Size = new System.Drawing.Size(260, 25);
...@@ -71,6 +72,7 @@ namespace OnlineStore.AutoInOutStore ...@@ -71,6 +72,7 @@ namespace OnlineStore.AutoInOutStore
IOTextControl control = new IOTextControl(); IOTextControl control = new IOTextControl();
control.IOName = ioValue.ElectricalDefinition + "_" + ResourceCulture.GetString(ioValue.ElectricalDefinition, ioValue.Explain); control.IOName = ioValue.ElectricalDefinition + "_" + ResourceCulture.GetString(ioValue.ElectricalDefinition, ioValue.Explain);
control.IOValue = 0; control.IOValue = 0;
control.IoType = ioValue.ProName;
control.isCanClick = true; control.isCanClick = true;
//control.Location = new System.Drawing.Point(0, 25*roleindex); //control.Location = new System.Drawing.Point(0, 25*roleindex);
control.Name = "IO_" + ioValue.ProName; control.Name = "IO_" + ioValue.ProName;
......
source/DeviceLibrary/DeviceLibrary.csproj
...@@ -64,18 +64,18 @@ ...@@ -64,18 +64,18 @@
<Compile Include="acSingleStore\AutomaticBaiting_Partial.cs" /> <Compile Include="acSingleStore\AutomaticBaiting_Partial.cs" />
<Compile Include="acSingleStore\StoreManager.cs" /> <Compile Include="acSingleStore\StoreManager.cs" />
<Compile Include="acSingleStore\AutomaticBaiting.cs" /> <Compile Include="acSingleStore\AutomaticBaiting.cs" />
<Compile Include="halcon\CodeManager.cs" /> <Compile Include="DeviceLibrary\halcon\CodeManager.cs" />
<Compile Include="IO\AIOBOX\AIOBOXManager.cs" /> <Compile Include="DeviceLibrary\IO\AIOBOX\AIOBOXManager.cs" />
<Compile Include="IO\IOManager.cs" /> <Compile Include="DeviceLibrary\IO\IOManager.cs" />
<Compile Include="IO\KangNaiDe\KNDManager.cs" /> <Compile Include="DeviceLibrary\IO\KangNaiDe\KNDManager.cs" />
<Compile Include="IO\KangNaiDe\MasterTcpClient.cs" /> <Compile Include="DeviceLibrary\IO\KangNaiDe\MasterTcpClient.cs" />
<Compile Include="PanasonicServo\ACCMDManager.cs" /> <Compile Include="DeviceLibrary\PanasonicServo\ACCMDManager.cs" />
<Compile Include="PanasonicServo\ACServerManager.cs" /> <Compile Include="DeviceLibrary\PanasonicServo\ACServerManager.cs" />
<Compile Include="PanasonicServo\ACServerManager_Partial.cs" /> <Compile Include="DeviceLibrary\PanasonicServo\ACServerManager_Partial.cs" />
<Compile Include="PanasonicServo\BatchAxisController.cs" /> <Compile Include="DeviceLibrary\PanasonicServo\BatchAxisController.cs" />
<Compile Include="DeviceLibrary\ShuoKe\MeteringSignalBean.cs" />
<Compile Include="DeviceLibrary\ShuoKe\ShuoKeController.cs" />
<Compile Include="ResourceControl.cs" /> <Compile Include="ResourceControl.cs" />
<Compile Include="ShuoKe\MeteringSignalBean.cs" />
<Compile Include="ShuoKe\ShuoKeController.cs" />
<Compile Include="store\LineMoveP.cs" /> <Compile Include="store\LineMoveP.cs" />
<Compile Include="store\LineAlarm.cs"> <Compile Include="store\LineAlarm.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
......
source/UserFromControl/IOTextControl.cs
...@@ -7,12 +7,15 @@ using System.Linq; ...@@ -7,12 +7,15 @@ using System.Linq;
using System.Text; using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
using OnlineStore.DeviceLibrary;
using OnlineStore.LoadCSVLibrary;
namespace UserFromControl namespace UserFromControl
{ {
public partial class IOTextControl : UserControl public partial class IOTextControl : UserControl
{ {
public string IoType = "";
public string IOName { get; set; } public string IOName { get; set; }
public int IOValue { get; set; } public int IOValue { get; set; }
...@@ -57,8 +60,9 @@ namespace UserFromControl ...@@ -57,8 +60,9 @@ namespace UserFromControl
{ {
if (isCanClick) if (isCanClick)
{ {
pictureBox2.Visible = true; IOManager.IOMove(IoType, IO_VALUE.LOW);
pictureBox1.Visible = false; IOValue = 0;
ShowData();
} }
} }
...@@ -66,8 +70,9 @@ namespace UserFromControl ...@@ -66,8 +70,9 @@ namespace UserFromControl
{ {
if (isCanClick) if (isCanClick)
{ {
pictureBox2.Visible = false; IOManager.IOMove(IoType, IO_VALUE.HIGH);
pictureBox1.Visible = true; IOValue = 1;
ShowData();
} }
} }
} }
......
source/UserFromControl/Properties/Resources.Designer.cs
...@@ -47,7 +47,7 @@ namespace UserFromControl.Properties { ...@@ -47,7 +47,7 @@ namespace UserFromControl.Properties {
} }
/// <summary> /// <summary>
/// 使用此强类型资源类，为所有资源查找 /// 重写当前线程的 CurrentUICulture 属性
/// 重写当前线程的 CurrentUICulture 属性。 /// 重写当前线程的 CurrentUICulture 属性。
/// </summary> /// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
......
source/UserFromControl/UserFromControl.csproj
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>UserFromControl</RootNamespace> <RootNamespace>UserFromControl</RootNamespace>
<AssemblyName>UserFromControl</AssemblyName> <AssemblyName>UserFromControl</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
...@@ -94,6 +94,16 @@ ...@@ -94,6 +94,16 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\DeviceLibrary\DeviceLibrary.csproj">
<Project>{513bc1c9-800d-43a6-9499-3700baec3554}</Project>
<Name>DeviceLibrary</Name>
</ProjectReference>
<ProjectReference Include="..\LoadCVSLibrary\LoadCSVLibrary.csproj">
<Project>{064BEBF5-8FAA-4EA2-A5F3-A06E6E7D9251}</Project>
<Name>LoadCSVLibrary</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!