Commit 3cc47606 几米阳光

3.增加启用调试开关。

1 个父辈 9895791e
...@@ -48,7 +48,7 @@ namespace OnlineStore.ACSingleStore ...@@ -48,7 +48,7 @@ namespace OnlineStore.ACSingleStore
txtMiddleSpeed.Text = (middle.TargetSpeed / 5).ToString(); txtMiddleSpeed.Text = (middle.TargetSpeed / 5).ToString();
txtInOutSpeed.Text = (inout.TargetSpeed / 5).ToString(); txtInOutSpeed.Text = (inout.TargetSpeed / 5).ToString();
txtUpDownSpeed.Text = (updown.TargetSpeed / 5).ToString(); txtUpDownSpeed.Text = (updown.TargetSpeed / 5).ToString();
txtComSpeed.Text = (StoreManager.Config.CompressAxis_EndSpeed/5).ToString(); txtComSpeed.Text = (StoreManager.Config.CompressAxis_EndSpeed).ToString();
timer1.Start(); timer1.Start();
} }
/// <summary> /// <summary>
......
...@@ -132,13 +132,7 @@ namespace OnlineStore.ACSingleStore ...@@ -132,13 +132,7 @@ namespace OnlineStore.ACSingleStore
preOpen = isOpen; preOpen = isOpen;
btnOutStore.Enabled = isOpen; btnOutStore.Enabled = isOpen;
btnInStore.Enabled = isOpen; btnInStore.Enabled = isOpen;
//btnAxisAMove.Enabled = isOpen;
//btnAxisReturnHome.Enabled = isOpen;
//btnAxisRMove.Enabled = isOpen;
//btnAxisVMove.Enabled = isOpen;
启动ToolStripMenuItem.Enabled = !isOpen; 启动ToolStripMenuItem.Enabled = !isOpen;
停止ToolStripMenuItem.Enabled = isOpen; 停止ToolStripMenuItem.Enabled = isOpen;
复位ToolStripMenuItem.Enabled = isOpen; 复位ToolStripMenuItem.Enabled = isOpen;
...@@ -294,18 +288,7 @@ namespace OnlineStore.ACSingleStore ...@@ -294,18 +288,7 @@ namespace OnlineStore.ACSingleStore
lblThisSta.Text = "等待启动"; lblThisSta.Text = "等待启动";
lblWarnMsg.Text = ""; lblWarnMsg.Text = "";
btnStartAuTo.Text = "开始自动出入库"; btnStartAuTo.Text = "开始自动出入库";
} }
//if (WCFControl.isRun)
//{
// btnOpenWCF.Enabled = false;
// btnCloseWCF.Enabled = true;
//}
//else
//{
// btnOpenWCF.Enabled = true ;
// btnCloseWCF.Enabled = false ;
//}
} }
private void ReadPosistion() private void ReadPosistion()
...@@ -1267,7 +1250,9 @@ namespace OnlineStore.ACSingleStore ...@@ -1267,7 +1250,9 @@ namespace OnlineStore.ACSingleStore
this.WindowState = FormWindowState.Maximized; this.WindowState = FormWindowState.Maximized;
this.notifyIcon1.Visible = false; this.notifyIcon1.Visible = false;
this.ShowInTaskbar = true; this.ShowInTaskbar = true;
}catch(Exception ex) DebugStatus(false);
}
catch(Exception ex)
{ {
LogUtil.error("显示界面出错:"+ex.ToString()); LogUtil.error("显示界面出错:"+ex.ToString());
} }
...@@ -1314,6 +1299,7 @@ namespace OnlineStore.ACSingleStore ...@@ -1314,6 +1299,7 @@ namespace OnlineStore.ACSingleStore
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.notifyIcon1.Visible = true; this.notifyIcon1.Visible = true;
this.Hide(); this.Hide();
DebugStatus(false);
} }
private void FrmStoreBox_FormClosed(object sender, FormClosedEventArgs e) private void FrmStoreBox_FormClosed(object sender, FormClosedEventArgs e)
{ {
...@@ -1458,5 +1444,31 @@ namespace OnlineStore.ACSingleStore ...@@ -1458,5 +1444,31 @@ namespace OnlineStore.ACSingleStore
FrmAbout about = new FrmAbout(); FrmAbout about = new FrmAbout();
about.ShowDialog(); about.ShowDialog();
} }
private void DebugStatus(bool status)
{
if (status)
{
btnDebug.Text = "禁用调试";
}
else
{
btnDebug.Text = "启用调试";
}
groupAxis.Enabled = status;
groupComAxis.Enabled = status;
groupInout.Enabled = status;
}
private void btnDebug_Click(object sender, EventArgs e)
{
if (btnDebug.Text.Equals("启用调试"))
{
DebugStatus(true);
}
else
{
DebugStatus(false);
}
}
} }
} }
...@@ -1263,7 +1263,7 @@ ...@@ -1263,7 +1263,7 @@
</value> </value>
</data> </data>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>169</value> <value>25</value>
</metadata> </metadata>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
......
...@@ -50,9 +50,11 @@ ...@@ -50,9 +50,11 @@
条码前面字母去掉之后用分号分割,最后不加分号 条码前面字母去掉之后用分号分割,最后不加分号
P;H;Q P;H;Q
20190312
1.测高AI模块BUG修改。
2.出库增加缓存功能,若出库失败也放入缓存。
3.增加启用调试开关。
......
...@@ -67,7 +67,10 @@ namespace OnlineStore.Common ...@@ -67,7 +67,10 @@ namespace OnlineStore.Common
/// </summary> /// </summary>
public static void Release() public static void Release()
{ {
sb.closePort(); if (sb != null)
{
sb.closePort();
}
IsRun = false; IsRun = false;
} }
public static ASTemperateParam LastData = new ASTemperateParam(0, 0); public static ASTemperateParam LastData = new ASTemperateParam(0, 0);
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!