/[thuban]/branches/WIP-pyshapelib-bramz/Thuban/UI/mainwindow.py
ViewVC logotype

Diff of /branches/WIP-pyshapelib-bramz/Thuban/UI/mainwindow.py

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 188 by bh, Tue May 28 12:38:45 2002 UTC revision 1023 by jan, Fri May 23 14:20:16 2003 UTC
# Line 1  Line 1 
1  # Copyright (C) 2001, 2002 by Intevation GmbH  # Copyright (C) 2001, 2002, 2003 by Intevation GmbH
2  # Authors:  # Authors:
3  # Jan-Oliver Wagner <[email protected]>  # Jan-Oliver Wagner <[email protected]>
4  # Bernhard Herzog <[email protected]>  # Bernhard Herzog <[email protected]>
5    # Frank Koormann <[email protected]>
6  #  #
7  # This program is free software under the GPL (>=v2)  # This program is free software under the GPL (>=v2)
8  # Read the file COPYING coming with Thuban for details.  # Read the file COPYING coming with Thuban for details.
# Line 12  The main window Line 13  The main window
13    
14  __version__ = "$Revision$"  __version__ = "$Revision$"
15    
16    __ThubanVersion__ = "0.2" #"$THUBAN_0_2$"
17    #__BuildDate__ = "$Date$"
18    
19  import os  import os
20    
21  from wxPython.wx import *  from wxPython.wx import *
22    from wxPython.wx import __version__ as wxPython_version
23    
24    from wxPython.lib.dialogs import wxMultipleChoiceDialog
25    
26  import Thuban  import Thuban
27    import Thuban.version
28    
29    from Thuban import _
30  from Thuban.Model.session import create_empty_session  from Thuban.Model.session import create_empty_session
31  from Thuban.Model.layer import Layer  from Thuban.Model.layer import Layer, RasterLayer
32  from Thuban.Model.color import Color  from Thuban.Model.color import Color
33  from Thuban.Model.proj import Projection  from Thuban.Model.proj import Projection
34    
# Line 26  import view Line 36  import view
36  import tree  import tree
37  import proj4dialog  import proj4dialog
38  import tableview, identifyview  import tableview, identifyview
39    from Thuban.UI.classifier import Classifier
40    import legend
41  from menu import Menu  from menu import Menu
42    
43  import main  from context import Context
44  from command import registry, Command  from command import registry, Command, ToolCommand
45  from messages import SELECTED_SHAPE, VIEW_POSITION  from messages import LAYER_SELECTED, SHAPES_SELECTED, VIEW_POSITION
46    
47    from Thuban.UI.dock import DockFrame
48    from Thuban.UI.join import JoinDialog
49    
50    import resource
51    
52    import projdialog
53    
54    
 # the directory where the toolbar icons are stored  
 bitmapdir = os.path.join(Thuban.__path__[0], os.pardir, "Resources", "Bitmaps")  
 bitmapext = ".xpm"  
55    
56    class MainWindow(DockFrame):
57    
58  class MainWindow(wxFrame):      # Some messages that can be subscribed/unsubscribed directly through
59        # the MapCanvas come in fact from other objects. This is a map to
60        # map those messages to the names of the instance variables they
61        # actually come from. This delegation is implemented in the
62        # Subscribe and unsubscribed methods
63        delegated_messages = {LAYER_SELECTED: "canvas",
64                              SHAPES_SELECTED: "canvas"}
65    
66      def __init__(self, parent, ID, interactor):      # Methods delegated to some instance variables. The delegation is
67          wxFrame.__init__(self, parent, ID, 'Thuban',      # implemented in the __getattr__ method.
68                           wxDefaultPosition, wxSize(400, 300))      delegated_methods = {"SelectLayer": "canvas",
69                             "SelectShapes": "canvas",
70                             "SelectedShapes": "canvas",
71                             }
72    
73          self.interactor = interactor      def __init__(self, parent, ID, title, application, interactor,
74                     initial_message = None, size = wxSize(-1, -1)):
75            DockFrame.__init__(self, parent, ID, title, wxDefaultPosition, size)
76            #wxFrame.__init__(self, parent, ID, title, wxDefaultPosition, size)
77    
78            self.application = application
79    
80          self.CreateStatusBar()          self.CreateStatusBar()
81          self.SetStatusText("This is the wxPython-based "          if initial_message:
82                        "Graphical User Interface for exploring geographic data")              self.SetStatusText(initial_message)
83    
84          self.identify_view = None          self.identify_view = None
85    
86          self.init_ids()          self.init_ids()
87    
88          #main_menu.print_menu()          # creat the menubar from the main_menu description
89          self.SetMenuBar(self.build_menu_bar(main_menu))          self.SetMenuBar(self.build_menu_bar(main_menu))
90    
91          # toolbar          # Similarly, create the toolbar from main_toolbar
92          toolbar = self.CreateToolBar(wxTB_3DBUTTONS)          toolbar = self.build_toolbar(main_toolbar)
   
         # set the size of the tools' bitmaps. Not needed on wxGTK, but  
         # on Windows. We probably shouldn't hardwire the bitmap size  
         # here  
         toolbar.SetToolBitmapSize(wxSize(24, 24))  
   
         for name in ["map_zoom_in_tool", "map_zoom_out_tool", "map_pan_tool",  
                      "map_identify_tool", "map_label_tool", "map_full_extent"]:  
             self.add_toolbar_command(toolbar, name)  
