/[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 310 by bh, Tue Sep 10 16:45:22 2002 UTC revision 1108 by jonathan, Fri May 30 06:31:21 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    import copy
21    
22  from wxPython.wx import *  from wxPython.wx import *
23    from wxPython.wx import __version__ as wxPython_version
24    
25    from wxPython.lib.dialogs import wxMultipleChoiceDialog
26    
27  import Thuban  import Thuban
28    import Thuban.version
29    
30    from Thuban import _
31  from Thuban.Model.session import create_empty_session  from Thuban.Model.session import create_empty_session
32  from Thuban.Model.layer import Layer  from Thuban.Model.layer import Layer, RasterLayer
 from Thuban.Model.color import Color  
 from Thuban.Model.proj import Projection  
33    
34  import view  import view
35  import tree  import tree
 import proj4dialog  
36  import tableview, identifyview  import tableview, identifyview
37    from Thuban.UI.classifier import Classifier
38    import legend
39  from menu import Menu  from menu import Menu
40    
41  from context import Context  from context import Context
42  from command import registry, Command  from command import registry, Command, ToolCommand
43  from messages import SELECTED_SHAPE, VIEW_POSITION  from messages import LAYER_SELECTED, SHAPES_SELECTED, VIEW_POSITION
44    
45    from Thuban.UI.dock import DockFrame
46    from Thuban.UI.join import JoinDialog
47    
48    import resource
49    
50    import projdialog
51    
 # the directory where the toolbar icons are stored  
 bitmapdir = os.path.join(Thuban.__path__[0], os.pardir, "Resources", "Bitmaps")  
 bitmapext = ".xpm"  
52    
53    
54  class MainWindow(wxFrame):  class MainWindow(DockFrame):
55    
56        # Some messages that can be subscribed/unsubscribed directly through
57        # the MapCanvas come in fact from other objects. This is a map to
58        # map those messages to the names of the instance variables they
59        # actually come from. This delegation is implemented in the
60        # Subscribe and unsubscribed methods
61        delegated_messages = {LAYER_SELECTED: "canvas",
62                              SHAPES_SELECTED: "canvas"}
63    
64        # Methods delegated to some instance variables. The delegation is
65        # implemented in the __getattr__ method.
66        delegated_methods = {"SelectLayer": "canvas",
67                             "SelectShapes": "canvas",
68                             "SelectedLayer": "canvas",
69                             "SelectedShapes": "canvas",
70                             }
71    
72      def __init__(self, parent, ID, title, application, interactor,      def __init__(self, parent, ID, title, application, interactor,
73                   initial_message = None, size = wxSize(-1, -1)):                   initial_message = None, size = wxSize(-1, -1)):
74          wxFrame.__init__(self, parent, ID, title, wxDefaultPosition, size)          DockFrame.__init__(self, parent, ID, title, wxDefaultPosition, size)
75            #wxFrame.__init__(self, parent, ID, title, wxDefaultPosition, size)
76    
77          self.application = application          self.application = application
         self.interactor = interactor  
78    
79          self.CreateStatusBar()          self.CreateStatusBar()
80          if initial_message:          if initial_message:
# Line 63  class MainWindow(wxFrame): Line 92  class MainWindow(wxFrame):
92          # call Realize to make sure that the tools appear.          # call Realize to make sure that the tools appear.
93          toolbar.Realize()          toolbar.Realize()
94    
95    
96          # Create the map canvas          # Create the map canvas
97          canvas = view.MapCanvas(self, -1, interactor)          canvas = view.MapCanvas(self, -1)
98          canvas.Subscribe(VIEW_POSITION, self.view_position_changed)          canvas.Subscribe(VIEW_POSITION, self.view_position_changed)
99            canvas.Subscribe(SHAPES_SELECTED, self.identify_view_on_demand)
100          self.canvas = canvas          self.canvas = canvas
101    
102          self.init_dialogs()          self.SetMainWindow(self.canvas)
103    
104            self.SetAutoLayout(True)
105    
106          interactor.Subscribe(SELECTED_SHAPE, self.identify_view_on_demand)          self.init_dialogs()
107    
108          EVT_CLOSE(self, self.OnClose)          EVT_CLOSE(self, self.OnClose)
109    
110        def Subscribe(self, channel, *args):
111            """Subscribe a function to a message channel.
112    
113            If channel is one of the delegated messages call the appropriate
114            object's Subscribe method. Otherwise do nothing.
115            """
116            if channel in self.delegated_messages:
117                object = getattr(self, self.delegated_messages[channel])
118                object.Subscribe(channel, *args)
119            else:
120                print "Trying to subscribe to unsupported channel %s" % channel
121    
122        def Unsubscribe(self, channel, *args):
123            """Unsubscribe a function from a message channel.
124    
125            If channel is one of the delegated messages call the appropriate
126            object's Unsubscribe method. Otherwise do nothing.
127            """
128            if channel in self.delegated_messages:
129                object = getattr(self, self.delegated_messages[channel])
130                object.Unsubscribe(channel, *args)
131    
132        def __getattr__(self, attr):
133            """If attr is one of the delegated methods return that method
134    
135            Otherwise raise AttributeError.
136            """
137            if attr in self.delegated_methods:
138                return getattr(getattr(self, self.delegated_methods[attr]), attr)
139            raise AttributeError(attr)
140    
141      def init_ids(self):      def init_ids(self):
142          """Initialize the ids"""          """Initialize the ids"""
143          self.current_id = 6000          self.current_id = 6000
# Line 112  class MainWindow(wxFrame): Line 176  class MainWindow(wxFrame):
176          return menu_bar          return menu_bar
177    
178      def build_menu(self, menudesc):      def build_menu(self, menudesc):
179          """Build and return a wxMenu from a menudescription"""          """Return a wxMenu built from the menu description menudesc"""
180          wxmenu = wxMenu()          wxmenu = wxMenu()
181          last = None          last = None
182          for item in menudesc.items:          for item in menudesc.items:
             # here the items must all be Menu instances themselves  
183              if item is None:              if item is None:
184                  # a separator. Only add one if the last item was not a                  # a separator. Only add one if the last item was not a
185                  # separator                  # separator
# Line 169  class MainWindow(wxFrame): Line 232  class MainWindow(wxFrame):
232                              command.IsCheckCommand())                              command.IsCheckCommand())
233                  self.bind_command_events(command, ID)                  self.bind_command_events(command, ID)
234              else:              else:
235                  print "Unknown command %s" % name                  print _("Unknown command %s") % name
236    
237      def add_toolbar_command(self, toolbar, name):      def add_toolbar_command(self, toolbar, name):
238          """Add the command with name name to the toolbar toolbar.          """Add the command with name name to the toolbar toolbar.
# Line 184  class MainWindow(wxFrame): Line 247  class MainWindow(wxFrame):
247              command = registry.Command(name)              command = registry.Command(name)
248              if command is not None:              if command is not None:
249                  ID = self.get_id(name)                  ID = self.get_id(name)
250                  filename = os.path.join(bitmapdir, command.Icon()) + bitmapext                  bitmap = resource.GetBitmapResource(command.Icon(),
251                  bitmap = wxBitmap(filename, wxBITMAP_TYPE_XPM)                                                      wxBITMAP_TYPE_XPM)
252                  toolbar.AddTool(ID, bitmap,                  toolbar.AddTool(ID, bitmap,
253                                  shortHelpString = command.HelpText(),                                  shortHelpString = command.HelpText(),
254                                  isToggle = command.IsCheckCommand())                                  isToggle = command.IsCheckCommand())
255                  self.bind_command_events(command, ID)                  self.bind_command_events(command, ID)
256              else:              else:
257                  print "Unknown command %s" % name                  print _("Unknown command %s") % name
258    
259      def Context(self):      def Context(self):
260          """Return the context object for a command invoked from this window          """Return the context object for a command invoked from this window
# Line 204  class MainWindow(wxFrame): Line 267  class MainWindow(wxFrame):
267              command = registry.Command(name)              command = registry.Command(name)
268              command.Execute(self.Context())              command.Execute(self.Context())
269          else:          else:
270              print "Unknown command ID %d" % event.GetId()              print _("Unknown command ID %d") % event.GetId()
271    
272      def update_command_ui(self, event):      def update_command_ui(self, event):
273          #print "update_command_ui", self.id_to_name[event.GetId()]          #print "update_command_ui", self.id_to_name[event.GetId()]
274          context = self.Context()          context = self.Context()
275          command = registry.Command(self.id_to_name[event.GetId()])          command = registry.Command(self.id_to_name[event.GetId()])
276          if command is not None:          if command is not None:
277              event.Enable(command.Sensitive(context))              sensitive = command.Sensitive(context)
278                event.Enable(sensitive)
279                if command.IsTool() and not sensitive and command.Checked(context):
280                    # When a checked tool command is disabled deselect all
281                    # tools. Otherwise the tool would remain active but it
282                    # might lead to errors if the tools stays active. This
283                    # problem occurred in GREAT-ER and this fixes it, but
284                    # it's not clear to me whether this is really the best
285                    # way to do it (BH, 20021206).
286                    self.canvas.SelectTool(None)
287              event.SetText(command.DynText(context))              event.SetText(command.DynText(context))
288              if command.IsCheckCommand():              if command.IsCheckCommand():
289                  event.Check(command.Checked(context))                      event.Check(command.Checked(context))
290    
291      def RunMessageBox(self, title, text, flags = wxOK | wxICON_INFORMATION):      def RunMessageBox(self, title, text, flags = wxOK | wxICON_INFORMATION):
292          """Run a modal message box with the given text, title and flags          """Run a modal message box with the given text, title and flags
293          and return the result"""          and return the result"""
294          dlg = wxMessageDialog(self, text, title, flags)          dlg = wxMessageDialog(self, text, title, flags)
295            dlg.CenterOnParent()
296          result = dlg.ShowModal()          result = dlg.ShowModal()
297          dlg.Destroy()          dlg.Destroy()
298          return result          return result
# Line 233  class MainWindow(wxFrame): Line 306  class MainWindow(wxFrame):
306    
307      def add_dialog(self, name, dialog):      def add_dialog(self, name, dialog):
308          if self.dialogs.has_key(name):          if self.dialogs.has_key(name):
309              raise RuntimeError("The Dialog named %s is already open" % name)              raise RuntimeError(_("The Dialog named %s is already open") % name)
310          self.dialogs[name] = dialog          self.dialogs[name] = dialog
311    
312      def dialog_open(self, name):      def dialog_open(self, name):
# Line 251  class MainWindow(wxFrame): Line 324  class MainWindow(wxFrame):
324              text = "(%10.10g, %10.10g)" % pos              text = "(%10.10g, %10.10g)" % pos
325          else:          else:
326              text = ""              text = ""
327            self.set_position_text(text)
328    
329        def set_position_text(self, text):
330            """Set the statusbar text showing the current position.
331    
332            By default the text is shown in field 0 of the status bar.
333            Override this method in derived classes to put it into a
334            different field of the statusbar.
335            """
336          self.SetStatusText(text)          self.SetStatusText(text)
337    
338      def save_modified_session(self, can_veto = 1):      def save_modified_session(self, can_veto = 1):
# Line 266  class MainWindow(wxFrame): Line 348  class MainWindow(wxFrame):
348              flags = wxYES_NO | wxICON_QUESTION              flags = wxYES_NO | wxICON_QUESTION
349              if can_veto:              if can_veto:
350                  flags = flags | wxCANCEL                  flags = flags | wxCANCEL
351              result = self.RunMessageBox("Exit",              result = self.RunMessageBox(_("Exit"),
352                                          ("The session has been modified."                                          _("The session has been modified."
353                                           " Do you want to save it?"),                                           " Do you want to save it?"),
354                                          flags)                                          flags)
355              if result == wxID_YES:              if result == wxID_YES:
# Line 276  class MainWindow(wxFrame): Line 358  class MainWindow(wxFrame):
358              result = wxID_NO              result = wxID_NO
359          return result          return result
360    
361        def prepare_new_session(self):
362            for d in self.dialogs.values():
363                if not isinstance(d, tree.SessionTreeView):
364                    d.Close()
365    
366      def NewSession(self):      def NewSession(self):
367          self.save_modified_session()          if self.save_modified_session() != wxID_CANCEL:
368          self.application.SetSession(create_empty_session())              self.prepare_new_session()
369                self.application.SetSession(create_empty_session())
370    
371      def OpenSession(self):      def OpenSession(self):
372          self.save_modified_session()          if self.save_modified_session() != wxID_CANCEL:
373          dlg = wxFileDialog(self, "Select a session file", ".", "",              dlg = wxFileDialog(self, _("Open Session"), ".", "",
374                             "*.thuban", wxOPEN)                                 "Thuban Session File (*.thuban)|*.thuban",
375          if dlg.ShowModal() == wxID_OK:                                 wxOPEN)
376              self.application.OpenSession(dlg.GetPath())              if dlg.ShowModal() == wxID_OK:
377          dlg.Destroy()                  self.prepare_new_session()
378                    self.application.OpenSession(dlg.GetPath())
379                dlg.Destroy()
380    
381      def SaveSession(self):      def SaveSession(self):
382          if self.application.session.filename == None:          if self.application.session.filename == None:
383              self.SaveSessionAs()              self.SaveSessionAs()
384          self.application.SaveSession()          else:
385                self.application.SaveSession()
386    
387      def SaveSessionAs(self):      def SaveSessionAs(self):
388          dlg = wxFileDialog(self, "Enter a filename for session", ".", "",          dlg = wxFileDialog(self, _("Save Session As"), ".", "",
389                             "*.thuban", wxOPEN)                             "Thuban Session File (*.thuban)|*.thuban",
390                               wxSAVE|wxOVERWRITE_PROMPT)
391          if dlg.ShowModal() == wxID_OK:          if dlg.ShowModal() == wxID_OK:
392              self.application.session.SetFilename(dlg.GetPath())              self.application.session.SetFilename(dlg.GetPath())
393              self.application.SaveSession()              self.application.SaveSession()
394          dlg.Destroy()          dlg.Destroy()
395    
396      def Exit(self):      def Exit(self):
397          self.Close(false)          self.Close(False)
398    
399      def OnClose(self, event):      def OnClose(self, event):
400          result = self.save_modified_session(can_veto = event.CanVeto())          result = self.save_modified_session(can_veto = event.CanVeto())
# Line 313  class MainWindow(wxFrame): Line 405  class MainWindow(wxFrame):
405              # wx's destroy event, but that isn't implemented for wxGTK              # wx's destroy event, but that isn't implemented for wxGTK
406              # yet.              # yet.
407              self.canvas.Unsubscribe(VIEW_POSITION, self.view_position_changed)              self.canvas.Unsubscribe(VIEW_POSITION, self.view_position_changed)
408                DockFrame.OnClose(self, event)
409                for dlg in self.dialogs.values():
410                    dlg.Destroy()
411                self.canvas.Destroy()
412              self.Destroy()              self.Destroy()
413    
414      def SetMap(self, map):      def SetMap(self, map):
415          self.canvas.SetMap(map)          self.canvas.SetMap(map)
416            self.__SetTitle(map.Title())
417    
418            dialog = self.FindRegisteredDock("legend")
419            if dialog is not None:
420                dialog.GetPanel().SetMap(self.Map())
421    
422      def Map(self):      def Map(self):
423          """Return the map displayed by this mainwindow"""          """Return the map displayed by this mainwindow"""
424    
425          return self.canvas.Map()          return self.canvas.Map()
426    
427      def ShowSessionTree(self):      def ToggleSessionTree(self):
428            """If the session tree is shown close it otherwise create a new tree"""
429          name = "session_tree"          name = "session_tree"
430          dialog = self.get_open_dialog(name)          dialog = self.get_open_dialog(name)
431          if dialog is None:          if dialog is None:
432              dialog = tree.SessionTreeView(self, self.application, name)              dialog = tree.SessionTreeView(self, self.application, name)
433              self.add_dialog(name, dialog)              self.add_dialog(name, dialog)
434              dialog.Show(true)              dialog.Show(True)
435          else:          else:
436              # FIXME: bring dialog to front here              dialog.Close()
437              pass  
438        def SessionTreeShown(self):
439            """Return true iff the session tree is currently shown"""
440            return self.get_open_dialog("session_tree") is not None
441    
442      def About(self):      def About(self):
443          self.RunMessageBox("About",          self.RunMessageBox(_("About"),
444                             ("Thuban is a program for\n"                             _("Thuban %s\n"
445                                #"Build Date: %s\n"
446                                "using:\n"
447                                "  %s\n"
448                                "  %s\n\n"
449                                "Thuban is a program for\n"
450                              "exploring geographic data.\n"                              "exploring geographic data.\n"
451                              "Copyright (C) 2001 Intevation GmbH.\n"                              "Copyright (C) 2001-2003 Intevation GmbH.\n"
452                              "Thuban is licensed under the GPL"),                              "Thuban is licensed under the GNU GPL"
453                                % (Thuban.version.longversion,
454                                   "wxPython %s" % wxPython_version,
455                                   "Python %d.%d.%d" % sys.version_info[:3]
456                                  )),
457    #                           % __ThubanVersion__), #__BuildDate__)),
458                             wxOK | wxICON_INFORMATION)                             wxOK | wxICON_INFORMATION)
459    
460      def AddLayer(self):      def AddLayer(self):
461          dlg = wxFileDialog(self, "Select a data file", ".", "", "*.*",          dlg = wxFileDialog(self, _("Select a data file"), ".", "", "*.*",
462                             wxOPEN)                             wxOPEN)
463          if dlg.ShowModal() == wxID_OK:          if dlg.ShowModal() == wxID_OK:
464              filename = dlg.GetPath()              filename = dlg.GetPath()
465              title = os.path.splitext(os.path.basename(filename))[0]              title = os.path.splitext(os.path.basename(filename))[0]
             layer = Layer(title, filename)  
