tomwer 1.4.18__py3-none-any.whl → 1.4.19__py3-none-any.whl

orangecontrib/tomwer/widgets/cluster/SlurmClusterOW.py

@@ -10,6 +10,7 @@ from orangewidget.widget import Output, OWBaseWidget
 
 from tomwer.core.cluster import SlurmClusterConfiguration
 from tomwer.gui.cluster.slurm import SlurmSettingsWindow
+from tomwer.core.settings import SlurmSettingsMode
 
 _logger = logging.getLogger(__name__)
 
@@ -32,6 +33,7 @@ class SlurmClusterOW(OWBaseWidget, openclass=True):
     resizing_enabled = True
 
     _ewoks_default_inputs = Setting(dict())
+    slurm_mode_name = Setting(SlurmSettingsMode.GENERIC.name)
 
     class Outputs:
         config_out = Output(name="cluster_config", type=SlurmClusterConfiguration)
@@ -46,6 +48,14 @@ class SlurmClusterOW(OWBaseWidget, openclass=True):
         if self._ewoks_default_inputs != {}:
             self._widget.setConfiguration(self._ewoks_default_inputs)
 
+        try:
+            mode = SlurmSettingsMode[self.slurm_mode_name]
+            self._widget.setMode(mode)
+        except Exception:
+            _logger.exception(
+                f"Could not restore saved SlurmSettingsMode {self.slurm_mode_name!r}"
+            )
+
         # trigger the signal to avoid any user request
         self.Outputs.config_out.send(self.getConfiguration())
 
@@ -66,6 +76,7 @@ class SlurmClusterOW(OWBaseWidget, openclass=True):
         slurmClusterconfiguration = self.getConfiguration()
         self.Outputs.config_out.send(slurmClusterconfiguration)
         self._ewoks_default_inputs = slurmClusterconfiguration.to_dict()
+        self.slurm_mode_name = self._widget.mode().name
 
     def getConfiguration(self):
         return self._widget.getSlurmClusterConfiguration()

tomwer/gui/cluster/slurm.py

@@ -110,6 +110,7 @@ class SlurmSettingsWindow(qt.QMainWindow):
         # connect signal / slot
         self._modeCombox.currentIndexChanged.connect(self._reloadPredefinedSettings)
         self._settingsWidget.sigConfigChanged.connect(self._configChanged)
+        self._modeCombox.currentIndexChanged.connect(self.sigConfigChanged)
         # when the settings widget is edited them we automatically move to 'manual' settings. To notify visually the user
         self._settingsWidget.sigConfigChanged.connect(self._switchToManual)
 
@@ -160,6 +161,14 @@ class SlurmSettingsWindow(qt.QMainWindow):
         mode = SlurmSettingsMode.from_value(mode)
         self._modeCombox.setCurrentText(mode.value)
 
+    def setMode(self, mode: SlurmSettingsMode) -> None:
+        """Alias for setCurrentSettingsMode(), used by SlurmClusterOW."""
+        self.setCurrentSettingsMode(mode)
+
+    def mode(self) -> SlurmSettingsMode:
+        """Alias for getCurrentSettingsMode(), used by SlurmClusterOW."""
+        return self.getCurrentSettingsMode()
+
     # expose API
     def getConfiguration(self) -> dict:
         return self._settingsWidget.getConfiguration()

tomwer/version.py

