Skip to content

李娜 / Line-Smart-Workstation

转到一个项目
切换导航栏
切换导航栏固定状态
Commit fcb8f526 由 刘韬
选项

1

1 个父辈 773f1289
内嵌 并排
正在显示 37 个修改的文件 包含 46 行增加 和 153 行删除
DeviceLibrary/deviceLibrary/IO/NanjingSDotIO.cs
......@@ -291,7 +291,7 @@ class NanjingSDotIO : IOBase
if (dichgindex.Count > 0)
DI_Changed_Event?.BeginInvoke(dichgindex, DIstate, null, null);
if (dochgindex.Count > 0)
DO_Changed_Event?.BeginInvoke(dichgindex, DOstate, null, null);
DO_Changed_Event?.BeginInvoke(dochgindex, DOstate, null, null);
}
}
else
......
DeviceLibrary/manager/LineWidthManager.cs
......@@ -95,9 +95,7 @@ namespace TSA_V.DeviceLibrary
while (true)
{
Thread.Sleep(200);
if (!IOManager.ShuddenOK())
break;
if (IsStop)
if (IsStop || TSAVBean.IsInSuddenDown)
{
result = ResourceControl.GetString(ResourceControl.UserStop, "用户中止");
break;
......@@ -130,7 +128,8 @@ namespace TSA_V.DeviceLibrary
while (true)
{
Thread.Sleep(200);
if (IsStop)
if (IsStop || TSAVBean.IsInSuddenDown)
{
IsStop = true;
result = ResourceControl.GetString(ResourceControl.UserStop, "用户中止");
......
DeviceLibrary/manager/TSAVBean.cs
......@@ -281,7 +281,7 @@ namespace TSA_V.DeviceLibrary
{
foreach (NodeInfo node in map.Values)
{
if (!IOManager.ShuddenOK())
if (TSAVBean.IsInSuddenDown)
return;
if (!PUSICANControl.IsHomeEnd(node.NodeId))
{
......
DeviceLibrary/manager/TSAVStatus.cs
......@@ -217,7 +217,8 @@ namespace TSA_V.DeviceLibrary
}
else if (wait.WaitType.Equals(WaitTypeEnum.NodeHome_2))
{
wait.IsEnd = PUSICANControl.IsHomeEnd(wait.Node.NodeId);
if (!TSAVBean.IsInSuddenDown)
wait.IsEnd = PUSICANControl.IsHomeEnd(wait.Node.NodeId);
}
else if (wait.WaitType.Equals(WaitTypeEnum.IOSingle_6))
{
......
PUSICANLibrary/CANOpen.dll deleted 100644 → 0
此文件类型无法预览
PUSICANLibrary/ControlCAN.dll deleted 100644 → 0
此文件类型无法预览
PUSICANLibrary/ECanVci.dll deleted 100644 → 0
此文件类型无法预览
PUSICANLibrary/LM_USB.dll deleted 100644 → 0
此文件类型无法预览
PUSICANLibrary/PUSICANControl.cs
using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.ExceptionServices;
using System.Runtime.InteropServices;
using System.Text;
using System.Threading;
......@@ -851,6 +852,7 @@ namespace PUSICANLibrary
/// <summary>
/// 判断原点返回是否完成
/// </summary>
[HandleProcessCorruptedStateExceptions]
public static bool IsHomeEnd(uint nodeId)
{
try
......
PUSICANLibrary/PUSICANLibrary.csproj
......@@ -49,85 +49,6 @@
<Compile Include="PUSICANControl.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="CANOpen.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="can_gc.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="can_ixxat.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="can_lanma.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="can_ledia.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="can_yl9100.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="can_zlg.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="ControlCAN.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="ECanVci.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="kerneldlls\CAN232.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="kerneldlls\CANETE.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="kerneldlls\CANET_TCP.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="kerneldlls\CANWIFI_TCP.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="kerneldlls\CANWIFI_UDP.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="kerneldlls\gisadll.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="kerneldlls\gpcidll.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="kerneldlls\isa5420.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="kerneldlls\PC104C2.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="kerneldlls\PC104CAN.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="kerneldlls\PCI5121.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="kerneldlls\usbcan.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="LM_USB.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="mfc100u.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="msvcr100.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<None Include="kerneldlls\kerneldll.ini">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<Folder Include="obj\" />
</ItemGroup>
<ItemGroup>
......
PUSICANLibrary/can_gc.dll deleted 100644 → 0
此文件类型无法预览
PUSICANLibrary/can_ixxat.dll deleted 100644 → 0
此文件类型无法预览
PUSICANLibrary/can_lanma.dll deleted 100644 → 0
此文件类型无法预览
PUSICANLibrary/can_ledia.dll deleted 100644 → 0
此文件类型无法预览
PUSICANLibrary/can_yl9100.dll deleted 100644 → 0
此文件类型无法预览
PUSICANLibrary/can_zlg.dll deleted 100644 → 0
此文件类型无法预览
PUSICANLibrary/kerneldlls/kerneldll.ini deleted 100644 → 0
[KERNELDLL]
COUNT=29
1=PCI51XXE.dll
2=PCI9810B.dll
3=USBCAN.dll
4=USBCAN.dll
5=PCI9820B.dll
6=CAN232.dll
7=PCI51XXE.dll
8=CANLite.dll
9=ISA9620B.dll
10=ISA5420.dll
11=PC104CAN.dll
12=CANETE.dll
13=DNP9810B.dll
14=PCI9840B.dll
15=PC104C2.dll
16=PCI9820I.dll
17=CANET_TCP.dll
18=pec9920.dll
19=pci50xx_u.dll
20=USBCAN_E.dll
21=USBCAN_E.dll
22=pci50xx_u.dll
23=topcliff_can.dll
24=pcie9221.dll
25=CANWIFI_TCP.dll
26=CANWIFI_UDP.dll
27=pcie9120.dll
28=pcie9110.dll
29=pcie9140.dll
PUSICANLibrary/mfc100u.dll deleted 100644 → 0
此文件类型无法预览
PUSICANLibrary/msvcr100.dll deleted 100644 → 0
此文件类型无法预览
TSA-V/FrmBoardList.cs
......@@ -135,7 +135,7 @@ namespace TSA_V
}
catch (Exception ex)
{
}
finally
{
......
TSA-V/FrmDeviceConfig.cs
......@@ -185,7 +185,7 @@ ResourceCulture.GetString(ResourceCulture.Sure, "确认"), MessageBoxButtons.Yes
string serverAddress = txtAddr.Text.Trim();
if (String.IsNullOrEmpty(serverAddress))
{
MessageBox.Show("请输入正确的接口地址");
MessageBox.Show(ResourceCulture.GetString("请输入正确的接口地址"));
}
BoardInfo board = new BoardInfo();
board.boardId = -1;
......
TSA-V/Properties/Resource.en-US.resx
此文件的差异太大，无法显示。
TSA-V/workForm/FrmAOICheck.Designer.cs
......@@ -44,11 +44,11 @@ namespace TSA_V
this.panelImg = new System.Windows.Forms.Panel();
this.picResult = new Acc.ImageBox.AccImageBox();
this.panel3 = new System.Windows.Forms.Panel();
this.listErrorView = new System.Windows.Forms.ListView();
this.chbAllShow = new System.Windows.Forms.CheckBox();
this.label2 = new System.Windows.Forms.Label();
this.picCurr = new System.Windows.Forms.PictureBox();
this.label1 = new System.Windows.Forms.Label();
this.listErrorView = new System.Windows.Forms.ListView();
this.picStand = new System.Windows.Forms.PictureBox();
this.panel1.SuspendLayout();
this.panel4.SuspendLayout();
......@@ -94,7 +94,7 @@ namespace TSA_V
//
this.panel2.AutoScroll = true;
this.panel2.Controls.Add(this.lblInfo);
this.panel2.Location = new System.Drawing.Point(16, 599);
this.panel2.Location = new System.Drawing.Point(23, 658);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(214, 166);
this.panel2.TabIndex = 297;
......@@ -116,16 +116,16 @@ namespace TSA_V
//
this.lblError.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblError.ForeColor = System.Drawing.Color.Red;
this.lblError.Location = new System.Drawing.Point(7, 354);
this.lblError.Location = new System.Drawing.Point(14, 458);
this.lblError.Name = "lblError";
this.lblError.Size = new System.Drawing.Size(231, 192);
this.lblError.Size = new System.Drawing.Size(231, 175);
this.lblError.TabIndex = 295;
this.lblError.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// lblCurrWorkTime
//
this.lblCurrWorkTime.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblCurrWorkTime.Location = new System.Drawing.Point(7, 166);
this.lblCurrWorkTime.Location = new System.Drawing.Point(7, 304);
this.lblCurrWorkTime.Name = "lblCurrWorkTime";
this.lblCurrWorkTime.Size = new System.Drawing.Size(232, 51);
this.lblCurrWorkTime.TabIndex = 291;
......@@ -137,7 +137,7 @@ namespace TSA_V
this.btnExit.BackColor = System.Drawing.SystemColors.Control;
this.btnExit.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnExit.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnExit.Location = new System.Drawing.Point(56, 284);
this.btnExit.Location = new System.Drawing.Point(55, 405);
this.btnExit.Name = "btnExit";
this.btnExit.Size = new System.Drawing.Size(134, 46);
this.btnExit.TabIndex = 293;
......@@ -149,7 +149,7 @@ namespace TSA_V
//
this.lblResult.Font = new System.Drawing.Font("宋体", 69.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblResult.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
this.lblResult.Location = new System.Drawing.Point(7, 42);
this.lblResult.Location = new System.Drawing.Point(7, 180);
this.lblResult.Name = "lblResult";
this.lblResult.Size = new System.Drawing.Size(232, 113);
this.lblResult.TabIndex = 8;
......@@ -161,7 +161,7 @@ namespace TSA_V
this.btnRun.BackColor = System.Drawing.SystemColors.Control;
this.btnRun.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnRun.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnRun.Location = new System.Drawing.Point(56, 234);
this.btnRun.Location = new System.Drawing.Point(55, 355);
this.btnRun.Name = "btnRun";
this.btnRun.Size = new System.Drawing.Size(134, 46);
this.btnRun.TabIndex = 7;
......@@ -194,17 +194,33 @@ namespace TSA_V
//
this.panel3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Right)));
this.panel3.Controls.Add(this.listErrorView);
this.panel3.Controls.Add(this.chbAllShow);
this.panel3.Controls.Add(this.label2);
this.panel3.Controls.Add(this.picCurr);
this.panel3.Controls.Add(this.label1);
this.panel3.Controls.Add(this.listErrorView);
this.panel3.Controls.Add(this.picStand);
this.panel3.Location = new System.Drawing.Point(730, 4);
this.panel3.Name = "panel3";
this.panel3.Size = new System.Drawing.Size(336, 852);
this.panel3.TabIndex = 298;
//
// listErrorView
//
this.listErrorView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.listErrorView.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.listErrorView.HideSelection = false;
this.listErrorView.Location = new System.Drawing.Point(3, 33);
this.listErrorView.MultiSelect = false;
this.listErrorView.Name = "listErrorView";
this.listErrorView.Size = new System.Drawing.Size(325, 253);
this.listErrorView.TabIndex = 299;
this.listErrorView.UseCompatibleStateImageBehavior = false;
this.listErrorView.View = System.Windows.Forms.View.List;
this.listErrorView.SelectedIndexChanged += new System.EventHandler(this.listErrorView_SelectedIndexChanged);
//
// chbAllShow
//
this.chbAllShow.AutoSize = true;
......@@ -221,7 +237,7 @@ namespace TSA_V
//
this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(5, 507);
this.label2.Location = new System.Drawing.Point(5, 568);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(41, 12);
this.label2.TabIndex = 300;
......@@ -231,10 +247,10 @@ namespace TSA_V
//
this.picCurr.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.picCurr.BackgroundImage = global::TSA_V.Properties.Resources.backImage;
this.picCurr.Location = new System.Drawing.Point(5, 526);
this.picCurr.Location = new System.Drawing.Point(5, 583);
this.picCurr.Name = "picCurr";
this.picCurr.Size = new System.Drawing.Size(327, 320);
this.picCurr.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.picCurr.Size = new System.Drawing.Size(327, 263);
this.picCurr.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.picCurr.TabIndex = 299;
this.picCurr.TabStop = false;
//
......@@ -242,36 +258,20 @@ namespace TSA_V
//
this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(5, 161);
this.label1.Location = new System.Drawing.Point(5, 289);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(29, 12);
this.label1.TabIndex = 298;
this.label1.Text = "基准";
//
// listErrorView
//
this.listErrorView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.listErrorView.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.listErrorView.HideSelection = false;
this.listErrorView.Location = new System.Drawing.Point(5, 34);
this.listErrorView.MultiSelect = false;
this.listErrorView.Name = "listErrorView";
this.listErrorView.Size = new System.Drawing.Size(325, 120);
this.listErrorView.TabIndex = 299;
this.listErrorView.UseCompatibleStateImageBehavior = false;
this.listErrorView.View = System.Windows.Forms.View.List;
this.listErrorView.SelectedIndexChanged += new System.EventHandler(this.listErrorView_SelectedIndexChanged);
//
// picStand
//
this.picStand.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.picStand.BackgroundImage = global::TSA_V.Properties.Resources.backImage;
this.picStand.Location = new System.Drawing.Point(5, 180);
this.picStand.Location = new System.Drawing.Point(5, 304);
this.picStand.Name = "picStand";
this.picStand.Size = new System.Drawing.Size(327, 320);
this.picStand.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.picStand.Size = new System.Drawing.Size(327, 261);
this.picStand.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.picStand.TabIndex = 297;
this.picStand.TabStop = false;
//
......
TSA-V/workForm/FrmAOICheck.cs
......@@ -148,6 +148,7 @@ namespace TSA_V
chbAllShow.Enabled = false;
string camera = ConfigAppSettings.GetValue(Setting_Init.CameraName);
camera = AccAOI.camera.CameraManager.hikNameList.ToArray().FirstOrDefault();
Image currImage = CameraManager.GetCamerImage(camera);
if (currImage != null)
{
......
TSA-V/workForm/FrmAOICheck.resx
......@@ -121,6 +121,6 @@
<value>17, 17</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>25</value>
<value>103</value>
</metadata>
</root>
\ No newline at end of file
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!