Skip to content
Draft
Show file tree
Hide file tree
Changes from 1 commit
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
Original file line number Diff line number Diff line change
Expand Up @@ -321,18 +321,9 @@ private static IEnumerable<Node> GetNodesByBudget(IReadOnlyList<Node> nodes, lon
{
var selectedNodes = actualDepth switch
{
1
=> nodes
.Where(x => x.Diagonal * (x.Priority == NodePriority.Low ? 0.5f : 1) >= MinDiagonalSizeAtDepth_1)
.ToArray(),
2
=> nodes
.Where(x => x.Diagonal * (x.Priority == NodePriority.Low ? 0.5f : 1) >= MinDiagonalSizeAtDepth_2)
.ToArray(),
3
=> nodes
.Where(x => x.Diagonal * (x.Priority == NodePriority.Low ? 0.5f : 1) >= MinDiagonalSizeAtDepth_3)
.ToArray(),
1 => nodes.Where(x => x.Diagonal * GetPriorityWeighting(x) >= MinDiagonalSizeAtDepth_1).ToArray(),
2 => nodes.Where(x => x.Diagonal * GetPriorityWeighting(x) >= MinDiagonalSizeAtDepth_2).ToArray(),
3 => nodes.Where(x => x.Diagonal * GetPriorityWeighting(x) >= MinDiagonalSizeAtDepth_3).ToArray(),
_ => nodes.ToArray(),
};

Expand All @@ -356,4 +347,14 @@ private static IEnumerable<Node> GetNodesByBudget(IReadOnlyList<Node> nodes, lon
yield return node;
}
}

private static float GetPriorityWeighting(Node node)
{
if (node.Priority == NodePriority.Low)
return 0.5f;
if (node.Priority == NodePriority.Medium)
return 10.0f;

return 1;
}
}
15 changes: 15 additions & 0 deletions CadRevealRvmProvider/RvmStoreToCadRevealNodesConverter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,21 @@ PriorityMapping priorityMapping

var allNodes = cadRevealRootNodes.SelectMany(CadRevealNode.GetAllNodesFlat).ToArray();

allNodes = allNodes
.Select(node =>
{
var type = node.Attributes.GetValueOrNull("Type") ?? "lol";
if (type.Equals("VALV"))
{
node.Geometries = node.Geometries
.Select(g => g with { NodePriority = NodePriority.Medium })
.ToArray();
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorter geometries etter størrelse og prioriter de største geometriene og ikke gjør noe med de små.

}

return node;
})
.ToArray();

return allNodes;
}

Expand Down