equal
deleted
inserted
replaced
845 else: |
845 else: |
846 source_size = None |
846 source_size = None |
847 target_panel = self.GraphicPanels[target_idx] |
847 target_panel = self.GraphicPanels[target_idx] |
848 graph_type = target_panel.GraphType |
848 graph_type = target_panel.GraphType |
849 if target_panel != source_panel: |
849 if target_panel != source_panel: |
850 if (merge_type == GRAPH_PARALLEL and graph_type != merge_type or |
850 if merge_type == GRAPH_PARALLEL and graph_type != merge_type or \ |
851 merge_type == GRAPH_ORTHOGONAL and |
851 merge_type == GRAPH_ORTHOGONAL and ( |
852 (graph_type == GRAPH_PARALLEL and len(target_panel.Items) > 1 or |
852 graph_type == GRAPH_PARALLEL and len(target_panel.Items) > 1 or |
853 graph_type == GRAPH_ORTHOGONAL and len(target_panel.Items) >= 3)): |
853 graph_type == GRAPH_ORTHOGONAL and len(target_panel.Items) >= 3): |
854 return |
854 return |
855 |
855 |
856 if source_panel is not None: |
856 if source_panel is not None: |
857 source_panel.RemoveItem(source_item) |
857 source_panel.RemoveItem(source_item) |
858 if source_panel.ItemsIsEmpty(): |
858 if source_panel.ItemsIsEmpty(): |