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

Tidy up whitespace

Browse Source
This commit is contained in:
Nick Hall
2016-05-25 17:13:51 +01:00
parent 5e89b0a417
commit 7ea7850331
4 changed files with 265 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gramps/gen/utils/callback.py
View File

@ -249,7 +249,8 @@ class Callback:
for (k, v) in s.items(): for (k, v) in s.items():
if k in self.__signal_map: if k in self.__signal_map:
# signal name clash # signal name clash
sys.stderr.write("Warning: signal name clash: %s\n" % str(k)) sys.stderr.write("Warning: signal name clash: %s\n"
% str(k))
self.__signal_map[k] = v self.__signal_map[k] = v
# Set to None to prevent a memory leak in this recursive function # Set to None to prevent a memory leak in this recursive function
trav = None trav = None

10
gramps/gen/utils/callman.py
View File

@ -253,15 +253,12 @@ class CallbackManager:
signal = key + method signal = key + method
self.__do_unconnect(signal) self.__do_unconnect(signal)
self.__callbacks[signal][1] = self.database.connect( self.__callbacks[signal][1] = self.database.connect(
signal, signal, self.__callbackcreator(signal))
self.__callbackcreator(signal))
for method in METHODS_NONE: for method in METHODS_NONE:
signal = key + method signal = key + method
self.__do_unconnect(signal) self.__do_unconnect(signal)
self.__callbacks[signal][1] = self.database.connect( self.__callbacks[signal][1] = self.database.connect(
signal, signal, self.__callbackcreator(signal, noarg=True))
self.__callbackcreator(signal,
noarg=True))
def __do_callback(self, signal, *arg): def __do_callback(self, signal, *arg):
""" """
@ -304,7 +301,8 @@ class CallbackManager:
managed automatically. managed automatically.
""" """
if self.database: if self.database:
self.custom_signal_keys.append(self.database.connect(name, callback)) self.custom_signal_keys.append(self.database.connect(name,
callback))
def __callbackcreator(self, signal, noarg=False): def __callbackcreator(self, signal, noarg=False):
""" """

19
gramps/gen/utils/place.py
View File

@ -98,7 +98,7 @@ def __convert_using_float_repr(stringValue):
v = float(stringValue) v = float(stringValue)
return v return v
except ValueError: except ValueError:
return None; return None
def __convert_using_colon_repr(stringValue): def __convert_using_colon_repr(stringValue):
""" helper function that tries to convert the string using the colon """ helper function that tries to convert the string using the colon
@ -273,7 +273,7 @@ def __convert_using_modgedcom_repr(val, typedeg):
v = float(stringValue) v = float(stringValue)
return v return v
except ValueError: except ValueError:
return None; return None
def __convert_float_val(val, typedeg="lat"): def __convert_float_val(val, typedeg="lat"):
# function converting input to float, recognizing decimal input, or # function converting input to float, recognizing decimal input, or
@ -432,7 +432,8 @@ def conv_lat_lon(latitude, longitude, format="D.D4"):
else: else:
str_lon = "W" + "%.6f" % (-lon_float) str_lon = "W" + "%.6f" % (-lon_float)
str_lon = str_lon[:-5] + str_lon[-5:].rstrip("0") str_lon = str_lon[:-5] + str_lon[-5:].rstrip("0")
str_lat = ("%s%.6f" % (("N", lat_float) if lat_float >= 0 else ("S", -lat_float))) str_lat = ("%s%.6f" % (("N", lat_float) if lat_float >= 0
else ("S", -lat_float)))
str_lat = str_lat[:-5] + str_lat[-5:].rstrip("0") str_lat = str_lat[:-5] + str_lat[-5:].rstrip("0")
return (str_lat, str_lon) return (str_lat, str_lon)
@ -616,7 +617,8 @@ def __conv_WGS84_SWED_RT90(lat, lon):
psi = lat_rad - math.sin(lat_rad)*math.cos(lat_rad)*E psi = lat_rad - math.sin(lat_rad)*math.cos(lat_rad)*E
xi = math.atan2(math.tan(psi), math.cos(DL)) xi = math.atan2(math.tan(psi), math.cos(DL))
eta = atanh(math.cos(psi)*math.sin(DL)) eta = atanh(math.cos(psi)*math.sin(DL))
B1 = 1.0/2.0*n - 2.0/3.0*pow(n,2) + 5.0/16.0*pow(n,3) + 41.0/180.0*pow(n,4) B1 = 1.0/2.0*n - 2.0/3.0*pow(n, 2) + 5.0/16.0*pow(n, 3) + \
41.0/180.0*pow(n, 4)
B2 = 13.0/48.0*pow(n, 2) - 3.0/5.0*pow(n, 3) + 557.0/1440.0*pow(n, 4) B2 = 13.0/48.0*pow(n, 2) - 3.0/5.0*pow(n, 3) + 557.0/1440.0*pow(n, 4)
B3 = 61.0/240.0*pow(n, 3) - 103.0/140.0*pow(n, 4) B3 = 61.0/240.0*pow(n, 3) - 103.0/140.0*pow(n, 4)
B4 = 49561.0/161280.0*pow(n, 4) B4 = 49561.0/161280.0*pow(n, 4)
@ -650,7 +652,8 @@ def __conv_SWED_RT90_WGS84(X, Y):
xi = (X - FN)/(k0*at) xi = (X - FN)/(k0*at)
eta = (Y - FE)/(k0*at) eta = (Y - FE)/(k0*at)
D1 = 1.0/2.0*n - 2.0/3.0*pow(n,2) + 37.0/96.0*pow(n,3) - 1.0/360.0*pow(n,4) D1 = 1.0/2.0*n - 2.0/3.0*pow(n, 2) + 37.0/96.0*pow(n, 3) - \
1.0/360.0*pow(n, 4)
D2 = 1.0/48.0*pow(n, 2) + 1.0/15.0*pow(n, 3) - 437.0/1440.0*pow(n, 4) D2 = 1.0/48.0*pow(n, 2) + 1.0/15.0*pow(n, 3) - 437.0/1440.0*pow(n, 4)
D3 = 17.0/480.0*pow(n, 3) - 37.0/840.0*pow(n, 4) D3 = 17.0/480.0*pow(n, 3) - 37.0/840.0*pow(n, 4)
D4 = 4397.0/161280.0*pow(n, 4) D4 = 4397.0/161280.0*pow(n, 4)
@ -848,8 +851,10 @@ if __name__ == '__main__':
lat, lon = ': 0 : 1 : 1', ':1:2' lat, lon = ': 0 : 1 : 1', ':1:2'
test_formats_fail(lat, lon) test_formats_fail(lat, lon)
lat, lon = 'N 50º52\'21.92"', 'E 124º52\'21.92"' lat, lon = 'N 50º52\'21.92"', 'E 124º52\'21.92"'
test_formats_success(lat,lon, 'New format with N/E first and another º - character') test_formats_success(lat, lon,
'New format with N/E first and another º - character')
lat, lon = 'S 50º52\'21.92"', 'W 124º52\'21.92"' lat, lon = 'S 50º52\'21.92"', 'W 124º52\'21.92"'
test_formats_success(lat,lon, 'New format with S/W first and another º - character') test_formats_success(lat, lon,
'New format with S/W first and another º - character')
test_RT90_conversion() test_RT90_conversion()