Skip to content

Commit

Permalink
Fix "default knit side image" behavior
Browse files Browse the repository at this point in the history
Instead of Scene modifying AyabImage's internal image,
it now reverses the image (if requested) only at render time.
This makes it easier to avoid getting confused with how
many times the image has been reversed.
  • Loading branch information
jonathanperret committed Sep 22, 2024
1 parent 79fc553 commit d59bdf1
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 28 deletions.
4 changes: 0 additions & 4 deletions src/main/python/main/ayab/ayab.py
Original file line number Diff line number Diff line change
Expand Up @@ -185,10 +185,6 @@ def set_image_dimensions(self) -> None:
)
self.scene.refresh()

def reverse_image(self) -> None:
"""Flip image horizontally."""
self.scene.reverse()

def update_start_row(self, start_row: int) -> None:
self.scene.row_progress = start_row
self.engine.status.current_row = start_row
Expand Down
11 changes: 7 additions & 4 deletions src/main/python/main/ayab/engine/options.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ class OptionsTab(SignalSender, QWidget):
def __init__(self, parent: GuiMain):
super().__init__(parent.signal_receiver)
self.prefs = parent.prefs
self.auto_mirror = False
self.ui = Ui_Options()
self.__setup_ui()
self.__activate_ui()
Expand Down Expand Up @@ -113,7 +114,7 @@ def __activate_ui(self) -> None:
self.ui.alignment_combo_box.currentIndexChanged.connect(
lambda: self.emit_alignment_updater(self.__read_alignment())
)
self.ui.auto_mirror_checkbox.clicked.connect(self.__reverse_image)
self.ui.auto_mirror_checkbox.clicked.connect(self.__auto_mirror_changed)

def update_needles(self) -> None:
"""Sends the needles_updater signal."""
Expand All @@ -122,14 +123,15 @@ def update_needles(self) -> None:
stop_needle = NeedleColor.read_stop_needle(self.ui, self.machine)
self.emit_needles_updater(start_needle, stop_needle)

def __reverse_image(self) -> None:
if self.ui.auto_mirror_checkbox.isChecked():
def __auto_mirror_changed(self) -> None:
reversed = self.ui.auto_mirror_checkbox.isChecked()
if reversed:
self.ui.auto_mirror_icon.setPixmap(QPixmap(":/garamond-lowercase-e.png"))
else:
self.ui.auto_mirror_icon.setPixmap(
QPixmap(":/garamond-lowercase-e-reversed.png")
)
self.emit_image_reverser()
self.emit_image_reverser(reversed)

def __read_start_row(self) -> int:
return int(self.ui.start_row_edit.value()) - 1
Expand Down Expand Up @@ -185,6 +187,7 @@ def refresh(self) -> None:
QPixmap(":/garamond-lowercase-e-reversed.png")
)
# self.ui.continuous_reporting_checkbox
self.emit_image_reverser(self.auto_mirror)

