Skip to content

李娜 / SO908-XLRStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 90ae9aa6 由 张东亮
选项

存储机构-视觉对位

1 个父辈 3f996b55
全部展开
内嵌 并排
正在显示 10 个修改的文件 包含 31 行增加 和 19 行删除
source/DeviceLibrary/manager/model/DeviceStep.cs
...@@ -372,35 +372,43 @@ namespace OnlineStore.DeviceLibrary ...@@ -372,35 +372,43 @@ namespace OnlineStore.DeviceLibrary
/// <summary> /// <summary>
/// 存储机构自动对位：开始对位 /// 存储机构自动对位：开始对位
/// </summary> /// </summary>
SA_Drawer_Start_Find_Pos = 401, SA_01_Pos_Start_Find_Pos = 401,
/// <summary> /// <summary>
/// 存储机构自动对位：去抽屉起始点 /// 存储机构自动对位：去抽屉起始点
/// </summary> /// </summary>
SA_01_To_Drawer_StartPoint, SA_02_Pos_To_Drawer_StartPoint,
/// <summary> /// <summary>
/// 存储机构自动对位:取图(正向) /// 存储机构自动对位:取图(正向)
/// </summary> /// </summary>
SA_02_Pos_AcqImg, SA_03_Pos_AcqImg,
/// <summary> /// <summary>
/// 存储机构自动对位:对位(正向) /// 存储机构自动对位:对位(正向)
/// </summary> /// </summary>
SA_03_Pos_AdjPos, SA_04_Pos_AdjPos,
/// <summary> /// <summary>
/// 存储机构自动对位:到下一个抽屉(正向) /// 存储机构自动对位:到下一个抽屉(正向)
/// </summary> /// </summary>
SA_04_Pos_NextDrawer, SA_05_Pos_NextDrawer,
/// <summary>
/// 存储机构自动对位：开始对位
/// </summary>
SA_06_Neg_Start_Find_Pos,
/// <summary>
/// 存储机构自动对位：去抽屉起始点
/// </summary>
SA_07_Neg_To_Drawer_StartPoint,
/// <summary> /// <summary>
/// 存储机构自动对位:取图(反向) /// 存储机构自动对位:取图(反向)
/// </summary> /// </summary>
SA_05_Neg_AcqImg, SA_08_Neg_AcqImg,
/// <summary> /// <summary>
/// 存储机构自动对位:对位(反向) /// 存储机构自动对位:对位(反向)
/// </summary> /// </summary>
SA_06_Neg_AdjPos, SA_09_Neg_AdjPos,
/// <summary> /// <summary>
/// 存储机构自动对位:到下一个抽屉(反向) /// 存储机构自动对位:到下一个抽屉(反向)
/// </summary> /// </summary>
SA_07_Neg_NextDrawer, SA_10_Neg_NextDrawer,
#endregion #endregion
#region 入料模块复位 1000 开始 #region 入料模块复位 1000 开始
......
source/DeviceLibrary/storeBean/boxBean/EyemLibDemo.cs
...@@ -432,9 +432,9 @@ namespace eyemLib_Sharp ...@@ -432,9 +432,9 @@ namespace eyemLib_Sharp
[StructLayout(LayoutKind.Sequential)] [StructLayout(LayoutKind.Sequential)]
public struct EyemOcsFXYR // 用于表示圆 public struct EyemOcsFXYR // 用于表示圆
{ {
float fX; // Ｘ坐标 public float fX; // Ｘ坐标
float fY; // Ｙ坐标 public float fY; // Ｙ坐标
float fR; // 半径 public float fR; // 半径
} }
[StructLayout(LayoutKind.Sequential)] [StructLayout(LayoutKind.Sequential)]
......
source/LoadCVSLibrary/storeConfig/config/BoxEquip_Config.cs
...@@ -75,22 +75,22 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -75,22 +75,22 @@ namespace OnlineStore.LoadCSVLibrary
/// 抽屉Mark_X坐标 /// 抽屉Mark_X坐标
/// </summary> /// </summary>
[ConfigProAttribute("Drawer_X")] [ConfigProAttribute("Drawer_X")]
public double Drawer_X { get; set; } public float Drawer_X { get; set; }
/// <summary> /// <summary>
/// 抽屉Mark_Y坐标 /// 抽屉Mark_Y坐标
/// </summary> /// </summary>
[ConfigProAttribute("Drawer_Y")] [ConfigProAttribute("Drawer_Y")]
public double Drawer_Y { get; set; } public float Drawer_Y { get; set; }
/// <summary> /// <summary>
/// 抽屉Mark_X方向误差范围 /// 抽屉Mark_X方向误差范围
/// </summary> /// </summary>
[ConfigProAttribute("Drawer_X_Error")] [ConfigProAttribute("Drawer_X_Error")]
public string Drawer_X_Error { get; set; } public float Drawer_X_Error { get; set; }
/// <summary> /// <summary>
/// 抽屉Mark_Y方向误差范围 /// 抽屉Mark_Y方向误差范围
/// </summary> /// </summary>
[ConfigProAttribute("Drawer_Y_Error")] [ConfigProAttribute("Drawer_Y_Error")]
public string Drawer_Y_Error { get; set; } public float Drawer_Y_Error { get; set; }
/// <summary> /// <summary>
/// 抽屉行间距 /// 抽屉行间距
/// </summary> /// </summary>
...@@ -111,7 +111,6 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -111,7 +111,6 @@ namespace OnlineStore.LoadCSVLibrary
/// </summary> /// </summary>
[ConfigProAttribute("Drawer_Columns")] [ConfigProAttribute("Drawer_Columns")]
public int Drawer_Columns { get; set; } public int Drawer_Columns { get; set; }
/// <summary> /// <summary>
/// PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,,,,,,,,,,,, /// PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,,,,,,,,,,,,
/// </summary> /// </summary>
......
source/XLRStoreClient/App.config
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<add key="ConfigPath_BoxPosition" value="\Config\linePositions.csv" /> <add key="ConfigPath_BoxPosition" value="\Config\linePositions.csv" />
<add key="ConfigPath_DrawerPosition" value="\Config\DrawerPosition.csv" /> <add key="ConfigPath_DrawerPosition" value="\Config\DrawerPosition.csv" />
<add key="ConfigPath_TrayList" value="\LineConfig\TrayList.data" /> <add key="ConfigPath_TrayList" value="\LineConfig\TrayList.data" />
<add key="Line_CID" value="so827" /> <add key="Line_CID" value="05" />
<!--end one store config--> <!--end one store config-->
<!--二维码类型列表配置，用#分割，一维码=Barcode 二维码： QR Code#Data Matrix ECC 200#Micro QR Code--> <!--二维码类型列表配置，用#分割，一维码=Barcode 二维码： QR Code#Data Matrix ECC 200#Micro QR Code-->
<add key="CodeType" value="Data Matrix ECC 200#QR Code" /> <add key="CodeType" value="Data Matrix ECC 200#QR Code" />
......
source/XLRStoreClient/boxForm/FrmAutoFindPos.resx
...@@ -117,4 +117,7 @@ ...@@ -117,4 +117,7 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root> </root>
\ No newline at end of file \ No newline at end of file
source/XLRStoreClient/boxForm/FrmAxisMove.Designer.cs
...@@ -1613,7 +1613,7 @@ ...@@ -1613,7 +1613,7 @@
this.groupBox23.Dock = System.Windows.Forms.DockStyle.Top; this.groupBox23.Dock = System.Windows.Forms.DockStyle.Top;
this.groupBox23.Location = new System.Drawing.Point(0, 191); this.groupBox23.Location = new System.Drawing.Point(0, 191);
this.groupBox23.Name = "groupBox23"; this.groupBox23.Name = "groupBox23";
this.groupBox23.Size = new System.Drawing.Size(492, 248); this.groupBox23.Size = new System.Drawing.Size(492, 209);
this.groupBox23.TabIndex = 12; this.groupBox23.TabIndex = 12;
this.groupBox23.TabStop = false; this.groupBox23.TabStop = false;
this.groupBox23.Text = "页面切换操作"; this.groupBox23.Text = "页面切换操作";
......
source/XLRStoreClient/boxForm/FrmBoxEquip.cs
...@@ -22,8 +22,8 @@ namespace OnlineStore.XLRStore ...@@ -22,8 +22,8 @@ namespace OnlineStore.XLRStore
{ {
internal partial class FrmBoxEquip : FrmBase internal partial class FrmBoxEquip : FrmBase
{ {
FrmAxisMove frmAxisMove = null;
private bool IsLoad = false; private bool IsLoad = false;
FrmAxisMove frmAxisMove =null;
private BoxEquip boxBean; private BoxEquip boxBean;
internal FrmBoxEquip(BoxEquip moveEquip) internal FrmBoxEquip(BoxEquip moveEquip)
{ {
...@@ -41,6 +41,8 @@ namespace OnlineStore.XLRStore ...@@ -41,6 +41,8 @@ namespace OnlineStore.XLRStore
lblName.Text = boxBean.Name; lblName.Text = boxBean.Name;
this.Text = boxBean.Name; this.Text = boxBean.Name;
chbDebug.Checked = boxBean.IsDebug; chbDebug.Checked = boxBean.IsDebug;
FrmAutoFindPos frmAutoFindPos = new FrmAutoFindPos();
AddForm(tabControl1, " 视觉对位 ", frmAutoFindPos);
IsLoad = true; IsLoad = true;
} }
protected Dictionary<string, IOTextControl> DIControlList = new Dictionary<string, IOTextControl>(); protected Dictionary<string, IOTextControl> DIControlList = new Dictionary<string, IOTextControl>();
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!