Skip to content

Fix/calibration points overflow #2748

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Skybladev2 wants to merge 3 commits into
base: master
Choose a base branch
from
+15 −2
Open

Fix/calibration points overflow #2748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
05fb350
fix calibration points overflow text styling
Skybladev2 Apr 13, 2026
69340b8
revert unnneeded changes
Skybladev2 Apr 14, 2026
22f2a34
Guard module sorting against transient invalid slots.
Skybladev2 Apr 14, 2026
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
2 changes: 2 additions & 0 deletions gui/builtinStatsViews/resourcesViewFull.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,8 @@ def refreshPanel(self, fit):
labelTFT.SetForegroundColour(colorF)
labelUCP.SetForegroundColour(colorC)
labelTCP.SetForegroundColour(colorC)
labelUCP.Refresh()
labelTCP.Refresh()

if fit is not None:
resMax = (
Expand Down
15 changes: 13 additions & 2 deletions gui/builtinViews/fittingView.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,8 +557,19 @@ def generateMods(self):
]

if fit is not None:
self.mods = fit.modules[:]
self.mods.sort(key=lambda _mod: (slotOrder.index(_mod.slot), _mod.position))
self.mods = [mod for mod in fit.modules if mod is not None]

def _get_sort_key(mod):
slot = getattr(mod, "slot", None)
try:
slot_index = slotOrder.index(slot)
except ValueError:
# During rapid fit switches we may briefly see transient modules
# with unresolved slot references; keep UI stable by sorting them last.
slot_index = len(slotOrder)
return slot_index, getattr(mod, "position", 0)

self.mods.sort(key=_get_sort_key)

# Blanks is a list of indexes that mark non-module positions (such
# as Racks and tactical Modes. This allows us to skip over common
Expand Down