Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify coordinate checking

Browse Source 
svn: r10837
This commit is contained in:
Gerald Britton
2008-07-03 18:28:44 +00:00
parent e4f568cd01
commit 6926f71869
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Editors/_EditMediaRef.py
View File

@@ -124,10 +124,11 @@ class EditMediaRef(EditReference):
coord = self.source_ref.get_rectangle()
#upgrade path: set invalid (from eg old db) to none
if coord is not None and (
(coord[0] is coord[1] is coord[2] is coord[3] is None) or \
(coord[0] == coord[1] == 0 and coord[2] == coord[3] == 100) or \
(coord[0] == coord[2] and coord[1] == coord[3])
if coord is not None and coord in (
(None, None, None, None),
(0, 0, 100, 100),
(coord[0], coord[1], coord[0], coord[1])
):
coord = None
@@ -473,11 +474,13 @@ class EditMediaRef(EditReference):
self.top.get_widget("corner2_x").get_value_as_int(),
self.top.get_widget("corner2_y").get_value_as_int(),
)
#do not set unset or invalid coord
if coord is not None and (
(coord[0] is coord[1] is coord[2] is coord[3] is None) or \
(coord[0] == coord[1] == 0 and coord[2] == coord[3] == 100) or \
(coord[0] == coord[2] and coord[1] == coord[3])
if coord is not None and coord in (
(None, None, None, None),
(0, 0, 100, 100),
(coord[0], coord[1], coord[0], coord[1])
):
coord = None