From bb145e66d2458f9581b47885557a15123e238892 Mon Sep 17 00:00:00 2001 From: Sven Augustin Date: Mon, 19 Dec 2022 14:16:16 +0100 Subject: [PATCH] introduced sub folders for mdi and rpc files --- grum/mainwin.py | 5 ++--- grum/mdi/__init__.py | 5 +++++ grum/{ => mdi}/mdiarea.py | 4 ++-- grum/{ => mdi}/mdisubplot.py | 2 +- grum/rpc/__init__.py | 6 ++++++ grum/{ => rpc}/rpcclient.py | 0 grum/{ => rpc}/rpcserver.py | 0 grum/{ => rpc}/rpcserverthread.py | 0 8 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 grum/mdi/__init__.py rename grum/{ => mdi}/mdiarea.py (96%) rename grum/{ => mdi}/mdisubplot.py (96%) create mode 100644 grum/rpc/__init__.py rename grum/{ => rpc}/rpcclient.py (100%) rename grum/{ => rpc}/rpcserver.py (100%) rename grum/{ => rpc}/rpcserverthread.py (100%) diff --git a/grum/mainwin.py b/grum/mainwin.py index e9685bd..008543e 100644 --- a/grum/mainwin.py +++ b/grum/mainwin.py @@ -3,9 +3,8 @@ from PyQt5.QtWidgets import QMainWindow, QSplitter from . import assets from .dictlist import DictList -from .mdiarea import MDIArea -from .mdisubplot import MDISubPlot -from .rpcserverthread import RPCServerThread +from .mdi import MDIArea, MDISubPlot +from .rpc import RPCServerThread from .plotdesc import PlotDescription from .exampledata import exampledata diff --git a/grum/mdi/__init__.py b/grum/mdi/__init__.py new file mode 100644 index 0000000..acce841 --- /dev/null +++ b/grum/mdi/__init__.py @@ -0,0 +1,5 @@ + +from .mdiarea import MDIArea +from .mdisubplot import MDISubPlot + + diff --git a/grum/mdiarea.py b/grum/mdi/mdiarea.py similarity index 96% rename from grum/mdiarea.py rename to grum/mdi/mdiarea.py index c88c760..a2d3b23 100644 --- a/grum/mdiarea.py +++ b/grum/mdi/mdiarea.py @@ -1,8 +1,8 @@ from PyQt5.QtWidgets import QMdiArea, QAction from PyQt5.QtGui import QPainter -from . import assets -from .theme import MDI_BKG +from .. import assets +from ..theme import MDI_BKG class MDIArea(QMdiArea): diff --git a/grum/mdisubplot.py b/grum/mdi/mdisubplot.py similarity index 96% rename from grum/mdisubplot.py rename to grum/mdi/mdisubplot.py index a135111..af3b4d2 100644 --- a/grum/mdisubplot.py +++ b/grum/mdi/mdisubplot.py @@ -1,7 +1,7 @@ from PyQt5.QtCore import Qt from PyQt5.QtWidgets import QMdiSubWindow import pyqtgraph as pg -from . import assets +from .. import assets class MDISubPlot(QMdiSubWindow): diff --git a/grum/rpc/__init__.py b/grum/rpc/__init__.py new file mode 100644 index 0000000..4826f64 --- /dev/null +++ b/grum/rpc/__init__.py @@ -0,0 +1,6 @@ + +from .rpcclient import RPCClient +from .rpcserver import RPCServer +from .rpcserverthread import RPCServerThread + + diff --git a/grum/rpcclient.py b/grum/rpc/rpcclient.py similarity index 100% rename from grum/rpcclient.py rename to grum/rpc/rpcclient.py diff --git a/grum/rpcserver.py b/grum/rpc/rpcserver.py similarity index 100% rename from grum/rpcserver.py rename to grum/rpc/rpcserver.py diff --git a/grum/rpcserverthread.py b/grum/rpc/rpcserverthread.py similarity index 100% rename from grum/rpcserverthread.py rename to grum/rpc/rpcserverthread.py