afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

pygui: implemented toolbar based marker configuration, fixed some issues when switching between different node bar states

Browse source
This commit is contained in:
Blake Harnden 2020-05-17 23:08:53 -07:00
parent bd897efd05
commit cde053da73
4 changed files with 119 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

8
daemon/core/gui/graph/graph.py
View file

@ -596,13 +596,13 @@ class CanvasGraph(tk.Canvas):
if self.mode == GraphMode.ANNOTATION:
if is_marker(self.annotation_type):
r = self.app.toolbar.marker_tool.radius
r = self.app.toolbar.marker_frame.size.get()
self.create_oval(
x - r,
y - r,
x + r,
y + r,
fill=self.app.toolbar.marker_tool.color,
fill=self.app.toolbar.marker_frame.color,
outline="",
tags=(tags.MARKER, tags.ANNOTATION),
state=self.show_annotations.state(),
@ -678,13 +678,13 @@ class CanvasGraph(tk.Canvas):
shape.shape_motion(x, y)
return
elif is_marker(self.annotation_type):
r = self.app.toolbar.marker_tool.radius
r = self.app.toolbar.marker_frame.size.get()
self.create_oval(
x - r,
y - r,
x + r,
y + r,
fill=self.app.toolbar.marker_tool.color,
fill=self.app.toolbar.marker_frame.color,
outline="",
tags=(tags.MARKER, tags.ANNOTATION),
)