466              map = self.canvas.Map()              map = self.canvas.Map()
467              has_layers = map.HasLayers()              has_layers = map.HasLayers()
468              try:              try:
469                    store = self.application.Session().OpenShapefile(filename)
470                except IOError:
471                    # the layer couldn't be opened
472                    self.RunMessageBox(_("Add Layer"),
473                                       _("Can't open the file '%s'.") % filename)
474                else:
475                    layer = Layer(title, store)
476                  map.AddLayer(layer)                  map.AddLayer(layer)
477                    if not has_layers:
478                        # if we're adding a layer to an empty map, fit the
479                        # new map to the window
480                        self.canvas.FitMapToWindow()
481            dlg.Destroy()
482    
483        def AddRasterLayer(self):
484            dlg = wxFileDialog(self, _("Select an image file"), ".", "", "*.*",
485                               wxOPEN)
486            if dlg.ShowModal() == wxID_OK:
487                filename = dlg.GetPath()
488                title = os.path.splitext(os.path.basename(filename))[0]
489                map = self.canvas.Map()
490                has_layers = map.HasLayers()
491                try:
492                    layer = RasterLayer(title, filename)
493              except IOError:              except IOError:
494                  # the layer couldn't be opened                  # the layer couldn't be opened
495                  self.RunMessageBox("Add Layer",                  self.RunMessageBox(_("Add Image Layer"),
496                                     "Can't open the file '%s'." % filename)                                     _("Can't open the file '%s'.") % filename)
497              else:              else:
498                    map.AddLayer(layer)
499                  if not has_layers:                  if not has_layers:
500                      # if we're adding a layer to an empty map, for the                      # if we're adding a layer to an empty map, fit the
501                      # new map to the window                      # new map to the window
502                      self.canvas.FitMapToWindow()                      self.canvas.FitMapToWindow()
503          dlg.Destroy()          dlg.Destroy()
# Line 371  class MainWindow(wxFrame): Line 510  class MainWindow(wxFrame):
510      def CanRemoveLayer(self):      def CanRemoveLayer(self):
511          """Return true if the currently selected layer can be deleted.          """Return true if the currently selected layer can be deleted.
512    
513          If no layer is selected return false.          If no layer is selected return False.
514    
515          The return value of this method determines whether the remove          The return value of this method determines whether the remove
516          layer command is sensitive in menu.          layer command is sensitive in menu.
# Line 379  class MainWindow(wxFrame): Line 518  class MainWindow(wxFrame):
518          layer = self.current_layer()          layer = self.current_layer()
519          if layer is not None:          if layer is not None:
520              return self.canvas.Map().CanRemoveLayer(layer)              return self.canvas.Map().CanRemoveLayer(layer)
521          return 0          return False
522    
523      def RaiseLayer(self):      def RaiseLayer(self):
524          layer = self.current_layer()          layer = self.current_layer()
# Line 396  class MainWindow(wxFrame): Line 535  class MainWindow(wxFrame):
535    
536          If no layer is selected, return None          If no layer is selected, return None
537          """          """
538          return self.interactor.SelectedLayer()          return self.canvas.SelectedLayer()
539    
540      def has_selected_layer(self):      def has_selected_layer(self):
541          """Return true if a layer is currently selected"""          """Return true if a layer is currently selected"""
542          return self.interactor.HasSelectedLayer()          return self.canvas.HasSelectedLayer()
543    
544      def choose_color(self):      def has_selected_shapes(self):
545          """Run the color selection dialog and return the selected color.          """Return true if a shape is currently selected"""
546            return self.canvas.HasSelectedShapes()
547    
548          If the user cancels, return None.      def HideLayer(self):
         """  
         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):  
