feat(cli): auto detect resolution #158
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,6 +9,7 @@ | |
| import click | ||
| import cv2 | ||
| import numpy as np | ||
| from click import Context, Parameter | ||
| from pydantic import ValidationError | ||
| from PySide6.QtCore import Qt, QThread, Signal, Slot | ||
| from PySide6.QtGui import QCloseEvent, QIcon, QImage, QKeyEvent, QPixmap, QResizeEvent | ||
|
|
@@ -70,8 +71,7 @@ class Presentation: | |
| """Creates presentation from a configuration object.""" | ||
|
|
||
| def __init__(self, config: PresentationConfig) -> None: | ||
| self.config = config | ||
|
|
||
| self.__current_slide_index: int = 0 | ||
| self.current_animation: int = self.current_slide.start_animation | ||
|
|
@@ -90,23 +90,41 @@ def __init__(self, config: PresentationConfig) -> None: | |
| def __len__(self) -> int: | ||
| return len(self.slides) | ||
|
|
||
| @property | ||
| def slides(self) -> List[SlideConfig]: | ||
| """Returns the list of slides.""" | ||
| return self.config.slides | ||
|
|
||
| @property | ||
| def files(self) -> List[Path]: | ||
| """Returns the list of animation files.""" | ||
| return self.config.files | ||
|
|
||
| @property | ||
| def resolution(self) -> Tuple[int, int]: | ||
| """Returns the resolution.""" | ||
| return self.config.resolution | ||
|
|
||
|
Comment on lines
+103
to
+107
There was a problem hiding this comment. @Fairlight8 Second, add a property to |
||
| @property | ||
| def current_slide_index(self) -> int: | ||
| return self.__current_slide_index | ||
|
|
||
| @current_slide_index.setter | ||
| def current_slide_index(self, value: Optional[int]) -> None: | ||
| if value is not None: | ||
| if -len(self) <= value < len(self): | ||
| self.__current_slide_index = value | ||
| self.current_animation = self.current_slide.start_animation | ||
| logger.debug(f"Set current slide index to {value}") | ||
| else: | ||
| logger.error( | ||
| f"Could not load slide number {value}, playing first slide instead." | ||
| ) | ||
|
|
||
| def set_current_animation_and_update_slide_number( | ||
| self, value: Optional[int] | ||
| ) -> None: | ||
| if value is not None: | ||
| n_files = len(self.files) | ||
| if -n_files <= value < n_files: | ||
| if value < 0: | ||
|
|
@@ -116,6 +134,8 @@ def set_current_animation_and_update_slide_number(self, value: Optional[int]): | |
| if value < slide.end_animation: | ||
| self.current_slide_index = i | ||
| self.current_animation = value | ||
|
|
||
| logger.debug(f"Playing animation {value}, at slide index {i}") | ||
| return | ||
|
|
||
| assert ( | ||
|
|
@@ -159,7 +179,7 @@ def load_animation_cap(self, animation: int) -> None: | |
|
|
||
| self.release_cap() | ||
|
|
||
| file: str = str(self.files[animation]) | ||
|
|
||
| if self.reverse: | ||
| file = "{}_reversed{}".format(*os.path.splitext(file)) | ||
|
|
@@ -178,7 +198,7 @@ def current_cap(self) -> cv2.VideoCapture: | |
|
|
||
| def rewind_current_slide(self) -> None: | ||
| """Rewinds current slide to first frame.""" | ||
| logger.debug("Rewinding current slide") | ||
| if self.reverse: | ||
| self.current_animation = self.current_slide.end_animation - 1 | ||
| else: | ||
|
|
@@ -216,9 +236,10 @@ def load_next_slide(self) -> None: | |
|
|
||
| def load_previous_slide(self) -> None: | ||
| """Loads previous slide.""" | ||
| logger.debug(f"Loading previous slide, current is {self.current_slide_index}") | ||
| self.cancel_reverse() | ||
| self.current_slide_index = max(0, self.current_slide_index - 1) | ||
| logger.debug(f"Loading slide index {self.current_slide_index}") | ||
| self.rewind_current_slide() | ||
|
|
||
| @property | ||
|
|
@@ -229,7 +250,8 @@ def fps(self) -> int: | |
| logger.warn( | ||
| f"Something is wrong with video file {self.current_file}, as the fps returned by frame {self.current_frame_number} is 0" | ||
| ) | ||
| # TODO: understand why we sometimes get 0 fps | ||
| return max(fps, 1) # type: ignore | ||
|
|
||
| def reset(self) -> None: | ||
| """Rests current presentation.""" | ||
|
|
@@ -320,6 +342,7 @@ class Display(QThread): # type: ignore | |
|
|
||
| change_video_signal = Signal(np.ndarray) | ||
| change_info_signal = Signal(dict) | ||
| change_presentation_sigal = Signal() | ||
| finished = Signal() | ||
|
|
||
| def __init__( | ||
|
|
@@ -365,10 +388,12 @@ def current_presentation_index(self) -> int: | |
| return self.__current_presentation_index | ||
|
|
||
| @current_presentation_index.setter | ||
| def current_presentation_index(self, value: Optional[int]) -> None: | ||
| if value is not None: | ||
| if -len(self) <= value < len(self): | ||
| self.__current_presentation_index = value | ||
| self.current_presentation.release_cap() | ||
| self.change_presentation_sigal.emit() | ||
| else: | ||
| logger.error( | ||
| f"Could not load scene number {value}, playing first scene instead." | ||
|
|
@@ -379,6 +404,11 @@ def current_presentation(self) -> Presentation: | |
| """Returns the current presentation.""" | ||
| return self.presentations[self.current_presentation_index] | ||
|
|
||
| @property | ||
| def current_resolution(self) -> Tuple[int, int]: | ||
| """Returns the resolution of the current presentation.""" | ||
| return self.current_presentation.resolution | ||
|
|
||
| def run(self) -> None: | ||
| """Runs a series of presentations until end or exit.""" | ||
| while self.run_flag: | ||
|
|
@@ -413,7 +443,7 @@ def run(self) -> None: | |
| if self.record_to is not None: | ||
| self.record_movie() | ||
|
|
||
| logger.debug("Closing video thread gracefully and exiting") | ||
| self.finished.emit() | ||
|
|
||
| def record_movie(self) -> None: | ||
|
|
@@ -587,7 +617,6 @@ def __init__( | |
| *args: Any, | ||
| config: Config = DEFAULT_CONFIG, | ||
| fullscreen: bool = False, | ||
| hide_mouse: bool = False, | ||
| aspect_ratio: AspectRatio = AspectRatio.auto, | ||
| resize_mode: Qt.TransformationMode = Qt.SmoothTransformation, | ||
|
|
@@ -599,7 +628,12 @@ def __init__( | |
| self.setWindowTitle(WINDOW_NAME) | ||
| self.icon = QIcon(":/icon.png") | ||
| self.setWindowIcon(self.icon) | ||
|
|
||
| # create the video capture thread | ||
| kwargs["config"] = config | ||
| self.thread = Display(*args, **kwargs) | ||
|
|
||
| self.display_width, self.display_height = self.thread.current_resolution | ||
| self.aspect_ratio = aspect_ratio | ||
| self.resize_mode = resize_mode | ||
| self.hide_mouse = hide_mouse | ||
|
|
@@ -619,9 +653,6 @@ def __init__( | |
| self.label.setPixmap(self.pixmap) | ||
| self.label.setMinimumSize(1, 1) | ||
|
|
||
| # create the info dialog | ||
| self.info = Info() | ||
| self.info.show() | ||
|
|
@@ -635,6 +666,7 @@ def __init__( | |
| # connect signals | ||
| self.thread.change_video_signal.connect(self.update_image) | ||
| self.thread.change_info_signal.connect(self.info.update_info) | ||
| self.thread.change_presentation_sigal.connect(self.update_canvas) | ||
| self.thread.finished.connect(self.closeAll) | ||
| self.send_key_signal.connect(self.thread.set_key) | ||
|
|
||
|
|
@@ -688,6 +720,14 @@ def update_image(self, cv_img: np.ndarray) -> None: | |
|
|
||
| self.label.setPixmap(QPixmap.fromImage(qt_img)) | ||
|
|
||
| @Slot() | ||
| def update_canvas(self) -> None: | ||
| """Update the canvas when a presentation has changed.""" | ||
| logger.debug("Updating canvas") | ||
| self.display_width, self.display_height = self.thread.current_resolution | ||
| if not self.isFullScreen(): | ||
| self.resize(self.display_width, self.display_height) | ||
|
Comment on lines
+723
to
+729
There was a problem hiding this comment. @Fairlight8 Third, every time the presentation changes, call to |
||
|
|
||
|
|
||
| @click.command() | ||
| @click.option( | ||
|
|
@@ -757,7 +797,7 @@ def value_proc(value: Optional[str]) -> List[str]: | |
| while True: | ||
| try: | ||
| scenes = click.prompt("Choice(s)", value_proc=value_proc) | ||
| return scenes # type: ignore | ||
| except ValueError as e: | ||
| raise click.UsageError(str(e)) | ||
|
|
||
|
|
@@ -785,7 +825,9 @@ def get_scenes_presentation_config( | |
| return presentation_configs | ||
|
|
||
|
|
||
| def start_at_callback( | ||
| ctx: Context, param: Parameter, values: str | ||
| ) -> Tuple[Optional[int], ...]: | ||
| if values == "(None, None, None)": | ||
| return (None, None, None) | ||
|
|
||
|
|
@@ -838,9 +880,8 @@ def str_to_int_or_none(value: str) -> Optional[int]: | |
| "--resolution", | ||
| metavar="<WIDTH HEIGHT>", | ||
| type=(int, int), | ||
| default=None, | ||
|
Comment on lines
-841
to
+883
There was a problem hiding this comment. @Fairlight8 Fourth, set the default to |
||
| help="Window resolution WIDTH HEIGHT used if fullscreen is not set. You may manually resize the window afterward.", | ||
| ) | ||
| @click.option( | ||
| "--to", | ||
|
|
@@ -931,7 +972,7 @@ def present( | |
| start_paused: bool, | ||
| fullscreen: bool, | ||
| skip_all: bool, | ||
| resolution: Optional[Tuple[int, int]], | ||
|
Comment on lines
-934
to
+975
There was a problem hiding this comment. @Fairlight8 same as above, but for type hint |
||
| record_to: Optional[Path], | ||
| exit_after_last_slide: bool, | ||
| hide_mouse: bool, | ||
|
|
@@ -956,9 +997,15 @@ def present( | |
| if skip_all: | ||
| exit_after_last_slide = True | ||
|
|
||
| presentation_configs = get_scenes_presentation_config(scenes, folder) | ||
|
|
||
| if resolution is not None: | ||
| for presentation_config in presentation_configs: | ||
| presentation_config.resolution = resolution | ||
|
|
||
| presentations = [ | ||
| Presentation(presentation_config) | ||
| for presentation_config in presentation_configs | ||
| ] | ||
|
|
||
| if config_path.exists(): | ||
|
|
@@ -994,7 +1041,6 @@ def present( | |
| start_paused=start_paused, | ||
| fullscreen=fullscreen, | ||
| skip_all=skip_all, | ||
| record_to=record_to, | ||
| exit_after_last_slide=exit_after_last_slide, | ||
| hide_mouse=hide_mouse, | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Fairlight8 first, I added a new
resolutionfield. Specifying a default value is very important for backward compatibility (i.e., what to do when no resolution was specified? Use the default!).