fix: added data converter as dialog

Author: rabii-chaarani

loopstructural/gui/data_conversion/__init__.py

@@ -1,5 +1,5 @@
 """Data conversion GUI components."""
 
-from .data_conversion_widget import DataConversionWidget
+from .data_conversion_widget import AutomaticConversionDialog, AutomaticConversionWidget
 
-__all__ = ["DataConversionWidget"]
+__all__ = ["AutomaticConversionDialog", "AutomaticConversionWidget"]

loopstructural/gui/data_conversion/data_conversion_widget.py

@@ -1,4 +1,4 @@
-"""Data conversion widget displayed inside the LoopStructural dock."""
+"""Data conversion widgets and dialog for LoopStructural."""
 
 from __future__ import annotations
 
@@ -8,6 +8,8 @@
 from PyQt5.QtCore import Qt
 from PyQt5.QtWidgets import (
     QComboBox,
+    QDialog,
+    QDialogButtonBox,
     QFormLayout,
     QHBoxLayout,
     QLabel,
@@ -290,16 +292,16 @@ def _collect_data_sources(self) -> Dict[Datatype | str, str]:
                     data_sources[data_type] = path
         return data_sources
 
-    def _handle_run_conversion(self) -> None:
+    def _handle_run_conversion(self) -> bool:
         converter_option = self.current_converter()
         if converter_option is None:
             self._update_status("Please select a converter before running.", error=True)
-            return
+            return False
 
         sources = self._collect_data_sources()
         if not sources:
             self._update_status("Select at least one data source layer before running.", error=True)
-            return
+            return False
 
         loop_converter: Any = None
         result: Any = None
@@ -314,7 +316,7 @@ def _handle_run_conversion(self) -> None:
                 added_layers = self._add_layers_to_project_group(layers)
         except Exception as exc:  # pragma: no cover - UI feedback
             self._update_status(f"Conversion failed: {exc}", error=True)
-            return
+            return False
 
         if added_layers:
             message = (
@@ -325,6 +327,7 @@ def _handle_run_conversion(self) -> None:
         else:
             message = "Conversion completed successfully."
         self._update_status(message)
+        return True
 
     def _update_status(self, message: str, *, error: bool = False) -> None:
         color = "#c00000" if error else "#006400"
@@ -572,37 +575,38 @@ def _default_converter_options(self) -> List[ConverterOption]:
         return options
 
 
-class DataConversionWidget(QWidget):
-    """High level widget that exposes automatic conversion."""
+class AutomaticConversionDialog(QDialog):
+    """Dialog wrapper for the automatic conversion workflow."""
 
     def __init__(
         self,
         parent: Optional[QWidget] = None,
         *,
-        data_manager: Any = None,
         converters: Optional[Iterable[Any]] = None,
         project: Optional[QgsProject] = None,
     ):
         super().__init__(parent)
-        self.data_manager = data_manager
+        self.setWindowTitle("Data Converter")
         self.project = project or QgsProject.instance()
 
         layout = QVBoxLayout(self)
         description = QLabel("Convert geological datasets for use within LoopStructural.")
         description.setWordWrap(True)
         layout.addWidget(description)
 
-        self.automatic_widget = AutomaticConversionWidget(self, converters=converters, project=self.project)
-        layout.addWidget(self.automatic_widget)
+        self.widget = AutomaticConversionWidget(self, converters=converters, project=self.project)
+        layout.addWidget(self.widget)
+        self.widget.run_button.hide()
 
-    def set_converters(self, converters: Iterable[Any]) -> None:
-        """Update the converter options displayed in the automatic tab."""
-        self.automatic_widget.set_converters(converters)
+        self.button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel, self)
+        self.button_box.accepted.connect(self._run_and_accept)
+        self.button_box.rejected.connect(self.reject)
+        layout.addWidget(self.button_box)
 
-    def get_active_configuration(self) -> Dict[str, Any]:
-        """Return a serialisable summary of the current tab selection."""
-        converter = self.automatic_widget.current_converter()
-        return {
-            "mode": "automatic",
-            "converter": converter.to_dict() if converter else None,
-        }
+    def _run_and_accept(self) -> None:
+        if self.widget._handle_run_conversion():
+            self.accept()
+
+    def set_converters(self, converters: Iterable[Any]) -> None:
+        """Update the converter options displayed in the dialog."""
+        self.widget.set_converters(converters)

loopstructural/gui/loop_widget.py

@@ -7,7 +7,6 @@
 
 from PyQt5.QtWidgets import QTabWidget, QVBoxLayout, QWidget
 
-from .data_conversion import DataConversionWidget
 from .modelling.modelling_widget import ModellingWidget
 from .visualisation.visualisation_widget import VisualisationWidget
 
@@ -51,12 +50,6 @@ def __init__(
         self.visualisation_widget = VisualisationWidget(
             self, mapCanvas=self.mapCanvas, logger=self.logger, model_manager=self.model_manager
         )
-        self.data_conversion_widget = DataConversionWidget(
-            self,
-            data_manager=self.data_manager,
-            project=self.data_manager.project if self.data_manager else None,
-        )
-        tabWidget.addTab(self.data_conversion_widget, "Data Conversion")
         tabWidget.addTab(self.modelling_widget, "Modelling")
         tabWidget.addTab(self.visualisation_widget, "Visualisation")
 
@@ -80,6 +73,3 @@ def get_visualisation_widget(self):
         """
         return self.visualisation_widget
 
-    def get_data_conversion_widget(self):
-        """Return the data conversion widget instance."""
-        return self.data_conversion_widget

loopstructural/plugin_main.py

@@ -140,17 +140,24 @@ def initGui(self):
             self.tr("LoopStructural Modelling"),
             self.iface.mainWindow(),
         )
+        self.action_data_conversion = QAction(
+            self.tr("LoopStructural Data Conversion"),
+            self.iface.mainWindow(),
+        )
+        self.action_data_conversion.triggered.connect(self.show_data_conversion_dialog)
         self.action_visualisation = QAction(
             QIcon(os.path.dirname(__file__) + "/3D_icon.png"),
             self.tr("LoopStructural Visualisation"),
             self.iface.mainWindow(),
         )
 
         self.toolbar.addAction(self.action_modelling)
+        self.toolbar.addAction(self.action_data_conversion)
         self.toolbar.addAction(self.action_fault_topology)
         # -- Menu
         self.iface.addPluginToMenu(__title__, self.action_settings)
         self.iface.addPluginToMenu(__title__, self.action_help)
+        self.iface.addPluginToMenu(__title__, self.action_data_conversion)
         self.initProcessing()
 
         # Map2Loop tool actions
@@ -338,6 +345,16 @@ def show_sampler_dialog(self):
         )
         dialog.exec_()
 
+    def show_data_conversion_dialog(self):
+        """Show the data conversion dialog."""
+        from loopstructural.gui.data_conversion import AutomaticConversionDialog
+
+        dialog = AutomaticConversionDialog(
+            self.iface.mainWindow(),
+            project=self.data_manager.project if self.data_manager else None,
+        )
+        dialog.exec_()
+
     def show_sorter_dialog(self):
         """Show the automatic stratigraphic sorter dialog."""
         from loopstructural.gui.map2loop_tools import SorterDialog
@@ -449,6 +466,7 @@ def unload(self):
         for attr in (
             "action_help",
             "action_settings",
+            "action_data_conversion",
             "action_sampler",
             "action_sorter",
             "action_user_sorter",