diff --git a/gui/builtinAdditionPanes/boosterView.py b/gui/builtinAdditionPanes/boosterView.py index 11bac08ca..eda07eb5e 100644 --- a/gui/builtinAdditionPanes/boosterView.py +++ b/gui/builtinAdditionPanes/boosterView.py @@ -110,6 +110,9 @@ class BoosterView(d.Display): self.origional = fit.boosters if fit is not None else None self.boosters = stuff = fit.boosters[:] if fit is not None else None + if stuff is not None: + stuff.sort(key=lambda booster: booster.slot or 0) + if event.fitID != self.lastFitId: self.lastFitId = event.fitID diff --git a/gui/utils/exportHtml.py b/gui/utils/exportHtml.py index d1c0af9d0..608b52396 100644 --- a/gui/utils/exportHtml.py +++ b/gui/utils/exportHtml.py @@ -2,6 +2,7 @@ import threading import time # noinspection PyPackageRequirements import wx +from service.const import PortEftOptions from service.settings import HTMLExportSettings from service.fit import Fit from service.port import Port @@ -208,8 +209,10 @@ class exportHtmlThread(threading.Thread): if self.stopRunning: return try: - eftFit = Port.exportEft(getFit(fit[0])) - print(eftFit) + eftFit = Port.exportEft(getFit(fit[0]), options={ + PortEftOptions.IMPLANTS: True, + PortEftOptions.MUTATIONS: True, + PortEftOptions.LOADED_CHARGES: True}) HTMLfit = ( '