pytec/MANIFEST.in

@@ -1,3 +1,4 @@
-include resources/*.ico
-include view/param_tree.json
-include view/tec_qt.ui
+graft examples
+include pytec/gui/resources/artiq.ico
+include pytec/gui/view/param_tree.json
+include pytec/gui/view/tec_qt.ui

pytec/pytec/gui/model/thermostat.py

@@ -1,7 +1,7 @@
 from pytec.aioclient import Client
 from PyQt6.QtCore import pyqtSignal, QObject, pyqtSlot
 from qasync import asyncSlot
-from model.property import Property, PropertyMeta
+from pytec.gui.model.property import Property, PropertyMeta
 import asyncio
 import logging
 

pytec/pytec/gui/view/tec_qt.ui

@@ -588,7 +588,7 @@
   <customwidget>
    <class>QtWaitingSpinner</class>
    <extends>QWidget</extends>
-   <header>view.waitingspinnerwidget</header>
+   <header>pytec.gui.view.waitingspinnerwidget</header>
    <container>1</container>
   </customwidget>
  </customwidgets>

pytec/tec_qt.py

@@ -1,13 +1,13 @@
-from view.zero_limits_warning import ZeroLimitsWarningView
-from view.net_settings_input_diag import NetSettingsInputDiag
-from view.thermostat_ctrl_menu import ThermostatCtrlMenu
-from view.conn_menu import ConnMenu
-from view.plot_options_menu import PlotOptionsMenu
-from view.live_plot_view import LiveDataPlotter
-from view.ctrl_panel import CtrlPanel
-from view.info_box import InfoBox
-from model.pid_autotuner import PIDAutoTuner
-from model.thermostat import WrappedClient, Thermostat
+from pytec.gui.view.zero_limits_warning import ZeroLimitsWarningView
+from pytec.gui.view.net_settings_input_diag import NetSettingsInputDiag
+from pytec.gui.view.thermostat_ctrl_menu import ThermostatCtrlMenu
+from pytec.gui.view.conn_menu import ConnMenu
+from pytec.gui.view.plot_options_menu import PlotOptionsMenu
+from pytec.gui.view.live_plot_view import LiveDataPlotter
+from pytec.gui.view.ctrl_panel import CtrlPanel
+from pytec.gui.view.info_box import InfoBox
+from pytec.gui.model.pid_autotuner import PIDAutoTuner
+from pytec.gui.model.thermostat import WrappedClient, Thermostat
 import json
 from autotune import PIDAutotuneState
 from qasync import asyncSlot, asyncClose
@@ -47,7 +47,7 @@ def get_argparser():
     parser.add_argument(
         "-p",
         "--param_tree",
-        default=importlib.resources.files("view").joinpath("param_tree.json"),
+        default=importlib.resources.files("pytec.gui.view").joinpath("param_tree.json"),
         help="Param Tree Description JSON File",
     )
 
@@ -60,7 +60,7 @@ class MainWindow(QtWidgets.QMainWindow):
     def __init__(self, args):
         super(MainWindow, self).__init__()
 
-        ui_file_path = importlib.resources.files("view").joinpath("tec_qt.ui")
+        ui_file_path = importlib.resources.files("pytec.gui.view").joinpath("tec_qt.ui")
         uic.loadUi(ui_file_path, self)
 
         self.show()
@@ -419,7 +419,7 @@ async def coro_main():
     app = QtWidgets.QApplication.instance()
     app.aboutToQuit.connect(app_quit_event.set)
     app.setWindowIcon(
-        QtGui.QIcon(str(importlib.resources.files("resources").joinpath("artiq.ico")))
+        QtGui.QIcon(str(importlib.resources.files("pytec.gui.resources").joinpath("artiq.ico")))
     )
 
     main_window = MainWindow(args)