tomwer 1.0.4__py3-none-any.whl → 1.1.0__py3-none-any.whl

orangecontrib/tomwer/widgets/reconstruction/SADeltaBetaOW.py

@@ -125,7 +125,9 @@ class SADeltaBetaWindow(_SADeltaBetaWindow):
         if scan is None:
             return
         assert isinstance(scan, TomwerScanBase)
-        selected_db_value = self.getCurrentDeltaBetaValue()
+        selected_db_value = (
+            self.getCurrentDeltaBetaValue() or scan.sa_delta_beta_params.autofocus
+        )
         if selected_db_value is None:
             infos = "no selected delta / beta value. {} skip SADeltaBetaParams".format(
                 scan
@@ -137,6 +139,10 @@ class SADeltaBetaWindow(_SADeltaBetaWindow):
             )
         else:
             scan.sa_delta_beta_params.set_db_selected_value(selected_db_value)
+            if scan.nabu_recons_params is not None:
+                if "phase" not in scan.nabu_recons_params:
+                    scan.nabu_recons_params["phase"] = {}
+                scan.nabu_recons_params["phase"]["delta_beta"] = (selected_db_value,)
             infos = "delta / beta selected for {}: {},".format(
                 scan, scan.sa_delta_beta_params.value
             )
@@ -221,10 +227,7 @@ class SADeltaBetaOW(SuperviseOW, WidgetLongProcessing):
     sigScanReady = qt.Signal(TomwerScanBase)
     """Signal emitted when a scan is ready"""
 
-    _rpSetting = Setting(dict())
-    "settings store as dict"
-
-    static_input = Setting({"data": None, "sa_delta_beta_params": None})
+    _ewoks_default_inputs = Setting({"data": None, "sa_delta_beta_params": None})
 
     class Inputs:
         data = Input(name="data", type=TomwerScanBase, default=True, multiple=False)
@@ -264,10 +267,10 @@ class SADeltaBetaOW(SuperviseOW, WidgetLongProcessing):
         )
         self._layout.addWidget(self._widget)
 
-        sa_delta_beta_params = self.static_input.get("sa_delta_beta_params", None)
-        if sa_delta_beta_params is None:
-            sa_delta_beta_params = self._rpSetting
-        self.setConfiguration(sa_delta_beta_params)
+        sa_delta_beta_params = self._ewoks_default_inputs.get(
+            "sa_delta_beta_params", None
+        )
+        self.setConfiguration(sa_delta_beta_params or {})
 
         # connect signal / slot
         self._widget.sigConfigurationChanged.connect(self._updateSettings)
@@ -279,6 +282,16 @@ class SADeltaBetaOW(SuperviseOW, WidgetLongProcessing):
         # expose API
         self.wait_processing = self._widget.wait_processing
 
+    def __new__(cls, *args, **kwargs):
+        # ensure backward compatibility with 'static_input'
+        static_input = kwargs.get("stored_settings", {}).get("static_input", None)
+        if static_input not in (None, {}):
+            _logger.warning(
+                "static_input has been deprecated. Will be replaced by _ewoks_default_inputs in the workflow file. Please save the workflow to apply modifications"
+            )
+            kwargs["stored_settings"]["_ewoks_default_inputs"] = static_input
+        return super().__new__(cls, *args, **kwargs)
+
     def setConfiguration(self, configuration):
         if "workflow" in configuration:
             autofocus_lock = configuration["workflow"].get("autofocus_lock", None)
@@ -362,17 +375,11 @@ class SADeltaBetaOW(SuperviseOW, WidgetLongProcessing):
     def _updateSettings(self):
         config = self._widget.getConfiguration()
         config.pop("cluster_config", None)
