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

GeoView : Added some corrections for issue 3312

Browse Source 
When we switch between databases, if no info exist for the current view,
          don't try to load the page.


svn: r13844
This commit is contained in:
Serge Noiraud 2009-12-18 07:36:20 +00:00
parent f31b20e7a9
commit 74752f1360
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/plugins/view/geoview.py
View File

@ -439,18 +439,20 @@ class GeoView(HtmlView):
self._savezoomandposition() self._savezoomandposition()
# Need to wait the page is loaded to show the markers. # Need to wait the page is loaded to show the markers.
gobject.timeout_add(1500, self._show_selected_places) gobject.timeout_add(1500, self._show_selected_places)
#self._erase_placebox_selection() self._erase_placebox_selection()
def _show_selected_places(self): def _show_selected_places(self):
""" """
Here, we synchronize the years combobox with the renderer Here, we synchronize the years combobox with the renderer
except when we are in the places view.
""" """
index = 0 if self.displaytype != "places":
for r_year in self.buttons: index = 0
if self.last_selected_year == r_year[0]: for r_year in self.buttons:
self.yearsbox.set_active(index) if self.last_selected_year == r_year[0]:
self._call_js_selectmarkers(r_year[0]) self.yearsbox.set_active(index)
index += 1 self._call_js_selectmarkers(r_year[0])
index += 1
def _show_places_without_coord(self, widget): # pylint: disable-msg=W0613 def _show_places_without_coord(self, widget): # pylint: disable-msg=W0613
""" """
@ -498,7 +500,7 @@ class GeoView(HtmlView):
entry[1]) entry[1])
# Need to wait the page is loaded to show the markers. # Need to wait the page is loaded to show the markers.
gobject.timeout_add(1600, self._show_selected_places) gobject.timeout_add(1600, self._show_selected_places)
self._erase_placebox_selection() self._erase_placebox_selection()
return return
def _show_place_info_bubble(self, marker_index): def _show_place_info_bubble(self, marker_index):
@ -510,9 +512,9 @@ class GeoView(HtmlView):
def _erase_placebox_selection(self): def _erase_placebox_selection(self):
""" """
We erase the place selected after 2 secondes. We erase the place name in the entrybox after 1 second.
""" """
gobject.timeout_add(2000, self.placebox.child.set_text, "") gobject.timeout_add(1000, self.placebox.child.set_text, "")
def on_delete(self): def on_delete(self):
""" """
@ -1051,8 +1053,8 @@ class GeoView(HtmlView):
if modulo == 0: if modulo == 0:
modulo = 10 modulo = 10
self.minyear -= self.minyear % 10 self.minyear -= self.minyear % 10
self.maxyear -= self.maxyear % 10 self.maxyear -= ( self.maxyear % 10 ) + 10
self.yearint = ( self.maxyear - self.minyear ) / 10 + 5 self.yearint = ( self.maxyear - self.minyear ) / ( self.maxbut - 1 )
self.yearint -= ( self.yearint % modulo ) self.yearint -= ( self.yearint % modulo )
if self.yearint == 0: if self.yearint == 0:
self.yearint = 10 self.yearint = 10
@ -1749,11 +1751,11 @@ class GeoView(HtmlView):
'name' : _nd.display(person) 'name' : _nd.display(person)
} }
self._createpersonmarkers(dbstate, person, comment) self._createpersonmarkers(dbstate, person, comment)
self._need_to_create_pages(3, self.center, self._need_to_create_pages(3, self.center,
_("All %(name)s people's family places in the" _("All %(name)s people's family places in the"
" family tree with coordinates.") % { " family tree with coordinates.") % {
'name' :_nd.display(person) }, 'name' :_nd.display(person) },
) )
def _createmapstractionperson(self, dbstate): def _createmapstractionperson(self, dbstate):
""" """
@ -1809,8 +1811,8 @@ class GeoView(HtmlView):
else: else:
self._append_to_places_without_coord( self._append_to_places_without_coord(
place.gramps_id, descr) place.gramps_id, descr)
self._need_to_create_pages(4, self.center, self._need_to_create_pages(4, self.center,
_("All event places for") + (" %s." % _("All event places for") + (" %s." %
_nd.display(person) ) ) _nd.display(person) ) )
def _need_to_create_pages(self, ptype, center, message ): def _need_to_create_pages(self, ptype, center, message ):