Skip to content

Commit

Permalink
updated dependencies
Browse files Browse the repository at this point in the history
Also fixed some things to work with the latest versions of ruamel.yaml and PyQt6
  • Loading branch information
toomanybrians committed Feb 27, 2023
1 parent 84dbc6a commit 0e33565
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 25 deletions.
6 changes: 2 additions & 4 deletions mpfmonitor/_version.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
# mpf-monitor
__version__ = '0.56.0'
__version__ = '0.56.1'
__short_version__ = '0.56'
__bcp_version__ = '1.1'
__config_version__ = '5'
__mpf_version_required__ = '0.56.0-dev.1'

version = "MPF Monitor v{} (config_version={}, BCP v{}, Requires MPF v{})".format(
__version__, __config_version__, __bcp_version__, __mpf_version_required__)
version = f"MPF Monitor v{__version__} (config_version={__config_version__}, BCP v{__bcp_version__})"
38 changes: 19 additions & 19 deletions mpfmonitor/core/playfield.py
Original file line number Diff line number Diff line change
Expand Up @@ -219,26 +219,26 @@ def paint(self, painter, option, widget=None):

# Draw based on the shape we want, not device type.
if draw_shape == Shape.CIRCLE:
painter.drawEllipse(self.device_size / -2, self.device_size / -2,
self.device_size, self.device_size)
painter.drawEllipse(int(self.device_size / -2), int(self.device_size / -2),
int(self.device_size), int(self.device_size))

elif draw_shape == Shape.SQUARE:
aspect_ratio = 1 # Smaller for taller rectangles, larger for wider rectangles
painter.drawRect((self.device_size * aspect_ratio) / -2, self.device_size / -2,
self.device_size * aspect_ratio, self.device_size)
painter.drawRect(int((self.device_size * aspect_ratio) / -2), int(self.device_size / -2),
int(self.device_size * aspect_ratio), int(self.device_size))

elif draw_shape == Shape.RECTANGLE:
aspect_ratio = .4 # Smaller for taller rectangles, larger for wider rectangles
painter.drawRect((self.device_size * aspect_ratio) / -2, self.device_size / -2,
self.device_size * aspect_ratio, self.device_size)
painter.drawRect(int((self.device_size * aspect_ratio) / -2), int(self.device_size / -2),
int(self.device_size * aspect_ratio), int(self.device_size))

elif draw_shape == Shape.TRIANGLE:
aspect_ratio = 1
scale = .6
points = QPolygon([
QPoint(0, self.device_size * scale * -1),
QPoint(self.device_size * scale * -1, ((self.device_size * scale) / 2) * aspect_ratio),
QPoint(self.device_size * scale, ((self.device_size * scale) / 2) * aspect_ratio),
QPoint(0, int(self.device_size * scale * -1)),
QPoint(int(self.device_size * scale * -1), int(((self.device_size * scale) / 2) * aspect_ratio)),
QPoint(int(self.device_size * scale), int(((self.device_size * scale) / 2) * aspect_ratio)),
])
painter.drawPolygon(points)

Expand All @@ -256,23 +256,23 @@ def paint(self, painter, option, widget=None):
aspect_ratio = 1
scale = .8
points = QPolygon([
QPoint(0, self.device_size * scale * -1),
QPoint(self.device_size * scale / -2, 0),
QPoint(self.device_size * scale / -4, 0),
QPoint(self.device_size * scale / -4, self.device_size * scale / 2),
QPoint(self.device_size * scale / 4, self.device_size * scale / 2),
QPoint(self.device_size * scale / 4, 0),
QPoint(self.device_size * scale / 2, 0)
QPoint(0, int(self.device_size * scale * -1)),
QPoint(int(self.device_size * scale / -2), 0),
QPoint(int(self.device_size * scale / -4), 0),
QPoint(int(self.device_size * scale / -4), int(self.device_size * scale / 2)),
QPoint(int(self.device_size * scale / 4), int(self.device_size * scale / 2)),
QPoint(int(self.device_size * scale / 4), 0),
QPoint(int(self.device_size * scale / 2), 0)
])
painter.drawPolygon(points)

elif draw_shape == Shape.FLIPPER:
aspect_ratio = 5
scale = .7
points = QPolygon([
QPoint(0, self.device_size * scale * -1),
QPoint(self.device_size * scale * -1, ((self.device_size * scale) / 2) * aspect_ratio),
QPoint(self.device_size * scale, ((self.device_size * scale) / 2) * aspect_ratio),
QPoint(0, int(self.device_size * scale * -1)),
QPoint(int(self.device_size * scale * -1), ((int(self.device_size * scale) / 2) * aspect_ratio)),
QPoint(int(self.device_size * scale), ((int(self.device_size * scale) / 2) * aspect_ratio)),
])
painter.drawPolygon(points)

Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ classifiers=[
"Topic :: Games/Entertainment :: Arcade"
]
dependencies = [
"ruamel.yaml == 0.15.42", # newer than this requires compiled c lib, currently no Mac arm versions
"PyQt6 == 6.3.1", # Jun 17, 2022. Tried 6.4.0 and it broke, so, meh, this is fine.
"ruamel.yaml >= 0.15.42", # Feb 26, 2023 got 0.17 working
"PyQt6 == 6.4.2", # Feb 26, 2023
]
dynamic = ["version"]

Expand Down

0 comments on commit 0e33565

Please sign in to comment.