MainDisplay3 추가

main
Seonjae 2024-03-27 10:53:00 +09:00
parent e37288262c
commit f521eb3b1d
25 changed files with 9925 additions and 1541 deletions

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 MiB

Binary file not shown.

View File

@ -2035,7 +2035,7 @@
this.labelMotor2Turn.RoundRectFillColor = System.Drawing.Color.LightBlue;
this.labelMotor2Turn.Size = new System.Drawing.Size(100, 30);
this.labelMotor2Turn.TabIndex = 114;
this.labelMotor2Turn.Text = "12345";
this.labelMotor2Turn.Text = "0";
this.labelMotor2Turn.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
this.labelMotor2Turn.TextColorDisable = System.Drawing.Color.Gray;
this.labelMotor2Turn.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
@ -2081,7 +2081,7 @@
this.labelMotor2Origin.RoundRectFillColor = System.Drawing.Color.LightBlue;
this.labelMotor2Origin.Size = new System.Drawing.Size(100, 30);
this.labelMotor2Origin.TabIndex = 112;
this.labelMotor2Origin.Text = "12345";
this.labelMotor2Origin.Text = "0";
this.labelMotor2Origin.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
this.labelMotor2Origin.TextColorDisable = System.Drawing.Color.Gray;
this.labelMotor2Origin.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
@ -2127,7 +2127,7 @@
this.labelMotor1Front2.RoundRectFillColor = System.Drawing.Color.LightBlue;
this.labelMotor1Front2.Size = new System.Drawing.Size(100, 30);
this.labelMotor1Front2.TabIndex = 110;
this.labelMotor1Front2.Text = "12345";
this.labelMotor1Front2.Text = "0";
this.labelMotor1Front2.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
this.labelMotor1Front2.TextColorDisable = System.Drawing.Color.Gray;
this.labelMotor1Front2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
@ -2173,7 +2173,7 @@
this.labelMotor1Front1.RoundRectFillColor = System.Drawing.Color.LightBlue;
this.labelMotor1Front1.Size = new System.Drawing.Size(100, 30);
this.labelMotor1Front1.TabIndex = 108;
this.labelMotor1Front1.Text = "12345";
this.labelMotor1Front1.Text = "0";
this.labelMotor1Front1.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
this.labelMotor1Front1.TextColorDisable = System.Drawing.Color.Gray;
this.labelMotor1Front1.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
@ -2219,7 +2219,7 @@
this.labelMotor1Origin.RoundRectFillColor = System.Drawing.Color.LightBlue;
this.labelMotor1Origin.Size = new System.Drawing.Size(100, 30);
this.labelMotor1Origin.TabIndex = 106;
this.labelMotor1Origin.Text = "12345";
this.labelMotor1Origin.Text = "0";
this.labelMotor1Origin.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
this.labelMotor1Origin.TextColorDisable = System.Drawing.Color.Gray;
this.labelMotor1Origin.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;

View File