-        self._rpSetting = config
-        self._rpSetting["workflow"] = {
-            "autofocus_lock": self._widget.isAutoFocusLock(),
-        }
-        # keep for backward compatibility
-
-        self.static_input = {
+        self._ewoks_default_inputs = {
             "data": None,
             "sa_delta_beta_params": self._widget.getConfiguration(),
         }
-        self.static_input["sa_delta_beta_params"]["workflow"] = {
+        self._ewoks_default_inputs["sa_delta_beta_params"]["workflow"] = {
             "autofocus_lock": self._widget.isAutoFocusLock(),
         }
 

orangecontrib/tomwer/widgets/reconstruction/SinoNormOW.py

@@ -133,7 +133,7 @@ class SinoNormOW(WidgetLongProcessing, SuperviseOW):
     compress_signal = False
     allows_cycle = True
 
-    _rpSetting = Setting(dict())
+    _ewoks_default_inputs = Setting(dict())
 
     sigScanReady = qt.Signal(TomwerScanBase)
     "Signal emitted when a scan is ended"
@@ -300,10 +300,10 @@ class SinoNormOW(WidgetLongProcessing, SuperviseOW):
         self._window.stop()
 
     def _updateSettings(self):
-        self._rpSetting = self._window.getConfiguration()
-        self._rpSetting["__lock__"] = self.isLocked()
+        self._ewoks_default_inputs = self._window.getConfiguration()
+        self._ewoks_default_inputs["__lock__"] = self.isLocked()
 
     def loadSettings(self):
-        self._window.setConfiguration(self._rpSetting)
-        if "__lock__" in self._rpSetting:
-            self.setLocked(self._rpSetting["__lock__"])
+        self._window.setConfiguration(self._ewoks_default_inputs)
+        if "__lock__" in self._ewoks_default_inputs:
+            self.setLocked(self._ewoks_default_inputs["__lock__"])

orangecontrib/tomwer/widgets/reconstruction/TofuOW.py

@@ -75,7 +75,7 @@ class TofuOW(WidgetLongProcessing, SuperviseOW):
     _reconsParams = settings.Setting(dict())
     """Parameters directly editabled from the TOFU interface"""
     # kept for compatibility
-    static_input = settings.Setting({"data": None, "lamino_params": None})
+    _ewoks_default_inputs = settings.Setting({"data": None, "lamino_params": None})
 
     _additionalOpts = settings.Setting(dict())
     """Parameters which can be add on the expert tab from TOFU"""
@@ -108,7 +108,9 @@ class TofuOW(WidgetLongProcessing, SuperviseOW):
         self._box.layout().addWidget(self._mainWidget)
         self._box.layout().addWidget(self._widgetControl)
 
-        lamino_params = self.static_input.get("lamino_params", None)
+        lamino_params = self._ewoks_default_inputs.get(  # pylint: disable=E1101
+            "lamino_params", None
+        )
         if lamino_params is None:
             lamino_params = self._reconsParams
         self._mainWidget.setParameters(lamino_params)

orangecontrib/tomwer/widgets/reconstruction/icons/nabu_2d.svg

@@ -14,8 +14,11 @@
    viewBox="0 0 48 48"
    version="1.1"
    id="SVGRoot"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
-   sodipodi:docname="nabu.svg">
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
+   sodipodi:docname="nabu_2d.svg"
+   inkscape:export-filename="/media/payno/830add5c-f5d7-4db2-875e-03be4f0a67f0/dev/tomography/tomwer/orangecontrib/tomwer/widgets/reconstruction/icons/nabu_2d.png"
+   inkscape:export-xdpi="59.900002"
+   inkscape:export-ydpi="59.900002">
   <defs
      id="defs815" />
   <sodipodi:namedview
@@ -26,14 +29,14 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="5.3333333"
-     inkscape:cx="-29.508774"
-     inkscape:cy="36.425261"
+     inkscape:cx="-96.821274"
+     inkscape:cy="34.925261"
      inkscape:document-units="px"
      inkscape:current-layer="g1399"
      showgrid="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
-     inkscape:window-x="0"
+     inkscape:window-width="1848"
+     inkscape:window-height="1136"
+     inkscape:window-x="72"
      inkscape:window-y="27"
      inkscape:window-maximized="1"
      inkscape:grid-bbox="true" />
@@ -45,7 +48,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>

orangecontrib/tomwer/widgets/visualization/DataViewerOW.py

@@ -70,7 +70,7 @@ class DataViewerOW(widget.OWBaseWidget, openclass=True):
         data = Input(name="data", type=TomwerScanBase)
 
     def __init__(self, parent=None):
-        widget.OWBaseWidget.__init__(self, parent)
+        super().__init__(parent)
         self._layout = gui.vBox(self.mainArea, self.name).layout()
         self.viewer = DataViewer(parent=self)
         self.viewer.setSizePolicy(qt.QSizePolicy.Expanding, qt.QSizePolicy.Expanding)
@@ -115,9 +115,15 @@ class DataViewerOW(widget.OWBaseWidget, openclass=True):
         return qt.QSize(400, 500)
 
     def _updateSettings(self):
-        self._viewer_config["mode"] = self.viewer.getDisplayMode()
-        self._viewer_config["slice_opt"] = self.viewer.getSliceOption()
-        self._viewer_config["radio_opt"] = self.viewer.getRadioOption()
+        self._viewer_config[  # pylint: disable=E1137
+            "mode"
+        ] = self.viewer.getDisplayMode().value
+        self._viewer_config[  # pylint: disable=E1137
+            "slice_opt"
+        ] = self.viewer.getSliceOption().value
+        self._viewer_config[  # pylint: disable=E1137
+            "radio_opt"
+        ] = self.viewer.getRadioOption().value
 
     def _setSettings(self, settings):
         old_state = self.viewer.blockSignals(True)

orangecontrib/tomwer/widgets/visualization/DiffViewerOW.py

@@ -74,4 +74,4 @@ class DiffViewerOW(widget.OWBaseWidget, openclass=True):
         self.viewer.addScan(scan)
 
     def sizeHint(self):
-        return qt.QSize(400, 500)
+        return qt.QSize(500, 700)

orangecontrib/tomwer/widgets/visualization/NXtomoMetadataViewerOW.py

@@ -0,0 +1,69 @@
+from orangewidget import widget, gui
+from tomwer.gui.visualization.nxtomometadata import NXtomoMetadataViewer
+from orangewidget.widget import Input, Output
+from tomwer.core.scan.hdf5scan import HDF5TomoScan
+from tomwer.core.scan.scanbase import TomwerScanBase
+from silx.gui import qt
+
+
+class NXtomoMetadataViewerOW(widget.OWBaseWidget, openclass=True):
+    """
+    Widget to siplay NXtomo metadata
+    """
+
+    name = "nxtomo-metadata-viewer"
+    id = "orange.widgets.tomwer.visualization.NXtomoMetadataViewerOW.NXtomoMetadataViewerOW"
+    description = "Interface to display some metadata of an NXtomo"
+    icon = "icons/nx_tomo_metadata_viewer.svg"
+    priority = 13
+    keywords = [
+        "hdf5",
+        "nexus",
+        "tomwer",
+        "file",
+        "visualize",
+        "visualization",
+        "display",
+        "NXTomo",
+        "editor",
+        "energy",
+        "distance",
+        "pixel size",
+    ]
+
+    class Inputs:
+        data = Input(name="data", type=TomwerScanBase)
+
+    class Outputs:
+        data = Output(name="data", type=TomwerScanBase)
+
+    want_main_area = True
+    resizing_enabled = True
+    compress_signal = False
+
+    def __init__(self, parent=None, *args, **kwargs):
+        super().__init__(parent=parent, *args, **kwargs)
+
+        _layout = gui.vBox(self.mainArea, self.name).layout()
+        self.widget = NXtomoMetadataViewer(parent=self)
+        _layout.addWidget(self.widget)
+
+    def _validateScan(self, scan):
+        self.Outputs.data.send(scan)
+        super().hide()
+
+    @Inputs.data
+    def setScan(self, scan):
+        if scan is None:
+            pass
+        elif not isinstance(scan, HDF5TomoScan):
+            raise TypeError(
+                f"expect to have an instance of {HDF5TomoScan}. {type(scan)} provided."
+            )
+        else:
+            self.widget.setScan(scan)
+            self.show()
+            self.raise_()
+
+    def sizeHint(self):
+        return qt.QSize(400, 500)

orangecontrib/tomwer/widgets/visualization/SampleMovedOW.py

@@ -30,7 +30,6 @@ __date__ = "19/03/2018"
 from silx.gui import qt
 from orangewidget import widget, gui
 from orangewidget.widget import Input
-from tomwer.web.client import OWClient
 from tomwer.gui.samplemoved import SampleMovedWidget
 from tomwer.core.scan.scanbase import TomwerScanBase
 import tomwer.core.process.visualization.samplemoved
@@ -40,7 +39,7 @@ import logging
 logger = logging.getLogger(__name__)
 
 
-class SampleMovedOW(widget.OWBaseWidget, OWClient, openclass=True):
+class SampleMovedOW(widget.OWBaseWidget, openclass=True):
     """
     Simple widget exposing two images side by side to see if a sample moved
     during the acquisition.
@@ -72,8 +71,7 @@ class SampleMovedOW(widget.OWBaseWidget, OWClient, openclass=True):
         data = Input(name="data", type=TomwerScanBase)
 
     def __init__(self, parent=None):
-        widget.OWBaseWidget.__init__(self, parent)
-        OWClient.__init__(self)
+        super().__init__(parent)
 
         layout = gui.vBox(self.mainArea, self.name).layout()
 

orangecontrib/tomwer/widgets/visualization/icons/nx_tomo_metadata_viewer.svg

@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   viewBox="0 0 12.7 12.7"
+   version="1.1"
+   id="svg901"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
+   sodipodi:docname="nx_tomo_metadata_viewer.svg"
+   inkscape:export-filename="/media/payno/830add5c-f5d7-4db2-875e-03be4f0a67f0/dev/tomography/tomwer/orangecontrib/tomwer/widgets/visualization/icons/nx_tomo_metadata_viewer.png"
+   inkscape:export-xdpi="59.900002"
+   inkscape:export-ydpi="59.900002">
+  <defs
+     id="defs895" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.959798"
+     inkscape:cx="-32.267824"
+     inkscape:cy="1.1453318"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1848"
+     inkscape:window-height="1136"
+     inkscape:window-x="72"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata898">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-284.3)">
+    <g
+       transform="matrix(0.67999756,0,0,1.4705936,-0.07800087,-0.17577001)"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.24015903px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:sans-serif;letter-spacing:0px;word-spacing:0px;opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.07525919"
+       id="text2005">
+      <path
+         inkscape:connector-curvature="0"
+         d="M 0.19471413,195.6209 H 1.1392864 l 2.2989224,4.3374 v -4.3374 h 0.6806477 v 5.18473 H 3.1742841 l -2.29892227,-4.33739 v 4.33739 h -0.6806477 z"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.1120739px;font-family:'Noto Serif Gurmukhi';-inkscape-font-specification:'Noto Serif Gurmukhi';stroke-width:0.07525919"
+         id="path869" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 5.264845,195.6209 h 0.7535742 l 1.2883689,1.92735 1.2953142,-1.92735 h 0.7535742 l -1.6668923,2.48992 1.7780185,2.69481 H 8.7132284 l -1.4585307,-2.20516 -1.4689489,2.20516 H 5.0287019 l 1.850945,-2.76773 z"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.1120739px;font-family:'Noto Serif Gurmukhi';-inkscape-font-specification:'Noto Serif Gurmukhi';stroke-width:0.07525919"
+         id="path871" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 10.340185,198.30877 v 0.55216 h 0.658075 v 0.24829 h -0.658075 v 1.0557 q 0,0.23788 0.06424,0.3056 0.06598,0.0677 0.265661,0.0677 h 0.328169 v 0.26739 h -0.328169 q -0.369842,0 -0.510486,-0.13717 -0.140644,-0.13891 -0.140644,-0.50354 v -1.0557 H 9.7845543 v -0.24829 h 0.2344067 v -0.55216 z"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.55603695px;font-family:'Noto Serif Gurmukhi';-inkscape-font-specification:'Noto Serif Gurmukhi';stroke-width:0.07525919"
+         id="path873" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 12.17203,199.08491 q -0.25698,0 -0.406305,0.20142 -0.149326,0.19968 -0.149326,0.54869 0,0.349 0.147589,0.55042 0.149326,0.19968 0.408042,0.19968 0.255242,0 0.404568,-0.20142 0.149326,-0.20141 0.149326,-0.54868 0,-0.34554 -0.149326,-0.54695 -0.149326,-0.20316 -0.404568,-0.20316 z m 0,-0.27087 q 0.416723,0 0.654602,0.27087 0.237879,0.27087 0.237879,0.75011 0,0.47749 -0.237879,0.7501 -0.237879,0.27087 -0.654602,0.27087 -0.41846,0 -0.656339,-0.27087 -0.236143,-0.27261 -0.236143,-0.7501 0,-0.47924 0.236143,-0.75011 0.237879,-0.27087 0.656339,-0.27087 z"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.55603695px;font-family:'Noto Serif Gurmukhi';-inkscape-font-specification:'Noto Serif Gurmukhi';stroke-width:0.07525919"
+         id="path875" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 15.108191,199.23424 q 0.119808,-0.21531 0.286497,-0.31775 0.166689,-0.10245 0.392414,-0.10245 0.303861,0 0.468814,0.21358 0.164953,0.21183 0.164953,0.60424 v 1.17377 h -0.321224 v -1.16335 q 0,-0.27955 -0.09897,-0.41499 -0.09897,-0.13543 -0.302124,-0.13543 -0.248298,0 -0.392414,0.16495 -0.144117,0.16496 -0.144117,0.44972 v 1.0991 h -0.321224 v -1.16335 q 0,-0.28129 -0.09897,-0.41499 -0.09897,-0.13543 -0.305597,-0.13543 -0.244825,0 -0.388941,0.16669 -0.144117,0.16495 -0.144117,0.44798 v 1.0991 h -0.321224 v -1.9447 h 0.321224 v 0.30212 q 0.10939,-0.17884 0.262188,-0.26392 0.152799,-0.0851 0.362897,-0.0851 0.211834,0 0.359423,0.10766 0.149326,0.10765 0.220516,0.31254 z"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.55603695px;font-family:'Noto Serif Gurmukhi';-inkscape-font-specification:'Noto Serif Gurmukhi';stroke-width:0.07525919"
+         id="path877" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 17.811682,199.08491 q -0.256979,0 -0.406305,0.20142 -0.149326,0.19968 -0.149326,0.54869 0,0.349 0.147589,0.55042 0.149326,0.19968 0.408042,0.19968 0.255243,0 0.404568,-0.20142 0.149326,-0.20141 0.149326,-0.54868 0,-0.34554 -0.149326,-0.54695 -0.149325,-0.20316 -0.404568,-0.20316 z m 0,-0.27087 q 0.416723,0 0.654602,0.27087 0.23788,0.27087 0.23788,0.75011 0,0.47749 -0.23788,0.7501 -0.237879,0.27087 -0.654602,0.27087 -0.41846,0 -0.656339,-0.27087 -0.236143,-0.27261 -0.236143,-0.7501 0,-0.47924 0.236143,-0.75011 0.237879,-0.27087 0.656339,-0.27087 z"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.55603695px;font-family:'Noto Serif Gurmukhi';-inkscape-font-specification:'Noto Serif Gurmukhi';stroke-width:0.07525919"
+         id="path879" />
+    </g>
+    <image
+       width="8.9820642"
+       height="8.2470732"
+       preserveAspectRatio="none"
+       xlink:href="data:image/png;base64,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 QmCC "
+       id="image1813"
+       x="4.855176"
+       y="283.63773" />
+  </g>
+</svg>

tomwer/__main__.py

@@ -80,6 +80,11 @@ def main():
         module_name="tomwer.app.imagekeyeditor",
         description="Tool to modify in place frames image key parameter.",
     )
+    launcher.add_command(
+        "image-key-upgrader",
+        module_name="tomwer.app.imagekeyupgrader",
+        description="Tool to upgrade in place frames image key parameter.",
+    )
     launcher.add_command(
         "norm-intensity",
         module_name="tomwer.app.intensitynormalization",
@@ -100,16 +105,16 @@ def main():
         module_name="tomwer.app.nabuapp",
         description="Use nabu to reconstruct a given scan",
     )
+    launcher.add_command(
+        "nxtomo-editor",
+        module_name="tomwer.app.nxtomoeditor",
+        description="Use to edit an NXtomo",
+    )
     launcher.add_command(
         "ows-to-script",
         module_name="tomwer.app.ows_to_script",
         description="Convert a .ows file to python script",
     )
-    launcher.add_command(
-        "process",
-        module_name="tomwer.app.process",
-        description="Process a given scan with a defined" "workflow",
-    )
     launcher.add_command(
         "rsync",
         module_name="tomwer.app.rsync",

tomwer/app/canvas_launcher/config.py

@@ -124,12 +124,12 @@ class TomwerConfig(config.Config):
         #: Submit a bug report action in the Help menu
         "Bug Report": "https://gitlab.esrf.fr/tomotools/tomwer/-/issues",
         #: A url quick tour/getting started url
-        "Quick Start": "http://www.edna-site.org/pub/doc/tomwer/video/canvas/start_up/",
+        "Quick Start": "https://www.youtube.com/playlist?list=PLddRXwP6Z6F9KOu1V5o6H24KPH5Ikuk2f",
         #: The 'full' documentation, should be something like current /docs/
         #: but specific for 'Visual Programing' only
-        "Documentation": "http://www.edna-site.org/pub/doc/tomwer/latest/",
+        "Documentation": "https://tomotools.gitlab-pages.esrf.fr/nxtomomill/index.html",
         #: YouTube tutorials
-        "Screencasts": "http://www.edna-site.org/pub/doc/tomwer/video",
+        "Screencasts": "https://www.youtube.com/@tomotools",
     }
 
 
@@ -187,13 +187,13 @@ class TerminalTextDocument(_TerminalTextDocument):
         # remove linux reset sequence
         string = string.replace("\033[1;%dm", "")
         # remove linux reset sequence
-        string = string.replace("", "")
-        string = string.replace("", "")
-        string = string.replace("", "")
-        string = string.replace("", "")
-        string = string.replace("", "")
-        string = string.replace("", "")
-        string = string.replace("", "")
+        string = string.replace("\x1B[1m", "")
+        string = string.replace("\x1B[1;30m", "")
+        string = string.replace("\x1B[1;31m", "")
+        string = string.replace("\x1B[1;32m", "")
+        string = string.replace("\x1B[1;33m", "")
+        string = string.replace("\x1B[1;34m", "")
+        string = string.replace("\x1B[1;35m", "")
 
         color = self.get_log_level(string) or qt.Qt.red
         charformat.setForeground(color)

tomwer/app/canvas_launcher/mainwindow.py

@@ -16,6 +16,7 @@ from orangecanvas.application.outputview import (
     ExceptHook,
     TerminalTextDocument,
 )
+from xml.sax.saxutils import escape
 import logging
 import os
 import shutil
@@ -26,6 +27,19 @@ from .config import TomwerConfig, TomwerSplashScreen
 import tomwer.version
 from urllib.request import urlopen
 
+try:
+    import nabu
+except ImportError:
+    has_nabu = False
+else:
+    has_nabu = True
+try:
+    import nxtomomill.version
+except ImportError:
+    has_nxtomomill = False
+else:
+    has_nxtomomill = True
+
 _logger = logging.getLogger(__file__)
 
 MAX_LOG_FILE = 10
@@ -68,20 +82,27 @@ class MainWindow(_MainWindow):
         super().setup_menu()
         self.view_menu.addAction(self.show_processes_manager_action)
 
+    def open_about(self):
+        # type: () -> None
+        """Open the about dialog."""
+        dlg = AboutDialog(self)
+        dlg.setAttribute(qt.Qt.WA_DeleteOnClose)
+        dlg.exec()
+
 
 log = logging.getLogger(__name__)
 
 
-def check_for_updates():
-    pass
+def check_for_updates() -> bool:
+    return False
 
 
-def send_usage_statistics():
-    pass
+def send_usage_statistics() -> bool:
+    return False
 
 
-def pull_notifications():
-    pass
+def pull_notifications() -> bool:
+    return False
 
 
 def make_sql_logger(level=logging.INFO):
@@ -175,6 +196,47 @@ def widget_settings_dir():
     return os.path.join(data_dir(), "widgets")
 
 
+ABOUT_TEMPLATE = """\
+<center>
+<h4>{name}</h4>
+<p>tomwer version: {tomwer_version}</p>
+<p>nabu version: {nabu_version}</p>
+<p>nxtomomill version: {nxtomomill_version}</p>
+</center>
+"""
+
+
+class AboutDialog(qt.QDialog):
+    def __init__(self, parent=None, **kwargs) -> None:
+        super().__init__(parent, **kwargs)
+        layout = qt.QVBoxLayout()
+        label = qt.QLabel(self)
+
+        pixmap, _ = TomwerConfig.splash_screen()
+        pixmap = pixmap.scaled(150, 150)
+
+        label.setPixmap(pixmap)
+
+        layout.addWidget(label, qt.Qt.AlignCenter)
+
+        text = ABOUT_TEMPLATE.format(
+            name=escape("tomwer"),
+            tomwer_version=escape(tomwer.version.version),
+            nabu_version=escape(nabu.version if has_nabu else "not installed"),
+            nxtomomill_version=escape(
+                nxtomomill.version.version if has_nxtomomill else "not installed"
+            ),
+        )
+        text_label = qt.QLabel(text)
+        layout.addWidget(text_label, qt.Qt.AlignCenter)
+
+        buttons = qt.QDialogButtonBox(qt.QDialogButtonBox.Close, qt.Qt.Horizontal, self)
+        layout.addWidget(buttons)
+        buttons.rejected.connect(self.accept)
+        layout.setSizeConstraint(qt.QVBoxLayout.SetFixedSize)
+        self.setLayout(layout)
+
+
 class OMain(_OMain):
     config: TomwerConfig
     DefaultConfig = "tomwer.app.canvas_launcher.config.TomwerConfig"

tomwer/app/canvas_launcher/widgetsscheme.py

@@ -50,9 +50,7 @@ class WidgetsScheme(Scheme):
         return changed
 
     def show_report_view(self):
-        inst = self.report_view()
-        inst.show()
-        inst.raise_()
+        return
 
     def has_report(self):
         """