Skip to content

刘韬 / SO1057_XLC_Store

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

添加三色塔设置

1 个父辈 c920ab50
内嵌 并排
正在显示 6 个修改的文件 包含 471 行增加 和 11 行删除
TheMachine/SettingControl.Designer.cs
......@@ -43,8 +43,15 @@ namespace TheMachine
this.lbl_hmdstate = new System.Windows.Forms.Label();
this.lblWeight = new System.Windows.Forms.Label();
this.button2 = new System.Windows.Forms.Button();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.tabPage2 = new System.Windows.Forms.TabPage();
this.uC_LedConfig1 = new TheMachine.UC.UC_LedConfig();
this.groupBox1.SuspendLayout();
this.tp.SuspendLayout();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
this.tabPage2.SuspendLayout();
this.SuspendLayout();
//
// cb_leftmode
......@@ -91,7 +98,7 @@ namespace TheMachine
this.groupBox1.Controls.Add(this.cb_leftmode);
this.groupBox1.Controls.Add(this.label1);
this.groupBox1.Controls.Add(this.cb_rightmode);
this.groupBox1.Location = new System.Drawing.Point(3, 72);
this.groupBox1.Location = new System.Drawing.Point(20, 92);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(363, 204);
this.groupBox1.TabIndex = 4;
......@@ -125,7 +132,7 @@ namespace TheMachine
this.tp.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.tp.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.tp.Controls.Add(this.chbAutoRun, 0, 7);
this.tp.Location = new System.Drawing.Point(3, 3);
this.tp.Location = new System.Drawing.Point(20, 24);
this.tp.Name = "tp";
this.tp.RowCount = 9;
this.tp.RowStyles.Add(new System.Windows.Forms.RowStyle());
......@@ -160,7 +167,7 @@ namespace TheMachine
//
// lbl_hmdstate
//
this.lbl_hmdstate.Location = new System.Drawing.Point(10, 299);
this.lbl_hmdstate.Location = new System.Drawing.Point(26, 347);
this.lbl_hmdstate.Name = "lbl_hmdstate";
this.lbl_hmdstate.Size = new System.Drawing.Size(405, 145);
this.lbl_hmdstate.TabIndex = 8;
......@@ -168,7 +175,7 @@ namespace TheMachine
//
// lblWeight
//
this.lblWeight.Location = new System.Drawing.Point(428, 72);
this.lblWeight.Location = new System.Drawing.Point(485, 46);
this.lblWeight.Name = "lblWeight";
this.lblWeight.Size = new System.Drawing.Size(405, 145);
this.lblWeight.TabIndex = 9;
......@@ -176,7 +183,7 @@ namespace TheMachine
//
// button2
//
this.button2.Location = new System.Drawing.Point(499, 231);
this.button2.Location = new System.Drawing.Point(544, 251);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(204, 45);
this.button2.TabIndex = 10;
......@@ -184,14 +191,57 @@ namespace TheMachine
this.button2.UseVisualStyleBackColor = true;
this.button2.Click += new System.EventHandler(this.button2_Click);
//
// tabControl1
//
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Controls.Add(this.tabPage2);
this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabControl1.Location = new System.Drawing.Point(0, 0);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(1024, 740);
this.tabControl1.TabIndex = 11;
//
// tabPage1
//
this.tabPage1.Controls.Add(this.button2);
this.tabPage1.Controls.Add(this.groupBox1);
this.tabPage1.Controls.Add(this.tp);
this.tabPage1.Controls.Add(this.lbl_hmdstate);
this.tabPage1.Controls.Add(this.lblWeight);
this.tabPage1.Location = new System.Drawing.Point(4, 30);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(1016, 706);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "常规设置";
this.tabPage1.UseVisualStyleBackColor = true;
//
// tabPage2
//
this.tabPage2.Controls.Add(this.uC_LedConfig1);
this.tabPage2.Location = new System.Drawing.Point(4, 30);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
this.tabPage2.Size = new System.Drawing.Size(1016, 706);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "灯塔设置";
this.tabPage2.UseVisualStyleBackColor = true;
//
// uC_LedConfig1
//
this.uC_LedConfig1.Config = null;
this.uC_LedConfig1.Dock = System.Windows.Forms.DockStyle.Fill;
this.uC_LedConfig1.Location = new System.Drawing.Point(3, 3);
this.uC_LedConfig1.Name = "uC_LedConfig1";
this.uC_LedConfig1.Size = new System.Drawing.Size(1010, 700);
this.uC_LedConfig1.TabIndex = 0;
this.uC_LedConfig1.Tag = "not";
//
// SettingControl
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.Controls.Add(this.button2);
this.Controls.Add(this.lblWeight);
this.Controls.Add(this.lbl_hmdstate);
this.Controls.Add(this.tp);
this.Controls.Add(this.groupBox1);
this.Controls.Add(this.tabControl1);
this.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Name = "SettingControl";
this.Size = new System.Drawing.Size(1024, 740);
......@@ -200,8 +250,11 @@ namespace TheMachine
this.groupBox1.PerformLayout();
this.tp.ResumeLayout(false);
this.tp.PerformLayout();
this.tabControl1.ResumeLayout(false);
this.tabPage1.ResumeLayout(false);
this.tabPage1.PerformLayout();
this.tabPage2.ResumeLayout(false);
this.ResumeLayout(false);
this.PerformLayout();
}
......@@ -219,5 +272,9 @@ namespace TheMachine
private System.Windows.Forms.Label lbl_hmdstate;
private System.Windows.Forms.Label lblWeight;
private System.Windows.Forms.Button button2;
private System.Windows.Forms.TabControl tabControl1;
private System.Windows.Forms.TabPage tabPage1;
private System.Windows.Forms.TabPage tabPage2;
private UC.UC_LedConfig uC_LedConfig1;
}
}
TheMachine/SettingControl.cs
......@@ -35,6 +35,7 @@ namespace TheMachine
{
if (!state)
return;
uC_LedConfig1.Config = RobotManage.Config;
}
......
TheMachine/TheMachine.csproj
......@@ -147,6 +147,12 @@
<Compile Include="UC\uc_boxdebug.Designer.cs">
<DependentUpon>uc_boxdebug.cs</DependentUpon>
</Compile>
<Compile Include="UC\UC_LedConfig.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="UC\UC_LedConfig.Designer.cs">
<DependentUpon>UC_LedConfig.cs</DependentUpon>
</Compile>
<EmbeddedResource Include="AboutBox1.resx">
<DependentUpon>AboutBox1.cs</DependentUpon>
</EmbeddedResource>
......@@ -194,6 +200,9 @@
<EmbeddedResource Include="UC\uc_boxdebug.resx">
<DependentUpon>uc_boxdebug.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UC\UC_LedConfig.resx">
<DependentUpon>UC_LedConfig.cs</DependentUpon>
</EmbeddedResource>
<None Include="app.manifest" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
......
TheMachine/UC/UC_LedConfig.Designer.cs 0 → 100644

