equal
deleted
inserted
replaced
795 else: |
795 else: |
796 source_panel.RemoveItem(item) |
796 source_panel.RemoveItem(item) |
797 source_size = source_panel.GetSize() |
797 source_size = source_panel.GetSize() |
798 if item.IsNumVariable() and graph: |
798 if item.IsNumVariable() and graph: |
799 panel = DebugVariableGraphicViewer(self.GraphicsWindow, self, [item], GRAPH_PARALLEL) |
799 panel = DebugVariableGraphicViewer(self.GraphicsWindow, self, [item], GRAPH_PARALLEL) |
800 panel.SetCanvasSize(source_size.width, source_size.height) |
800 panel.SetCanvasHeight(source_size.height) |
801 if self.CursorTick is not None: |
801 if self.CursorTick is not None: |
802 panel.SetCursorTick(self.CursorTick) |
802 panel.SetCursorTick(self.CursorTick) |
803 |
803 |
804 else: |
804 else: |
805 panel = DebugVariableTextViewer(self.GraphicsWindow, self, [item]) |
805 panel = DebugVariableTextViewer(self.GraphicsWindow, self, [item]) |
859 if target_panel is not None: |
859 if target_panel is not None: |
860 target_panel.AddItem(source_item) |
860 target_panel.AddItem(source_item) |
861 target_panel.GraphType = merge_type |
861 target_panel.GraphType = merge_type |
862 size = target_panel.GetSize() |
862 size = target_panel.GetSize() |
863 if merge_type == GRAPH_ORTHOGONAL: |
863 if merge_type == GRAPH_ORTHOGONAL: |
864 target_panel.SetCanvasSize(size.width, size.width) |
864 target_panel.SetCanvasHeight(size.width) |
865 elif source_size is not None: |
865 elif source_size is not None and source_panel != target_panel: |
866 target_panel.SetCanvasSize(size.width, size.height + source_size.height) |
866 target_panel.SetCanvasHeight(size.height + source_size.height) |
867 else: |
|
868 target_panel.SetCanvasSize(size.width, size.height) |
|
869 target_panel.ResetGraphics() |
867 target_panel.ResetGraphics() |
870 |
868 |
871 self.ResetVariableNameMask() |
869 self.ResetVariableNameMask() |
872 self.RefreshGraphicsSizer() |
870 self.RefreshGraphicsSizer() |
873 self.ForceRefresh() |
871 self.ForceRefresh() |
939 for panel in self.GraphicPanels: |
937 for panel in self.GraphicPanels: |
940 panel_size = panel.GetSize() |
938 panel_size = panel.GetSize() |
941 if (isinstance(panel, DebugVariableGraphicViewer) and |
939 if (isinstance(panel, DebugVariableGraphicViewer) and |
942 panel.GraphType == GRAPH_ORTHOGONAL and |
940 panel.GraphType == GRAPH_ORTHOGONAL and |
943 panel_size.width == panel_size.height): |
941 panel_size.width == panel_size.height): |
944 panel.SetCanvasSize(size.width, size.width) |
942 panel.SetCanvasHeight(size.width) |
945 self.RefreshGraphicsWindowScrollbars() |
943 self.RefreshGraphicsWindowScrollbars() |
946 self.GraphicsSizer.Layout() |
944 self.GraphicsSizer.Layout() |
947 event.Skip() |
945 event.Skip() |
948 |
946 |
949 def OnGraphicsWindowMouseWheel(self, event): |
947 def OnGraphicsWindowMouseWheel(self, event): |