Skip to content

孙克 / ACSingleStore

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

优化界面显示

1 个父辈 440a3081
内嵌 并排
正在显示 4 个修改的文件 包含 34 行增加 和 27 行删除
source/ACSingleStore/FrmStoreBox.Designer.cs
......@@ -116,6 +116,7 @@ namespace OnlineStore.ACSingleStore
this.btnUpDownP1 = new System.Windows.Forms.Button();
this.btnUpDownP2 = new System.Windows.Forms.Button();
this.axisMoveControl1 = new OnlineStore.DUOStore.AxisMoveControl();
this.tabPage9 = new System.Windows.Forms.TabPage();
this.menuStrip1 = new System.Windows.Forms.MenuStrip();
this.料仓操作ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.启动ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
......@@ -148,7 +149,6 @@ namespace OnlineStore.ACSingleStore
this.开启DEBUGToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator();
this.清理日志ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.tabPage9 = new System.Windows.Forms.TabPage();
this.contextMenuStrip1.SuspendLayout();
this.tabControl2.SuspendLayout();
this.tabPage4.SuspendLayout();
......@@ -436,7 +436,7 @@ namespace OnlineStore.ACSingleStore
//
this.chbIsDebug.AutoSize = true;
this.chbIsDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbIsDebug.Location = new System.Drawing.Point(596, 32);
this.chbIsDebug.Location = new System.Drawing.Point(715, 13);
this.chbIsDebug.Name = "chbIsDebug";
this.chbIsDebug.Size = new System.Drawing.Size(84, 24);
this.chbIsDebug.TabIndex = 272;
......@@ -448,7 +448,7 @@ namespace OnlineStore.ACSingleStore
//
this.chbBuzzer.AutoSize = true;
this.chbBuzzer.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbBuzzer.Location = new System.Drawing.Point(696, 32);
this.chbBuzzer.Location = new System.Drawing.Point(715, 33);
this.chbBuzzer.Name = "chbBuzzer";
this.chbBuzzer.Size = new System.Drawing.Size(98, 24);
this.chbBuzzer.TabIndex = 271;
......@@ -460,7 +460,7 @@ namespace OnlineStore.ACSingleStore
//
this.chbAuto.AutoSize = true;
this.chbAuto.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbAuto.Location = new System.Drawing.Point(810, 32);
this.chbAuto.Location = new System.Drawing.Point(715, 54);
this.chbAuto.Name = "chbAuto";
this.chbAuto.Size = new System.Drawing.Size(112, 24);
this.chbAuto.TabIndex = 270;
......@@ -559,11 +559,11 @@ namespace OnlineStore.ACSingleStore
//
this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.groupBox3.Controls.Add(this.chbAuto);
this.groupBox3.Controls.Add(this.chbIsDebug);
this.groupBox3.Controls.Add(this.lblWarnMsg);
this.groupBox3.Controls.Add(this.chbBuzzer);
this.groupBox3.Controls.Add(this.lblThisSta);
this.groupBox3.Controls.Add(this.chbAuto);
this.groupBox3.Location = new System.Drawing.Point(7, 3);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(935, 189);
......@@ -1334,6 +1334,16 @@ namespace OnlineStore.ACSingleStore
this.axisMoveControl1.Size = new System.Drawing.Size(557, 397);
this.axisMoveControl1.TabIndex = 0;
//
// tabPage9
//
this.tabPage9.Location = new System.Drawing.Point(4, 29);
this.tabPage9.Name = "tabPage9";
this.tabPage9.Padding = new System.Windows.Forms.Padding(3);
this.tabPage9.Size = new System.Drawing.Size(946, 606);
this.tabPage9.TabIndex = 5;
this.tabPage9.Text = " IO调试 ";
this.tabPage9.UseVisualStyleBackColor = true;
//
// menuStrip1
//
this.menuStrip1.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
......@@ -1574,16 +1584,6 @@ namespace OnlineStore.ACSingleStore
this.清理日志ToolStripMenuItem.Text = "清理日志";
this.清理日志ToolStripMenuItem.Click += new System.EventHandler(this.清理日志ToolStripMenuItem_Click);
//
// tabPage9
//
this.tabPage9.Location = new System.Drawing.Point(4, 29);
this.tabPage9.Name = "tabPage9";
this.tabPage9.Padding = new System.Windows.Forms.Padding(3);
this.tabPage9.Size = new System.Drawing.Size(946, 606);
this.tabPage9.TabIndex = 5;
this.tabPage9.Text = " IO调试 ";
this.tabPage9.UseVisualStyleBackColor = true;
//
// FrmStoreBox
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
......
source/ACSingleStore/resource/language.resource
FrmStoreBox_Text,AC_SA_料仓,AC_SA_SMD BOX,AC_SA_box
FrmStoreBox_tabControl2_Text,FrmStoreBox_tabControl2_Text,FrmStoreBox_tabControl2_Text,FrmStoreBox_tabControl2_Text
FrmStoreBox_tabControl2_Text,FrmStoreBox_tabControl2_Text,FrmStoreBox_tabControl2_Text,FrmStoreBox_tabControl2_Text
FrmStoreBox_tabPage4_Text,料仓操作,Operation,boxの操作
FrmStoreBox_tabPage9_Text, IO调试 ,IO Debug,デバッグ
FrmStoreBox_chbBuzzer_Text,启用蜂鸣器,Enable the buzzer,ブザーを鳴らす
......
source/ACSingleStore/useControl/uc_boxdebug.Designer.cs
......@@ -33,6 +33,7 @@ namespace OnlineStore.ACSingleStore.useControl
this.groupInout = new System.Windows.Forms.GroupBox();
this.btnInOutP1 = new System.Windows.Forms.Button();
this.checkBox_Double_Alternate = new System.Windows.Forms.CheckBox();
this.label_size = new System.Windows.Forms.Label();
this.cmbPosition = new System.Windows.Forms.Label();
this.txtJiange = new System.Windows.Forms.TextBox();
this.lblMsg = new System.Windows.Forms.Label();
......@@ -61,7 +62,6 @@ namespace OnlineStore.ACSingleStore.useControl
this.btnUpDownP4 = new System.Windows.Forms.Button();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.dataGridView1 = new System.Windows.Forms.DataGridView();
this.label_size = new System.Windows.Forms.Label();
this.groupInout.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
this.SuspendLayout();
......@@ -134,11 +134,18 @@ namespace OnlineStore.ACSingleStore.useControl
this.checkBox_Double_Alternate.UseVisualStyleBackColor = true;
this.checkBox_Double_Alternate.CheckedChanged += new System.EventHandler(this.checkBox_Double_Alternate_CheckedChanged);
//
// label_size
//
this.label_size.Location = new System.Drawing.Point(267, 0);
this.label_size.Name = "label_size";
this.label_size.Size = new System.Drawing.Size(57, 10);
this.label_size.TabIndex = 224;
//
// cmbPosition
//
this.cmbPosition.Location = new System.Drawing.Point(326, 0);
this.cmbPosition.Name = "cmbPosition";
this.cmbPosition.Size = new System.Drawing.Size(73, 11);
this.cmbPosition.Size = new System.Drawing.Size(104, 11);
this.cmbPosition.TabIndex = 224;
//
// txtJiange
......@@ -553,13 +560,6 @@ namespace OnlineStore.ACSingleStore.useControl
this.dataGridView1.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellContentClick);
this.dataGridView1.CellMouseDown += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dataGridView1_CellMouseDown);
//
// label_size
//
this.label_size.Location = new System.Drawing.Point(267, 0);
this.label_size.Name = "label_size";
this.label_size.Size = new System.Drawing.Size(57, 10);
this.label_size.TabIndex = 224;
//
// uc_boxdebug
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
......@@ -1728,7 +1728,11 @@ namespace OnlineStore.DeviceLibrary
result = 8;
}
}
if (result >= 38)
if (result >= 48)
{
result = 56;
}
else if (result >= 38)
{
result = 44;
}
......@@ -1740,6 +1744,10 @@ namespace OnlineStore.DeviceLibrary
{
result = 24;
}
else if (result >= 13)
{
result = 12;
}
return result;
}
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!