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

marker tool

Browse source
This commit is contained in:
Huy Pham 2019-12-18 11:57:47 -08:00
parent da26e34765
commit 5f927f75ba
2 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
coretk/coretk/dialogs/marker.py
View file

@ -2,6 +2,8 @@
marker dialog marker dialog
""" """
import logging
import tkinter as tk
from tkinter import ttk from tkinter import ttk
from coretk.dialogs.colorpicker import ColorPicker from coretk.dialogs.colorpicker import ColorPicker
@ -16,7 +18,9 @@ class Marker(Dialog):
self.app = app self.app = app
self.color = initcolor self.color = initcolor
self.radius = MARKER_THICKNESS[0] self.radius = MARKER_THICKNESS[0]
self.marker_thickness = tk.IntVar(value=MARKER_THICKNESS[0])
self.draw() self.draw()
self.top.bind("<Destroy>", self.close_marker)
def draw(self): def draw(self):
button = ttk.Button(self.top, text="clear", command=self.clear_marker) button = ttk.Button(self.top, text="clear", command=self.clear_marker)
@ -24,23 +28,18 @@ class Marker(Dialog):
frame = ttk.Frame(self.top) frame = ttk.Frame(self.top)
frame.grid(row=1, column=0) frame.grid(row=1, column=0)
combobox = ttk.Combobox(
button = ttk.Button(frame, text="radius 1") frame,
button.grid(row=0, column=0) textvariable=self.marker_thickness,
button = ttk.Button(frame, text="radius 2") values=MARKER_THICKNESS,
button.grid(row=0, column=1) state="readonly",
button = ttk.Button(frame, text="radius 3") )
button.grid(row=1, column=0) combobox.grid(row=0, column=1, sticky="nsew")
button = ttk.Button(frame, text="radius 4") combobox.bind("<<ComboboxSelected>>", self.change_thickness)
button.grid(row=1, column=1)
label = ttk.Label(self.top, background=self.color) label = ttk.Label(self.top, background=self.color)
label.grid(row=2, column=0, sticky="nsew") label.grid(row=2, column=0, sticky="nsew")
label.bind("<Button-1>", self.change_color) label.bind("<Button-1>", self.change_color)
# button = ttk.Button(self.top, text="color", command=self.change_color)
# button.grid(row=2, column=0)
def clear_marker(self): def clear_marker(self):
canvas = self.app.canvas canvas = self.app.canvas
for i in canvas.find_withtag("marker"): for i in canvas.find_withtag("marker"):
@ -51,3 +50,10 @@ class Marker(Dialog):
color = color_picker.askcolor() color = color_picker.askcolor()
event.widget.configure(background=color) event.widget.configure(background=color)
self.color = color self.color = color
def change_thickness(self, event):
self.radius = self.marker_thickness.get()
def close_marker(self, event):
logging.debug("destroy marker dialog")
self.app.toolbar.marker_tool = None

5
coretk/coretk/toolbar.py
View file

@ -406,8 +406,9 @@ class Toolbar(ttk.Frame):
self.app.canvas.mode = GraphMode.ANNOTATION self.app.canvas.mode = GraphMode.ANNOTATION
self.app.canvas.annotation_type = shape_type self.app.canvas.annotation_type = shape_type
if is_marker(shape_type): if is_marker(shape_type):
self.marker_tool = Marker(self.master, self.app) if not self.marker_tool:
self.marker_tool.show() self.marker_tool = Marker(self.master, self.app)
self.marker_tool.show()
def click_run_button(self): def click_run_button(self):
logging.debug("Click on RUN button") logging.debug("Click on RUN button")