From 232e76520ecfafb98e7f5e212dfdc31a51ea2a8f Mon Sep 17 00:00:00 2001 From: Serge Noiraud Date: Wed, 29 Aug 2012 22:13:09 +0000 Subject: [PATCH] Geography : gtk3 migration. several corrections. svn: r20286 --- src/plugins/lib/maps/geography.py | 23 +++++++++-------- src/plugins/lib/maps/osmGps.py | 42 +++++++++++++++++-------------- 2 files changed, 36 insertions(+), 29 deletions(-) diff --git a/src/plugins/lib/maps/geography.py b/src/plugins/lib/maps/geography.py index c68a75607..c9f9e290d 100644 --- a/src/plugins/lib/maps/geography.py +++ b/src/plugins/lib/maps/geography.py @@ -32,6 +32,7 @@ import os import re from gi.repository import GObject import time +from math import pi #------------------------------------------------------------------------- # @@ -294,6 +295,7 @@ class GeoGraphyView(OsmGps, NavigationView): changemapitem.show() changemapitem.connect("activate", self.change_map, map) changemap.append(changemapitem) + menu.show() menu.popup(None, None, None, None, 0, event.time) return 1 @@ -529,9 +531,12 @@ class GeoGraphyView(OsmGps, NavigationView): """ Is this marker in the visible area ? """ - return True + #return True # BUG here : how to replace that ? - bbox = self.osm.get_bbox() + pt1 = osmgpsmap.MapPoint.new_degrees(0.0, 0.0) + pt2 = osmgpsmap.MapPoint.new_degrees(0.0, 0.0) + bbox = self.osm.get_bbox(pt1,pt2) + print bbox s_lon = lon + 10.0 s_lat = lat + 10.0 s_bbox_lat1 = bbox[0] + 10.0 @@ -582,14 +587,12 @@ class GeoGraphyView(OsmGps, NavigationView): """ level_start = self.osm.props.zoom # BUG here : how to replace that ? - #p1lat = p1lon = 0.0 - #p1lat, p1lon = self.begin_selection.get_degrees(p1lat, p1lon) - #print p1lat, p1lon - #p2lat, p2lon = self.end_selection.get_degrees(0.0, 0.0) - p1lat = self.begin_selection.rlat - p1lon = self.begin_selection.rlon - p2lat = self.end_selection.rlat - p2lon = self.end_selection.rlon + #p1lat, p1lon = self.begin_selection.get_degrees() + #p2lat, p2lon = self.end_selection.get_degrees() + p1lat = 180 * self.begin_selection.rlat / pi + p1lon = 180 * self.begin_selection.rlon / pi + p2lat = 180 * self.end_selection.rlat / pi + p2lon = 180 * self.end_selection.rlon / pi lat = p1lat + ( p2lat - p1lat ) / 2 lon = p1lon + ( p2lon - p1lon ) / 2 # We center the map on the center of the region diff --git a/src/plugins/lib/maps/osmGps.py b/src/plugins/lib/maps/osmGps.py index 0ddb19546..4a8fe3b73 100644 --- a/src/plugins/lib/maps/osmGps.py +++ b/src/plugins/lib/maps/osmGps.py @@ -28,6 +28,7 @@ # #------------------------------------------------------------------------- import os +from math import pi from gi.repository import GObject #------------------------------------------------------------------------ @@ -247,14 +248,11 @@ class OsmGps(): """ Moving during selection """ - # BUG here : how to replace that ? - #current = osmgpsmap.MapPoint.new_degrees(0.0, 0.0) - current = osmgpsmap.MapPoint.new_degrees(int(event.x), int(event.y)) - # BUG here : how to replace that ? - #osmmap.convert_screen_to_geographic(int(event.x), int(event.y), current) + current = osmmap.convert_screen_to_geographic(int(event.x), int(event.y)) #lat, lon = current.get_degrees() - lat = current.rlat - lon = current.rlon + lat = 180 * current.rlat / pi + lon = 180 * current.rlon / pi + print event.x, event.y, lat, lon if self.zone_selection: # We draw a rectangle to show the selected region. layer = self.get_selection_layer() @@ -308,18 +306,13 @@ class OsmGps(): mouse button 2 : begin zone selection mouse button 3 : call the menu """ - # BUG here : how to replace that ? #lat, lon = self.osm.get_event_location(event).get_degrees() - lat = self.osm.get_event_location(event).rlat - lon = self.osm.get_event_location(event).rlon - current = osmgpsmap.MapPoint.new_degrees(0.0, 0.0) - # BUG here : how to replace that ? - #osm.convert_screen_to_geographic(int(event.x), int(event.y), current) + lat = 180 * self.osm.get_event_location(event).rlat / pi + lon = 180 * self.osm.get_event_location(event).rlon / pi current = osm.convert_screen_to_geographic(int(event.x), int(event.y)) - # BUG here : how to replace that ? #lat, lon = current.get_degrees() - lat = current.rlat - lon = current.rlon + lat = 180 * current.rlat / pi + lon = 180 * current.rlon / pi if event.button == 1: if self.end_selection is not None: self.activate_selection_zoom(osm, event) @@ -334,8 +327,19 @@ class OsmGps(): elif event.button == 2 and event.type == Gdk.EventType.BUTTON_RELEASE: self.end_selection = current self.zone_selection = False - elif event.button == 3: - self.build_nav_menu(osm, event, lat, lon ) + elif event.button == 3 and event.type == Gdk.EventType.BUTTON_PRESS: + # I don't see the menu. Why ? + #self.build_nav_menu(osm, event, lat, lon ) + menu = Gtk.Menu() + menu.set_title(_('Map Menu')) + + add_item = Gtk.MenuItem(label="title") + add_item.connect("activate", self.config_crosshair, event, lat , lon) + add_item.show() + menu.append(add_item) + menu.show() + menu.popup(None, None, None, None, event.button, event.time) + return 1 else: self.save_center(lat, lon) @@ -405,7 +409,7 @@ class OsmGps(): Show or hide the crosshair ? """ if active: - self.cross_map = osmgpsmap.GpsMapOsd( show_crosshair=True) + self.cross_map = osmgpsmap.MapOsd( show_crosshair=True) self.osm.layer_add( self.cross_map ) # The two following are to force the map to update self.osm.zoom_in()