rendercanvas 2.1.2__tar.gz → 2.2.0__tar.gz

{rendercanvas-2.1.2 → rendercanvas-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rendercanvas
-Version: 2.1.2
+Version: 2.2.0
 Summary: One canvas API, multiple backends
 Keywords: canvas,rendering,graphics,wgpu,qt,wx,glfw,jupyter
 Author: Almar Klein, Korijn van Golen

{rendercanvas-2.1.2 → rendercanvas-2.2.0}/rendercanvas/_scheduler.py

@@ -94,6 +94,11 @@ class Scheduler:
             self._min_fps = max(0.0, float(min_fps))
 
         if max_fps is not None:
+            # For users setting max_fps=-1 to try to disable the fps cap, as was the way to go in wgpu.gui
+            if max_fps < 1:
+                raise ValueError(
+                    "max_fps should be a >= 1. Use update_mode='fastest' to disable the fps cap. Also see ``vsync=False`` to unlock higher frame rates."
+                )
             self._max_fps = max(1, float(max_fps))
 
     def request_draw(self):

{rendercanvas-2.1.2 → rendercanvas-2.2.0}/rendercanvas/_version.py

@@ -10,7 +10,7 @@ from pathlib import Path
 
 # This is the reference version number, to be bumped before each release.
 # The build system detects this definition when building a distribution.
-__version__ = "2.1.2"
+__version__ = "2.2.0"
 
 # Allow using nearly the same code in different projects
 project_name = "rendercanvas"

{rendercanvas-2.1.2 → rendercanvas-2.2.0}/rendercanvas/glfw.py

@@ -81,7 +81,7 @@ KEY_MAP = {
     glfw.KEY_LEFT_SUPER: "Meta",  # in glfw super means Windows or MacOS-command
     glfw.KEY_NUM_LOCK: "NumLock",
     glfw.KEY_PAGE_DOWN: "PageDown",
-    glfw.KEY_PAGE_UP: "Pageup",
+    glfw.KEY_PAGE_UP: "PageUp",
     glfw.KEY_PAUSE: "Pause",
     glfw.KEY_PRINT_SCREEN: "PrintScreen",
     glfw.KEY_RIGHT_ALT: "Alt",
@@ -625,7 +625,9 @@ class GlfwRenderCanvas(BaseRenderCanvas):
             "key": keyname,
             "modifiers": tuple(self._key_modifiers),
         }
-        self.submit_event(ev)
+
+        if not action == glfw.REPEAT:
+            self.submit_event(ev)
 
     def _on_char(self, window, char):
         # Undocumented char event to make imgui work, see https://github.com/pygfx/wgpu-py/issues/530

{rendercanvas-2.1.2 → rendercanvas-2.2.0}/rendercanvas/offscreen.py

@@ -17,15 +17,34 @@ class OffscreenRenderCanvas(BaseRenderCanvas):
     """An offscreen canvas intended for manual use.
 
     Call the ``.draw()`` method to perform a draw and get the result.
+
+    Arguments:
+        pixel_ratio (float): the ratio of logical to physical pixels.
+        format (str): the preferred format. Multiple formats are supported, but by
+            setting the preferred format here, other systems (e.g. Pygfx) will
+            automatically use that format.
     """
 
     _rc_canvas_group = OffscreenCanvasGroup(None)  # no loop, no scheduling
 
-    def __init__(self, *args, pixel_ratio=1.0, **kwargs):
+    def __init__(self, *args, pixel_ratio=1.0, format="rgba-u8", **kwargs):
         super().__init__(*args, **kwargs)
         self._pixel_ratio = pixel_ratio
         self._closed = False
         self._last_image = None
+
+        self._present_formats = ["rgba-u8", "rgba-f16", "rgba-f32", "rgba-u16"]
+        if format != self._present_formats[0]:
+            colors, _, dtype = format.partition("-")
+            if not (
+                colors in ("i", "rgb", "rgba", "bgra")
+                and dtype in ("u8", "u16", "u32", "f16", "f32")
+            ):
+                raise ValueError(f"Unexpected format: {format!r}")
+            if format in self._present_formats:
+                self._present_formats.remove(format)
+            self._present_formats.insert(0, format)
+
         self._final_canvas_init()
 
     # %% Methods to implement RenderCanvas
@@ -36,7 +55,7 @@ class OffscreenRenderCanvas(BaseRenderCanvas):
     def _rc_get_present_methods(self):
         return {
             "bitmap": {
-                "formats": ["rgba-u8", "rgba-f16", "rgba-f32", "rgba-u16"],
+                "formats": self._present_formats,
             }
         }
 

{rendercanvas-2.1.2 → rendercanvas-2.2.0}/rendercanvas/qt.py

@@ -121,7 +121,7 @@ KEY_MAP = {
     int(Keys.Key_Meta): "Meta",  # meta maps to control in QT on macOS, and vice-versa
     int(Keys.Key_NumLock): "NumLock",
     int(Keys.Key_PageDown): "PageDown",
-    int(Keys.Key_PageUp): "Pageup",
+    int(Keys.Key_PageUp): "PageUp",
     int(Keys.Key_Pause): "Pause",
     int(Keys.Key_ScrollLock): "ScrollLock",
     int(Keys.Key_Tab): "Tab",
@@ -478,7 +478,9 @@ class QRenderWidget(BaseRenderCanvas, QtWidgets.QWidget):
             "key": KEY_MAP.get(event.key(), event.text()),
             "modifiers": modifiers,
         }
-        self.submit_event(ev)
+
+        if not event.isAutoRepeat():
+            self.submit_event(ev)
 
     def _char_input_event(self, char_str):
         ev = {

{rendercanvas-2.1.2 → rendercanvas-2.2.0}/rendercanvas/wx.py

@@ -355,8 +355,13 @@ class WxRenderWidget(BaseRenderCanvas, wx.Window):
         parent = self.Parent
         if isinstance(parent, WxRenderCanvas):
             parent.SetSize(width, height)
-        else:
+        elif parent is not None:
             self.SetSize(width, height)
+        else:
+            # The widget has no parent, likely because its going to inserted in a GUI later.
+            # This method is likely called from _final_canvas_init and if we call self.SetSize() it will likely error/segfault.
+            # See https://github.com/pygfx/rendercanvas/issues/91
+            pass
 
     def _rc_close(self):
         self._is_closed = True
@@ -422,7 +427,9 @@ class WxRenderWidget(BaseRenderCanvas, wx.Window):
             "key": KEY_MAP.get(event.GetKeyCode(), char_str),
             "modifiers": modifiers,
         }
-        self.submit_event(ev)
+
+        if not event.IsAutoRepeat():
+            self.submit_event(ev)
 
     def _char_input_event(self, char_str: Optional[str]):
         if char_str is None: