Skip to content

Commit

Permalink
Merge pull request #4 from pperanich/dev
Browse files Browse the repository at this point in the history
Minor patch to revert Pyside file in examples.
  • Loading branch information
pperanich committed Jul 11, 2024
2 parents 75b1018 + debe3eb commit c1113ed
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 155 deletions.
8 changes: 3 additions & 5 deletions examples/frontends/line_vis_frontend.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,12 @@

from qtpy import QtGui
from qtpy import QtWidgets
from qtpy.uic import loadUi

from ezmsg.vispy.frontends.main_window import EzMainWindow
from ezmsg.vispy.frontends.main_window import register_command
from ezmsg.vispy.frontends.main_window import register_response

sys.path.append(str(Path(__file__).parent))
from ui_line_vis_frontend import Ui_AppWindow

logger = logging.getLogger(__name__)


Expand All @@ -23,14 +21,14 @@ class WaveformCfgMessage:
start: bool


class LineVisFrontend(EzMainWindow, Ui_AppWindow):
class LineVisFrontend(EzMainWindow):
ez_frequency_dial: QtWidgets.QDial
ez_waveform_type: QtWidgets.QComboBox
ez_start_btn: QtWidgets.QPushButton

def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self.setupUi(self)
loadUi(__file__.replace(".py", ".ui"), self)

self.ez_waveform_type.addItem(QtGui.QIcon("resources/sine.png"), "sine")
self.ez_waveform_type.addItem(QtGui.QIcon("resources/triangle.png"), "sawtooth")
Expand Down
148 changes: 0 additions & 148 deletions examples/frontends/ui_line_vis_frontend.py

This file was deleted.

3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[project]
name = "ezmsg-vispy"
version = "0.3.0"
version = "0.3.1"
license = { file = "LICENSE.txt" }
readme = "README.md"
requires-python = ">=3.9"
Expand All @@ -14,6 +14,7 @@ dependencies = [
]

[tool.rye]
managed = true
dev-dependencies = ["pre-commit>=3.7.0"]
universal = true

Expand Down
2 changes: 1 addition & 1 deletion src/ezmsg/vispy/frontends/main_window.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
logging.getLogger("qdarkstyle").setLevel(logging.WARNING)
logger = logging.getLogger(__name__)

PYQT_SLOT = Union[Callable[..., None], QtCore.Signal]
PYQT_SLOT = Union[Callable[..., None], QtCore.SignalInstance]


def merge(a, b, path=None):
Expand Down

0 comments on commit c1113ed

Please sign in to comment.