93          # call Realize to make sure that the tools appear.          # call Realize to make sure that the tools appear.
94          toolbar.Realize()          toolbar.Realize()
95    
96    
97          # Create the map canvas          # Create the map canvas
98          canvas = view.MapCanvas(self, -1, interactor)          canvas = view.MapCanvas(self, -1)
99          canvas.Subscribe(VIEW_POSITION, self.view_position_changed)          canvas.Subscribe(VIEW_POSITION, self.view_position_changed)
100            canvas.Subscribe(SHAPES_SELECTED, self.identify_view_on_demand)
101          self.canvas = canvas          self.canvas = canvas
102    
103          self.init_dialogs()          self.SetMainWindow(self.canvas)
104    
105          interactor.Subscribe(SELECTED_SHAPE, self.identify_view_on_demand)          self.SetAutoLayout(True)
106    
107            self.init_dialogs()
108    
109          EVT_CLOSE(self, self.OnClose)          EVT_CLOSE(self, self.OnClose)
110    
111        def Subscribe(self, channel, *args):
112            """Subscribe a function to a message channel.
113    
114            If channel is one of the delegated messages call the appropriate
115            object's Subscribe method. Otherwise do nothing.
116            """
117            if channel in self.delegated_messages:
118                object = getattr(self, self.delegated_messages[channel])
119                object.Subscribe(channel, *args)
120            else:
121                print "Trying to subscribe to unsupported channel %s" % channel
122    
123        def Unsubscribe(self, channel, *args):
124            """Unsubscribe a function from a message channel.
125    
126            If channel is one of the delegated messages call the appropriate
127            object's Unsubscribe method. Otherwise do nothing.
128            """
129            if channel in self.delegated_messages:
130                object = getattr(self, self.delegated_messages[channel])
131                object.Unsubscribe(channel, *args)
132    
133        def __getattr__(self, attr):
134            """If attr is one of the delegated methods return that method
135    
136            Otherwise raise AttributeError.
137            """
138            if attr in self.delegated_methods:
139                return getattr(getattr(self, self.delegated_methods[attr]), attr)
140            raise AttributeError(attr)
141    
142      def init_ids(self):      def init_ids(self):
143          """Initialize the ids"""          """Initialize the ids"""
144          self.current_id = 6000          self.current_id = 6000
145          self.id_to_name = {}          self.id_to_name = {}
146          self.name_to_id = {}          self.name_to_id = {}
147            self.events_bound = {}
148    
149      def get_id(self, name):      def get_id(self, name):
150          """Return the wxWindows id for the command named name.          """Return the wxWindows id for the command named name.
# Line 100  class MainWindow(wxFrame): Line 158  class MainWindow(wxFrame):
158              self.id_to_name[ID] = name              self.id_to_name[ID] = name
159          return ID          return ID
160    
161        def bind_command_events(self, command, ID):
162            """Bind the necessary events for the given command and ID"""
163            if not self.events_bound.has_key(ID):
164                # the events haven't been bound yet
165                EVT_MENU(self, ID, self.invoke_command)
166                if command.IsDynamic():
167                    EVT_UPDATE_UI(self, ID, self.update_command_ui)
168    
169      def build_menu_bar(self, menudesc):      def build_menu_bar(self, menudesc):
170          """Build and return the menu bar from the menu description"""          """Build and return the menu bar from the menu description"""
171          menu_bar = wxMenuBar()          menu_bar = wxMenuBar()
# Line 111  class MainWindow(wxFrame): Line 177  class MainWindow(wxFrame):
177          return menu_bar          return menu_bar
178    
179      def build_menu(self, menudesc):      def build_menu(self, menudesc):
180          """Build and return a wxMenu from a menudescription"""          """Return a wxMenu built from the menu description menudesc"""
181          wxmenu = wxMenu()          wxmenu = wxMenu()
182          last = None          last = None
183          for item in menudesc.items:          for item in menudesc.items:
             # here the items must all be Menu instances themselves  
184              if item is None:              if item is None:
185                  # a separator. Only add one if the last item was not a                  # a separator. Only add one if the last item was not a
186                  # separator                  # separator
# Line 130  class MainWindow(wxFrame): Line 195  class MainWindow(wxFrame):
195              last = item              last = item
196          return wxmenu          return wxmenu
197    
198        def build_toolbar(self, toolbardesc):
199            """Build and return the main toolbar window from a toolbar description
200    
201            The parameter should be an instance of the Menu class but it
202            should not contain submenus.
203            """
204            toolbar = self.CreateToolBar(wxTB_3DBUTTONS)
205    
206            # set the size of the tools' bitmaps. Not needed on wxGTK, but
207            # on Windows, although it doesn't work very well there. It seems
208            # that only 16x16 icons are really supported on windows.
209            # We probably shouldn't hardwire the bitmap size here.
210            toolbar.SetToolBitmapSize(wxSize(24, 24))
211    
212            for item in toolbardesc.items:
213                if item is None:
214                    toolbar.AddSeparator()
215                else:
216                    # assume it's a string.
217                    self.add_toolbar_command(toolbar, item)
218    
219            return toolbar
220    
221      def add_menu_command(self, menu, name):      def add_menu_command(self, menu, name):
222          """Add the command with name name to the menu menu.          """Add the command with name name to the menu menu.
223    
# Line 143  class MainWindow(wxFrame): Line 231  class MainWindow(wxFrame):
231                  ID = self.get_id(name)                  ID = self.get_id(name)
232                  menu.Append(ID, command.Title(), command.HelpText(),                  menu.Append(ID, command.Title(), command.HelpText(),
233                              command.IsCheckCommand())                              command.IsCheckCommand())
234                  EVT_MENU(self, ID, self.invoke_command)                  self.bind_command_events(command, ID)
                 if command.IsDynamic():  
                     EVT_UPDATE_UI(self, ID, self.update_command_ui)  
