Skip to content

孙克 / RC1250-AssemblyLine

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 459a7efc 由 LN
选项

1

1 个父辈 2ee1f3c2
内嵌 并排
正在显示 8 个修改的文件 包含 215 行增加 和 87 行删除
source/AssemblyLineClient/AssemblyLineClient.csproj
...@@ -96,12 +96,6 @@ ...@@ -96,12 +96,6 @@
<Compile Include="FrmEquipBase.Designer.cs"> <Compile Include="FrmEquipBase.Designer.cs">
<DependentUpon>FrmEquipBase.cs</DependentUpon> <DependentUpon>FrmEquipBase.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="FrmEquipBaseForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="FrmEquipBaseForm.Designer.cs">
<DependentUpon>FrmEquipBaseForm.cs</DependentUpon>
</Compile>
<Compile Include="FrmProvidingEquip.cs"> <Compile Include="FrmProvidingEquip.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
...@@ -156,9 +150,6 @@ ...@@ -156,9 +150,6 @@
<EmbeddedResource Include="FrmEquipBase.resx"> <EmbeddedResource Include="FrmEquipBase.resx">
<DependentUpon>FrmEquipBase.cs</DependentUpon> <DependentUpon>FrmEquipBase.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="FrmEquipBaseForm.resx">
<DependentUpon>FrmEquipBaseForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="FrmProvidingEquip.resx"> <EmbeddedResource Include="FrmProvidingEquip.resx">
<DependentUpon>FrmProvidingEquip.cs</DependentUpon> <DependentUpon>FrmProvidingEquip.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
......
source/AssemblyLineClient/FrmEquipBaseForm.Designer.cs → source/AssemblyLineClient/equip/FrmEquipBaseForm.Designer.cs
...@@ -1113,24 +1113,24 @@ ...@@ -1113,24 +1113,24 @@
private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label3;
private System.Windows.Forms.TextBox txtAlarmStatus; private System.Windows.Forms.TextBox txtAlarmStatus;
private System.Windows.Forms.Button btnGetAlarm; private System.Windows.Forms.Button btnGetAlarm;
public System.Windows.Forms.Button btnReadPosition; private System.Windows.Forms.Button btnReadPosition;
private System.Windows.Forms.Label lblServerOn; private System.Windows.Forms.Label lblServerOn;
private System.Windows.Forms.Label label7; private System.Windows.Forms.Label label7;
private System.Windows.Forms.Label label8; private System.Windows.Forms.Label label8;
public System.Windows.Forms.Button btnOpenAxis; private System.Windows.Forms.Button btnOpenAxis;
public System.Windows.Forms.Button btnCloseAxis; private System.Windows.Forms.Button btnCloseAxis;
private System.Windows.Forms.TextBox lblCountPulse; private System.Windows.Forms.TextBox lblCountPulse;
public System.Windows.Forms.TextBox txtASpeed; private System.Windows.Forms.TextBox txtASpeed;
private System.Windows.Forms.TextBox lblOutPulse; private System.Windows.Forms.TextBox lblOutPulse;
public System.Windows.Forms.Label label47; private System.Windows.Forms.Label label47;
public System.Windows.Forms.Button btnAxisVMove; private System.Windows.Forms.Button btnAxisVMove;
public System.Windows.Forms.Button btnAxisRMove; private System.Windows.Forms.Button btnAxisRMove;
public System.Windows.Forms.Button btnAxisReturnHome; private System.Windows.Forms.Button btnAxisReturnHome;
public System.Windows.Forms.Button btnAxisAMove; private System.Windows.Forms.Button btnAxisAMove;
private System.Windows.Forms.Button btnComAlarmClear; private System.Windows.Forms.Button btnComAlarmClear;
public System.Windows.Forms.TextBox txtAPosition; private System.Windows.Forms.TextBox txtAPosition;
public System.Windows.Forms.Label label48; private System.Windows.Forms.Label label48;
public System.Windows.Forms.Button btnAxisStop; private System.Windows.Forms.Button btnAxisStop;
private System.Windows.Forms.TextBox txtAxisValue; private System.Windows.Forms.TextBox txtAxisValue;
private System.Windows.Forms.TextBox txtAxisDeviceName; private System.Windows.Forms.TextBox txtAxisDeviceName;
private System.Windows.Forms.Label label45; private System.Windows.Forms.Label label45;
...@@ -1147,24 +1147,24 @@ ...@@ -1147,24 +1147,24 @@
private System.Windows.Forms.Button btnWriteSingleDO; private System.Windows.Forms.Button btnWriteSingleDO;
private System.Windows.Forms.TextBox txtWriteTime; private System.Windows.Forms.TextBox txtWriteTime;
private System.Windows.Forms.Label label5; private System.Windows.Forms.Label label5;
protected System.Windows.Forms.Label lblStoreStatus; private System.Windows.Forms.Label lblStoreStatus;
protected System.Windows.Forms.Button btnStart; private System.Windows.Forms.Button btnStart;
protected System.Windows.Forms.Button btnStop; private System.Windows.Forms.Button btnStop;
protected System.Windows.Forms.Button btnReset; private System.Windows.Forms.Button btnReset;
protected System.Windows.Forms.Button btnInStore; private System.Windows.Forms.Button btnInStore;
protected System.Windows.Forms.Button btnOutStore; private System.Windows.Forms.Button btnOutStore;
protected System.Windows.Forms.CheckBox chbDebug; private System.Windows.Forms.CheckBox chbDebug;
protected System.Windows.Forms.TabControl tabControl1; private System.Windows.Forms.TabControl tabControl1;
protected System.Windows.Forms.GroupBox groupAxis; private System.Windows.Forms.GroupBox groupAxis;
protected System.Windows.Forms.Panel panel1; private System.Windows.Forms.Panel panel1;
protected System.Windows.Forms.GroupBox groupBox3; private System.Windows.Forms.GroupBox groupBox3;
protected System.Windows.Forms.GroupBox groupBox4; private System.Windows.Forms.GroupBox groupBox4;
protected System.Windows.Forms.GroupBox groupBox1; private System.Windows.Forms.GroupBox groupBox1;
protected System.Windows.Forms.GroupBox groupBox5; private System.Windows.Forms.GroupBox groupBox5;
protected System.Windows.Forms.Label lblThisSta; private System.Windows.Forms.Label lblThisSta;
protected System.Windows.Forms.Label lblTrayNum; private System.Windows.Forms.Label lblTrayNum;
protected System.Windows.Forms.GroupBox groupBox6; private System.Windows.Forms.GroupBox groupBox6;
protected System.Windows.Forms.Label lblInstoreList; private System.Windows.Forms.Label lblInstoreList;
} }
} }
source/AssemblyLineClient/FrmEquipBaseForm.cs → source/AssemblyLineClient/equip/FrmEquipBaseForm.cs
...@@ -29,14 +29,66 @@ namespace OnlineStore.AssemblyLine ...@@ -29,14 +29,66 @@ namespace OnlineStore.AssemblyLine
protected EquipBase equipBase = null; protected EquipBase equipBase = null;
public static readonly ILog LOGGER = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); public static readonly ILog LOGGER = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
protected List<ConfigMoveAxis> allAxis = new List<ConfigMoveAxis>(); protected List<ConfigMoveAxis> allAxis = new List<ConfigMoveAxis>();
public FrmEquipBaseForm( ) public FrmEquipBaseForm()
{ {
Control.CheckForIllegalCrossThreadCalls = false;
InitializeComponent();
}
public FrmEquipBaseForm(EquipBase equipBase)
{
this.equipBase = equipBase;
Control.CheckForIllegalCrossThreadCalls = false; Control.CheckForIllegalCrossThreadCalls = false;
InitializeComponent(); InitializeComponent();
LoadIOList(); LoadIOList();
} }
private void FrmStoreIOStatus_Load(object sender, EventArgs e)
{
//chbDebug.Checked = equipBase.IsDebug;
//if (equipBase.UseAxis)
//{
// portName = equipBase.baseConfig.UpDown_Axis.DeviceName;
// SlvAddr = equipBase.baseConfig.UpDown_Axis.GetAxisValue();
// txtAxisDeviceName.Text = portName;
// txtSlaveId.Text = SlvAddr.ToString();
// comboBox1.Items.Clear();
// comboBox1.Items.Add(equipBase.baseConfig.UpDown_Axis.Explain);
// comboBox1.SelectedIndex = 0;
// txtAxisValue.Text = SlvAddr.ToString();
// btnUpDownUp.Visible = false;
//}
//else
//{
// tabControl1.TabPages.Remove(tabPage2);
// btnUpDownUp.Visible = true;
//}
//cmbSizeList.Items.Clear();
//cmbSizeList.Items.Add("0=默认位置");
//for(int i = 8; i <= 48; i = i + 4)
//{
// cmbSizeList.Items.Add(i.ToString());
//}
//cmbSizeList.SelectedIndex = 0;
//lblStoreStatus.Text = KTK_Store.GetRunStr(equipBase.lineStatus, equipBase.runStatus);
//lblThisSta.Text = equipBase.WarnMsg;
//txtP1.Text = equipBase.baseConfig.UpDownAxisP1.ToString();
//IsLoad = true;
//allAxis.Add()
//cmbAxisList.DataSource = new List<ConfigMoveAxis>(store.moveAxisList);
//cmbAxisList.DisplayMember = "Explain";
//cmbAxisList.ValueMember = "Explain";
//cmbAxisList.SelectedIndex = 0;
LoadData();
}
protected void LoadData()
{
}
protected Dictionary<string, IOTextControl> DIControlList = new Dictionary<string, IOTextControl>(); protected Dictionary<string, IOTextControl> DIControlList = new Dictionary<string, IOTextControl>();
protected Dictionary<string, IOTextControl> DOControlList = new Dictionary<string, IOTextControl>(); protected Dictionary<string, IOTextControl> DOControlList = new Dictionary<string, IOTextControl>();
protected void ReadIOList() protected void ReadIOList()
...@@ -252,52 +304,6 @@ namespace OnlineStore.AssemblyLine ...@@ -252,52 +304,6 @@ namespace OnlineStore.AssemblyLine
} }
private void FrmStoreIOStatus_Load(object sender, EventArgs e)
{
//chbDebug.Checked = equipBase.IsDebug;
//if (equipBase.UseAxis)
//{
// portName = equipBase.baseConfig.UpDown_Axis.DeviceName;
// SlvAddr = equipBase.baseConfig.UpDown_Axis.GetAxisValue();
// txtAxisDeviceName.Text = portName;
// txtSlaveId.Text = SlvAddr.ToString();
// comboBox1.Items.Clear();
// comboBox1.Items.Add(equipBase.baseConfig.UpDown_Axis.Explain);
// comboBox1.SelectedIndex = 0;
// txtAxisValue.Text = SlvAddr.ToString();
// btnUpDownUp.Visible = false;
//}
//else
//{
// tabControl1.TabPages.Remove(tabPage2);
// btnUpDownUp.Visible = true;
//}
//cmbSizeList.Items.Clear();
//cmbSizeList.Items.Add("0=默认位置");
//for(int i = 8; i <= 48; i = i + 4)
//{
// cmbSizeList.Items.Add(i.ToString());
//}
//cmbSizeList.SelectedIndex = 0;
//lblStoreStatus.Text = KTK_Store.GetRunStr(equipBase.lineStatus, equipBase.runStatus);
//lblThisSta.Text = equipBase.WarnMsg;
//txtP1.Text = equipBase.baseConfig.UpDownAxisP1.ToString();
//IsLoad = true;
//allAxis.Add()
//cmbAxisList.DataSource = new List<ConfigMoveAxis>(store.moveAxisList);
//cmbAxisList.DisplayMember = "Explain";
//cmbAxisList.ValueMember = "Explain";
//cmbAxisList.SelectedIndex = 0;
LoadData();
}
protected void LoadData()
{
}
private void cmbWriteIO_DrawItem(object sender, DrawItemEventArgs e) private void cmbWriteIO_DrawItem(object sender, DrawItemEventArgs e)
{ {
if (e.Index < 0) if (e.Index < 0)
......
source/AssemblyLineClient/equip/FrmFeedingEquipF.Designer.cs 0 → 100644
namespace OnlineStore.AssemblyLine
{
partial class FrmFeedingEquipF
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(800, 450);
this.Text = "FrmFeedingEquipF";
}
#endregion
}
}
\ No newline at end of file \ No newline at end of file
source/AssemblyLineClient/equip/FrmFeedingEquipF.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace OnlineStore.AssemblyLine
{
public partial class FrmFeedingEquipF : FrmEquipBaseForm
{
public FrmFeedingEquipF()
{
InitializeComponent();
}
}
}
source/AssemblyLineClient/equip/FrmMoveEquipForm.Designer.cs 0 → 100644
namespace OnlineStore.AssemblyLine
{
partial class FrmMoveEquipForm
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1399, 800);
this.Text = "FrmMoveEquipForm";
}
#endregion
}
}
\ No newline at end of file \ No newline at end of file
source/AssemblyLineClient/equip/FrmMoveEquipForm.cs 0 → 100644
using OnlineStore.DeviceLibrary;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace OnlineStore.AssemblyLine
{
public partial class FrmMoveEquipForm : FrmEquipBaseForm
{
private MoveEquip equipBean;
public FrmMoveEquipForm( )
{
Control.CheckForIllegalCrossThreadCalls = false;
InitializeComponent();
}
public FrmMoveEquipForm(MoveEquip moveEquip) : base(moveEquip)
{
equipBase = moveEquip;
this.equipBean = moveEquip;
Control.CheckForIllegalCrossThreadCalls = false;
InitializeComponent();
}
}
}
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!