From 4c8255711e96de7c71a9f6ca1bddc58e4c1fec1b Mon Sep 17 00:00:00 2001 From: "Dr. Simon Levy" Date: Wed, 10 Aug 2016 16:38:17 -0400 Subject: [PATCH] Exit gracefully --- examples/logdemo.py | 4 ++-- examples/pltslamshow.py | 11 +++-------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/examples/logdemo.py b/examples/logdemo.py index 0c4a7f8..aad6a3c 100755 --- a/examples/logdemo.py +++ b/examples/logdemo.py @@ -104,9 +104,9 @@ def main(): display.displayRobot((x_mm, y_mm, theta_degrees)) # Exit gracefully if user closes display - key = display.refresh() - if key != None and (key&0x1A): + if not display.refresh(): exit(0) + # XXX Add delay for real-time plot diff --git a/examples/pltslamshow.py b/examples/pltslamshow.py index 72a1d2f..8fe303a 100644 --- a/examples/pltslamshow.py +++ b/examples/pltslamshow.py @@ -166,17 +166,12 @@ class SlamShow(object): except: return False - # Rotate image 270 degrees - #wid,hgt = cv.GetSize(self.image) - #mapMatrix = cv2.getRotationMatrix2D((wid/2,hgt/2), 270, 1.0) - #cv.WarpAffine(self.image, self.image, cv.fromarray(mapMatrix)) - # Display image cv.ShowImage(self.window_name, self.image) - - # Force image display, returning any key hit + + # Force image display, returning False if user hit ESC, True otherwise key = cvdisplay() - return key if key > -1 else None + return False if key==27 else True def waitkey(self, action):