235              else:              else:
236                  print "Unknown command %s" % name                  print _("Unknown command %s") % name
237    
238      def add_toolbar_command(self, toolbar, name):      def add_toolbar_command(self, toolbar, name):
239          """Add the command with name name to the toolbar toolbar.          """Add the command with name name to the toolbar toolbar.
# Line 162  class MainWindow(wxFrame): Line 248  class MainWindow(wxFrame):
248              command = registry.Command(name)              command = registry.Command(name)
249              if command is not None:              if command is not None:
250                  ID = self.get_id(name)                  ID = self.get_id(name)
251                  filename = os.path.join(bitmapdir, command.Icon()) + bitmapext                  bitmap = resource.GetBitmapResource(command.Icon(),
252                  bitmap = wxBitmap(filename, wxBITMAP_TYPE_XPM)                                                      wxBITMAP_TYPE_XPM)
253                  toolbar.AddTool(ID, bitmap,                  toolbar.AddTool(ID, bitmap,
254                                  shortHelpString = command.HelpText(),                                  shortHelpString = command.HelpText(),
255                                  isToggle = command.IsCheckCommand())                                  isToggle = command.IsCheckCommand())
256                    self.bind_command_events(command, ID)
257              else:              else:
258                  print "Unknown command %s" % name                  print _("Unknown command %s") % name
259    
260        def Context(self):
261            """Return the context object for a command invoked from this window
262            """
263            return Context(self.application, self.application.Session(), self)
264    
265      def invoke_command(self, event):      def invoke_command(self, event):
266          name = self.id_to_name.get(event.GetId())          name = self.id_to_name.get(event.GetId())
267          if name is not None:          if name is not None:
268              command = registry.Command(name)              command = registry.Command(name)
269              command.Execute(self)              command.Execute(self.Context())
270          else:          else:
271              print "Unknown command ID %d" % event.GetId()              print _("Unknown command ID %d") % event.GetId()
272    
273      def update_command_ui(self, event):      def update_command_ui(self, event):
274          #print "update_command_ui", self.id_to_name[event.GetId()]          #print "update_command_ui", self.id_to_name[event.GetId()]
275            context = self.Context()
276          command = registry.Command(self.id_to_name[event.GetId()])          command = registry.Command(self.id_to_name[event.GetId()])
277          if command is not None:          if command is not None:
278              event.Enable(command.Sensitive(self))              sensitive = command.Sensitive(context)
279              event.SetText(command.DynText(self))              event.Enable(sensitive)
280                if command.IsTool() and not sensitive and command.Checked(context):
281                    # When a checked tool command is disabled deselect all
282                    # tools. Otherwise the tool would remain active but it
283                    # might lead to errors if the tools stays active. This
284                    # problem occurred in GREAT-ER and this fixes it, but
285                    # it's not clear to me whether this is really the best
286                    # way to do it (BH, 20021206).
287                    self.canvas.SelectTool(None)
288                event.SetText(command.DynText(context))
289              if command.IsCheckCommand():              if command.IsCheckCommand():
290                  event.Check(command.Checked(self))                      event.Check(command.Checked(context))
291    
292      def RunMessageBox(self, title, text, flags = wxOK | wxICON_INFORMATION):      def RunMessageBox(self, title, text, flags = wxOK | wxICON_INFORMATION):
293          """Run a modal message box with the given text, title and flags          """Run a modal message box with the given text, title and flags
294          and return the result"""          and return the result"""
295          dlg = wxMessageDialog(self, text, title, flags)          dlg = wxMessageDialog(self, text, title, flags)
296            dlg.CenterOnParent()
297          result = dlg.ShowModal()          result = dlg.ShowModal()
298          dlg.Destroy()          dlg.Destroy()
299          return result          return result
# Line 204  class MainWindow(wxFrame): Line 307  class MainWindow(wxFrame):
307    
308      def add_dialog(self, name, dialog):      def add_dialog(self, name, dialog):
309          if self.dialogs.has_key(name):          if self.dialogs.has_key(name):
310              raise RuntimeError("The Dialog named %s is already open" % name)              raise RuntimeError(_("The Dialog named %s is already open") % name)
311          self.dialogs[name] = dialog          self.dialogs[name] = dialog
312    
313      def dialog_open(self, name):      def dialog_open(self, name):
# Line 222  class MainWindow(wxFrame): Line 325  class MainWindow(wxFrame):
325              text = "(%10.10g, %10.10g)" % pos              text = "(%10.10g, %10.10g)" % pos
326          else:          else:
327              text = ""              text = ""
328            self.set_position_text(text)
329    
330        def set_position_text(self, text):
331            """Set the statusbar text showing the current position.
332    
333            By default the text is shown in field 0 of the status bar.
334            Override this method in derived classes to put it into a
335            different field of the statusbar.
336            """
337          self.SetStatusText(text)          self.SetStatusText(text)
338    
339      def save_modified_session(self, can_veto = 1):      def save_modified_session(self, can_veto = 1):
# Line 233  class MainWindow(wxFrame): Line 345  class MainWindow(wxFrame):
345          If the can_veto parameter is true (default) the dialog includes          If the can_veto parameter is true (default) the dialog includes
346          a cancel button, otherwise not.          a cancel button, otherwise not.
347          """          """
348          if main.app.session.WasModified():          if self.application.session.WasModified():
349              flags = wxYES_NO | wxICON_QUESTION              flags = wxYES_NO | wxICON_QUESTION
350              if can_veto:              if can_veto:
351                  flags = flags | wxCANCEL                  flags = flags | wxCANCEL
352              result = self.RunMessageBox("Exit",              result = self.RunMessageBox(_("Exit"),
353                                          ("The session has been modified."                                          _("The session has been modified."
354                                           " Do you want to save it?"),                                           " Do you want to save it?"),
355                                          flags)                                          flags)
356              if result == wxID_YES:              if result == wxID_YES:
# Line 247  class MainWindow(wxFrame): Line 359  class MainWindow(wxFrame):
359              result = wxID_NO              result = wxID_NO
360          return result          return result
361    
362        def prepare_new_session(self):
363            for d in self.dialogs.values():
364                if not isinstance(d, tree.SessionTreeView):
365                    d.Close()
366    
367      def NewSession(self):      def NewSession(self):
368          self.save_modified_session()          if self.save_modified_session() != wxID_CANCEL:
369          main.app.SetSession(create_empty_session())              self.prepare_new_session()
370                self.application.SetSession(create_empty_session())
371    
372      def OpenSession(self):      def OpenSession(self):
373          self.save_modified_session()          if self.save_modified_session() != wxID_CANCEL:
374          dlg = wxFileDialog(self, "Select a session file", ".", "",              dlg = wxFileDialog(self, _("Open Session"), ".", "",
375                             "*.thuban", wxOPEN)                                 "Thuban Session File (*.thuban)|*.thuban",
376          if dlg.ShowModal() == wxID_OK:                                 wxOPEN)
377              main.app.OpenSession(dlg.GetPath())              if dlg.ShowModal() == wxID_OK:
378          dlg.Destroy()                  self.prepare_new_session()
379                    self.application.OpenSession(dlg.GetPath())
380                dlg.Destroy()
381    
382      def SaveSession(self):      def SaveSession(self):
383          if main.app.session.filename == None:          if self.application.session.filename == None:
384              self.SaveSessionAs()              self.SaveSessionAs()
385          main.app.SaveSession()          else:
386                self.application.SaveSession()
387    
388      def SaveSessionAs(self):      def SaveSessionAs(self):
389          dlg = wxFileDialog(self, "Enter a filename for session", ".", "",          dlg = wxFileDialog(self, _("Save Session As"), ".", "",
390                             "*.thuban", wxOPEN)                             "Thuban Session File (*.thuban)|*.thuban",
391                               wxSAVE|wxOVERWRITE_PROMPT)
392          if dlg.ShowModal() == wxID_OK:          if dlg.ShowModal() == wxID_OK:
393              main.app.session.SetFilename(dlg.GetPath())              self.application.session.SetFilename(dlg.GetPath())
394              main.app.SaveSession()              self.application.SaveSession()
395          dlg.Destroy()          dlg.Destroy()
396    
397      def Exit(self):      def Exit(self):
398          self.Close(false)          self.Close(False)
399    
400      def OnClose(self, event):      def OnClose(self, event):
401          result = self.save_modified_session(can_veto = event.CanVeto())          result = self.save_modified_session(can_veto = event.CanVeto())
402          if result == wxID_CANCEL:          if result == wxID_CANCEL:
403              event.Veto()              event.Veto()
404          else:          else:
405                # FIXME: it would be better to tie the unsubscription to
406                # wx's destroy event, but that isn't implemented for wxGTK
407                # yet.
408                self.canvas.Unsubscribe(VIEW_POSITION, self.view_position_changed)
409                DockFrame.OnClose(self, event)
410              self.Destroy()              self.Destroy()
411    
412      def SetMap(self, map):      def SetMap(self, map):
413          self.canvas.SetMap(map)          self.canvas.SetMap(map)
414            self.__SetTitle(map.Title())
415    
416            dialog = self.FindRegisteredDock("legend")
417            if dialog is not None:
418                dialog.GetPanel().SetMap(self.Map())
419    
420        def Map(self):
421            """Return the map displayed by this mainwindow"""
422    
423      def ShowSessionTree(self):          return self.canvas.Map()
424    
425        def ToggleSessionTree(self):
426            """If the session tree is shown close it otherwise create a new tree"""
427          name = "session_tree"          name = "session_tree"
428          dialog = self.get_open_dialog(name)          dialog = self.get_open_dialog(name)
429          if dialog is None:          if dialog is None:
430              dialog = tree.SessionTreeView(self, main.app, name)              dialog = tree.SessionTreeView(self, self.application, name)
431              self.add_dialog(name, dialog)              self.add_dialog(name, dialog)
432              dialog.Show(true)              dialog.Show(True)
433          else:          else:
434              # FIXME: bring dialog to front here              dialog.Close()
435              pass  
436        def SessionTreeShown(self):
437            """Return true iff the session tree is currently shown"""
438            return self.get_open_dialog("session_tree") is not None
439    
440      def About(self):      def About(self):
441          self.RunMessageBox("About",          self.RunMessageBox(_("About"),
442                             ("Thuban is a program for\n"                             _("Thuban %s\n"
443                                #"Build Date: %s\n"
444                                "using:\n"
445                                "  %s\n"
446                                "  %s\n\n"
447                                "Thuban is a program for\n"
448                              "exploring geographic data.\n"                              "exploring geographic data.\n"
449                              "Copyright (C) 2001 Intevation GmbH.\n"                              "Copyright (C) 2001-2003 Intevation GmbH.\n"
450                              "Thuban is licensed under the GPL"),                              "Thuban is licensed under the GNU GPL"
451                                % (Thuban.version.longversion,
452                                   "wxPython %s" % wxPython_version,
453                                   "Python %d.%d.%d" % sys.version_info[:3]
454                                  )),
455    #                           % __ThubanVersion__), #__BuildDate__)),
456                             wxOK | wxICON_INFORMATION)                             wxOK | wxICON_INFORMATION)
457    
458      def AddLayer(self):      def AddLayer(self):
459          dlg = wxFileDialog(self, "Select a data file", ".", "", "*.*",          dlg = wxFileDialog(self, _("Select a data file"), ".", "", "*.*",
460                             wxOPEN)                             wxOPEN)
461          if dlg.ShowModal() == wxID_OK:          if dlg.ShowModal() == wxID_OK:
462              filename = dlg.GetPath()              filename = dlg.GetPath()
463              title = os.path.splitext(os.path.basename(filename))[0]              title = os.path.splitext(os.path.basename(filename))[0]
             layer = Layer(title, filename)  
