diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 6ba1724..e9e0292 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -2,5 +2,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
index 6e6eec1..79ee123 100644
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -1,6 +1,5 @@
-
\ No newline at end of file
diff --git a/corrscope/corrscope.py b/corrscope/corrscope.py
index 68962a3..809c70a 100644
--- a/corrscope/corrscope.py
+++ b/corrscope/corrscope.py
@@ -1,6 +1,5 @@
# -*- coding: utf-8 -*-
import time
-import warnings
from contextlib import ExitStack, contextmanager
from enum import unique, IntEnum
from fractions import Fraction
@@ -12,16 +11,9 @@ import attr
from corrscope import outputs as outputs_
from corrscope.channel import Channel, ChannelConfig
-from corrscope.config import (
- KeywordAttrs,
- register_enum,
- Ignored,
- CorrError,
- CorrWarning,
-)
-
-from corrscope.renderer import MatplotlibRenderer, RendererConfig
+from corrscope.config import KeywordAttrs, register_enum, CorrError
from corrscope.layout import LayoutConfig
+from corrscope.renderer import MatplotlibRenderer, RendererConfig
from corrscope.triggers import ITriggerConfig, CorrelationTriggerConfig, PerFrameCache
from corrscope.util import pushd, coalesce
from corrscope.wave import Wave
diff --git a/corrscope/gui/data_bind.py b/corrscope/gui/data_bind.py
index 233649c..e1d96c1 100644
--- a/corrscope/gui/data_bind.py
+++ b/corrscope/gui/data_bind.py
@@ -7,7 +7,7 @@ from PyQt5.QtCore import pyqtSlot
from PyQt5.QtGui import QPalette, QColor
from PyQt5.QtWidgets import QWidget
-from corrscope.config import CorrError
+from corrscope.config import CorrError, DumpableAttrs
from corrscope.triggers import lerp
from corrscope.util import obj_name, perr
@@ -18,7 +18,6 @@ __all__ = ["PresentationModel", "map_gui", "behead", "rgetattr", "rsetattr"]
WidgetUpdater = Callable[[], None]
-Attrs = Any
class PresentationModel(qc.QObject):
@@ -35,7 +34,7 @@ class PresentationModel(qc.QObject):
combo_text: Dict[str, List[str]]
edited = qc.pyqtSignal()
- def __init__(self, cfg: Attrs):
+ def __init__(self, cfg: DumpableAttrs):
super().__init__()
self.cfg = cfg
self.update_widget: Dict[str, WidgetUpdater] = {}
@@ -58,7 +57,7 @@ class PresentationModel(qc.QObject):
else:
raise AttributeError(f"cannot set attribute {key} on {obj_name(self)}()")
- def set_cfg(self, cfg: Attrs):
+ def set_cfg(self, cfg: DumpableAttrs):
self.cfg = cfg
for updater in self.update_widget.values():
updater()
diff --git a/corrscope/settings/__init__.py b/corrscope/settings/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 0000000..e69de29