Skip to content

Commit 4d40572

Browse files
committed
fix
1 parent e99be5d commit 4d40572

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

src/main/scala/edg_ide/edgir_graph/ElkEdgirGraphUtils.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ object ElkEdgirGraphUtils {
110110
case "CanControllerPort" => Some(PortSide.EAST)
111111
case "CanTransceiverPort" => Some(PortSide.WEST)
112112
case "CanDiffPort" => None
113+
case "CanPassivePort" => Some(PortSide.EAST)
113114

114115
case "CrystalDriver" => Some(PortSide.EAST)
115116
case "CrystalPort" => Some(PortSide.WEST)

src/main/scala/edg_ide/edgir_graph/HierarchyGraphElk.scala

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -224,13 +224,7 @@ object HierarchyGraphElk {
224224
// For now, this only updates the graph visualization, which can change with focus.
225225
// In the future, maybe this will also update or filter the design tree.
226226
val edgirGraph = EdgirGraph.blockToNode(blockPath, block)
227-
val highFanoutTransform = new RemoveHighFanoutEdgeTransform(
228-
6,
229-
Set(
230-
LibraryPath("edg.electronics_model.VoltagePorts.VoltageLink"),
231-
LibraryPath("edg.electronics_model.GroundPort.GroundLink")
232-
)
233-
)
227+
val highFanoutTransform = new RemoveHighFanoutEdgeTransform(5, Set("VoltageLink", "GroundLink"))
234228
val blockGroupings = block.meta match {
235229
case Some(meta) => meta.meta.members.get.node.get("_block_diagram_grouping") match {
236230
case Some(meta) => meta.meta.members.get.node.map { case (name, group) =>

src/main/scala/edg_ide/edgir_graph/RemoveHighFanoutEdgeTransform.scala

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package edg_ide.edgir_graph
22

3+
import edg.EdgirUtils.SimpleLibraryPath
34
import edgir.elem.elem
45
import edgir.ref.ref.LibraryPath
56
import edg.wir.DesignPath
@@ -8,7 +9,7 @@ import edg_ide.edgir_graph.EdgirGraph.EdgirEdge
89
/** Removes links (as edges - must run AFTER collapse - prevents weird interactions with bridge removal) that are
910
* "high-fanout", based on the link type allowlist and parameterized number of sink connections.
1011
*/
11-
class RemoveHighFanoutEdgeTransform(minConnects: Int, allowedLinkTypes: Set[LibraryPath]) {
12+
class RemoveHighFanoutEdgeTransform(minConnects: Int, allowedLinkTypeSimple: Set[String]) {
1213
def apply(node: EdgirGraph.EdgirNode): EdgirGraph.EdgirNode = {
1314
val highFanoutLinks = node.edges
1415
.collect { case EdgirEdge(EdgeLinkWrapper(linkPath, linkLike), source, target) =>
@@ -24,7 +25,8 @@ class RemoveHighFanoutEdgeTransform(minConnects: Int, allowedLinkTypes: Set[Libr
2425
(linkPath, link, linkLike, source, target) // extract elaborated link
2526
}
2627
.collect {
27-
case (linkPath, link, linkLike, source, target) if allowedLinkTypes.contains(link.getSelfClass) =>
28+
case (linkPath, link, linkLike, source, target)
29+
if allowedLinkTypeSimple.contains(link.getSelfClass.toSimpleString) =>
2830
(linkPath, linkLike, source, target) // filter by type
2931
}
3032
.groupBy(_._1)

0 commit comments

Comments
 (0)