464              map = self.canvas.Map()              map = self.canvas.Map()
465              has_layers = map.HasLayers()              has_layers = map.HasLayers()
466              try:              try:
467                    store = self.application.Session().OpenShapefile(filename)
468                except IOError:
469                    # the layer couldn't be opened
470                    self.RunMessageBox(_("Add Layer"),
471                                       _("Can't open the file '%s'.") % filename)
472                else:
473                    layer = Layer(title, store)
474                  map.AddLayer(layer)                  map.AddLayer(layer)
475                    if not has_layers:
476                        # if we're adding a layer to an empty map, fit the
477                        # new map to the window
478                        self.canvas.FitMapToWindow()
479            dlg.Destroy()
480    
481        def AddRasterLayer(self):
482            dlg = wxFileDialog(self, _("Select an image file"), ".", "", "*.*",
483                               wxOPEN)
484            if dlg.ShowModal() == wxID_OK:
485                filename = dlg.GetPath()
486                title = os.path.splitext(os.path.basename(filename))[0]
487                map = self.canvas.Map()
488                has_layers = map.HasLayers()
489                try:
490                    layer = RasterLayer(title, filename)
491              except IOError:              except IOError:
492                  # the layer couldn't be opened                  # the layer couldn't be opened
493                  self.RunMessageBox("Add Layer",                  self.RunMessageBox(_("Add Image Layer"),
494                                     "Can't open the file '%s'." % filename)                                     _("Can't open the file '%s'.") % filename)
495              else:              else:
496                    map.AddLayer(layer)
497                  if not has_layers:                  if not has_layers:
498                      # if we're adding a layer to an empty map, for the                      # if we're adding a layer to an empty map, fit the
499                      # new map to the window                      # new map to the window
500                      self.canvas.FitMapToWindow()                      self.canvas.FitMapToWindow()
501          dlg.Destroy()          dlg.Destroy()
# Line 331  class MainWindow(wxFrame): Line 505  class MainWindow(wxFrame):
505          if layer is not None:          if layer is not None:
506              self.canvas.Map().RemoveLayer(layer)              self.canvas.Map().RemoveLayer(layer)
507    
508        def CanRemoveLayer(self):
509            """Return true if the currently selected layer can be deleted.
510    
511            If no layer is selected return False.
512    
513            The return value of this method determines whether the remove
514            layer command is sensitive in menu.
515            """
516            layer = self.current_layer()
517            if layer is not None:
518                return self.canvas.Map().CanRemoveLayer(layer)
519            return False
520    
521      def RaiseLayer(self):      def RaiseLayer(self):
522          layer = self.current_layer()          layer = self.current_layer()
523          if layer is not None:          if layer is not None:
524              self.canvas.Map().RaiseLayer(layer)              self.canvas.Map().RaiseLayer(layer)
525            
526      def LowerLayer(self):      def LowerLayer(self):
527          layer = self.current_layer()          layer = self.current_layer()
528          if layer is not None:          if layer is not None:
# Line 346  class MainWindow(wxFrame): Line 533  class MainWindow(wxFrame):
533    
534          If no layer is selected, return None          If no layer is selected, return None
535          """          """
536          return self.interactor.SelectedLayer()          return self.canvas.SelectedLayer()
537    
538      def has_selected_layer(self):      def has_selected_layer(self):
539          """Return true if a layer is currently selected"""          """Return true if a layer is currently selected"""
540          return self.interactor.HasSelectedLayer()          return self.canvas.HasSelectedLayer()
   
     def choose_color(self):  
         """Run the color selection dialog and return the selected color.  
   
         If the user cancels, return None.  
         """  
         dlg = wxColourDialog(self)  
         color = None  
         if dlg.ShowModal() == wxID_OK:  
             data = dlg.GetColourData()  
             wxc = data.GetColour()  
             color = Color(wxc.Red() / 255.0,  
                           wxc.Green() / 255.0,  
                           wxc.Blue() / 255.0)  
         dlg.Destroy()  
         return color  
   
     def LayerFillColor(self):  
         layer = self.current_layer()  
         if layer is not None:  
             color = self.choose_color()  
             if color is not None:  
                 layer.SetFill(color)  
   
     def LayerTransparentFill(self):  
         layer = self.current_layer()  
         if layer is not None:  
             layer.SetFill(None)  
