refactoring the plotting system

plottr/__init__.py

@@ -1,4 +1,4 @@
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, List, Tuple
 import os
 
 if TYPE_CHECKING:
@@ -14,8 +14,37 @@
 Flowchart = pgFlowchart
 NodeBase = pgNode
 
-plottrPath = os.path.split(os.path.abspath(__file__))[0]
-
 from ._version import get_versions
 __version__ = get_versions()['version']
 del get_versions
+
+plottrPath = os.path.split(os.path.abspath(__file__))[0]
+
+
+def configPaths() -> Tuple[str, str, str]:
+    """Get the folders where plottr looks for config files.
+
+    :return: List of absolute paths, in order of priority:
+        (1) current working directory
+        (2) ~/.plottr
+        (3) config directory in the package.
+    """
+    builtIn = os.path.join(plottrPath, 'config')
+    user = os.path.join(os.path.expanduser("~"), '.plottr')
+    cwd = os.getcwd()
+    return cwd, user, builtIn
+
+
+def configFiles(fileName: str) -> List[str]:
+    """Get available config files with the given file name.
+
+    :param fileName: file name, without path
+    :return: List of found config files with the provided name, in order
+        or priority.
+    """
+    ret = []
+    for path in configPaths():
+        fp = os.path.join(path, fileName)
+        if os.path.exists(fp):
+            ret.append(fp)
+    return ret

plottr/config/plottr_default.mplstyle

@@ -0,0 +1,28 @@
+axes.grid: True
+axes.prop_cycle: cycler('color', ['1f77b4', 'ff7f0e', '2ca02c', 'd62728', '9467bd', '8c564b', 'e377c2', '7f7f7f', 'bcbd22', '17becf'])
+
+figure.dpi: 150
+figure.figsize: 4.5, 3
+
+font.size: 6
+font.family: Helvetica, Arial, DejaVu Sans, Bitstream Vera Sans
+
+grid.linewidth: 0.5
+grid.linestyle: --
+
+image.cmap: magma
+
+legend.fontsize: 6
+legend.frameon: True
+legend.numpoints: 1
+legend.scatterpoints: 1
+
+lines.marker: o
+lines.markersize: 3
+lines.markeredgewidth: 1
+lines.markerfacecolor: w
+lines.linestyle: -
+lines.linewidth: 1
+
+savefig.dpi: 300
+savefig.transparent: False

plottr/gui/widgets.py

@@ -9,7 +9,7 @@
 from .tools import dictToTreeWidgetItems
 from plottr import QtCore, Flowchart, QtWidgets, Signal, Slot
 from plottr.node import Node, linearFlowchart
-from ..plot import PlotNode, PlotWidgetContainer, MPLAutoPlot
+from ..plot import PlotNode, PlotWidgetContainer, PlotWidget
 
 __author__ = 'Wolfgang Pfaff'
 __license__ = 'MIT'
@@ -74,15 +74,20 @@ class PlotWindow(QtWidgets.QMainWindow):
     :meth:`addNodeWidgetFromFlowchart`.
     """
 
-    plotWidgetClass = MPLAutoPlot
-
     def __init__(self, parent: Optional[QtWidgets.QMainWindow] = None,
-                 fc: Optional[Flowchart] = None, **kw: Any):
+                 fc: Optional[Flowchart] = None,
+                 plotWidgetClass: Optional[Any] = None,
+                 **kw: Any):
         super().__init__(parent)
 
+        if plotWidgetClass is None:
+            from ..plot.mpl import AutoPlot
+            plotWidgetClass = AutoPlot
+
+        self.plotWidgetClass = plotWidgetClass
         self.plot = PlotWidgetContainer(parent=self)
         self.setCentralWidget(self.plot)
-        self.plotWidget: Optional[MPLAutoPlot] = None
+        self.plotWidget: Optional[PlotWidget] = None
 
         self.nodeToolBar = QtWidgets.QToolBar('Node control', self)
         self.addToolBar(self.nodeToolBar)

plottr/plot/__init__.py

@@ -1,2 +1,2 @@
-from .base import PlotNode, PlotWidgetContainer, makeFlowchartWithPlot
-from .mpl import AutoPlot as MPLAutoPlot
+from .base import PlotNode, PlotWidgetContainer, makeFlowchartWithPlot, \
+    PlotWidget