Skip to content

刘韬 / 1069_MIMO_PlUS

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

界面调整

1 个父辈 7dd17650
全部展开
内嵌 并排
正在显示 14 个修改的文件 包含 156 行增加 和 109 行删除
DeviceLibrary/theMachine/MainMachine _LedRGBProcess.cs
......@@ -95,6 +95,32 @@ namespace DeviceLibrary
catch (Exception ex) { LogUtil.error("ShowColror " + color + ", " + lastState + "出错：" + ex.ToString()); }
}
public void ShowBlink(Color color, string lastState)
{
try
{
if (rGB_Controller == null || (!rgbLedInitOk))
{
return;
}
if (string.IsNullOrEmpty(lastS))
{
lastS = "show";
rGB_Controller.ShowColor(color);
}
else
{
lastS = "";
rGB_Controller.CloseLed();
}
lastColor = color.Name.ToString();
}
catch (Exception ex) { LogUtil.error("ShowColror " + color + ", " + lastState + "出错：" + ex.ToString()); }
}
public void ShowYellowLight(string s= "storeOut")
{
if (!lastColor.Equals("yellowL"))
......@@ -124,7 +150,7 @@ namespace DeviceLibrary
return;
}
// 红色: 急停,
//红色: 急停,
//紫色: 异常,
//蓝绿: 待机
//流动绿: 入库
......@@ -198,33 +224,37 @@ namespace DeviceLibrary
else if (scanCode)
{
//蓝色: 扫码检测
ShowColor(Color.Blue, "scanCode");
//ShowColor(Color.Blue, "scanCode");
ShowBlink(Color.Yellow, "scanCode");
}
else if (waitTake)
{
//暂停等待料盘拿走
//白色: 等待用户响应(等待取走盘等),
//蓝色: 扫码检测
ShowColor(Color.White, "waitTask");
//ShowColor(Color.White, "waitTask");
ShowBlink(Color.Yellow, "waitTask");
}
//出入库 绿闪 黄闪
else if (inOut)
{
////流动黄: 出库,
ShowYellowLight();
//ShowYellowLight();
ShowBlink(Color.Yellow, "inOut");
//lastS = "storeOut";
//LogUtil.info(Name + " ShowColor " + lastS + "=" + lastColor);
}
else if (inPut)
{
ShowGreenLight();
//ShowGreenLight();
ShowBlink(Color.Yellow, "InPut");
//lastS = "storeIn";
//LogUtil.info(Name + " ShowColor " + lastS + "=" + lastColor);
}
else if (hasAlarm)
{
//紫色: 异常,
ShowColor(Color.Purple, "hasAlarm");
ShowColor(Color.Red, "hasAlarm");
} //温度超限
//else if (IsTHoutRange())
......@@ -243,7 +273,8 @@ namespace DeviceLibrary
else
{
//待机 蓝绿
ShowColor(Color.FromArgb(0, 255, 64), "waiting");
//ShowColor(Color.FromArgb(0, 255, 64), "waiting");
ShowColor(Color.Green, "waiting");
}
}
}
......
TheMachineNView/AxisControl.Designer.cs
......@@ -40,38 +40,38 @@ namespace TheMachineNView
this.lblSensor = new System.Windows.Forms.Label();
this.btnAxisRStop = new System.Windows.Forms.Button();
this.btnAxisRTest = new System.Windows.Forms.Button();
this.axisMoveControl1 = new AxisMoveControl();
this.configControl1 = new TheMachineNView.ConfigControl();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.colorDialog1 = new System.Windows.Forms.ColorDialog();
this.axisMoveControl1 = new TheMachineNView.AxisMoveControl();
this.configControl1 = new TheMachineNView.ConfigControl();
this.panel1.SuspendLayout();
this.SuspendLayout();
//
// panel1
//
this.panel1.AutoScroll = true;
this.panel1.Controls.Add(this.button1);
this.panel1.Controls.Add(this.btnChangeColor);
this.panel1.Controls.Add(this.btnGree);
this.panel1.Controls.Add(this.btnYellow);
this.panel1.Controls.Add(this.lblLed);
this.panel1.Controls.Add(this.lblOkValue);
this.panel1.Controls.Add(this.lblSensor);
this.panel1.Controls.Add(this.btnAxisRStop);
this.panel1.Controls.Add(this.btnAxisRTest);
this.panel1.Controls.Add(this.lblLed);
this.panel1.Controls.Add(this.button1);
this.panel1.Controls.Add(this.axisMoveControl1);
this.panel1.Controls.Add(this.lblOkValue);
this.panel1.Controls.Add(this.configControl1);
this.panel1.Controls.Add(this.btnAxisRStop);
this.panel1.Controls.Add(this.btnGree);
this.panel1.Controls.Add(this.lblSensor);
this.panel1.Controls.Add(this.btnYellow);
this.panel1.Controls.Add(this.btnChangeColor);
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1234, 924);
this.panel1.Size = new System.Drawing.Size(725, 815);
this.panel1.TabIndex = 2;
//
// button1
//
this.button1.Location = new System.Drawing.Point(211, 578);
this.button1.Location = new System.Drawing.Point(568, 208);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(155, 31);
this.button1.Size = new System.Drawing.Size(130, 31);
this.button1.TabIndex = 20;
this.button1.Text = "停止";
this.button1.UseVisualStyleBackColor = true;
......@@ -79,9 +79,9 @@ namespace TheMachineNView
//
// btnChangeColor
//
this.btnChangeColor.Location = new System.Drawing.Point(211, 541);
this.btnChangeColor.Location = new System.Drawing.Point(568, 171);
this.btnChangeColor.Name = "btnChangeColor";
this.btnChangeColor.Size = new System.Drawing.Size(155, 31);
this.btnChangeColor.Size = new System.Drawing.Size(130, 31);
this.btnChangeColor.TabIndex = 19;
this.btnChangeColor.Text = "切换颜色";
this.btnChangeColor.UseVisualStyleBackColor = true;
......@@ -89,9 +89,9 @@ namespace TheMachineNView
//
// btnGree
//
this.btnGree.Location = new System.Drawing.Point(25, 578);
this.btnGree.Location = new System.Drawing.Point(568, 134);
this.btnGree.Name = "btnGree";
this.btnGree.Size = new System.Drawing.Size(155, 31);
this.btnGree.Size = new System.Drawing.Size(130, 31);
this.btnGree.TabIndex = 18;
this.btnGree.Text = "流动绿";
this.btnGree.UseVisualStyleBackColor = true;
......@@ -99,9 +99,9 @@ namespace TheMachineNView
//
// btnYellow
//
this.btnYellow.Location = new System.Drawing.Point(25, 541);
this.btnYellow.Location = new System.Drawing.Point(568, 97);
this.btnYellow.Name = "btnYellow";
this.btnYellow.Size = new System.Drawing.Size(155, 31);
this.btnYellow.Size = new System.Drawing.Size(130, 31);
this.btnYellow.TabIndex = 17;
this.btnYellow.Text = "流动黄";
this.btnYellow.UseVisualStyleBackColor = true;
......@@ -109,36 +109,39 @@ namespace TheMachineNView
//
// lblLed
//
this.lblLed.AutoSize = true;
this.lblLed.Location = new System.Drawing.Point(23, 508);
this.lblLed.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.lblLed.Location = new System.Drawing.Point(569, 360);
this.lblLed.Name = "lblLed";
this.lblLed.Size = new System.Drawing.Size(41, 12);
this.lblLed.Size = new System.Drawing.Size(134, 44);
this.lblLed.TabIndex = 16;
this.lblLed.Text = "氛围灯";
//
// lblOkValue
//
this.lblOkValue.AutoSize = true;
this.lblOkValue.Location = new System.Drawing.Point(23, 482);
this.lblOkValue.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.lblOkValue.Location = new System.Drawing.Point(569, 310);
this.lblOkValue.Name = "lblOkValue";
this.lblOkValue.Size = new System.Drawing.Size(65, 12);
this.lblOkValue.Size = new System.Drawing.Size(134, 44);
this.lblOkValue.TabIndex = 15;
this.lblOkValue.Text = "压力传感器";
//
// lblSensor
//
this.lblSensor.AutoSize = true;
this.lblSensor.Location = new System.Drawing.Point(23, 456);
this.lblSensor.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.lblSensor.Location = new System.Drawing.Point(569, 260);
this.lblSensor.Name = "lblSensor";
this.lblSensor.Size = new System.Drawing.Size(65, 12);
this.lblSensor.Size = new System.Drawing.Size(134, 44);
this.lblSensor.TabIndex = 14;
this.lblSensor.Text = "声波传感器";
//
// btnAxisRStop
//
this.btnAxisRStop.Location = new System.Drawing.Point(397, 495);
this.btnAxisRStop.Location = new System.Drawing.Point(568, 60);
this.btnAxisRStop.Name = "btnAxisRStop";
this.btnAxisRStop.Size = new System.Drawing.Size(155, 31);
this.btnAxisRStop.Size = new System.Drawing.Size(130, 31);
this.btnAxisRStop.TabIndex = 13;
this.btnAxisRStop.Text = "旋转轴停止";
this.btnAxisRStop.UseVisualStyleBackColor = true;
......@@ -146,14 +149,19 @@ namespace TheMachineNView
//
// btnAxisRTest
//
this.btnAxisRTest.Location = new System.Drawing.Point(397, 453);
this.btnAxisRTest.Location = new System.Drawing.Point(568, 18);
this.btnAxisRTest.Name = "btnAxisRTest";
this.btnAxisRTest.Size = new System.Drawing.Size(155, 31);
this.btnAxisRTest.Size = new System.Drawing.Size(130, 31);
this.btnAxisRTest.TabIndex = 12;
this.btnAxisRTest.Text = "旋转轴循环";
this.btnAxisRTest.UseVisualStyleBackColor = true;
this.btnAxisRTest.Click += new System.EventHandler(this.button2_Click);
//
// timer1
//
this.timer1.Interval = 1000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
// axisMoveControl1
//
this.axisMoveControl1.Location = new System.Drawing.Point(3, 3);
......@@ -164,18 +172,17 @@ namespace TheMachineNView
//
// configControl1
//
this.configControl1.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.configControl1.AutoScroll = true;
this.configControl1.Config = null;
this.configControl1.Location = new System.Drawing.Point(568, 3);
this.configControl1.Location = new System.Drawing.Point(6, 453);
this.configControl1.Name = "configControl1";
this.configControl1.Size = new System.Drawing.Size(647, 688);
this.configControl1.Size = new System.Drawing.Size(712, 314);
this.configControl1.TabIndex = 1;
this.configControl1.Tag = "not";
//
// timer1
//
this.timer1.Interval = 1000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
// AxisControl
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
......@@ -183,10 +190,9 @@ namespace TheMachineNView
this.Controls.Add(this.panel1);
this.Font = new System.Drawing.Font("新宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Name = "AxisControl";
this.Size = new System.Drawing.Size(1234, 924);
this.Size = new System.Drawing.Size(725, 815);
this.Load += new System.EventHandler(this.AxisControl_Load);
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
this.ResumeLayout(false);
}
......
TheMachineNView/SettingControl.Designer.cs
......@@ -94,7 +94,7 @@ namespace TheMachineNView
this.tp.Controls.Add(this.lbl_hmdstate, 0, 4);
this.tp.Controls.Add(this.cb_usefixpos, 0, 6);
this.tp.Controls.Add(this.chbAutoRun, 0, 7);
this.tp.Location = new System.Drawing.Point(3, 3);
this.tp.Location = new System.Drawing.Point(8, 3);
this.tp.Name = "tp";
this.tp.RowCount = 9;
this.tp.RowStyles.Add(new System.Windows.Forms.RowStyle());
......@@ -123,7 +123,7 @@ namespace TheMachineNView
//
// button1
//
this.button1.Location = new System.Drawing.Point(903, 101);
this.button1.Location = new System.Drawing.Point(475, 636);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(102, 48);
this.button1.TabIndex = 7;
......@@ -136,16 +136,16 @@ namespace TheMachineNView
//
this.uC_LedConfig1.AutoScroll = true;
this.uC_LedConfig1.Config = null;
this.uC_LedConfig1.Location = new System.Drawing.Point(4, 263);
this.uC_LedConfig1.Location = new System.Drawing.Point(0, 203);
this.uC_LedConfig1.Name = "uC_LedConfig1";
this.uC_LedConfig1.Size = new System.Drawing.Size(859, 440);
this.uC_LedConfig1.Size = new System.Drawing.Size(694, 427);
this.uC_LedConfig1.TabIndex = 9;
this.uC_LedConfig1.Tag = "not";
//
// uC_SetUserPassword1
//
this.uC_SetUserPassword1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.uC_SetUserPassword1.Location = new System.Drawing.Point(481, 1);
this.uC_SetUserPassword1.Location = new System.Drawing.Point(5, 654);
this.uC_SetUserPassword1.Margin = new System.Windows.Forms.Padding(5);
this.uC_SetUserPassword1.Name = "uC_SetUserPassword1";
this.uC_SetUserPassword1.Size = new System.Drawing.Size(393, 237);
......@@ -161,7 +161,7 @@ namespace TheMachineNView
this.Controls.Add(this.button1);
this.Controls.Add(this.tp);
this.Name = "SettingControl";
this.Size = new System.Drawing.Size(1024, 740);
this.Size = new System.Drawing.Size(700, 908);
this.Load += new System.EventHandler(this.SettingControl_Load);
this.tp.ResumeLayout(false);
this.tp.PerformLayout();
......
TheMachineNView/TheMachineNView.csproj
......@@ -136,12 +136,6 @@
<Compile Include="SettingControl.Designer.cs">
<DependentUpon>SettingControl.cs</DependentUpon>
</Compile>
<Compile Include="UC\frmHSVdebug.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="UC\frmHSVdebug.Designer.cs">
<DependentUpon>frmHSVdebug.cs</DependentUpon>
</Compile>
<Compile Include="UC\FrmPassCheck.cs">
<SubType>Form</SubType>
</Compile>
......@@ -234,9 +228,6 @@
<EmbeddedResource Include="SettingControl.resx">
<DependentUpon>SettingControl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UC\frmHSVdebug.resx">
<DependentUpon>frmHSVdebug.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UC\FrmPassCheck.resx">
<DependentUpon>FrmPassCheck.cs</DependentUpon>
</EmbeddedResource>
......@@ -329,6 +320,7 @@
</PreBuildEvent>
</PropertyGroup>
<PropertyGroup>
<PostBuildEvent>start $(TargetDir)</PostBuildEvent>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
TheMachineNView/UC/ConfigControl.cs
......@@ -71,6 +71,10 @@ namespace TheMachineNView
tableLayoutPanel1.SuspendLayout();
int maxrow = tableLayoutPanel1.Height / 34;
if (tableLayoutPanel1.Width < 800)
{
maxrow = 999;
}
tableLayoutPanel1.Controls.Clear();
this.tableLayoutPanel1.RowStyles.Clear();
//this.tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType., 26));
......
TheMachineNView/UC/ConfigControl.designer.cs
......@@ -52,13 +52,14 @@ namespace TheMachineNView
this.tableLayoutPanel1.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.tableLayoutPanel1.AutoScroll = true;
this.tableLayoutPanel1.ColumnCount = 6;
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 30F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 30F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanel1.Location = new System.Drawing.Point(6, 14);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 1;
......@@ -80,12 +81,12 @@ namespace TheMachineNView
//
// ConfigControl
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.AutoScroll = true;
this.Controls.Add(this.btnSavePos);
this.Controls.Add(this.groupBox3);
this.Name = "ConfigControl";
this.Size = new System.Drawing.Size(1096, 504);
this.Size = new System.Drawing.Size(636, 504);
this.Load += new System.EventHandler(this.ConfigControl_Load);
this.groupBox3.ResumeLayout(false);
this.ResumeLayout(false);
......
TheMachineNView/UC/IOControl.Designer.cs
......@@ -54,12 +54,12 @@ namespace TheMachineNView
this.tableLayoutPanel1.AutoScroll = true;
this.tableLayoutPanel1.ColumnCount = 1;
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel1.Location = new System.Drawing.Point(6, 14);
this.tableLayoutPanel1.Location = new System.Drawing.Point(8, 14);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 2;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(244, 340);
this.tableLayoutPanel1.Size = new System.Drawing.Size(310, 365);
this.tableLayoutPanel1.TabIndex = 102;
this.tableLayoutPanel1.Tag = "not";
//
......@@ -71,12 +71,12 @@ namespace TheMachineNView
this.tableLayoutPanel2.AutoScroll = true;
this.tableLayoutPanel2.ColumnCount = 1;
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel2.Location = new System.Drawing.Point(5, 14);
this.tableLayoutPanel2.Location = new System.Drawing.Point(7, 14);
this.tableLayoutPanel2.Name = "tableLayoutPanel2";
this.tableLayoutPanel2.RowCount = 2;
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel2.Size = new System.Drawing.Size(244, 340);
this.tableLayoutPanel2.Size = new System.Drawing.Size(310, 365);
this.tableLayoutPanel2.TabIndex = 103;
this.tableLayoutPanel2.Tag = "not";
//
......@@ -85,9 +85,9 @@ namespace TheMachineNView
this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.groupBox4.Controls.Add(this.tableLayoutPanel2);
this.groupBox4.Location = new System.Drawing.Point(262, 3);
this.groupBox4.Location = new System.Drawing.Point(348, 313);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(255, 360);
this.groupBox4.Size = new System.Drawing.Size(327, 394);
this.groupBox4.TabIndex = 110;
this.groupBox4.TabStop = false;
this.groupBox4.Text = "DO列表";
......@@ -97,7 +97,7 @@ namespace TheMachineNView
this.btnOpenDo.BackColor = System.Drawing.Color.White;
this.btnOpenDo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOpenDo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenDo.Location = new System.Drawing.Point(20, 85);
this.btnOpenDo.Location = new System.Drawing.Point(163, 51);
this.btnOpenDo.Name = "btnOpenDo";
this.btnOpenDo.Size = new System.Drawing.Size(125, 34);
this.btnOpenDo.TabIndex = 282;
......@@ -110,7 +110,7 @@ namespace TheMachineNView
this.btnCloseDO.BackColor = System.Drawing.Color.White;
this.btnCloseDO.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseDO.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseDO.Location = new System.Drawing.Point(156, 85);
this.btnCloseDO.Location = new System.Drawing.Point(299, 51);
this.btnCloseDO.Name = "btnCloseDO";
this.btnCloseDO.Size = new System.Drawing.Size(125, 34);
this.btnCloseDO.TabIndex = 281;
......@@ -123,7 +123,7 @@ namespace TheMachineNView
this.label14.AutoSize = true;
this.label14.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label14.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label14.Location = new System.Drawing.Point(20, 57);
this.label14.Location = new System.Drawing.Point(316, 25);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(35, 17);
this.label14.TabIndex = 239;
......@@ -133,7 +133,7 @@ namespace TheMachineNView
// txtWriteTime
//
this.txtWriteTime.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtWriteTime.Location = new System.Drawing.Point(219, 54);
this.txtWriteTime.Location = new System.Drawing.Point(515, 22);
this.txtWriteTime.MaxLength = 10;
this.txtWriteTime.Name = "txtWriteTime";
this.txtWriteTime.Size = new System.Drawing.Size(72, 23);
......@@ -146,7 +146,7 @@ namespace TheMachineNView
this.label5.AutoSize = true;
this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label5.Location = new System.Drawing.Point(153, 57);
this.label5.Location = new System.Drawing.Point(449, 25);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(60, 17);
this.label5.TabIndex = 237;
......@@ -174,9 +174,9 @@ namespace TheMachineNView
this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.groupBox3.Controls.Add(this.tableLayoutPanel1);
this.groupBox3.Location = new System.Drawing.Point(3, 3);
this.groupBox3.Location = new System.Drawing.Point(12, 313);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(255, 360);
this.groupBox3.Size = new System.Drawing.Size(327, 394);
this.groupBox3.TabIndex = 109;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "DI列表";
......@@ -184,7 +184,7 @@ namespace TheMachineNView
// txtDOIndex
//
this.txtDOIndex.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtDOIndex.Location = new System.Drawing.Point(58, 54);
this.txtDOIndex.Location = new System.Drawing.Point(354, 22);
this.txtDOIndex.MaxLength = 10;
this.txtDOIndex.Name = "txtDOIndex";
this.txtDOIndex.Size = new System.Drawing.Size(70, 23);
......@@ -194,8 +194,8 @@ namespace TheMachineNView
//
// groupBox1
//
this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.groupBox1.Controls.Add(this.btnOpenDo);
this.groupBox1.Controls.Add(this.btnCloseDO);
this.groupBox1.Controls.Add(this.txtDOIndex);
......@@ -204,9 +204,9 @@ namespace TheMachineNView
this.groupBox1.Controls.Add(this.label5);
this.groupBox1.Controls.Add(this.cmbWriteIO);
this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox1.Location = new System.Drawing.Point(521, 3);
this.groupBox1.Location = new System.Drawing.Point(12, 12);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(361, 360);
this.groupBox1.Size = new System.Drawing.Size(663, 295);
this.groupBox1.TabIndex = 111;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "DO写入";
......@@ -214,11 +214,13 @@ namespace TheMachineNView
// IOControl
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.AutoScroll = true;
this.AutoSize = true;
this.Controls.Add(this.groupBox4);
this.Controls.Add(this.groupBox3);
this.Controls.Add(this.groupBox1);
this.Name = "IOControl";
this.Size = new System.Drawing.Size(911, 366);
this.Size = new System.Drawing.Size(700, 714);
this.Load += new System.EventHandler(this.IOControl_Load);
this.groupBox4.ResumeLayout(false);
this.groupBox3.ResumeLayout(false);
......
TheMachineNView/UC/StorePosControl.cs
......@@ -67,6 +67,10 @@ namespace TheMachineNView
tableLayoutPanel1.SuspendLayout();
int maxrow = tableLayoutPanel1.Height / 37;
if (tableLayoutPanel1.Width < 800)
{
maxrow = 999;
}
tableLayoutPanel1.Controls.Clear();
this.tableLayoutPanel1.RowStyles.Clear();
//this.tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType., 26));
......
TheMachineNView/UC/StorePosControl.designer.cs
......@@ -52,20 +52,23 @@ namespace TheMachineNView
//
// tableLayoutPanel1
//
this.tableLayoutPanel1.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.tableLayoutPanel1.AutoScroll = true;
this.tableLayoutPanel1.ColumnCount = 6;
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 30F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 30F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10F));
this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanel1.Location = new System.Drawing.Point(4, 18);
this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 1;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tableLayoutPanel1.Size = new System.Drawing.Size(582, 277);
this.tableLayoutPanel1.Size = new System.Drawing.Size(577, 277);
this.tableLayoutPanel1.TabIndex = 102;
this.tableLayoutPanel1.Tag = "not";
//
......
TheMachineNView/UC/UC_LedConfig.Designer.cs
......@@ -36,25 +36,28 @@ namespace TheMachineNView
//
// tableLayoutPanel1
//
this.tableLayoutPanel1.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.tableLayoutPanel1.AutoSize = true;
this.tableLayoutPanel1.CellBorderStyle = System.Windows.Forms.TableLayoutPanelCellBorderStyle.Single;
this.tableLayoutPanel1.ColumnCount = 4;
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 200F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 40F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F));
this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 3);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 2;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 33F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(537, 234);
this.tableLayoutPanel1.Size = new System.Drawing.Size(573, 312);
this.tableLayoutPanel1.TabIndex = 0;
//
// button_reset
//
this.button_reset.Location = new System.Drawing.Point(601, 3);
this.button_reset.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.button_reset.Location = new System.Drawing.Point(8, 321);
this.button_reset.Name = "button_reset";
this.button_reset.Size = new System.Drawing.Size(162, 34);
this.button_reset.TabIndex = 1;
......@@ -64,7 +67,8 @@ namespace TheMachineNView
//
// button_save
//
this.button_save.Location = new System.Drawing.Point(601, 72);
this.button_save.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.button_save.Location = new System.Drawing.Point(176, 321);
this.button_save.Name = "button_save";
this.button_save.Size = new System.Drawing.Size(162, 34);
this.button_save.TabIndex = 1;
......@@ -79,7 +83,7 @@ namespace TheMachineNView
this.Controls.Add(this.button_reset);
this.Controls.Add(this.tableLayoutPanel1);
this.Name = "UC_LedConfig";
this.Size = new System.Drawing.Size(859, 498);
this.Size = new System.Drawing.Size(585, 362);
this.ResumeLayout(false);
this.PerformLayout();
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!