541    
542      def LayerOutlineColor(self):      def has_selected_shapes(self):
543          layer = self.current_layer()          """Return true if a shape is currently selected"""
544          if layer is not None:          return self.canvas.HasSelectedShapes()
             color = self.choose_color()  
             if color is not None:  
                 layer.SetStroke(color)  
   
     def LayerNoOutline(self):  
         layer = self.current_layer()  
         if layer is not None:  
             layer.SetStroke(None)  
545    
546      def HideLayer(self):      def HideLayer(self):
547          layer = self.current_layer()          layer = self.current_layer()
# Line 409  class MainWindow(wxFrame): Line 560  class MainWindow(wxFrame):
560              name = "table_view" + str(id(table))              name = "table_view" + str(id(table))
561              dialog = self.get_open_dialog(name)              dialog = self.get_open_dialog(name)
562              if dialog is None:              if dialog is None:
563                  dialog = tableview.TableFrame(self, self.interactor, name,                  dialog = tableview.LayerTableFrame(self, name,
564                                                "Table: %s" % layer.Title(),                                           _("Layer Table: %s") % layer.Title(),
565                                                layer, table)                                           layer, table)
566                  self.add_dialog(name, dialog)                  self.add_dialog(name, dialog)
567                  dialog.Show(true)                  dialog.Show(true)
568              else:              else:
569                  # FIXME: bring dialog to front here                  # FIXME: bring dialog to front here
570                  pass                  pass
571    
572      def Projection(self):      def MapProjection(self):
573          map = self.canvas.Map()  
574          proj = map.projection          name = "map_projection"
575          if proj is None:          dialog = self.get_open_dialog(name)
576              proj4Dlg = proj4dialog.Proj4Dialog(NULL, None, map.BoundingBox())  
577            if dialog is None:
578                map = self.canvas.Map()
579                dialog = projdialog.ProjFrame(self, name,
580                         _("Map Projection: %s") % map.Title(), map)
581                self.add_dialog(name, dialog)
582                dialog.Show()
583            dialog.Raise()
584    
585        def LayerProjection(self):
586    
587            layer = self.current_layer()
588    
589            name = "layer_projection" + str(id(layer))
590            dialog = self.get_open_dialog(name)
591    
592            if dialog is None:
593                map = self.canvas.Map()
594                dialog = projdialog.ProjFrame(self, name,
595                         _("Layer Projection: %s") % layer.Title(), layer)
596                self.add_dialog(name, dialog)
597                dialog.Show()
598            dialog.Raise()
599    
600        def LayerEditProperties(self):
601    
602            #
603            # the menu option for this should only be available if there
604            # is a current layer, so we don't need to check if the
605            # current layer is None
606            #
607    
608            layer = self.current_layer()
609            self.OpenLayerProperties(layer)
610    
611        def OpenLayerProperties(self, layer, group = None):
612            name = "layer_properties" + str(id(layer))
613            dialog = self.get_open_dialog(name)
614    
615            if dialog is None:
616                dialog = Classifier(self, name, layer, group)
617                self.add_dialog(name, dialog)
618                dialog.Show()
619            dialog.Raise()
620    
621        def LayerJoinTable(self):
622            print "LayerJoinTable: Not implemented."
623    
624        def LayerUnjoinTable(self):
625            print "LayerUnjoinTable: Not implemented."
626    
627        def ShowLegend(self):
628            if not self.LegendShown():
629                self.ToggleLegend()
630    
631        def ToggleLegend(self):
632            """Show the legend if it's not shown otherwise hide it again"""
633            name = "legend"
634            dialog = self.FindRegisteredDock(name)
635    
636            if dialog is None:
637                dialog = self.CreateDock(name, -1, _("Legend"), wxLAYOUT_LEFT)
638                legend.LegendPanel(dialog, None, self)
639                dialog.Dock()
640                dialog.GetPanel().SetMap(self.Map())
641                dialog.Show()
642          else:          else:
643              proj4Dlg = proj4dialog.Proj4Dialog(NULL, map.projection.params,              dialog.Show(not dialog.IsShown())
644                                                 map.BoundingBox())  
645          if proj4Dlg.ShowModal() == wxID_OK:      def LegendShown(self):
646              params = proj4Dlg.GetParams()          """Return true iff the legend is currently open"""
647              if params is not None:          dialog = self.FindRegisteredDock("legend")
648                  proj = Projection(params)          return dialog is not None and dialog.IsShown()
649    
650        def TableOpen(self):
651            print "TableOpen: not implemented"
652            dlg = wxFileDialog(self, _("Open Table"), ".", "",
653                               "DBF Files (*.dbf)|*.dbf|" +
654                               "CSV Files (*.csv)|*.csv|" +
655                               "All Files (*.*)|*.*",
656                               wxOPEN)
657            if dlg.ShowModal() == wxID_OK:
658                #self.application.session.OpenTable(dlg.GetPath())
659                pass
660    
661            dlg.Destroy()
662    
663        def TableClose(self):
664            print "TableClose: not implemented"
665    
666        def TableShow(self):
667            """Offer a multi-selection dialog for tables to be displayed
668            
669            The windows for the selected tables are opened or brought to
670            the front.
671            """
672            tables = self.application.session.Tables()
673            table_list = []
674            for table in tables:
675                table_list.append(table.Title())
676    
677            dlg = wxMultipleChoiceDialog(self, _("Pick the table to show:"),
678                                         _("Show Table"), table_list)
679            if (dlg.ShowModal() == wxID_OK):
680                for i in dlg.GetValue():
681                    # XXX: First check whether the dialog is already open
682                    # and if so, bring it to the front.
683                    # XXX: if the table belongs to a layer, open a
684                    # LayerTableFrame instead of QueryTableFrame
685                    print "tables[i]:", tables[i]
686                    dialog = tableview.QueryTableFrame(self, table_list[i],
687                                                  _("Table: %s") % table_list[i],
688                                                  tables[i])
689                    self.add_dialog(table_list[i], dialog)
690                    dialog.Show(true)
691    
692            # XXX: just some analyis code, remove it when the above XXX is
693            # resolved.
694            for d in self.dialogs.values():
695                if isinstance(d, tableview.LayerTableFrame):
696                    print "LayerTable:", d.GetTitle()
697                elif isinstance(d, tableview.QueryTableFrame):
698                    print "QueryTable:", d.GetTitle()
699              else:              else:
700                  proj = None                  print "Other:", d.GetTitle()
701              map.SetProjection(proj)  
702          proj4Dlg.Destroy()      def TableHide(self):
703            print "TableHide: not implemented"
704    
705        def TableJoin(self):
706            dlg = JoinDialog(self, _("Join Tables"), self.application.session)
707            dlg.ShowModal()
708    
709      def ZoomInTool(self):      def ZoomInTool(self):
710          self.canvas.ZoomInTool()          self.canvas.ZoomInTool()
# Line 454  class MainWindow(wxFrame): Line 725  class MainWindow(wxFrame):
725      def FullExtent(self):      def FullExtent(self):
726          self.canvas.FitMapToWindow()          self.canvas.FitMapToWindow()
727    
728        def FullLayerExtent(self):
729            self.canvas.FitLayerToWindow(self.current_layer())
730    
731        def FullSelectionExtent(self):
732            self.canvas.FitSelectedToWindow()
733    
734        def ExportMap(self):
735            self.canvas.Export()
736    
737      def PrintMap(self):      def PrintMap(self):
738          self.canvas.Print()          self.canvas.Print()
739    
740      def identify_view_on_demand(self, layer, shape):      def RenameMap(self):
741            dlg = wxTextEntryDialog(self, "Map Title: ", "Rename Map",
742                                    self.Map().Title())
743            if dlg.ShowModal() == wxID_OK:
744                title = dlg.GetValue()
745                if title != "":
746                    self.Map().SetTitle(title)
747                    self.__SetTitle(title)
748    
749            dlg.Destroy()
750    
751        def identify_view_on_demand(self, layer, shapes):
752            """Subscribed to the canvas' SHAPES_SELECTED message
753    
754            If the current tool is the identify tool, at least one shape is
755            selected and the identify dialog is not shown, show the dialog.
756            """
757            # If the selection has become empty we don't need to do
758            # anything. Otherwise it could happen that the dialog was popped
759            # up when the selection became empty, e.g. when a new selection
760            # is opened while the identify tool is active and dialog had
761            # been closed
762            if not shapes:
763                return
764    
765          name = "identify_view"          name = "identify_view"
766          if self.canvas.CurrentTool() == "IdentifyTool":          if self.canvas.CurrentTool() == "IdentifyTool":
767              if not self.dialog_open(name):              if not self.dialog_open(name):
768                  dialog = identifyview.IdentifyView(self, self.interactor, name)                  dialog = identifyview.IdentifyView(self, name)
769                  self.add_dialog(name, dialog)                  self.add_dialog(name, dialog)
770                  dialog.Show(true)                  dialog.Show(True)
771              else:              else:
772                  # FIXME: bring dialog to front?                  # FIXME: bring dialog to front?
773                  pass                  pass
774    
775        def __SetTitle(self, title):
776            self.SetTitle("Thuban - " + title)
777    
778  #  #
779  # Define all the commands available in the main window  # Define all the commands available in the main window
780  #  #
# Line 475  class MainWindow(wxFrame): Line 782  class MainWindow(wxFrame):
782    
783  # Helper functions to define common command implementations  # Helper functions to define common command implementations
784  def call_method(context, methodname, *args):  def call_method(context, methodname, *args):
785      """Call the context's method methodname with args *args"""      """Call the mainwindow's method methodname with args *args"""
786      apply(getattr(context, methodname), args)      apply(getattr(context.mainwindow, methodname), args)
787    
788  def _method_command(name, title, method, helptext = "",  def _method_command(name, title, method, helptext = "",
789                      icon = "", sensitive = None):                      icon = "", sensitive = None, checked = None):
790      """Add a command implemented by a method of the context object"""      """Add a command implemented by a method of the mainwindow object"""
791      registry.Add(Command(name, title, call_method, args=(method,),      registry.Add(Command(name, title, call_method, args=(method,),
792                           helptext = helptext, icon = icon,                           helptext = helptext, icon = icon,
793                           sensitive = sensitive))                           sensitive = sensitive, checked = checked))
794    
795    def make_check_current_tool(toolname):
796        """Return a function that tests if the currently active tool is toolname
797    
798        The returned function can be called with the context and returns
799        true iff the currently active tool's name is toolname. It's directly
800        usable as the 'checked' callback of a command.
801        """
802        def check_current_tool(context, name=toolname):
803            return context.mainwindow.canvas.CurrentTool() == name
804        return check_current_tool
805    
806  def _tool_command(name, title, method, toolname, helptext = "",  def _tool_command(name, title, method, toolname, helptext = "",
807                    icon = ""):                    icon = "", sensitive = None):
808      """Add a tool command"""      """Add a tool command"""
809      def check_current_tool(context, name=toolname):      registry.Add(ToolCommand(name, title, call_method, args=(method,),
810          return context.canvas.CurrentTool() == name                               helptext = helptext, icon = icon,
811      registry.Add(Command(name, title, call_method, args=(method,),                               checked = make_check_current_tool(toolname),
812                           helptext = helptext, icon = icon,                               sensitive = sensitive))
                          checked = check_current_tool))  
