Changeset 8441:cfc8bead4479 in orange

Timestamp:

07/25/11 10:51:32 (22 months ago)

Author:

Noughmad <Noughmad@…>

Branch:

default

Convert:

db98babdfb88638b04b418eb8183b9bd114f2285

Message:

Improved legend movement, its center follows the mouse during orientation changes

Location:

orange/OrangeWidgets/plot

Files:

• owlegend.py (modified) (3 diffs)
• owplot.py (modified) (1 diff)

orange/OrangeWidgets/plot/owlegend.py

@@ -49 +49 @@
         self.mouse_down = False
         self._orientation = Qt.Vertical
-        self.animated = True
+        self.animated = True        
+        self._center_point = None
+
         
     def clear(self):
@@ -68 +70 @@
             y = 0
             for item in self.items:
-                self.move_item(item, 0, y)
+                self.box_rect = self.box_rect | item.boundingRect().translated(0, y)
                 y = y + item.boundingRect().height()
-                self.box_rect = self.box_rect | item.mapRectToParent(item.boundingRect())
         elif self._orientation == Qt.Horizontal:
             x = 0
             for item in self.items:
-                self.move_item(item, x, 0)
+                self.box_rect = self.box_rect | item.boundingRect().translated(x, 0)
                 x = x + item.boundingRect().width()
-                self.box_rect = self.box_rect | item.mapRectToParent(item.boundingRect())
-                
+        
+        if self._center_point:
+            self.setPos(self.pos() + self._center_point - self.box_rect.center())
+        x, y = 0, 0
+        if self._orientation == Qt.Vertical:
+            for item in self.items:
+                self.move_item(item, x, y)
+                y = y + item.boundingRect().height()
+        elif self._orientation == Qt.Horizontal:
+            for item in self.items:
+                self.move_item(item, x, y)
+                x = x + item.boundingRect().width()
+    
     def mouseMoveEvent(self, event):
         self.setPos(self.pos() + event.scenePos() - event.lastScenePos())
-        self.graph.notify_legend_moved()
+        self.graph.notify_legend_moved(event.scenePos())
         event.accept()
             
@@ -99 +111 @@
         pass
     
-    def set_orientation(self, orientation):
-        self._orientation = orientation
-        self.update()
+    def set_orientation(self, orientation, origin_point = QPointF()):
+        if self._orientation != orientation:
+            self._orientation = orientation
+            if origin_point.isNull():
+                self._center_point = origin_point
+            else:
+                self._center_point = self.mapFromScene(origin_point)
+            self.update()
         
     def move_item(self, item, x, y):

orange/OrangeWidgets/plot/owplot.py

@@ -949 +949 @@
         QToolTip.showText(self.mapToGlobal(QPoint(x, y)), text, self, QRect(x-3,y-3,6,6))
         
-    def notify_legend_moved(self):
+    def notify_legend_moved(self, pos):
         self._legend_moved = True
         l = self.legend_rect()
         g = getattr(self, '_legend_outside_area', QRectF())
-        offset = 10
+        offset = 2
         rect = QRectF()
-        if l.right() > g.right() - offset:
+        if pos.x() > g.right() - offset:
             rect.setRight(l.width())
-        elif l.left() < g.left() + offset:
+        elif pos.x() < g.left() + offset:
             rect.setLeft(l.width())
-        elif l.top() < g.top() + offset:
+        elif pos.y() < g.top() + offset:
             rect.setTop(l.height())
-        elif l.bottom() > g.bottom() - offset:
+        elif pos.y() > g.bottom() - offset:
             rect.setBottom(l.height())
         if rect != self._legend_margin:
-            self._legend.set_orientation(Qt.Horizontal if rect.top() or rect.bottom() else Qt.Vertical)
+            self._legend.set_orientation(Qt.Horizontal if rect.top() or rect.bottom() else Qt.Vertical, pos)
             self._legend_animation = QPropertyAnimation(self, 'legend_margin')
             self._legend_animation.setStartValue(self._legend_margin)