--- a/controls/DebugVariablePanel.py Tue Feb 12 23:19:57 2013 +0100
+++ b/controls/DebugVariablePanel.py Sun Feb 17 23:47:41 2013 +0100
@@ -335,10 +335,7 @@
if self.ParentControl.Is3DCanvas():
- if len(values) > 2 and values[2] == "move":
- self.ParentWindow.MoveGraph(values[0], target_idx)
- self.ParentWindow.InsertValue(values[0], target_idx, force=True)
+ self.ParentWindow.InsertValue(values[0], target_idx, force=True) rect = self.ParentControl.GetAxesBoundingBox()
@@ -349,14 +346,8 @@
- if len(values) > 2 and values[2] == "move":
- self.ParentWindow.MoveGraph(values[0], target_idx)
- self.ParentWindow.InsertValue(values[0], target_idx, force=True)
- elif len(values) > 2 and values[2] == "move":
- self.ParentWindow.MoveGraph(values[0])
- self.ParentWindow.InsertValue(values[0], force=True)
+ self.ParentWindow.InsertValue(values[0], target_idx, force=True) + self.ParentWindow.InsertValue(values[0], force=True) if self.ParentControl is not None:
@@ -422,13 +413,6 @@
self.ParentWindow = window
- self.MainSizer = wx.FlexGridSizer(cols=2, hgap=0, rows=1, vgap=0)
- self.MainSizer.AddGrowableCol(0)
- self.SetSizer(self.MainSizer)
@@ -567,10 +551,15 @@
class DebugVariableText(DebugVariableViewer):
+ def __init__(self, parent, window, items=[]): + DebugVariableViewer.__init__(self, parent, window, items) + main_sizer = wx.FlexGridSizer(cols=2, hgap=0, rows=1, vgap=0) + main_sizer.AddGrowableCol(0) viewer_sizer = wx.FlexGridSizer(cols=2, hgap=0, rows=1, vgap=0)
viewer_sizer.AddGrowableCol(0)
- self.MainSizer.AddSizer(viewer_sizer, border=5,
+ main_sizer.AddSizer(viewer_sizer, border=5, flag=wx.ALL|wx.GROW|wx.ALIGN_CENTER_VERTICAL)
variable_name_label = wx.TextCtrl(self, size=wx.Size(0, -1),
@@ -582,8 +571,7 @@
size=wx.Size(100, -1), style=wx.TE_READONLY|wx.TE_RIGHT|wx.NO_BORDER)
viewer_sizer.AddWindow(self.ValueLabel,
button_sizer = wx.BoxSizer(wx.HORIZONTAL)
self.MainSizer.AddSizer(button_sizer, border=5,
flag=wx.TOP|wx.BOTTOM|wx.RIGHT|wx.ALIGN_CENTER_VERTICAL)
@@ -591,15 +579,17 @@
("ForceButton", "force", _("Force value")),
("ReleaseButton", "release", _("Release value")),
- ("DeleteButton", "remove_element", _("Remove debug variable"))]
+ ("DeleteButton", "delete_graph", _("Remove debug variable"))] for name, bitmap, help in buttons:
button = wx.lib.buttons.GenBitmapButton(self, bitmap=GetBitmap(bitmap),
- size=wx.Size(28, 28), style=wx.NO_BORDER)
+ size=wx.Size(20, 20), style=wx.NO_BORDER) button.SetToolTipString(help)
setattr(self, name, button)
self.Bind(wx.EVT_BUTTON, getattr(self, "On" + name), button)
button_sizer.AddWindow(button, border=5, flag=wx.LEFT)
+ self.SetSizer(main_sizer) self.ValueLabel.ChangeValue(self.Items[0].GetValue())
@@ -628,14 +618,87 @@
HIGHLIGHT_PEN = wx.Pen(wx.Colour(0, 128, 255))
HIGHLIGHT_BRUSH = wx.Brush(wx.Colour(0, 128, 255, 128))
+ if wx.Platform == '__WXMSW__': + popupclass = wx.PopupTransientWindow + popupclass = wx.PopupWindow + class PopupWithButtons(popupclass): + def __init__(self, parent, window, item, style=wx.HORIZONTAL): + popupclass.__init__(self, parent, wx.NO_BORDER) + self.SetBackgroundColour(wx.WHITE) + self.ParentWindow = window + main_sizer = wx.BoxSizer(style) + if self.Item.IsForced(): + buttons = [("ReleaseButton", "release", _("Release value"))] + buttons = [("ForceButton", "force", _("Force value"))] + buttons.append(("DeleteButton", "delete_graph", _("Remove debug variable"))) + for name, bitmap, help in buttons: + button = wx.lib.buttons.GenBitmapButton(self, bitmap=GetBitmap(bitmap), + size=wx.Size(20, 20), style=wx.NO_BORDER) + button.SetToolTipString(help) + setattr(self, name, button) + self.Bind(wx.EVT_BUTTON, getattr(self, "On" + name), button) + main_sizer.AddWindow(button) + self.SetSizer(main_sizer) + def OnForceButton(self, event): + wx.CallAfter(self.Parent.DismissButtons) + wx.CallAfter(self.Parent.ForceValue, self.Item) + def OnReleaseButton(self, event): + wx.CallAfter(self.Parent.DismissButtons) + wx.CallAfter(self.Parent.ReleaseValue, self.Item) + def OnDeleteButton(self, event): + wx.CallAfter(self.Parent.DismissButtons) + wx.CallAfter(self.ParentWindow.DeleteValue, self.Parent, self.Item) + wx.CallAfter(self.Parent.DismissButtons) class DraggingFigureCanvas(FigureCanvas):
def __init__(self, parent, window, *args, **kwargs):
FigureCanvas.__init__(self, parent, *args, **kwargs)
+ self.SetBackgroundColour(wx.WHITE) + self.Bind(wx.EVT_ENTER_WINDOW, self.OnEnterWindow) + self.Bind(wx.EVT_LEAVE_WINDOW, self.OnLeaveWindow) + self.Bind(wx.EVT_SIZE, self.OnResizeWindow) self.ParentWindow = window
self.Highlight = HIGHLIGHT_NONE
+ self.ChangeSizeButton = wx.lib.buttons.GenBitmapToggleButton(self, + bitmap=GetBitmap("minimize_graph"), + size=wx.Size(20, 20), style=wx.NO_BORDER) + self.ChangeSizeButton.SetBitmapSelected(GetBitmap("maximize_graph")) + self.Bind(wx.EVT_BUTTON, self.OnChangeSizeButton, self.ChangeSizeButton) + self.CloseButton = wx.lib.buttons.GenBitmapButton(self, + bitmap=GetBitmap("delete_graph"), + size=wx.Size(20, 20), style=wx.NO_BORDER) + self.Bind(wx.EVT_BUTTON, self.OnCloseButton, self.CloseButton) + self.ShowButtons(False) def SetHighlight(self, highlight):
if self.Highlight != highlight:
self.Highlight = highlight
@@ -702,6 +765,43 @@
self.gui_repaint(drawDC=drawDC)
+ def ShowButtons(self, show): + self.ChangeSizeButton.Show() + self.CloseButton.Show() + self.ChangeSizeButton.Hide() + self.CloseButton.Hide() + def OnEnterWindow(self, event): + def OnLeaveWindow(self, event): + x, y = event.GetPosition() + width, height = self.GetSize() + if (x <= 0 or x >= width - 1 or + y <= 0 or y >= height - 1): + self.ShowButtons(False) + def OnChangeSizeButton(self, event): + if self.ChangeSizeButton.GetToggle(): + def OnCloseButton(self, event): + wx.CallAfter(self.ParentWindow.DeleteValue, self.Parent) + def OnResizeWindow(self, event): + width, height = self.GetSize() + self.ChangeSizeButton.SetPosition(wx.Point(width - 50, 5)) + self.CloseButton.SetPosition(wx.Point(width - 25, 5)) class DebugVariableGraphic(DebugVariableViewer):
@@ -712,41 +812,35 @@
self.MouseStartPos = None
self.StartCursorTick = None
+ self.ItemButtons = None
+ main_sizer = wx.BoxSizer(wx.VERTICAL) self.Figure = matplotlib.figure.Figure(facecolor='w')
self.Canvas = DraggingFigureCanvas(self, self.ParentWindow, -1, self.Figure)
self.Canvas.SetMinSize(wx.Size(200, 200))
self.Canvas.SetDropTarget(DebugVariableDropTarget(self.ParentWindow, self))
- self.Canvas.Bind(wx.EVT_LEFT_DOWN, self.OnCanvasLeftDown)
+ self.Canvas.Bind(wx.EVT_MOUSEWHEEL, self.OnCanvasMouseWheel) self.Canvas.mpl_connect('button_press_event', self.OnCanvasButtonPressed)
self.Canvas.mpl_connect('motion_notify_event', self.OnCanvasMotion)
self.Canvas.mpl_connect('button_release_event', self.OnCanvasButtonReleased)
self.Canvas.mpl_connect('scroll_event', self.OnCanvasScroll)
- self.MainSizer.AddWindow(self.Canvas, flag=wx.GROW)
- button_sizer = wx.BoxSizer(wx.VERTICAL)
- self.MainSizer.AddSizer(button_sizer, border=5,
- flag=wx.RIGHT|wx.ALIGN_CENTER_VERTICAL)
+ main_sizer.AddWindow(self.Canvas, 1, flag=wx.GROW) + self.SetSizer(main_sizer)
- ("ForceButton", "force", _("Force value")),
- ("ReleaseButton", "release", _("Release value")),
- ("SplitButton", "split", _("Split graphs")),
- ("DeleteButton", "remove_element", _("Remove debug variable"))]
- for name, bitmap, help in buttons:
- button = wx.lib.buttons.GenBitmapButton(self, bitmap=GetBitmap(bitmap),
- size=wx.Size(28, 28), style=wx.NO_BORDER)
- button.SetToolTipString(help)
- setattr(self, name, button)
- self.Bind(wx.EVT_BUTTON, getattr(self, "On" + name), button)
- button_sizer.AddWindow(button, border=5, flag=wx.LEFT)
+ self.Canvas.SetMinSize(wx.Size(200, 100)) + self.Figure.subplotpars.update(bottom=0.20) + self.ParentWindow.RefreshGraphicsSizer() + self.Canvas.SetMinSize(wx.Size(200, 200)) + self.Figure.subplotpars.update(bottom=0.1) + self.ParentWindow.RefreshGraphicsSizer() def GetAxesBoundingBox(self, absolute=False):
bbox = self.Canvas.GetAxesBoundingBox()
@@ -756,29 +850,33 @@
- def OnCanvasLeftDown(self, event):
+ def OnCanvasButtonPressed(self, event): if not self.Is3DCanvas():
- x, y = event.GetPosition()
width, height = self.Canvas.GetSize()
+ x, y = event.x, height - event.y rect = self.GetAxesBoundingBox()
self.MouseStartPos = wx.Point(x, y)
if self.Legend is not 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):
- if item_idx is not None:
- self.DoDragDrop(item_idx)
- def OnCanvasButtonPressed(self, event):
- if not self.Is3DCanvas():
+ texts = self.Legend.get_texts() + elif len(self.AxesLabels) > 0: + texts = self.AxesLabels + for i, t in enumerate(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): + if item_idx is not None: + self.Canvas.ShowButtons(False) + xw, yw = self.GetPosition() + self.ParentWindow.StartDragNDrop(self, + self.Items[item_idx], x + xw, y + yw, x + xw, y + yw) + elif event.button == 1: self.HandleCursorMove(event)
elif event.button == 2 and self.GraphType == GRAPH_PARALLEL:
width, height = self.Canvas.GetSize()
@@ -799,8 +897,8 @@
self.StartCursorTick = None
def OnCanvasMotion(self, event):
+ width, height = self.Canvas.GetSize() if self.ParentWindow.IsDragging():
- width, height = self.Canvas.GetSize()
xw, yw = self.GetPosition()
self.ParentWindow.MoveDragNDrop(
@@ -810,10 +908,10 @@
if event.inaxes == self.Axes:
if self.MouseStartPos is not None:
self.HandleCursorMove(event)
- elif self.MouseStartPos is not None:
+ elif self.MouseStartPos is not None and len(self.Items) == 1: xw, yw = self.GetPosition()
- width, height = self.Canvas.GetSize()
self.ParentWindow.StartDragNDrop(self,
event.x + xw, height - event.y + yw,
self.MouseStartPos.x + xw, self.MouseStartPos.y + yw)
elif event.button == 2 and self.GraphType == GRAPH_PARALLEL:
@@ -822,11 +920,33 @@
self.ParentWindow.SetCanvasPosition(
self.StartCursorTick + (self.MouseStartPos.x - event.x) *
(end_tick - start_tick) / rect.width)
+ elif event.button is None: + if self.Legend is not None: + labels = self.Legend.get_texts() + texts = zip(labels, [wx.HORIZONTAL] * len(labels)) + elif len(self.AxesLabels) > 0: + texts = zip(self.AxesLabels, [wx.HORIZONTAL, wx.VERTICAL]) + for i, (t, style) in enumerate(texts): + (x0, y0), (x1, y1) = t.get_window_extent().get_points() + rect = wx.Rect(x0, height - y1, x1 - x0, y1 - y0) + if rect.InsideXY(event.x, height - event.y): + if item_idx is not None: + self.PopupButtons(item_idx, rect, item_style) + if self.ItemButtons is not None: def OnCanvasDragging(self, x, y, refresh=True):
width, height = self.Canvas.GetSize()
bbox = self.Canvas.GetAxesBoundingBox()
- if bbox.InsideXY(x, y):
+ if bbox.InsideXY(x, y) and not self.Is3DCanvas(): rect = wx.Rect(bbox.x, bbox.y, bbox.width / 2, bbox.height)
self.Canvas.SetHighlight(HIGHLIGHT_LEFT)
@@ -853,6 +973,10 @@
self.ParentWindow.ChangeRange(int(-event.step) / 3, tick)
+ def OnCanvasMouseWheel(self, event): + if self.ItemButtons is not None: def HandleCursorMove(self, event):
start_tick, end_tick = self.ParentWindow.GetRange()
@@ -871,11 +995,45 @@
self.ParentWindow.SetCursorTick(cursor_tick)
def DoDragDrop(self, item_idx):
+ self.Canvas.ShowButtons(False) data = wx.TextDataObject(str((self.Items[item_idx].GetVariable(), "debug", "move")))
dragSource = wx.DropSource(self.Canvas)
+ def PopupButtons(self, item_idx, rect, style=wx.HORIZONTAL): + item = self.Items[item_idx] + if self.ItemButtons is not None and item != self.ItemButtons.GetItem(): + if self.ItemButtons is None: + self.ItemButtons = PopupWithButtons(self, self.ParentWindow, item, style) + # Show the popup right below or above the button + # depending on available screen space... + w, h = self.ItemButtons.GetSize() + if style == wx.HORIZONTAL: + x = rect.x + rect.width + y = rect.y + (rect.height - h) / 2 + x = rect.x + (rect.width - w ) / 2 + self.ItemButtons.SetPosition(self.ClientToScreen((x, y))) + if wx.Platform == '__WXMSW__': + self.ItemButtons.Popup() + self.ItemButtons.Show() + def DismissButtons(self): + if wx.Platform == '__WXMSW__': + self.ItemButtons.Dismiss() + self.ItemButtons.Destroy() + self.ItemButtons = None def OnAxesMotion(self, event):
@@ -883,26 +1041,6 @@
self.LastMotionTime = current_time
Axes3D._on_move(self.Axes, event)
- def OnSplitButton(self, event):
- if len(self.Items) == 2 or self.GraphType == GRAPH_ORTHOGONAL:
- wx.CallAfter(self.ParentWindow.SplitGraphs, self)
- menu = wx.Menu(title='')
- for item in self.Items:
- AppendMenu(menu, help='', id=new_id, kind=wx.ITEM_NORMAL,
- text=item.GetVariable(self.ParentWindow.GetVariableNameMask()))
- self.GetSplitGraphMenuFunction(item),
- AppendMenu(menu, help='', id=new_id, kind=wx.ITEM_NORMAL, text=_("All"))
- self.Bind(wx.EVT_MENU, self.OnSplitAllGraphsMenu, id=new_id)
@@ -913,25 +1051,45 @@
self.Axes = self.Figure.gca()
- self.Figure.subplotpars.update(top=0.95)
- if self.GraphType == GRAPH_ORTHOGONAL:
- self.Figure.subplotpars.update(bottom=0.15)
+ self.Figure.subplotpars.update(top=0.95, right=0.95) - if self.GraphType == GRAPH_PARALLEL:
+ if self.GraphType == GRAPH_PARALLEL or self.Is3DCanvas(): num_item = len(self.Items)
+ if not self.Is3DCanvas(): + text_func = self.Axes.text + text_func = self.Axes.text2D for idx in xrange(num_item):
- self.Axes.text(0.95, 0.05 + (num_item - idx - 1) * 0.1,
- horizontalalignment='right',
- color = color_cycle[idx % len(color_cycle)],
- transform = self.Axes.transAxes))
- self.SplitButton.Enable(len(self.Items) > 1)
+ text_func(0.95, 0.05 + (num_item - idx - 1) * 0.1, + horizontalalignment='right', + color=color_cycle[idx % len(color_cycle)], + transform=self.Axes.transAxes)) + self.AxesLabels.append( + self.Axes.text(0.1, 0.05, "", size='small', + transform=self.Axes.transAxes)) + self.Axes.text(0.95, 0.05, "", size='large', + horizontalalignment='right', + transform=self.Axes.transAxes)) + self.AxesLabels.append( + self.Axes.text(0.05, 0.1, "", size='small', + verticalalignment='bottom', + transform=self.Axes.transAxes)) + self.Axes.text(0.05, 0.95, "", size='large', + verticalalignment='top', + transform=self.Axes.transAxes)) DebugVariableViewer.AddItem(self, item)
@@ -939,6 +1097,8 @@
def RemoveItem(self, item):
DebugVariableViewer.RemoveItem(self, item)
+ if len(self.Items) == 1: + self.GraphType = GRAPH_PARALLEL def UnregisterObsoleteData(self):
@@ -1069,8 +1229,7 @@
values, forced = apply(zip, [item.GetValue(self.CursorTick) for item in self.Items])
values, forced = apply(zip, [(item.GetValue(), item.IsForced()) for item in self.Items])
- names = [item.GetVariable(variable_name_mask) for item in self.Items]
- labels = map(lambda x: "%s: %s" % x, zip(names, values))
+ labels = [item.GetVariable(variable_name_mask) for item in self.Items] colors = map(lambda x: {True: 'b', False: 'k'}[x], forced)
if self.GraphType == GRAPH_PARALLEL:
@@ -1080,23 +1239,20 @@
self.Legend.get_title().set_fontsize('small')
for t, color in zip(self.Legend.get_texts(), colors):
- for label, value in zip(self.Labels, values):
- self.Axes.set_xlabel(labels[0], fontdict={'size':'small','color':colors[0]})
- self.Axes.set_ylabel(labels[1], fontdict={'size':'small','color':colors[1]})
+ self.Axes.set_xlabel(labels[0], fontdict={'size':'small','color':colors[0]}) + self.Axes.set_ylabel(labels[1], fontdict={'size':'small','color':colors[1]}) self.Axes.set_zlabel(labels[2], fontdict={'size':'small','color':colors[2]})
+ for label, text, color in zip(self.AxesLabels, labels, colors): + for label, value in zip(self.Labels, values):
- def GetSplitGraphMenuFunction(self, item):
- def SplitGraphFunction(event):
- self.ParentWindow.SplitGraphs(self, item)
- return SplitGraphFunction
- def OnSplitAllGraphsMenu(self, event):
- self.ParentWindow.SplitGraphs(self)
class DebugVariablePanel(wx.Panel, DebugViewer):
@@ -1312,8 +1468,15 @@
panel.SetCursorTick(self.CursorTick)
- def StartDragNDrop(self, panel, x_mouse, y_mouse, x_mouse_start, y_mouse_start):
- self.DraggingAxesPanel = panel
+ def StartDragNDrop(self, panel, item, x_mouse, y_mouse, x_mouse_start, y_mouse_start): + if len(panel.GetItems()) > 1: + self.DraggingAxesPanel = DebugVariableGraphic(self.GraphicsWindow, self, [item], GRAPH_PARALLEL) + self.DraggingAxesPanel.SetCursorTick(self.CursorTick) + width, height = panel.GetSize() + self.DraggingAxesPanel.SetMinSize(wx.Size(width, height)) + self.DraggingAxesPanel.SetPosition(wx.Point(0, -height)) + self.DraggingAxesPanel = panel self.DraggingAxesBoundingBox = panel.GetAxesBoundingBox(absolute=True)
self.DraggingAxesMousePos = wx.Point(
x_mouse_start - self.DraggingAxesBoundingBox.x,
@@ -1323,11 +1486,13 @@
def MoveDragNDrop(self, x_mouse, y_mouse):
self.DraggingAxesBoundingBox.x = x_mouse - self.DraggingAxesMousePos.x
self.DraggingAxesBoundingBox.y = y_mouse - self.DraggingAxesMousePos.y
- for panel in self.GraphicPanels:
+ for idx, panel in enumerate(self.GraphicPanels): x, y = panel.GetPosition()
width, height = panel.Canvas.GetSize()
rect = wx.Rect(x, y, width, height)
- if rect.InsideXY(x_mouse, y_mouse):
+ if (rect.InsideXY(x_mouse, y_mouse) or + idx == 0 and y_mouse < 0 or + idx == len(self.GraphicPanels) - 1 and y_mouse > panel.GetPosition()[1]): panel.OnCanvasDragging(x_mouse - x, y_mouse - y, False)
panel.OnCanvasLeave(False)
@@ -1360,7 +1525,6 @@
if y_mouse > yw + height / 2:
wx.CallAfter(self.MoveGraph, variable, idx)
rect = panel.GetAxesBoundingBox(True)
if rect.InsideXY(x_mouse, y_mouse):
@@ -1372,19 +1536,44 @@
if y_mouse > yw + height / 2:
wx.CallAfter(self.MoveGraph, variable, idx)
+ width, height = self.GraphicsWindow.GetVirtualSize() + rect = wx.Rect(0, 0, width, height) + if rect.InsideXY(x_mouse, y_mouse): + wx.CallAfter(self.MoveGraph, variable, len(self.GraphicPanels)) def RefreshView(self, only_values=False):
self.RefreshCanvasPosition()
+ width, height = self.GraphicsWindow.GetVirtualSize() + bitmap = wx.EmptyBitmap(width, height) + dc = wx.BufferedPaintDC(self.GraphicsWindow, bitmap) + if self.DraggingAxesPanel is not None: + destBBox = self.DraggingAxesBoundingBox + srcBBox = self.DraggingAxesPanel.GetAxesBoundingBox() + srcBmp = _convert_agg_to_wx_bitmap(self.DraggingAxesPanel.Canvas.get_renderer(), None) + srcDC.SelectObject(srcBmp) + dc.Blit(destBBox.x, destBBox.y, + int(destBBox.width), int(destBBox.height), + srcDC, srcBBox.x, srcBBox.y) if not self.Fixed or self.Force:
+ if self.DraggingAxesPanel is not None and self.DraggingAxesPanel not in self.GraphicPanels: + self.DraggingAxesPanel.Refresh() for panel in self.GraphicPanels:
if isinstance(panel, DebugVariableGraphic):
panel.Refresh(refresh_graphics)
@@ -1738,39 +1927,6 @@
self.RefreshGraphicsSizer()
- def SplitGraphs(self, source_panel, item=None):
- source_idx = self.GetViewerIndex(source_panel)
- if source_idx is not None:
- source_items = source_panel.GetItems()
- while len(source_items) > 1:
- item = source_items.pop(-1)
- if item.IsNumVariable():
- panel = DebugVariableGraphic(self.GraphicsWindow, self, [item], GRAPH_PARALLEL)
- if self.CursorTick is not None:
- panel.SetCursorTick(self.CursorTick)
- panel = DebugVariableText(self.GraphicsWindow, self, [item])
- self.GraphicPanels.insert(source_idx + 1, panel)
- if isinstance(source_panel, DebugVariableGraphic):
- source_panel.GraphType = GRAPH_PARALLEL
- source_panel.ResetGraphics()
- source_panel.RemoveItem(item)
- if item.IsNumVariable():
- panel = DebugVariableGraphic(self.GraphicsWindow, self, [item], GRAPH_PARALLEL)
- if self.CursorTick is not None:
- panel.SetCursorTick(self.CursorTick)
- panel = DebugVariableText(self.GraphicsWindow, self, [item])
- self.GraphicPanels.insert(source_idx + 1, panel)
- self.ResetVariableNameMask()
- self.RefreshGraphicsSizer()
def MergeGraphs(self, source, target_idx, merge_type, force=False):
--- a/images/plcopen_icons.svg Tue Feb 12 23:19:57 2013 +0100
+++ b/images/plcopen_icons.svg Sun Feb 17 23:47:41 2013 +0100
@@ -10034,6 +10034,787 @@
style="stop-color:#eeeeec;stop-opacity:1"
+ id="linearGradient3234" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.57895,0,0,0.61111,1.0526,0.36108)" + style="stop-color:#777976" + style="stop-color:#565755" + id="linearGradient3231" + xlink:href="#linearGradient7916" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.30773,-0.32448,0.30773,0.32448,-7.0772,7.6731)" + id="linearGradient7916"> + style="stop-color:#fff" + style="stop-color:#fff;stop-opacity:0" + id="linearGradient3228" + xlink:href="#linearGradient7916" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.30773,-0.32448,0.30773,0.32448,-7.3874,7.8369)" + id="linearGradient3013-6"> + style="stop-color:#fff" + style="stop-color:#fff;stop-opacity:0" + gradientTransform="matrix(0.30773,-0.32448,0.30773,0.32448,-7.3874,7.8369)" + gradientUnits="userSpaceOnUse" + id="linearGradient3023" + xlink:href="#linearGradient7916" + inkscape:collect="always" /> + id="linearGradient5528" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.45455,0,0,0.45902,-3.3637,-2.6312)" + style="stop-color:#505050" + style="stop-color:#6e6e6e" + style="stop-color:#8c8c8c" + id="linearGradient5525" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.41935,0,0,0.41379,-2.4838,-1.431)" + style="stop-color:#fff" + style="stop-color:#fff;stop-opacity:.46875" + id="linearGradient5522" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.36842,0,0,0.48002992,-0.8421,-4.2013409)" + style="stop-color:#fff;stop-opacity:.94118" + style="stop-color:#fff;stop-opacity:.70588" + id="linearGradient3234-2" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.57895,0,0,0.61111,1.0526,0.36108)" + style="stop-color:#777976" + style="stop-color:#565755" + id="linearGradient3231-1" + xlink:href="#linearGradient7916-4" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.30773,-0.32448,0.30773,0.32448,-7.0772,7.6731)" + id="linearGradient7916-4"> + style="stop-color:#fff" + style="stop-color:#fff;stop-opacity:0" + gradientTransform="matrix(0.30773,-0.32448,0.30773,0.32448,-7.3874,7.8369)" + gradientUnits="userSpaceOnUse" + id="linearGradient3023-8" + xlink:href="#linearGradient7916-4" + inkscape:collect="always" /> + id="linearGradient5800"> + style="stop-color:#fff" + style="stop-color:#fff;stop-opacity:0" + gradientTransform="matrix(0.30773,-0.32448,0.30773,0.32448,-7.3874,7.8369)" + gradientUnits="userSpaceOnUse" + id="linearGradient5810" + xlink:href="#linearGradient7916-4" + inkscape:collect="always" /> + id="linearGradient3234-5" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.57895,0,0,0.61111,1.0526,0.36108)" + style="stop-color:#777976" + style="stop-color:#565755" + gradientTransform="matrix(0.57895,0,0,0.61111,-0.9473,-1.63892)" + gradientUnits="userSpaceOnUse" + id="linearGradient5895" + xlink:href="#linearGradient3234-5" + inkscape:collect="always" /> + id="linearGradient3234-1" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.57895,0,0,0.61111,1.0526,0.36108)" + style="stop-color:#777976" + style="stop-color:#565755" + gradientTransform="matrix(0.57895,0,0,0.61111,58.6726,221.75818)" + gradientUnits="userSpaceOnUse" + id="linearGradient5925" + xlink:href="#linearGradient3234-1" + inkscape:collect="always" /> + id="linearGradient3234-0" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.57895,0,0,0.61111,1.0526,0.36108)" + style="stop-color:#777976" + style="stop-color:#565755" + gradientTransform="matrix(0.57895,0,0,0.61111,-0.9473,-1.63892)" + gradientUnits="userSpaceOnUse" + id="linearGradient5925-1" + xlink:href="#linearGradient3234-0" + inkscape:collect="always" /> + inkscape:collect="always" + xlink:href="#linearGradient3234-0" + id="linearGradient6750" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.96201841,0,0,1.9879765,-206.55613,-188.7245)" /> + gradientTransform="matrix(0.30773,-0.32448,0.30773,0.32448,-7.3874,7.8369)" + gradientUnits="userSpaceOnUse" + id="linearGradient3023-80" + xlink:href="#linearGradient7916-5" + inkscape:collect="always" /> + id="linearGradient7916-5"> + style="stop-color:#fff" + style="stop-color:#fff;stop-opacity:0" + gradientTransform="matrix(0.30773,-0.32448,0.30773,0.32448,39.784853,228.1471)" + gradientUnits="userSpaceOnUse" + id="linearGradient6767" + xlink:href="#linearGradient7916-5" + inkscape:collect="always" /> + id="linearGradient3231-16" + xlink:href="#linearGradient7916-9" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.30773,-0.32448,0.30773,0.32448,-7.0772,7.6731)" + id="linearGradient7916-9"> + style="stop-color:#fff" + style="stop-color:#fff;stop-opacity:0" + gradientTransform="matrix(0.44717834,-0.00406845,-0.01961605,0.44676642,-134.39116,258.96099)" + gradientUnits="userSpaceOnUse" + id="linearGradient6801" + xlink:href="#linearGradient7916-9" + inkscape:collect="always" /> + gradientTransform="matrix(0.44717834,-0.00406845,-0.01961605,0.44676642,-78.185829,253.58647)" + gradientUnits="userSpaceOnUse" + id="linearGradient6801-3" + xlink:href="#linearGradient7916-9-1" + inkscape:collect="always" /> + id="linearGradient7916-9-1"> + style="stop-color:#fff" + style="stop-color:#fff;stop-opacity:0" + inkscape:collect="always" + xlink:href="#linearGradient3234-0-5" + id="linearGradient6750-4" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.96236471,0,0,5.1478585,-150.36967,-920.8619)" /> + id="linearGradient3234-0-5" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.57895,0,0,0.61111,1.0526,0.36108)" + style="stop-color:#777976" + style="stop-color:#565755" + id="linearGradient5528-8" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.45455,0,0,0.45902,-3.3637,-2.6312)" + style="stop-color:#505050" + style="stop-color:#6e6e6e" + style="stop-color:#8c8c8c" + id="linearGradient5525-3" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.41935,0,0,0.41379,-2.4838,-1.431)" + style="stop-color:#fff" + style="stop-color:#fff;stop-opacity:.46875" + id="linearGradient5522-9" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.36842,0,0,0.48002992,-0.8421,-4.2013409)" + style="stop-color:#fff;stop-opacity:.94118" + style="stop-color:#fff;stop-opacity:.70588" + id="linearGradient2627" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.31434,0,0,0.37784,0.45678,-2.0038)" + style="stop-color:#fee7b1" + style="stop-color:#ebd4b4" + style="stop-color:#c8a775" + style="stop-color:#b0935b" + style="stop-color:#fcebbf" + id="linearGradient2624" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.27248,0,0,0.33859,1.4645,-0.49541)" + style="stop-color:#fff" + style="stop-color:#fff;stop-opacity:.49485" + id="linearGradient2621" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.29412,0,0,0.60561,0.94118,-3.8915)" + style="stop-color:#d6c8a7" + style="stop-color:#d0bd99" + id="linearGradient2618" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.27273,0,0,0.25159,1.4545,3.0971)" + style="stop-color:#fff" + style="stop-color:#fff;stop-opacity:0" + id="linearGradient2608" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.26064,0,0,0.31489,1.7268,-1.0478)" + style="stop-color:#cad0c6" + style="stop-color:#eaece9" + style="stop-color:#c5cbc0" + id="linearGradient2631" + xlink:href="#linearGradient6227" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(1.6824,1.125)" + id="linearGradient6227"> + color-interpolation-filters="sRGB" + id="feGaussianBlur6253-62" + stdDeviation="0.24444548" /> + id="linearGradient2629" + xlink:href="#linearGradient6227" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-19.533,1.7437)" + id="linearGradient3056"> + color-interpolation-filters="sRGB" + id="feGaussianBlur3064" + stdDeviation="0.24444548" /> + color-interpolation-filters="sRGB"> + id="feGaussianBlur3409" + stdDeviation="0.82668559" /> + id="linearGradient2627-1" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.31434,0,0,0.37784,0.45678,-2.0038)" + style="stop-color:#fee7b1" + style="stop-color:#ebd4b4" + style="stop-color:#c8a775" + style="stop-color:#b0935b" + style="stop-color:#fcebbf" + id="linearGradient2624-6" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.27248,0,0,0.33859,1.4645,-0.49541)" + style="stop-color:#fff" + style="stop-color:#fff;stop-opacity:.49485" + id="linearGradient2621-2" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.29412,0,0,0.60561,0.94118,-3.8915)" + style="stop-color:#d6c8a7" + style="stop-color:#d0bd99" + id="linearGradient2618-4" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.27273,0,0,0.25159,1.4545,3.0971)" + style="stop-color:#fff" + style="stop-color:#fff;stop-opacity:0" + id="linearGradient2608-4" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.26064,0,0,0.31489,7.19555,-1.0478)" + style="stop-color:#cad0c6" + style="stop-color:#eaece9" + style="stop-color:#c5cbc0" + id="linearGradient2631-3" + xlink:href="#linearGradient6227-9" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(1.6824,1.125)" + id="linearGradient6227-9"> + color-interpolation-filters="sRGB" + id="feGaussianBlur6253-62-0" + stdDeviation="0.24444548" /> + id="linearGradient2629-8" + xlink:href="#linearGradient6227-9" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-19.533,1.7437)" + id="linearGradient5841"> + color-interpolation-filters="sRGB" + id="feGaussianBlur5849" + stdDeviation="0.24444548" /> + color-interpolation-filters="sRGB"> + id="feGaussianBlur3409-6" + stdDeviation="0.82668559" /> @@ -10042,9 +10823,9 @@
- inkscape:zoom="2.828427"
- inkscape:cx="-47.411844"
- inkscape:cy="-252.32358"
+ inkscape:zoom="1.9999999" + inkscape:cx="-254.99706" + inkscape:cy="-254.41678" inkscape:document-units="px"
inkscape:current-layer="layer1"
@@ -10058,7 +10839,8 @@
inkscape:window-height="1056"
- inkscape:window-maximized="1">
+ inkscape:window-maximized="1" + inkscape:snap-global="false"> @@ -10088,8 +10870,8 @@
inkscape:label="#rect3636"
@@ -14540,206 +15322,61 @@
inkscape:label="#rect3636"
style="opacity:0;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
style="font-size:4.49727678px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:Bitstream Vera Sans"
id="text3638-3-3-2-0-9-84"><tspan
id="tspan3640-1-8-0-6-8-0"
- y="215.125">%%force%%</tspan></text>
- transform="translate(-90.439343,218.49737)"
- inkscape:connector-curvature="0"
- style="opacity:0.4;fill:url(#radialGradient2670)"
- d="m 22,21.947 c 0,1.113 -4.4771,2.0152 -9.9999,2.0152 -5.5228,0 -9.9999,-0.90224 -9.9999,-2.0152 0,-1.11296 4.4771,-2.0152 9.9999,-2.0152 5.5228,0 9.9999,0.90224 9.9999,2.0152 z" />
- inkscape:connector-curvature="0"
- style="fill:url(#linearGradient2667);fill-rule:evenodd;stroke:#a2824e;stroke-linecap:round;stroke-linejoin:round"
- d="m 4.5857,8.0018 c 4.8977,-0.72404 9.8475,-0.61163 14.828,0 0.60151,0 1.0857,0.52347 1.0857,1.1737 v 11.698 c 0,0.65024 -0.5155,1.0797 -1.0857,1.1737 -5.164,0.60626 -9.5919,0.60147 -14.828,0 -0.6955,-0.22 -1.086,-0.524 -1.086,-1.175 V 9.1742 c 0,-0.65024 0.48424,-1.1737 1.0857,-1.1737 z" />
- inkscape:connector-curvature="0"
- style="opacity:0.38000039;fill:none;stroke:url(#linearGradient2654);stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.60109002"
- d="m 5.0857,9.5 h 13.829 c 0.32446,0 0.58567,0.26635 0.58567,0.5972 v 10.396 c 0,0.33085 -0.23192,0.48359 -0.58567,0.5972 -4.5217,0.54696 -8.9848,0.5457 -13.829,0 C 4.76124,20.97679 4.50003,20.82405 4.50003,20.4932 V 10.0972 C 4.50003,9.76635 4.76124,9.5 5.0857,9.5 z" />
- inkscape:connector-curvature="0"
- style="fill:url(#linearGradient2651);fill-rule:evenodd"
- d="m 4.7794,8.5385 c 4.8137,-0.78635 9.6274,-0.64629 14.441,0 0.4318,0 0.77943,0.386 0.77943,0.86548 v 1.499 c 0,0.47947 -0.34763,0.86548 -0.77943,0.86548 -5.0234,0.3715 -9.6454,0.23891 -14.441,0 -0.4314,0 -0.779,-0.386 -0.779,-0.865 v -1.499 c 0,-0.4795 0.3476,-0.8655 0.7794,-0.8655 z" />
- inkscape:connector-curvature="0"
- style="opacity:0.6;fill:none;stroke:url(#linearGradient2648);stroke-linecap:round;stroke-linejoin:round"
- d="m 5.0455,10.5 h 13.909 c 0.30223,0 0.54554,0.1293 0.54554,0.2899 v 0.17499 c 0,0.1606 -0.24331,0.2899 -0.54554,0.2899 -4.593,0.31718 -9.238,0.33659 -13.909,0 -0.30223,0 -0.54554,-0.1293 -0.54554,-0.2899 V 10.7899 C 4.49996,10.6293 4.74327,10.5 5.0455,10.5 z" />
- style="opacity:0.2;fill:#ffffff;fill-rule:evenodd;filter:url(#filter5957)"
- transform="matrix(0.9234,0,0,0.57774,-7.227,-2.3565)"
- inkscape:connector-curvature="0"
- style="opacity:0.3;fill:url(#radialGradient3446);fill-rule:evenodd"
- d="M 10,9.25 C 10,9.9404 8.8807,10.5 7.5,10.5 6.1193,10.5 5,9.9404 5,9.25 5,8.5596 6.1193,8 7.5,8 8.8807,8 10,8.5596 10,9.25 z" />
- inkscape:connector-curvature="0"
- style="opacity:0.3;fill:url(#radialGradient3444);fill-rule:evenodd"
- d="M 19,9.25 C 19,9.9404 17.881,10.5 16.5,10.5 15.119,10.5 14,9.9404 14,9.25 14,8.5596 15.119,8 16.5,8 17.881,8 19,8.5596 19,9.25 z" />
- inkscape:connector-curvature="0"
- style="fill:url(#linearGradient2638);fill-rule:evenodd;stroke:#888a85"
- d="M 6.5022,8.6395 V 5.9354 c 0,-3.711 2.1522,-5.4739 5.4773,-5.4276 3.3431,0.046344 5.5183,1.673 5.5183,5.4276 v 2.822 c 0,0.92147 -2.2477,1.0387 -2.2477,0 v -1.879 c 0,-0.94305 0.2327,-3.9947 -3.2471,-3.9947 -3.4511,0 -3.1997,3.0704 -3.1863,3.9909 v 1.7807 c 0,1.1103 -2.3144,1.1055 -2.3144,-0.01588 z" />
- inkscape:connector-curvature="0"
- style="opacity:0.18235001;fill:url(#linearGradient2623);fill-rule:evenodd;filter:url(#filter6251)"
- d="m 34.687,10.837 1.2639,0.125 c 0.92724,2.8227 0.73605,9.5104 0.73605,9.5104 -0.0625,1.125 -2.0312,0.53125 -2,0 V 10.837 z"
- transform="matrix(0.40937,0,0,0.47152,2.1465,-0.90174)" />
- inkscape:connector-curvature="0"
- style="opacity:0.14118;fill:url(#linearGradient2625);fill-rule:evenodd;filter:url(#filter6251)"
- d="m 12.927,11.544 0.37172,0.1692 c 1.7203,1.055 2.1735,9.3778 2.1735,9.3778 -0.0625,1.125 -2.0312,0.53125 -2,0 0,0 0.37822,-6.8706 -0.54525,-9.547 z"
- transform="matrix(-0.40937,0,0,0.47152,14.042,-1.1935)" />
- inkscape:connector-curvature="0"
- style="opacity:0.62352995;fill:none;stroke:#ffffff;stroke-width:4.29829979;stroke-linecap:round;filter:url(#filter5745)"
- d="m 13.877,17.722 0.125,-7.5 c 0,-9.8764 18.688,-10.676 18.688,0.875 v 6.875"
- transform="matrix(0.45915,0,0,0.47152,0.97831,0.22752)" />
+ y="255.625">%%force%%</tspan></text> style="font-size:4.49727678px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:Bitstream Vera Sans"
id="text3638-3-3-2-0-9-84-1"><tspan
id="tspan3640-1-8-0-6-8-0-5"
- y="215">%%release%%</tspan></text>
+ y="255.5">%%release%%</tspan></text> inkscape:label="#rect3636"
style="opacity:0;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
- transform="translate(-58.267759,218.481)"
- inkscape:connector-curvature="0"
- style="opacity:0.4;fill:url(#radialGradient2670-3)"
- d="m 22,21.947 c 0,1.113 -4.4771,2.0152 -9.9999,2.0152 -5.5228,0 -9.9999,-0.90224 -9.9999,-2.0152 0,-1.11296 4.4771,-2.0152 9.9999,-2.0152 5.5228,0 9.9999,0.90224 9.9999,2.0152 z" />
- inkscape:connector-curvature="0"
- style="fill:url(#linearGradient2667-8);fill-rule:evenodd;stroke:#a2824e;stroke-linecap:round;stroke-linejoin:round"
- d="m 4.5857,8.0018 c 4.8977,-0.72404 9.8475,-0.61163 14.828,0 0.60151,0 1.0857,0.52347 1.0857,1.1737 v 11.698 c 0,0.65024 -0.5155,1.0797 -1.0857,1.1737 -5.164,0.60626 -9.5919,0.60147 -14.828,0 -0.6955,-0.22 -1.086,-0.524 -1.086,-1.175 V 9.1742 c 0,-0.65024 0.48424,-1.1737 1.0857,-1.1737 z" />
- inkscape:connector-curvature="0"
- style="opacity:0.38000039;fill:none;stroke:url(#linearGradient2654-8);stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.60109002"
- d="m 5.0857,9.5 h 13.829 c 0.32446,0 0.58567,0.26635 0.58567,0.5972 v 10.396 c 0,0.33085 -0.23192,0.48359 -0.58567,0.5972 -4.5217,0.54696 -8.9848,0.5457 -13.829,0 C 4.76124,20.97679 4.50003,20.82405 4.50003,20.4932 V 10.0972 C 4.50003,9.76635 4.76124,9.5 5.0857,9.5 z" />
- inkscape:connector-curvature="0"
- style="fill:url(#linearGradient2651-2);fill-rule:evenodd"
- d="m 4.7794,8.5385 c 4.8137,-0.78635 9.6274,-0.64629 14.441,0 0.4318,0 0.77943,0.386 0.77943,0.86548 v 1.499 c 0,0.47947 -0.34763,0.86548 -0.77943,0.86548 -5.0234,0.3715 -9.6454,0.23891 -14.441,0 -0.4314,0 -0.779,-0.386 -0.779,-0.865 v -1.499 c 0,-0.4795 0.3476,-0.8655 0.7794,-0.8655 z" />
- inkscape:connector-curvature="0"
- style="opacity:0.6;fill:none;stroke:url(#linearGradient2648-2);stroke-linecap:round;stroke-linejoin:round"
- d="m 5.0455,10.5 h 13.909 c 0.30223,0 0.54554,0.1293 0.54554,0.2899 v 0.17499 c 0,0.1606 -0.24331,0.2899 -0.54554,0.2899 -4.593,0.31718 -9.238,0.33659 -13.909,0 -0.30223,0 -0.54554,-0.1293 -0.54554,-0.2899 V 10.7899 C 4.49996,10.6293 4.74327,10.5 5.0455,10.5 z" />
- style="opacity:0.2;fill:#ffffff;fill-rule:evenodd;filter:url(#filter5957-1)"
- transform="matrix(0.9234,0,0,0.57774,-7.227,-2.3565)"
- inkscape:connector-curvature="0"
- style="opacity:0.3;fill:url(#radialGradient3446-5);fill-rule:evenodd"
- d="M 10,9.25 C 10,9.9404 8.8807,10.5 7.5,10.5 6.1193,10.5 5,9.9404 5,9.25 5,8.5596 6.1193,8 7.5,8 8.8807,8 10,8.5596 10,9.25 z" />
- inkscape:connector-curvature="0"
- style="opacity:0.3;fill:url(#radialGradient3444-4);fill-rule:evenodd"
- d="M 19,9.25 C 19,9.9404 17.881,10.5 16.5,10.5 15.119,10.5 14,9.9404 14,9.25 14,8.5596 15.119,8 16.5,8 17.881,8 19,8.5596 19,9.25 z" />
- inkscape:connector-curvature="0"
- style="fill:url(#linearGradient2638-4);fill-rule:evenodd;stroke:#888a85"
- d="M 15.297692,8.6395 V 5.9354 c 0,-3.711 2.1522,-5.4739 5.4773,-5.4276 3.3431,0.046344 5.5183,1.673 5.5183,5.4276 v 2.822 c 0,0.92147 -2.2477,1.0387 -2.2477,0 v -1.879 c 0,-0.94305 0.2327,-3.9947 -3.2471,-3.9947 -3.4511,0 -3.1997,3.0704 -3.1863,3.9909 v 1.7807 c 0,1.1103 -2.3144,1.1055 -2.3144,-0.01588 z" />
- inkscape:connector-curvature="0"
- style="opacity:0.18235001;fill:url(#linearGradient2623-6);fill-rule:evenodd;filter:url(#filter6251-7)"
- d="m 34.687,10.837 1.2639,0.125 c 0.92724,2.8227 0.73605,9.5104 0.73605,9.5104 -0.0625,1.125 -2.0312,0.53125 -2,0 V 10.837 z"
- transform="matrix(0.40937,0,0,0.47152,10.941992,-0.90174)" />
- inkscape:connector-curvature="0"
- style="opacity:0.14118;fill:url(#linearGradient2625-2);fill-rule:evenodd;filter:url(#filter6251-7)"
- d="m 12.927,11.544 0.37172,0.1692 c 1.7203,1.055 2.1735,9.3778 2.1735,9.3778 -0.0625,1.125 -2.0312,0.53125 -2,0 0,0 0.37822,-6.8706 -0.54525,-9.547 z"
- transform="matrix(-0.40937,0,0,0.47152,22.837492,-1.1935)" />
- inkscape:connector-curvature="0"
- style="opacity:0.62352995;fill:none;stroke:#ffffff;stroke-width:4.29829979;stroke-linecap:round;filter:url(#filter5745-0)"
- d="m 13.877,17.722 0.125,-7.5 c 0,-9.8764 18.688,-10.676 18.688,0.875 v 6.875"
- transform="matrix(0.45915,0,0,0.47152,9.7738056,0.22752)" />
style="font-size:4.49727678px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:Bitstream Vera Sans"
id="text3638-3-3-2-0-9-84-1-0"><tspan
id="tspan3640-1-8-0-6-8-0-5-0"
- y="215.11613">%%split%%</tspan></text>
+ y="214.86613">%%split%%</tspan></text> inkscape:label="#rect3636"
style="opacity:0;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
- transform="scale(0.9,1)">
+ transform="matrix(0.9,0,0,1,-68.500003,-0.25000001)"> @@ -14757,7 +15394,7 @@
- transform="matrix(0.01312661,-0.55960772,0.55960772,0.01312661,-15.624053,237.13593)">
+ transform="matrix(0.01312661,-0.55960772,0.55960772,0.01312661,-84.124056,236.88593)"> transform="matrix(0.8930733,0.44991119,-0.44991119,0.8930733,-40.088761,-46.216687)">
@@ -14775,7 +15412,7 @@
style="fill:#d1524c;fill-opacity:1;stroke:#973137;stroke-width:0.64594996;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
transform="matrix(1.3838457,-0.5995106,0.7577226,1.5096437,-342.70934,195.72431)"
- points="297.04443,12.300293 297.04443,12.300293 296.39941,13.384766 295.13281,14.71875 294.73242,13.672852 295.74658,11.960449 " />
+ points="297.04443,12.300293 296.39941,13.384766 295.13281,14.71875 294.73242,13.672852 295.74658,11.960449 297.04443,12.300293 " /> style="fill:url(#linearGradient6534-2);stroke:#888a85;stroke-width:0.98886794;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
@@ -14800,7 +15437,7 @@
style="fill:#d1524c;fill-opacity:1;stroke:#973137;stroke-width:0.6332444;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
transform="matrix(1.1476031,-0.79527758,0.96691724,1.4548542,-275.37886,255.51909)"
- points="296.95605,12.300293 297.6001,13.384766 298.86719,14.71875 299.26807,13.672852 298.25391,11.960449 296.95605,12.300293 " />
+ points="297.6001,13.384766 298.86719,14.71875 299.26807,13.672852 298.25391,11.960449 296.95605,12.300293 296.95605,12.300293 " /> style="fill:#d1524c;fill-opacity:1;stroke:#973137;stroke-width:0.99573755;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
@@ -14820,7 +15457,7 @@
- transform="scale(0.9,1)">
+ transform="matrix(0.9,0,0,1,-68.500003,-0.25000001)"> @@ -14835,5 +15472,250 @@
d="m -20,234 3.427184,4 5.08233,-2.66431 L -10,237 -5.3695924,233.56793 0,236"
style="fill:none;stroke:#ff0000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ style="font-size:4.49727678px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:Bitstream Vera Sans" + id="text3638-3-3-2-0-9-84-1-0-7"><tspan + id="tspan3640-1-8-0-6-8-0-5-0-8" + y="255.625">%%delete_graph%%</tspan></text> + transform="translate(-184.69001,259.127)" + inkscape:connector-curvature="0" + style="fill:url(#linearGradient3234);stroke:#4d4d4d" + d="M 13.5,11.239 10.315,7.998 13.38,4.6029 11.17,2.5 8.0165,5.7353 4.7985,2.5 2.5,4.6803 5.7179,7.9842 2.4999,11.2353 4.7984,13.5 8.0126,10.1029 11.2343,13.5 13.4999,11.2388 z" /> + inkscape:connector-curvature="0" + style="opacity:0.3;fill:none;stroke:url(#linearGradient3231);stroke-linecap:square" + d="M 12.003,4.6567 11.232,3.9069 8.0826,7.1693 4.7768,3.9261 3.9136,4.7225" /> + inkscape:connector-curvature="0" + style="opacity:0.3;fill:none;stroke:url(#linearGradient3023)" + d="M 12.449,11.612 9.3447,8.3988 M 6.6909,8.39262 3.5815,11.58332" /> + inkscape:label="#rect3636" + style="opacity:0;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="font-size:4.49727678px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:Bitstream Vera Sans" + id="text3638-3-3-2-0-9-84-1-0-7-8"><tspan + id="tspan5713">%%minimize_graph%%</tspan></text> + inkscape:label="#rect3636" + style="opacity:0;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + transform="translate(-131.43751,258.375)" + style="fill:url(#linearGradient5528);stroke:#565853;stroke-width:0.99993002;stroke-linejoin:round" + style="opacity:0.2;fill:none;stroke:url(#linearGradient5525);stroke-width:1.00010002" + style="fill:url(#linearGradient5522)" + style="color:#000000;fill:url(#linearGradient6750);fill-opacity:1;fill-rule:nonzero;stroke:#565853;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + inkscape:connector-curvature="0" + style="opacity:0.3;fill:none;stroke:url(#linearGradient6801);stroke-width:1;stroke-linecap:square;display:inline" + d="m -118.96639,270.98043 0.004,-1.46609 -9.03453,0.0166" + sodipodi:nodetypes="ccc" /> + style="font-size:4.49727678px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:Bitstream Vera Sans" + id="text3638-3-3-2-0-9-84-1-0-7-8-0"><tspan + id="tspan5713-0">%%maximize_graph%%</tspan></text> + inkscape:label="#rect3636" + style="opacity:0;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + transform="translate(-75.199039,258.45845)" + style="fill:url(#linearGradient5528-8);stroke:#565853;stroke-width:0.99993002;stroke-linejoin:round" + style="opacity:0.2;fill:none;stroke:url(#linearGradient5525-3);stroke-width:1.00010002" + style="fill:url(#linearGradient5522-9)" + style="color:#000000;fill:url(#linearGradient6750-4);fill-opacity:1;fill-rule:nonzero;stroke:#565853;stroke-width:0.99638373;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + inkscape:connector-curvature="0" + style="opacity:0.3;fill:none;stroke:url(#linearGradient6801-3);stroke-width:1;stroke-linecap:square;display:inline" + d="m -62.761059,271.04244 0.004,-6.90262 -9.03453,0.0166" + sodipodi:nodetypes="ccc" /> + transform="translate(-261.99974,259.1098)" + inkscape:connector-curvature="0" + style="fill:url(#linearGradient2627);fill-rule:evenodd;stroke:#a2824e;stroke-linecap:round;stroke-linejoin:round" + d="m 3.2025,5.8345 c 3.1691,-0.48269 6.3719,-0.40776 9.5949,0 0.38921,0 0.70255,0.34898 0.70255,0.78248 v 7.7986 c 0,0.43349 -0.33356,0.71977 -0.70255,0.78247 -3.3415,0.40417 -6.2065,0.40098 -9.5949,0 -0.4503,-0.146 -0.703,-0.349 -0.703,-0.782 v -7.7986 c 0,-0.43349 0.31334,-0.78248 0.70255,-0.78248 z" /> + inkscape:connector-curvature="0" + style="opacity:0.38000039;fill:none;stroke:url(#linearGradient2624);stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.60109002" + d="m 3.8514,6.5 h 8.2972 c 0.194,0 0.351,0.1776 0.351,0.3981 v 6.9306 c 0,0.22057 -0.13915,0.3224 -0.3514,0.39814 -2.713,0.36464 -5.3909,0.3638 -8.2972,0 C 3.65632,14.1511 3.4996,14.04927 3.4996,13.8287 V 6.8981 c 0,-0.2208 0.1567,-0.3984 0.3514,-0.3984 z" /> + inkscape:connector-curvature="0" + style="fill:url(#linearGradient2621);fill-rule:evenodd" + d="m 3.4871,6.4039 c 3.0086,-0.58976 6.0171,-0.48472 9.0257,0 0.27,0 0.487,0.2895 0.487,0.6491 v 1.1242 c 0,0.35961 -0.21727,0.64911 -0.48715,0.64911 -3.1396,0.27862 -6.0283,0.17919 -9.0257,0 -0.2699,0 -0.4872,-0.2895 -0.4872,-0.6491 v -1.1242 c 0,-0.3596 0.2173,-0.6491 0.4871,-0.6491 z" /> + inkscape:connector-curvature="0" + style="opacity:0.6;fill:none;stroke:url(#linearGradient2618);stroke-linecap:round;stroke-linejoin:round" + d="m 3.8273,7.5 h 8.3453 c 0.18134,0 0.32733,0.1293 0.32733,0.2899 v 0.17498 c 0,0.1606 -0.14599,0.2899 -0.32733,0.2899 -2.7558,0.31718 -5.5428,0.33659 -8.3453,0 -0.18134,0 -0.32733,-0.1293 -0.32733,-0.2899 V 7.7899 C 3.49997,7.6293 3.64596,7.5 3.8273,7.5 z" /> + inkscape:connector-curvature="0" + style="fill:url(#linearGradient2608);fill-rule:evenodd;stroke:#888a85" + d="M 4.5,5.9305 V 4.1247 c 0,-2.4782 1.3703,-3.6555 3.4873,-3.6246 2.1285,0.030949 3.5134,1.1172 3.5134,3.6246 v 1.8846 c 0,0.61536 -1.4311,0.69368 -1.4311,0 V 4.7545 c 0,-0.62977 0.14816,-2.6677 -2.0674,-2.6677 -2.1973,0 -2.0372,2.0505 -2.0287,2.6652 V 5.9412 C 5.9735,6.68264 4.5,6.67949 4.5,5.930596 z" /> + inkscape:connector-curvature="0" + style="opacity:0.18235001;fill:url(#linearGradient2631);fill-rule:evenodd;filter:url(#filter6251-1)" + d="m 34.687,10.837 1.2639,0.125 c 0.92724,2.8227 0.73605,9.5104 0.73605,9.5104 -0.0625,1.125 -2.0312,0.53125 -2,0 V 10.837 z" + transform="matrix(0.26064,0,0,0.31489,1.7268,-0.44122)" /> + inkscape:connector-curvature="0" + style="opacity:0.14118;fill:url(#linearGradient2629);fill-rule:evenodd;filter:url(#filter6251-1)" + d="m 12.927,11.544 0.37172,0.1692 c 1.7203,1.055 2.1735,9.3778 2.1735,9.3778 -0.0625,1.125 -2.0312,0.53125 -2,0 0,0 0.37822,-6.8706 -0.54525,-9.547 z" + transform="matrix(-0.26064,0,0,0.31489,9.3006,-0.63604)" /> + inkscape:connector-curvature="0" + style="opacity:0.62352995;fill:none;stroke:#ffffff;stroke-width:6.59200001;stroke-linecap:round;filter:url(#filter3407)" + d="m 31.844,17.125 c -0.003,-2.113 0.006,-4.2261 -0.0047,-6.339 -0.034,-1.6107 -0.543,-3.2452 -1.612,-4.4726 -1.355,-1.5843 -3.379,-2.4626 -5.414,-2.7423 -0.487,-0.0673 -0.978,-0.1013 -1.469,-0.1023 -2.075,0.00558 -4.1949,0.54216 -5.9005,1.7543 -1.1825,0.83615 -2.1108,2.0716 -2.4313,3.4977 -0.22328,0.90342 -0.15731,1.8388 -0.19188,2.7603 -0.03376,1.798 -0.06753,3.5959 -0.10129,5.3939" + transform="matrix(0.29233,0,0,0.31489,0.98301,0.31291)" /> + transform="translate(-228.60957,259.1098)" + inkscape:connector-curvature="0" + style="fill:url(#linearGradient2627-1);fill-rule:evenodd;stroke:#a2824e;stroke-linecap:round;stroke-linejoin:round" + d="m 3.2025,5.8345 c 3.1691,-0.48269 6.3719,-0.40776 9.5949,0 0.38921,0 0.70255,0.34898 0.70255,0.78248 v 7.7986 c 0,0.43349 -0.33356,0.71977 -0.70255,0.78247 -3.3415,0.40417 -6.2065,0.40098 -9.5949,0 -0.4503,-0.146 -0.703,-0.349 -0.703,-0.782 v -7.7986 c 0,-0.43349 0.31334,-0.78248 0.70255,-0.78248 z" /> + inkscape:connector-curvature="0" + style="opacity:0.38000039;fill:none;stroke:url(#linearGradient2624-6);stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.60109002" + d="m 3.8514,6.5 h 8.2972 c 0.194,0 0.351,0.1776 0.351,0.3981 v 6.9306 c 0,0.22057 -0.13915,0.3224 -0.3514,0.39814 -2.713,0.36464 -5.3909,0.3638 -8.2972,0 C 3.65632,14.1511 3.4996,14.04927 3.4996,13.8287 V 6.8981 c 0,-0.2208 0.1567,-0.3984 0.3514,-0.3984 z" /> + inkscape:connector-curvature="0" + style="fill:url(#linearGradient2621-2);fill-rule:evenodd" + d="m 3.4871,6.4039 c 3.0086,-0.58976 6.0171,-0.48472 9.0257,0 0.27,0 0.487,0.2895 0.487,0.6491 v 1.1242 c 0,0.35961 -0.21727,0.64911 -0.48715,0.64911 -3.1396,0.27862 -6.0283,0.17919 -9.0257,0 -0.2699,0 -0.4872,-0.2895 -0.4872,-0.6491 v -1.1242 c 0,-0.3596 0.2173,-0.6491 0.4871,-0.6491 z" /> + inkscape:connector-curvature="0" + style="opacity:0.6;fill:none;stroke:url(#linearGradient2618-4);stroke-linecap:round;stroke-linejoin:round" + d="m 3.8273,7.5 h 8.3453 c 0.18134,0 0.32733,0.1293 0.32733,0.2899 v 0.17498 c 0,0.1606 -0.14599,0.2899 -0.32733,0.2899 -2.7558,0.31718 -5.5428,0.33659 -8.3453,0 -0.18134,0 -0.32733,-0.1293 -0.32733,-0.2899 V 7.7899 C 3.49997,7.6293 3.64596,7.5 3.8273,7.5 z" /> + inkscape:connector-curvature="0" + style="fill:url(#linearGradient2608-4);fill-rule:evenodd;stroke:#888a85" + d="M 9.96875,5.9305 V 4.1247 c 0,-2.4782 1.3703,-3.6555 3.4873,-3.6246 2.1285,0.030949 3.5134,1.1172 3.5134,3.6246 v 1.8846 c 0,0.61536 -1.4311,0.69368 -1.4311,0 V 4.7545 c 0,-0.62977 0.14816,-2.6677 -2.0674,-2.6677 -2.1973,0 -2.0372,2.0505 -2.0287,2.6652 v 1.1892 c 0,0.74144 -1.4735,0.73829 -1.4735,-0.010604 z" /> + inkscape:connector-curvature="0" + style="opacity:0.18235001;fill:url(#linearGradient2631-3);fill-rule:evenodd;filter:url(#filter6251-1-3)" + d="m 34.687,10.837 1.2639,0.125 c 0.92724,2.8227 0.73605,9.5104 0.73605,9.5104 -0.0625,1.125 -2.0312,0.53125 -2,0 V 10.837 z" + transform="matrix(0.26064,0,0,0.31489,7.211175,-0.44122)" /> + inkscape:connector-curvature="0" + style="opacity:0.14118;fill:url(#linearGradient2629-8);fill-rule:evenodd;filter:url(#filter6251-1-3)" + d="m 12.927,11.544 0.37172,0.1692 c 1.7203,1.055 2.1735,9.3778 2.1735,9.3778 -0.0625,1.125 -2.0312,0.53125 -2,0 0,0 0.37822,-6.8706 -0.54525,-9.547 z" + transform="matrix(-0.26064,0,0,0.31489,14.8006,-0.63604)" /> + inkscape:connector-curvature="0" + style="opacity:0.62352995;fill:none;stroke:#ffffff;stroke-width:6.59200001;stroke-linecap:round;filter:url(#filter3407-0)" + d="m 31.844,17.125 c -0.003,-2.113 0.006,-4.2261 -0.0047,-6.339 -0.034,-1.6107 -0.543,-3.2452 -1.612,-4.4726 -1.355,-1.5843 -3.379,-2.4626 -5.414,-2.7423 -0.487,-0.0673 -0.978,-0.1013 -1.469,-0.1023 -2.075,0.00558 -4.1949,0.54216 -5.9005,1.7543 -1.1825,0.83615 -2.1108,2.0716 -2.4313,3.4977 -0.22328,0.90342 -0.15731,1.8388 -0.19188,2.7603 -0.03376,1.798 -0.06753,3.5959 -0.10129,5.3939" + transform="matrix(0.29233,0,0,0.31489,6.45176,0.31291)" />