@@ -77,7 +77,7 @@ RELEASE_LEVEL_VALUE = {
 
 MAJOR = 1
 MINOR = 4
-MICRO = 18
+MICRO = 19
 RELEV = "final"  # <16
 SERIAL = 0  # <16
 

{tomwer-1.4.18.dist-info → tomwer-1.4.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tomwer
-Version: 1.4.18
+Version: 1.4.19
 Summary: "tomography workflow tools"
 Home-page: https://gitlab.esrf.fr/tomotools/tomwer
 Author: Henri Payno, Pierre Paleo, Pierre-Olivier Autran, Jérôme Lesaint, Alessandro Mirone

{tomwer-1.4.18.dist-info → tomwer-1.4.19.dist-info}/RECORD

@@ -27,7 +27,7 @@ orangecontrib/tomwer/tutorials/id16b/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeu
 orangecontrib/tomwer/widgets/__init__.py,sha256=dX_TpkBh3mVsrj3EeGglEESsnZAEVq7V0Nb9bnBrb-8,1214
 orangecontrib/tomwer/widgets/utils.py,sha256=yq1wZfpfY3iVAhwMRBls57q02lhljO89WRKN7MxMMNg,983
 orangecontrib/tomwer/widgets/cluster/FutureSupervisorOW.py,sha256=zXjddYmkhyBnoRCstZ6AYN1mG84xiOKaIntg5tqe4jw,9927
-orangecontrib/tomwer/widgets/cluster/SlurmClusterOW.py,sha256=L_fX3EFyyx71Fg-FI8ab34ZPSUzrwKGJLcS2FnYCY_c,2565
+orangecontrib/tomwer/widgets/cluster/SlurmClusterOW.py,sha256=O44AZGt7cC1KaAl4U9f78OuzKKMXOSm22voUodyvqnk,3003
 orangecontrib/tomwer/widgets/cluster/__init__.py,sha256=vOOJnIIaLWAj8tnxD9MRzWDyYgk-cyuBsN7QQ5FrIoQ,385
 orangecontrib/tomwer/widgets/cluster/icons/slurm.png,sha256=C-YBLwXCnh0oo4nvEt80WxX_jKYGUAFpWMUSlzt6ke0,1995
 orangecontrib/tomwer/widgets/cluster/icons/slurm.svg,sha256=9LqiU88NH3ACxtZ8A7gTm-C_0ACR8iq0k_N2W1IFf9Q,9790
@@ -219,7 +219,7 @@ orangecontrib/tomwer/widgets/visualization/tests/__init__.py,sha256=47DEQpj8HBSa
 tomwer/__init__.py,sha256=cMIyH-uRxpa9WVnAuWjiBD7k9TK57WO21RzP_S-Mb8I,460
 tomwer/__main__.py,sha256=7tCADiS4u7k1PCxFhlRAcYSIOpxQTGUTx8sCEQ-hi1E,8707
 tomwer/utils.py,sha256=7h7dEgKAEUmQ43jkULvC1B9Adl55nkCty-SEKUKCl4U,7008
-tomwer/version.py,sha256=ZockRUONTpS2pMmqMM74e8Rvh1TysPALNWyegIXFEyE,4387
+tomwer/version.py,sha256=iXKo54sHforGo1rCtg1WrAihg0qB1fT92sRCOtDm7EA,4387
 tomwer/app/__init__.py,sha256=h1FKED7Tw5f99yikygt7ruXsdrxQhcJxO7kagLGxhJg,84
 tomwer/app/axis.py,sha256=lB-IZx1o6KTWLIelITvYCIu2flFTB9NhuIfD2MhUZZA,5826
 tomwer/app/canvas.py,sha256=y8rYOiwmv6ug7JcjgkOzEiGQnNXjKWNNmKofT0n8TFg,1538
@@ -464,7 +464,7 @@ tomwer/gui/settings.py,sha256=7LH-v6DM_V82j--aoHO7BaRawCsJsfgE3_6yI90TD7E,405
 tomwer/gui/stackplot.py,sha256=WE_GOa0RzwPcMiop98ljM_r-4g4bSy-Jee9h8v3kwO8,3552
 tomwer/gui/stacks.py,sha256=4lPRUjqGhif_oxArV7HHllbFsmLTdPJgHe4QD8TRz8k,13558
 tomwer/gui/cluster/__init__.py,sha256=QeukFHF5SISl4dsVtIGc8UoAlgMiXdAeG2nksocycic,36
-tomwer/gui/cluster/slurm.py,sha256=FIp9e7E48KEORabOKBVu7Wm7N9oQBKKUanBSs62hqs0,34374
+tomwer/gui/cluster/slurm.py,sha256=_W3mfgj4doAO64nkzhZIBIPgeflong0Gmff8tG7rA6k,34784
 tomwer/gui/cluster/supervisor.py,sha256=5qgAbRoFQvQeZ1jy5Z-5p98QqdZxNM9hieOce2Dn_uE,15794
 tomwer/gui/cluster/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tomwer/gui/cluster/tests/test_cluster.py,sha256=Yz0nzPQmMhMj3lRsJ8lB3_d9tpeJ9iC-K24IgdhV08w,3205
@@ -904,9 +904,9 @@ tomwer/tests/orangecontrib/tomwer/widgets/visualization/tests/test_volume_viewer
 tomwer/tests/test_ewoks/test_conversion.py,sha256=a8cEWbErXiFCAkaapi0jeEoRKYxcFQCoa-Jr_u77_OM,3656
 tomwer/tests/test_ewoks/test_single_node_execution.py,sha256=YBUHfiAnkciv_kjj7biC5fOs7c7ofNImM_azGMn4LZM,2813
 tomwer/tests/test_ewoks/test_workflows.py,sha256=Eq80eexf5NVL7SzvwctLOaUeuQ8V3vDiFiHgbJA4Yb8,4871
-tomwer-1.4.18.dist-info/licenses/LICENSE,sha256=62p1wL0n9WMTu8x2YDv0odYgTqeSvTd9mQ0v6Mq7lzE,1876
-tomwer-1.4.18.dist-info/METADATA,sha256=JzR1mNQUR3mOwD1uqJNJKCE62eAa0U5Vy67pb2qNc5o,13483
-tomwer-1.4.18.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-tomwer-1.4.18.dist-info/entry_points.txt,sha256=py3ZUWvGnWGc5c7Yhw_uBTm8Fmew0BDw3aQZnWMBNZI,500
-tomwer-1.4.18.dist-info/top_level.txt,sha256=Yz5zKh0FPiImtzHYcPuztG1AO8-6KEpUWgoChGbA0Ys,21
-tomwer-1.4.18.dist-info/RECORD,,
+tomwer-1.4.19.dist-info/licenses/LICENSE,sha256=62p1wL0n9WMTu8x2YDv0odYgTqeSvTd9mQ0v6Mq7lzE,1876
+tomwer-1.4.19.dist-info/METADATA,sha256=I1y8TToS_xRYj6YtVTmqjCJ-sYzaUxajagOtBZ9lYfE,13483
+tomwer-1.4.19.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+tomwer-1.4.19.dist-info/entry_points.txt,sha256=py3ZUWvGnWGc5c7Yhw_uBTm8Fmew0BDw3aQZnWMBNZI,500
+tomwer-1.4.19.dist-info/top_level.txt,sha256=Yz5zKh0FPiImtzHYcPuztG1AO8-6KEpUWgoChGbA0Ys,21
+tomwer-1.4.19.dist-info/RECORD,,

{tomwer-1.4.18.dist-info → tomwer-1.4.19.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (79.0.0)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any