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

pygui: updated canvas size and scale dialog to allow negative values for lon,lat,alt

Browse source
This commit is contained in:
Blake Harnden 2020-05-11 16:02:23 -07:00
parent 12ed9c8422
commit 150db07497
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
daemon/core/gui/dialogs/canvassizeandscale.py
View file

@ -183,7 +183,7 @@ class SizeAndScaleDialog(Dialog):
frame, frame,
textvariable=self.lat, textvariable=self.lat,
validate="key", validate="key",
validatecommand=(self.validation.positive_float, "%P"), validatecommand=(self.validation.float, "%P"),
) )
entry.bind("<FocusOut>", lambda event: self.validation.focus_out(event, "0")) entry.bind("<FocusOut>", lambda event: self.validation.focus_out(event, "0"))
entry.grid(row=0, column=1, sticky="ew", padx=PADX) entry.grid(row=0, column=1, sticky="ew", padx=PADX)
@ -194,7 +194,7 @@ class SizeAndScaleDialog(Dialog):
frame, frame,
textvariable=self.lon, textvariable=self.lon,
validate="key", validate="key",
validatecommand=(self.validation.positive_float, "%P"), validatecommand=(self.validation.float, "%P"),
) )
entry.bind("<FocusOut>", lambda event: self.validation.focus_out(event, "0")) entry.bind("<FocusOut>", lambda event: self.validation.focus_out(event, "0"))
entry.grid(row=0, column=3, sticky="ew", padx=PADX) entry.grid(row=0, column=3, sticky="ew", padx=PADX)
@ -205,7 +205,7 @@ class SizeAndScaleDialog(Dialog):
frame, frame,
textvariable=self.alt, textvariable=self.alt,
validate="key", validate="key",
validatecommand=(self.validation.positive_float, "%P"), validatecommand=(self.validation.float, "%P"),
) )
entry.bind("<FocusOut>", lambda event: self.validation.focus_out(event, "0")) entry.bind("<FocusOut>", lambda event: self.validation.focus_out(event, "0"))
entry.grid(row=0, column=5, sticky="ew") entry.grid(row=0, column=5, sticky="ew")

12
daemon/core/gui/validation.py
View file

@ -20,6 +20,7 @@ class InputValidation:
self.master = app.master self.master = app.master
self.positive_int = None self.positive_int = None
self.positive_float = None self.positive_float = None
self.float = None
self.app_scale = None self.app_scale = None
self.name = None self.name = None
self.ip4 = None self.ip4 = None
@ -30,6 +31,7 @@ class InputValidation:
def register(self): def register(self):
self.positive_int = self.master.register(self.check_positive_int) self.positive_int = self.master.register(self.check_positive_int)
self.positive_float = self.master.register(self.check_positive_float) self.positive_float = self.master.register(self.check_positive_float)
self.float = self.master.register(self.check_float)
self.app_scale = self.master.register(self.check_scale_value) self.app_scale = self.master.register(self.check_scale_value)
self.name = self.master.register(self.check_node_name) self.name = self.master.register(self.check_node_name)
self.ip4 = self.master.register(self.check_ip4) self.ip4 = self.master.register(self.check_ip4)
@ -63,6 +65,16 @@ class InputValidation:
except ValueError: except ValueError:
return False return False
@classmethod
def check_float(cls, s: str) -> bool:
if len(s) == 0:
return True
try:
float(s)
return True
except ValueError:
return False
@classmethod @classmethod
def check_positive_float(cls, s: str) -> bool: def check_positive_float(cls, s: str) -> bool:
if len(s) == 0: if len(s) == 0: