Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Further updates to the knit progress view #687

Merged
merged 10 commits into from
Jul 29, 2024
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/python/main/ayab/ayab.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@ def __init__(self, app_context: AppContext):
# self.setStatusBar(self.statusbar)
self.about: About = About(self)
self.scene: Scene = Scene(self)
self.knitprog = KnitProgress(self)
self.engine: Engine = Engine(self)
self.hw_test = HardwareTestDialog(self)
self.progbar = ProgressBar(self)
self.knitprog = KnitProgress(self)
self.flash = FirmwareFlash(self)
self.audio = AudioPlayer(self)
self.knit_thread = GenericThread(self.engine.run, Operation.KNIT)
Expand Down
33 changes: 28 additions & 5 deletions src/main/python/main/ayab/knitprogress.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

from __future__ import annotations
from PySide6.QtCore import QCoreApplication, QRect, Qt
from PySide6.QtWidgets import QTableWidget, QTableWidgetItem, QHeaderView
from PySide6.QtWidgets import QTableWidget, QTableWidgetItem, QHeaderView, QAbstractItemView
from PySide6.QtGui import QBrush, QColor
from typing import TYPE_CHECKING, Optional, cast, List
from math import floor
Expand All @@ -47,13 +47,26 @@ def __init__(self, parent: GuiMain):
self.clear()
self.setRowCount(0)
self.__prefs: Preferences = parent.prefs
self.__progbar = parent.progbar
self.setGeometry(QRect(0, 0, 700, 220))
self.setContentsMargins(1, 1, 1, 1)
self.verticalHeader().setSectionResizeMode(
QHeaderView.ResizeMode.Fixed
)
self.verticalHeader().setSectionsClickable(False)
self.horizontalHeader().setMinimumSectionSize(0)
self.horizontalHeader().setDefaultSectionSize(self.__prefs.value("lower_display_stitch_width"))
self.horizontalHeader().setSectionsClickable(False)
self.horizontalHeader().setSectionResizeMode(
QHeaderView.ResizeMode.Fixed
)
self.setSelectionBehavior(QAbstractItemView.SelectionBehavior.SelectItems)
self.setSelectionMode(QAbstractItemView.SelectionMode.SingleSelection)
self.setEditTriggers(QAbstractItemView.EditTrigger.NoEditTriggers)

self.previousStatus: Optional[Status] = None
self.scene = parent.scene
self.currentItemChanged.connect(self.onStitchSelect)

def start(self) -> None:
self.clearContents()
Expand Down Expand Up @@ -141,19 +154,18 @@ def instantiate_row_from_columns(self, midline: int, columns: List[QTableWidgetI
self.setVerticalHeaderItem(0, QTableWidgetItem("To Be Selected"))
for i, col in enumerate(columns):
self.setItem(0, i, col)
self.setColumnWidth(i, cast(int, self.__prefs.settings.value("lower_display_stitch_width")))
self.setColumnWidth(i, self.__prefs.value("lower_display_stitch_width"))
# when width is under 20, the column numbers are unreadable.
if self.columnWidth(i) < 20:
self.horizontalHeader().setVisible(False)
continue
self.horizontalHeader().setVisible(True)
else:
self.horizontalHeader().setVisible(True)
if i < midline:
header = QTableWidgetItem(f"{(midline)-(i)}")
header.font().setBold(True)
header.setForeground(QBrush(QColor(f"#{self.orange:06x}")))
header.setTextAlignment(Qt.AlignmentFlag.AlignCenter)
self.setHorizontalHeaderItem(i, header)
self.horizontalHeader().setMinimumSectionSize(0)
else:
header = QTableWidgetItem(f"{(i+1)-(midline)}")
header.setForeground(QBrush(QColor(f"#{self.green:06x}")))
Expand Down Expand Up @@ -218,3 +230,14 @@ def __stitch(self, color: int, bit: bool, alt_color: Optional[int] = None, bg_co
if bg_color is not None:
stitch.setBackground(QBrush(bg_color))
return stitch

def onStitchSelect(self, current: QTableWidgetItem | None) -> None:
if current is None:
self.__progbar.set_selection_label("")
return
if self.horizontalHeaderItem(current.column()).foreground().color().red() == 187:
side = "Green"
else:
side = "Orange"
selection_string = f"Selection: {self.verticalHeaderItem(current.row()).text()} , stitch {side}-{self.horizontalHeaderItem(current.column()).text()}"
self.__progbar.set_selection_label(selection_string)
7 changes: 7 additions & 0 deletions src/main/python/main/ayab/main_gui.ui
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,13 @@
</property>
<item>
<layout class="QHBoxLayout" name="horizontal_layout">
<item>
<widget class="QLabel" name="label_selection">
<property name="text">
<string/>
</property>
</widget>
</item>
<item alignment="Qt::AlignHCenter|Qt::AlignVCenter">
<widget class="QLabel" name="label_current_color">
<property name="font">
Expand Down
8 changes: 8 additions & 0 deletions src/main/python/main/ayab/preferences.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
TypeVar,
TypedDict,
cast,
overload,
)

if TYPE_CHECKING:
Expand Down Expand Up @@ -141,6 +142,13 @@ def reset(self) -> None:
var, self.default_value(cast(PreferencesDictKeys, var))
)

@overload
def value(self, var: PreferencesDictBoolKeys) -> bool: ...
@overload
def value(self, var: PreferencesDictIntKeys | PreferencesDictObjKeys) -> int: ...
@overload
def value(self, var: Literal["language"]) -> str: ...

def value(self, var: PreferencesDictKeys) -> Any:
if var in self.settings.allKeys():
try:
Expand Down
5 changes: 5 additions & 0 deletions src/main/python/main/ayab/progressbar.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ def __init__(self, parent: GuiMain):
self.__row_label = parent.ui.label_current_row
self.__color_label = parent.ui.label_current_color
self.__status_label = parent.engine.status.ui.label_progress
self.__selection_label = parent.ui.label_selection
self.reset()

def reset(self) -> None:
Expand All @@ -45,6 +46,7 @@ def reset(self) -> None:
self.__row_label.setText("")
self.__color_label.setText("")
self.__status_label.setText("")
self.__selection_label.setText("")

def update(
self,
Expand All @@ -60,6 +62,9 @@ def update(
self.refresh()
return True

def set_selection_label(self, text: str) -> None:
self.__selection_label.setText(text)

def refresh(self) -> None:
"""Updates the color and row in progress bar"""
if self.row < 0 or self.total < 0:
Expand Down