namespace TheMachine.UC
{
partial class UC_LedConfig
{
/// <summary>
/// 必需的设计器变量。
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// 清理所有正在使用的资源。
/// </summary>
/// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region 组件设计器生成的代码
/// <summary>
/// 设计器支持所需的方法 - 不要修改
/// 使用代码编辑器修改此方法的内容。
/// </summary>
private void InitializeComponent()
{
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.button_reset = new System.Windows.Forms.Button();
this.button_save = new System.Windows.Forms.Button();
this.SuspendLayout();
//
// tableLayoutPanel1
//
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.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.TabIndex = 0;
//
// button_reset
//
this.button_reset.Location = new System.Drawing.Point(610, 3);
this.button_reset.Name = "button_reset";
this.button_reset.Size = new System.Drawing.Size(126, 34);
this.button_reset.TabIndex = 1;
this.button_reset.Text = "重置为默认值";
this.button_reset.UseVisualStyleBackColor = true;
this.button_reset.Click += new System.EventHandler(this.button_reset_Click);
//
// button_save
//
this.button_save.Location = new System.Drawing.Point(610, 72);
this.button_save.Name = "button_save";
this.button_save.Size = new System.Drawing.Size(126, 34);
this.button_save.TabIndex = 1;
this.button_save.Text = "保存设定";
this.button_save.UseVisualStyleBackColor = true;
this.button_save.Click += new System.EventHandler(this.button_save_Click);
//
// UC_LedConfig
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.Controls.Add(this.button_save);
this.Controls.Add(this.button_reset);
this.Controls.Add(this.tableLayoutPanel1);
this.Name = "UC_LedConfig";
this.Size = new System.Drawing.Size(859, 498);
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
private System.Windows.Forms.Button button_reset;
private System.Windows.Forms.Button button_save;
}
}
TheMachine/UC/UC_LedConfig.cs 0 → 100644
using DeviceLibrary;
using OnlineStore.LoadCSVLibrary;
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 TheMachine.UC
{
using crc = OnlineStore.CodeResourceControl;
public partial class UC_LedConfig : UserControl
{
public UC_LedConfig()
{
InitializeComponent();
this.Tag = "not";
crc.LanguageChangeEvent += Crc_LanguageChangeEvent;
}
private void Crc_LanguageChangeEvent(object sender, EventArgs e)
{
if (Config == null)
return;
LoadLedList();
}
private DeviceConfig _Config;
public DeviceConfig Config
{
get { return _Config; }
set
{
if (value == null)
return;
_Config = value;
LoadLedList();
}
}
void LoadLedList()
{
//if (!this.Created)
// return;
if (this.InvokeRequired)
{
this.Invoke((EventHandler)delegate
{
try
{
LoadLedList();
}
catch (Exception ee)
{
MessageBox.Show("LoadLedList:" + ee.ToString());
}
});
return;
}
tableLayoutPanel1.SuspendLayout();
tableLayoutPanel1.Controls.Clear();
this.tableLayoutPanel1.RowStyles.Clear();
var statenames = Enum.GetNames(typeof(MachineLedStateE));
Label label_s = new Label()
{
Size = new Size(200, 34),
Text = "状态,优先级从大到小",
TextAlign = ContentAlignment.MiddleLeft
};
tableLayoutPanel1.Controls.Add(label_s, 0, 0);
Label label_g = new Label()
{
Size = new Size(120, 34),
Text = "绿灯",
TextAlign = ContentAlignment.MiddleCenter
};
tableLayoutPanel1.Controls.Add(label_g, 1, 0);
Label label_y = new Label()
{
Size = new Size(120, 34),
Text = "黄灯",
TextAlign = ContentAlignment.MiddleCenter
};
tableLayoutPanel1.Controls.Add(label_y, 2, 0);
Label label_r = new Label()
{
Size = new Size(120, 34),
Text = "红灯",
TextAlign = ContentAlignment.MiddleCenter
};
tableLayoutPanel1.Controls.Add(label_r, 3, 0);
int r = 1;
var ledkeys = RobotManage.mainMachine.MachineLedStateName.Keys;
foreach (var key in ledkeys)
{
//if (r == 3)
// return;
Label button = new Label();
button.Anchor = (AnchorStyles)(AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Top | AnchorStyles.Bottom);
button.Name = key.ToString();
button.Text = crc.GetString("ledstate_"+ key, RobotManage.mainMachine.MachineLedStateName[key]);
button.AutoSize = false;
button.Size = new System.Drawing.Size(200, 34);
button.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
tableLayoutPanel1.Controls.Add(button, 0, r);
int c = 1;
foreach (var led in Led.LedColors.Keys)
{
List<lightitem> lightitems = new List<lightitem>();
lightitems.Add(new lightitem("无动作", LedState.none));
lightitems.Add(new lightitem("关", LedState.off));
lightitems.Add(new lightitem("开", LedState.on));
lightitems.Add(new lightitem("闪烁", LedState.blink));
var selit = lightitems.FindIndex(x => x.value == RobotManage.mainMachine.MachineLedState[key][led]);
ComboBox comboBox = new ComboBox();
comboBox.DropDownStyle = ComboBoxStyle.DropDownList;
comboBox.FormattingEnabled = true;
//comboBox.Items.AddRange(new object[] { "none", "on", "off", "blink" });
comboBox.Items.AddRange(lightitems.ToArray());
comboBox.Name = key.ToString();
comboBox.Tag = led;
//comboBox.SelectedItem = selit;
comboBox.SelectedIndex= selit;
tableLayoutPanel1.Controls.Add(comboBox, c, r);
c++;
}
r++;
}
tableLayoutPanel1.ResumeLayout(true);
}
class lightitem {
public string Text;
public LedState value;
public lightitem(string t, LedState v) {
Text = t;
value = v;
}
public override string ToString()
{
return Text;
}
}
private void button_reset_Click(object sender, EventArgs e)
{
RobotManage.mainMachine.DefaultLedCfg();
LoadLedList();
}
private void button_save_Click(object sender, EventArgs e)
{
for (int i = 0; i < tableLayoutPanel1.Controls.Count; i++) {
var cc = tableLayoutPanel1.Controls[i];
if (!(cc is ComboBox))
continue;
Enum.TryParse<MachineLedStateE>(cc.Name, out MachineLedStateE key);
LedColor led = (LedColor)cc.Tag;
RobotManage.mainMachine.MachineLedState[key][led] = ((lightitem)(cc as ComboBox).SelectedItem).value;
}
if (RobotManage.mainMachine.SaveLedCfg())
MessageBox.Show("保存成功!");
else
MessageBox.Show("保存失败!");
}
}
}
TheMachine/UC/UC_LedConfig.resx 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
\ No newline at end of file
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!