Fixed dock dragging on pyside

Added imageview.setImage argument documentation

pyqtgraph/dockarea/Dock.py

@@ -186,6 +186,7 @@ class Dock(QtGui.QWidget, DockDrop):
         
         
     def startDrag(self):
+        print('startDrag')
         self.drag = QtGui.QDrag(self)
         mime = QtCore.QMimeData()
         #mime.setPlainText("asd")
@@ -212,6 +213,19 @@ class Dock(QtGui.QWidget, DockDrop):
     def __repr__(self):
         return "<Dock %s %s>" % (self.name(), self.stretch())
 
+    ## PySide bug: We need to explicitly redefine these methods
+    ## or else drag/drop events will not be delivered.
+    def dragEnterEvent(self, *args):
+        DockDrop.dragEnterEvent(self, *args)
+
+    def dragMoveEvent(self, *args):
+        DockDrop.dragMoveEvent(self, *args)
+
+    def dragLeaveEvent(self, *args):
+        DockDrop.dragLeaveEvent(self, *args)
+
+    def dropEvent(self, *args):
+        DockDrop.dropEvent(self, *args)
 
 class DockLabel(VerticalLabel):
     

pyqtgraph/dockarea/DockArea.py

@@ -293,5 +293,19 @@ class DockArea(Container, QtGui.QWidget, DockDrop):
             self.home.removeTempArea(self)
             #self.close()
             
+    ## PySide bug: We need to explicitly redefine these methods
+    ## or else drag/drop events will not be delivered.
+    def dragEnterEvent(self, *args):
+        DockDrop.dragEnterEvent(self, *args)
+
+    def dragMoveEvent(self, *args):
+        DockDrop.dragMoveEvent(self, *args)
+
+    def dragLeaveEvent(self, *args):
+        DockDrop.dragLeaveEvent(self, *args)
+
+    def dropEvent(self, *args):
+        DockDrop.dropEvent(self, *args)
+
         
         

pyqtgraph/imageview/ImageView.py

@@ -206,6 +206,11 @@ class ImageView(QtGui.QWidget):
                        This is only needed to override the default guess. Format is::
                        
                            {'t':0, 'x':1, 'y':2, 'c':3};
+        
+        *pos*          Change the position of the displayed image
+        *scale*        Change the scale of the displayed image
+        *transform*    Set the transform of the dispalyed image. This option overrides *pos*
+                       and *scale*.
         ============== =======================================================================
         """
         prof = debug.Profiler('ImageView.setImage', disabled=True)