Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 31 additions & 15 deletions CodeWalker/Project/Panels/ProjectExplorerPanel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -601,30 +601,46 @@ private void LoadYnvTreeNodes(YnvFile ynv, TreeNode node)//TODO!


}
private void LoadTrainTrackTreeNodes(TrainTrack track, TreeNode node)
public async Task LoadTrainTrackTreeNodes(TrainTrack track, TreeNode node)
{
if (track == null) return;

if (!string.IsNullOrEmpty(node.Name)) return; //named nodes are eg Nodes

node.Nodes.Clear();
await Task.Run(() =>
{
// Invoke the method on the form's thread.
ProjectForm.Invoke((MethodInvoker)delegate
{
node.Nodes.Clear();
});

if ((track.Nodes != null) && (track.Nodes.Count > 0))
{
TreeNode nodesnode = null;
ProjectForm.Invoke((MethodInvoker)delegate
{
nodesnode = node.Nodes.Add("Nodes (" + track.Nodes.Count.ToString() + ")");
nodesnode.Name = "Nodes";
nodesnode.Tag = track;
});

var nodes = track.Nodes;

if ((track.Nodes != null) && (track.Nodes.Count > 0))
{
var nodesnode = node.Nodes.Add("Nodes (" + track.Nodes.Count.ToString() + ")");
nodesnode.Name = "Nodes";
nodesnode.Tag = track;
var nodes = track.Nodes;
for (int i = 0; i < nodes.Count; i++)
{
var ynode = nodes[i];
var tnode = nodesnode.Nodes.Add(ynode.ToString());
tnode.Tag = ynode;
}
}
TreeNode[] tempList = new TreeNode[track.Nodes.Count];
for (int i = 0; i < nodes.Count; i++)
{
var ynode = nodes[i];
tempList[i] = new TreeNode(ynode.ToString());
tempList[i].Tag = ynode;
}

ProjectForm.Invoke((MethodInvoker)delegate
{
nodesnode.Nodes.AddRange(tempList);
});
}
});
}
private void LoadScenarioTreeNodes(YmtFile ymt, TreeNode node)
{
Expand Down
19 changes: 16 additions & 3 deletions CodeWalker/Project/ProjectForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -629,6 +629,7 @@ private void ShowCurrentProjectItem(bool promote)
if (CurrentMulti != null)
{
ShowEditMultiPanel(promote);
return;
}
else if (CurrentMloEntity != null)
{
Expand Down Expand Up @@ -5213,10 +5214,22 @@ public TrainTrackNode NewTrainNode(TrainTrackNode copy = null, bool copyPosition

if (selectNew)
{
LoadProjectTree();
ProjectExplorer?.TrySelectTrainNodeTreeNode(n);
CurrentTrainNode = n;
ShowEditTrainNodePanel(false);

var trainTrackNodeTreeNode = ProjectExplorer?.FindTrainTrackTreeNode(n.Track);
if (trainTrackNodeTreeNode != null) {
ProjectExplorer?.LoadTrainTrackTreeNodes(n.Track, trainTrackNodeTreeNode).ContinueWith(delegate
{
ProjectExplorer?.TrySelectTrainNodeTreeNode(n);
ShowEditTrainNodePanel(false);

}, TaskContinuationOptions.ExecuteSynchronously);
} else
{
LoadProjectTree();
ProjectExplorer?.TrySelectTrainNodeTreeNode(n);
ShowEditTrainNodePanel(false);
}
}


Expand Down