@ -439,6 +439,8 @@ namespace INT_PT002.Controls
before = myKeyPad.StringValue;
this.ParentForm.ParentForm.SetTrackingHistoryData(Define.E_TrackingParameter.M1_Origin, "", before, after);
this.ParentForm.ParentForm.ServoMotorWrite1(1, ServoMotorAddress.SaveAllParameters, ServoMotorAddress.EEPROM);
}
}
}
@ -463,6 +465,8 @@ namespace INT_PT002.Controls
after = myKeyPad.StringValue;
this.ParentForm.ParentForm.SetTrackingHistoryData(Define.E_TrackingParameter.M1_Front1, "", before, after);
this.ParentForm.ParentForm.ServoMotorWrite1(1, ServoMotorAddress.SaveAllParameters, ServoMotorAddress.EEPROM);
}
}
}
@ -487,6 +491,8 @@ namespace INT_PT002.Controls
after = myKeyPad.StringValue;
this.ParentForm.ParentForm.SetTrackingHistoryData(Define.E_TrackingParameter.M1_Front2, "", before, after);
this.ParentForm.ParentForm.ServoMotorWrite1(1, ServoMotorAddress.SaveAllParameters, ServoMotorAddress.EEPROM);
}
}
}
@ -527,6 +533,8 @@ namespace INT_PT002.Controls
after = myKeyPad.StringValue;
this.ParentForm.ParentForm.SetTrackingHistoryData(Define.E_TrackingParameter.M2_Origin, "", before, after);
this.ParentForm.ParentForm.ServoMotorWrite1(2, ServoMotorAddress.SaveAllParameters, ServoMotorAddress.EEPROM);
}
}
}
@ -547,10 +555,12 @@ namespace INT_PT002.Controls
}
else
{
this.ParentForm.ParentForm.ServoMotorWrite2(1, ServoMotorAddress.CMD25, myKeyPad.IntValue, this.labelMotor2Turn);
this.ParentForm.ParentForm.ServoMotorWrite2(2, ServoMotorAddress.CMD25, myKeyPad.IntValue, this.labelMotor2Turn);
after = myKeyPad.StringValue;
this.ParentForm.ParentForm.SetTrackingHistoryData(Define.E_TrackingParameter.M2_Turn, "", before, after);
this.ParentForm.ParentForm.ServoMotorWrite1(2, ServoMotorAddress.SaveAllParameters, ServoMotorAddress.EEPROM);
}
}
}

View File

@ -0,0 +1,67 @@
namespace INT_PT002.Controls
{
partial class ControlMenuSystemStatus1
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Component Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.smartGroupBox1 = new SmartX.SmartGroupBox();
this.SuspendLayout();
//
// smartGroupBox1
//
this.smartGroupBox1.BackGround = null;
this.smartGroupBox1.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(51)))), ((int)(((byte)(65)))));
this.smartGroupBox1.BackImage = null;
this.smartGroupBox1.FrameLineColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(51)))), ((int)(((byte)(65)))));
this.smartGroupBox1.FrameLineColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165)))));
this.smartGroupBox1.FrameLineThickness = 2;
this.smartGroupBox1.FrameStyle = SmartX.SmartGroupBox.FRAMESTYLES.HeaderBar;
this.smartGroupBox1.HeaderHeightOffset = 9;
this.smartGroupBox1.Location = new System.Drawing.Point(0, 0);
this.smartGroupBox1.Name = "smartGroupBox1";
this.smartGroupBox1.RoundRadius = 5;
this.smartGroupBox1.Size = new System.Drawing.Size(909, 664);
this.smartGroupBox1.TabIndex = 0;
this.smartGroupBox1.Text = "smartGroupBox1";
this.smartGroupBox1.TextColor = System.Drawing.Color.White;
//
// ControlMenuSystemStatus1
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.Controls.Add(this.smartGroupBox1);
this.Name = "ControlMenuSystemStatus1";
this.Size = new System.Drawing.Size(909, 664);
this.ResumeLayout(false);
}
#endregion
private SmartX.SmartGroupBox smartGroupBox1;
}
}

View File

@ -0,0 +1,19 @@
using System;
using System.Linq;
using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Data;
using System.Text;
using System.Windows.Forms;
namespace INT_PT002.Controls
{
public partial class ControlMenuSystemStatus1 : UserControl
{
public ControlMenuSystemStatus1()
{
InitializeComponent();
}
}
}

View File

@ -0,0 +1,123 @@
<?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=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="$this.FormFactorShadowProperty" xml:space="preserve">
<value>WEBPAD</value>
</metadata>
</root>

View File

