This commit is contained in:
chi
2025-04-24 11:51:55 +09:00
parent 0a93a54a6f
commit f71b963851
62 changed files with 1748 additions and 4105 deletions

View File

@@ -9,6 +9,7 @@ using System.Text;
using System.Windows.Forms;
using COMM;
using System.Diagnostics;
using AR;
namespace Project
{
@@ -42,7 +43,7 @@ namespace Project
#endregion
public arDev.BMS dev_bms { private get; set; } = null;
public arDev.FakePLC dev_plc { private get; set; } = null;
// public arDev.FakePLC dev_plc { private get; set; } = null;
public arDev.Narumi dev_agv { private get; set; } = null;
public Device.Xbee dev_xbe { private get; set; } = null;
@@ -124,7 +125,6 @@ namespace Project
this.Invalidate();
}
}
public Color BorderColor { get; set; }
private int _itemgap = 0;
public int ItemGap { get { return _itemgap; } set { _itemgap = value; Invalidate(); } }
@@ -138,8 +138,8 @@ namespace Project
{
get
{
if (COMM.VAR.BOOL == null) return true;
else return COMM.VAR.BOOL[eVarBool.FLAG_AUTORUN];
if (VAR.BOOL == null) return true;
else return VAR.BOOL[eVarBool.FLAG_AUTORUN];
}
}
@@ -488,7 +488,7 @@ namespace Project
//상태메세지표시
string stmsg = string.Empty;
if (COMM.VAR.STR != null && COMM.VAR.STR[eVarString.StatusMessage].isEmpty() == false) stmsg = VAR.STR[eVarString.StatusMessage];
if (VAR.STR != null && VAR.STR[eVarString.StatusMessage].isEmpty() == false) stmsg = VAR.STR[eVarString.StatusMessage];
else stmsg = "STATUS MESSAGE DEMO";
if (nextstop) stmsg += "|MARK-STOP";
@@ -665,39 +665,39 @@ namespace Project
}
public bool LimitLU
{
get
{
if (dev_plc == null) return true;
return dev_plc.GetValueI(arDev.FakePLC.DIName.PINI_LIMIT_LU);
}
//public bool LimitLU
//{
// get
// {
// if (dev_plc == null) return true;
// return dev_plc.GetValueI(arDev.FakePLC.DIName.PINI_LIMIT_LU);
// }
}
public bool LimitLD
{
get
{
if (dev_plc == null) return false;
return dev_plc.GetValueI(arDev.FakePLC.DIName.PINI_LIMIT_LD);
}
}
public bool LimitRU
{
get
{
if (dev_plc == null) return false;
return dev_plc.GetValueI(arDev.FakePLC.DIName.PINI_LIMIT_RU);
}
}
public bool LimitRD
{
get
{
if (dev_plc == null) return true;
return dev_plc.GetValueI(arDev.FakePLC.DIName.PINI_LIMIT_RD);
}
}
//}
//public bool LimitLD
//{
// get
// {
// if (dev_plc == null) return false;
// return dev_plc.GetValueI(arDev.FakePLC.DIName.PINI_LIMIT_LD);
// }
//}
//public bool LimitRU
//{
// get
// {
// if (dev_plc == null) return false;
// return dev_plc.GetValueI(arDev.FakePLC.DIName.PINI_LIMIT_RU);
// }
//}
//public bool LimitRD
//{
// get
// {
// if (dev_plc == null) return true;
// return dev_plc.GetValueI(arDev.FakePLC.DIName.PINI_LIMIT_RD);
// }
//}
void DrawMC(Graphics g)
{
@@ -794,11 +794,11 @@ namespace Project
var coverLYOffset = 0;
var coverRYOffset = 0;
if (LimitRD == true) coverRYOffset = 20;
else if (LimitRU == true) coverRYOffset = coverYOffset;
//if (LimitRD == true) coverRYOffset = 20;
//else if (LimitRU == true) coverRYOffset = coverYOffset;
if (LimitLD == true) coverLYOffset = 20;
else if (LimitLU == true) coverLYOffset = coverYOffset;
//if (LimitLD == true) coverLYOffset = 20;
//else if (LimitLU == true) coverLYOffset = coverYOffset;
var PtsCoverBack = new PointF[] {
new PointF( PtsBack[0].X+coverPadding, PtsBack[0].Y+coverLYOffset ),
@@ -814,17 +814,17 @@ namespace Project
new PointF( PtsFront[3].X+coverPadding, PtsFront[3].Y+coverRYOffset )
};
if (LimitLU == true)
{
g.FillPolygon(new SolidBrush(Color.FromArgb(100, Color.Red)), PtsCoverBack);
g.DrawPolygon(new Pen(Color.DarkRed, 2), PtsCoverBack);
}
else if (LimitLD == true)
{
g.FillPolygon(new SolidBrush(Color.FromArgb(100, Color.Blue)), PtsCoverBack);
g.DrawPolygon(new Pen(Color.DarkBlue, 2), PtsCoverBack);
}
else
//if (LimitLU == true)
//{
// g.FillPolygon(new SolidBrush(Color.FromArgb(100, Color.Red)), PtsCoverBack);
// g.DrawPolygon(new Pen(Color.DarkRed, 2), PtsCoverBack);
//}
//else if (LimitLD == true)
//{
// g.FillPolygon(new SolidBrush(Color.FromArgb(100, Color.Blue)), PtsCoverBack);
// g.DrawPolygon(new Pen(Color.DarkBlue, 2), PtsCoverBack);
//}
//else
{
g.FillPolygon(new SolidBrush(Color.FromArgb(100, Color.Gray)), PtsCoverBack);
g.DrawPolygon(Pens.DimGray, PtsCoverBack);
@@ -835,17 +835,17 @@ namespace Project
g.FillPolygon(new SolidBrush(Color.FromArgb(50, Color.White)), PtsFront);
// g.DrawPolygon(Pens.Black, PtsFront);
if (LimitRU == true)
{
g.FillPolygon(new SolidBrush(Color.FromArgb(150, Color.Red)), PtsCoverFront);
g.DrawPolygon(new Pen(Color.DarkRed, 2), PtsCoverFront);
}
else if (LimitRD == true)
{
g.FillPolygon(new SolidBrush(Color.FromArgb(150, Color.Blue)), PtsCoverFront);
g.DrawPolygon(new Pen(Color.DarkBlue, 2), PtsCoverFront);
}
else
//if (LimitRU == true)
//{
// g.FillPolygon(new SolidBrush(Color.FromArgb(150, Color.Red)), PtsCoverFront);
// g.DrawPolygon(new Pen(Color.DarkRed, 2), PtsCoverFront);
//}
//else if (LimitRD == true)
//{
// g.FillPolygon(new SolidBrush(Color.FromArgb(150, Color.Blue)), PtsCoverFront);
// g.DrawPolygon(new Pen(Color.DarkBlue, 2), PtsCoverFront);
//}
//else
{
g.FillPolygon(new SolidBrush(Color.FromArgb(150, Color.Gray)), PtsCoverFront);
g.DrawPolygon(Pens.DimGray, PtsCoverFront);