Fixes for render_widget='scene' in Qt back end

ginga/qtw/ImageViewQt.py

@@ -53,6 +53,7 @@ def drawBackground(self, painter, rect):
         if pixmap is None:
             return
         x1, y1, x2, y2 = rect.getCoords()
+        x1, y1, x2, y2 = int(x1), int(y1), int(x2), int(y2)
         width = x2 - x1 + 1
         height = y2 - y1 + 1
 
@@ -63,6 +64,7 @@ def drawBackground(self, painter, rect):
     def resizeEvent(self, event):
         rect = self.geometry()
         x1, y1, x2, y2 = rect.getCoords()
+        x1, y1, x2, y2 = int(x1), int(y1), int(x2), int(y2)
         width = x2 - x1 + 1
         height = y2 - y1 + 1
 
@@ -174,6 +176,8 @@ def __init__(self, logger=None, rgbmap=None, settings=None, render=None):
         elif self.wtype == 'scene':
             self.scene = QtGui.QGraphicsScene()
             self.imgwin = RenderGraphicsView(self.scene)
+            self.imgwin.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
+            self.imgwin.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
         elif self.wtype == 'opengl':
             if not have_opengl:
                 raise ImageViewQtError("Please install 'pyopengl' to use render: '%s'" % (render))
@@ -221,9 +225,8 @@ def configure_window(self, width, height):
             # See http://stackoverflow.com/questions/3513788/qt-qgraphicsview-without-scrollbar
             width, height = width - 2, height - 2
             self.scene.setSceneRect(1, 1, width - 2, height - 2)
-
-        # tell renderer about our new size
-        #self.renderer.resize((width, height))
+            self.imgwin.fitInView(self.scene.sceneRect(),
+                                  QtCore.Qt.IgnoreAspectRatio)
 
         if self.wtype == 'opengl':
             pass

ginga/qtw/Widgets.py

@@ -80,6 +80,11 @@ def focus(self):
         # self.widget.raise_()
 
     def resize(self, width, height):
+        _wd, _ht = self.get_size()
+        if width < 0:
+            width = _wd
+        if height < 0:
+            height = _ht
         self.widget.resize(int(width), int(height))
 
     def show(self):