This commit is contained in:
chi
2025-05-23 11:01:22 +09:00
parent 34130e9c86
commit 80cf98901b
10 changed files with 1921 additions and 1982 deletions

View File

@@ -1066,17 +1066,18 @@ namespace AGVMapControl
e.Graphics.TranslateTransform(offset.X, offset.Y);
e.Graphics.ScaleTransform(zoom, zoom);
DrawMap(e.Graphics);
DrawCustomLines(e.Graphics);
DrawMapTexts(e.Graphics);
DrawRFIDLines(e.Graphics);
DrawMap(e.Graphics);
//DrawCustomLines(e.Graphics);
DrawMapTexts(e.Graphics);
DrawPath(e.Graphics);
DrawAGV(e.Graphics);
// 선택된 개체 강조 표시
if (selectedRFID != null)
{
using (Pen pen = new Pen(Color.Blue, 2))
using (Pen pen = new Pen(Color.Magenta, 2))
{
pen.DashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
e.Graphics.DrawEllipse(pen,
@@ -1088,7 +1089,7 @@ namespace AGVMapControl
if (selectedMagnetLine != null)
{
using (Pen pen = new Pen(Color.Blue, 2))
using (Pen pen = new Pen(Color.Magenta, 2))
{
pen.DashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
e.Graphics.DrawLine(pen, selectedMagnetLine.StartPoint, selectedMagnetLine.EndPoint);
@@ -1101,7 +1102,7 @@ namespace AGVMapControl
if (selectedLine != null)
{
using (Pen pen = new Pen(Color.Blue, 2))
using (Pen pen = new Pen(Color.Magenta, 2))
{
pen.DashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
e.Graphics.DrawLine(pen, selectedLine.StartPoint, selectedLine.EndPoint);
@@ -1124,8 +1125,6 @@ namespace AGVMapControl
// 툴바 버튼 그리기
foreach (var item in this.toolbarRects)
DrawToolbarButton(e.Graphics, item.Bounds, item.Title, item.isHovering);
}
@@ -1148,13 +1147,22 @@ namespace AGVMapControl
// }
//}
// RFID 포인트 그리기
foreach (var rfid in rfidPoints)
{
var MarkerSize = 5;
g.FillEllipse(Brushes.Green, rfid.Location.X - (MarkerSize/2f), rfid.Location.Y -(MarkerSize/2f), MarkerSize, MarkerSize);
//g.DrawString(rfid.RFIDValue, Font, Brushes.WhiteSmoke, rfid.Location.X + 5, rfid.Location.Y - 5);
}
// RFID 포인트 그리기
foreach (var rfid in rfidPoints)
{
g.FillEllipse(Brushes.Green, rfid.Location.X - 3, rfid.Location.Y - 3, 6, 6);
g.DrawString(rfid.RFIDValue, Font, Brushes.Black, rfid.Location.X + 5, rfid.Location.Y - 5);
//g.FillEllipse(Brushes.Green, rfid.Location.X - 3, rfid.Location.Y - 3, 6, 6);
var fsize = g.MeasureString(rfid.RFIDValue, Font);
g.DrawString(rfid.RFIDValue, Font, Brushes.WhiteSmoke,
(rfid.Location.X - fsize.Width / 2f),
(rfid.Location.Y + 2));
}
//var rfidpts = rfidPoints.Select(t => t.Location).ToArray();
@@ -1238,7 +1246,7 @@ namespace AGVMapControl
{
foreach (var line in rfidLines)
{
using (Pen linePen = new Pen(Color.FromArgb(100, Color.Black), 2))
using (Pen linePen = new Pen(Color.FromArgb(50, Color.Wheat), 2))
{
if (!line.IsBidirectional)
{
@@ -1289,7 +1297,7 @@ namespace AGVMapControl
if (currentPath == null || currentPath.Count < 2)
return;
Color pathColor = Color.FromArgb(180, Color.HotPink);
Color pathColor = Color.FromArgb(100, Color.Lime);
int pathWidth = 10;
using (Pen pathPen = new Pen(pathColor, pathWidth))