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

Geography : bug #6442 use the good glib with introspection.

Browse Source 
svn: r21349
This commit is contained in:
Serge Noiraud 2013-02-13 15:07:41 +00:00
parent ee56e5723a
commit d12314ccbd
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gramps/plugins/lib/maps/geography.py
View File

@ -34,7 +34,7 @@ import sys
import re import re
from gi.repository import GObject from gi.repository import GObject
import time import time
import glib from gi.repository import GLib
from math import pi from math import pi
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -600,10 +600,10 @@ class GeoGraphyView(OsmGps, NavigationView):
and lvl < 18 ): and lvl < 18 ):
lvl += 1 lvl += 1
self.osm.set_zoom(lvl) self.osm.set_zoom(lvl)
glib.timeout_add(50, self._autozoom_in, lvl, GLib.timeout_add(int(50), self._autozoom_in, lvl,
p1lat, p1lon, p2lat, p2lon) p1lat, p1lon, p2lat, p2lon)
else: else:
glib.timeout_add(50, self._autozoom_out, lvl, GLib.timeout_add(int(50), self._autozoom_out, lvl,
p1lat, p1lon, p2lat, p2lon) p1lat, p1lon, p2lat, p2lon)
def _autozoom_out(self, lvl, p1lat, p1lon, p2lat, p2lon): def _autozoom_out(self, lvl, p1lat, p1lon, p2lat, p2lon):
@ -615,7 +615,7 @@ class GeoGraphyView(OsmGps, NavigationView):
and lvl > 1 ): and lvl > 1 ):
lvl -= 1 lvl -= 1
self.osm.set_zoom(lvl) self.osm.set_zoom(lvl)
glib.timeout_add(50, self._autozoom_out, lvl, GLib.timeout_add(int(50), self._autozoom_out, lvl,
p1lat, p1lon, p2lat, p2lon) p1lat, p1lon, p2lat, p2lon)
else: else:
layer = self.get_selection_layer() layer = self.get_selection_layer()
@ -642,7 +642,7 @@ class GeoGraphyView(OsmGps, NavigationView):
p2lat = self.end_selection.rlat p2lat = self.end_selection.rlat
p2lon = self.end_selection.rlon p2lon = self.end_selection.rlon
# We zoom in until at least one marker missing. # We zoom in until at least one marker missing.
glib.timeout_add(50, self._autozoom_in, level_start, GLib.timeout_add(int(50), self._autozoom_in, level_start,
p1lat, p1lon, p2lat, p2lon) p1lat, p1lon, p2lat, p2lon)
def _set_center_and_zoom(self): def _set_center_and_zoom(self):

6
gramps/plugins/view/geomoves.py
View File

@ -39,7 +39,7 @@ from gi.repository import GObject
import time import time
import threading import threading
from math import * from math import *
import glib from gi.repository import GLib
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -466,7 +466,7 @@ class GeoMoves(GeoGraphyView):
return return
self.message_layer.add_message(_("All descendance for %s" % _nd.display(person))) self.message_layer.add_message(_("All descendance for %s" % _nd.display(person)))
color = Gdk.color_parse(self._config.get('geography.color_base')) color = Gdk.color_parse(self._config.get('geography.color_base'))
glib.timeout_add(int(self._config.get("geography.generation_interval")), GLib.timeout_add(int(self._config.get("geography.generation_interval")),
self.animate_moves, 0, person, color) self.animate_moves, 0, person, color)
def animate_moves(self, index, person, color): def animate_moves(self, index, person, color):
@ -534,7 +534,7 @@ class GeoMoves(GeoGraphyView):
time_to_wait = int(self._config.get("geography.generation_interval")) time_to_wait = int(self._config.get("geography.generation_interval"))
self._create_markers() self._create_markers()
# process next generation in a few milliseconds # process next generation in a few milliseconds
glib.timeout_add(time_to_wait, self.animate_moves, GLib.timeout_add(int(time_to_wait), self.animate_moves,
index+1, person, color) index+1, person, color)
else: else:
self.started = False self.started = False

4
gramps/plugins/view/geoperson.py
View File

@ -41,7 +41,7 @@ KEY_TAB = Gdk.KEY_Tab
import socket import socket
from gi.repository import Gtk from gi.repository import Gtk
from gi.repository import GObject from gi.repository import GObject
import glib from gi.repository import GLib
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -277,7 +277,7 @@ class GeoPerson(GeoGraphyView):
# in this case, stepyear is >= 9000 # in this case, stepyear is >= 9000
# large move means longitude or latitude differences greater than geography.maximum_lon_lat # large move means longitude or latitude differences greater than geography.maximum_lon_lat
# degrees. # degrees.
glib.timeout_add(self._config.get("geography.speed"), self.animate, GLib.timeout_add(int(self._config.get("geography.speed")), self.animate,
menu, marks, i, stepyear) menu, marks, i, stepyear)
return False return False