[libcamera-devel] [PATCH 3/5] py: cam: Cleanups

Laurent Pinchart laurent.pinchart at ideasonboard.com
Thu May 19 12:53:21 CEST 2022


On Thu, May 19, 2022 at 01:51:51PM +0300, Tomi Valkeinen wrote:
> On 19/05/2022 13:49, Laurent Pinchart wrote:
> > On Thu, May 19, 2022 at 01:33:45PM +0300, Tomi Valkeinen wrote:
> >> No functional changes.
> > 
> > That's nearly true, see below.
> > 
> >> Drop unused variables, reduce typechecker
> >> warnings.
> >>
> >> Signed-off-by: Tomi Valkeinen <tomi.valkeinen at ideasonboard.com>
> >> ---
> >>   src/py/cam/cam.py      |  2 +-
> >>   src/py/cam/cam_qt.py   | 13 ++-----------
> >>   src/py/cam/cam_qtgl.py |  9 ++-------
> >>   3 files changed, 5 insertions(+), 19 deletions(-)
> >>
> >> diff --git a/src/py/cam/cam.py b/src/py/cam/cam.py
> >> index 2f0690b5..e2bc78da 100755
> >> --- a/src/py/cam/cam.py
> >> +++ b/src/py/cam/cam.py
> >> @@ -304,7 +304,7 @@ def event_handler(state):
> >>   
> >>           running = any(ctx['reqs-completed'] < ctx['opt-capture'] for ctx in contexts)
> >>           return running
> >> -    except Exception as e:
> >> +    except Exception:
> >>           traceback.print_exc()
> >>           return False
> >>   
> >> diff --git a/src/py/cam/cam_qt.py b/src/py/cam/cam_qt.py
> >> index 0a25a823..8dc6f92e 100644
> >> --- a/src/py/cam/cam_qt.py
> >> +++ b/src/py/cam/cam_qt.py
> >> @@ -184,14 +184,8 @@ class QtRenderer:
> >>           windows = []
> >>   
> >>           for ctx in self.contexts:
> >> -            camera = ctx['camera']
> >> -
> >>               for stream in ctx['streams']:
> >> -                fmt = stream.configuration.pixel_format
> >> -                size = stream.configuration.size
> >> -
> >>                   window = MainWindow(ctx, stream)
> >> -                window.setAttribute(QtCore.Qt.WA_ShowWithoutActivating)
> > 
> > Isn't this one a functional change, and should it be split to a separate
> > patch ?
> 
> You're right, I missed that. I added WA_ShowWithoutActivating for 
> debugging purposes at some point long time back, but then forgot to 
> remove it.
> 
> I can separate it from this one.

I'll drop that line from this patch, no need to resubmit, you can then
send another one on top.

-- 
Regards,

Laurent Pinchart


More information about the libcamera-devel mailing list