813    
814  def _has_selected_layer(context):  def _has_selected_layer(context):
815      """Return true if a layer is selected in the context"""      """Return true if a layer is selected in the context"""
816      return context.has_selected_layer()      return context.mainwindow.has_selected_layer()
817    
818    def _has_selected_shapes(context):
819        """Return true if a layer is selected in the context"""
820        return context.mainwindow.has_selected_shapes()
821    
822    def _can_remove_layer(context):
823        return context.mainwindow.CanRemoveLayer()
824    
825    def _has_tree_window_shown(context):
826        """Return true if the tree window is shown"""
827        return context.mainwindow.SessionTreeShown()
828    
829    def _has_visible_map(context):
830        """Return true iff theres a visible map in the mainwindow.
831    
832        A visible map is a map with at least one visible layer."""
833        map = context.mainwindow.Map()
834        if map is not None:
835            for layer in map.Layers():
836                if layer.Visible():
837                    return 1
838        return 0
839    
840    def _has_legend_shown(context):
841        """Return true if the legend window is shown"""
842        return context.mainwindow.LegendShown()
843    
844    
845  # File menu  # File menu
846  _method_command("new_session", "&New Session", "NewSession")  _method_command("new_session", _("&New Session"), "NewSession")
847  _method_command("open_session", "&Open Session", "OpenSession")  _method_command("open_session", _("&Open Session..."), "OpenSession")
848  _method_command("save_session", "&Save Session", "SaveSession")  _method_command("save_session", _("&Save Session"), "SaveSession")
849  _method_command("save_session_as", "Save Session &As", "SaveSessionAs")  _method_command("save_session_as", _("Save Session &As..."), "SaveSessionAs")
850  _method_command("show_session_tree", "Show Session &Tree", "ShowSessionTree")  _method_command("toggle_session_tree", _("Session &Tree"), "ToggleSessionTree",
851  _method_command("exit", "&Exit", "Exit")                  checked = _has_tree_window_shown)
852    _method_command("toggle_legend", _("Legend"), "ToggleLegend",
853                    checked = _has_legend_shown)
854    _method_command("exit", _("E&xit"), "Exit")
855    
856  # Help menu  # Help menu
857  _method_command("help_about", "&About", "About")  _method_command("help_about", _("&About..."), "About")
858    
859    
860  # Map menu  # Map menu
861  _method_command("map_projection", "Pro&jection", "Projection")  _method_command("map_projection", _("Pro&jection..."), "MapProjection")
862    
863  _tool_command("map_zoom_in_tool", "&Zoom in", "ZoomInTool", "ZoomInTool",  _tool_command("map_zoom_in_tool", _("&Zoom in"), "ZoomInTool", "ZoomInTool",
864                helptext = "Switch to map-mode 'zoom-in'", icon = "zoom_in")                helptext = _("Switch to map-mode 'zoom-in'"), icon = "zoom_in",
865  _tool_command("map_zoom_out_tool", "Zoom &out", "ZoomOutTool", "ZoomOutTool",                sensitive = _has_visible_map)
866                helptext = "Switch to map-mode 'zoom-out'", icon = "zoom_out")  _tool_command("map_zoom_out_tool", _("Zoom &out"), "ZoomOutTool", "ZoomOutTool",
867  _tool_command("map_pan_tool", "&Pan", "PanTool", "PanTool",                helptext = _("Switch to map-mode 'zoom-out'"), icon = "zoom_out",
868                helptext = "Switch to map-mode 'pan'", icon = "pan")                sensitive = _has_visible_map)
869  _tool_command("map_identify_tool", "&Identify", "IdentifyTool", "IdentifyTool",  _tool_command("map_pan_tool", _("&Pan"), "PanTool", "PanTool",
870                helptext = "Switch to map-mode 'identify'", icon = "identify")                helptext = _("Switch to map-mode 'pan'"), icon = "pan",
871  _tool_command("map_label_tool", "&Label", "LabelTool", "LabelTool",                sensitive = _has_visible_map)
872                helptext = "Add/Remove labels", icon = "label")  _tool_command("map_identify_tool", _("&Identify"), "IdentifyTool",
873  _method_command("map_full_extent", "&Full extent", "FullExtent",                "IdentifyTool",
874                 helptext = "Full Extent", icon = "fullextent")                helptext = _("Switch to map-mode 'identify'"), icon = "identify",
875  _method_command("map_print", "Prin&t", "PrintMap", helptext = "Print the map")                sensitive = _has_visible_map)
876    _tool_command("map_label_tool", _("&Label"), "LabelTool", "LabelTool",
877                  helptext = _("Add/Remove labels"), icon = "label",
878                  sensitive = _has_visible_map)
879    _method_command("map_full_extent", _("&Full extent"), "FullExtent",
880                   helptext = _("Full Extent"), icon = "fullextent",
881                  sensitive = _has_visible_map)
882    _method_command("layer_full_extent", _("&Full layer extent"), "FullLayerExtent",
883                   helptext = _("Full Layer Extent"), icon = "fulllayerextent",
884                  sensitive = _has_selected_layer)
885    _method_command("selected_full_extent", _("&Full selection extent"), "FullSelectionExtent",
886                   helptext = _("Full Selection Extent"), icon = "fullselextent",
887                  sensitive = _has_selected_shapes)
888    _method_command("map_export", _("E&xport"), "ExportMap",
889                        helptext = _("Export the map to file"))
890    _method_command("map_print", _("Prin&t"), "PrintMap",
891                    helptext = _("Print the map"))
892    _method_command("map_rename", _("&Rename..."), "RenameMap",
893                    helptext = _("Rename the map"))
894    _method_command("layer_add", _("&Add Layer..."), "AddLayer",
895                    helptext = _("Add a new layer to active map"))
896    _method_command("rasterlayer_add", _("&Add Image Layer..."), "AddRasterLayer",
897                    helptext = _("Add a new image layer to active map"))
898    _method_command("layer_remove", _("&Remove Layer"), "RemoveLayer",
899                    helptext = _("Remove selected layer(s)"),
900                    sensitive = _can_remove_layer)
901    
902  # Layer menu  # Layer menu
903  _method_command("layer_add", "&Add Layer", "AddLayer",  _method_command("layer_projection", _("Pro&jection..."), "LayerProjection",
                 helptext = "Add a new layer to active map")  
 _method_command("layer_remove", "&Remove Layer", "RemoveLayer",  
                 helptext = "Remove selected layer(s)",  
                 sensitive = _has_selected_layer)  
 _method_command("layer_fill_color", "&Fill Color", "LayerFillColor",  
                 helptext = "Set the fill color of selected layer(s)",  
904                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
905  _method_command("layer_transparent_fill", "&Transparent Fill",  _method_command("layer_raise", _("&Raise"), "RaiseLayer",
906                  "LayerTransparentFill",                  helptext = _("Raise selected layer(s)"),
                 helptext = "Do not fill the selected layer(s)",  
907                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
908  _method_command("layer_outline_color", "&Outline Color", "LayerOutlineColor",  _method_command("layer_lower", _("&Lower"), "LowerLayer",
909                  helptext = "Set the outline color of selected layer(s)",                  helptext = _("Lower selected layer(s)"),
910                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
911  _method_command("layer_no_outline", "&No Outline", "LayerNoOutline",  _method_command("layer_show", _("&Show"), "ShowLayer",
912                  helptext = "Do not draw the outline of the selected layer(s)",                  helptext = _("Make selected layer(s) visible"),
913                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
914  _method_command("layer_raise", "&Raise", "RaiseLayer",  _method_command("layer_hide", _("&Hide"), "HideLayer",
915                  helptext = "Raise selected layer(s)",                  helptext = _("Make selected layer(s) unvisible"),
916                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
917  _method_command("layer_lower", "&Lower", "LowerLayer",  _method_command("layer_show_table", _("Show Ta&ble"), "LayerShowTable",
918                  helptext = "Lower selected layer(s)",                  helptext = _("Show the selected layer's table"),
919                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
920  _method_command("layer_show", "&Show", "ShowLayer",  _method_command("layer_properties", _("&Properties..."), "LayerEditProperties",
                 helptext = "Make selected layer(s) visible",  
921                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
922  _method_command("layer_hide", "&Hide", "HideLayer",  _method_command("layer_jointable", _("&Join Table..."), "LayerJoinTable",
                 helptext = "Make selected layer(s) unvisible",  
923                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
924  _method_command("layer_show_table", "Show Ta&ble", "LayerShowTable",  _method_command("layer_unjointable", _("&Unjoin Table..."), "LayerUnjoinTable",
                 helptext = "Show the selected layer's table",  
925                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
926    
927    # Table menu
928    _method_command("table_open", _("&Open..."), "TableOpen")
929    _method_command("table_close", _("&Close"), "TableClose")
930    _method_command("table_show", _("&Show"), "TableShow")
931    _method_command("table_hide", _("&Hide"), "TableHide")
932    _method_command("table_join", _("&Join..."), "TableJoin")
933    
934  # the menu structure  #  Export only under Windows ...
935  main_menu = Menu("<main>", "<main>",  map_menu = ["layer_add", "rasterlayer_add", "layer_remove", "map_rename",
                  [Menu("file", "&File",  
                        ["new_session", "open_session", None,  
                         "save_session", "save_session_as", None,  
                         "show_session_tree", None,  
                         "exit"]),  
                   Menu("map", "&Map",  
                        ["layer_add", "layer_remove",  
936                          None,                          None,
937                          "map_projection",                          "map_projection",
938                          None,                          None,
939                          "map_zoom_in_tool", "map_zoom_out_tool",                          "map_zoom_in_tool", "map_zoom_out_tool",
940                          "map_pan_tool", "map_identify_tool", "map_label_tool",                          "map_pan_tool",
941                            "map_full_extent",
942                            "layer_full_extent",
943                            "selected_full_extent",
944                          None,                          None,
945                          "map_full_extent",                          "map_identify_tool", "map_label_tool",
946                          None,                          None,
947                          "map_print"]),                          "toggle_legend",
948                    Menu("layer", "&Layer",                          None]
949                         ["layer_fill_color", "layer_transparent_fill",  if wxPlatform == '__WXMSW__':
950                          "layer_outline_color", "layer_no_outline",      map_menu.append("map_export")
951                          None,  map_menu.append("map_print")
952                          "layer_raise", "layer_lower",  
953    # the menu structure
954    main_menu = Menu("<main>", "<main>",
955                     [Menu("file", _("&File"),
956                           ["new_session", "open_session", None,
957                            "save_session", "save_session_as", None,
958                            "toggle_session_tree", None,
959                            "exit"]),
960                      Menu("map", _("&Map"), map_menu),
961                      Menu("layer", _("&Layer"),
962                            ["layer_raise", "layer_lower",
963                          None,                          None,
964                          "layer_show", "layer_hide",                          "layer_show", "layer_hide",
965                          None,                          None,
966                          "layer_show_table"]),                          "layer_projection",
967                    Menu("help", "&Help",                          None,
968                            "layer_show_table",
969                            "layer_jointable",
970                            "layer_unjointable",
971                            None,
972                            "layer_properties"]),
973                      Menu("table", _("&Table"),
974                           ["table_open", "table_close",
975                           None,
976                           "table_show", "table_hide",
977                           None,
978                           "table_join"]),
979                      Menu("help", _("&Help"),
980                         ["help_about"])])                         ["help_about"])])
981    
982    # the main toolbar
983    
984    main_toolbar = Menu("<toolbar>", "<toolbar>",
985                        ["map_zoom_in_tool", "map_zoom_out_tool", "map_pan_tool",
986                         "map_full_extent",
987                         "layer_full_extent",
988                         "selected_full_extent",
989                         None,
990                         "map_identify_tool", "map_label_tool"])

Legend:
Removed from v.188  
changed lines
  Added in v.1023

[email protected]
ViewVC Help
Powered by ViewVC 1.1.26