From 3a40c037aae179ed53973ba4e85c1b479f9fb7d7 Mon Sep 17 00:00:00 2001 From: Sven Augustin Date: Mon, 19 Dec 2022 14:09:09 +0100 Subject: [PATCH] introduced a base folder --- grum.py | 6 +++--- grum/__init__.py | 0 assets.py => grum/assets.py | 0 {assets => grum/assets}/char.png | Bin {assets => grum/assets}/icon.png | Bin {assets => grum/assets}/logo.png | Bin ctrl_c.py => grum/ctrl_c.py | 0 dictlist.py => grum/dictlist.py | 0 exampledata.py => grum/exampledata.py | 2 +- mainwin.py => grum/mainwin.py | 14 +++++++------- mdiarea.py => grum/mdiarea.py | 4 ++-- mdisubplot.py => grum/mdisubplot.py | 2 +- plotdesc.py => grum/plotdesc.py | 2 +- rpcclient.py => grum/rpcclient.py | 0 rpcserver.py => grum/rpcserver.py | 0 rpcserverthread.py => grum/rpcserverthread.py | 2 +- theme.py => grum/theme.py | 0 17 files changed, 16 insertions(+), 16 deletions(-) create mode 100644 grum/__init__.py rename assets.py => grum/assets.py (100%) rename {assets => grum/assets}/char.png (100%) rename {assets => grum/assets}/icon.png (100%) rename {assets => grum/assets}/logo.png (100%) rename ctrl_c.py => grum/ctrl_c.py (100%) rename dictlist.py => grum/dictlist.py (100%) rename exampledata.py => grum/exampledata.py (90%) rename mainwin.py => grum/mainwin.py (88%) rename mdiarea.py => grum/mdiarea.py (96%) rename mdisubplot.py => grum/mdisubplot.py (96%) rename plotdesc.py => grum/plotdesc.py (95%) rename rpcclient.py => grum/rpcclient.py (100%) rename rpcserver.py => grum/rpcserver.py (100%) rename rpcserverthread.py => grum/rpcserverthread.py (97%) rename theme.py => grum/theme.py (100%) diff --git a/grum.py b/grum.py index 501da41..ab409f5 100755 --- a/grum.py +++ b/grum.py @@ -3,9 +3,9 @@ import sys from PyQt5.QtWidgets import QApplication -import ctrl_c -import theme -from mainwin import MainWindow +from grum import ctrl_c +from grum import theme +from grum.mainwin import MainWindow app = QApplication(sys.argv) diff --git a/grum/__init__.py b/grum/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/assets.py b/grum/assets.py similarity index 100% rename from assets.py rename to grum/assets.py diff --git a/assets/char.png b/grum/assets/char.png similarity index 100% rename from assets/char.png rename to grum/assets/char.png diff --git a/assets/icon.png b/grum/assets/icon.png similarity index 100% rename from assets/icon.png rename to grum/assets/icon.png diff --git a/assets/logo.png b/grum/assets/logo.png similarity index 100% rename from assets/logo.png rename to grum/assets/logo.png diff --git a/ctrl_c.py b/grum/ctrl_c.py similarity index 100% rename from ctrl_c.py rename to grum/ctrl_c.py diff --git a/dictlist.py b/grum/dictlist.py similarity index 100% rename from dictlist.py rename to grum/dictlist.py diff --git a/exampledata.py b/grum/exampledata.py similarity index 90% rename from exampledata.py rename to grum/exampledata.py index c60c84a..65d8942 100644 --- a/exampledata.py +++ b/grum/exampledata.py @@ -1,5 +1,5 @@ import numpy as np -from plotdesc import PlotDescription +from .plotdesc import PlotDescription X = np.arange(100) / 10 diff --git a/mainwin.py b/grum/mainwin.py similarity index 88% rename from mainwin.py rename to grum/mainwin.py index 5c66198..e9685bd 100644 --- a/mainwin.py +++ b/grum/mainwin.py @@ -1,13 +1,13 @@ from PyQt5.QtCore import Qt, pyqtSignal from PyQt5.QtWidgets import QMainWindow, QSplitter -import assets -from dictlist import DictList -from mdiarea import MDIArea -from mdisubplot import MDISubPlot -from rpcserverthread import RPCServerThread -from plotdesc import PlotDescription -from exampledata import exampledata +from . import assets +from .dictlist import DictList +from .mdiarea import MDIArea +from .mdisubplot import MDISubPlot +from .rpcserverthread import RPCServerThread +from .plotdesc import PlotDescription +from .exampledata import exampledata class MainWindow(QMainWindow): diff --git a/mdiarea.py b/grum/mdiarea.py similarity index 96% rename from mdiarea.py rename to grum/mdiarea.py index 316c4e2..c88c760 100644 --- a/mdiarea.py +++ b/grum/mdiarea.py @@ -1,8 +1,8 @@ from PyQt5.QtWidgets import QMdiArea, QAction from PyQt5.QtGui import QPainter -import assets -from theme import MDI_BKG +from . import assets +from .theme import MDI_BKG class MDIArea(QMdiArea): diff --git a/mdisubplot.py b/grum/mdisubplot.py similarity index 96% rename from mdisubplot.py rename to grum/mdisubplot.py index e7779d7..a135111 100644 --- a/mdisubplot.py +++ b/grum/mdisubplot.py @@ -1,7 +1,7 @@ from PyQt5.QtCore import Qt from PyQt5.QtWidgets import QMdiSubWindow import pyqtgraph as pg -import assets +from . import assets class MDISubPlot(QMdiSubWindow): diff --git a/plotdesc.py b/grum/plotdesc.py similarity index 95% rename from plotdesc.py rename to grum/plotdesc.py index 945681d..49882ae 100644 --- a/plotdesc.py +++ b/grum/plotdesc.py @@ -1,4 +1,4 @@ -from theme import pg_plot_style +from .theme import pg_plot_style class PlotDescription: diff --git a/rpcclient.py b/grum/rpcclient.py similarity index 100% rename from rpcclient.py rename to grum/rpcclient.py diff --git a/rpcserver.py b/grum/rpcserver.py similarity index 100% rename from rpcserver.py rename to grum/rpcserver.py diff --git a/rpcserverthread.py b/grum/rpcserverthread.py similarity index 97% rename from rpcserverthread.py rename to grum/rpcserverthread.py index b0640d5..631be7f 100644 --- a/rpcserverthread.py +++ b/grum/rpcserverthread.py @@ -1,6 +1,6 @@ import atexit from threading import Thread -from rpcserver import RPCServer +from .rpcserver import RPCServer class RPCServerThread(Thread): diff --git a/theme.py b/grum/theme.py similarity index 100% rename from theme.py rename to grum/theme.py