Change hexrd.ui path to hexrdgui

We are removing the namespace package support to simplify things.

Now, all HEXRDGUI code will lie under `hexrdgui` instead of `hexrd.ui`.

Signed-off-by: Patrick Avery <patrick.avery@kitware.com>

conda.recipe/meta.yaml

@@ -8,7 +8,7 @@ source:
 build:
   number: {{ environ.get('GIT_DESCRIBE_NUMBER', 0) }}
   entry_points:
-    - hexrdgui = hexrd.ui.main:main
+    - hexrdgui = hexrdgui.main:main
 
 requirements:
   build:
@@ -29,7 +29,7 @@ requirements:
 
 test:
   imports:
-    - hexrd.ui
+    - hexrdgui
 
 about:
   home: https://github.com/HEXRD/hexrdgui

hexrd/ui/about_dialog.py → hexrdgui/about_dialog.py

@@ -8,8 +8,8 @@
 
 import hexrd
 
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.resource_loader import load_resource
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.resource_loader import load_resource
 
 LOGO_HEIGHT = 80
 
@@ -24,7 +24,7 @@ def __init__(self, parent=None):
         self._populate_versions()
 
     def _populate_hexrd_logo(self):
-        data = load_resource(hexrd.ui.resources.icons,
+        data = load_resource(hexrdgui.resources.icons,
                              'hexrd.ico', binary=True)
         pixmap = QPixmap()
         pixmap.loadFromData(data, 'ico')
@@ -36,7 +36,7 @@ def _calculate_size(self, size):
         return QSize(LOGO_HEIGHT/ratio, LOGO_HEIGHT)
 
     def _populate_logos(self):
-        data = load_resource(hexrd.ui.resources.icons, 'llnl_logo.svg',
+        data = load_resource(hexrdgui.resources.icons, 'llnl_logo.svg',
                              binary=True)
 
         self.ui.logos_horizontal_layout.addStretch()
@@ -47,7 +47,7 @@ def _populate_logos(self):
         self.ui.logos_horizontal_layout.addWidget(llnl, stretch=1)
         self.ui.logos_horizontal_layout.addStretch()
 
-        data = load_resource(hexrd.ui.resources.icons,
+        data = load_resource(hexrdgui.resources.icons,
                              'kitware_logo.svg',  binary=True)
 
         kitware = QSvgWidget()
@@ -57,7 +57,7 @@ def _populate_logos(self):
         self.ui.logos_horizontal_layout.addWidget(kitware, stretch=1)
         self.ui.logos_horizontal_layout.addStretch()
 
-        data = load_resource(hexrd.ui.resources.icons,
+        data = load_resource(hexrdgui.resources.icons,
                              'afrl_logo.png',  binary=True)
 
         pixmap = QPixmap()

hexrd/ui/async_runner.py → hexrdgui/async_runner.py

@@ -1,8 +1,8 @@
 from PySide6.QtCore import QThreadPool, QTimer
 from PySide6.QtWidgets import QMessageBox
 
-from hexrd.ui.async_worker import AsyncWorker
-from hexrd.ui.progress_dialog import ProgressDialog
+from hexrdgui.async_worker import AsyncWorker
+from hexrdgui.progress_dialog import ProgressDialog
 
 
 class AsyncRunner:

hexrd/ui/azimuthal_overlay_editor.py → hexrdgui/azimuthal_overlay_editor.py

@@ -1,5 +1,5 @@
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.ui_loader import UiLoader
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.ui_loader import UiLoader
 
 
 class AzimuthalOverlayEditor:

hexrd/ui/azimuthal_overlay_manager.py → hexrdgui/azimuthal_overlay_manager.py

@@ -4,13 +4,13 @@
     QCheckBox, QComboBox, QHBoxLayout, QHeaderView, QSizePolicy,
     QTableWidgetItem, QWidget
 )
-from hexrd.ui import utils
+from hexrdgui import utils
 
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.azimuthal_overlay_editor import AzimuthalOverlayEditor
-from hexrd.ui.azimuthal_overlay_style_picker import AzimuthalOverlayStylePicker
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils import block_signals
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.azimuthal_overlay_editor import AzimuthalOverlayEditor
+from hexrdgui.azimuthal_overlay_style_picker import AzimuthalOverlayStylePicker
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils import block_signals
 
 import numpy as np
 

hexrd/ui/azimuthal_overlay_style_picker.py → hexrdgui/azimuthal_overlay_style_picker.py

@@ -2,9 +2,9 @@
 from PySide6.QtGui import QColor
 from PySide6.QtWidgets import QColorDialog
 
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils import block_signals
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils import block_signals
 
 
 class AzimuthalOverlayStylePicker(QObject):

hexrd/ui/beam_marker_style_editor.py → hexrdgui/beam_marker_style_editor.py

@@ -5,9 +5,9 @@
 from PySide6.QtGui import QColor
 from PySide6.QtWidgets import QColorDialog
 
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils import block_signals
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils import block_signals
 
 
 class BeamMarkerStyleEditor:

hexrd/ui/brightness_contrast_editor.py → hexrdgui/brightness_contrast_editor.py

@@ -9,9 +9,9 @@
 from matplotlib.backends.backend_qt5agg import FigureCanvas
 from matplotlib.figure import Figure
 
-from hexrd.ui.range_widget import RangeWidget
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils import block_signals, reversed_enumerate
+from hexrdgui.range_widget import RangeWidget
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils import block_signals, reversed_enumerate
 
 
 NUM_INCREMENTS = 1000

hexrd/ui/cal_tree_view.py → hexrdgui/cal_tree_view.py

@@ -6,12 +6,12 @@
 
 import numpy as np
 
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.tree_views.base_tree_item_model import BaseTreeItemModel
-from hexrd.ui.tree_views.tree_item import TreeItem
-from hexrd.ui.tree_views.value_column_delegate import ValueColumnDelegate
-from hexrd.ui import constants
-from hexrd.ui.utils import is_int
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.tree_views.base_tree_item_model import BaseTreeItemModel
+from hexrdgui.tree_views.tree_item import TreeItem
+from hexrdgui.tree_views.value_column_delegate import ValueColumnDelegate
+from hexrdgui import constants
+from hexrdgui.utils import is_int
 
 # Global constants
 FIXED = 0

hexrd/ui/calibration/auto/powder_calibration_dialog.py → hexrdgui/calibration/auto/powder_calibration_dialog.py

@@ -3,8 +3,8 @@
 
 import numpy as np
 
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.ui_loader import UiLoader
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.ui_loader import UiLoader
 
 
 class PowderCalibrationDialog:

hexrd/ui/calibration/auto/powder_runner.py → hexrdgui/calibration/auto/powder_runner.py

@@ -7,13 +7,13 @@
 from PySide6.QtWidgets import QCheckBox, QMessageBox
 
 from hexrd.fitting.calibration import InstrumentCalibrator, PowderCalibrator
-from hexrd.ui.async_runner import AsyncRunner
-from hexrd.ui.constants import ViewType
-from hexrd.ui.create_hedm_instrument import create_hedm_instrument
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.utils import instr_to_internal_dict, masks_applied_to_panel_buffers
+from hexrdgui.async_runner import AsyncRunner
+from hexrdgui.constants import ViewType
+from hexrdgui.create_hedm_instrument import create_hedm_instrument
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.utils import instr_to_internal_dict, masks_applied_to_panel_buffers
 
-from hexrd.ui.calibration.auto import PowderCalibrationDialog
+from hexrdgui.calibration.auto import PowderCalibrationDialog
 
 
 class PowderRunner(QObject):

hexrd/ui/calibration/calibration_runner.py → hexrdgui/calibration/calibration_runner.py

@@ -15,27 +15,27 @@
 )
 from hexrd.instrument import unwrap_h5_to_dict
 
-from hexrd.ui.calibration.auto import (
+from hexrdgui.calibration.auto import (
     PowderCalibrationDialog,
     save_picks_to_overlay,
 )
-from hexrd.ui.calibration.laue_auto_picker_dialog import LaueAutoPickerDialog
-from hexrd.ui.calibration.pick_based_calibration import run_calibration
-from hexrd.ui.calibration.hkl_picks_tree_view_dialog import (
+from hexrdgui.calibration.laue_auto_picker_dialog import LaueAutoPickerDialog
+from hexrdgui.calibration.pick_based_calibration import run_calibration
+from hexrdgui.calibration.hkl_picks_tree_view_dialog import (
     generate_picks_results, overlays_to_tree_format, HKLPicksTreeViewDialog,
     picks_cartesian_to_angles, tree_format_to_picks,
 )
-from hexrd.ui.create_hedm_instrument import create_hedm_instrument
-from hexrd.ui.constants import OverlayType, ViewType
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.line_picker_dialog import LinePickerDialog
-from hexrd.ui.select_item_dialog import SelectItemDialog
-from hexrd.ui.utils import (
+from hexrdgui.create_hedm_instrument import create_hedm_instrument
+from hexrdgui.constants import OverlayType, ViewType
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.line_picker_dialog import LinePickerDialog
+from hexrdgui.select_item_dialog import SelectItemDialog
+from hexrdgui.utils import (
     array_index_in_list, instr_to_internal_dict,
     masks_applied_to_panel_buffers, unique_array_list
 )
-from hexrd.ui.utils.conversions import cart_to_angles
-from hexrd.ui.utils.dicts import ensure_all_keys_match, ndarrays_to_lists
+from hexrdgui.utils.conversions import cart_to_angles
+from hexrdgui.utils.dicts import ensure_all_keys_match, ndarrays_to_lists
 
 
 class CalibrationRunner(QObject):

hexrd/ui/calibration/cartesian_plot.py → hexrdgui/calibration/cartesian_plot.py

@@ -8,11 +8,11 @@
 
 from hexrd.gridutil import cellIndices
 
-from hexrd.ui.constants import ViewType
-from hexrd.ui.create_hedm_instrument import create_hedm_instrument
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.overlays import update_overlay_data
-from hexrd.ui.utils import format_memory_int
+from hexrdgui.constants import ViewType
+from hexrdgui.create_hedm_instrument import create_hedm_instrument
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.overlays import update_overlay_data
+from hexrdgui.utils import format_memory_int
 
 from skimage import transform as tf
 

hexrd/ui/calibration/hedm/calibration_options_dialog.py → hexrdgui/calibration/hedm/calibration_options_dialog.py

@@ -1,9 +1,9 @@
 from PySide6.QtCore import QObject, Signal
 
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.grains_viewer_dialog import GrainsViewerDialog
-from hexrd.ui.reflections_table import ReflectionsTable
-from hexrd.ui.ui_loader import UiLoader
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.grains_viewer_dialog import GrainsViewerDialog
+from hexrdgui.reflections_table import ReflectionsTable
+from hexrdgui.ui_loader import UiLoader
 
 
 class HEDMCalibrationOptionsDialog(QObject):

hexrd/ui/calibration/hedm/calibration_results_dialog.py → hexrdgui/calibration/hedm/calibration_results_dialog.py

@@ -5,8 +5,8 @@
 from matplotlib.figure import Figure
 import numpy as np
 
-from hexrd.ui.navigation_toolbar import NavigationToolbar
-from hexrd.ui.ui_loader import UiLoader
+from hexrdgui.navigation_toolbar import NavigationToolbar
+from hexrdgui.ui_loader import UiLoader
 
 
 DEFAULT_STYLE = 'rx'

hexrd/ui/calibration/hedm/calibration_runner.py → hexrdgui/calibration/hedm/calibration_runner.py

@@ -6,16 +6,16 @@
 from hexrd.fitting import calibration
 from hexrd.transforms import xfcapi
 
-from hexrd.ui.calibration.hedm import (
+from hexrdgui.calibration.hedm import (
     HEDMCalibrationOptionsDialog,
     HEDMCalibrationResultsDialog,
 )
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.indexing.create_config import (
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.indexing.create_config import (
     create_indexing_config, OmegasNotFoundError
 )
-from hexrd.ui.message_box import MessageBox
-from hexrd.ui.utils import instr_to_internal_dict
+from hexrdgui.message_box import MessageBox
+from hexrdgui.utils import instr_to_internal_dict
 
 
 class HEDMCalibrationRunner(QObject):

hexrd/ui/calibration/hkl_picks_tree_view_dialog.py → hexrdgui/calibration/hkl_picks_tree_view_dialog.py

@@ -11,13 +11,13 @@
 
 from hexrd.instrument import unwrap_dict_to_h5, unwrap_h5_to_dict
 
-from hexrd.ui.constants import ViewType
-from hexrd.ui.create_hedm_instrument import create_hedm_instrument
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.tree_views.hkl_picks_tree_view import HKLPicksTreeView
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils.conversions import angles_to_cart, cart_to_angles
-from hexrd.ui.utils.dicts import ensure_all_keys_match, ndarrays_to_lists
+from hexrdgui.constants import ViewType
+from hexrdgui.create_hedm_instrument import create_hedm_instrument
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.tree_views.hkl_picks_tree_view import HKLPicksTreeView
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils.conversions import angles_to_cart, cart_to_angles
+from hexrdgui.utils.dicts import ensure_all_keys_match, ndarrays_to_lists
 
 
 class HKLPicksTreeViewDialog:

hexrd/ui/calibration/laue_auto_picker_dialog.py → hexrdgui/calibration/laue_auto_picker_dialog.py

@@ -2,8 +2,8 @@
 
 import numpy as np
 
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.ui_loader import UiLoader
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.ui_loader import UiLoader
 
 
 class LaueAutoPickerDialog:

hexrd/ui/calibration/panel_buffer_dialog.py → hexrdgui/calibration/panel_buffer_dialog.py

@@ -7,10 +7,10 @@
 import matplotlib.pyplot as plt
 import numpy as np
 
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.ui_loader import UiLoader
-from hexrd.ui.utils import block_signals
-from hexrd.ui.utils.dialog import add_help_url
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.ui_loader import UiLoader
+from hexrdgui.utils import block_signals
+from hexrdgui.utils.dialog import add_help_url
 
 CONFIG_MODE_BORDER = 'border'
 CONFIG_MODE_NUMPY = 'numpy'

hexrd/ui/calibration/polar_plot.py → hexrdgui/calibration/polar_plot.py

@@ -5,11 +5,11 @@
 
 from .polarview import PolarView
 
-from hexrd.ui.constants import ViewType
-from hexrd.ui.create_hedm_instrument import create_hedm_instrument
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.overlays import update_overlay_data
-from hexrd.ui.calibration.utils.maud_headers import header0, header, block_hdr
+from hexrdgui.constants import ViewType
+from hexrdgui.create_hedm_instrument import create_hedm_instrument
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.overlays import update_overlay_data
+from hexrdgui.calibration.utils.maud_headers import header0, header, block_hdr
 
 
 def polar_viewer():

hexrd/ui/calibration/polarview.py → hexrdgui/calibration/polarview.py

@@ -12,8 +12,8 @@
 )
 from hexrd import instrument
 
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.utils import SnipAlgorithmType, run_snip1d, snip_width_pixels
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.utils import SnipAlgorithmType, run_snip1d, snip_width_pixels
 
 tvec_c = ct.zeros_3
 

hexrd/ui/calibration/raw_iviewer.py → hexrdgui/calibration/raw_iviewer.py

@@ -1,7 +1,7 @@
-from hexrd.ui.constants import ViewType
-from hexrd.ui.create_hedm_instrument import create_hedm_instrument
-from hexrd.ui.hexrd_config import HexrdConfig
-from hexrd.ui.overlays import update_overlay_data
+from hexrdgui.constants import ViewType
+from hexrdgui.create_hedm_instrument import create_hedm_instrument
+from hexrdgui.hexrd_config import HexrdConfig
+from hexrdgui.overlays import update_overlay_data
 
 
 def raw_iviewer():