Merge pull request #85 from neutrons/useful_script

Clean up script generation

src/shiver/models/histogram.py

@@ -32,6 +32,7 @@ def load(self, filename, ws_type):
         """Method to take filename and workspace type and load with correct algorithm"""
         ws_name, _ = os.path.splitext(os.path.basename(filename))
 
+        additional_parameters = {}
         if ws_type == "mde":
             logger.information(f"Loading {filename} as MDE")
             load = AlgorithmManager.create("LoadMD")
@@ -41,6 +42,7 @@ def load(self, filename, ws_type):
         elif ws_type == "norm":
             logger.information(f"Loading {filename} as normalization")
             load = AlgorithmManager.create("LoadNexusProcessed")
+            additional_parameters = {"LoadHistory": False}
         else:
             logger.error(f"Unsupported workspace type {ws_type} for {filename}")
 
@@ -54,6 +56,8 @@ def load(self, filename, ws_type):
         try:
             load.setProperty("Filename", filename)
             load.setProperty("OutputWorkspace", ws_name)
+            for key, value in additional_parameters.items():
+                load.setProperty(key, value)
             load.executeAsync()
         except ValueError as err:
             logger.error(str(err))
@@ -237,19 +241,31 @@ def save_history(self, ws_name, filename):
         """Save the mantid algorithm history"""
         history = mtd[ws_name].getHistory()
 
-        script = [f"from mantid.simpleapi import {', '.join(alg.name() for alg in history.getAlgorithmHistories())}"]
+        script = [
+            "import shiver",
+            f"from mantid.simpleapi import {', '.join(set(alg.name() for alg in history.getAlgorithmHistories()))}",
+            "",
+            "",
+        ]
 
+        previous_name = ""
         for alg in history.getAlgorithmHistories():
-            script.append(
-                "{}({})".format(  # pylint: disable=consider-using-f-string
-                    alg.name(),
-                    ", ".join(
-                        f"{p.name()}='{alg.getPropertyValue(p.name())}'"
-                        for p in alg.getProperties()
-                        if alg.getPropertyValue(p.name())
-                    ),
-                )
-            )
+            alg_name = alg.name()
+            if alg_name == "LoadMD" and previous_name == "GenerateDGSMDE":
+                comment = "# "
+            else:
+                comment = ""
+            previous_name = alg_name
+            separator = ",\n" + comment + "\t"
+            alg_props = []
+            for prop in alg.getProperties():
+                default = prop.isDefault()
+                value = prop.value()
+                if value and not default:
+                    value = value.replace('"', "'")
+                    alg_props.append(f'{prop.name()}="{value}"')
+            alg_props = separator.join(alg_props)
+            script.append(f"{comment}{alg_name}({alg_props})")
 
         with open(filename, "w", encoding="utf-8") as f_open:
             f_open.write("\n".join(script))

src/shiver/views/loading_buttons.py

@@ -41,8 +41,10 @@ def __init__(self, parent=None):
         self.load_dataset_callback = None
         self.error_msg_callback = None
 
-        # disable generate dataset button (not implemented for phase 1)
-        self.gen_dataset.setEnabled(False)
+        self.gen_dataset.clicked.connect(self._gen_dataset_click)
+
+    def _gen_dataset_click(self):
+        self.parent().parent().parent().setCurrentIndex(1)
 
     def _on_load_mde_click(self):
         filename, _ = QFileDialog.getOpenFileName(

tests/models/test_histogram_saving.py

@@ -31,9 +31,10 @@ def test_saving(tmp_path):
     with open(tmp_path / "test_workspace.py", encoding="utf-8") as f_open:
         lines = f_open.readlines()
 
-    assert len(lines) == 2
-    assert lines[0] == "from mantid.simpleapi import CreateMDHistoWorkspace\n"
+    assert len(lines) == 12
+    assert lines[0] == "import shiver\n"
+    assert lines[1] == "from mantid.simpleapi import CreateMDHistoWorkspace\n"
     assert (
-        lines[1] == "CreateMDHistoWorkspace(SignalInput='2,3', ErrorInput='1,1', Dimensionality='1', "
-        "Extents='-2,2', NumberOfBins='2', Names='A', Units='a', OutputWorkspace='test_workspace')"
+        " ".join([line.strip() for line in lines[4:]]) == 'CreateMDHistoWorkspace(SignalInput="2,3", ErrorInput="1,1", '
+        'Dimensionality="1", Extents="-2,2", NumberOfBins="2", Names="A", Units="a", OutputWorkspace="test_workspace")'
     )