ref: move matrix files to separate submodule

README.rst

@@ -44,5 +44,4 @@ Testing
 .. |Coverage Status| image:: https://img.shields.io/codecov/c/github/ZELLMECHANIK-DRESDEN/ShapeOut2/master.svg
    :target: https://codecov.io/gh/ZELLMECHANIK-DRESDEN/ShapeOut2
 .. |Docs Status| image:: https://readthedocs.org/projects/ShapeOut2/badge/?version=latest
-   :target: https://readthedocs.org/projects/ShapeOut2/builds/
-
+   :target: https://readthedocs.org/projects/shapeout2/builds/

shapeout2/gui/main.ui

@@ -491,7 +491,7 @@
   <customwidget>
    <class>DataMatrix</class>
    <extends>QWidget</extends>
-   <header>shapeout2.gui.matrix</header>
+   <header>shapeout2.gui.matrix.data_matrix</header>
    <container>1</container>
   </customwidget>
  </customwidgets>

shapeout2/gui/matrix.py → shapeout2/gui/matrix/data_matrix.py

@@ -4,9 +4,9 @@
 import numpy as np
 from PyQt5 import QtCore, QtWidgets
 
-from .matrix_dataset import MatrixDataset
-from .matrix_filter import MatrixFilter
-from .matrix_element import MatrixElement
+from .dm_dataset import MatrixDataset
+from .dm_filter import MatrixFilter
+from .dm_element import MatrixElement
 
 
 class DataMatrix(QtWidgets.QWidget):

shapeout2/gui/matrix_dataset.py → shapeout2/gui/matrix/dm_dataset.py

@@ -2,7 +2,7 @@
 
 from PyQt5 import uic, QtWidgets, QtCore
 
-from .. import meta_tool
+from ... import meta_tool
 
 
 class MatrixDataset(QtWidgets.QWidget):
@@ -19,7 +19,7 @@ def __init__(self, path=None):
         """
         QtWidgets.QWidget.__init__(self)
         path_ui = pkg_resources.resource_filename(
-            "shapeout2.gui", "matrix_dataset.ui")
+            "shapeout2.gui.matrix", "dm_dataset.ui")
         uic.loadUi(path_ui, self)
 
         MatrixDataset._instance_counter += 1

shapeout2/gui/matrix_element.py → shapeout2/gui/matrix/dm_element.py

@@ -10,7 +10,7 @@ class MatrixElement(QtWidgets.QWidget):
     def __init__(self):
         QtWidgets.QWidget.__init__(self)
         path_ui = pkg_resources.resource_filename(
-            "shapeout2.gui", "matrix_element.ui")
+            "shapeout2.gui.matrix", "dm_element.ui")
         uic.loadUi(path_ui, self)
 
         self.active = False

shapeout2/gui/matrix_filter.py → shapeout2/gui/matrix/dm_filter.py

@@ -12,7 +12,7 @@ class MatrixFilter(QtWidgets.QWidget):
     def __init__(self, title="FS?"):
         QtWidgets.QWidget.__init__(self)
         path_ui = pkg_resources.resource_filename(
-            "shapeout2.gui", "matrix_filter.ui")
+            "shapeout2.gui.matrix", "dm_filter.ui")
         uic.loadUi(path_ui, self)
 
         MatrixFilter._instance_counter += 1