549          layer = self.current_layer()          layer = self.current_layer()
550          if layer is not None:          if layer is not None:
551              layer.SetFill(None)              layer.SetVisible(0)
552    
553      def LayerOutlineColor(self):      def ShowLayer(self):
554          layer = self.current_layer()          layer = self.current_layer()
555          if layer is not None:          if layer is not None:
556              color = self.choose_color()              layer.SetVisible(1)
             if color is not None:  
                 layer.SetStroke(color)  
557    
558      def LayerNoOutline(self):      def DuplicateLayer(self):
559            """Ceate a new layer above the selected layer with the same shapestore
560            """
561          layer = self.current_layer()          layer = self.current_layer()
562          if layer is not None:          if layer is not None and hasattr(layer, "ShapeStore"):
563              layer.SetStroke(None)              new_layer = Layer(_("Copy of `%s'") % layer.Title(),
564                                  layer.ShapeStore(),
565                                  projection = layer.GetProjection())
566                new_classification = copy.deepcopy(layer.GetClassification())
567                new_layer.SetClassification(new_classification)
568                self.Map().AddLayer(new_layer)
569    
570      def HideLayer(self):      def CanDuplicateLayer(self):
571          layer = self.current_layer()          """Return whether the DuplicateLayer method can create a duplicate"""
         if layer is not None:  
             layer.SetVisible(0)  
           
     def ShowLayer(self):  
