This commit is contained in:
ChiKyun Kim
2025-09-23 15:41:16 +09:00
parent 02028afc27
commit b037dd53e6
74 changed files with 4269 additions and 7917 deletions

View File

@@ -226,29 +226,11 @@ namespace AR
#region "function"
[Editor(typeof(MyUITypeEditor), typeof(UITypeEditor))]
public Boolean Force_JobEndBuzzer { get; set; }
//[Browsable(false)]
//public Boolean Enable_ConveryorMode { get; set; }
[Browsable(false)]
public Boolean Disable_safty_F0 { get; set; }
[Browsable(false)]
public Boolean Disable_safty_F1 { get; set; }
[Browsable(false)]
public Boolean Disable_safty_F2 { get; set; }
[Browsable(false)]
public Boolean Disable_safty_R0 { get; set; }
[Browsable(false)]
public Boolean Disable_safty_R1 { get; set; }
[Browsable(false)]
public Boolean Disable_safty_R2 { get; set; }
[Browsable(false)]
public Boolean Disable_Buzzer { get; set; }
[Browsable(false)]
public Boolean Enable_Magnet0 { get; set; }

View File

@@ -47,6 +47,25 @@ namespace AR
#endregion
[Category("Door Safty"),DisplayName("Disable Front - Left")]
public Boolean Disable_safty_F0 { get; set; }
[Category("Door Safty"), DisplayName("Disable Front - Center")]
public Boolean Disable_safty_F1 { get; set; }
[Category("Door Safty"), DisplayName("Disable Front - Right")]
public Boolean Disable_safty_F2 { get; set; }
[Category("Door Safty"), DisplayName("Disable Rear - Left")]
public Boolean Disable_safty_R0 { get; set; }
[Category("Door Safty"), DisplayName("Disable Rear - Center")]
public Boolean Disable_safty_R1 { get; set; }
[Category("Door Safty"), DisplayName("Disable Rear - Right")]
public Boolean Disable_safty_R2 { get; set; }
public SystemSetting()
{
this.filename = UTIL.CurrentPath + "system.xml";

View File

@@ -67,8 +67,6 @@ namespace UIControl
public int ConveyorRunPoint = 1; //컨베어 모터 이동시 이동 화살표의 위치값(내부 타이머에의해 증가함)
public double arMcLengthW = 1460;
public double arMcLengthH = 1350;//
public Boolean arJoystickOn = false;
public int arJoystickGroup = 0;
public bool CVLeftBusy = false;
public bool CVLeftReady = false;
public bool CVRightBusy = false;
@@ -867,30 +865,6 @@ namespace UIControl
if (this.Scean == eScean.Nomal) Scean_Normal(e.Graphics);
else if (this.Scean == eScean.MotHome) Scean_MotHome(e.Graphics);
else if (this.Scean == eScean.xmove) Scean_XMove(e.Graphics);
//조이스틱표시
if (arJoystickOn)
{
var joyname = string.Empty;
if (arJoystickGroup == 0) joyname = "PICKER X/Z";
else if (arJoystickGroup == 1) joyname = "LEFT Y/Z";
else if (arJoystickGroup == 2) joyname = "RIGHT Y/Z";
else if (arJoystickGroup == 3) joyname = "THETA";
else joyname = arJoystickGroup.ToString();
var joystr = "JOYSTICK(" + joyname + ")";
var joyfsize = e.Graphics.MeasureString(joystr, this.Font);
var joyrect = new Rectangle(0, 0, (int)(joyfsize.Width * 1.1), (int)(joyfsize.Height * 1.1));
e.Graphics.FillRectangle(Brushes.Black, joyrect);
e.Graphics.DrawString(joystr, this.Font,
Brushes.Gold,
joyrect,
new StringFormat { Alignment = StringAlignment.Center, LineAlignment = StringAlignment.Center });
e.Graphics.DrawRect(joyrect, Color.Black, 3);
}
}
/// <summary>