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

fix map view startup traceback

Browse Source 
svn: r6135
This commit is contained in:
Don Allingham 2006-03-11 04:42:49 +00:00
parent 5fedb3ad84
commit f2f376765b
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gramps2/ChangeLog
View File

@ -1,3 +1,6 @@
2006-03-10 Don Allingham <don@gramps-project.org>
* src/DataViews/_MapView.py: try to avoid startup traceback
2006-03-10 Alex Roitman <shura@gramps-project.org> 2006-03-10 Alex Roitman <shura@gramps-project.org>
* src/Plugins.py, src/PluginMgr.py: Move to ReportUtils. * src/Plugins.py, src/PluginMgr.py: Move to ReportUtils.
* various: use ReportUtils instead of PluginMgr. * various: use ReportUtils instead of PluginMgr.

29
gramps2/src/DataViews/_MapView.py
View File

@ -227,21 +227,24 @@ class ZoomMap( gtk.DrawingArea):
px = min( px, self.map_pixbuf.get_width()-1-pw/2) px = min( px, self.map_pixbuf.get_width()-1-pw/2)
py = min( py, self.map_pixbuf.get_height()-1-ph/2) py = min( py, self.map_pixbuf.get_height()-1-ph/2)
zoomebuf = self.map_pixbuf.subpixbuf( max(0,int(px-pw/2)),max(0,int(py-ph/2)), try:
min(self.map_pixbuf.get_width(),pw), zoomebuf = self.map_pixbuf.subpixbuf( max(0,int(px-pw/2)),max(0,int(py-ph/2)),
min(self.map_pixbuf.get_height(),ph)) min(self.map_pixbuf.get_width(),pw),
self.backbuf = zoomebuf.scale_simple(self.old_size[0], min(self.map_pixbuf.get_height(),ph))
self.backbuf = zoomebuf.scale_simple(self.old_size[0],
self.old_size[1], self.old_size[1],
gtk.gdk.INTERP_BILINEAR) gtk.gdk.INTERP_BILINEAR)
gc.collect() gc.collect()
mx = 360.0 / self.map_pixbuf.get_width() * (px-pw/2.0) - 180.0 mx = 360.0 / self.map_pixbuf.get_width() * (px-pw/2.0) - 180.0
my = 90.0 - 180.0 / self.map_pixbuf.get_height() * (py-ph/2.0) my = 90.0 - 180.0 / self.map_pixbuf.get_height() * (py-ph/2.0)
mw = 360.0 / self.map_pixbuf.get_width() * pw mw = 360.0 / self.map_pixbuf.get_width() * pw
mh = 180.0 / self.map_pixbuf.get_height() * ph mh = 180.0 / self.map_pixbuf.get_height() * ph
self.current_area = (px-pw/2, py-ph/2, pw,ph) self.current_area = (px-pw/2, py-ph/2, pw,ph)
self.current_map_area = (mx, my, mw, mh) self.current_map_area = (mx, my, mw, mh)
if self.guide: if self.guide:
self.guide.hightlight_area( (mx,my,mw,mh)) self.guide.hightlight_area( (mx,my,mw,mh))
except:
pass
# Scroll to requested position # Scroll to requested position
def scroll_to( self, long, lat): def scroll_to( self, long, lat):