@ -890,7 +890,7 @@
this.labelCommunicationStatus.BorderColor = System.Drawing.Color.Lime;
this.labelCommunicationStatus.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect;
this.labelCommunicationStatus.LineSpacing = 0F;
this.labelCommunicationStatus.Location = new System.Drawing.Point(904, 87);
this.labelCommunicationStatus.Location = new System.Drawing.Point(904, 13);
this.labelCommunicationStatus.Name = "labelCommunicationStatus";
this.labelCommunicationStatus.OverlapOptimize = true;
this.labelCommunicationStatus.PasswordChar = '\0';
@ -2267,7 +2267,7 @@
this.buttonUser.ImageDisable = null;
this.buttonUser.ImageDown = null;
this.buttonUser.ImageUp = null;
this.buttonUser.Location = new System.Drawing.Point(917, 356);
this.buttonUser.Location = new System.Drawing.Point(917, 286);
this.buttonUser.Mode = SmartX.SmartButton.BUTTONMODE.RADIO;
this.buttonUser.Name = "buttonUser";
this.buttonUser.NestedClickEventPrevent = false;
@ -2296,7 +2296,7 @@
this.labelStop.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect;
this.labelStop.Font = new System.Drawing.Font("Arial", 20F, System.Drawing.FontStyle.Bold);
this.labelStop.LineSpacing = 0F;
this.labelStop.Location = new System.Drawing.Point(917, 86);
this.labelStop.Location = new System.Drawing.Point(917, 12);
this.labelStop.Name = "labelStop";
this.labelStop.OverlapOptimize = true;
this.labelStop.PasswordChar = '\0';
@ -2320,7 +2320,7 @@
this.labelStart.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect;
this.labelStart.Font = new System.Drawing.Font("Arial", 20F, System.Drawing.FontStyle.Bold);
this.labelStart.LineSpacing = 0F;
this.labelStart.Location = new System.Drawing.Point(917, 86);
this.labelStart.Location = new System.Drawing.Point(917, 12);
this.labelStart.Name = "labelStart";
this.labelStart.OverlapOptimize = true;
this.labelStart.PasswordChar = '\0';
@ -2388,7 +2388,7 @@
this.buttonInspection.ImageDisable = null;
this.buttonInspection.ImageDown = null;
this.buttonInspection.ImageUp = null;
this.buttonInspection.Location = new System.Drawing.Point(917, 158);
this.buttonInspection.Location = new System.Drawing.Point(917, 88);
this.buttonInspection.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
this.buttonInspection.Name = "buttonInspection";
this.buttonInspection.NestedClickEventPrevent = false;
@ -2424,7 +2424,7 @@
this.buttonClear.ImageDisable = null;
this.buttonClear.ImageDown = null;
this.buttonClear.ImageUp = null;
this.buttonClear.Location = new System.Drawing.Point(917, 224);
this.buttonClear.Location = new System.Drawing.Point(917, 154);
this.buttonClear.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
this.buttonClear.Name = "buttonClear";
this.buttonClear.NestedClickEventPrevent = false;
@ -2496,7 +2496,7 @@
this.buttonDisplay.ImageDisable = null;
this.buttonDisplay.ImageDown = null;
this.buttonDisplay.ImageUp = null;
this.buttonDisplay.Location = new System.Drawing.Point(917, 290);
this.buttonDisplay.Location = new System.Drawing.Point(917, 220);
this.buttonDisplay.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
this.buttonDisplay.Name = "buttonDisplay";
this.buttonDisplay.NestedClickEventPrevent = false;

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -135,6 +135,7 @@
this.smartButton4.TextDownColor = System.Drawing.Color.Chartreuse;
this.smartButton4.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
this.smartButton4.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
this.smartButton4.Visible = false;
this.smartButton4.Click += new System.EventHandler(this.smartButton4_Click);
//
// smartButton3
@ -171,6 +172,7 @@
this.smartButton3.TextDownColor = System.Drawing.Color.Chartreuse;
this.smartButton3.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
this.smartButton3.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
this.smartButton3.Visible = false;
this.smartButton3.Click += new System.EventHandler(this.smartButton3_Click);
//
// smartButton2
@ -207,6 +209,7 @@
this.smartButton2.TextDownColor = System.Drawing.Color.Chartreuse;
this.smartButton2.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
this.smartButton2.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
this.smartButton2.Visible = false;
this.smartButton2.Click += new System.EventHandler(this.smartButton1_Click);
//
// smartButton1
@ -243,6 +246,7 @@
this.smartButton1.TextDownColor = System.Drawing.Color.Chartreuse;
this.smartButton1.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
this.smartButton1.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
this.smartButton1.Visible = false;
this.smartButton1.Click += new System.EventHandler(this.smartButton2_Click);
//
// smartGroupBox3