# HG changeset patch
# User Laurent Bessard
# Date 1359569279 -3600
# Node ID 4a36e38e51d3568f9b8ffd01b0fed0da5f6674f7
# Parent  aa136ef125062c62db48e7ccdee1d8de5857c509
Fix bug in DebugVariablePanel when manipulating graph layout and adding drag'n drop graph from parallel graphs and moving graphs order

diff -r aa136ef12506 -r 4a36e38e51d3 controls/DebugVariablePanel.py
--- a/controls/DebugVariablePanel.py	Wed Jan 30 19:03:25 2013 +0100
+++ b/controls/DebugVariablePanel.py	Wed Jan 30 19:07:59 2013 +0100
@@ -273,7 +273,12 @@
                 target_idx = self.ParentControl.GetIndex()
                 merge_type = GRAPH_PARALLEL
                 if self.ParentControl.Is3DCanvas():
-                    self.ParentWindow.InsertValue(values[0], target_idx, force=True)
+                    if y > height / 2:
+                        target_idx += 1
+                    if len(values) > 2 and values[2] == "move":
+                        self.ParentWindow.MoveGraph(values[0], target_idx)
+                    else:
+                        self.ParentWindow.InsertValue(values[0], target_idx, force=True)
                 else:
                     ax, ay, aw, ah = self.ParentControl.Axes.get_position().bounds
                     rect = wx.Rect(ax * width, height - (ay + ah) * height,
@@ -285,7 +290,14 @@
                             merge_type = GRAPH_ORTHOGONAL
                         wx.CallAfter(self.ParentWindow.MergeGraphs, values[0], target_idx, merge_type, force=True)
                     else:
-                        self.ParentWindow.InsertValue(values[0], target_idx, force=True)
+                        if y > height / 2:
+                            target_idx += 1
+                        if len(values) > 2 and values[2] == "move":
+                            self.ParentWindow.MoveGraph(values[0], target_idx)
+                        else:
+                            self.ParentWindow.InsertValue(values[0], target_idx, force=True)
+            elif len(values) > 2 and values[2] == "move":
+                self.ParentWindow.MoveGraph(values[0])
             else:
                 self.ParentWindow.InsertValue(values[0], force=True)
             
@@ -572,23 +584,40 @@
                 button_sizer.AddWindow(button, border=5, flag=wx.LEFT)
     
         def OnCanvasClick(self, event):
+            x, y = event.GetPosition()
+            width, height = self.Canvas.GetSize()
             if len(self.Items) == 1:
-                width, height = self.Canvas.GetSize()
-                x, y = event.GetPosition()
                 ax, ay, aw, ah = self.Axes.get_position().bounds
                 rect = wx.Rect(ax * width, height - (ay + ah) * height,
                                aw * width, ah * height)
                 if rect.InsideXY(x, y):
-                    data = wx.TextDataObject(str((self.Items[0].GetVariable(), "debug")))
-                    dragSource = wx.DropSource(self.Canvas)
-                    dragSource.SetData(data)
-                    dragSource.DoDragDrop()
-        
+                    self.DoDragDrop(0)
+                    return
+            elif self.Legend is not None:
+                item_idx = None
+                for i, t in enumerate(self.Legend.get_texts()):
+                    (x0, y0), (x1, y1) = t.get_window_extent().get_points()
+                    rect = wx.Rect(x0, height - y1, x1 - x0, y1 - y0)
+                    if rect.InsideXY(x, y):
+                        item_idx = i
+                        break
+                if item_idx is not None:
+                    self.DoDragDrop(item_idx)
+                    return
+            event.Skip()
+        
+        def DoDragDrop(self, item_idx):
+            data = wx.TextDataObject(str((self.Items[item_idx].GetVariable(), "debug", "move")))
+            dragSource = wx.DropSource(self.Canvas)
+            dragSource.SetData(data)
+            dragSource.DoDragDrop()
+            
         def OnMotion(self, event):
-            current_time = gettime()
-            if current_time - self.LastMotionTime > REFRESH_PERIOD:
-                self.LastMotionTime = current_time
-                Axes3D._on_move(self.Axes, event)
+            if self.Is3DCanvas():
+                current_time = gettime()
+                if current_time - self.LastMotionTime > REFRESH_PERIOD:
+                    self.LastMotionTime = current_time
+                    Axes3D._on_move(self.Axes, event)
         
         def OnSplitButton(self, event):
             if len(self.Items) == 2 or self.GraphType == GRAPH_ORTHOGONAL:
@@ -713,16 +742,17 @@
                 self.Axes.set_xlim(x_min, x_max)
                 self.Axes.set_ylim(y_min, y_max)
             
-            labels = ["%s: %s" % (item.GetVariable(), item.GetValue())
+            labels = ["%s: %s" % (item.GetVariable(40), item.GetValue())
                       for item in self.Items]
             colors = [{True: 'b', False: 'k'}[item.IsForced()] for item in self.Items]
             if self.GraphType == GRAPH_PARALLEL:
-                legend = self.Axes.legend(self.Plots, labels, 
+                self.Legend = self.Axes.legend(self.Plots, labels, 
                     loc="upper left", frameon=False,
                     prop={'size':'small'})
-                for t, color in zip(legend.get_texts(), colors):
+                for t, color in zip(self.Legend.get_texts(), colors):
                     t.set_color(color)
             else:
+                self.Legend = None
                 self.Axes.set_xlabel(labels[0], fontdict={'size':'small','color':colors[0]})
                 self.Axes.set_ylabel(labels[1], fontdict={'size':'small','color':colors[1]})
                 if len(labels) > 2:
@@ -1159,6 +1189,29 @@
             
             self.RefreshView()
     
+    def MoveGraph(self, iec_path, idx = None):
+        if idx is None:
+            idx = len(self.GraphicPanels)
+        source_panel = None
+        item = None
+        for panel in self.GraphicPanels:
+            item = panel.GetItem(iec_path)
+            if item is not None:
+                source_panel = panel
+                break
+        if source_panel is not None:
+            source_panel.RemoveItem(item)
+            if source_panel.IsEmpty():
+                if source_panel.Canvas.HasCapture():
+                    source_panel.Canvas.ReleaseMouse()
+                self.GraphicPanels.remove(source_panel)
+                source_panel.Destroy()
+            
+            panel = DebugVariableGraphic(self.GraphicsWindow, self, [item], GRAPH_PARALLEL)
+            self.GraphicPanels.insert(idx, panel)
+            self.RefreshGraphicsSizer()
+            self.RefreshView()
+    
     def SplitGraphs(self, source_panel, item=None):
         source_idx = self.GetViewerIndex(source_panel)
         if source_idx is not None: