persistent Energy tab reporting mode

Author: MAKOMO

src/artisanlib/canvas.py

@@ -2308,6 +2308,7 @@ def __init__(self, parent:QWidget, dpi:int, locale:str, aw:'ApplicationWindow')
                           QApplication.translate('Label','Continuous'),
                           QApplication.translate('Label','Roast Event'),
                           QApplication.translate('Label','Meter')]
+        self.perKgRoastMode:bool = False # if true only the amount during the roast and not the full batch (incl. preheat and BBP) are displayed), toggled by click on the result widget
 
         ## working variables (stored in .alog profiles):
         # Burners

src/artisanlib/main.py

@@ -18213,6 +18213,7 @@ def settingsLoad(self, filename:Optional[str] = None, theme:bool = False, machin
             self.qmc.gasMix_setup = toInt(settings.value('gasMix_setup',self.qmc.gasMix_setup))
             self.qmc.energyresultunit_setup = toInt(settings.value('energyresultunit_setup',self.qmc.energyresultunit_setup))
 #            self.qmc.energytablecolumnwidths = [toInt(x) for x in toList(settings.value("energytablecolumnwidths",self.qmc.energytablecolumnwidths))]
+            self.qmc.perKgRoastMode = toBool(settings.value('perKgRoastMode',self.qmc.perKgRoastMode))
             settings.endGroup()
             self.qmc.restoreEnergyLoadDefaults()
             self.qmc.restoreEnergyProtocolDefaults()
@@ -19979,6 +19980,7 @@ def saveAllSettings(self, settings:QSettings, default_settings:Optional[Dict[str
             self.settingsSetValue(settings, default_settings, 'electricEnergyMix_setup',self.qmc.electricEnergyMix_setup, read_defaults)
             self.settingsSetValue(settings, default_settings, 'gasMix_setup',self.qmc.gasMix_setup, read_defaults)
             self.settingsSetValue(settings, default_settings, 'energyresultunit_setup',self.qmc.energyresultunit_setup, read_defaults)
+            self.settingsSetValue(settings, default_settings, 'perKgRoastMode',self.qmc.perKgRoastMode, read_defaults)
             settings.endGroup()
 #--- END GROUP EnergyUse
 

src/artisanlib/roast_properties.py

@@ -600,7 +600,8 @@ def __init__(self, parent:QWidget, aw:'ApplicationWindow', activeTab:int = 0) ->
 
         self.batcheditmode = False # a click to the batch label enables the batcheditmode
 
-        self.perKgRoastMode = False # if true only the amount during the roast and not the full batch (incl. preheat and BBP) are displayed), toggled by click on the result widget
+        self.org_perKgRoastMode = self.aw.qmc.perKgRoastMode
+        self.perKgRoastMode = self.aw.qmc.perKgRoastMode # if true only the amount during the roast and not the full batch (incl. preheat and BBP) are displayed), toggled by click on the result widget
 
         self.acaia:'Optional[Acaia]' = None # the BLE interface # noqa: UP037
         self.scale_weight:Optional[float] = None # weight received from a connected scale
@@ -2555,6 +2556,8 @@ def closeEvent(self, _:Optional['QCloseEvent'] = None) -> None:
         self.aw.qmc.weight = self.org_weight
         self.aw.qmc.volume = self.org_volume
 
+        self.aw.qmc.perKgRoastMode = self.org_perKgRoastMode
+
         self.aw.qmc.specialevents = self.org_specialevents
         self.aw.qmc.specialeventstype = self.org_specialeventstype
         self.aw.qmc.specialeventsStrings = self.org_specialeventsStrings
@@ -5266,6 +5269,8 @@ def accept(self) -> None:
             self.aw.qmc.roastbatchnr = self.batchcounterSpinBox.value()
             self.aw.qmc.roastbatchpos = self.batchposSpinBox.value()
 
+        self.aw.qmc.perKgRoastMode = self.perKgRoastMode
+
         # if custom events were changed we clear the event flag position cache
         if self.aw.qmc.specialevents != self.org_specialevents:
             self.aw.qmc.l_event_flags_dict = {}