572          layer = self.current_layer()          layer = self.current_layer()
573          if layer is not None:          return layer is not None and hasattr(layer, "ShapeStore")
             layer.SetVisible(1)  
574    
575      def LayerShowTable(self):      def LayerShowTable(self):
576          layer = self.current_layer()          layer = self.current_layer()
# Line 459  class MainWindow(wxFrame): Line 579  class MainWindow(wxFrame):
579              name = "table_view" + str(id(table))              name = "table_view" + str(id(table))
580              dialog = self.get_open_dialog(name)              dialog = self.get_open_dialog(name)
581              if dialog is None:              if dialog is None:
582                  dialog = tableview.LayerTableFrame(self, self.interactor, name,                  dialog = tableview.LayerTableFrame(self, name,
583                                                     "Table: %s" % layer.Title(),                                           _("Layer Table: %s") % layer.Title(),
584                                                     layer, table)                                           layer, table)
585                  self.add_dialog(name, dialog)                  self.add_dialog(name, dialog)
586                  dialog.Show(true)                  dialog.Show(True)
587              else:              else:
588                  # FIXME: bring dialog to front here                  # FIXME: bring dialog to front here
589                  pass                  pass
590    
591      def Projection(self):      def MapProjection(self):
592          map = self.canvas.Map()  
593          proj = map.projection          name = "map_projection"
594          if proj is None:          dialog = self.get_open_dialog(name)
595              proj4Dlg = proj4dialog.Proj4Dialog(NULL, None, map.BoundingBox())  
596            if dialog is None:
597                map = self.canvas.Map()
598                dialog = projdialog.ProjFrame(self, name,
599                         _("Map Projection: %s") % map.Title(), map)
600                self.add_dialog(name, dialog)
601                dialog.Show()
602            dialog.Raise()
603    
604        def LayerProjection(self):
605    
606            layer = self.current_layer()
607    
608            name = "layer_projection" + str(id(layer))
609            dialog = self.get_open_dialog(name)
610    
611            if dialog is None:
612                map = self.canvas.Map()
613                dialog = projdialog.ProjFrame(self, name,
614                         _("Layer Projection: %s") % layer.Title(), layer)
615                self.add_dialog(name, dialog)
616                dialog.Show()
617            dialog.Raise()
618    
619        def LayerEditProperties(self):
620    
621            #
622            # the menu option for this should only be available if there
623            # is a current layer, so we don't need to check if the
624            # current layer is None
625            #
626    
627            layer = self.current_layer()
628            self.OpenLayerProperties(layer)
629    
630        def OpenLayerProperties(self, layer, group = None):
631            name = "layer_properties" + str(id(layer))
632            dialog = self.get_open_dialog(name)
633    
634            if dialog is None:
635                dialog = Classifier(self, name, layer, group)
636                self.add_dialog(name, dialog)
637                dialog.Show()
638            dialog.Raise()
639    
640        def LayerJoinTable(self):
641            layer = self.canvas.SelectedLayer()
642            if layer is not None:
643                dlg = JoinDialog(self, _("Join Layer with Table"),
644                                 self.application.session,
645                                 layer = layer)
646                dlg.ShowModal()
647    
648        def LayerUnjoinTable(self):
649            layer = self.canvas.SelectedLayer()
650            if layer is not None:
651                orig_store = layer.ShapeStore().OrigShapeStore()
652                if orig_store:
653                    layer.SetShapeStore(orig_store)
654    
655        def ShowLegend(self):
656            if not self.LegendShown():
657                self.ToggleLegend()
658    
659        def ToggleLegend(self):
660            """Show the legend if it's not shown otherwise hide it again"""
661            name = "legend"
662            dialog = self.FindRegisteredDock(name)
663    
664            if dialog is None:
665                dialog = self.CreateDock(name, -1, _("Legend"), wxLAYOUT_LEFT)
666                legend.LegendPanel(dialog, None, self)
667                dialog.Dock()
668                dialog.GetPanel().SetMap(self.Map())
669                dialog.Show()
670          else:          else:
671              proj4Dlg = proj4dialog.Proj4Dialog(NULL, map.projection.params,              dialog.Show(not dialog.IsShown())
672                                                 map.BoundingBox())  
673          if proj4Dlg.ShowModal() == wxID_OK:          self.canvas.FitMapToWindow()
674              params = proj4Dlg.GetParams()  
675              if params is not None:      def LegendShown(self):
676                  proj = Projection(params)          """Return true iff the legend is currently open"""
677            dialog = self.FindRegisteredDock("legend")
678            return dialog is not None and dialog.IsShown()
679    
680        def TableOpen(self):
681            dlg = wxFileDialog(self, _("Open Table"), ".", "",
682                               _("DBF Files (*.dbf)") + "|*.dbf|" +
683                               #_("CSV Files (*.csv)") + "|*.csv|" +
684                               _("All Files (*.*)") + "|*.*",
685                               wxOPEN)
686            if dlg.ShowModal() == wxID_OK:
687                filename = dlg.GetPath()
688                dlg.Destroy()
689                try:
690                    table = self.application.session.OpenTableFile(filename)
691                except IOError:
692                    # the layer couldn't be opened
693                    self.RunMessageBox(_("Open Table"),
694                                       _("Can't open the file '%s'.") % filename)
695              else:              else:
696                  proj = None                  self.ShowTableView(table)
697              map.SetProjection(proj)  
698          proj4Dlg.Destroy()      def TableClose(self):
699            tables = self.application.session.UnreferencedTables()
700    
701            lst = [(t.Title(), t) for t in tables]
702            lst.sort()
703            titles = [i[0] for i in lst]
704            dlg = wxMultipleChoiceDialog(self, _("Pick the tables to close:"),
705                                         _("Close Table"), titles,
706                                         size = (400, 300),
707                                         style = wxDEFAULT_DIALOG_STYLE |
708                                                 wxRESIZE_BORDER)
709            if dlg.ShowModal() == wxID_OK:
710                for i in dlg.GetValue():
711                    self.application.session.RemoveTable(lst[i][1])
712    
713    
714        def TableShow(self):
715            """Offer a multi-selection dialog for tables to be displayed
716    
717            The windows for the selected tables are opened or brought to
718            the front.
719            """
720            tables = self.application.session.Tables()
721    
722            lst = [(t.Title(), t) for t in tables]
723            lst.sort()
724            titles = [i[0] for i in lst]
725            dlg = wxMultipleChoiceDialog(self, _("Pick the table to show:"),
726                                         _("Show Table"), titles,
727                                         size = (400,300),
728                                         style = wxDEFAULT_DIALOG_STYLE |
729                                                 wxRESIZE_BORDER)
730            if (dlg.ShowModal() == wxID_OK):
731                for i in dlg.GetValue():
732                    # XXX: if the table belongs to a layer, open a
733                    # LayerTableFrame instead of QueryTableFrame
734                    self.ShowTableView(lst[i][1])
735    
736        def TableJoin(self):
737            dlg = JoinDialog(self, _("Join Tables"), self.application.session)
738            dlg.ShowModal()
739    
740        def ShowTableView(self, table):
741            """Open a table view for the table and optionally"""
742            name = "table_view%d" % id(table)
743            dialog = self.get_open_dialog(name)
744            if dialog is None:
745                dialog = tableview.QueryTableFrame(self, name,
746                                                   _("Table: %s") % table.Title(),
747                                                   table)
748                self.add_dialog(name, dialog)
749                dialog.Show(True)
750            # FIXME: else bring dialog to front
751    
752      def ZoomInTool(self):      def ZoomInTool(self):
753          self.canvas.ZoomInTool()          self.canvas.ZoomInTool()
# Line 504  class MainWindow(wxFrame): Line 768  class MainWindow(wxFrame):
768      def FullExtent(self):      def FullExtent(self):
769          self.canvas.FitMapToWindow()          self.canvas.FitMapToWindow()
770    
771        def FullLayerExtent(self):
772            self.canvas.FitLayerToWindow(self.current_layer())
773    
774        def FullSelectionExtent(self):
775            self.canvas.FitSelectedToWindow()
776    
777        def ExportMap(self):
778            self.canvas.Export()
779    
780      def PrintMap(self):      def PrintMap(self):
781          self.canvas.Print()          self.canvas.Print()
782    
783      def identify_view_on_demand(self, layer, shape):      def RenameMap(self):
784            dlg = wxTextEntryDialog(self, "Map Title: ", "Rename Map",
785                                    self.Map().Title())
786            if dlg.ShowModal() == wxID_OK:
787                title = dlg.GetValue()
788                if title != "":
789                    self.Map().SetTitle(title)
790                    self.__SetTitle(title)
791    
792            dlg.Destroy()
793    
794        def identify_view_on_demand(self, layer, shapes):
795            """Subscribed to the canvas' SHAPES_SELECTED message
796    
797            If the current tool is the identify tool, at least one shape is
798            selected and the identify dialog is not shown, show the dialog.
799            """
800            # If the selection has become empty we don't need to do
801            # anything. Otherwise it could happen that the dialog was popped
802            # up when the selection became empty, e.g. when a new selection
803            # is opened while the identify tool is active and dialog had
804            # been closed
805            if not shapes:
806                return
807    
808          name = "identify_view"          name = "identify_view"
809          if self.canvas.CurrentTool() == "IdentifyTool":          if self.canvas.CurrentTool() == "IdentifyTool":
810              if not self.dialog_open(name):              if not self.dialog_open(name):
811                  dialog = identifyview.IdentifyView(self, self.interactor, name)                  dialog = identifyview.IdentifyView(self, name)
812                  self.add_dialog(name, dialog)                  self.add_dialog(name, dialog)
813                  dialog.Show(true)                  dialog.Show(True)
814              else:              else:
815                  # FIXME: bring dialog to front?                  # FIXME: bring dialog to front?
816                  pass                  pass
817    
818        def __SetTitle(self, title):
819            self.SetTitle("Thuban - " + title)
820    
821  #  #
822  # Define all the commands available in the main window  # Define all the commands available in the main window
823  #  #
# Line 529  def call_method(context, methodname, *ar Line 829  def call_method(context, methodname, *ar
829      apply(getattr(context.mainwindow, methodname), args)      apply(getattr(context.mainwindow, methodname), args)
830    
831  def _method_command(name, title, method, helptext = "",  def _method_command(name, title, method, helptext = "",
832                      icon = "", sensitive = None):                      icon = "", sensitive = None, checked = None):
833      """Add a command implemented by a method of the mainwindow object"""      """Add a command implemented by a method of the mainwindow object"""
834      registry.Add(Command(name, title, call_method, args=(method,),      registry.Add(Command(name, title, call_method, args=(method,),
835                           helptext = helptext, icon = icon,                           helptext = helptext, icon = icon,
836                           sensitive = sensitive))                           sensitive = sensitive, checked = checked))
837    
838  def make_check_current_tool(toolname):  def make_check_current_tool(toolname):
839      """Return a function that tests if the currently active tool is toolname      """Return a function that tests if the currently active tool is toolname
# Line 549  def make_check_current_tool(toolname): Line 849  def make_check_current_tool(toolname):
849  def _tool_command(name, title, method, toolname, helptext = "",  def _tool_command(name, title, method, toolname, helptext = "",
850                    icon = "", sensitive = None):                    icon = "", sensitive = None):
851      """Add a tool command"""      """Add a tool command"""
852      registry.Add(Command(name, title, call_method, args=(method,),      registry.Add(ToolCommand(name, title, call_method, args=(method,),
853                           helptext = helptext, icon = icon,                               helptext = helptext, icon = icon,
854                           checked = make_check_current_tool(toolname),                               checked = make_check_current_tool(toolname),
855                           sensitive = sensitive))                               sensitive = sensitive))
856    
857  def _has_selected_layer(context):  def _has_selected_layer(context):
858      """Return true if a layer is selected in the context"""      """Return true if a layer is selected in the context"""
859      return context.mainwindow.has_selected_layer()      return context.mainwindow.has_selected_layer()
860    
861    def _has_selected_shapes(context):
862        """Return true if a layer is selected in the context"""
863        return context.mainwindow.has_selected_shapes()
864    
865  def _can_remove_layer(context):  def _can_remove_layer(context):
866      return context.mainwindow.CanRemoveLayer()      return context.mainwindow.CanRemoveLayer()
867    
868  def _has_tree_window_shown(context):  def _has_tree_window_shown(context):
869      """Return true if the tree window is shown"""      """Return true if the tree window is shown"""
870      return context.mainwindow.get_open_dialog("session_tree") is None      return context.mainwindow.SessionTreeShown()
871    
872  def _has_visible_map(context):  def _has_visible_map(context):
873      """Return true iff theres a visible map in the mainwindow.      """Return true iff theres a visible map in the mainwindow.
# Line 576  def _has_visible_map(context): Line 880  def _has_visible_map(context):
880                  return 1                  return 1
881      return 0      return 0
882    
883    def _has_legend_shown(context):
884        """Return true if the legend window is shown"""
885        return context.mainwindow.LegendShown()
886    
887    
888  # File menu  # File menu
889  _method_command("new_session", "&New Session", "NewSession")  _method_command("new_session", _("&New Session"), "NewSession")
890  _method_command("open_session", "&Open Session", "OpenSession")  _method_command("open_session", _("&Open Session..."), "OpenSession")
891  _method_command("save_session", "&Save Session", "SaveSession")  _method_command("save_session", _("&Save Session"), "SaveSession")
892  _method_command("save_session_as", "Save Session &As", "SaveSessionAs")  _method_command("save_session_as", _("Save Session &As..."), "SaveSessionAs")
893  _method_command("show_session_tree", "Show Session &Tree", "ShowSessionTree",  _method_command("toggle_session_tree", _("Session &Tree"), "ToggleSessionTree",
894                  sensitive = _has_tree_window_shown)                  checked = _has_tree_window_shown)
895  _method_command("exit", "&Exit", "Exit")  _method_command("toggle_legend", _("Legend"), "ToggleLegend",
896                    checked = _has_legend_shown)
897    _method_command("exit", _("E&xit"), "Exit")
898    
899  # Help menu  # Help menu
900  _method_command("help_about", "&About", "About")  _method_command("help_about", _("&About..."), "About")
901    
902    
903  # Map menu  # Map menu
904  _method_command("map_projection", "Pro&jection", "Projection")  _method_command("map_projection", _("Pro&jection..."), "MapProjection")
905    
906  _tool_command("map_zoom_in_tool", "&Zoom in", "ZoomInTool", "ZoomInTool",  _tool_command("map_zoom_in_tool", _("&Zoom in"), "ZoomInTool", "ZoomInTool",
907                helptext = "Switch to map-mode 'zoom-in'", icon = "zoom_in",                helptext = _("Switch to map-mode 'zoom-in'"), icon = "zoom_in",
908                sensitive = _has_visible_map)                sensitive = _has_visible_map)
909  _tool_command("map_zoom_out_tool", "Zoom &out", "ZoomOutTool", "ZoomOutTool",  _tool_command("map_zoom_out_tool", _("Zoom &out"), "ZoomOutTool", "ZoomOutTool",
910                helptext = "Switch to map-mode 'zoom-out'", icon = "zoom_out",                helptext = _("Switch to map-mode 'zoom-out'"), icon = "zoom_out",
911                sensitive = _has_visible_map)                sensitive = _has_visible_map)
912  _tool_command("map_pan_tool", "&Pan", "PanTool", "PanTool",  _tool_command("map_pan_tool", _("&Pan"), "PanTool", "PanTool",
913                helptext = "Switch to map-mode 'pan'", icon = "pan",                helptext = _("Switch to map-mode 'pan'"), icon = "pan",
914                sensitive = _has_visible_map)                sensitive = _has_visible_map)
915  _tool_command("map_identify_tool", "&Identify", "IdentifyTool", "IdentifyTool",  _tool_command("map_identify_tool", _("&Identify"), "IdentifyTool",
916                helptext = "Switch to map-mode 'identify'", icon = "identify",                "IdentifyTool",
917                  helptext = _("Switch to map-mode 'identify'"), icon = "identify",
918                sensitive = _has_visible_map)                sensitive = _has_visible_map)
919  _tool_command("map_label_tool", "&Label", "LabelTool", "LabelTool",  _tool_command("map_label_tool", _("&Label"), "LabelTool", "LabelTool",
920                helptext = "Add/Remove labels", icon = "label",                helptext = _("Add/Remove labels"), icon = "label",
921                sensitive = _has_visible_map)                sensitive = _has_visible_map)
922  _method_command("map_full_extent", "&Full extent", "FullExtent",  _method_command("map_full_extent", _("&Full extent"), "FullExtent",
923                 helptext = "Full Extent", icon = "fullextent",                 helptext = _("Full Extent"), icon = "fullextent",
924                sensitive = _has_visible_map)                sensitive = _has_visible_map)
925  _method_command("map_print", "Prin&t", "PrintMap", helptext = "Print the map")  _method_command("layer_full_extent", _("&Full layer extent"), "FullLayerExtent",
926                   helptext = _("Full Layer Extent"), icon = "fulllayerextent",
927                  sensitive = _has_selected_layer)
928    _method_command("selected_full_extent", _("&Full selection extent"), "FullSelectionExtent",
929                   helptext = _("Full Selection Extent"), icon = "fullselextent",
930                  sensitive = _has_selected_shapes)
931    _method_command("map_export", _("E&xport"), "ExportMap",
932                        helptext = _("Export the map to file"))
933    _method_command("map_print", _("Prin&t"), "PrintMap",
934                    helptext = _("Print the map"))
935    _method_command("map_rename", _("&Rename..."), "RenameMap",
936                    helptext = _("Rename the map"))
937    _method_command("layer_add", _("&Add Layer..."), "AddLayer",
938                    helptext = _("Add a new layer to active map"))
939    _method_command("rasterlayer_add", _("&Add Image Layer..."), "AddRasterLayer",
940                    helptext = _("Add a new image layer to active map"))
941    _method_command("layer_remove", _("&Remove Layer"), "RemoveLayer",
942                    helptext = _("Remove selected layer(s)"),
943                    sensitive = _can_remove_layer)
944    
945  # Layer menu  # Layer menu
946  _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 = _can_remove_layer)  
 _method_command("layer_fill_color", "&Fill Color", "LayerFillColor",  
                 helptext = "Set the fill color of selected layer(s)",  
947                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
948  _method_command("layer_transparent_fill", "&Transparent Fill",  _method_command("layer_duplicate", _("&Duplicate"), "DuplicateLayer",
949                  "LayerTransparentFill",                  helptext = _("Duplicate selected layer(s)"),
950                  helptext = "Do not fill the selected layer(s)",            sensitive = lambda context: context.mainwindow.CanDuplicateLayer())
951    _method_command("layer_raise", _("&Raise"), "RaiseLayer",
952                    helptext = _("Raise selected layer(s)"),
953                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
954  _method_command("layer_outline_color", "&Outline Color", "LayerOutlineColor",  _method_command("layer_lower", _("&Lower"), "LowerLayer",
955                  helptext = "Set the outline color of selected layer(s)",                  helptext = _("Lower selected layer(s)"),
956                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
957  _method_command("layer_no_outline", "&No Outline", "LayerNoOutline",  _method_command("layer_show", _("&Show"), "ShowLayer",
958                  helptext = "Do not draw the outline of the selected layer(s)",                  helptext = _("Make selected layer(s) visible"),
959                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
960  _method_command("layer_raise", "&Raise", "RaiseLayer",  _method_command("layer_hide", _("&Hide"), "HideLayer",
961                  helptext = "Raise selected layer(s)",                  helptext = _("Make selected layer(s) unvisible"),
962                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
963  _method_command("layer_lower", "&Lower", "LowerLayer",  _method_command("layer_show_table", _("Show Ta&ble"), "LayerShowTable",
964                  helptext = "Lower selected layer(s)",                  helptext = _("Show the selected layer's table"),
965                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
966  _method_command("layer_show", "&Show", "ShowLayer",  _method_command("layer_properties", _("&Properties..."), "LayerEditProperties",
                 helptext = "Make selected layer(s) visible",  
967                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
968  _method_command("layer_hide", "&Hide", "HideLayer",  _method_command("layer_jointable", _("&Join Table..."), "LayerJoinTable",
                 helptext = "Make selected layer(s) unvisible",  
                 sensitive = _has_selected_layer)  
 _method_command("layer_show_table", "Show Ta&ble", "LayerShowTable",  
                 helptext = "Show the selected layer's table",  
969                  sensitive = _has_selected_layer)                  sensitive = _has_selected_layer)
970    
971    def _can_unjoin(context):
972        """Return whether the Layer/Unjoin command can be executed.
973    
974        This is the case if a layer is selected and that layer has a
975        shapestore that has an original shapestore.
976        """
977        layer = context.mainwindow.SelectedLayer()
978        if layer is None:
979            return 0
980        getstore = getattr(layer, "ShapeStore", None)
981        if getstore is not None:
982            return getstore().OrigShapeStore() is not None
983        else:
984            return 0
985    _method_command("layer_unjointable", _("&Unjoin Table..."), "LayerUnjoinTable",
986                    sensitive = _can_unjoin)
987    
988    # Table menu
989    _method_command("table_open", _("&Open..."), "TableOpen")
990    _method_command("table_close", _("&Close"), "TableClose",
991           sensitive = lambda context: bool(context.session.UnreferencedTables()))
992    _method_command("table_show", _("&Show"), "TableShow")
993    _method_command("table_join", _("&Join..."), "TableJoin")
994    
995    #  Export only under Windows ...
996    map_menu = ["layer_add", "rasterlayer_add", "layer_remove", "map_rename",
997                            None,
998                            "map_projection",
999                            None,
1000                            "map_zoom_in_tool", "map_zoom_out_tool",
1001                            "map_pan_tool",
1002                            "map_full_extent",
1003                            "layer_full_extent",
1004                            "selected_full_extent",
1005                            None,
1006                            "map_identify_tool", "map_label_tool",
1007                            None,
1008                            "toggle_legend",
1009                            None]
1010    if wxPlatform == '__WXMSW__':
1011        map_menu.append("map_export")
1012    map_menu.append("map_print")
1013    
1014  # the menu structure  # the menu structure
1015  main_menu = Menu("<main>", "<main>",  main_menu = Menu("<main>", "<main>",
1016                   [Menu("file", "&File",                   [Menu("file", _("&File"),
1017                         ["new_session", "open_session", None,                         ["new_session", "open_session", None,
1018                          "save_session", "save_session_as", None,                          "save_session", "save_session_as", None,
1019                          "show_session_tree", None,                          "toggle_session_tree", None,
1020                          "exit"]),                          "exit"]),
1021                    Menu("map", "&Map",                    Menu("map", _("&Map"), map_menu),
1022                         ["layer_add", "layer_remove",                    Menu("layer", _("&Layer"),
1023                          None,                          ["layer_raise", "layer_lower",
                         "map_projection",  
1024                          None,                          None,
1025                          "map_zoom_in_tool", "map_zoom_out_tool",                          "layer_show", "layer_hide",
                         "map_pan_tool", "map_identify_tool", "map_label_tool",  
                         None,  
                         "map_full_extent",  
1026                          None,                          None,
1027                          "map_print"]),                          "layer_duplicate",
                   Menu("layer", "&Layer",  
                        ["layer_fill_color", "layer_transparent_fill",  
                         "layer_outline_color", "layer_no_outline",  
1028                          None,                          None,
1029                          "layer_raise", "layer_lower",                          "layer_projection",
1030                          None,                          None,
1031                          "layer_show", "layer_hide",                          "layer_show_table",
1032                            "layer_jointable",
1033                            "layer_unjointable",
1034                          None,                          None,
1035                          "layer_show_table"]),                          "layer_properties"]),
1036                    Menu("help", "&Help",                    Menu("table", _("&Table"),
1037                           ["table_open", "table_close",
1038                           None,
1039                           "table_show",
1040                           None,
1041                           "table_join"]),
1042                      Menu("help", _("&Help"),
1043                         ["help_about"])])                         ["help_about"])])
1044    
1045  # the main toolbar  # the main toolbar
1046    
1047  main_toolbar = Menu("<toolbar>", "<toolbar>",  main_toolbar = Menu("<toolbar>", "<toolbar>",
1048                      ["map_zoom_in_tool", "map_zoom_out_tool", "map_pan_tool",                      ["map_zoom_in_tool", "map_zoom_out_tool", "map_pan_tool",
1049                       "map_identify_tool", "map_label_tool", "map_full_extent"])                       "map_full_extent",
1050                         "layer_full_extent",
1051                         "selected_full_extent",
1052                         None,
1053                         "map_identify_tool", "map_label_tool"])
Legend:
Removed from v.310  
changed lines
  Added in v.1108
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26