Refactor model and custom GUI files into subpackages for neatness

CustomGUI for custom or modified qtgui elements like CodeEditor. ModelEditors and its subpackages for model editors ModelEditors.Dialogs for dialogs called by model editors
SasView · Oct 25, 2024 · 0576c83 · 0576c83
1 parent 4c9d71f
commit 0576c83
Show file tree

Hide file tree

Showing 24 changed files with 486 additions and 512 deletions.
diff --git a/src/sas/qtgui/Calculators/GenericScatteringCalculator.py b/src/sas/qtgui/Calculators/GenericScatteringCalculator.py
@@ -25,7 +25,7 @@
 import periodictable
 
 import sas.qtgui.Utilities.GuiUtils as GuiUtils
-from sas.qtgui.Utilities.TabbedModelEditor import TabbedModelEditor
+from sas.qtgui.Utilities.ModelEditors.TabbedEditor.TabbedModelEditor import TabbedModelEditor
 from sas.qtgui.Utilities.GenericReader import GenReader
 from sasdata.dataloader.data_info import Detector, Source
 from sas.system.version import __version__

diff --git a/src/sas/qtgui/MainWindow/GuiManager.py b/src/sas/qtgui/MainWindow/GuiManager.py
@@ -28,9 +28,9 @@
 import sas.qtgui.Utilities.GuiUtils as GuiUtils
 
 import sas.qtgui.Utilities.ObjectLibrary as ObjectLibrary
-from sas.qtgui.Utilities.TabbedModelEditor import TabbedModelEditor
+from sas.qtgui.Utilities.ModelEditors.TabbedEditor.TabbedModelEditor import TabbedModelEditor
 from sas.qtgui.Utilities.PluginManager import PluginManager
-from sas.qtgui.Utilities.ReparameterizationEditor import ReparameterizationEditor
+from sas.qtgui.Utilities.ModelEditors.ReparamEditor.ReparameterizationEditor import ReparameterizationEditor
 from sas.qtgui.Utilities.GridPanel import BatchOutputPanel
 from sas.qtgui.Utilities.ResultPanel import ResultPanel
 from sas.qtgui.Utilities.OrientationViewer.OrientationViewer import show_orientation_viewer
@@ -69,7 +69,7 @@
 
 from sas.qtgui.MainWindow.DataExplorer import DataExplorerWindow
 
-from sas.qtgui.Utilities.AddMultEditor import AddMultEditor
+from sas.qtgui.Utilities.ModelEditors.AddMultEditor.AddMultEditor import AddMultEditor
 from sas.qtgui.Utilities.ImageViewer import ImageViewer
 from sas.qtgui.Utilities.FileConverter import FileConverterWidget
 from sas.qtgui.Utilities.WhatsNew.WhatsNew import WhatsNew

diff --git a/src/sas/qtgui/Utilities/CodeEditor.py → ...s/qtgui/Utilities/CustomGUI/CodeEditor.py b/src/sas/qtgui/Utilities/CodeEditor.py → ...s/qtgui/Utilities/CustomGUI/CodeEditor.py
diff --git a/src/sas/qtgui/Utilities/ParameterTree.py → ...tgui/Utilities/CustomGUI/ParameterTree.py b/src/sas/qtgui/Utilities/ParameterTree.py → ...tgui/Utilities/CustomGUI/ParameterTree.py
diff --git a/src/sas/qtgui/Utilities/DocViewWidget.py b/src/sas/qtgui/Utilities/DocViewWidget.py
@@ -8,7 +8,7 @@
 from twisted.internet import threads
 
 from .UI.DocViewWidgetUI import Ui_DocViewerWindow
-from sas.qtgui.Utilities.TabbedModelEditor import TabbedModelEditor
+from sas.qtgui.Utilities.ModelEditors.TabbedEditor.TabbedModelEditor import TabbedModelEditor
 from sas.sascalc.fit import models
 from sas.sascalc.data_util.calcthread import CalcThread
 from sas.sascalc.doc_regen.makedocumentation import (make_documentation, create_user_files_if_needed,

diff --git a/src/sas/qtgui/Utilities/AddMultEditor.py → ...delEditors/AddMultEditor/AddMultEditor.py b/src/sas/qtgui/Utilities/AddMultEditor.py → ...delEditors/AddMultEditor/AddMultEditor.py
@@ -23,7 +23,7 @@
 from sas.qtgui.Perspectives.Fitting.FittingWidget import SUPPRESSED_MODELS
 
 # Local UI
-from sas.qtgui.Utilities.UI.AddMultEditorUI import Ui_AddMultEditorUI
+from sas.qtgui.Utilities.ModelEditors.AddMultEditor.UI.AddMultEditorUI import Ui_AddMultEditorUI
 
 # Template for the output plugin file
 SUM_TEMPLATE = """