def as_dict(self) -> OptionsTabDict:
return OptionsTabDict(
Expand Down
4 changes: 3 additions & 1 deletion src/main/python/main/ayab/engine/pattern.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@

class Pattern(object):
def __init__(self, image: Image.Image, config: OptionsTab, num_colors: int = 2):
self.__pattern = image
self.__pattern = (
image.transpose(Image.FLIP_LEFT_RIGHT) if config.auto_mirror else image
)
self.__num_colors = num_colors
self.__alignment = Alignment.CENTER
self.__pat_start_needle: int = -1
Expand Down
1 change: 0 additions & 1 deletion src/main/python/main/ayab/image.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ def __init__(self, parent: GuiMain):
self.__parent = parent
self.image: Image.Image = None # type: ignore
self.filename: Optional[str] = None
self.reversed = False
self.filename_input = self.__parent.ui.filename_lineedit

def select_file(self) -> None:
Expand Down
21 changes: 8 additions & 13 deletions src/main/python/main/ayab/scene.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
from enum import Enum

from PySide6.QtCore import QRect
from PySide6.QtGui import QImage, QPixmap, QPen, QBrush, QColor, QWheelEvent
from PySide6.QtGui import QImage, QPixmap, QPen, QBrush, QColor, QWheelEvent, QTransform
from PySide6.QtWidgets import (
QGraphicsScene,
QGraphicsRectItem,
Expand All @@ -32,7 +32,6 @@
)

from .image import AyabImage
from .transforms import Transform
from .engine.options import Alignment
from .machine import Machine
from typing import TYPE_CHECKING
Expand Down Expand Up @@ -69,23 +68,17 @@ def __init__(self, parent: GuiMain):
self.__start_needle: int = (machine_width // 2) - 20
self.__stop_needle: int = (machine_width - 1) // 2 + 20
self.__row_progress: int = 0
self.reverse_image = False

# zoom behavior
self.setDragMode(QGraphicsView.DragMode.ScrollHandDrag)
self.__zoom: float = 3

self.ayabimage.reversed = False
if self.__prefs.value("default_knit_side_image"):
self.reverse() # calls refresh(), so no need to call it again
else:
self.refresh()

def reverse(self) -> None:
"""Mirrors the image"""
self.refresh()

if self.ayabimage.image is not None:
self.ayabimage.reversed = not self.ayabimage.reversed
self.ayabimage.image = Transform.hflip(self.ayabimage.image)
def set_image_reversed(self, reversed: bool) -> None:
"""Sets the image reversed flag"""
self.reverse_image = reversed

self.refresh()

Expand All @@ -110,6 +103,8 @@ def refresh(self) -> None:
width, height = self.ayabimage.image.size
data = self.ayabimage.image.convert("RGBA").tobytes("raw", "RGBA")
qim = QImage(data, width, height, QImage.Format.Format_RGBA8888)
if self.reverse_image:
qim = qim.transformed(QTransform.fromScale(-1, 1))
pixmap = QPixmap.fromImage(qim)

# add pattern and locate according to alignment
Expand Down
4 changes: 2 additions & 2 deletions src/main/python/main/ayab/signal_receiver.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class SignalReceiver(QObject):
needles_updater = Signal(int, int)
alignment_updater = Signal(Alignment)
image_resizer = Signal()
image_reverser = Signal()
image_reverser = Signal(bool)
got_image_flag = Signal()
new_image_flag = Signal()
bad_config_flag = Signal()
Expand All @@ -77,7 +77,7 @@ def activate_signals(self, parent: GuiMain) -> None:
self.needles_updater.connect(parent.scene.update_needles)
self.alignment_updater.connect(parent.scene.update_alignment)
self.image_resizer.connect(parent.set_image_dimensions)
self.image_reverser.connect(parent.reverse_image)
self.image_reverser.connect(parent.scene.set_image_reversed)
self.operation_finisher.connect(parent.finish_operation)
self.hw_test_starter.connect(parent.hw_test.open)
self.hw_test_writer.connect(parent.hw_test.output)
4 changes: 2 additions & 2 deletions src/main/python/main/ayab/signal_sender.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ def emit_alignment_updater(self, alignment: Alignment) -> None:
def emit_image_resizer(self) -> None:
self.__signal_receiver.image_resizer.emit()

def emit_image_reverser(self) -> None:
self.__signal_receiver.image_reverser.emit()
def emit_image_reverser(self, reversed: bool) -> None:
self.__signal_receiver.image_reverser.emit(reversed)

def emit_got_image_flag(self) -> None:
self.__signal_receiver.got_image_flag.emit()
Expand Down
2 changes: 1 addition & 1 deletion src/main/python/main/ayab/tests/test_control.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ def __init__(self):


class Config(object):
def __init__(self, machine, mode=Mode.SINGLEBED):
self.machine = machine
self.mode = mode
self.auto_mirror = auto_mirror


class TestControl(unittest.TestCase):
Expand Down

0 comments on commit d59bdf1

Please sign in to comment.