This commit is contained in:
backuppc
2026-01-12 17:37:37 +09:00
parent 880dc526da
commit 5801137d63
12 changed files with 356 additions and 1385 deletions

View File

@@ -35,10 +35,8 @@ namespace AGVMapEditor.Forms
public class NodeConnectionInfo
{
public string FromNodeId { get; set; }
public string FromNodeName { get; set; }
public ushort FromRfidId { get; set; }
public string ToNodeId { get; set; }
public string ToNodeName { get; set; }
public ushort ToRfidId { get; set; }
public string ConnectionType { get; set; }
@@ -46,12 +44,12 @@ namespace AGVMapEditor.Forms
{
// RFID가 있으면 RFID(노드이름), 없으면 NodeID(노드이름) 형태로 표시
string fromDisplay = FromRfidId > 0
? $"{FromRfidId}({FromNodeName})"
: $"---({FromNodeId})";
? $"{FromRfidId:0000}(*{FromNodeId.PadLeft(4,'0')})"
: $"(*{FromNodeId})";
string toDisplay = ToRfidId > 0
? $"{ToRfidId}({ToNodeName})"
: $"---({ToNodeId})";
? $"{ToRfidId:0000}(*{ToNodeId.PadLeft(4, '0')})"
: $"(*{ToNodeId})";
// 양방향 연결은 ↔ 기호 사용
string arrow = ConnectionType == "양방향" ? "↔" : "→";
@@ -828,7 +826,7 @@ namespace AGVMapEditor.Forms
var item = node as MapNode;
if (item.StationType == StationType.Normal)
foreColor = Color.DimGray;
else if (item.StationType == StationType.Charger)
else if (item.StationType == StationType.Charger1 || item.StationType == StationType.Charger2)
foreColor = Color.Red;
else
foreColor = Color.DarkGreen;
@@ -907,10 +905,8 @@ namespace AGVMapEditor.Forms
connections.Add(new NodeConnectionInfo
{
FromNodeId = firstNode.Id,
FromNodeName = "",
FromRfidId = firstNode.RfidId,
ToNodeId = secondNode.Id,
ToNodeName = "",
ToRfidId = secondNode.RfidId,
ConnectionType = "양방향" // 모든 연결이 양방향
});
@@ -923,6 +919,7 @@ namespace AGVMapEditor.Forms
}
// 리스트박스에 표시
lstNodeConnection.Font = new Font("돋움체", 10);
lstNodeConnection.DataSource = null;
lstNodeConnection.DataSource = connections;
lstNodeConnection.DisplayMember = "ToString";