DPL GUI: improve display of many devices

ktf · davidrohr · commit 01c7503ef688 · 2021-03-12T14:39:34.000+01:00
diff --git a/Framework/GUISupport/src/FrameworkGUIDevicesGraph.cxx b/Framework/GUISupport/src/FrameworkGUIDevicesGraph.cxx
@@ -290,7 +290,7 @@ void showTopologyNodeGraph(WorkspaceGUIState& state,
       auto& node = sortedNodes[si];
       assert(node.index == si);
       int xpos = 40 + 240 * node.layer;
-      int ypos = 300 + (600 / (layerMax[node.layer] + 1)) * (layerEntries[node.layer] - layerMax[node.layer] / 2);
+      int ypos = 300 + (std::max(600, 60 * (int)layerMax[node.layer]) / (layerMax[node.layer] + 1)) * (layerEntries[node.layer] - layerMax[node.layer] / 2);
       positions.push_back(NodePos{ImVec2(xpos, ypos)});
       layerEntries[node.layer] += 1;
     }

Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,7 @@ void showTopologyNodeGraph(WorkspaceGUIState& state,`
`290`	`290`	`auto& node = sortedNodes[si];`
`291`	`291`	`assert(node.index == si);`
`292`	`292`	`int xpos = 40 + 240 * node.layer;`
`293`		`- int ypos = 300 + (600 / (layerMax[node.layer] + 1)) * (layerEntries[node.layer] - layerMax[node.layer] / 2);`
	`293`	`+ int ypos = 300 + (std::max(600, 60 * (int)layerMax[node.layer]) / (layerMax[node.layer] + 1)) * (layerEntries[node.layer] - layerMax[node.layer] / 2);`
`294`	`294`	`positions.push_back(NodePos{ImVec2(xpos, ypos)});`
`295`	`295`	`layerEntries[node.layer] += 1;`
`296`	`296`	`}`