[GRASS-SVN] r42008 - grass-addons/gui/wxpython/data_catalog

svn_grass at osgeo.org svn_grass at osgeo.org
Fri Apr 23 12:01:15 EDT 2010


Author: rashadkm
Date: 2010-04-23 12:01:07 -0400 (Fri, 23 Apr 2010)
New Revision: 42008

Added:
   grass-addons/gui/wxpython/data_catalog/LayerTree.py
   grass-addons/gui/wxpython/data_catalog/README
   grass-addons/gui/wxpython/data_catalog/catalog.py
   grass-addons/gui/wxpython/data_catalog/mapdisplay.py
   grass-addons/gui/wxpython/data_catalog/toolbars.py
   grass-addons/gui/wxpython/data_catalog/units.py
Log:
fixed display for different location and mapsets

Added: grass-addons/gui/wxpython/data_catalog/LayerTree.py
===================================================================
--- grass-addons/gui/wxpython/data_catalog/LayerTree.py	                        (rev 0)
+++ grass-addons/gui/wxpython/data_catalog/LayerTree.py	2010-04-23 16:01:07 UTC (rev 42008)
@@ -0,0 +1,385 @@
+import os
+import sys
+import wx
+import glob
+import render
+from threading import Thread
+
+import wx.lib.customtreectrl as CT
+try:
+    import treemixin 
+except ImportError:
+    from wx.lib.mixins import treemixin
+
+#To run DataCatalog from any directory set this pathname for access to gui_modules 
+gbase = os.getenv("GISBASE") 
+pypath = os.path.join(gbase,'etc','wxpython','gui_modules')
+sys.path.append(pypath)
+
+
+import globalvar
+if not os.getenv("GRASS_WXBUNDLED"):
+    globalvar.CheckForWx()
+import gcmd
+
+
+
+
+class LayerTree(treemixin.DragAndDrop, CT.CustomTreeCtrl):
+
+
+
+    def __init__(self, parent,
+                 id=wx.ID_ANY, pos=wx.DefaultPosition,
+                 size=(300,300), style=wx.SUNKEN_BORDER,
+                 ctstyle=CT.TR_HAS_BUTTONS | CT.TR_HAS_VARIABLE_ROW_HEIGHT |
+                 CT.TR_HIDE_ROOT | CT.TR_FULL_ROW_HIGHLIGHT |
+                 CT.TR_MULTIPLE,mapdisplay=None,frame=None,panel=None,Map=None,lmgr=None,gisdbase=None):
+        self.items = []
+        self.itemCounter = 0
+        
+        super(LayerTree, self).__init__(parent, id, pos, size, style=style, ctstyle=ctstyle)
+        self.SetName("LayerTree")
+
+
+        self.itemFont = wx.Font(pointSize=9,weight=0, family=wx.FONTFAMILY_DEFAULT ,style=wx.FONTSTYLE_ITALIC)
+
+        self.gisdbase = gisdbase
+
+
+        self.Map = None
+        #if self.Map is not None:
+        #    print self.Map.width
+
+        self.ID_REN= wx.NewId()
+        self.ID_COPY = wx.NewId()
+        self.ID_DEL = wx.NewId()
+        self.ID_OSSIM = wx.NewId()
+
+        acel = wx.AcceleratorTable([ 
+		        (wx.ACCEL_CTRL,  ord('R'), self.ID_REN ) ,
+		        (wx.ACCEL_CTRL,  ord('C'), self.ID_COPY) ,
+		        (wx.ACCEL_NORMAL, wx.WXK_DELETE, self.ID_DEL) ])
+
+
+        self.SetAcceleratorTable(acel)
+
+        self.dict = {}
+
+        self.layer = []
+        self.maplayer = None
+
+        d = self.GetParent()
+        notebook = d.GetParent()
+
+
+        child=notebook.GetChildren()
+        for panel in child:
+              if panel.GetName() == "pg_panel":
+                self.mapdisplay = panel
+
+        self.MapWindow = self.mapdisplay.MapWindow2D
+        self.Bind(CT.EVT_TREE_ITEM_CHECKED,     self.OnLayerChecked)
+
+
+        self.Bind(wx.EVT_TREE_ITEM_RIGHT_CLICK,self.OnTreePopUp)
+        self.Bind(wx.EVT_TREE_END_LABEL_EDIT, self.OnEndRename)
+        self.Bind(wx.EVT_TREE_BEGIN_LABEL_EDIT, self.OnBeginRename)
+
+	    #Event bindings for tree menu
+        self.Bind(wx.EVT_MENU,self.OnCopy,id=self.ID_COPY)
+        self.Bind(wx.EVT_MENU,self.OnRename,id=self.ID_REN)
+        self.Bind(wx.EVT_MENU,self.OnDelete,id=self.ID_DEL)
+        self.Bind(wx.EVT_MENU,self.OnOssim,id=self.ID_OSSIM)
+
+
+
+
+    def OnLayerChecked(self, event):
+        """!Enable/disable data layer"""
+
+        item    = event.GetItem()
+        checked = item.IsChecked()
+
+
+        pText = self.GetItemText(self.GetItemParent(item)) 
+
+
+        leftpanel=self.GetParent()
+        notebook = leftpanel.GetParent()
+        frame = notebook.GetParent()
+
+
+        if not self.ItemHasChildren(item):
+            self.mapname =  self.GetItemText(item) + "@" + frame.cmbMapset.GetValue()
+            #for f in frames:
+            #    print f.GetName()     
+            #maptree = mapframe.maptree
+
+            if pText == "Raster Map" :
+                self.cmd= ['d.rast', str("map=" + self.mapname)]
+                l_type='raster'
+                
+                self.maplayer = self.MapWindow.Map.AddLayer(type='raster', name=self.mapname, command=self.cmd)
+               
+
+                #layer = maptree.PrependItem(parent=maptree.root, text=self.mapname, ct_type=1)
+                #maptree.first = True
+                #maptree.layer_selected = layer
+                #maptree.CheckItem(layer)
+                #self.layer.append(self.maplayer)
+                #maptree.PlusLayer(self.maplayer)
+
+
+            if pText == "Vector Map" :
+                self.cmd= ['d.vect', str("map=" + self.mapname)]
+                l_type='vector'
+                
+                self.maplayer = self.MapWindow.Map.AddLayer(type='vector', name=self.mapname, command=self.cmd)
+
+
+            self.MapWindow.Map.region = self.MapWindow.Map.GetRegion()
+            self.MapWindow.flag = True
+            self.MapWindow.UpdateMap(render=True)
+            self.MapWindow.flag = False
+                #layer = maptree.PrependItem(parent=maptree.root, text=self.mapname, ct_type=1)
+                #maptree.first = True
+                #maptree.layer_selected = layer
+                #maptree.CheckItem(layer)
+                #self.layer.append(self.maplayer)
+                #maptree.PlusLayer(self.maplayer)
+
+
+
+
+    def AddTreeNodes(self,location,mapset):
+        """
+        Adds tree nodes. raster,vector and dbf files are identified using 
+        their directory structure.
+        """
+        self.DeleteAllItems()
+        root = self.AddRoot("Map Layers")
+        self.SetPyData(root, (None,None))
+        node_raster = self.AppendItem(root, "Raster Map")
+        node_vector = self.AppendItem(root, "Vector Map")
+        node_dbf = self.AppendItem(root, "DBF")
+        treeNodes = [node_raster,node_vector,node_dbf]
+
+        glocs = glob.glob(os.path.join(self.gisdbase,location, mapset,"*"))
+        for gloc in glocs:
+            if not os.path.isfile(gloc) and os.path.isdir(gloc):
+	            if(os.path.basename(gloc)=='cellhd'):
+		            for rast in glob.glob(os.path.join(self.gisdbase,location, mapset,gloc, "*")):
+			            self.PrependItem(node_raster, os.path.basename(rast),ct_type=1)
+	            elif(os.path.basename(gloc)=='vector'):
+		            for vect in glob.glob(os.path.join(self.gisdbase,location, mapset,gloc, "*")):
+			            self.PrependItem(node_vector, os.path.basename(vect),ct_type=1)
+	            elif(os.path.basename(gloc)=='dbf'):
+		            for dfile in glob.glob(os.path.join(self.gisdbase,location, mapset,gloc, "*")):
+			            self.PrependItem(node_dbf, os.path.basename(dfile),ct_type=1)
+
+        #Nodes with no children are given an italic type font
+        for node in treeNodes: 
+            if not self.ItemHasChildren(node):
+	            if self.GetItemText(node) == 'Raster Map':
+		            tmp_item = self.AppendItem(node, "No raster maps found.")
+	            elif self.GetItemText(node) == 'Vector Map':
+		            tmp_item = self.AppendItem(node, "No vector maps found.")
+	            elif self.GetItemText(node) == 'DBF':
+		            tmp_item = self.AppendItem(node, "No DBF files found.")
+	            self.SetItemFont(tmp_item,self.itemFont)
+
+
+        self.SortChildren(node_raster)
+        self.SortChildren(node_vector)
+        self.SortChildren(node_dbf)
+
+    def OnToggleExpand(self,event):  
+	    if self.treeExpand.GetValue() == True:
+		    self.ExpandAll()
+	    else: 
+		    self.CollapseAll()
+
+
+    def OnBeginRename(self,event):
+
+        item = self.GetItemText(event.GetItem())
+        if type(item) == str and item in ("Raster Map", "Vector Map" , "DBF"):
+            event.Veto()             #disable editing of parent items
+
+    def OnEndRename(self,event):
+	    """
+	    Rename mapset using grass commands
+	    """
+	    item = event.GetItem()
+	    oldName = self.GetItemText(item) 
+	    try:
+		    newName =  self.GetEditControl().GetValue()
+	    except:
+		    return
+	    parent =self.GetItemParent(item)
+	    if self.GetItemText(parent) == "Raster Map" :
+		    cmdflag = 'rast=' +  oldName + ',' + newName
+	    elif self.GetItemText(parent) == "Vector Map" :
+		    cmdflag = 'vect=' +  oldName + ',' + newName
+
+	    if cmdflag:
+		    command = ["g.rename", cmdflag]
+		    gcmd.CommandThread(command,stdout=None,stderr=None).run()
+
+
+
+    def OnTreePopUp(self,event):
+        """
+        Display a popupMenu for copy,rename & delete operations
+        """
+        item =  event.GetItem()
+        if not self.ItemHasChildren(item) and \
+               self.GetItemFont(item) != self.itemFont:
+
+            self.popupmenu = wx.Menu()
+            mnuCopy = self.popupmenu.Append(self.ID_COPY,'&Copy\tCtrl+C')
+            mnuRename = self.popupmenu.Append(self.ID_REN,'&Rename\tCtrl-R')
+            mnuDel = self.popupmenu.Append(self.ID_DEL,'&Delete\tDEL')
+            mnuOssim = self.popupmenu.Append(self.ID_OSSIM,'&send to OssimPlanet')
+            self.PopupMenu(self.popupmenu)
+
+
+    def OnCopy( self,event ):
+        #print "copy"
+	    item =  self.GetSelection()
+	    parent = self.GetItemParent(item)
+	    pText = self.GetItemText(parent)
+	    name = self.GetCopyName(item)
+	    if pText == "Raster Map" :
+		    cmdflag = 'rast=' + self.GetItemText(item) + ',' + name
+		    self.PrependItem(parent=parent,text=name,ct_type=1)
+	    elif pText  == "Vector Map" :
+		    cmdflag = 'vect=' + self.GetItemText(item) + ',' + name
+		    self.PrependItem(parent=parent,text=name,ct_type=1)
+
+	    if cmdflag:
+		    command = ["g.copy", cmdflag]
+		    gcmd.CommandThread(command,stdout=None,stderr=None).run()
+
+
+    def GetCopyName(self, item):
+	    """
+	    Returns unique name depending on the mapname to be copied.
+	    """
+
+	    def GetPrefix(prefix):
+		    """
+		    This returns a prefix to the given map name 
+		    prefix applied here is _copy_x.
+		    """
+
+		    prefix = "_copy_" + str(self.count)
+		    self.count = self.count + 1
+		    return prefix
+        
+            #end of GetPrefix
+
+	    def CheckName(parent,prefix,name):
+		    """
+		    Checks all silbings of the parent wheather the name 
+		    already exists.
+		    """
+		    ncount = self.GetChildrenCount(parent, False)
+		    ck = 1
+		    current , ck = self.GetFirstChild(parent)
+		    for i in range(ncount):
+			    if str(self.GetItemText(current)) == str(name + prefix):
+				    return False
+			    else:
+				    current,ck = self.GetNextChild(parent,ck)
+		    return True
+            
+            #End of CheckName
+
+        #GetCopyName function starts here
+	    ext = None	
+	    self.count  = 1
+	    ext = GetPrefix(ext)
+	    name = str(self.GetItemText(item))
+	    parent = self.GetItemParent(item)
+	    while  CheckName(parent,ext,name) == False:
+		    ext = GetPrefix(ext)
+		    CheckName(parent,ext,name)
+
+	    name = str(name + ext)
+	    return name
+
+
+    def OnRename( self,event ):
+
+        item = self.GetSelection()
+        self.EditLabel( self.GetSelection())
+
+
+    def OnDelete( self,event ):
+        """
+        Performs grass command for deleting a map
+        """
+        item =  self.GetSelection()
+        dlg = wx.MessageDialog(self, message=_(    "Do you want to delete selected map ?"),
+                            caption=_("Delete Map"),
+                            style=wx.YES_NO | wx.YES_DEFAULT | \
+                                wx.CANCEL | wx.ICON_QUESTION)
+        ret = dlg.ShowModal()
+        if ret == wx.ID_YES:
+            dlg.Destroy()
+            parent  =self.GetItemParent(item) 
+            if self.GetItemText(parent) == "Raster Map" :
+                cmdflag = 'rast=' + str(self.GetItemText(item))
+            elif self.GetItemText(parent) == "Vector Map" :
+                cmdflag = 'vect=' + str(self.GetItemText(item))
+
+            if cmdflag:
+                command = ["g.remove", cmdflag]
+                gcmd.CommandThread(command,stdout=None,stderr=None).run()
+                select = self.GetPrevSibling(item)
+                self.Delete(item)
+                #self.SelectItem(select)
+
+        elif ret == wx.ID_CANCEL:
+         dlg.Destroy()
+         return
+
+    def OnOssim( self,event ):
+        """
+        Performs grass command for deleting a map
+        """
+        item =  self.GetSelection()
+        
+        parent  =self.GetItemParent(item) 
+        if self.GetItemText(parent) == "Raster Map" :
+            cmdflag = 'r.planet.py -a map=' + str(self.GetItemText(item))
+        elif self.GetItemText(parent) == "Vector Map" :
+            cmdflag = 'v.planet.py -a map=' + str(self.GetItemText(item))
+
+        if cmdflag:
+            
+            #command = ["r.planet.py", cmdflag]
+            #gcmd.CommandThread(command,stdout=None,stderr=None).run()
+            current = OssimPlanet(cmdflag)
+            current.start()
+
+        
+
+    def OnDisplay(self, event):
+
+        item =  event.GetItem()
+        pText = self.GetItemText(self.GetItemParent(item)) 
+        
+
+
+class OssimPlanet(Thread):
+   def __init__ (self,cmd):
+      Thread.__init__(self)
+      self.cmd =  cmd
+   def run(self):
+      os.system(self.cmd)	
+
+
+

Added: grass-addons/gui/wxpython/data_catalog/README
===================================================================
--- grass-addons/gui/wxpython/data_catalog/README	                        (rev 0)
+++ grass-addons/gui/wxpython/data_catalog/README	2010-04-23 16:01:07 UTC (rev 42008)
@@ -0,0 +1,6 @@
+To run DataCatalog
+from grass shell type:
+
+python catalog.py
+
+To send files to ossimplanet please download r.planet and v.planet and copy it in application directory

Added: grass-addons/gui/wxpython/data_catalog/catalog.py
===================================================================
--- grass-addons/gui/wxpython/data_catalog/catalog.py	                        (rev 0)
+++ grass-addons/gui/wxpython/data_catalog/catalog.py	2010-04-23 16:01:07 UTC (rev 42008)
@@ -0,0 +1,2159 @@
+"""
+ at package catalog.py
+
+GRASS DataCatalog.
+
+ at breif A GRASS GIS data manager used to copy,rename,delete,
+display maps in different mapsets and locations.
+
+Classes:
+ - DataCatalog
+ - CatalogApp
+
+(C) 2007 by the GRASS Development Team
+This program is free software under the GNU General Public
+License (>=v2). Read the file COPYING that comes with GRASS
+for details.
+
+ at author Mohammed Rashad K.M <rashadkm at gmail dot com>
+
+"""
+
+import sys
+import os
+import time
+import traceback
+import re
+import string
+import getopt
+import platform
+import shlex
+
+try:
+    import xml.etree.ElementTree as etree
+except ImportError:
+    import elementtree.ElementTree as etree 
+
+
+gbase = os.getenv("GISBASE") 
+pypath = os.path.join(gbase,'etc','wxpython')
+sys.path.append(pypath)
+
+
+
+import gui_modules
+gmpath = gui_modules.__path__[0]
+sys.path.append(gmpath)
+
+import images
+imagepath = images.__path__[0]
+sys.path.append(imagepath)
+
+import icons
+gmpath = icons.__path__[0]
+sys.path.append(gmpath)
+
+
+#To run DataCatalog from any directory set this pathname for access to gui_modules 
+gbase = os.getenv("GISBASE") 
+pypath = os.path.join(gbase,'etc','wxpython','gui_modules')
+sys.path.append(pypath)
+
+
+import globalvar
+if not os.getenv("GRASS_WXBUNDLED"):
+    globalvar.CheckForWx()
+import wx
+import gcmd
+import glob
+import render
+import gui_modules.gdialogs as gdialogs
+import gui_modules.goutput as goutput
+import gui_modules.histogram as histogram
+from   gui_modules.debug import Debug
+import gui_modules.menuform as menuform
+import gui_modules.menudata as menudata
+
+import gui_modules.utils as utils
+import gui_modules.preferences as preferences
+import gui_modules.mapdisp as mapdisp
+import gui_modules.histogram as histogram
+import gui_modules.profile as profile
+import gui_modules.rules as rules
+import gui_modules.mcalc_builder as mapcalculator
+import gui_modules.gcmd as gcmd
+import gui_modules.georect as georect
+import gui_modules.dbm as dbm
+import gui_modules.workspace as workspace
+import gui_modules.colorrules as colorrules
+
+version = os.getenv("GRASS_VERSION")
+if version == "6.5.svn":
+    import gui_modules.menu as menu
+    import gui_modules.gmodeler as gmodeler
+
+#import gui_modules.ogc_services as ogc_services
+
+#from   gui_modules.help import MenuTreeWindow
+#from   gui_modules.help import AboutWindow
+from   icons.icon import Icons
+
+#from gmconsole import GLog
+from mapdisplay import MapFrame
+from LayerTree import LayerTree
+import wx.lib.flatnotebook as FN
+from   icons.icon import Icons
+from preferences import globalSettings as UserSettings
+import render
+import gc
+
+class DataCatalog(wx.Frame):
+
+
+    def __init__(self, parent=None, id=wx.ID_ANY, title=_("Data Catalog Beta"),
+                 workspace=None,size=wx.DefaultSize,pos=wx.DefaultPosition):
+
+       
+        self.iconsize  = (16, 16)
+        self.baseTitle = title
+
+        wx.Frame.__init__(self, parent, id, title, pos=pos, size=size)
+ 
+
+        #self.Maximize()
+
+        self.dict = {}
+
+
+        self.gisbase  = os.getenv("GISBASE")
+        self.gisrc  = self.read_gisrc()
+        self.viewInfo = True        #to display v/r.info on mapdisplay
+        self.gisdbase = self.gisrc['GISDBASE'] 
+
+        #backup location and mapset from gisrc which may be modified  by datacatalog
+        self.iLocation = self.gisrc['LOCATION_NAME']
+        self.iMapset = self.gisrc['MAPSET']
+        
+
+        #self.Map = render.Map()
+
+        self.curr_pagenum  = -1           # currently selected page number for layer tree notebook
+        self.encoding      = 'ISO-8859-1' # default encoding for display fonts
+        self.workspaceFile = workspace    # workspace file
+        self.menucmd       = dict()       # menuId / cmd
+        self.georectifying = None         # reference to GCP class or None
+
+        self.dialogs        = dict()
+        self.dialogs['preferences'] = None
+        self.dialogs['atm'] = list()
+
+
+
+        self.g_catalog=None
+
+        self.locationchange = True
+
+        self.menucmd       = dict() 
+        
+        self.mapfile = []  
+        self.mapname = None
+        self.cmd = None
+        self.newmap = None
+
+
+     #creating sizers    
+        self.cmbSizer = wx.BoxSizer(wx.HORIZONTAL) 
+        self.mSizer = wx.BoxSizer(wx.VERTICAL)
+
+        #these two sizers are applied to splitter window
+        self.leftSizer = wx.BoxSizer(wx.HORIZONTAL)
+        self.rightSizer = wx.BoxSizer(wx.HORIZONTAL)
+
+        #populate location combobox
+        self.loclist = self.GetLocations()
+        self.loclist.sort()
+
+        #self.pg_panel4 = None
+        version = os.getenv("GRASS_VERSION")
+        if version == "6.5.svn":
+            self.menubar = menu.Menu(parent = self, data = menudata.ManagerData())
+        else:
+            self.menubar, self.menudata = self.__createMenuBar()
+        #self.statusbar = self.CreateStatusBar(number=1)
+        #self.cmdprompt, self.cmdinput = self.__createCommandPrompt()
+        self.toolbar   = self.__createToolBar()
+
+        #setting splitter window
+
+        self.cmbPanel = wx.Panel(self,name="cmbpanel")
+
+
+        self.maptree = None
+        self.pg_panel = None
+        self.cb_loclist = []
+        self.cb_maplist = []
+        self.cb_mapfile = []
+        
+        #creating controls
+        #self.mInfo = wx.TextCtrl(self.pRight, wx.ID_ANY, style = wx.TE_MULTILINE|wx.HSCROLL|wx.TE_READONLY)
+        #self.chkInfo = wx.CheckBox(self.cmbPanel, wx.ID_ANY,"display Info", wx.DefaultPosition, wx.DefaultSize)
+        self.treeExpand = wx.CheckBox(self.cmbPanel, wx.ID_ANY,"Expand All", wx.DefaultPosition, wx.DefaultSize)
+        self.cmbLocation = wx.ComboBox(self.cmbPanel, value = "Select Location",size=wx.DefaultSize, choices=self.loclist)
+        self.cmbMapset = wx.ComboBox(self.cmbPanel, value = "Select Mapset", size=wx.DefaultSize)	
+        #self.tree = wx.TreeCtrl(self.pLeft, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.TR_HIDE_ROOT|wx.TR_HAS_BUTTONS|wx.TR_EDIT_LABELS)
+
+
+
+        self.itemFont = wx.Font(pointSize=9,weight=0, family=wx.FONTFAMILY_DEFAULT ,style=wx.FONTSTYLE_ITALIC)
+
+        
+        self.notebook  = self.__createNoteBook()
+        self.cmdprompt = self.__createCommandPrompt()
+
+       # self._mgr = self.pg_panel._layerManager
+
+#        self._mgr.AddPane(self.cmdprompt, wx.aui.AuiPaneInfo().CentrePane().Dockable(False).BestSize((-1,-1)).CloseButton(False).DestroyOnClose(True). Layer(0))
+
+        self.current = self.notebook.GetCurrentPage()    
+ 
+
+        self.goutput = goutput.GMConsole(self, pageid=1)
+        self.goutput.Hide()
+
+    
+       # self.ltree = LayerTree(self.pLeft,wx.ID_ANY,gisdbase=self.gisdbase,frame=self.pg_panel)
+
+        self.doBindings()
+        self.doLayout()
+
+        self.cmbSizer.Add(self.cmdprompt)
+
+        self.Map =    self.GetMapDisplay()
+
+        
+
+
+
+
+    def GetMapDisplay(self):
+        self.panel = self.notebook.GetCurrentPage()
+        return self.panel.Map
+                            
+
+    def __createMenuBar(self):
+        """!Creates menubar"""
+
+        self.menubar = wx.MenuBar()
+        version = os.getenv("GRASS_VERSION")
+        if version == "6.5.svn":
+            self.menudata = menudata.ManagerData()
+        else:
+            self.menudata = menudata.Data()        
+        for eachMenuData in self.menudata.GetMenu():
+            for eachHeading in eachMenuData:
+                menuLabel = eachHeading[0]
+                menuItems = eachHeading[1]
+                self.menubar.Append(self.__createMenu(menuItems), menuLabel)
+
+        self.SetMenuBar(self.menubar)
+
+        return (self.menubar, self.menudata)
+
+    def __createCommandPrompt(self):
+        """!Creates command-line input area"""
+        self.cmdprompt = wx.Panel(self)
+
+        button = wx.Button(parent=self.cmdprompt, id=wx.ID_ANY, label="Cmd >",
+                            size=(70,23))
+        button.SetToolTipString(_("Click for erasing command prompt"))
+	# label.SetFont(wx.Font(pointSize=11, family=wx.FONTFAMILY_DEFAULT,
+        #                      style=wx.NORMAL, weight=wx.BOLD))
+        self.cinput = wx.TextCtrl(parent=self.cmdprompt, id=wx.ID_ANY,
+                            value="",
+                            style= wx.TE_PROCESS_ENTER,
+                            size=(250,20))
+
+        #cinput.SetFont(wx.Font(10, wx.FONTFAMILY_MODERN, wx.NORMAL, wx.NORMAL, 0, ''))
+
+        wx.CallAfter(self.cinput.SetInsertionPoint, 0)
+
+        self.Bind(wx.EVT_TEXT_ENTER, self.OnRunCmd,   self.cinput)
+        self.Bind(wx.EVT_BUTTON,     self.OnCmdClear,      button)
+        #self.Bind(wx.EVT_TEXT,       self.OnUpdateStatusBar, input)
+
+        # layout
+        sizer = wx.BoxSizer(wx.HORIZONTAL)
+        sizer.Add(item=button, proportion=0,
+                  flag=wx.EXPAND | wx.ALL | wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_CENTER,
+                  border=4)
+        sizer.Add(item=self.cinput, proportion=1,
+                  flag=wx.EXPAND | wx.ALL,
+                  border=1)
+
+        self.cmdprompt.SetSizer(sizer)
+        #sizer.Fit(self.cmdprompt)
+        self.cmdprompt.Layout()
+
+        return self.cmdprompt
+
+
+    def OnCmdClear(self,event):
+        self.cinput.SetValue('')
+        self.cinput.SetFocus()
+
+    def __createMenu(self, menuData):
+        """!Creates menu"""
+
+        menu = wx.Menu()
+        for eachItem in menuData:
+            if len(eachItem) == 2:
+                label = eachItem[0]
+                subMenu = self.__createMenu(eachItem[1])
+                menu.AppendMenu(wx.ID_ANY, label, subMenu)
+            else:
+                version = os.getenv("GRASS_VERSION")
+                if version == "6.4.0svn":
+                    self.__createMenuItem(menu, *eachItem)
+                else:
+                    self.__createMenuItem7(menu, *eachItem)
+        self.Bind(wx.EVT_MENU_HIGHLIGHT_ALL, self.OnMenuHighlight)
+        return menu
+
+#    def __createMenuItem(self, menu, label, help, handler, gcmd, keywords, shortcut = '', kind = wx.ITEM_NORMAL):
+    def __createMenuItem(self, menu, label, help, handler, gcmd, kind=wx.ITEM_NORMAL):
+        """Creates menu items"""
+
+        if not label:
+            menu.AppendSeparator()
+            return
+
+        if len(gcmd) > 0:
+            helpString = gcmd + ' -- ' + help
+        else:
+            helpString = help
+
+        menuItem = menu.Append(wx.ID_ANY, label, helpString, kind)
+        
+        self.menucmd[menuItem.GetId()] = gcmd
+
+        if len(gcmd) > 0 and \
+                gcmd.split()[0] not in globalvar.grassCmd['all']:
+            menuItem.Enable (False)
+
+        rhandler = eval(handler)
+
+        self.Bind(wx.EVT_MENU, rhandler, menuItem)
+
+    def __createMenuItem7(self, menu, label, help, handler, gcmd, keywords, shortcut = '', kind = wx.ITEM_NORMAL):
+        """!Creates menu items"""
+
+        if not label:
+            menu.AppendSeparator()
+            return
+
+        if len(gcmd) > 0:
+            helpString = gcmd + ' -- ' + help
+        else:
+            helpString = help
+        
+        if shortcut:
+            label += '\t' + shortcut
+        
+        menuItem = menu.Append(wx.ID_ANY, label, helpString, kind)
+
+        self.menucmd[menuItem.GetId()] = gcmd
+
+        if len(gcmd) > 0 and \
+                gcmd.split()[0] not in globalvar.grassCmd['all']:
+            menuItem.Enable (False)
+
+        rhandler = eval(handler)
+
+        self.Bind(wx.EVT_MENU, rhandler, menuItem)
+
+
+
+
+
+    def OnXTermNoXMon(self, event):
+        """!
+        Run commands that need xterm
+        """
+        self.OnXTerm(event, need_xmon = False)
+        
+    def OnXTerm(self, event, need_xmon = True):
+        """!
+        Run commands that need interactive xmon
+
+        @param need_xmon True to start X monitor
+        """
+        # unset display mode
+        del os.environ['GRASS_RENDER_IMMEDIATE']
+        
+        if need_xmon:
+            # open next available xmon
+            xmonlist = []
+            
+            # make list of xmons that are not running
+            ret = gcmd.RunCommand('d.mon',
+                                  flags = 'L',
+                                  read = True)
+            
+            for line in ret.split('\n'):               
+                line = line.strip()
+                if line.startswith('x') and 'not running' in line:
+                    xmonlist.append(line[0:2])
+            
+            # find available xmon
+            xmon = xmonlist[0]
+            
+            # bring up the xmon
+            cmdlist = ['d.mon', xmon]
+            p = gcmd.Command(cmdlist, wait=False)
+        
+        # run the command        
+        command = self.GetMenuCmd(event)
+        command = ' '.join(command)
+        
+        gisbase = os.environ['GISBASE']
+        
+        if sys.platform == "win32":
+            runbat = os.path.join(gisbase,'etc','grass-run.bat')
+            cmdlist = ["start", runbat, runbat, command]
+        else:
+            if sys.platform == "darwin":
+                xtermwrapper = os.path.join(gisbase,'etc','grass-xterm-mac')
+            else:
+                xtermwrapper = os.path.join(gisbase,'etc','grass-xterm-wrapper')
+            
+            grassrun = os.path.join(gisbase,'etc','grass-run.sh')
+            cmdlist = [xtermwrapper, '-e', grassrun, command]
+        
+        p = gcmd.Command(cmdlist, wait=False)
+        
+        # reset display mode
+        os.environ['GRASS_RENDER_IMMEDIATE'] = 'TRUE'
+
+    def OnRunCmd(self, event):
+        """Run command"""
+        cmdString = event.GetString()
+
+        if cmdString[:2] == 'd.' and not self.current:
+            self.NewDisplay(show=True)
+        
+        cmd = shlex.split(str(cmdString))
+        if len(cmd) > 1:
+            self.goutput.RunCmd(cmd, switchPage=True)
+        else:
+            self.goutput.RunCmd(cmd, switchPage=False)
+        
+        self.OnUpdateStatusBar(None)
+
+
+    def OnUpdateStatusBar(self, event):
+        #if event is None:
+         #   self.statusbar.SetStatusText("")
+        #else:
+         #   self.statusbar.SetStatusText(_("Type GRASS command and run by pressing ENTER"))
+        print "asdf4"
+
+
+    def __createToolBar(self):
+        """!Creates toolbar"""
+
+        self.toolbar = self.CreateToolBar()
+        self.toolbar.SetToolBitmapSize(globalvar.toolbarSize)
+
+        for each in self.ToolbarData():
+            self.AddToolbarButton(self.toolbar, *each)
+        self.toolbar.Realize()
+
+        return self.toolbar
+
+    def OnMenuHighlight(self, event):
+        """
+        Default menu help handler
+        """
+         # Show how to get menu item info from this event handler
+        id = event.GetMenuId()
+        item = self.GetMenuBar().FindItemById(id)
+        if item:
+            text = item.GetText()
+            help = item.GetHelp()
+
+        # but in this case just call Skip so the default is done
+        event.Skip()
+
+        
+    def __createNoteBook(self):
+        """!Creates notebook widgets"""
+
+        #create main notebook widget
+        nbStyle = FN.FNB_FANCY_TABS | \
+            FN.FNB_BOTTOM | \
+            FN.FNB_NO_NAV_BUTTONS | \
+            FN.FNB_NO_X_BUTTON
+        
+
+        self.disp_idx = -1
+  
+
+        # create displays notebook widget and add it to main notebook page
+        cbStyle = globalvar.FNPageStyle
+        self.notebook = FN.FlatNotebook(parent=self, id=wx.ID_ANY, style=cbStyle)
+        
+        self.notebook.SetTabAreaColour(globalvar.FNPageColor)
+
+       # self._lmgr=wx.aui.AuiManager(self)
+        self.pg_panel = MapFrame(parent=self.notebook, id=wx.ID_ANY, Map=render.Map(),  size=globalvar.MAP_WINDOW_SIZE,frame=self,flag=True,gismgr=self)
+        
+        self.disp_idx = self.disp_idx + 1
+        self.notebook.AddPage(self.pg_panel, text="Display "+ str(self.disp_idx), select = True)
+
+
+       # self.notebook.Bind(FN.EVT_FLATNOTEBOOK_PAGE_CHANGED, self.OnPageChanged)
+       # self.notebook.Bind(FN.EVT_FLATNOTEBOOK_PAGE_CLOSING, self.OnPageClosed)
+
+
+        self.notebook.Bind(FN.EVT_FLATNOTEBOOK_PAGE_CHANGED, self.OnCBPageChanged)
+        self.notebook.Bind(FN.EVT_FLATNOTEBOOK_PAGE_CLOSING, self.OnCBPageClosed)
+
+
+        return self.notebook
+
+    def OnPageChanged(self, event):
+        """!Page in notebook changed"""
+        pageno = event.GetSelection()
+        self.page = self.notebook.GetPage(pageno)
+        if page == self.goutput.pageid:
+            # remove '(...)'
+            self.notebook.SetPageText(page, _("Command output"))
+        
+        event.Skip()
+
+    def OnCBPageClosed(self, event):
+        """
+        Page of notebook closed
+        Also close associated map display
+        """
+        self.curr_page = self.notebook.GetCurrentPage()
+        if UserSettings.Get(group='manager', key='askOnQuit', subkey='enabled'):
+            maptree = self.curr_page.maptree
+            
+            if self.workspaceFile:
+                message = _("Do you want to save changes in the workspace?")
+            else:
+                message = _("Do you want to store current settings "
+                            "to workspace file?")
+            
+            # ask user to save current settings
+            if maptree.GetCount() > 0:
+                dlg = wx.MessageDialog(self,
+                                       message=message,
+                                       caption=_("Close Map Display %d") % (self.curr_pagenum + 1),
+                                       style=wx.YES_NO | wx.YES_DEFAULT |
+                                       wx.CANCEL | wx.ICON_QUESTION | wx.CENTRE)
+                ret = dlg.ShowModal()
+                if ret == wx.ID_YES:
+                    if not self.workspaceFile:
+                        self.OnWorkspaceSaveAs()
+                    else:
+                        self.SaveToWorkspaceFile(self.workspaceFile)
+                elif ret == wx.ID_CANCEL:
+                    event.Veto()
+                    dlg.Destroy()
+                    return
+                dlg.Destroy()
+        
+        self.notebook.GetPage(event.GetSelection()).maptree.Map.Clean()
+        self.notebook.GetPage(event.GetSelection()).maptree.Close(True)
+        self.disp_idx = self.disp_idx - 1
+        
+        self.curr_page = None
+        
+        event.Skip()
+
+    def OnCBPageChanged(self, event):
+        """!Page in notebook (display) changed"""
+
+
+        old_pgnum = event.GetOldSelection()
+        new_pgnum = event.GetSelection()
+
+        self.oldpage = self.notebook.GetPage(old_pgnum)
+
+       
+        self.curr_page   = self.notebook.GetCurrentPage()
+        self.curr_pagenum = self.notebook.GetSelection()
+
+
+
+  #      self.cmbMapset.SetValue(self.cb_loclist[self.disp_idx])
+ #       self.cmbLocation.SetValue(self.cb_loclist[self.disp_idx])
+#        self.disp_idx
+
+
+        index  = self.notebook.GetSelection()
+        self.page = self.notebook.GetPage(index)
+
+    
+
+        
+
+ #       print index
+#        print self.cb_mapfile
+        #import pdb
+       # pdb.set_trace()
+
+        try:
+            a_loc = str(self.cb_loclist[index])
+            a_map =  str(self.cb_maplist[index])
+          
+           # a_mapfile = self.cb_mapfile[index]
+
+        except IndexError:
+            a_loc = "Select Location"
+            a_map = "Select Mapset"
+
+        self.cmbLocation.SetValue(a_loc)
+        self.cmbMapset.SetValue(a_map)
+
+
+
+        try:
+            self.gisrc['LOCATION_NAME'] = self.cb_loclist[index]
+            self.gisrc['MAPSET'] = self.cb_maplist[index]
+
+
+        except:
+            pass
+        #self.page.Map.Region = self.page.Map.GetRegion()
+
+        self.update_grassrc(self.gisrc)
+    
+        
+        event.Skip()
+
+
+
+    def OnGeorectify(self, event):
+        """
+        Launch georectifier module
+        """
+        georect.GeorectWizard(self)
+
+
+    def OnGModeler(self, event):
+        """!Launch Graphical Modeler"""
+        win = gmodeler.ModelFrame(parent = self)
+        win.CentreOnScreen()
+        
+        win.Show()
+
+
+    def OnRunModel(self, event):
+        """!Run model"""
+        filename = ''
+        dlg = wx.FileDialog(parent = self, message=_("Choose model to run"),
+                            defaultDir = os.getcwd(),
+                            wildcard=_("GRASS Model File (*.gxm)|*.gxm"))
+        if dlg.ShowModal() == wx.ID_OK:
+            filename = dlg.GetPath()
+        
+        if not filename:
+            return
+        
+        self.model = gmodeler.Model()
+        self.model.LoadModel(filename)
+        self.SetStatusText(_('Validating model...'), 0)
+        result =  self.model.Validate()
+        if result:
+            dlg = wx.MessageDialog(parent = self,
+                                   message = _('Model is not valid. Do you want to '
+                                               'run the model anyway?\n\n%s') % '\n'.join(errList),
+                                   caption=_("Run model?"),
+                                   style = wx.YES_NO | wx.NO_DEFAULT |
+                                   wx.ICON_QUESTION | wx.CENTRE)
+            ret = dlg.ShowModal()
+            if ret != wx.ID_YES:
+                return
+        
+        self.SetStatusText(_('Running model...'), 0)
+        self.model.Run(log = self.goutput,
+                       onDone = self.OnDone)
+
+
+        
+    def OnMapsets(self, event):
+        """
+        Launch mapset access dialog
+        """
+        dlg = preferences.MapsetAccess(parent=self, id=wx.ID_ANY)
+        dlg.CenterOnScreen()
+
+        # if OK is pressed...
+        if dlg.ShowModal() == wx.ID_OK:
+            ms = dlg.GetMapsets()
+            # run g.mapsets with string of accessible mapsets
+            gcmd.RunCommand('g.mapsets',
+                            parent = self,
+                            mapset = '%s' % ','.join(ms))
+            
+    def OnRDigit(self, event):
+        """
+        Launch raster digitizing module
+        """
+        pass
+
+    def OnPageChanged(self,event):
+        self.current = self.notebook.GetPage(event.GetSelection())
+        #self.current = self.notebook.GetCurrentPage()
+        #self.current.Map = self.GetMapDisplay()
+        event.Skip()
+
+
+
+    def OnPageClosed(self, event):
+        """
+        Page of notebook closed
+        Also close associated map display
+        """
+
+
+#        if UserSettings.Get(group='manager', key='askOnQuit', subkey='enabled'):
+#            maptree = self.current.maptree
+#           
+#            if self.workspaceFile:
+#                message = _("Do you want to save changes in the workspace?")
+#            else:
+#                message = _("Do you want to store current settings "
+#                            "to workspace file?")
+#            
+#            # ask user to save current settings
+#            if maptree.GetCount() > 0:
+#                dlg = wx.MessageDialog(self,
+#                                       message=message,
+#                                       caption=_("Close Map Display %d") % (self.disp_idx),
+#                                       style=wx.YES_NO | wx.YES_DEFAULT |
+#                                       wx.CANCEL | wx.ICON_QUESTION | wx.CENTRE)
+#                ret = dlg.ShowModal()
+#                if ret == wx.ID_YES:
+#                    if not self.workspaceFile:
+#                        self.OnWorkspaceSaveAs()
+#                    else:
+#                        self.SaveToWorkspaceFile(self.workspaceFile)
+#                elif ret == wx.ID_CANCEL:
+#
+#                    event.Veto()
+#                    dlg.Destroy()
+#                    return
+#                dlg.Destroy()
+
+
+        self.notebook.GetPage(event.GetSelection()).maptree.Map.Clean()
+        self.disp_idx = self.disp_idx - 1
+        self.notebook.DeletePage(self.notebook.GetCurrentPage())
+        self.current = self.notebook.GetCurrentPage()
+        #self.current.Map.Clean()
+        event.Skip()
+
+        
+    def GetLogWindow(self):
+        """!Get widget for command output"""
+        return self.gmconsole.goutput
+    
+    def GetMenuCmd(self, event):
+        """!Get GRASS command from menu item
+
+        Return command as a list"""
+        layer = None
+        
+        if event:
+            cmd = self.menucmd[event.GetId()]
+        
+        try:
+            cmdlist = cmd.split(' ')
+        except: # already list?
+            cmdlist = cmd
+            
+        # check list of dummy commands for GUI modules that do not have GRASS
+        # bin modules or scripts. 
+        if cmd in ['vcolors']:
+            return cmdlist
+
+        try:
+            layer = self.current.maptree.layer_selected
+            name = self.current.maptree.GetPyData(layer)[0]['maplayer'].name
+            type = self.current.maptree.GetPyData(layer)[0]['type']
+        except:
+            layer = None
+        if layer and len(cmdlist) == 1: # only if no paramaters given
+            if (type == 'raster' and cmdlist[0][0] == 'r' and cmdlist[0][1] != '3') or \
+                    (type == 'vector' and cmdlist[0][0] == 'v'):
+                input = menuform.GUI().GetCommandInputMapParamKey(cmdlist[0])
+                if input:
+                    cmdlist.append("%s=%s" % (input, name))
+
+        return cmdlist
+
+    def RunMenuCmd(self, event):
+        """!Run command selected from menu"""
+        print "asdf"
+        #cmd = self.GetMenuCmd(event)
+        #goutput.GMConsole(self, pageid=1).RunCmd(cmd, switchPage=True)
+
+    def OnMenuCmd(self, event, cmd = ''):
+        """!Parse command selected from menu"""
+        if event:
+            cmd = self.GetMenuCmd(event)
+        menuform.GUI().ParseCommand(cmd, parentframe=self)
+
+    def OnChangeLocation(self, event):
+        """Change current location"""
+        pass
+                    
+    def OnChangeMapset(self, event):
+        """Change current mapset"""
+        pass
+        
+    def OnNewVector(self, event):
+        """!Create new vector map layer"""
+        name, add = gdialogs.CreateNewVector(self, cmd = (('v.edit',  { 'tool' : 'create' }, 'map')))
+        
+        if name and add:
+            # add layer to map layer tree
+            self.current.maptree.AddLayer(ltype='vector',
+                                            lname=name,
+                                            lchecked=True,
+                                            lopacity=1.0,
+                                            lcmd=['d.vect', 'map=%s' % name])
+           
+    def OnMenuTree(self, event):
+        """!Show dialog with menu tree"""
+        dlg = MenuTreeWindow(self)
+        dlg.CentreOnScreen()
+        dlg.Show()
+    
+    def OnAboutGRASS(self, event):
+        """!Display 'About GRASS' dialog"""
+        win = AboutWindow(self)
+        win.Centre()
+        win.Show(True)  
+        
+    def OnWorkspace(self, event):
+        """!Workspace menu (new, load)"""
+        point = wx.GetMousePosition()
+        menu = wx.Menu()
+
+        # Add items to the menu
+        new = wx.MenuItem(menu, wx.ID_ANY, Icons["workspaceNew"].GetLabel())
+        new.SetBitmap(Icons["workspaceNew"].GetBitmap(self.iconsize))
+        menu.AppendItem(new)
+        self.Bind(wx.EVT_MENU, self.OnWorkspaceNew, new)
+
+        load = wx.MenuItem(menu, wx.ID_ANY, Icons["workspaceLoad"].GetLabel())
+        load.SetBitmap(Icons["workspaceLoad"].GetBitmap(self.iconsize))
+        menu.AppendItem(load)
+        self.Bind(wx.EVT_MENU, self.OnWorkspaceLoad, load)
+
+        # create menu
+        self.PopupMenu(menu)
+        menu.Destroy()
+
+#    def OnWorkspaceNew(self, event=None):
+#        """!Create new workspace file
+#
+#        Erase current workspace settings first"""
+#
+#        Debug.msg(4, "GMFrame.OnWorkspaceNew():")
+#        
+#        # start new map display if no display is available
+#        if not self.current:
+#            self.NewDisplay()
+#        
+#        maptree = self.current.maptree
+#        
+#        # ask user to save current settings
+#        if maptree.GetCount() > 0:
+#             dlg = wx.MessageDialog(self, message=_("Current workspace is not empty. "
+#                                                    "Do you want to store current settings "
+#                                                    "to workspace file?"),
+#                                    caption=_("Create new workspace?"),
+#                                    style=wx.YES_NO | wx.YES_DEFAULT | \
+#                                        wx.CANCEL | wx.ICON_QUESTION)
+#             ret = dlg.ShowModal()
+#             if ret == wx.ID_YES:
+#                 self.OnWorkspaceSaveAs()
+#             elif ret == wx.ID_CANCEL:
+#                 dlg.Destroy()
+#                 return
+#             
+#             dlg.Destroy()
+#        
+#        # delete all items
+#        maptree.DeleteAllItems()
+#        
+#        # add new root element
+#        maptree.root = maptree.AddRoot("Map Layers")
+#        self.current.maptree.SetPyData(maptree.root, (None,None))
+#        
+#        # no workspace file loaded
+#        self.workspaceFile = None
+#        self.SetTitle(self.baseTitle)
+
+
+    def OnWorkspaceNew(self, event = None):
+        """!Create new workspace file
+
+        Erase current workspace settings first
+        """
+        Debug.msg(4, "GMFrame.OnWorkspaceNew():")
+        
+        # start new map display if no display is available
+        if not self.curr_page:
+            self.NewDisplay()
+        
+        maptree = self.curr_page.maptree
+        
+        # ask user to save current settings
+        if self.workspaceFile and self.workspaceChanged:
+            self.OnWorkspaceSave()
+        elif self.workspaceFile is None and maptree.GetCount() > 0:
+             dlg = wx.MessageDialog(self, message=_("Current workspace is not empty. "
+                                                    "Do you want to store current settings "
+                                                    "to workspace file?"),
+                                    caption=_("Create new workspace?"),
+                                    style=wx.YES_NO | wx.YES_DEFAULT | \
+                                        wx.CANCEL | wx.ICON_QUESTION)
+             ret = dlg.ShowModal()
+             if ret == wx.ID_YES:
+                 self.OnWorkspaceSaveAs()
+             elif ret == wx.ID_CANCEL:
+                 dlg.Destroy()
+                 return
+             
+             dlg.Destroy()
+        
+        # delete all items
+        maptree.DeleteAllItems()
+        
+        # add new root element
+        maptree.root = maptree.AddRoot("Map Layers")
+        self.curr_page.maptree.SetPyData(maptree.root, (None,None))
+        
+        # no workspace file loaded
+        self.workspaceFile = None
+        self.workspaceChanged = False
+        self.SetTitle(self.baseTitle)
+
+        
+    def OnWorkspaceOpen(self, event=None):
+        """!Open file with workspace definition"""
+        dlg = wx.FileDialog(parent=self, message=_("Choose workspace file"),
+                            defaultDir=os.getcwd(), wildcard="*.gxw")
+
+        filename = ''
+        if dlg.ShowModal() == wx.ID_OK:
+            filename = dlg.GetPath()
+
+        if filename == '':
+            return
+
+        Debug.msg(4, "GMFrame.OnWorkspaceOpen(): filename=%s" % filename)
+
+        # delete current layer tree content
+        self.OnWorkspaceClose()
+        
+        self.LoadWorkspaceFile(filename)
+
+        self.workspaceFile = filename
+        self.SetTitle(self.baseTitle + " - " +  os.path.basename(self.workspaceFile))
+
+    def LoadWorkspaceFile(self, filename):
+        """!Load layer tree definition stored in GRASS Workspace XML file (gxw)
+
+        @todo Validate against DTD
+        
+        @return True on success
+        @return False on error
+        """
+        # dtd
+        dtdFilename = os.path.join(globalvar.ETCWXDIR, "xml", "grass-gxw.dtd")
+        
+        # parse workspace file
+        try:
+            gxwXml = workspace.ProcessWorkspaceFile(etree.parse(filename))
+        except Exception, err:
+            raise gcmd.GStdError(_("Reading workspace file <%(file)s> failed.\n"
+                                   "Invalid file, unable to parse XML document."
+                                   "\n\n%(err)s") % { 'file' : filename, 'err': err},
+                                 parent = self)
+        
+        busy = wx.BusyInfo(message=_("Please wait, loading workspace..."),
+                           parent=self)
+        wx.Yield()
+
+        #
+        # load layer manager window properties
+        #
+        if UserSettings.Get(group='workspace', key='posManager', subkey='enabled') is False:
+            if gxwXml.layerManager['pos']:
+                self.SetPosition(gxwXml.layerManager['pos'])
+            if gxwXml.layerManager['size']:
+                self.SetSize(gxwXml.layerManager['size'])
+        
+        #
+        # start map displays first (list of layers can be empty)
+        #
+        displayId = 0
+        mapdisplay = []
+        for display in gxwXml.displays:
+            mapdisplay.append(self.NewDisplay())
+            maptree = self.notebook.GetPage(displayId).maptree
+            
+            # set windows properties
+            mapdisplay[-1].SetProperties(render=display['render'],
+                                         mode=display['mode'],
+                                         showCompExtent=display['showCompExtent'],
+                                         constrainRes=display['constrainRes'],
+                                         projection=display['projection']['enabled'])
+
+            if display['projection']['enabled']:
+                if display['projection']['epsg']:
+                    UserSettings.Set(group = 'display', key = 'projection', subkey = 'epsg',
+                                     value = display['projection']['epsg'])
+                    if display['projection']['proj']:
+                        UserSettings.Set(group = 'display', key = 'projection', subkey = 'proj4',
+                                         value = display['projection']['proj'])
+            
+            # set position and size of map display
+            if UserSettings.Get(group='workspace', key='posDisplay', subkey='enabled') is False:
+                if display['pos']:
+                    mapdisplay[-1].SetPosition(display['pos'])
+                if display['size']:
+                    mapdisplay[-1].SetSize(display['size'])
+                    
+            # set extent if defined
+            if display['extent']:
+                w, s, e, n = display['extent']
+                maptree.Map.region = maptree.Map.GetRegion(w=w, s=s, e=e, n=n)
+                
+            mapdisplay[-1].Show()
+            
+            displayId += 1
+    
+        maptree = None 
+        selected = [] # list of selected layers
+        # 
+        # load list of map layers
+        #
+        for layer in gxwXml.layers:
+            display = layer['display']
+            maptree = self.notebook.GetPage(display).maptree
+            
+            newItem = maptree.AddLayer(ltype=layer['type'],
+                                       lname=layer['name'],
+                                       lchecked=layer['checked'],
+                                       lopacity=layer['opacity'],
+                                       lcmd=layer['cmd'],
+                                       lgroup=layer['group'],
+                                       lnviz=layer['nviz'],
+                                       lvdigit=layer['vdigit'])
+            
+            if layer.has_key('selected'):
+                if layer['selected']:
+                    selected.append((maptree, newItem))
+                else:
+                    maptree.SelectItem(newItem, select=False)
+            
+        for maptree, layer in selected:
+            if not maptree.IsSelected(layer):
+                maptree.SelectItem(layer, select=True)
+                maptree.layer_selected = layer
+                
+        busy.Destroy()
+        
+        if maptree:
+            # reverse list of map layers
+            maptree.Map.ReverseListOfLayers()
+
+        for mdisp in mapdisplay:
+            mdisp.MapWindow2D.UpdateMap()
+
+        return True
+
+    def OnWorkspaceLoad(self, event=None):
+        """!Load given map layers into layer tree"""
+        dialog = gdialogs.LoadMapLayersDialog(parent=self, title=_("Load map layers into layer tree"))
+
+        if dialog.ShowModal() == wx.ID_OK:
+            # start new map display if no display is available
+            if not self.current:
+                self.NewDisplay()
+
+            maptree = self.current.maptree
+            busy = wx.BusyInfo(message=_("Please wait, loading workspace..."),
+                               parent=self)
+            wx.Yield()
+
+            for layerName in dialog.GetMapLayers():
+                if dialog.GetLayerType() == 'raster':
+                    cmd = ['d.rast', 'map=%s' % layerName]
+                elif dialog.GetLayerType() == 'vector':
+                    cmd = ['d.vect', 'map=%s' % layerName]
+                newItem = maptree.AddLayer(ltype=dialog.GetLayerType(),
+                                           lname=layerName,
+                                           lchecked=True,
+                                           lopacity=1.0,
+                                           lcmd=cmd,
+                                           lgroup=None)
+
+            busy.Destroy()
+
+    def OnWorkspaceLoadGrcFile(self, event):
+        """!Load map layers from GRC file (Tcl/Tk GUI) into map layer tree"""
+        dlg = wx.FileDialog(parent=self, message=_("Choose GRC file to load"),
+                            defaultDir=os.getcwd(), wildcard="*.grc")
+
+        filename = ''
+        if dlg.ShowModal() == wx.ID_OK:
+            filename = dlg.GetPath()
+
+        if filename == '':
+            return
+
+        Debug.msg(4, "GMFrame.OnWorkspaceLoadGrcFile(): filename=%s" % filename)
+
+        # start new map display if no display is available
+        if not self.current:
+            self.NewDisplay()
+
+        busy = wx.BusyInfo(message=_("Please wait, loading workspace..."),
+                           parent=self)
+        wx.Yield()
+
+        maptree = None
+        for layer in workspace.ProcessGrcFile(filename).read(self):
+            maptree = self.gm_cb.GetPage(layer['display']).maptree
+            newItem = maptree.AddLayer(ltype=layer['type'],
+                                       lname=layer['name'],
+                                       lchecked=layer['checked'],
+                                       lopacity=layer['opacity'],
+                                       lcmd=layer['cmd'],
+                                       lgroup=layer['group'])
+
+            busy.Destroy()
+            
+        if maptree:
+            # reverse list of map layers
+            maptree.Map.ReverseListOfLayers()
+
+    def OnWorkspaceSaveAs(self, event=None):
+        """!Save workspace definition to selected file"""
+
+        dlg = wx.FileDialog(parent=self, message=_("Choose file to save current workspace"),
+                            defaultDir=os.getcwd(), wildcard="*.gxw", style=wx.FD_SAVE)
+
+        filename = ''
+        if dlg.ShowModal() == wx.ID_OK:
+            filename = dlg.GetPath()
+
+        if filename == '':
+            return False
+
+        # check for extension
+        if filename[-4:] != ".gxw":
+            filename += ".gxw"
+
+        if os.path.exists(filename):
+            dlg = wx.MessageDialog(self, message=_("Workspace file <%s> already exists. "
+                                                   "Do you want to overwrite this file?") % filename,
+                                   caption=_("Save workspace"), style=wx.YES_NO | wx.YES_DEFAULT | wx.ICON_QUESTION)
+            if dlg.ShowModal() != wx.ID_YES:
+                dlg.Destroy()
+                return False
+
+        Debug.msg(4, "GMFrame.OnWorkspaceSaveAs(): filename=%s" % filename)
+
+        self.SaveToWorkspaceFile(filename)
+        self.workspaceFile = filename
+        self.SetTitle(self.baseTitle + " - " + os.path.basename(self.workspaceFile))
+
+    def OnWorkspaceSave(self, event=None):
+        """!Save file with workspace definition"""
+
+        if self.workspaceFile:
+            dlg = wx.MessageDialog(self, message=_("Workspace file <%s> already exists. "
+                                                   "Do you want to overwrite this file?") % \
+                                       self.workspaceFile,
+                                   caption=_("Save workspace"), style=wx.YES_NO | wx.YES_DEFAULT | wx.ICON_QUESTION)
+            if dlg.ShowModal() == wx.ID_NO:
+                dlg.Destroy()
+            else:
+                Debug.msg(4, "GMFrame.OnWorkspaceSave(): filename=%s" % self.workspaceFile)
+                self.SaveToWorkspaceFile(self.workspaceFile)
+        else:
+            self.OnWorkspaceSaveAs()
+
+    def SaveToWorkspaceFile(self, filename):
+        """!Save layer tree layout to workspace file
+
+        Return True on success, False on error
+        """
+
+        try:
+            file = open(filename, "w")
+        except IOError:
+            wx.MessageBox(parent=self,
+                          message=_("Unable to open workspace file <%s> for writing.") % filename,
+                          caption=_("Error"), style=wx.OK | wx.ICON_ERROR | wx.CENTRE)
+            return False
+
+        try:
+            workspace.WriteWorkspaceFile(lmgr=self, file=file)
+        except StandardError, e:
+            file.close()
+            wx.MessageBox(parent=self,
+                          message=_("Writing current settings to workspace file failed (%s)." % e),
+                          caption=_("Error"),
+                          style=wx.OK | wx.ICON_ERROR | wx.CENTRE)
+            return False
+
+        file.close()
+        
+        return True
+    
+    def OnWorkspaceClose(self, event=None):
+        """!Close file with workspace definition
+
+        If workspace has been modified ask user to save the changes.
+        """
+
+        Debug.msg(4, "GMFrame.OnWorkspaceClose(): file=%s" % self.workspaceFile)
+        self.workspaceFile = None
+        self.SetTitle(self.baseTitle)
+
+        displays = []
+        for page in range(0, self.notebook.GetPageCount()):
+            displays.append(self.notebook.GetPage(page).maptree.mapdisplay)
+        
+        for display in displays:
+            display.OnCloseWindow(event)
+        
+        self.disp_idx = 0
+        self.curr_page = None
+        
+
+    def RulesCmd(self, event, cmd = ''):
+        """
+        Launches dialog for commands that need rules
+        input and processes rules
+        """
+        if event:
+            cmd = self.GetMenuCmd(event)
+                
+        if cmd[0] == 'r.colors' or cmd[0] == 'vcolors':
+            ctable = colorrules.ColorTable(self, cmd=cmd[0])
+            ctable.Show()
+        else:
+            dlg = rules.RulesText(self, cmd=cmd)
+            dlg.CenterOnScreen()
+            if dlg.ShowModal() == wx.ID_OK:
+                gtemp = utils.GetTempfile()
+                output = open(gtemp, "w")
+                try:
+                    output.write(dlg.rules)
+                finally:
+                    output.close()
+    
+                cmdlist = [cmd[0],
+                           'input=%s' % dlg.inmap,
+                           'output=%s' % dlg.outmap,
+                           'rules=%s' % gtemp]
+    
+                if dlg.overwrite == True:
+                    cmdlist.append('--o')
+    
+                dlg.Destroy()
+    
+                self.goutput.RunCmd(cmdlist)
+
+    def OnPreferences(self, event):
+        """!General GUI preferences/settings"""
+        if not self.dialogs['preferences']:
+            dlg = preferences.PreferencesDialog(parent=self)
+            self.dialogs['preferences'] = dlg
+            self.dialogs['preferences'].CenterOnScreen()
+
+        self.dialogs['preferences'].ShowModal()
+        
+    def DispHistogram(self, event):
+        """
+        Init histogram display canvas and tools
+        """
+        self.histogram = histogram.HistFrame(self,
+                                             id=wx.ID_ANY, pos=wx.DefaultPosition, size=(400,300),
+                                             style=wx.DEFAULT_FRAME_STYLE)
+
+        #show new display
+        self.histogram.Show()
+        self.histogram.Refresh()
+        self.histogram.Update()
+
+    def DispProfile(self, event):
+        """
+        Init profile canvas and tools
+        """
+        self.profile = profile.ProfileFrame(self,
+                                           id=wx.ID_ANY, pos=wx.DefaultPosition, size=(400,300),
+                                           style=wx.DEFAULT_FRAME_STYLE)
+        self.profile.Show()
+        self.profile.Refresh()
+        self.profile.Update()
+        
+    def DispMapCalculator(self, event):
+        """
+        Init map calculator for interactive creation of mapcalc statements
+        """
+        
+        self.mapcalculator = mapcalculator.MapCalcFrame(self, wx.ID_ANY, title='',
+                                                        dimension=2)
+
+    def Disp3DMapCalculator(self, event):
+        """
+        Init map calculator for interactive creation of mapcalc statements
+        """
+        
+        self.mapcalculator = mapcalculator.MapCalcFrame(self, wx.ID_ANY, title='',
+                                                        dimension=3)
+
+    def AddToolbarButton(self, toolbar, label, icon, help, handler):
+        """!Adds button to the given toolbar"""
+
+        if not label:
+            toolbar.AddSeparator()
+            return
+        tool = toolbar.AddLabelTool(id=wx.ID_ANY, label=label, bitmap=icon, shortHelp=help)
+        self.Bind(wx.EVT_TOOL, handler, tool)
+
+    def ToolbarData(self):
+
+        return   (
+                 ('newdisplay', Icons["newdisplay"].GetBitmap(),
+                  Icons["newdisplay"].GetLabel(), self.OnNewDisplay),
+                 ('', '', '', ''),
+                 ('workspaceLoad', Icons["workspaceLoad"].GetBitmap(),
+                  Icons["workspaceLoad"].GetLabel(), self.OnWorkspace),
+                 ('workspaceOpen', Icons["workspaceOpen"].GetBitmap(),
+                  Icons["workspaceOpen"].GetLabel(), self.OnWorkspaceOpen),
+                 ('workspaceSave', Icons["workspaceSave"].GetBitmap(),
+                  Icons["workspaceSave"].GetLabel(), self.OnWorkspaceSave),
+                 ('', '', '', ''),
+                 ('addrast', Icons["addrast"].GetBitmap(),
+                  Icons["addrast"].GetLabel(), self.OnAddRaster),
+                 ('addshaded', Icons["addshaded"].GetBitmap(),
+                  _("Add various raster-based map layers"), self.OnAddRasterMisc),
+                 ('addvect', Icons["addvect"].GetBitmap(),
+                  Icons["addvect"].GetLabel(), self.OnAddVector),
+                 ('addthematic', Icons["addthematic"].GetBitmap(),
+                  _("Add various vector-based map layer"), self.OnAddVectorMisc),
+                 ('addcmd',  Icons["addcmd"].GetBitmap(),
+                  Icons["addcmd"].GetLabel(),  self.OnAddCommand),
+                 ('addgrp',  Icons["addgrp"].GetBitmap(),
+                  Icons["addgrp"].GetLabel(), self.OnAddGroup),
+                 ('addovl',  Icons["addovl"].GetBitmap(),
+                  Icons["addovl"].GetLabel(), self.OnAddOverlay),
+                 ('delcmd',  Icons["delcmd"].GetBitmap(),
+                  Icons["delcmd"].GetLabel(), self.OnDeleteLayer),
+                 ('', '', '', ''),
+                 ('attrtable', Icons["attrtable"].GetBitmap(),
+                  Icons["attrtable"].GetLabel(), self.OnShowAttributeTable)
+                  )
+
+    def OnImportDxfFile(self, event):
+        """!Convert multiple DXF layers to GRASS vector map layers"""
+        dlg = gdialogs.MultiImportDialog(parent=self, type='dxf',
+                                         title=_("Import DXF layers"))
+        dlg.ShowModal()
+
+    def OnImportGdalLayers(self, event):
+        """!Convert multiple GDAL layers to GRASS raster map layers"""
+        dlg = gdialogs.MultiImportDialog(parent=self, type='gdal',
+                                         title=_("Import GDAL layers"))
+        dlg.ShowModal()
+
+    def OnLinkGdalLayers(self, event):
+        """!Link multiple GDAL layers to GRASS raster map layers"""
+        dlg = gdialogs.MultiImportDialog(parent=self, type='gdal',
+                                         title=_("Link GDAL layers"),
+                                         link = True)
+        dlg.ShowModal()
+        
+    def OnImportOgrLayers(self, event):
+        """!Convert multiple OGR layers to GRASS vector map layers"""
+        dlg = gdialogs.MultiImportDialog(parent=self, type='ogr',
+                                         title=_("Import OGR layers"))
+        dlg.ShowModal()
+    
+    def OnLinkOgrLayers(self, event):
+        """!Links multiple OGR layers to GRASS vector map layers"""
+        dlg = gdialogs.MultiImportDialog(parent=self, type='ogr',
+                                         title=_("Link OGR layers"),
+                                         link = True)
+        dlg.ShowModal()
+        
+    def OnImportWMS(self, event):
+        """!Import data from OGC WMS server"""
+        dlg = ogc_services.WMSDialog(parent = self, service = 'wms')
+        dlg.CenterOnScreen()
+        
+        if dlg.ShowModal() == wx.ID_OK: # -> import layers
+            layers = dlg.GetLayers()
+            
+            if len(layers.keys()) > 0:
+                for layer in layers.keys():
+                    cmd = ['r.in.wms',
+                           'mapserver=%s' % dlg.GetSettings()['server'],
+                           'layers=%s' % layer,
+                           'output=%s' % layer]
+                    styles = ','.join(layers[layer])
+                    if styles:
+                        cmd.append('styles=%s' % styles)
+                    self.goutput.RunCmd(cmd, switchPage = True)
+            else:
+                self.goutput.WriteWarning(_("Nothing to import. No WMS layer selected."))
+        
+        dlg.Destroy()
+        
+    def OnShowAttributeTable(self, event):
+        """
+        Show attribute table of the given vector map layer
+        """
+        if not self.current:
+            self.MsgNoLayerSelected()
+            return
+        
+        layer = self.current.maptree.layer_selected
+        # no map layer selected
+        if not layer:
+            self.MsgNoLayerSelected()
+            return
+        
+        # available only for vector map layers
+        try:
+            maptype = self.current.maptree.GetPyData(layer)[0]['maplayer'].type
+        except:
+            maptype = None
+        
+        if not maptype or maptype != 'vector':
+            wx.MessageBox(parent=self,
+                          message=_("Attribute management is available only "
+                                    "for vector maps."),
+                          caption=_("Message"),
+                          style=wx.OK | wx.ICON_INFORMATION | wx.CENTRE)
+            return
+        
+        if not self.current.maptree.GetPyData(layer)[0]:
+            return
+        dcmd = self.current.maptree.GetPyData(layer)[0]['cmd']
+        if not dcmd:
+            return
+        
+        busy = wx.BusyInfo(message=_("Please wait, loading attribute data..."),
+                           parent=self)
+        wx.Yield()
+        
+        dbmanager = dbm.AttributeManager(parent=self, id=wx.ID_ANY,
+                                         size=wx.Size(500, 300),
+                                         item=layer, log=self.goutput)
+        
+        busy.Destroy()
+        
+        # register ATM dialog
+        self.dialogs['atm'].append(dbmanager)
+        
+        # show ATM window
+        dbmanager.Show()
+        
+    def OnNewDisplay(self, event=None):
+        """!Create new layer tree and map display instance"""
+        self.NewDisplay()
+
+    def NewDisplay(self):
+        """!Create new layer tree, which will
+        create an associated map display frame
+
+        @param show show map display window if True
+
+        @return reference to mapdisplay intance
+        """
+        Debug.msg(1, "GMFrame.NewDisplay(): idx=%d" % self.disp_idx)
+
+        #wx.MessageBox(parent=self,
+        #              message=_("This part is under development. New display does not work when you change location and mapset"),
+         #             caption=_("Data Catalog"),
+         #             style=wx.OK | wx.ICON_INFORMATION | wx.CENTRE)
+
+        # make a new page in the bookcontrol for the layer tree (on page 0 of the notebook)
+
+        self.disp_idx = self.disp_idx + 1
+#        self.curr_pagenum  = self.disp_idx
+        self.locationchange = True
+
+#        self.cb_loclist.append( str(self.cmbLocation.GetValue()) )
+ #       self.cb_maplist.append( str(self.cmbMapset.GetValue()) )
+    
+        #print self.cb_maplist
+        #print self.cb_loclist
+
+        
+        self.page = MapFrame(parent=self.notebook, id=wx.ID_ANY, Map=render.Map(),  size=globalvar.MAP_WINDOW_SIZE,frame=self)
+        self.notebook.AddPage(self.page, text="Display "+ str(self.disp_idx), select = True)
+
+        self.current = self.notebook.GetCurrentPage()
+
+
+        
+
+    # toolBar button handlers
+    def OnAddRaster(self, event):
+        """!Add raster map layer"""
+        #create image list to use with layer tree
+        il = wx.ImageList(16, 16, mask=False)
+
+        trart = wx.ArtProvider.GetBitmap(wx.ART_FOLDER_OPEN, wx.ART_OTHER, (16, 16))
+        self.folder_open = il.Add(trart)
+        trart = wx.ArtProvider.GetBitmap(wx.ART_FOLDER, wx.ART_OTHER, (16, 16))
+        self.folder = il.Add(trart)
+
+        bmpsize = (16, 16)
+        trgif = Icons["addrast"].GetBitmap(bmpsize)
+        self.rast_icon = il.Add(trgif)
+
+        trgif = Icons["addrast3d"].GetBitmap(bmpsize)
+        self.rast3d_icon = il.Add(trgif)
+
+        trgif = Icons["addrgb"].GetBitmap(bmpsize)
+        self.rgb_icon = il.Add(trgif)
+        
+        trgif = Icons["addhis"].GetBitmap(bmpsize)
+        self.his_icon = il.Add(trgif)
+
+        trgif = Icons["addshaded"].GetBitmap(bmpsize)
+        self.shaded_icon = il.Add(trgif)
+
+        trgif = Icons["addrarrow"].GetBitmap(bmpsize)
+        self.rarrow_icon = il.Add(trgif)
+
+        trgif = Icons["addrnum"].GetBitmap(bmpsize)
+        self.rnum_icon = il.Add(trgif)
+
+        trgif = Icons["addvect"].GetBitmap(bmpsize)
+        self.vect_icon = il.Add(trgif)
+
+        trgif = Icons["addthematic"].GetBitmap(bmpsize)
+        self.theme_icon = il.Add(trgif)
+
+        trgif = Icons["addchart"].GetBitmap(bmpsize)
+        self.chart_icon = il.Add(trgif)
+
+        trgif = Icons["addgrid"].GetBitmap(bmpsize)
+        self.grid_icon = il.Add(trgif)
+
+        trgif = Icons["addgeodesic"].GetBitmap(bmpsize)
+        self.geodesic_icon = il.Add(trgif)
+
+        trgif = Icons["addrhumb"].GetBitmap(bmpsize)
+        self.rhumb_icon = il.Add(trgif)
+
+        trgif = Icons["addlabels"].GetBitmap(bmpsize)
+        self.labels_icon = il.Add(trgif)
+
+        trgif = Icons["addcmd"].GetBitmap(bmpsize)
+        self.cmd_icon = il.Add(trgif)
+
+#        self.current.maptree.AssignImageList(il)
+
+        
+        self.AddRaster(event)
+        
+    def OnAddRasterMisc(self, event):
+        """!Add raster menu"""
+        # start new map display if no display is available
+        if not self.current:
+            self.NewDisplay()
+
+        point = wx.GetMousePosition()
+        rastmenu = wx.Menu()
+
+        # add items to the menu
+        if self.current.maptree.mapdisplay.toolbars['nviz']:
+            addrast3d = wx.MenuItem(rastmenu, -1, Icons ["addrast3d"].GetLabel())
+            addrast3d.SetBitmap(Icons["addrast3d"].GetBitmap (self.iconsize))
+            rastmenu.AppendItem(addrast3d)
+            self.Bind(wx.EVT_MENU, self.AddRaster3d, addrast3d)
+
+        addshaded = wx.MenuItem(rastmenu, -1, Icons ["addshaded"].GetLabel())
+        addshaded.SetBitmap(Icons["addshaded"].GetBitmap (self.iconsize))
+        rastmenu.AppendItem(addshaded)
+        self.Bind(wx.EVT_MENU, self.AddShaded, addshaded)
+
+        addrgb = wx.MenuItem(rastmenu, -1, Icons["addrgb"].GetLabel())
+        addrgb.SetBitmap(Icons["addrgb"].GetBitmap(self.iconsize))
+        rastmenu.AppendItem(addrgb)
+        self.Bind(wx.EVT_MENU, self.AddRGB, addrgb)
+
+        addhis = wx.MenuItem(rastmenu, -1, Icons ["addhis"].GetLabel())
+        addhis.SetBitmap(Icons["addhis"].GetBitmap (self.iconsize))
+        rastmenu.AppendItem(addhis)
+        self.Bind(wx.EVT_MENU, self.AddHIS, addhis)
+
+        addrastarrow = wx.MenuItem(rastmenu, -1, Icons ["addrarrow"].GetLabel())
+        addrastarrow.SetBitmap(Icons["addrarrow"].GetBitmap (self.iconsize))
+        rastmenu.AppendItem(addrastarrow)
+        self.Bind(wx.EVT_MENU, self.AddRastarrow, addrastarrow)
+
+        addrastnums = wx.MenuItem(rastmenu, -1, Icons ["addrnum"].GetLabel())
+        addrastnums.SetBitmap(Icons["addrnum"].GetBitmap (self.iconsize))
+        rastmenu.AppendItem(addrastnums)
+        self.Bind(wx.EVT_MENU, self.AddRastnum, addrastnums)
+
+        # Popup the menu.  If an item is selected then its handler
+        # will be called before PopupMenu returns.
+        self.PopupMenu(rastmenu)
+        rastmenu.Destroy()
+        
+        # show map display
+        #self.curr_page.maptree.mapdisplay.Show()
+
+    def OnAddVector(self, event):
+        """!Add vector map layer"""
+        # start new map display if no display is available
+        if not self.current:
+            self.NewDisplay()
+        
+        self.AddVector(event)
+        
+    def OnAddVectorMisc(self, event):
+        """!Add vector menu"""
+        # start new map display if no display is available
+        if not self.current:
+            self.NewDisplay()
+
+        point = wx.GetMousePosition()
+        vectmenu = wx.Menu()
+        
+        addtheme = wx.MenuItem(vectmenu, -1, Icons["addthematic"].GetLabel())
+        addtheme.SetBitmap(Icons["addthematic"].GetBitmap(self.iconsize))
+        vectmenu.AppendItem(addtheme)
+        self.Bind(wx.EVT_MENU, self.AddThemeMap, addtheme)
+
+        addchart = wx.MenuItem(vectmenu, -1, Icons["addchart"].GetLabel())
+        addchart.SetBitmap(Icons["addchart"].GetBitmap(self.iconsize))
+        vectmenu.AppendItem(addchart)
+        self.Bind(wx.EVT_MENU, self.AddThemeChart, addchart)
+
+        # Popup the menu.  If an item is selected then its handler
+        # will be called before PopupMenu returns.
+        self.PopupMenu(vectmenu)
+        vectmenu.Destroy()
+
+        # show map display
+        #self.curr_page.maptree.mapdisplay.Show()
+
+    def OnAddOverlay(self, event):
+        """!Add overlay menu""" 
+        # start new map display if no display is available
+        if not self.curent:
+            self.NewDisplay()
+
+        point = wx.GetMousePosition()
+        ovlmenu = wx.Menu()
+
+        addgrid = wx.MenuItem(ovlmenu, wx.ID_ANY, Icons["addgrid"].GetLabel())
+        addgrid.SetBitmap(Icons["addgrid"].GetBitmap(self.iconsize))
+        ovlmenu.AppendItem(addgrid)
+        self.Bind(wx.EVT_MENU, self.AddGrid, addgrid)
+        
+        addlabels = wx.MenuItem(ovlmenu, wx.ID_ANY, Icons["addlabels"].GetLabel())
+        addlabels.SetBitmap(Icons["addlabels"].GetBitmap(self.iconsize))
+        ovlmenu.AppendItem(addlabels)
+        self.Bind(wx.EVT_MENU, self.OnAddLabels, addlabels)
+        
+        addgeodesic = wx.MenuItem(ovlmenu, wx.ID_ANY, Icons["addgeodesic"].GetLabel())
+        addgeodesic.SetBitmap(Icons["addgeodesic"].GetBitmap(self.iconsize))
+        ovlmenu.AppendItem(addgeodesic)
+        self.Bind(wx.EVT_MENU, self.AddGeodesic, addgeodesic)
+        
+        addrhumb = wx.MenuItem(ovlmenu, wx.ID_ANY, Icons["addrhumb"].GetLabel())
+        addrhumb.SetBitmap(Icons["addrhumb"].GetBitmap(self.iconsize))
+        ovlmenu.AppendItem(addrhumb)
+        self.Bind(wx.EVT_MENU, self.AddRhumb, addrhumb)
+
+        # Popup the menu.  If an item is selected then its handler
+        # will be called before PopupMenu returns.
+        self.PopupMenu(ovlmenu)
+        ovlmenu.Destroy()
+
+        # show map display
+        self.curr_page.maptree.mapdisplay.Show()
+
+    def AddRaster(self, event):
+        if not self.current:
+            self.NewDisplay()
+
+        self.current.maptree.AddLayer('raster') 
+
+    def AddRaster3d(self, event):
+        if not self.current:
+            self.NewDisplay()
+
+        self.current.maptree.AddLayer('3d-raster')
+
+    def AddRGB(self, event):
+        """!Add RGB layer"""
+        if not self.current:
+            self.NewDisplay()
+
+        self.current.maptree.AddLayer('rgb')
+
+    def AddHIS(self, event):
+        """!Add HIS layer"""
+        if not self.current:
+            self.NewDisplay()
+
+        self.current.maptree.AddLayer('his')
+
+    def AddShaded(self, event):
+        """!Add shaded relief map layer"""
+        if not self.current:
+            self.NewDisplay()
+
+        self.current.maptree.AddLayer('shaded')
+
+    def AddRastarrow(self, event):
+        """!Add raster flow arrows map"""
+        if not self.current:
+            self.NewDisplay()
+
+        self.current.maptree.AddLayer('rastarrow')
+
+    def AddRastnum(self, event):
+        """!Add raster map with cell numbers"""
+        if not self.current:
+            self.NewDisplay()
+
+        self.current.maptree.AddLayer('rastnum')
+
+    def AddVector(self, event):
+        """!Add vector layer"""
+        if not self.current:
+            self.NewDisplay()
+
+        self.current.maptree.AddLayer('vector')
+
+    def AddThemeMap(self, event):
+        """!Add thematic map layer"""
+        if not self.current:
+            self.NewDisplay()
+
+        self.current.maptree.AddLayer('thememap')
+
+    def AddThemeChart(self, event):
+        """!Add thematic chart layer"""
+        if not self.current:
+            self.NewDisplay()
+
+        self.current.maptree.AddLayer('themechart')
+
+    def OnAddCommand(self, event):
+        """!Add command line layer"""
+        if not self.current:
+            self.NewDisplay()
+
+        self.current.maptree.AddLayer('command')
+
+    def OnAddGroup(self, event):
+        """!Add layer group"""
+        if not self.current:
+            self.NewDisplay()
+
+        self.current.maptree.AddLayer('group')
+
+    def AddGrid(self, event):
+        """!Add layer grid"""
+        if not self.current:
+            self.NewDisplay()
+
+        self.current.maptree.AddLayer('grid')
+
+    def AddGeodesic(self, event):
+        """!Add layer geodesic"""
+        self.curr_page.maptree.AddLayer('geodesic')
+
+    def AddRhumb(self, event):
+        """!Add layer rhumb"""
+        if not self.current:
+            self.NewDisplay()
+
+        self.current.maptree.AddLayer('rhumb')
+
+    def OnAddLabels(self, event):
+        """!Add layer vector labels"""
+        if not self.current:
+            self.NewDisplay()
+
+        self.current.maptree.AddLayer('labels')
+
+    def OnDeleteLayer(self, event):
+        """
+        Delete selected map display layer in GIS Manager tree widget
+        """
+        if UserSettings.Get(group='manager', key='askOnRemoveLayer', subkey='enabled'):
+            layerName = ''
+            for item in self.current.maptree.GetSelections():
+                name = str(self.current.maptree.GetItemText(item))
+                idx = name.find('(opacity')
+                if idx > -1:
+                    layerName += '<' + name[:idx].strip(' ') + '>,\n'
+                else:
+                    layerName += '<' + name + '>,\n'
+            layerName = layerName.rstrip(',\n')
+            
+            if len(layerName) > 2: # <>
+                message = _("Do you want to remove map layer(s)\n%s\n"
+                            "from layer tree?") % layerName
+            else:
+                message = _("Do you want to remove selected map layer(s) "
+                            "from layer tree?")
+
+            dlg = wx.MessageDialog (parent=self, message=message,
+                                    caption=_("Remove map layer"),
+                                    style=wx.YES_NO | wx.YES_DEFAULT | wx.CANCEL | wx.ICON_QUESTION)
+
+            if dlg.ShowModal() in [wx.ID_NO, wx.ID_CANCEL]:
+                dlg.Destroy()
+                return
+
+            dlg.Destroy()
+
+        for layer in self.current.maptree.GetSelections():
+            self.current.maptree.Delete(layer) 
+
+
+
+        item = self.current.maptree.item
+        try:
+            self.current.maptree.item.properties.Close(True)
+        except:
+            pass
+
+        #if item != self.current.maptree.root:
+           # Debug.msg (3, "LayerTree.OnDeleteLayer(): name=%s" % \
+            #               (self.current.maptree.GetItemText(item)))
+       # else:
+         #   self.current.maptree.root = None
+
+        # unselect item
+        self.current.maptree.Unselect()
+        self.current.maptree.layer_selected = None
+
+        #try:
+       # if self.current.maptree.GetPyData(item)[0]['type'] != 'group':
+        nb =        self.notebook.GetCurrentPage()
+        #print nb.maptree
+        index = self.notebook.GetSelection()
+        try:
+            nb.Map.DeleteLayer( self.ltree.layer[index])
+            nb.maptree.layer.remove(self.ltree.layer[index])
+        except:
+            pass
+        
+        #except:
+         #   pass
+
+        # redraw map if auto-rendering is enabled
+        self.current.maptree.rerender = True
+        self.current.maptree.reorder = True
+        #if self.mapdisplay.statusbarWin['render'].GetValue():
+        #    print "*** Delete OnRender *****"
+        #    self.mapdisplay.OnRender(None)
+
+
+  #      if self.mapdisplay.toolbars['vdigit']:
+   #         self.mapdisplay.toolbars['vdigit'].UpdateListOfLayers (updateTool=True)
+
+        # update progress bar range (mapwindow statusbar)
+ #       self.mapdisplay.statusbarWin['progress'].SetRange(len(self.Map.GetListOfLayers(l_active=True)))
+
+        #self.current.Map.UpdateMap(render=True)
+
+        
+    def OnKey(self, event):
+        """!Check hotkey"""
+        try:
+            kc = chr(event.GetKeyCode())
+        except ValueError:
+            event.Skip()
+            return
+        
+        if event.AltDown():
+            if kc == 'R':
+                self.OnAddRaster(None)
+            elif kc == 'V':
+                self.OnAddVector(None)
+        
+        event.Skip()
+        
+    def OnCloseWindow(self, event):
+        """!Cleanup when wxGUI is quit"""
+        count = self.notebook.GetPageCount()
+        index = 0
+        while index < count:
+            self.current = self.notebook.GetPage(index)
+            self.current.Map.Clean()
+            index = index+1
+
+        self.notebook.DeleteAllPages()
+        self.Destroy()
+
+
+        
+    def MsgNoLayerSelected(self):
+        """!Show dialog message 'No layer selected'"""
+        wx.MessageBox(parent=self,
+                      message=_("No map layer selected. Operation cancelled."),
+                      caption=_("Message"),
+                      style=wx.OK | wx.ICON_INFORMATION | wx.CENTRE)
+          
+
+
+    def OnMapsetChange(self,event):
+        """
+        Create the tree nodes based on selected location and mapset.
+        Also update gisrc and grassrc files.
+        """
+       
+        self.page = self.notebook.GetCurrentPage()
+        
+        self.page.maptree.AddTreeNodes(self.cmbLocation.GetValue(),self.cmbMapset.GetValue())	
+        self.gisrc['LOCATION_NAME'] = str(self.cmbLocation.GetValue())
+        self.gisrc['MAPSET'] = str(self.cmbMapset.GetValue())
+        self.update_grassrc(self.gisrc)
+        
+
+        self.page = self.notebook.GetPage(self.notebook.GetSelection())
+        self.page.Map.__init__()	
+        self.page.Map.region = self.page.Map.GetRegion()
+        if version == "6.5.svn":
+            self.page.Map.projinfo = self.page.Map._projInfo()
+        else:
+            self.page.Map.projinfo = self.page.Map.ProjInfo()
+
+        self.page.Map.wind = self.page.Map.GetWindow()
+        
+        if self.locationchange == True:
+            self.cb_loclist.append( str(self.cmbLocation.GetValue()) )
+            self.cb_maplist.append( str(self.cmbMapset.GetValue()) )
+
+            #self.cb_mapfile.append( self.page.Map)
+            self.locationchange = False
+
+    
+
+    
+        
+             
+
+
+
+        
+    def OnRunScript():
+        print "for grass7"
+
+    def OnQuit():
+        print "for grass7"
+
+    def OnLocationChange(self,event):
+        """
+        Populate mapset combobox with selected location.
+        """
+
+
+
+        self.cmbMapset.Clear()
+        self.cmbMapset.SetValue("Select Mapset")
+        #self.ltree.DeleteAllItems()
+
+
+        maplists = self.GetMapsets(self.cmbLocation.GetValue())
+        for mapsets in maplists:
+	        self.cmbMapset.Append(str(mapsets))
+
+    def GetMapsets(self,location):
+        """
+        Read and returns all mapset int GRASS data directory.
+        """
+
+        maplist = []
+        for mapset in glob.glob(os.path.join(self.gisdbase, location, "*")):
+	        if os.path.isdir(mapset) and os.path.isfile(os.path.join(self.gisdbase, location, mapset, "WIND")):
+		        maplist.append(os.path.basename(mapset))
+        return maplist
+
+    def GetLocations(self):
+	    """
+	    Read and returns all locations int GRASS data directory.
+	    """
+	    loclist = []
+	    for location in glob.glob(os.path.join(self.gisdbase, "*")):
+		    if os.path.join(location, "PERMANENT") in glob.glob(os.path.join(location, "*")):
+			    loclist.append(os.path.basename(location))
+	    return loclist
+
+
+    def doBindings(self):
+        
+	    #Event bindings for combo boxes
+        self.Bind(wx.EVT_COMBOBOX,self.OnMapsetChange,self.cmbMapset)
+        self.Bind(wx.EVT_COMBOBOX,self.OnLocationChange,self.cmbLocation)
+
+        #Event bindings for tree -(display,popup,label edit.)
+        #self.Bind(wx.EVT_TREE_ITEM_ACTIVATED, self.ltree.OnDisplay,self.ltree)
+        #self.Bind(wx.EVT_TREE_ITEM_RIGHT_CLICK,self.ltree.OnTreePopUp,self.ltree)
+        #self.Bind(wx.EVT_TREE_END_LABEL_EDIT, self.ltree.OnEndRename,self.ltree)
+       # self.Bind(wx.EVT_TREE_BEGIN_LABEL_EDIT, self.ltree.OnBeginRename,self.ltree)
+
+	    #Event bindings for tree menu
+        #self.Bind(wx.EVT_MENU,self.ltree.OnCopy,id=self.ltree.ID_COPY)
+        #self.Bind(wx.EVT_MENU,self.ltree.OnRename,id=self.ltree.ID_REN)
+        #self.Bind(wx.EVT_MENU,self.ltree.OnDelete,id=self.ltree.ID_DEL)
+        #self.Bind(wx.EVT_MENU,self.ltree.OnOssim,id=self.ltree.ID_OSSIM)
+
+
+        self.Bind(wx.EVT_CLOSE,    self.OnCloseWindow)
+
+	    #Event bindings for v/r.info checkbox
+	    #self.Bind(wx.EVT_CHECKBOX, self.OnToggleInfo,self.chkInfo)
+	    #self.Bind(wx.EVT_CHECKBOX, self.OnToggleExpand,self.treeExpand)
+
+    def OnToggleExpand(self,event):
+        if self.treeExpand.IsChecked():
+            if not self.gmconsole:
+                self.gmconsole = GLog(parent=self)
+               # self.gmconsole.show()
+#                sys.exit(0)
+            else:
+                self.gmconsole.Raise()
+        else:
+            self.gmconsole.Destroy()
+ 
+    def doLayout(self):
+
+	    #combo panel sizers
+        self.cmbSizer.Add(self.cmbLocation)
+        self.cmbSizer.Add(self.cmbMapset)
+        self.cmbSizer.Add(self.treeExpand)
+        #splitter window sizers
+        self.mSizer.Add(self.cmbPanel,flag=wx.EXPAND)
+        #self.mSizer.Add(self.win, 1, wx.EXPAND)
+        #self.leftSizer.Add(self.ltree,1,wx.EXPAND)
+        self.mSizer.Add(self.notebook,1,wx.EXPAND)
+
+        self.cmbPanel.SetSizer(self.cmbSizer)
+        self.SetSizer(self.mSizer)
+       # self.pLeft.SetSizer(self.leftSizer)
+        #self.pRight.SetSizer(self.rightSizer)
+
+
+
+    def read_gisrc(self):
+	    """
+	    Read variables gisrc file
+	    """
+
+	    rc = {}
+
+	    gisrc = os.getenv("GISRC")
+
+	    if gisrc and os.path.isfile(gisrc):
+		    try:
+			    f = open(gisrc, "r")
+			    for line in f.readlines():
+				    key, val = line.split(":", 1)
+				    rc[key.strip()] = val.strip()
+		    finally:
+			    f.close()
+
+	    return rc
+
+    def update_grassrc(self,gisrc):
+        """
+        Update $HOME/.grassrc(6/7) and gisrc files
+        """
+        rc = os.getenv("GISRC")
+        version = os.getenv("GRASS_VERSION")
+        if version == "7.0.svn":
+            grassrc = os.path.join(os.getenv('HOME'), ".grassrc7.%s" % os.uname()[1])
+            if not os.access(grassrc, os.R_OK):
+                grassrc = os.path.join(os.getenv('HOME'), ".grassrc7")
+
+        else:
+            grassrc = os.path.join(os.getenv('HOME'), ".grassrc6.%s" % os.uname()[1])
+            if not os.access(grassrc, os.R_OK):
+                grassrc = os.path.join(os.getenv('HOME'), ".grassrc6")
+
+        if rc and os.path.isfile(rc):
+            try:
+	            f = open(rc, 'w')
+	            for key, val in gisrc.iteritems():
+	                f.write("%s: %s\n" % (key, val))
+            finally:
+	            f.close()
+
+        if grassrc and os.path.isfile(grassrc):
+            try:
+	            g = open(grassrc, 'w')
+	            for key, val in gisrc.iteritems():
+	                g.write("%s: %s\n" % (key, val))
+            finally:
+	                g.close()
+
+
+
+#End of DataCatalog class
+
+
+
+class CatalogApp(wx.App):
+
+    def OnInit(self):
+        self.catalog = DataCatalog()
+        self.catalog.Show()
+        self.catalog.Maximize()
+	return 1
+
+
+# end of class MapApp
+
+# Run the program
+if __name__ == "__main__":
+
+
+    #gc.enable()
+    #gc.set_debug(gc.DEBUG_LEAK)
+    #print gc.garbage
+    #gc.collect()
+
+    
+    g_catalog = CatalogApp(0)
+
+    g_catalog.MainLoop()
+
+    #sys.exit(0)	
+    
+
+
+
+
+

Added: grass-addons/gui/wxpython/data_catalog/mapdisplay.py
===================================================================
--- grass-addons/gui/wxpython/data_catalog/mapdisplay.py	                        (rev 0)
+++ grass-addons/gui/wxpython/data_catalog/mapdisplay.py	2010-04-23 16:01:07 UTC (rev 42008)
@@ -0,0 +1,4618 @@
+"""!
+ at package mapdisp.py
+
+ at brief GIS map display canvas, with toolbar for various display
+management functions, and additional toolbars (vector digitizer, 3d
+view).
+
+Can be used either from Layer Manager or as p.mon backend.
+
+Classes:
+- MapFrame
+- MapApp
+
+Usage:
+python mapdisp.py monitor-identifier /path/to/command/file
+
+(C) 2006-2009 by the GRASS Development Team
+This program is free software under the GNU General Public
+License (>=v2). Read the file COPYING that comes with GRASS
+for details.
+
+ at author Michael Barton
+ at author Jachym Cepicky
+ at author Martin Landa <landa.martin gmail.com>
+ at author Mohammed Rashad K.M <rashadkm at gmail dot com> (only modified for DataCatalog)
+"""
+
+import os
+import sys
+import glob
+import math
+import tempfile
+import copy
+import time
+
+
+
+gbase = os.getenv("GISBASE") 
+pypath = os.path.join(gbase,'etc','wxpython','gui_modules')
+sys.path.append(pypath)
+
+import globalvar
+if not os.getenv("GRASS_WXBUNDLED"):
+    globalvar.CheckForWx()
+import wx
+import wx.aui
+
+
+try:
+    import subprocess
+except:
+    CompatPath = os.path.join(globalvar.ETCWXDIR)
+    sys.path.append(CompatPath)
+    from compat import subprocess
+
+gmpath = os.path.join(globalvar.ETCWXDIR, "icons")
+sys.path.append(gmpath)
+
+grassPath = os.path.join(globalvar.ETCDIR, "python")
+sys.path.append(grassPath)
+
+import render
+import toolbars
+import menuform
+import gselect
+import disp_print
+import gcmd
+import dbm
+import histogram
+import profile
+import globalvar
+import utils
+import gdialogs
+import goutput
+from grass.script import core as grass
+from debug import Debug
+from preferences import globalSettings as UserSettings
+
+from LayerTree import LayerTree
+
+from threading import Thread
+
+
+
+import images
+imagepath = images.__path__[0]
+sys.path.append(imagepath)
+
+###
+### global variables
+###
+# for standalone app
+cmdfilename = None
+class Command(Thread):
+    """
+    Creates thread which will observe the command file and see, if
+    there is new command to be executed
+    """
+    def __init__ (self, parent, Map):
+        Thread.__init__(self)
+
+        global cmdfilename
+
+        self.parent = parent
+        self.map = Map
+        self.cmdfile = open(cmdfilename, "r")
+
+    def run(self):
+        """
+        Run this in thread
+        """
+        dispcmd = []
+        while 1:
+            self.parent.redraw = False
+            line = self.cmdfile.readline().strip()
+            if line == "quit":
+                break
+
+            if line:
+                try:
+                    Debug.msg (3, "Command.run(): cmd=%s" % (line))
+
+                    self.map.AddLayer(item=None, type="raster",
+                                      name='',
+                                      command=line,
+                                      l_opacity=1)
+
+                    self.parent.redraw =True
+
+                except Exception, e:
+                    print "Command Thread: ",e
+
+            time.sleep(0.1)
+
+        sys.exit()
+
+class MapWindow(object):
+    """
+    Abstract map window class
+
+    Parent for BufferedWindow class (2D display mode) and
+    GLWindow (3D display mode)
+    """
+    def __init__(self, parent, id=wx.ID_ANY,
+                 pos=wx.DefaultPosition,
+                 size=wx.DefaultSize,
+                 style=wx.NO_FULL_REPAINT_ON_RESIZE,
+                 Map=None, tree=None, gismgr=None):
+        self.parent = parent # MapFrame
+
+        #
+        # mouse attributes like currently pressed buttons, position on
+        # the screen, begin and end of dragging, and type of drawing
+        #
+        self.mouse = {
+            'l'    : False,
+            'r'    : False,
+            'm'    : False,
+            'begin': [0, 0], # screen coordinates
+            'end'  : [0, 0],
+            'use'  : "pointer",
+            'box'  : "point"
+            }
+        
+    def EraseMap(self):
+        """
+        Erase the canvas (virtual method)
+        """
+        pass
+
+    def UpdateMap(self):
+        """
+        Updates the canvas anytime there is a change to the
+        underlaying images or to the geometry of the canvas.
+        """
+        pass
+
+    def OnLeftDown(self, event):
+        pass
+
+    def OnLeftUp(self, event):
+        pass
+
+    def OnMouseMotion(self, event):
+        pass
+
+    def OnZoomToMap(self, event):
+        pass
+
+    def OnZoomToRaster(self, event):
+        pass
+
+    def GetSelectedLayer(self, type = 'layer', multi = False):
+        """
+        Get selected layer from layer tree
+
+        @param type 'item' / 'layer' / 'nviz'
+        @param multi return first selected layer or all
+        
+        @return layer / map layer properties / nviz properties
+        @return None / [] on failure
+        """
+        ret = []
+        if not self.tree or \
+                not self.tree.GetSelection():
+            if multi:
+                return []
+            else:
+                return None
+        
+        if multi and \
+                type == 'item':
+            return self.tree.GetSelections()
+        
+        for item in self.tree.GetSelections():
+            if not item.IsChecked():
+                if multi:
+                    continue
+                else:
+                    return None
+
+            if type == 'item': # -> multi = False
+                return item
+        
+            try:
+                if type == 'nviz':
+                    layer = self.tree.GetPyData(item)[0]['nviz']
+                else:
+                    layer = self.tree.GetPyData(item)[0]['maplayer']
+            except:
+                layer = None
+
+            if multi:
+                ret.append(layer)
+            else:
+                return layer
+            
+        return ret
+
+class BufferedWindow(MapWindow, wx.Window):
+    """
+    A Buffered window class.
+
+    When the drawing needs to change, you app needs to call the
+    UpdateMap() method. Since the drawing is stored in a bitmap, you
+    can also save the drawing to file by calling the
+    SaveToFile(self,file_name,file_type) method.
+    """
+
+    def __init__(self, parent, id,
+                 pos = wx.DefaultPosition,
+                 size = wx.DefaultSize,
+                 style=wx.NO_FULL_REPAINT_ON_RESIZE,
+                 Map=None, tree=None, gismgr=None):
+
+        MapWindow.__init__(self, parent, id, pos, size, style,
+                           Map, tree, gismgr)
+        wx.Window.__init__(self, parent, id, pos, size, style)
+
+        self.Map = Map
+        self.tree = tree
+        self.gismanager = gismgr
+
+        mapframe= self.GetParent()
+        notebook=mapframe.GetParent()
+        self.gframe=notebook.GetParent()
+   
+
+        #
+        # Flags
+        #
+        self.resize = False # indicates whether or not a resize event has taken place
+        self.dragimg = None # initialize variable for map panning
+        self.flag = False
+
+        #
+        # Variable for drawing on DC
+        #
+        self.pen = None      # pen for drawing zoom boxes, etc.
+        self.polypen = None  # pen for drawing polylines (measurements, profiles, etc)
+        # List of wx.Point tuples defining a polyline (geographical coordinates)
+        self.polycoords = []
+        # ID of rubber band line
+        self.lineid = None
+        # ID of poly line resulting from cumulative rubber band lines (e.g. measurement)
+        self.plineid = None
+        
+        #
+        # Event bindings
+        #
+        self.Bind(wx.EVT_PAINT,        self.OnPaint)
+        self.Bind(wx.EVT_SIZE,         self.OnSize)
+        self.Bind(wx.EVT_IDLE,         self.OnIdle)
+        self.Bind(wx.EVT_MOTION,       self.MouseActions)
+        self.Bind(wx.EVT_MOUSE_EVENTS, self.MouseActions)
+        self.processMouse = True
+        
+        #
+        # Render output objects
+        #
+        self.mapfile = None   # image file to be rendered
+        self.img = ""         # wx.Image object (self.mapfile)
+        # used in digitization tool (do not redraw vector map)
+        self.imgVectorMap = None
+        # decoration overlays
+        self.overlays = {}
+        # images and their PseudoDC ID's for painting and dragging
+        self.imagedict = {}   
+        self.select = {}      # selecting/unselecting decorations for dragging
+        self.textdict = {}    # text, font, and color indexed by id
+        self.currtxtid = None # PseudoDC id for currently selected text
+
+        #
+        # Zoom objects
+        #
+        self.zoomhistory = [] # list of past zoom extents
+        self.currzoom = 0 # current set of extents in zoom history being used
+        
+        self.zoomtype = 1   # 1 zoom in, 0 no zoom, -1 zoom out
+        self.hitradius = 10 # distance for selecting map decorations
+        self.dialogOffset = 5 # offset for dialog (e.g. DisplayAttributesDialog)
+
+        # OnSize called to make sure the buffer is initialized.
+        # This might result in OnSize getting called twice on some
+        # platforms at initialization, but little harm done.
+        ### self.OnSize(None)
+
+        # create PseudoDC used for background map, map decorations like scales and legends
+        self.pdc = wx.PseudoDC()
+        # used for digitization tool
+        self.pdcVector = None
+        # decorations (region box, etc.)
+        self.pdcDec = wx.PseudoDC()
+        # pseudoDC for temporal objects (select box, measurement tool, etc.)
+        self.pdcTmp = wx.PseudoDC()
+        # redraw all pdc's, pdcTmp layer is redrawn always (speed issue)
+        self.redrawAll = True
+
+        # will store an off screen empty bitmap for saving to file
+        self._buffer = ''
+
+        self.Bind(wx.EVT_ERASE_BACKGROUND, lambda x:None)
+
+        # vars for handling mouse clicks
+        self.dragid   = -1
+        self.lastpos  = (0, 0)
+
+    def Draw(self, pdc, img=None, drawid=None, pdctype='image', coords=[0, 0, 0, 0]):
+        """
+        Draws map and overlay decorations
+        """
+
+        if drawid == None:
+            if pdctype == 'image' and img:
+                drawid = self.imagedict[img]
+            elif pdctype == 'clear':
+                drawid == None
+            else:
+                drawid = wx.NewId()
+        
+        if img and pdctype == 'image':
+            # self.imagedict[img]['coords'] = coords
+            self.select[self.imagedict[img]['id']] = False # ?
+
+        pdc.BeginDrawing()
+
+        if drawid != 99:
+            bg = wx.TRANSPARENT_BRUSH
+        else:
+            bg = wx.Brush(self.GetBackgroundColour())
+
+        pdc.SetBackground(bg)
+        ### pdc.Clear()
+
+        Debug.msg (5, "BufferedWindow.Draw(): id=%s, pdctype=%s, coord=%s" % \
+                       (drawid, pdctype, coords))
+
+        # set PseudoDC id
+        if drawid is not None:
+            pdc.SetId(drawid)
+        
+        if pdctype == 'clear': # erase the display
+            bg = wx.WHITE_BRUSH
+            # bg = wx.Brush(self.GetBackgroundColour())
+            pdc.SetBackground(bg)
+            pdc.RemoveAll()
+            pdc.Clear()
+            pdc.EndDrawing()
+            
+            self.Refresh()
+            return
+
+        if pdctype == 'image': # draw selected image
+            bitmap = wx.BitmapFromImage(img)
+            w,h = bitmap.GetSize()
+            pdc.DrawBitmap(bitmap, coords[0], coords[1], True) # draw the composite map
+            pdc.SetIdBounds(drawid, (coords[0],coords[1], w, h))
+
+        elif pdctype == 'box': # draw a box on top of the map
+            if self.pen:
+                pdc.SetBrush(wx.Brush(wx.CYAN, wx.TRANSPARENT))
+                pdc.SetPen(self.pen)
+                x2 = max(coords[0],coords[2])
+                x1 = min(coords[0],coords[2])
+                y2 = max(coords[1],coords[3])
+                y1 = min(coords[1],coords[3])
+                rwidth = x2-x1
+                rheight = y2-y1
+                rect = wx.Rect(x1,y1,rwidth,rheight)
+                pdc.DrawRectangleRect(rect)
+                pdc.SetIdBounds(drawid,rect)
+                # self.ovlcoords[drawid] = coords
+
+        elif pdctype == 'line': # draw a line on top of the map
+            if self.pen:
+                pdc.SetBrush(wx.Brush(wx.CYAN, wx.TRANSPARENT))
+                pdc.SetPen(self.pen)
+                pdc.DrawLine(coords[0], coords[1], coords[2], coords[3])
+                pdc.SetIdBounds(drawid,(coords[0], coords[1], coords[2], coords[3]))
+                # self.ovlcoords[drawid] = coords
+
+        elif pdctype == 'polyline': # draw a polyline on top of the map
+            if self.polypen:
+                pdc.SetBrush(wx.Brush(wx.CYAN, wx.TRANSPARENT))
+                pdc.SetPen(self.polypen)
+                pdc.DrawLines(coords)
+
+                # get bounding rectangle for polyline
+                xlist = []
+                ylist = []
+                if len(coords) > 0:
+                    for point in coords:
+                        x,y = point
+                        xlist.append(x)
+                        ylist.append(y)
+                    x1=min(xlist)
+                    x2=max(xlist)
+                    y1=min(ylist)
+                    y2=max(ylist)
+                    pdc.SetIdBounds(drawid,(x1,y1,x2,y2))
+                    # self.ovlcoords[drawid] = [x1,y1,x2,y2]
+
+        elif pdctype == 'point': # draw point
+            if self.pen:
+                pdc.SetPen(self.pen)
+                pdc.DrawPoint(coords[0], coords[1])
+                coordsBound = (coords[0] - 5,
+                               coords[1] - 5,
+                               coords[0] + 5,
+                               coords[1] + 5)
+                pdc.SetIdBounds(drawid, coordsBound)
+                # self.ovlcoords[drawid] = coords
+
+        elif pdctype == 'text': # draw text on top of map
+            if not img['active']:
+                return #only draw active text
+            if img.has_key('rotation'):
+                rotation = float(img['rotation'])
+            else:
+                rotation = 0.0
+            w, h = self.GetFullTextExtent(img['text'])[0:2]
+            pdc.SetFont(img['font'])
+            pdc.SetTextForeground(img['color'])
+            coords, w, h = self.TextBounds(img)
+            if rotation == 0:
+                pdc.DrawText(img['text'], coords[0], coords[1])
+            else:
+                pdc.DrawRotatedText(img['text'], coords[0], coords[1], rotation)
+            pdc.SetIdBounds(drawid, (coords[0], coords[1], w, h))
+            
+        pdc.EndDrawing()
+        
+        self.Refresh()
+        
+        return drawid
+
+    def TextBounds(self, textinfo):
+        """
+        Return text boundary data
+
+        @param textinfo text metadata (text, font, color, rotation)
+        @param coords reference point
+        """
+        if textinfo.has_key('rotation'):
+            rotation = float(textinfo['rotation'])
+        else:
+            rotation = 0.0
+        
+        coords = textinfo['coords']
+        
+        Debug.msg (4, "BufferedWindow.TextBounds(): text=%s, rotation=%f" % \
+                   (textinfo['text'], rotation))
+
+        self.Update()
+        ### self.Refresh()
+
+        self.SetFont(textinfo['font'])
+
+        w, h = self.GetTextExtent(textinfo['text'])
+
+        if rotation == 0:
+            coords[2], coords[3] = coords[0] + w, coords[1] + h
+            return coords, w, h
+
+        boxh = math.fabs(math.sin(math.radians(rotation)) * w) + h
+        boxw = math.fabs(math.cos(math.radians(rotation)) * w) + h
+        coords[2] = coords[0] + boxw
+        coords[3] = coords[1] + boxh
+        
+        return coords, boxw, boxh
+
+    def OnPaint(self, event):
+        """
+        Draw PseudoDC's to buffered paint DC
+
+        self.pdc for background and decorations
+        self.pdcVector for vector map which is edited
+        self.pdcTmp for temporaly drawn objects (self.polycoords)
+
+        If self.redrawAll is False on self.pdcTmp content is re-drawn
+        """
+        Debug.msg(4, "BufferedWindow.OnPaint(): redrawAll=%s" % self.redrawAll)
+        
+        dc = wx.BufferedPaintDC(self, self.buffer)
+        
+        ### dc.SetBackground(wx.Brush("White"))
+        dc.Clear()
+
+        # use PrepareDC to set position correctly
+        self.PrepareDC(dc)
+
+        # create a clipping rect from our position and size
+        # and update region
+        rgn = self.GetUpdateRegion().GetBox()
+        dc.SetClippingRect(rgn)
+
+        switchDraw = False
+        if self.redrawAll is None:
+            self.redrawAll = True
+            switchDraw = True
+        
+        if self.redrawAll: # redraw pdc and pdcVector
+            # draw to the dc using the calculated clipping rect
+            self.pdc.DrawToDCClipped(dc, rgn)
+
+            # draw vector map layer
+            if self.pdcVector:
+                # decorate with GDDC (transparency)
+                try:
+                    gcdc = wx.GCDC(dc)
+                    self.pdcVector.DrawToDCClipped(gcdc, rgn)
+                except NotImplementedError, e:
+                    print >> sys.stderr, e
+                    self.pdcVector.DrawToDCClipped(dc, rgn)
+
+            self.bufferLast = None
+        else: # do not redraw pdc and pdcVector
+            if self.bufferLast is None:
+                # draw to the dc
+                self.pdc.DrawToDC(dc)
+
+                if self.pdcVector:
+                    # decorate with GDDC (transparency)
+                    try:
+                        gcdc = wx.GCDC(dc)
+                        self.pdcVector.DrawToDC(gcdc)
+                    except NotImplementedError, e:
+                        print >> sys.stderr, e
+                        self.pdcVector.DrawToDC(dc)
+                        
+                # store buffered image
+                # self.bufferLast = wx.BitmapFromImage(self.buffer.ConvertToImage())
+                self.bufferLast = dc.GetAsBitmap(wx.Rect(0, 0, self.Map.width, self.Map.height))
+
+            pdcLast = wx.PseudoDC()
+            pdcLast.DrawBitmap(bmp=self.bufferLast, x=0, y=0)
+            pdcLast.DrawToDC(dc)
+
+        # draw decorations (e.g. region box)
+        try:
+            gcdc = wx.GCDC(dc)
+            self.pdcDec.DrawToDC(gcdc)
+        except NotImplementedError, e:
+            print >> sys.stderr, e
+            self.pdcDec.DrawToDC(dc)
+
+        # draw temporary object on the foreground
+        ### self.pdcTmp.DrawToDCClipped(dc, rgn)
+        self.pdcTmp.DrawToDC(dc)
+
+        if switchDraw:
+            self.redrawAll = False
+                
+    def OnSize(self, event):
+        """
+        Scale map image so that it is
+        the same size as the Window
+        """
+        Debug.msg(3, "BufferedWindow.OnSize():")
+
+        # set size of the input image
+        self.Map.ChangeMapSize(self.GetClientSize())
+        # align extent based on center point and display resolution
+        # this causes that image is not resized when display windows is resized
+        # self.Map.AlignExtentFromDisplay()
+
+        # Make new off screen bitmap: this bitmap will always have the
+        # current drawing in it, so it can be used to save the image to
+        # a file, or whatever.
+        self.buffer = wx.EmptyBitmap(max(1, self.Map.width), max(1, self.Map.height))
+
+        # get the image to be rendered
+        self.img = self.GetImage()
+
+        # update map display
+        if self.img and self.Map.width + self.Map.height > 0: # scale image during resize
+            self.img = self.img.Scale(self.Map.width, self.Map.height)
+            if len(self.Map.GetListOfLayers()) > 0:
+                self.UpdateMap()
+
+        # re-render image on idle
+        self.resize = True
+
+        # reposition checkbox in statusbar
+        self.parent.StatusbarReposition()
+
+        # update statusbar
+        self.parent.StatusbarUpdate()
+
+    def OnIdle(self, event):
+        """
+        Only re-render a composite map image from GRASS during
+        idle time instead of multiple times during resizing.
+        """
+        if self.resize:
+            self.UpdateMap(render=True)
+
+        event.Skip()
+
+    def SaveToFile(self, FileName, FileType):
+        """
+        This draws the psuedo DC to a buffer that
+        can be saved to a file.
+        """
+        dc = wx.BufferedPaintDC(self, self.buffer)
+        self.pdc.DrawToDC(dc)
+        if self.pdcVector:
+            self.pdcVector.DrawToDC(dc)
+        self.buffer.SaveFile(FileName, FileType)
+
+    def GetOverlay(self):
+        """
+        Converts rendered overlay files to wx.Image
+
+        Updates self.imagedict
+
+        @return list of images
+        """
+        imgs = []
+        for overlay in self.Map.GetListOfLayers(l_type="overlay", l_active=True):
+            if os.path.isfile(overlay.mapfile) and os.path.getsize(overlay.mapfile):
+                img = wx.Image(overlay.mapfile, wx.BITMAP_TYPE_ANY)
+                self.imagedict[img] = { 'id' : overlay.id,
+                                        'layer' : overlay }
+                imgs.append(img)
+
+        return imgs
+
+    def GetImage(self):
+        """
+        Converts redered map files to wx.Image
+
+        Updates self.imagedict (id=99)
+
+        @return wx.Image instance (map composition)
+        """
+        imgId = 99
+        if self.Map.mapfile and os.path.isfile(self.Map.mapfile) and \
+                os.path.getsize(self.Map.mapfile):
+            img = wx.Image(self.Map.mapfile, wx.BITMAP_TYPE_ANY)
+        else:
+            img = None
+
+        self.imagedict[img] = { 'id': imgId }
+
+        return img
+
+    def UpdateMap(self, render=True, renderVector=True):
+        """
+        Updates the canvas anytime there is a change to the
+        underlaying images or to the geometry of the canvas.
+
+        @param render re-render map composition
+        @param renderVector re-render vector map layer enabled for editing (used for digitizer)
+        """
+        if self.flag == True:
+            start = time.clock()
+
+
+            self.resize = False
+
+            if len(self.Map.GetListOfLayers()) == 0:
+                return False
+            
+            if self.img is None:
+                render = True
+
+            #
+            # initialize process bar (only on 'render')
+            #
+            if render is True or renderVector is True:
+                self.parent.onRenderGauge.Show()
+                if self.parent.onRenderGauge.GetRange() > 0:
+                    self.parent.onRenderGauge.SetValue(1)
+            
+            #
+            # render background image if needed
+            #
+            
+            # update layer dictionary if there has been a change in layers
+            if self.tree and self.tree.reorder == True:
+                self.tree.ReorderLayers()
+                
+            # reset flag for auto-rendering
+            if self.tree:
+                self.tree.rerender = False
+            
+            if render:
+                # update display size
+                self.Map.ChangeMapSize(self.GetClientSize())
+                if self.parent.compResolution.IsChecked():
+                    # use computation region resolution for rendering
+                    windres = True
+                else:
+                    windres = False
+                self.mapfile = self.Map.Render(force=True, mapWindow=self.parent,
+                                               windres=windres)
+            else:
+                self.mapfile = self.Map.Render(force=False, mapWindow=self.parent)
+            
+            self.img = self.GetImage() # id=99
+                
+            #
+            # clear pseudoDcs
+            #
+            for pdc in (self.pdc,
+                        self.pdcDec,
+                        self.pdcTmp):
+                pdc.Clear()
+                pdc.RemoveAll()
+            
+            #
+            # draw background map image to PseudoDC
+            #
+            if not self.img:
+                self.Draw(self.pdc, pdctype='clear')
+            else:
+                try:
+                    id = self.imagedict[self.img]['id']
+                except:
+                    return False
+
+                self.Draw(self.pdc, self.img, drawid=id)
+
+            #
+            # render vector map layer
+            #
+            digitToolbar = self.parent.toolbars['vdigit']
+            if renderVector and digitToolbar and \
+                    digitToolbar.GetLayer():
+                # set region
+                self.parent.digit.driver.UpdateRegion()
+                # re-calculate threshold for digitization tool
+                self.parent.digit.driver.GetThreshold()
+                # draw map
+                self.pdcVector.Clear()
+                self.pdcVector.RemoveAll()
+                try:
+                    item = self.tree.FindItemByData('maplayer', digitToolbar.GetLayer())
+                except TypeError:
+                    item = None
+                
+                if item and self.tree.IsItemChecked(item):
+                    self.parent.digit.driver.DrawMap()
+
+                # translate tmp objects (pointer position)
+                if digitToolbar.GetAction() == 'moveLine':
+                    if  hasattr(self, "vdigitMove") and \
+                            self.vdigitMove.has_key('beginDiff'):
+                        # move line
+                        for id in self.vdigitMove['id']:
+                            # print self.pdcTmp.GetIdBounds(id)
+                            self.pdcTmp.TranslateId(id,
+                                                    self.vdigitMove['beginDiff'][0],
+                                                    self.vdigitMove['beginDiff'][1])
+                        del self.vdigitMove['beginDiff']
+            
+            #
+            # render overlays
+            #
+            for img in self.GetOverlay():
+                # draw any active and defined overlays
+                if self.imagedict[img]['layer'].IsActive():
+                    id = self.imagedict[img]['id']
+                    self.Draw(self.pdc, img=img, drawid=id,
+                              pdctype=self.overlays[id]['pdcType'], coords=self.overlays[id]['coords'])
+
+            for id in self.textdict.keys():
+                self.Draw(self.pdc, img=self.textdict[id], drawid=id,
+                          pdctype='text', coords=[10, 10, 10, 10])
+
+            # optionally draw computational extent box
+            self.DrawCompRegionExtent()
+
+            #
+            # redraw pdcTmp if needed
+            #
+            if len(self.polycoords) > 0:
+                self.DrawLines(self.pdcTmp)
+
+
+            if self.gframe.georectifying:
+                # -> georectifier (redraw GCPs)
+                if self.parent.toolbars['georect']:
+                    coordtype = 'gcpcoord'
+                else:
+                    coordtype = 'mapcoord'
+                self.gframe.georectifying.DrawGCP(coordtype)
+                
+            # 
+            # clear measurement
+            #
+            
+            if self.mouse["use"] == "measure":
+                self.ClearLines(pdc=self.pdcTmp)
+                self.polycoords = []
+                self.mouse['use'] = 'pointer'
+                self.mouse['box'] = 'point'
+                self.mouse['end'] = [0, 0]
+                self.SetCursor(self.parent.cursors["default"])
+                
+            stop = time.clock()
+
+            #
+            # hide process bar
+            #
+            self.parent.onRenderGauge.Hide()
+
+            #
+            # update statusbar
+            #
+            ### self.Map.SetRegion()
+            self.parent.StatusbarUpdate()
+            if grass.find_file(name = 'MASK', element = 'cell')['name']:
+                # mask found
+                self.parent.maskInfo.SetLabel(_('MASK'))
+            else:
+                self.parent.maskInfo.SetLabel('')
+            
+            Debug.msg (2, "BufferedWindow.UpdateMap(): render=%s, renderVector=%s -> time=%g" % \
+                       (render, renderVector, (stop-start)))
+            
+            return True
+
+    def DrawCompRegionExtent(self):
+        """
+        Draw computational region extent in the display
+        
+        Display region is drawn as a blue box inside the computational region,
+        computational region inside a display region as a red box).
+        """
+        if hasattr(self, "regionCoords"):
+            compReg = self.Map.GetRegion()
+            dispReg = self.Map.GetCurrentRegion()
+            reg = None
+            if self.IsInRegion(dispReg, compReg):
+                self.polypen = wx.Pen(colour=wx.Colour(0, 0, 255, 128), width=3, style=wx.SOLID)
+                reg = dispReg
+            else:
+                self.polypen = wx.Pen(colour=wx.Colour(255, 0, 0, 128),
+                                      width=3, style=wx.SOLID)
+                reg = compReg
+            
+            self.regionCoords = []
+            self.regionCoords.append((reg['w'], reg['n']))
+            self.regionCoords.append((reg['e'], reg['n']))
+            self.regionCoords.append((reg['e'], reg['s']))
+            self.regionCoords.append((reg['w'], reg['s']))
+            self.regionCoords.append((reg['w'], reg['n']))
+            # draw region extent
+            self.DrawLines(pdc=self.pdcDec, polycoords=self.regionCoords)
+
+    def IsInRegion(self, region, refRegion):
+        """
+        Test if 'region' is inside of 'refRegion'
+
+        @param region input region
+        @param refRegion reference region (e.g. computational region)
+
+        @return True if region is inside of refRegion
+        @return False 
+        """
+        if region['s'] >= refRegion['s'] and \
+                region['n'] <= refRegion['n'] and \
+                region['w'] >= refRegion['w'] and \
+                region['e'] <= refRegion['e']:
+            return True
+
+        return False
+
+    def EraseMap(self):
+        """
+        Erase the canvas
+        """
+        self.Draw(self.pdc, pdctype='clear')
+                  
+        if self.pdcVector:
+            self.Draw(self.pdcVector, pdctype='clear')
+        
+        self.Draw(self.pdcDec, pdctype='clear')
+        self.Draw(self.pdcTmp, pdctype='clear')
+        
+    def DragMap(self, moveto):
+        """
+        Drag the entire map image for panning.
+        """
+
+        dc = wx.BufferedDC(wx.ClientDC(self))
+        dc.SetBackground(wx.Brush("White"))
+        dc.Clear()
+
+        self.dragimg = wx.DragImage(self.buffer)
+        self.dragimg.BeginDrag((0, 0), self)
+        self.dragimg.GetImageRect(moveto)
+        self.dragimg.Move(moveto)
+
+        self.dragimg.DoDrawImage(dc, moveto)
+        self.dragimg.EndDrag()
+
+        return True
+
+    def DragItem(self, id, event):
+        """
+        Drag an overlay decoration item
+        """
+        if id == 99 or id == '' or id == None: return
+        Debug.msg (5, "BufferedWindow.DragItem(): id=%d" % id)
+        x, y = self.lastpos
+        dx = event.GetX() - x
+        dy = event.GetY() - y
+        self.pdc.SetBackground(wx.Brush(self.GetBackgroundColour()))
+        r = self.pdc.GetIdBounds(id)
+        if id > 100: # text dragging
+            rtop = (r[0],r[1]-r[3],r[2],r[3])
+            r = r.Union(rtop)
+            rleft = (r[0]-r[2],r[1],r[2],r[3])
+            r = r.Union(rleft)
+        self.pdc.TranslateId(id, dx, dy)
+
+        r2 = self.pdc.GetIdBounds(id)
+        if id > 100: # text
+            self.textdict[id]['coords'] = r2
+        r = r.Union(r2)
+        r.Inflate(4,4)
+        self.RefreshRect(r, False)
+        self.lastpos = (event.GetX(), event.GetY())
+                
+    def MouseDraw(self, pdc=None, begin=None, end=None):
+        """
+        Mouse box or line from 'begin' to 'end'
+
+        If not given from self.mouse['begin'] to self.mouse['end'].
+
+        """
+        self.redrawAll = False
+        
+        if not pdc:
+            return
+
+        if begin is None:
+            begin = self.mouse['begin']
+        if end is None:
+            end   = self.mouse['end']
+
+        Debug.msg (5, "BufferedWindow.MouseDraw(): use=%s, box=%s, begin=%f,%f, end=%f,%f" % \
+                       (self.mouse['use'], self.mouse['box'],
+                        begin[0], begin[1], end[0], end[1]))
+
+        if self.mouse['box'] == "box":
+            boxid = wx.ID_NEW
+            mousecoords = [begin[0], begin[1],
+                           end[0], end[1]]
+            r = pdc.GetIdBounds(boxid)
+            r.Inflate(4,4)
+            pdc.ClearId(boxid)
+            self.RefreshRect(r, False)
+            pdc.SetId(boxid)
+            self.Draw(pdc, drawid=boxid, pdctype='box', coords=mousecoords)
+        elif self.mouse['box'] == "line" or self.mouse['box'] == 'point':
+            self.lineid = wx.ID_NEW
+            mousecoords = [begin[0], begin[1], \
+                           end[0], end[1]]
+            x1=min(begin[0],end[0])
+            x2=max(begin[0],end[0])
+            y1=min(begin[1],end[1])
+            y2=max(begin[1],end[1])
+            r = wx.Rect(x1,y1,x2-x1,y2-y1)
+            r.Inflate(4,4)
+            try:
+                pdc.ClearId(self.lineid)
+            except:
+                pass
+            self.RefreshRect(r, False)
+            pdc.SetId(self.lineid)
+
+            self.Draw(pdc, drawid=self.lineid, pdctype='line', coords=mousecoords)
+
+    def DrawLines(self, pdc=None, polycoords=None):
+        """
+        Draw polyline in PseudoDC
+
+        Set self.pline to wx.NEW_ID + 1
+
+        polycoords - list of polyline vertices, geographical coordinates
+        (if not given, self.polycoords is used)
+
+        """
+        if not pdc:
+            pdc = self.pdcTmp
+
+        if not polycoords:
+            polycoords = self.polycoords
+        
+        if len(polycoords) > 0:
+            self.plineid = wx.ID_NEW + 1
+            # convert from EN to XY
+            coords = []
+            for p in polycoords:
+                coords.append(self.Cell2Pixel(p))
+
+            self.Draw(pdc, drawid=self.plineid, pdctype='polyline', coords=coords)
+            
+            Debug.msg (4, "BufferedWindow.DrawLines(): coords=%s, id=%s" % \
+                           (coords, self.plineid))
+
+            return self.plineid
+
+        return -1
+
+    def DrawCross(self, pdc, coords, size, rotation=0,
+                  text=None, textAlign='lr', textOffset=(5, 5)):
+        """Draw cross in PseudoDC
+
+        @todo implement rotation
+
+        @param pdc PseudoDC
+        @param coord center coordinates
+        @param rotation rotate symbol
+        @param text draw also text (text, font, color, rotation)
+        @param textAlign alignment (default 'lower-right')
+        @textOffset offset for text (from center point)
+        """
+        Debug.msg(4, "BufferedWindow.DrawCross(): pdc=%s, coords=%s, size=%d" % \
+                  (pdc, coords, size))
+        coordsCross = ((coords[0] - size, coords[1], coords[0] + size, coords[1]),
+                       (coords[0], coords[1] - size, coords[0], coords[1] + size))
+
+        self.lineid = wx.NewId()
+        for lineCoords in coordsCross:
+            self.Draw(pdc, drawid=self.lineid, pdctype='line', coords=lineCoords)
+
+        if not text:
+            return self.lineid
+
+        if textAlign == 'ul':
+            coord = [coords[0] - textOffset[0], coords[1] - textOffset[1], 0, 0]
+        elif textAlign == 'ur':
+            coord = [coords[0] + textOffset[0], coords[1] - textOffset[1], 0, 0]
+        elif textAlign == 'lr':
+            coord = [coords[0] + textOffset[0], coords[1] + textOffset[1], 0, 0]
+        else:
+            coord = [coords[0] - textOffset[0], coords[1] + textOffset[1], 0, 0]
+        
+        self.Draw(pdc, img=text,
+                  pdctype='text', coords=coord)
+
+        return self.lineid
+
+    def MouseActions(self, event):
+        """
+        Mouse motion and button click notifier
+        """
+        if not self.processMouse:
+            return
+        
+        ### if self.redrawAll is False:
+        ###    self.redrawAll = True
+        
+        # zoom with mouse wheel
+        if event.GetWheelRotation() != 0:
+            self.OnMouseWheel(event)
+            
+        # left mouse button pressed
+        elif event.LeftDown():
+            self.OnLeftDown(event)
+
+        # left mouse button released
+        elif event.LeftUp():
+            self.OnLeftUp(event)
+
+        # dragging
+        elif event.Dragging():
+            self.OnDragging(event)
+
+        # double click
+        elif event.ButtonDClick():
+            self.OnButtonDClick(event)
+
+        # middle mouse button pressed
+        elif event.MiddleDown():
+            self.OnMiddleDown(event)
+
+        # right mouse button pressed
+        elif event.RightDown():
+            self.OnRightDown(event)
+
+        # right mouse button released
+        elif event.RightUp():
+            self.OnRightUp(event)
+
+        elif event.Moving():
+            self.OnMouseMoving(event)
+
+#        event.Skip()
+        
+    def OnMouseWheel(self, event):
+        """
+        Mouse wheel moved
+        """
+        self.processMouse = False
+        current  = event.GetPositionTuple()[:]
+        wheel = event.GetWheelRotation()
+        Debug.msg (5, "BufferedWindow.MouseAction(): wheel=%d" % wheel)
+        # zoom 1/2 of the screen, centered to current mouse position (TODO: settings)
+        begin = (current[0] - self.Map.width / 4,
+                 current[1] - self.Map.height / 4)
+        end   = (current[0] + self.Map.width / 4,
+                 current[1] + self.Map.height / 4)
+
+        if wheel > 0:
+            zoomtype = 1
+        else:
+            zoomtype = -1
+
+        # zoom
+        self.Zoom(begin, end, zoomtype)
+
+        # redraw map
+        self.UpdateMap()
+
+        ### self.OnPaint(None)
+
+        # update statusbar
+        self.parent.StatusbarUpdate()
+
+        self.Refresh()
+        self.processMouse = True
+#        event.Skip()
+
+    def OnDragging(self, event):
+        """
+        Mouse dragging with left button down
+        """
+        Debug.msg (5, "BufferedWindow.MouseAction(): Dragging")
+        current  = event.GetPositionTuple()[:]
+        previous = self.mouse['begin']
+        move = (current[0] - previous[0],
+                current[1] - previous[1])
+
+        digitToolbar = self.parent.toolbars['vdigit']
+
+        # dragging or drawing box with left button
+        if self.mouse['use'] == 'pan':
+            self.DragMap(move)
+
+        # dragging decoration overlay item
+        elif (self.mouse['use'] == 'pointer' and 
+                not digitToolbar and 
+                self.dragid != None):
+            self.DragItem(self.dragid, event)
+
+        # dragging anything else - rubber band box or line
+        else:
+            if (self.mouse['use'] == 'pointer' and 
+                not digitToolbar): return
+            self.mouse['end'] = event.GetPositionTuple()[:]
+            digitClass = self.parent.digit
+            if (event.LeftIsDown() and 
+                not (digitToolbar and 
+                    digitToolbar.GetAction() in ("moveLine",) and 
+                    digitClass.driver.GetSelected() > 0)):
+                # draw box only when left mouse button is pressed
+                self.MouseDraw(pdc=self.pdcTmp)
+      
+#        event.Skip()
+
+    def OnLeftDown(self, event):
+        """
+        Left mouse button pressed
+        """
+        Debug.msg (5, "BufferedWindow.OnLeftDown(): use=%s" % \
+                   self.mouse["use"])
+
+        self.mouse['begin'] = event.GetPositionTuple()[:]
+
+        if self.mouse["use"] in ["measure", "profile"]:
+            # measure or profile
+            if len(self.polycoords) == 0:
+                self.mouse['end'] = self.mouse['begin']
+                self.polycoords.append(self.Pixel2Cell(self.mouse['begin']))
+                self.ClearLines(pdc=self.pdcTmp)
+            else:
+                self.mouse['begin'] = self.mouse['end']
+        elif self.mouse['use'] == 'zoom':
+            pass
+        elif self.mouse["use"] == "pointer" and self.parent.toolbars['vdigit']:
+            # digitization
+            digitToolbar = self.parent.toolbars['vdigit']
+            digitClass   = self.parent.digit
+            east, north = self.Pixel2Cell(self.mouse['begin'])
+
+            try:
+                map = digitToolbar.GetLayer().GetName()
+            except:
+                map = None
+                wx.MessageBox(parent=self,
+                              message=_("No vector map selected for editing."),
+                              caption=_("Error"), style=wx.OK | wx.ICON_ERROR | wx.CENTRE)
+                event.Skip()
+                return
+
+            # calculate position of 'update record' dialog
+            position = self.mouse['begin']
+            posWindow = self.ClientToScreen((position[0] + self.dialogOffset,
+                                             position[1] + self.dialogOffset))
+
+            if digitToolbar.GetAction() not in ("moveVertex", "addVertex",
+                                                "removeVertex", "editLine"):
+                # set pen
+                self.pen = wx.Pen(colour='Red', width=2, style=wx.SHORT_DASH)
+                self.polypen = wx.Pen(colour='dark green', width=2, style=wx.SOLID)
+
+            if digitToolbar.GetAction() in ("addVertex", "removeVertex"):
+                # unselect
+                digitClass.driver.SetSelected([])
+
+            if digitToolbar.GetAction() == "addLine":
+                if digitToolbar.GetAction('type') in ["point", "centroid"]:
+                    # add new point
+                    if digitToolbar.GetAction('type') == 'point':
+                        point = True
+                    else:
+                        point = False
+
+                    fid = digitClass.AddPoint(map, point, east, north)
+                    if fid < 0:
+                        return
+
+                    self.UpdateMap(render=False) # redraw map
+
+                    # add new record into atribute table
+                    if UserSettings.Get(group='vdigit', key="addRecord", subkey='enabled')  is True:
+                        # select attributes based on layer and category
+                        cats = { fid : {
+                                UserSettings.Get(group='vdigit', key="layer", subkey='value') :
+                                    (UserSettings.Get(group='vdigit', key="category", subkey='value'), )
+                                }}
+                        addRecordDlg = dbm.DisplayAttributesDialog(parent=self, map=map,
+                                                                   cats=cats,
+                                                                   pos=posWindow,
+                                                                   action="add")
+                        if addRecordDlg.mapDBInfo and \
+                               addRecordDlg.ShowModal() == wx.ID_OK:
+                            sqlfile = tempfile.NamedTemporaryFile(mode="w")
+                            for sql in addRecordDlg.GetSQLString():
+                                sqlfile.file.write(sql + ";\n")
+                            sqlfile.file.flush()
+                            executeCommand = gcmd.Command(cmd=["db.execute",
+                                                               "--q",
+                                                               "input=%s" % sqlfile.name])
+
+                elif digitToolbar.GetAction('type') in ["line", "boundary"]:
+                    # add new point to the line
+                    self.polycoords.append(self.Pixel2Cell(event.GetPositionTuple()[:]))
+                    self.DrawLines(pdc=self.pdcTmp)
+            
+            elif digitToolbar.GetAction() == "editLine" and hasattr(self, "vdigitMove"):
+                self.polycoords.append(self.Pixel2Cell(self.mouse['begin']))
+                self.vdigitMove['id'].append(wx.NewId())
+                self.DrawLines(pdc=self.pdcTmp)
+
+            elif digitToolbar.GetAction() == "deleteLine":
+                pass
+
+            elif digitToolbar.GetAction() in ["moveLine", "moveVertex", "editLine"] and \
+                    not hasattr(self, "vdigitMove"):
+                self.vdigitMove = {}
+                # geographic coordinates of initial position (left-down)
+                self.vdigitMove['begin'] = None
+                # list of ids to modify    
+                self.vdigitMove['id'] = []
+                # ids geographic coordinates
+                self.vdigitMove['coord'] = {}
+                
+                if digitToolbar.GetAction() in ["moveVertex", "editLine"]:
+                    # set pen
+                    pcolor = UserSettings.Get(group='vdigit', key="symbol",
+                                              subkey=["highlight", "color"])
+                    self.pen = self.polypen = wx.Pen(colour=pcolor,
+                                                     width=2, style=wx.SHORT_DASH)
+                    self.pdcTmp.SetPen(self.polypen)
+
+            elif digitToolbar.GetAction() == "splitLine":
+                # unselect
+                digitClass.driver.SetSelected([])
+
+            elif digitToolbar.GetAction() in ["displayAttrs", "displayCats"]:
+                qdist = digitClass.driver.GetThreshold(type='selectThresh')
+                coords = (east, north)
+                if digitClass.type == 'vdigit':
+                    # unselect
+                    digitClass.driver.SetSelected([])
+
+                    # select feature by point
+                    cats = {}
+                    if digitClass.driver.SelectLineByPoint(coords,
+                                                        digitClass.GetSelectType()) is not None:
+                        if UserSettings.Get(group='vdigit', key='checkForDupl',
+                                            subkey='enabled'):
+                            lines = digitClass.driver.GetSelected()
+                        else:
+                            lines = (digitClass.driver.GetSelected()[0],) # only first found
+                        
+                        for line in lines:
+                            cats[line] = digitClass.GetLineCats(line)
+                    
+                if digitToolbar.GetAction() == "displayAttrs":
+                    # select attributes based on coordinates (all layers)
+                    if self.parent.dialogs['attributes'] is None:
+                        if digitClass.type == 'vedit':
+                            self.parent.dialogs['attributes'] = dbm.DisplayAttributesDialog(parent=self, map=map,
+                                                                                            query=(coords, qdist),
+                                                                                            pos=posWindow,
+                                                                                            action="update")
+                        else:
+                            self.parent.dialogs['attributes'] = dbm.DisplayAttributesDialog(parent=self, map=map,
+                                                                                            cats=cats,
+                                                                                            action="update")
+                    else:
+                        # update currently open dialog
+                        if digitClass.type == 'vedit':
+                            self.parent.dialogs['attributes'].UpdateDialog(query=(coords, qdist))
+                        else:
+                            # upgrade dialog
+                            self.parent.dialogs['attributes'].UpdateDialog(cats=cats)
+
+                    if self.parent.dialogs['attributes']:
+                        if len(cats.keys()) > 0:
+                            # highlight feature & re-draw map
+                            if not self.parent.dialogs['attributes'].IsShown():
+                                self.parent.dialogs['attributes'].Show()
+                        else:
+                            if self.parent.dialogs['attributes'] and \
+                                   self.parent.dialogs['attributes'].IsShown():
+                                self.parent.dialogs['attributes'].Hide()
+
+                else: # displayCats
+                    if self.parent.dialogs['category'] is None:
+                        # open new dialog
+                        if digitClass.type == 'vedit':
+                            dlg = VDigitCategoryDialog(parent=self,
+                                                        map=map,
+                                                        query=(coords, qdist),
+                                                        pos=posWindow,
+                                                        title=_("Update categories"))
+                            self.parent.dialogs['category'] = dlg
+                        else:
+                            dlg = VDigitCategoryDialog(parent=self,
+                                                       map=map,
+                                                       cats=cats,
+                                                       pos=posWindow,
+                                                       title=_("Update categories"))
+                            self.parent.dialogs['category'] = dlg
+                    else:
+                        # update currently open dialog
+                        if digitClass.type == 'vedit':
+                            self.parent.dialogs['category'].UpdateDialog(query=(coords, qdist))
+                        else:
+                            # upgrade dialog
+                            self.parent.dialogs['category'].UpdateDialog(cats=cats)
+                            
+                    if self.parent.dialogs['category']:
+                        if len(cats.keys()) > 0:
+                            # highlight feature & re-draw map
+                            ### digitClass.driver.SetSelected(line)
+                            if not self.parent.dialogs['category'].IsShown():
+                                self.parent.dialogs['category'].Show()
+                        else:
+                            if self.parent.dialogs['category'].IsShown():
+                                self.parent.dialogs['category'].Hide()
+                
+                self.UpdateMap(render=False)
+
+            elif digitToolbar.GetAction() in ("copyCats", "copyAttrs"):
+                if not hasattr(self, "copyCatsList"):
+                    self.copyCatsList = []
+                else:
+                    self.copyCatsIds = []
+                    self.mouse['box'] = 'box'
+
+            elif digitToolbar.GetAction() == "copyLine":
+                self.copyIds = []
+                self.layerTmp = None
+
+            elif digitToolbar.GetAction() == "zbulkLine":
+                if len(self.polycoords) > 1: # start new line
+                    self.polycoords = []
+                    self.ClearLines(pdc=self.pdcTmp)
+                self.polycoords.append(self.Pixel2Cell(event.GetPositionTuple()[:]))
+                if len(self.polycoords) == 1:
+                    begin = self.Pixel2Cell(self.polycoords[-1])
+                    end   = self.Pixel2Cell(self.mouse['end'])
+                else:
+                    end   = self.Pixel2Cell(self.polycoords[-1])
+                    begin = self.Pixel2Cell(self.mouse['begin'])
+
+                    self.DrawLines(self.pdcTmp, polycoords = [begin, end])
+        elif self.mouse['use'] == 'pointer':
+            # get decoration or text id
+            self.idlist = []
+            self.dragid = ''
+            self.lastpos = self.mouse['begin']
+            idlist = self.pdc.FindObjects(x=self.lastpos[0], y=self.lastpos[1],
+                                          radius=self.hitradius)
+                                          
+            if 99 in idlist: idlist.remove(99)                             
+            if idlist != [] :
+                self.dragid = idlist[0] #drag whatever is on top
+        else:
+            pass
+
+        event.Skip()
+
+    def OnLeftUp(self, event):
+        """
+        Left mouse button released
+        """
+        Debug.msg (5, "BufferedWindow.OnLeftUp(): use=%s" % \
+                   self.mouse["use"])
+
+        self.mouse['end'] = event.GetPositionTuple()[:]
+
+        if self.mouse['use'] in ["zoom", "pan"]:
+            # set region in zoom or pan
+            begin = self.mouse['begin']
+            end = self.mouse['end']
+            if self.mouse['use'] == 'zoom':
+                # set region for click (zero-width box)
+                if begin[0] - end[0] == 0 or \
+                        begin[1] - end[1] == 0:
+                    # zoom 1/2 of the screen (TODO: settings)
+                    begin = (end[0] - self.Map.width / 4,
+                             end[1] - self.Map.height / 4)
+                    end   = (end[0] + self.Map.width / 4,
+                             end[1] + self.Map.height / 4)
+
+            self.Zoom(begin, end, self.zoomtype)
+
+            # redraw map
+            self.UpdateMap(render=True)
+
+            # update statusbar
+            self.parent.StatusbarUpdate()
+
+        elif self.mouse["use"] == "query":
+            # querying
+            self.parent.QueryMap(self.mouse['begin'][0],self.mouse['begin'][1])
+
+        elif self.mouse["use"] == "queryVector":
+            # editable mode for vector map layers
+            self.parent.QueryVector(self.mouse['begin'][0], self.mouse['begin'][1])
+
+            # clear temp canvas
+            self.UpdateMap(render=False, renderVector=False)
+            
+        elif self.mouse["use"] in ["measure", "profile"]:
+            # measure or profile
+            if self.mouse["use"] == "measure":
+                self.parent.MeasureDist(self.mouse['begin'], self.mouse['end'])
+
+            self.polycoords.append(self.Pixel2Cell(self.mouse['end']))
+            self.ClearLines(pdc=self.pdcTmp)
+            self.DrawLines(pdc=self.pdcTmp)
+        
+        elif self.mouse["use"] == "pointer" and self.parent.gismanager.georectifying:
+            # -> georectifying
+            coord = self.Pixel2Cell(self.mouse['end'])
+            if self.parent.toolbars['georect']:
+                coordtype = 'gcpcoord'
+            else:
+                coordtype = 'mapcoord'
+
+            self.parent.gismanager.georectifying.SetGCPData(coordtype, coord, self)
+            self.UpdateMap(render=False, renderVector=False)
+
+        elif self.mouse["use"] == "pointer" and self.parent.toolbars['vdigit']:
+            # digitization tool active
+            digitToolbar = self.parent.toolbars['vdigit']
+            digitClass   = self.parent.digit
+
+            pos1 = self.Pixel2Cell(self.mouse['begin'])
+            pos2 = self.Pixel2Cell(self.mouse['end'])
+
+            if hasattr(self, "vdigitMove"):
+                if len(digitClass.driver.GetSelected()) == 0:
+                    self.vdigitMove['begin'] = pos1 # left down
+                ### else:
+                ###    dx = pos2[0] - pos1[0] ### ???
+                ###    dy = pos2[1] - pos1[1]
+                ###    self.vdigitMove = (self.vdigitMove['begin'][0] + dx,
+                ###                       self.vdigitMove['begin'][1] + dy)
+                
+                # eliminate initial mouse moving efect
+                self.mouse['begin'] = self.mouse['end'] 
+
+            if digitToolbar.GetAction() in ["deleteLine", "moveLine", "moveVertex",
+                                            "copyCats", "copyAttrs", "editLine", "flipLine",
+                                            "mergeLine", "snapLine",
+                                            "queryLine", "breakLine", "typeConv", "connectLine"]:
+                nselected = 0
+                # -> delete line || move line || move vertex
+                if digitToolbar.GetAction() in ["moveVertex", "editLine"]:
+                    if len(digitClass.driver.GetSelected()) == 0:
+                        nselected = digitClass.driver.SelectLineByPoint(pos1, type=VDigit_Lines_Type)
+                        if digitToolbar.GetAction() == "editLine":
+                            try:
+                                selVertex = digitClass.driver.GetSelectedVertex(pos1)[0]
+                            except IndexError:
+                                selVertex = None
+
+                            if selVertex:
+                                # self.UpdateMap(render=False)
+                                ids = digitClass.driver.GetSelected(grassId=False)
+                                # move this line to tmp layer
+                                self.polycoords = []
+                                for id in ids:
+                                    if id % 2: # register only vertices
+                                        e, n = self.Pixel2Cell(self.pdcVector.GetIdBounds(id)[0:2])
+                                        self.polycoords.append((e, n))
+                                    # self.pdcVector.RemoveId(id)
+                                digitClass.driver.DrawSelected(False) 
+                                
+                                if selVertex < ids[-1] / 2:
+                                    # choose first or last node of line
+                                    self.vdigitMove['id'].reverse()
+                                    self.polycoords.reverse()
+                            else:
+                                # unselect
+                                digitClass.driver.SetSelected([])
+                                del self.vdigitMove
+                                
+                            self.UpdateMap(render=False)
+
+                        
+                elif digitToolbar.GetAction() in ("copyCats", "copyAttrs"):
+                    if not hasattr(self, "copyCatsIds"):
+                        # 'from' -> select by point
+                        nselected = digitClass.driver.SelectLineByPoint(pos1, digitClass.GetSelectType())
+                        if nselected:
+                            self.copyCatsList = digitClass.driver.GetSelected()
+                    else:
+                        # -> 'to' -> select by bbox
+                        digitClass.driver.SetSelected([])
+                        # return number of selected features (by box/point)
+                        nselected = digitClass.driver.SelectLinesByBox(pos1, pos2,
+                                                                       digitClass.GetSelectType())
+                        if nselected == 0:
+                            if digitClass.driver.SelectLineByPoint(pos1,
+                                                                   digitClass.GetSelectType()) is not None:
+                                nselected = 1
+
+                        if nselected > 0:
+                            self.copyCatsIds = digitClass.driver.GetSelected()
+
+                elif digitToolbar.GetAction() == "queryLine":
+                    selected = digitClass.SelectLinesByQuery(pos1, pos2)
+                    nselected = len(selected)
+                    if nselected > 0:
+                        digitClass.driver.SetSelected(selected)
+
+                else:
+                    # -> moveLine || deleteLine, etc. (select by point/box)
+                    if digitToolbar.GetAction() == 'moveLine' and \
+                           len(digitClass.driver.GetSelected()) > 0:
+                        nselected = 0
+                    else:
+                        if digitToolbar.GetAction() == 'moveLine':
+                            drawSeg = True
+                        else:
+                            drawSeg = False
+                        nselected = digitClass.driver.SelectLinesByBox(pos1, pos2,
+                                                                       digitClass.GetSelectType(),
+                                                                       drawSeg)
+                        
+                        if nselected == 0:
+                            if digitClass.driver.SelectLineByPoint(pos1,
+                                                                   digitClass.GetSelectType()) is not None:
+                                nselected = 1
+                
+                if nselected > 0:
+                    if digitToolbar.GetAction() in ["moveLine", "moveVertex"]:
+                        # get pseudoDC id of objects which should be redrawn
+                        if digitToolbar.GetAction() == "moveLine":
+                            # -> move line
+                            self.vdigitMove['id'] = digitClass.driver.GetSelected(grassId=False)
+                            self.vdigitMove['coord'] = digitClass.driver.GetSelectedCoord()
+                        elif digitToolbar.GetAction() == "moveVertex":
+                            # -> move vertex
+                            self.vdigitMove['id'] = digitClass.driver.GetSelectedVertex(pos1)
+                            if len(self.vdigitMove['id']) == 0: # no vertex found
+                                digitClass.driver.SetSelected([])
+
+                                   
+                    #
+                    # check for duplicates
+                    #
+                    if UserSettings.Get(group='vdigit', key='checkForDupl', subkey='enabled') is True:
+                        dupl = digitClass.driver.GetDuplicates()
+                        self.UpdateMap(render=False)
+
+                        if dupl:
+                            posWindow = self.ClientToScreen((self.mouse['end'][0] + self.dialogOffset,
+                                                             self.mouse['end'][1] + self.dialogOffset))
+                            
+                            dlg = VDigitDuplicatesDialog(parent=self, data=dupl, pos=posWindow)
+
+                            if dlg.ShowModal() == wx.ID_OK:
+                                digitClass.driver.UnSelect(dlg.GetUnSelected())
+                                # update selected
+                                self.UpdateMap(render=False)
+
+                    if digitToolbar.GetAction() != "editLine":
+                        # -> move line || move vertex
+                        self.UpdateMap(render=False)
+
+                else: # no vector object found
+                    if not (digitToolbar.GetAction() in ["moveLine", "moveVertex"] and \
+                                len(self.vdigitMove['id']) > 0):
+                        # avoid left-click when features are already selected
+                        self.UpdateMap(render=False, renderVector=False)
+
+            elif digitToolbar.GetAction() in ["splitLine", "addVertex", "removeVertex"]:
+                pointOnLine = digitClass.driver.SelectLineByPoint(pos1,
+                                                                  type=VDigit_Lines_Type)
+                if pointOnLine:
+                    if digitToolbar.GetAction() in ["splitLine", "addVertex"]:
+                        self.UpdateMap(render=False) # highlight object
+                        self.DrawCross(pdc=self.pdcTmp, coords=self.Cell2Pixel(pointOnLine),
+                                       size=5)
+                    elif digitToolbar.GetAction() == "removeVertex":
+                        # get only id of vertex
+                        try:
+                            id = digitClass.driver.GetSelectedVertex(pos1)[0]
+                        except IndexError:
+                            id = None
+
+                        if id:
+                            x, y = self.pdcVector.GetIdBounds(id)[0:2]
+                            self.pdcVector.RemoveId(id)
+                            self.UpdateMap(render=False) # highlight object
+                            self.DrawCross(pdc=self.pdcTmp, coords=(x, y),
+                                           size=5)
+                        else:
+                            # unselect
+                            digitClass.driver.SetSelected([])
+                            self.UpdateMap(render=False)
+                            
+            elif digitToolbar.GetAction() == "copyLine":
+                if UserSettings.Get(group='vdigit', key='bgmap',
+                                    subkey='value', internal=True) == '':
+                    # no background map -> copy from current vector map layer
+                    nselected = digitClass.driver.SelectLinesByBox(pos1, pos2,
+                                                                   digitClass.GetSelectType())
+
+                    if nselected > 0:
+                        # highlight selected features
+                        self.UpdateMap(render=False)
+                    else:
+                        self.UpdateMap(render=False, renderVector=False)
+                else:
+                    # copy features from background map
+                    self.copyIds = digitClass.SelectLinesFromBackgroundMap(pos1, pos2)
+                    if len(self.copyIds) > 0:
+                        color = UserSettings.Get(group='vdigit', key='symbol',
+                                                 subkey=['highlight', 'color'])
+                        colorStr = str(color[0]) + ":" + \
+                            str(color[1]) + ":" + \
+                            str(color[2])
+                        dVectTmp = ['d.vect',
+                                    'map=%s' % UserSettings.Get(group='vdigit', key='bgmap',
+                                                                subkey='value', internal=True),
+                                    'cats=%s' % utils.ListOfCatsToRange(self.copyIds),
+                                    '-i',
+                                    'color=%s' % colorStr,
+                                    'fcolor=%s' % colorStr,
+                                    'type=point,line,boundary,centroid',
+                                    'width=2']
+                        
+                        self.layerTmp = self.Map.AddLayer(type='vector',
+                                                          name=globalvar.QUERYLAYER,
+                                                          command=dVectTmp)
+                        self.UpdateMap(render=True, renderVector=False)
+                    else:
+                        self.UpdateMap(render=False, renderVector=False)
+                    self.redrawAll = None
+
+            elif digitToolbar.GetAction() == "zbulkLine" and len(self.polycoords) == 2:
+                # select lines to be labeled
+                pos1 = self.polycoords[0]
+                pos2 = self.polycoords[1]
+                nselected = digitClass.driver.SelectLinesByBox(pos1, pos2,
+                                                               digitClass.GetSelectType())
+
+                if nselected > 0:
+                    # highlight selected features
+                    self.UpdateMap(render=False)
+                    self.DrawLines(pdc=self.pdcTmp) # redraw temp line
+                else:
+                    self.UpdateMap(render=False, renderVector=False)
+
+            elif digitToolbar.GetAction() == "connectLine":
+                if len(digitClass.driver.GetSelected()) > 0:
+                    self.UpdateMap(render=False)
+                    
+            if len(digitClass.driver.GetSelected()) > 0:
+                self.redrawAll = None
+                ### self.OnPaint(None)
+                
+        elif (self.mouse['use'] == 'pointer' and 
+                self.dragid >= 0):
+            # end drag of overlay decoration
+            
+            if self.dragid < 99 and self.overlays.has_key(self.dragid):
+                self.overlays[self.dragid]['coords'] = self.pdc.GetIdBounds(self.dragid)
+            elif self.dragid > 100 and self.textdict.has_key(self.dragid):
+                self.textdict[self.dragid]['coords'] = self.pdc.GetIdBounds(self.dragid)
+            else:
+                pass
+            self.dragid = None
+            self.currtxtid = None
+#            self.UpdateMap(render=True)
+            
+        else:
+            pass
+                                              
+#        event.Skip()
+
+    def OnButtonDClick(self, event):
+        """
+        Mouse button double click
+        """
+        Debug.msg (5, "BufferedWindow.OnButtonDClick(): use=%s" % \
+                   self.mouse["use"])
+
+        if self.mouse["use"] == "measure":
+            # measure
+            self.ClearLines(pdc=self.pdcTmp)
+            self.polycoords = []
+            self.mouse['use'] = 'pointer'
+            self.mouse['box'] = 'point'
+            self.mouse['end'] = [0, 0]
+            self.Refresh()
+            self.SetCursor(self.parent.cursors["default"])
+        elif self.mouse["use"] == "profile":
+            # profile
+            pass
+        #                self.pdc.ClearId(self.lineid)
+        #                self.pdc.ClearId(self.plineid)
+        #                print 'coordinates: ',self.polycoords
+        #                self.polycoords = []
+        #                self.mouse['begin'] = self.mouse['end'] = [0, 0]
+        #                self.Refresh()
+        elif self.mouse['use'] == 'pointer' and self.parent.toolbars['vdigit']:
+            # digitization tool
+            pass
+        else:
+            # select overlay decoration options dialog
+            clickposition = event.GetPositionTuple()[:]
+            idlist  = self.pdc.FindObjects(clickposition[0], clickposition[1], self.hitradius)
+            if idlist == []:
+                return
+            self.dragid = idlist[0]
+
+            # self.ovlcoords[self.dragid] = self.pdc.GetIdBounds(self.dragid)
+            if self.dragid > 100:
+                self.currtxtid = self.dragid
+                self.parent.OnAddText(None)
+            elif self.dragid == 0:
+                self.parent.OnAddBarscale(None)
+            elif self.dragid == 1:
+                self.parent.OnAddLegend(None)
+                
+#        event.Skip()
+
+    def OnRightDown(self, event):
+        """
+        Right mouse button pressed
+        """
+        Debug.msg (5, "BufferedWindow.OnRightDown(): use=%s" % \
+                   self.mouse["use"])
+                   
+        digitToolbar = self.parent.toolbars['vdigit']
+        if digitToolbar:
+            digitClass = self.parent.digit
+            # digitization tool (confirm action)
+            if digitToolbar.GetAction() in ["moveLine", "moveVertex"] and \
+                    hasattr(self, "vdigitMove"):
+
+                pFrom = self.vdigitMove['begin']
+                pTo = self.Pixel2Cell(event.GetPositionTuple())
+                
+                move = (pTo[0] - pFrom[0],
+                        pTo[1] - pFrom[1])
+                
+                if digitToolbar.GetAction() == "moveLine":
+                    # move line
+                    if digitClass.MoveSelectedLines(move) < 0:
+                        return
+                elif digitToolbar.GetAction() == "moveVertex":
+                    # move vertex
+                    if digitClass.MoveSelectedVertex(pFrom, move) < 0:
+                        return
+                
+                del self.vdigitMove
+                
+        event.Skip()
+
+    def OnRightUp(self, event):
+        """
+        Right mouse button released
+        """
+        Debug.msg (5, "BufferedWindow.OnRightUp(): use=%s" % \
+                   self.mouse["use"])
+
+        digitToolbar = self.parent.toolbars['vdigit']
+        if digitToolbar:
+            digitClass = self.parent.digit
+            # digitization tool (confirm action)
+            if digitToolbar.GetAction() == "addLine" and \
+                    digitToolbar.GetAction('type') in ["line", "boundary"]:
+                # -> add new line / boundary
+                try:
+                    map = digitToolbar.GetLayer().GetName()
+                except:
+                    map = None
+                    wx.MessageBox(parent=self,
+                                  message=_("No vector map selected for editing."),
+                                  caption=_("Error"), style=wx.OK | wx.ICON_ERROR | wx.CENTRE)
+                    
+                if map:
+                    # mapcoords = []
+                    # xy -> EN
+                    # for coord in self.polycoords:
+                    #    mapcoords.append(self.Pixel2Cell(coord))
+                    if digitToolbar.GetAction('type') == 'line':
+                        line = True
+                    else:
+                        line = False
+
+                    if len(self.polycoords) < 2: # ignore 'one-point' lines
+                        return
+                    
+                    fid = digitClass.AddLine(map, line, self.polycoords)
+                    if fid < 0:
+                        return
+                    
+                    position = self.Cell2Pixel(self.polycoords[-1])
+                    self.polycoords = []
+                    self.UpdateMap(render=False)
+                    self.redrawAll = True
+                    self.Refresh()
+                    
+                    # add new record into atribute table
+                    if UserSettings.Get(group='vdigit', key="addRecord", subkey='enabled') is True:
+                        posWindow = self.ClientToScreen((position[0] + self.dialogOffset,
+                                                         position[1] + self.dialogOffset))
+
+                        # select attributes based on layer and category
+                        cats = { fid : {
+                                UserSettings.Get(group='vdigit', key="layer", subkey='value') :
+                                    (UserSettings.Get(group='vdigit', key="category", subkey='value'), )
+                                }}
+
+                        addRecordDlg = dbm.DisplayAttributesDialog(parent=self, map=map,
+                                                                   cats=cats,
+                                                                   pos=posWindow,
+                                                                   action="add")
+                        if addRecordDlg.mapDBInfo and \
+                               addRecordDlg.ShowModal() == wx.ID_OK:
+                            sqlfile = tempfile.NamedTemporaryFile(mode="w")
+                            for sql in addRecordDlg.GetSQLString():
+                                sqlfile.file.write(sql + ";\n")
+                            sqlfile.file.flush()
+                            executeCommand = gcmd.Command(cmd=["db.execute",
+                                                              "--q",
+                                                              "input=%s" % sqlfile.name])
+            elif digitToolbar.GetAction() == "deleteLine":
+                # -> delete selected vector features
+                if digitClass.DeleteSelectedLines() < 0:
+                    return
+            elif digitToolbar.GetAction() == "splitLine":
+                # split line
+                if digitClass.SplitLine(self.Pixel2Cell(self.mouse['begin'])) < 0:
+                    return
+            elif digitToolbar.GetAction() == "addVertex":
+                # add vertex
+                if digitClass.AddVertex(self.Pixel2Cell(self.mouse['begin'])) < 0:
+                    return
+            elif digitToolbar.GetAction() == "removeVertex":
+                # remove vertex
+                if digitClass.RemoveVertex(self.Pixel2Cell(self.mouse['begin'])) < 0:
+                    return
+            elif digitToolbar.GetAction() in ("copyCats", "copyAttrs"):
+                try:
+                    if digitToolbar.GetAction() == 'copyCats':
+                        if digitClass.CopyCats(self.copyCatsList,
+                                               self.copyCatsIds, copyAttrb=False) < 0:
+                            return
+                    else:
+                        if digitClass.CopyCats(self.copyCatsList,
+                                               self.copyCatsIds, copyAttrb=True) < 0:
+                            return
+                    
+                    del self.copyCatsList
+                    del self.copyCatsIds
+                except AttributeError:
+                    pass
+            elif digitToolbar.GetAction() == "editLine" and \
+                    hasattr(self, "vdigitMove"):
+                line = digitClass.driver.GetSelected()
+                if digitClass.EditLine(line, self.polycoords) < 0:
+                    return
+                
+                del self.vdigitMove
+                
+            elif digitToolbar.GetAction() == "flipLine":
+                if digitClass.FlipLine() < 0:
+                    return
+            elif digitToolbar.GetAction() == "mergeLine":
+                if digitClass.MergeLine() < 0:
+                    return
+            elif digitToolbar.GetAction() == "breakLine":
+                if digitClass.BreakLine() < 0:
+                    return
+            elif digitToolbar.GetAction() == "snapLine":
+                if digitClass.SnapLine() < 0:
+                    return
+            elif digitToolbar.GetAction() == "connectLine":
+                if len(digitClass.driver.GetSelected()) > 1:
+                    if digitClass.ConnectLine() < 0:
+                        return
+            elif digitToolbar.GetAction() == "copyLine":
+                if digitClass.CopyLine(self.copyIds) < 0:
+                    return
+                del self.copyIds
+                if self.layerTmp:
+                    self.Map.DeleteLayer(self.layerTmp)
+                    self.UpdateMap(render=True, renderVector=False)
+                del self.layerTmp
+
+            elif digitToolbar.GetAction() == "zbulkLine" and len(self.polycoords) == 2:
+                pos1 = self.polycoords[0]
+                pos2 = self.polycoords[1]
+
+                selected = digitClass.driver.GetSelected()
+                dlg = VDigitZBulkDialog(parent=self, title=_("Z bulk-labeling dialog"),
+                                        nselected=len(selected))
+                if dlg.ShowModal() == wx.ID_OK:
+                    if digitClass.ZBulkLines(pos1, pos2, dlg.value.GetValue(),
+                                            dlg.step.GetValue()) < 0:
+                        return
+                self.UpdateMap(render=False, renderVector=True)
+            elif digitToolbar.GetAction() == "typeConv":
+                # -> feature type conversion
+                # - point <-> centroid
+                # - line <-> boundary
+                if digitClass.TypeConvForSelectedLines() < 0:
+                    return
+
+            if digitToolbar.GetAction() != "addLine":
+                # unselect and re-render
+                digitClass.driver.SetSelected([])
+                self.polycoords = []
+                self.UpdateMap(render=False)
+
+            self.redrawAll = True
+            self.Refresh()
+        
+        event.Skip()
+
+    def OnMiddleDown(self, event):
+        """
+        Middle mouse button pressed
+        """
+        digitToolbar = self.parent.toolbars['vdigit']
+        # digitization tool
+        if self.mouse["use"] == "pointer" and digitToolbar:
+            digitClass = self.parent.digit
+            if (digitToolbar.GetAction() == "addLine" and \
+                    digitToolbar.GetAction('type') in ["line", "boundary"]) or \
+                    digitToolbar.GetAction() == "editLine":
+                # add line or boundary -> remove last point from the line
+                try:
+                    removed = self.polycoords.pop()
+                    Debug.msg(4, "BufferedWindow.OnMiddleDown(): polycoords_poped=%s" % \
+                                  [removed,])
+
+                    self.mouse['begin'] = self.Cell2Pixel(self.polycoords[-1])
+                except:
+                    pass
+
+                if digitToolbar.GetAction() == "editLine":
+                    # remove last vertex & line
+                    if len(self.vdigitMove['id']) > 1:
+                        self.vdigitMove['id'].pop()
+
+                self.UpdateMap(render=False, renderVector=False)
+
+            elif digitToolbar.GetAction() in ["deleteLine", "moveLine", "splitLine",
+                                              "addVertex", "removeVertex", "moveVertex",
+                                              "copyCats", "flipLine", "mergeLine",
+                                              "snapLine", "connectLine", "copyLine",
+                                              "queryLine", "breakLine", "typeConv"]:
+                # varios tools -> unselected selected features
+                digitClass.driver.SetSelected([])
+                if digitToolbar.GetAction() in ["moveLine", "moveVertex", "editLine"] and \
+                        hasattr(self, "vdigitMove"):
+
+                    del self.vdigitMove
+                    
+                elif digitToolbar.GetAction() == "copyCats":
+                    try:
+                        del self.copyCatsList
+                        del self.copyCatsIds
+                    except AttributeError:
+                        pass
+                
+                elif digitToolbar.GetAction() == "copyLine":
+                    del self.copyIds
+                    if self.layerTmp:
+                        self.Map.DeleteLayer(self.layerTmp)
+                        self.UpdateMap(render=True, renderVector=False)
+                    del self.layerTmp
+
+                self.polycoords = []
+                self.UpdateMap(render=False) # render vector
+
+            elif digitToolbar.GetAction() == "zbulkLine":
+                # reset polyline
+                self.polycoords = []
+                digitClass.driver.SetSelected([])
+                self.UpdateMap(render=False)
+            
+            self.redrawAll = True
+            
+    def OnMouseMoving(self, event):
+        """
+        Motion event and no mouse buttons were pressed
+        """
+        digitToolbar = self.parent.toolbars['vdigit']
+        if self.mouse["use"] == "pointer" and digitToolbar:
+            digitClass = self.parent.digit
+            self.mouse['end'] = event.GetPositionTuple()[:]
+            Debug.msg (5, "BufferedWindow.OnMouseMoving(): coords=%f,%f" % \
+                           (self.mouse['end'][0], self.mouse['end'][1]))
+            if digitToolbar.GetAction() == "addLine" and digitToolbar.GetAction('type') in ["line", "boundary"]:
+                if len(self.polycoords) > 0:
+                    self.MouseDraw(pdc=self.pdcTmp, begin=self.Cell2Pixel(self.polycoords[-1]))
+            elif digitToolbar.GetAction() in ["moveLine", "moveVertex", "editLine"] \
+                    and hasattr(self, "vdigitMove"):
+                dx = self.mouse['end'][0] - self.mouse['begin'][0]
+                dy = self.mouse['end'][1] - self.mouse['begin'][1]
+                
+                if len(self.vdigitMove['id']) > 0:
+                    # draw lines on new position
+                    if digitToolbar.GetAction() == "moveLine":
+                        # move line
+                        for id in self.vdigitMove['id']:
+                            self.pdcTmp.TranslateId(id, dx, dy)
+                    elif digitToolbar.GetAction() in ["moveVertex", "editLine"]:
+                        # move vertex ->
+                        # (vertex, left vertex, left line,
+                        # right vertex, right line)
+
+                        # do not draw static lines
+                        if digitToolbar.GetAction() == "moveVertex":
+                            self.polycoords = []
+                            ### self.pdcTmp.TranslateId(self.vdigitMove['id'][0], dx, dy)
+                            self.pdcTmp.RemoveId(self.vdigitMove['id'][0])
+                            if self.vdigitMove['id'][1] > 0: # previous vertex
+                                x, y = self.Pixel2Cell(self.pdcTmp.GetIdBounds(self.vdigitMove['id'][1])[0:2])
+                                self.pdcTmp.RemoveId(self.vdigitMove['id'][1]+1)
+                                self.polycoords.append((x, y))
+                            ### x, y = self.Pixel2Cell(self.pdcTmp.GetIdBounds(self.vdigitMove['id'][0])[0:2])
+                            self.polycoords.append(self.Pixel2Cell(self.mouse['end']))
+                            if self.vdigitMove['id'][2] > 0: # next vertex
+                                x, y = self.Pixel2Cell(self.pdcTmp.GetIdBounds(self.vdigitMove['id'][2])[0:2])
+                                self.pdcTmp.RemoveId(self.vdigitMove['id'][2]-1)
+                                self.polycoords.append((x, y))
+                            
+                            self.ClearLines(pdc=self.pdcTmp)
+                            self.DrawLines(pdc=self.pdcTmp)
+
+                        else: # edit line
+                            try:
+                                if self.vdigitMove['id'][-1] > 0: # previous vertex
+                                    self.MouseDraw(pdc=self.pdcTmp,
+                                                   begin=self.Cell2Pixel(self.polycoords[-1]))
+                            except: # no line
+                                self.vdigitMove['id'] = []
+                                self.polycoords = []
+
+                self.Refresh() # TODO: use RefreshRect()
+                self.mouse['begin'] = self.mouse['end']
+
+            elif digitToolbar.GetAction() == "zbulkLine":
+                if len(self.polycoords) == 1:
+                    # draw mouse moving
+                    self.MouseDraw(self.pdcTmp)
+
+        event.Skip()
+
+    def ClearLines(self, pdc=None):
+        """
+        Clears temporary drawn lines from PseudoDC
+        """
+        if not pdc:
+            pdc=self.pdcTmp
+        try:
+            pdc.ClearId(self.lineid)
+            pdc.RemoveId(self.lineid)
+        except:
+            pass
+
+        try:
+            pdc.ClearId(self.plineid)
+            pdc.RemoveId(self.plineid)
+        except:
+            pass
+
+        Debug.msg(4, "BufferedWindow.ClearLines(): lineid=%s, plineid=%s" %
+                  (self.lineid, self.plineid))
+
+        ### self.Refresh()
+
+        return True
+
+    def Pixel2Cell(self, (x, y)):
+        """
+        Convert image coordinates to real word coordinates
+
+        Input : int x, int y
+        Output: float x, float y
+        """
+
+        try:
+            x = int(x)
+            y = int(y)
+        except:
+            return None
+
+        if self.Map.region["ewres"] > self.Map.region["nsres"]:
+            res = self.Map.region["ewres"]
+        else:
+            res = self.Map.region["nsres"]
+
+        w = self.Map.region["center_easting"] - (self.Map.width / 2) * res
+        n = self.Map.region["center_northing"] + (self.Map.height / 2) * res
+
+        east  = w + x * res
+        north = n - y * res
+
+        # extent does not correspond with whole map canvas area...
+        # east  = self.Map.region['w'] + x * self.Map.region["ewres"]
+        # north = self.Map.region['n'] - y * self.Map.region["nsres"]
+
+        return (east, north)
+
+    def Cell2Pixel(self, (east, north)):
+        """
+        Convert real word coordinates to image coordinates
+        """
+
+        try:
+            east  = float(east)
+            north = float(north)
+        except:
+            return None
+
+        if self.Map.region["ewres"] > self.Map.region["nsres"]:
+            res = self.Map.region["ewres"]
+        else:
+            res = self.Map.region["nsres"]
+
+        w = self.Map.region["center_easting"] - (self.Map.width / 2) * res
+        n = self.Map.region["center_northing"] + (self.Map.height / 2) * res
+
+        # x = int((east  - w) / res)
+        # y = int((n - north) / res)
+
+        x = (east  - w) / res
+        y = (n - north) / res
+
+        return (x, y)
+
+    def Zoom(self, begin, end, zoomtype):
+        """
+        Calculates new region while (un)zoom/pan-ing
+        """
+        x1, y1 = begin
+        x2, y2 = end
+        newreg = {}
+
+        # threshold - too small squares do not make sense
+        # can only zoom to windows of > 5x5 screen pixels
+        if abs(x2-x1) > 5 and abs(y2-y1) > 5 and zoomtype != 0:
+
+            if x1 > x2:
+                x1, x2 = x2, x1
+            if y1 > y2:
+                y1, y2 = y2, y1
+
+            # zoom in
+            if zoomtype > 0:
+                newreg['w'], newreg['n'] = self.Pixel2Cell((x1, y1))
+                newreg['e'], newreg['s'] = self.Pixel2Cell((x2, y2))
+
+            # zoom out
+            elif zoomtype < 0:
+                newreg['w'], newreg['n'] = self.Pixel2Cell((-x1 * 2, -y1 * 2))
+                newreg['e'], newreg['s'] = self.Pixel2Cell((self.Map.width  + 2 * \
+                                                                (self.Map.width  - x2),
+                                                            self.Map.height + 2 * \
+                                                                (self.Map.height - y2)))
+        # pan
+        elif zoomtype == 0:
+            dx = x1 - x2
+            dy = y1 - y2
+            newreg['w'], newreg['n'] = self.Pixel2Cell((dx, dy))
+            newreg['e'], newreg['s'] = self.Pixel2Cell((self.Map.width  + dx,
+                                                        self.Map.height + dy))
+
+        # if new region has been calculated, set the values
+        if newreg != {}:
+            # LL locations
+            if self.parent.Map.projinfo['proj'] == 'll':
+                if newreg['n'] > 90.0:
+                    newreg['n'] = 90.0
+                if newreg['s'] < -90.0:
+                    newreg['s'] = -90.0
+            
+            ce = newreg['w'] + (newreg['e'] - newreg['w']) / 2
+            cn = newreg['s'] + (newreg['n'] - newreg['s']) / 2
+            
+            if hasattr(self, "vdigitMove"):
+                # xo = self.Cell2Pixel((self.Map.region['center_easting'], self.Map.region['center_northing']))
+                # xn = self.Cell2Pixel(ce, cn))
+                tmp = self.Pixel2Cell(self.mouse['end'])
+            
+            # calculate new center point and display resolution
+            self.Map.region['center_easting'] = ce
+            self.Map.region['center_northing'] = cn
+            self.Map.region["ewres"] = (newreg['e'] - newreg['w']) / self.Map.width
+            self.Map.region["nsres"] = (newreg['n'] - newreg['s']) / self.Map.height
+            self.Map.AlignExtentFromDisplay()
+
+            if hasattr(self, "vdigitMove"):
+                tmp1 = self.mouse['end']
+                tmp2 = self.Cell2Pixel(self.vdigitMove['begin'])
+                dx = tmp1[0] - tmp2[0]
+                dy = tmp1[1] - tmp2[1]
+                self.vdigitMove['beginDiff'] = (dx, dy)
+                for id in self.vdigitMove['id']:
+                    self.pdcTmp.RemoveId(id)
+            
+            self.ZoomHistory(self.Map.region['n'], self.Map.region['s'],
+                             self.Map.region['e'], self.Map.region['w'])
+
+        if self.redrawAll is False:
+            self.redrawAll = True
+
+    def ZoomBack(self):
+        """
+        Zoom to previous extents in zoomhistory list
+        """
+
+        zoom = []
+        if len(self.zoomhistory) > 1:
+            self.zoomhistory.pop()
+            zoom = self.zoomhistory[len(self.zoomhistory)-1]
+            # (n, s, e, w)
+        if zoom:
+            # zoom to selected region
+            self.Map.region['center_easting'] = zoom[3] + \
+                (zoom[2] - zoom[3]) / 2
+            self.Map.region['center_northing'] = zoom[1] + \
+                (zoom[0] - zoom[1]) / 2
+            self.Map.region["ewres"] = (zoom[2] - zoom[3]) / self.Map.width
+            self.Map.region["nsres"] = (zoom[0] - zoom[1]) / self.Map.height
+            self.Map.AlignExtentFromDisplay()
+
+            # update map
+            self.UpdateMap()
+
+            # update statusbar
+            self.parent.StatusbarUpdate()
+
+    def ZoomHistory(self, n, s, e, w):
+        """
+        Manages a list of last 10 zoom extents
+
+        Return removed history item if exists
+        """
+        removed = None
+        self.zoomhistory.append((n,s,e,w))
+
+        if len(self.zoomhistory) > 10:
+            removed = self.zoomhistory.pop(0)
+
+        if removed:
+            Debug.msg(4, "BufferedWindow.ZoomHistory(): hist=%s, removed=%s" %
+                      (self.zoomhistory, removed))
+        else:
+            Debug.msg(4, "BufferedWindow.ZoomHistory(): hist=%s" %
+                      (self.zoomhistory))
+
+        return removed
+
+    def OnZoomToMap(self, event):
+        """
+        Set display extents to match selected raster (including NULLs)
+        or vector map.
+        """
+        self.ZoomToMap()
+
+    def OnZoomToRaster(self, event):
+        """
+        Set display extents to match selected raster map (ignore NULLs)
+        """
+        self.ZoomToMap(zoom=True)
+        
+    def ZoomToMap(self, layer = None, zoom = False):
+        """
+        Set display extents to match selected raster
+        or vector map.
+        """
+        zoomreg = {}
+
+        if not layer:
+            layer = self.GetSelectedLayer(multi = True)
+        
+        if not layer:
+            return
+
+        rast = []
+        vect = []
+        updated = False
+        for l in layer:
+            # only raster/vector layers are currently supported
+            if l.type == 'raster':
+                rast.append(l.name)
+            elif l.type == 'vector':
+                if self.parent.digit and l.name == self.parent.digit.map and \
+                        self.parent.digit.type == 'vdigit':
+                    w, s, b, e, n, t = self.parent.digit.driver.GetMapBoundingBox()
+                    self.Map.GetRegion(n=n, s=s, w=w, e=e,
+                                       update=True)
+                    updated = True
+                else:
+                    vect.append(l.name)
+
+        if not updated:
+            self.Map.GetRegion(rast = rast,
+                               vect = vect,
+                               update = True)
+        
+        self.ZoomHistory(self.Map.region['n'], self.Map.region['s'],
+                         self.Map.region['e'], self.Map.region['w'])
+
+        self.UpdateMap()
+
+        self.parent.StatusbarUpdate()
+
+    def ZoomToWind(self, event):
+        """
+        Set display geometry to match computational
+        region settings (set with g.region)
+        """
+        self.Map.region = self.Map.GetRegion()
+        ### self.Map.SetRegion(windres=True)
+
+        self.ZoomHistory(self.Map.region['n'], self.Map.region['s'],
+                         self.Map.region['e'], self.Map.region['w'])
+
+        self.UpdateMap()
+
+        self.parent.StatusbarUpdate()
+
+    def ZoomToDefault(self, event):
+        """
+        Set display geometry to match default region settings
+        """
+        self.Map.region = self.Map.GetRegion(default=True)
+        self.Map.AdjustRegion() # aling region extent to the display
+
+        self.ZoomHistory(self.Map.region['n'], self.Map.region['s'],
+                         self.Map.region['e'], self.Map.region['w'])
+
+        self.UpdateMap()
+
+        self.parent.StatusbarUpdate()
+        
+    def DisplayToWind(self, event):
+        """
+        Set computational region (WIND file) to
+        match display extents
+        """
+        tmpreg = os.getenv("GRASS_REGION")
+        if tmpreg:
+            del os.environ["GRASS_REGION"]
+
+        # We ONLY want to set extents here. Don't mess with resolution. Leave that
+        # for user to set explicitly with g.region
+        new = self.Map.AlignResolution()
+        
+        cmdRegion = ["g.region", "--o",
+                     "n=%f"    % new['n'],
+                     "s=%f"    % new['s'],
+                     "e=%f"    % new['e'],
+                     "w=%f"    % new['w'],
+                     "rows=%d" % int(new['rows']),
+                     "cols=%d" % int(new['cols'])]
+        
+        p = gcmd.Command(cmdRegion)
+
+        if tmpreg:
+            os.environ["GRASS_REGION"] = tmpreg
+
+    def ZoomToSaved(self, event):
+        """!Set display geometry to match extents in
+        saved region file
+        """
+        dlg = gdialogs.SavedRegion(parent = self, id = wx.ID_ANY,
+                                   title = _("Zoom to saved region extents"),
+                                   pos=wx.DefaultPosition, size=wx.DefaultSize,
+                                   style=wx.DEFAULT_DIALOG_STYLE,
+                                   loadsave='load')
+        
+        if dlg.ShowModal() == wx.ID_CANCEL:
+            dlg.Destroy()
+            return
+        
+        wind = dlg.wind
+        
+        self.Map.GetRegion(regionName = wind,
+                           update = True)
+        
+        dlg.Destroy()
+        
+        self.ZoomHistory(self.Map.region['n'],
+                         self.Map.region['s'],
+                         self.Map.region['e'],
+                         self.Map.region['w'])
+        
+        self.UpdateMap()
+    
+    def SaveDisplayRegion(self, event):
+        """
+        Save display extents to named region file.
+        """
+
+        dlg = gdialogs.SavedRegion(parent = self, id = wx.ID_ANY,
+                                   title = _("Save display extents to region file"),
+                                   pos=wx.DefaultPosition, size=wx.DefaultSize,
+                                   style=wx.DEFAULT_DIALOG_STYLE,
+                                   loadsave='save')
+        if dlg.ShowModal() == wx.ID_CANCEL:
+            dlg.Destroy()
+            return
+        
+        wind = dlg.wind
+        
+        # test to see if it already exists and ask permission to overwrite
+        windpath = os.path.join(self.Map.env["GISDBASE"], self.Map.env["LOCATION_NAME"],
+                                self.Map.env["MAPSET"], "windows", wind)
+        
+        if windpath and not os.path.exists(windpath):
+            self.SaveRegion(wind)
+        elif windpath and os.path.exists(windpath):
+            overwrite = wx.MessageBox(_("Region file <%s> already exists. "
+                                        "Do you want to overwrite it?") % (wind),
+                                      _("Warning"), wx.YES_NO | wx.CENTRE)
+            if (overwrite == wx.YES):
+                self.SaveRegion(wind)
+        else:
+            pass
+
+        dlg.Destroy()
+
+    def SaveRegion(self, wind):
+        """
+        Save region settings
+        """
+        ### new = self.Map.AlignResolution()
+        new = self.Map.GetCurrentRegion()
+        
+        cmdRegion = ["g.region",
+                     "-u",
+                     "n=%f" % new['n'],
+                     "s=%f" % new['s'],
+                     "e=%f" % new['e'],
+                     "w=%f" % new['w'],
+                     "rows=%d" % new['rows'],
+                     "cols=%d" % new['cols'],
+                     "save=%s" % wind,
+                     "--o"]
+
+        tmpreg = os.getenv("GRASS_REGION")
+        if tmpreg:
+            del os.environ["GRASS_REGION"]
+        
+        p = gcmd.Command(cmdRegion)
+
+        if tmpreg:
+            os.environ["GRASS_REGION"] = tmpreg
+
+    def Distance(self, beginpt, endpt, screen=True):
+        """Calculete distance
+
+        LL-locations not supported
+
+        @todo Use m.distance
+
+        @param beginpt first point
+        @param endpt second point
+        @param screen True for screen coordinates otherwise EN
+        """
+        x1, y1 = beginpt
+        x2, y2 = endpt
+        if screen:
+            dEast  = (x2 - x1) * self.Map.region["ewres"]
+            dNorth = (y2 - y1) * self.Map.region["nsres"]
+        else:
+            dEast  = (x2 - x1)
+            dNorth = (y2 - y1)
+            
+
+        return (math.sqrt(math.pow((dEast),2) + math.pow((dNorth),2)), (dEast, dNorth))
+
+
+
+class MapFrame(wx.Panel):
+    """
+    Main frame for map display window. Drawing takes place in child double buffered
+    drawing window.
+    """
+
+    def __init__(self, parent=None, id=wx.ID_ANY, title=_("GRASS GIS - Map display"),
+                 pos=wx.DefaultPosition, size=wx.DefaultSize,
+                 style=wx.DEFAULT_FRAME_STYLE, toolbars=["map"],
+                 tree=None, notebook=None, gismgr=None, page=None,
+                 Map=None, auimgr=None,frame=None,flag=False):
+        """
+        Main map display window with toolbars, statusbar and
+        DrawWindow
+
+        @param toolbars array of activated toolbars, e.g. ['map', 'digit']
+        @param tree reference to layer tree
+        @param notebook control book ID in Layer Manager
+        @param mgr Layer Manager
+        @param page notebook page with layer tree
+        @param Map instance of render.Map
+        """
+        self.gismanager = gismgr   # Layer Manager object
+        self._layerManager = gismgr
+        self.Map        = Map       # instance of render.Map
+        self.tree       = tree      # Layer Manager layer tree object
+        self.page       = page      # Notebook page holding the layer tree
+        self.layerbook  = notebook  # Layer Manager layer tree notebook
+        self.parent     = parent
+        self.frame = frame
+        self.statusFlag = flag
+        self.statusbar = None
+
+        #FIX THIS
+
+        
+        #
+        # available cursors
+        #
+        self.cursors = {
+            # default: cross
+            # "default" : wx.StockCursor(wx.CURSOR_DEFAULT),
+            "default" : wx.StockCursor(wx.CURSOR_ARROW),
+            "cross"   : wx.StockCursor(wx.CURSOR_CROSS),
+            "hand"    : wx.StockCursor(wx.CURSOR_HAND),
+            "pencil"  : wx.StockCursor(wx.CURSOR_PENCIL),
+            "sizenwse": wx.StockCursor(wx.CURSOR_SIZENWSE)
+            }
+
+        #wx.Frame.__init__(self, parent, id, title, pos, size, style)
+
+
+        wx.Panel.__init__(self, parent, id, pos, size, style,name="pg_panel")
+        #self.SetName("MapWindow")
+
+        #
+        # set the size & system icon
+        #
+        #self.SetClientSize(size)
+        self.iconsize = (16, 16)
+
+
+
+
+        #self.SetIcon(wx.Icon(os.path.join(globalvar.ETCICONDIR, 'grass_map.ico'), wx.BITMAP_TYPE_ICO))
+
+        #
+        # Fancy gui
+        #
+        # self._mgr = auimgr
+
+      
+
+        self._mgr = wx.aui.AuiManager(self)
+        
+        #self._layerManager.goutput = goutput.GMConsole(self.parent.GetParent(), pageid=1)
+        #self._layerManager.goutput.Hide()
+
+        #
+        # Add toolbars
+        #
+        self.toolbars = { 'map' : None,
+                          'vdigit' : None,
+                          'georect' : None, 
+                          'nviz' : None }
+        for toolb in toolbars:
+            self.AddToolbar(toolb)
+
+        #
+        # Add statusbar
+        #
+        if self.statusFlag:
+            self.statusbar = self.frame.CreateStatusBar(number=4, style=0)
+            self.statusbar.SetStatusWidths([-5, -2, -1, -1])
+        else:
+            self.statusbar = self.frame.GetStatusBar()
+
+            
+
+        self.statusbarWin = dict()
+        self.statusbarWin['toggle'] = wx.Choice(self.statusbar, wx.ID_ANY,
+                                                choices = globalvar.MAP_DISPLAY_STATUSBAR_MODE)
+        self.statusbarWin['toggle'].SetSelection(UserSettings.Get(group='display',
+                                                                  key='statusbarMode',
+                                                                  subkey='selection'))
+
+        self.statusbar.Bind(wx.EVT_CHOICE, self.OnToggleStatus, self.statusbarWin['toggle'])
+
+        # auto-rendering checkbox
+        self.statusbarWin['render'] = wx.CheckBox(parent=self.statusbar, id=wx.ID_ANY,
+                                                  label=_("Render"))
+
+        self.statusbar.Bind(wx.EVT_CHECKBOX, self.OnToggleRender, self.statusbarWin['render'])
+
+        self.statusbarWin['render'].SetValue(UserSettings.Get(group='display',
+                                                              key='autoRendering',
+                                                              subkey='enabled'))
+        self.statusbarWin['render'].SetToolTip(wx.ToolTip (_("Enable/disable auto-rendering")))
+        # show region
+        self.statusbarWin['region'] = wx.CheckBox(parent=self.statusbar, id=wx.ID_ANY,
+                                                  label=_("Show computational extent"))
+
+
+        self.statusbar.Bind(wx.EVT_CHECKBOX, self.OnToggleShowRegion, self.statusbarWin['region'])
+        
+        self.statusbarWin['region'].SetValue(False)
+        self.statusbarWin['region'].Hide()
+        self.statusbarWin['region'].SetToolTip(wx.ToolTip (_("Show/hide computational "
+                                                             "region extent (set with g.region). "
+                                                             "Display region drawn as a blue box inside the "
+                                                             "computational region, "
+                                                             "computational region inside a display region "
+                                                             "as a red box).")))
+        # set resolution
+        self.statusbarWin['resolution'] = wx.CheckBox(parent=self.statusbar, id=wx.ID_ANY,
+                                                      label=_("Constrain display resolution to computational settings"))
+        self.statusbar.Bind(wx.EVT_CHECKBOX, self.OnToggleResolution, self.statusbarWin['resolution'])
+        self.statusbarWin['resolution'].SetValue(UserSettings.Get(group='display', key='compResolution', subkey='enabled'))
+        self.statusbarWin['resolution'].Hide()
+        self.statusbarWin['resolution'].SetToolTip(wx.ToolTip (_("Constrain display resolution "
+                                                                 "to computational region settings. "
+                                                                 "Default value for new map displays can "
+                                                                 "be set up in 'User GUI settings' dialog.")))
+        # map scale
+        self.statusbarWin['mapscale'] = wx.TextCtrl(parent=self.statusbar, id=wx.ID_ANY,
+                                                    value="", style=wx.TE_PROCESS_ENTER,
+                                                    size=(150, -1))
+        self.statusbarWin['mapscale'].Hide()
+        self.statusbar.Bind(wx.EVT_TEXT_ENTER, self.OnChangeMapScale, self.statusbarWin['mapscale'])
+
+        # go to
+        self.statusbarWin['goto'] = wx.TextCtrl(parent=self.statusbar, id=wx.ID_ANY,
+                                                value="", style=wx.TE_PROCESS_ENTER,
+                                                size=(300, -1))
+        self.statusbarWin['goto'].Hide()
+        self.statusbar.Bind(wx.EVT_TEXT_ENTER, self.OnGoTo, self.statusbarWin['goto'])
+
+        # projection
+        self.statusbarWin['projection'] = wx.CheckBox(parent=self.statusbar, id=wx.ID_ANY,
+                                                      label=_("Use defined projection"))
+        self.statusbarWin['projection'].SetValue(False)
+        size = self.statusbarWin['projection'].GetSize()
+        self.statusbarWin['projection'].SetMinSize((size[0] + 150, size[1]))
+        self.statusbarWin['projection'].SetToolTip(wx.ToolTip (_("Reproject coordinates displayed "
+                                                                 "in the statusbar. Projection can be "
+                                                                 "defined in GUI preferences dialog "
+                                                                 "(tab 'Display')")))
+        self.statusbarWin['projection'].Hide()
+        
+        # mask
+        self.statusbarWin['mask'] = wx.StaticText(parent = self.statusbar, id = wx.ID_ANY,
+                                                  label = '')
+        self.statusbarWin['mask'].SetForegroundColour(wx.Colour(255, 0, 0))
+        
+        # on-render gauge
+        self.statusbarWin['progress'] = wx.Gauge(parent=self.statusbar, id=wx.ID_ANY,
+                                      range=0, style=wx.GA_HORIZONTAL)
+        self.statusbarWin['progress'].Hide()
+        
+        self.StatusbarReposition() # reposition statusbar
+
+        self.maskInfo = wx.StaticText(parent = self.statusbar, id = wx.ID_ANY,
+                                                  label = '')
+        self.maskInfo.SetForegroundColour(wx.Colour(255, 0, 0))
+
+        #
+        # Init map display (buffered DC & set default cursor)
+        #
+
+        self.MapWindow2D = BufferedWindow(self, id=wx.ID_ANY,   Map=self.Map, tree=self.tree, gismgr=self._layerManager)
+        # default is 2D display mode
+        self.MapWindow = self.MapWindow2D
+        #self.MapWindow.Bind(wx.EVT_MOTION, self.OnMotion)
+        self.MapWindow.SetCursor(self.cursors["default"])
+        # used by Nviz (3D display mode)
+        self.MapWindow3D = None 
+
+        #
+        # initialize region values
+        #
+        self.__InitDisplay() 
+
+        #
+        # Bind various events
+        #
+        self.Bind(wx.EVT_ACTIVATE, self.OnFocus)
+        self.Bind(wx.EVT_CLOSE,    self.OnCloseWindow)
+        self.Bind(render.EVT_UPDATE_PRGBAR, self.OnUpdateProgress)
+        
+        #
+        # Update fancy gui style
+        #
+        self._mgr.AddPane(self.MapWindow, wx.aui.AuiPaneInfo().CentrePane().
+                          Dockable(False).BestSize((-1,-1)).
+                          CloseButton(False).DestroyOnClose(True).
+                          Layer(0))
+
+
+        self._mgr.Update()
+
+        #
+        # Init print module and classes
+        #
+        self.printopt = disp_print.PrintOptions(self, self.MapWindow)
+        
+        #
+        # Initialization of digitization tool
+        #
+        self.digit = None
+
+        #
+        # Init zoom history
+        #
+        self.MapWindow.ZoomHistory(self.Map.region['n'],
+                                   self.Map.region['s'],
+                                   self.Map.region['e'],
+                                   self.Map.region['w'])
+
+        #
+        # Re-use dialogs
+        #
+        self.dialogs = {}
+        self.dialogs['attributes'] = None
+        self.dialogs['category'] = None
+        self.dialogs['barscale'] = None
+        self.dialogs['legend'] = None
+
+        self.decorationDialog = None # decoration/overlays
+
+        pos = wx.Point(700,10)
+
+        self.gisrc  = self.read_gisrc()
+        self.viewInfo = True        #to display v/r.info on mapdisplay
+        self.gisdbase = self.gisrc['GISDBASE'] 
+
+        parent1 = self.GetParent()
+        
+        rightpanel = parent1.GetParent()
+
+        #splitter= rightpanel.GetParent()
+        self.lmgr= rightpanel
+
+        self.onRenderGauge = wx.Gauge(parent=self.statusbar, id=wx.ID_ANY,
+                                      range=0, style=wx.GA_HORIZONTAL)
+
+        self.compResolution = wx.CheckBox(parent=self.statusbar, id=wx.ID_ANY,
+                                         label=_("Constrain display resolution to computational settings"))
+        self.statusbar.Bind(wx.EVT_CHECKBOX, self.OnToggleResolution, self.compResolution)
+        self.compResolution.SetValue(UserSettings.Get(group='display', key='compResolution', subkey='enabled'))
+        self.compResolution.Hide()
+        self.compResolution.SetToolTip(wx.ToolTip (_("Constrain display resolution "
+                                                     "to computational region settings. "
+                                                     "Default value for new map displays can "
+                                                     "be set up in 'User GUI settings' dialog.")))
+
+        self.maptree = LayerTree(self, id=wx.ID_ANY, pos=wx.DefaultPosition,
+                                                      size=wx.DefaultSize, style=wx.TR_HAS_BUTTONS
+                                                      |wx.TR_LINES_AT_ROOT|wx.TR_HIDE_ROOT,
+                                                      gisdbase=self.gisdbase)
+        #self.maptree.SetBackgroundColour("red")
+
+        self._mgr.AddPane(self.maptree, wx.aui.AuiPaneInfo().Left().
+                                        Dockable(False).BestSize((400,300)).
+                                        CloseButton(False).DestroyOnClose(True).
+                                        Layer(0).Caption("MapTree"))
+
+        self._mgr.Update()
+
+        #r.rightSizer.Add(self.maptree)
+
+    def read_gisrc(self):
+	    """
+	    Read variables gisrc file
+	    """
+
+	    rc = {}
+
+	    gisrc = os.getenv("GISRC")
+
+	    if gisrc and os.path.isfile(gisrc):
+		    try:
+			    f = open(gisrc, "r")
+			    for line in f.readlines():
+				    key, val = line.split(":", 1)
+				    rc[key.strip()] = val.strip()
+		    finally:
+			    f.close()
+
+	    return rc
+
+
+    def AddToolbar(self, name):
+        """
+        Add defined toolbar to the window
+
+        Currently known toolbars are:
+        - map basic map toolbar
+        - digit vector digitizer
+        - georect georectifier
+        """
+        # default toolbar
+        if name == "map":
+            self.toolbars['map'] = toolbars.MapToolbar(self, self.Map)
+
+            self._mgr.AddPane(self.toolbars['map'].toolbar,
+                              wx.aui.AuiPaneInfo().
+                              Name("maptoolbar").Caption(_("Map Toolbar")).
+                              ToolbarPane().Top().
+                              LeftDockable(False).RightDockable(False).
+                              BottomDockable(False).TopDockable(True).
+                              CloseButton(False).Layer(2).
+                              BestSize((self.toolbars['map'].GetToolbar().GetSize())))
+	
+        # vector digitizer
+        elif name == "vdigit":
+            from vdigit import haveVDigit
+            if not haveVDigit:
+                from vdigit import errorMsg
+                msg = _("Unable to start vector digitizer.\nThe VDigit python extension "
+                        "was not found or loaded properly.\n"
+                        "Switching back to 2D display mode.\n\nDetails: %s" % errorMsg)
+                
+                self.toolbars['map'].combo.SetValue (_("2D view"))
+                wx.MessageBox(parent=self,
+                              message=msg,
+                              caption=_("Error"),
+                              style=wx.OK | wx.ICON_ERROR | wx.CENTRE)
+                return
+            
+            if self._layerManager:
+                log = self._layerManager.goutput
+            else:
+                log = None
+            self.toolbars['vdigit'] = toolbars.VDigitToolbar(parent=self, map=self.Map,
+                                                             layerTree=self.tree,
+                                                             log=log)
+
+            for toolRow in range(0, self.toolbars['vdigit'].numOfRows):
+                self._mgr.AddPane(self.toolbars['vdigit'].toolbar[toolRow],
+                                  wx.aui.AuiPaneInfo().
+                                  Name("vdigittoolbar" + str(toolRow)).Caption(_("Vector digitizer toolbar")).
+                                  ToolbarPane().Top().Row(toolRow + 1).
+                                  LeftDockable(False).RightDockable(False).
+                                  BottomDockable(False).TopDockable(True).
+                                  CloseButton(False).Layer(2).
+                                  BestSize((self.toolbars['vdigit'].GetToolbar().GetSize())))
+	
+            # change mouse to draw digitized line
+            self.MapWindow.mouse['box'] = "point"
+            self.MapWindow.zoomtype = 0
+            self.MapWindow.pen     = wx.Pen(colour='red',   width=2, style=wx.SOLID)
+            self.MapWindow.polypen = wx.Pen(colour='green', width=2, style=wx.SOLID)
+        # georectifier
+        elif name == "georect":
+            self.toolbars['georect'] = toolbars.GRToolbar(self, self.Map)
+
+            self._mgr.AddPane(self.toolbars['georect'].toolbar,
+                              wx.aui.AuiPaneInfo().
+                              Name("georecttoolbar").Caption(_("Georectification toolbar")).
+                              ToolbarPane().Top().
+                              LeftDockable(False).RightDockable(False).
+                              BottomDockable(False).TopDockable(True).
+                              CloseButton(False).Layer(2))
+        # nviz
+        elif name == "nviz":
+            import nviz
+
+            # check for GLCanvas and OpenGL
+            msg = None
+            if not nviz.haveGLCanvas:
+                msg = _("Unable to switch to 3D display mode.\nThe GLCanvas class has not been "
+                        "included with this build "
+                        "of wxPython!\nSwitching back to "
+                        "2D display mode.\n\nDetails: %s" % nviz.errorMsg)
+            if not nviz.haveNviz:
+                msg = _("Unable to switch to 3D display mode.\nThe Nviz python extension "
+                        "was not found or loaded properly.\n"
+                        "Switching back to 2D display mode.\n\nDetails: %s" % nviz.errorMsg)
+
+            if msg:
+                self.toolbars['map'].combo.SetValue (_("2D view"))
+                wx.MessageBox(parent=self,
+                              message=msg,
+                              caption=_("Error"),
+                              style=wx.OK | wx.ICON_ERROR | wx.CENTRE)
+                return
+
+            #
+            # add Nviz toolbar and disable 2D display mode tools
+            #
+            self.toolbars['nviz'] = toolbars.NvizToolbar(self, self.Map)
+            self.toolbars['map'].Enable2D(False)
+
+            #
+            # update layer tree (-> enable 3d-rasters)
+            #
+            if self.tree:
+                self.tree.EnableItemType(type='3d-raster', enable=True)
+            
+            #
+            # update status bar
+            #
+            self.statusbarWin['toggle'].Enable(False)
+
+            #
+            # erase map window
+            #
+            self.MapWindow.EraseMap()
+
+            self.statusbar.SetStatusText(_("Please wait, loading data..."), 0)
+            
+            #
+            # create GL window & NVIZ toolbar
+            #
+            if not self.MapWindow3D:
+                self.MapWindow3D = nviz.GLWindow(self, id=wx.ID_ANY, Map=self.Map, tree=self.maptree, gismgr=self._layerManager)
+                # -> show after paint
+                self.nvizToolWin = nviz.NvizToolWindow(self, id=wx.ID_ANY,
+                                                       mapWindow=self.MapWindow3D)
+                self.MapWindow3D.OnPaint(None) # -> LoadData
+                self.MapWindow3D.Show()
+                self.MapWindow3D.UpdateView(None)
+            
+            self.nvizToolWin.Show()
+
+            #
+            # switch from MapWindow to MapWindowGL
+            # add nviz toolbar
+            #
+            self._mgr.DetachPane(self.MapWindow2D)
+            self.MapWindow2D.Hide()
+            self._mgr.AddPane(self.MapWindow3D, wx.aui.AuiPaneInfo().CentrePane().
+                              Dockable(False).BestSize((-1,-1)).
+                              CloseButton(False).DestroyOnClose(True).
+                              Layer(0))
+            self._mgr.AddPane(self.toolbars['nviz'].toolbar,
+                              wx.aui.AuiPaneInfo().
+                              Name("nviztoolbar").Caption(_("Nviz toolbar")).
+                              ToolbarPane().Top().Row(1).
+                              LeftDockable(False).RightDockable(False).
+                              BottomDockable(False).TopDockable(True).
+                              CloseButton(False).Layer(2))
+            
+            self.MapWindow = self.MapWindow3D
+            self.frame.SetStatusText("", 0)
+            
+        self._mgr.Update()
+
+    def RemoveToolbar (self, name):
+        """
+        Removes toolbar from the window
+
+        TODO: Only hide, activate by calling AddToolbar()
+        """
+
+        # cannot hide main toolbar
+        if name == "map":
+            return
+        elif name == "vdigit":
+            # TODO: not destroy only hide
+            for toolRow in range(0, self.toolbars['vdigit'].numOfRows):
+                self._mgr.DetachPane (self.toolbars['vdigit'].toolbar[toolRow])
+                self.toolbars['vdigit'].toolbar[toolRow].Destroy()
+        else:
+            self._mgr.DetachPane (self.toolbars[name].toolbar)
+            self.toolbars[name].toolbar.Destroy()
+
+        self.toolbars[name] = None
+
+        if name == 'nviz':
+            # hide nviz tools
+            self.nvizToolWin.Hide()
+            # unload data
+            #            self.MapWindow3D.Reset()
+            # switch from MapWindowGL to MapWindow
+            self._mgr.DetachPane(self.MapWindow3D)
+            self.MapWindow3D.Hide()
+            self.MapWindow2D.Show()
+            self._mgr.AddPane(self.MapWindow2D, wx.aui.AuiPaneInfo().CentrePane().
+                              Dockable(False).BestSize((-1,-1)).
+                              CloseButton(False).DestroyOnClose(True).
+                              Layer(0))
+            self.MapWindow = self.MapWindow2D
+            
+            #
+            # update layer tree (-> disable 3d-rasters)
+            #
+            if self.tree:
+                self.tree.EnableItemType(type='3d-raster', enable=False)
+            self.MapWindow.UpdateMap()
+            
+        self.toolbars['map'].combo.SetValue (_("2D view"))
+        self.toolbars['map'].Enable2D(True)
+        self.statusbarWin['toggle'].Enable(True)
+
+        self._mgr.Update()
+
+    def __InitDisplay(self):
+        """
+        Initialize map display, set dimensions and map region
+        """
+        self.width, self.height = self.GetClientSize()
+
+        Debug.msg(2, "MapFrame.__InitDisplay():")
+        self.Map.ChangeMapSize(self.GetClientSize())
+        self.Map.region = self.Map.GetRegion() # g.region -upgc
+        # self.Map.SetRegion() # adjust region to match display window
+
+    def OnUpdateProgress(self, event):
+        """
+        Update progress bar info
+        """
+        self.statusbarWin['progress'].SetValue(event.value)
+        
+        event.Skip()
+        
+    def OnFocus(self, event):
+        """
+        Change choicebook page to match display.
+        Or set display for georectifying
+        """
+        if self._layerManager and \
+                self._layerManager.georectifying:
+            # in georectifying session; display used to get get geographic
+            # coordinates for GCPs
+            self.OnPointer(event)
+        else:
+            # change bookcontrol page to page associated with display
+            if self.page:
+                pgnum = self.layerbook.GetPageIndex(self.page)
+                if pgnum > -1:
+                    self.layerbook.SetSelection(pgnum)
+        
+        event.Skip()
+
+    def OnMotion(self, event):
+        """
+        Mouse moved
+        Track mouse motion and update status bar
+        """
+        # update statusbar if required
+        if self.statusbarWin['toggle'].GetSelection() == 0: # Coordinates
+            precision = int(UserSettings.Get(group = 'projection', key = 'format',
+                                             subkey = 'precision'))
+            format = UserSettings.Get(group = 'projection', key = 'format',
+                                      subkey = 'll')
+            e, n = self.MapWindow.Pixel2Cell(event.GetPositionTuple())
+            if self.toolbars['vdigit'] and \
+                    self.toolbars['vdigit'].GetAction() == 'addLine' and \
+                    self.toolbars['vdigit'].GetAction('type') in ('line', 'boundary') and \
+                    len(self.MapWindow.polycoords) > 0:
+                # for linear feature show segment and total length
+                distance_seg = self.MapWindow.Distance(self.MapWindow.polycoords[-1],
+                                                       (e, n), screen=False)[0]
+                distance_tot = distance_seg
+                for idx in range(1, len(self.MapWindow.polycoords)):
+                    distance_tot += self.MapWindow.Distance(self.MapWindow.polycoords[idx-1],
+                                                            self.MapWindow.polycoords[idx],
+                                                            screen=False )[0]
+                self.statusbar.SetStatusText("%.*f, %.*f (seg: %.*f; tot: %.*f)" % \
+                                                 (precision, e, precision, n,
+                                                  precision, distance_seg,
+                                                  precision, distance_tot), 0)
+            else:
+                if self.statusbarWin['projection'].IsChecked():
+                    if not UserSettings.Get(group='projection', key='statusbar', subkey='proj4'):
+                        self.statusbar.SetStatusText(_("Projection not defined (check the settings)"), 0)
+                    else:
+                        proj, coord  = utils.ReprojectCoordinates(coord = (e, n),
+                                                                  projOut = UserSettings.Get(group='projection',
+                                                                                             key='statusbar',
+                                                                                             subkey='proj4'),
+                                                                  flags = 'd')
+                    
+                        if coord:
+                            e, n = coord
+                            if proj in ('ll', 'latlong', 'longlat') and format == 'DMS':
+                                self.statusbar.SetStatusText("%s" % \
+                                                                 utils.Deg2DMS(e, n, precision = precision),
+                                                             0)
+                            else:
+                                self.statusbar.SetStatusText("%.*f; %.*f" % \
+                                                                 (precision, e, precision, n), 0)
+                        else:
+                            self.statusbar.SetStatusText(_("Error in projection (check the settings)"), 0)
+                else:
+                    if self.Map.projinfo['proj'] == 'll' and format == 'DMS':
+                        self.statusbar.SetStatusText("%s" % \
+                                                         utils.Deg2DMS(e, n, precision = precision),
+                                                     0)
+                    else:
+                        self.statusbar.SetStatusText("%.*f; %.*f" % \
+                                                         (precision, e, precision, n), 0)
+                
+        event.Skip()
+
+    def OnDraw(self, event):
+        """
+        Re-display current map composition
+        """
+        self.MapWindow.UpdateMap(render=False)
+        
+    def OnRender(self, event):
+        """
+        Re-render map composition (each map layer)
+        """
+        # delete tmp map layers (queries)
+        qlayer = self.Map.GetListOfLayers(l_name=globalvar.QUERYLAYER)
+        for layer in qlayer:
+            self.Map.DeleteLayer(layer)
+
+        # delete tmp lines
+        if self.MapWindow.mouse["use"] in ("measure",
+                                           "profile"):
+            self.MapWindow.polycoords = []
+            self.MapWindow.ClearLines()
+        
+        # deselect features in vdigit
+        if self.toolbars['vdigit'] and self.digit:
+            self.digit.driver.SetSelected([])
+            self.MapWindow.UpdateMap(render=True, renderVector=True)
+        else:
+            self.MapWindow.UpdateMap(render=True)
+        
+        # update statusbar
+        self.StatusbarUpdate()
+
+    def OnPointer(self, event):
+        """
+        Pointer button clicked
+        """
+        if self.toolbars['map']:
+            if event:
+                self.toolbars['map'].OnTool(event)
+            self.toolbars['map'].action['desc'] = ''
+        
+        self.MapWindow.mouse['use'] = "pointer"
+        self.MapWindow.mouse['box'] = "point"
+
+        # change the cursor
+        if self.toolbars['vdigit']:
+            # digitization tool activated
+            self.MapWindow.SetCursor(self.cursors["cross"])
+
+            # reset mouse['box'] if needed
+            if self.toolbars['vdigit'].GetAction() in ['addLine']:
+                if self.toolbars['vdigit'].GetAction('type') in ['point', 'centroid']:
+                    self.MapWindow.mouse['box'] = 'point'
+                else: # line, boundary
+                    self.MapWindow.mouse['box'] = 'line'
+            elif self.toolbars['vdigit'].GetAction() in ['addVertex', 'removeVertex', 'splitLine',
+                                                         'editLine', 'displayCats', 'displayAttrs',
+                                                         'copyCats']:
+                self.MapWindow.mouse['box'] = 'point'
+            else: # moveLine, deleteLine
+                self.MapWindow.mouse['box'] = 'box'
+        
+        elif self._layerManager and self._layerManager.georectifying:
+            self.MapWindow.SetCursor(self.cursors["cross"])
+        
+        else:
+            self.MapWindow.SetCursor(self.cursors["default"])
+
+    def OnZoomIn(self, event):
+        """
+        Zoom in the map.
+        Set mouse cursor, zoombox attributes, and zoom direction
+        """
+        if self.toolbars['map']:
+            self.toolbars['map'].OnTool(event)
+            self.toolbars['map'].action['desc'] = ''
+        
+        self.MapWindow.mouse['use'] = "zoom"
+        self.MapWindow.mouse['box'] = "box"
+        self.MapWindow.zoomtype = 1
+        self.MapWindow.pen = wx.Pen(colour='Red', width=2, style=wx.SHORT_DASH)
+        
+        # change the cursor
+        self.MapWindow.SetCursor(self.cursors["cross"])
+
+    def OnZoomOut(self, event):
+        """
+        Zoom out the map.
+        Set mouse cursor, zoombox attributes, and zoom direction
+        """
+        if self.toolbars['map']:
+            self.toolbars['map'].OnTool(event)
+            self.toolbars['map'].action['desc'] = ''
+        
+        self.MapWindow.mouse['use'] = "zoom"
+        self.MapWindow.mouse['box'] = "box"
+        self.MapWindow.zoomtype = -1
+        self.MapWindow.pen = wx.Pen(colour='Red', width=2, style=wx.SHORT_DASH)
+        
+        # change the cursor
+        self.MapWindow.SetCursor(self.cursors["cross"])
+
+    def OnZoomBack(self, event):
+        """
+        Zoom last (previously stored position)
+        """
+        self.MapWindow.ZoomBack()
+
+    def OnPan(self, event):
+        """
+        Panning, set mouse to drag
+        """
+        if self.toolbars['map']:
+            self.toolbars['map'].OnTool(event)
+            self.toolbars['map'].action['desc'] = ''
+        
+        self.MapWindow.mouse['use'] = "pan"
+        self.MapWindow.mouse['box'] = "pan"
+        self.MapWindow.zoomtype = 0
+        
+        # change the cursor
+        self.MapWindow.SetCursor(self.cursors["hand"])
+
+    def OnErase(self, event):
+        """
+        Erase the canvas
+        """
+        self.MapWindow.EraseMap()
+
+    def OnZoomRegion(self, event):
+        """
+        Zoom to region
+        """
+        self.Map.getRegion()
+        self.Map.getResolution()
+        self.UpdateMap()
+        # event.Skip()
+
+    def OnAlignRegion(self, event):
+        """
+        Align region
+        """
+        if not self.Map.alignRegion:
+            self.Map.alignRegion = True
+        else:
+            self.Map.alignRegion = False
+        # event.Skip()
+
+    def OnToggleRender(self, event):
+        """
+        Enable/disable auto-rendering
+        """
+        if self.statusbarWin['render'].GetValue():
+            self.OnRender(None)
+
+    def OnToggleShowRegion(self, event):
+        """
+        Show/Hide extent in map canvas
+        """
+        if self.statusbarWin['region'].GetValue():
+            # show extent
+            self.MapWindow.regionCoords = []
+        else:
+            del self.MapWindow.regionCoords
+
+        # redraw map if auto-rendering is enabled
+        if self.statusbarWin['render'].GetValue():
+            self.OnRender(None)
+
+    def OnToggleResolution(self, event):
+        """
+        Use resolution of computation region settings
+        for redering image instead of display resolution
+        """
+        # redraw map if auto-rendering is enabled
+        if self.statusbarWin['render'].GetValue():
+            self.OnRender(None)
+        
+    def OnToggleStatus(self, event):
+        """
+        Toggle status text
+        """
+        self.StatusbarUpdate()
+
+    def OnChangeMapScale(self, event):
+        """
+        Map scale changed by user
+        """
+        scale = event.GetString()
+
+        try:
+            if scale[:2] != '1:':
+                raise ValueError
+            value = int(scale[2:])
+        except ValueError:
+            self.statusbarWin['mapscale'].SetValue('1:%ld' % int(self.mapScaleValue))
+            return
+
+        dEW = value * (self.Map.region['cols'] / self.ppm[0])
+        dNS = value * (self.Map.region['rows'] / self.ppm[1])
+        self.Map.region['n'] = self.Map.region['center_northing'] + dNS / 2.
+        self.Map.region['s'] = self.Map.region['center_northing'] - dNS / 2.
+        self.Map.region['w'] = self.Map.region['center_easting']  - dEW / 2.
+        self.Map.region['e'] = self.Map.region['center_easting']  + dEW / 2.
+        
+        # add to zoom history
+        self.MapWindow.ZoomHistory(self.Map.region['n'], self.Map.region['s'],
+                                   self.Map.region['e'], self.Map.region['w'])
+        
+        # redraw a map
+        self.MapWindow.UpdateMap()
+        self.statusbarWin['mapscale'].SetFocus()
+        
+    def OnGoTo(self, event):
+        """
+        Go to position
+        """
+        try:
+            if self.statusbarWin['projection'].IsChecked():
+                if not UserSettings.Get(group='projection', key='statusbar', subkey='proj4'):
+                    self.statusbar.SetStatusText(_("Projection not defined (check the settings)"), 0)
+                else:
+                    # reproject values
+                    projIn = UserSettings.Get(group='projection',
+                                              key='statusbar',
+                                              subkey='proj4')
+                    projOut = gcmd.RunCommand('g.proj',
+                                              flags = 'jf',
+                                              read = True)
+                    proj = projIn.split(' ')[0].split('=')[1]
+                    if proj in ('ll', 'latlong', 'longlat'):
+                        e, n = self.statusbarWin['goto'].GetValue().split(';')
+                        e, n = utils.DMS2Deg(e, n)
+                        proj, coord1 = utils.ReprojectCoordinates(coord = (e, n),
+                                                                  projIn = projIn,
+                                                                  projOut = projOut, flags = 'd')
+                        e, n = coord1
+                    else:
+                        e, n = map(float, self.statusbarWin['goto'].GetValue().split(';'))
+                        proj, coord1 = utils.ReprojectCoordinates(coord = (e, n),
+                                                                  projIn = projIn,
+                                                                  projOut = projOut, flags = 'd')
+                        e, n = coord1
+            else:
+                if self.Map.projinfo['proj'] == 'll':
+                    e, n = self.statusbarWin['goto'].GetValue().split(';')
+                else:
+                    e, n = map(float, self.statusbarWin['goto'].GetValue().split(';'))
+                    
+            region = self.Map.GetCurrentRegion()
+            if self.statusbarWin['projection'].IsChecked():
+                if not UserSettings.Get(group='projection', key='statusbar', subkey='proj4'):
+                    self.statusbar.SetStatusText(_("Projection not defined (check the settings)"), 0)
+                else:
+                    region['center_easting'], region['center_northing'] = e, n
+            else:
+                if self.Map.projinfo['proj'] == 'll':
+                    region['center_easting'], region['center_northing'] = utils.DMS2Deg(e, n)
+                else:
+                    region['center_easting'], region['center_northing'] = e, n
+        except ValueError:
+            region = self.Map.GetCurrentRegion()
+            precision = int(UserSettings.Get(group = 'projection', key = 'format',
+                                             subkey = 'precision'))
+            format = UserSettings.Get(group = 'projection', key = 'format',
+                                      subkey = 'll')
+            if self.Map.projinfo['proj'] == 'll' and format == 'DMS':
+                    self.statusbarWin['goto'].SetValue("%s" % utils.Deg2DMS(region['center_easting'], 
+                                                                            region['center_northing'],
+                                                                            precision = precision))
+            else:
+                self.statusbarWin['goto'].SetValue("%.*f; %.*f" % \
+                                                       (precision, region['center_easting'],
+                                                        precision, region['center_northing']))
+            return
+        
+        
+        dn = (region['nsres'] * region['rows']) / 2.
+        region['n'] = region['center_northing'] + dn
+        region['s'] = region['center_northing'] - dn
+        de = (region['ewres'] * region['cols']) / 2.
+        region['e'] = region['center_easting'] + de
+        region['w'] = region['center_easting'] - de
+        
+        self.Map.AdjustRegion()
+
+        # add to zoom history
+        self.MapWindow.ZoomHistory(region['n'], region['s'],
+                                   region['e'], region['w'])
+        
+        # redraw a map
+        self.MapWindow.UpdateMap()
+        self.statusbarWin['goto'].SetFocus()
+        
+    def StatusbarUpdate(self):
+        """!Update statusbar content"""
+
+        self.statusbarWin['region'].Hide()
+        self.statusbarWin['resolution'].Hide()
+        self.statusbarWin['mapscale'].Hide()
+        self.statusbarWin['goto'].Hide()
+        self.statusbarWin['projection'].Hide()
+        self.mapScaleValue = self.ppm = None
+
+        if self.statusbarWin['toggle'].GetSelection() == 0: # Coordinates
+            self.statusbar.SetStatusText("", 0)
+            # enable long help
+            self.StatusbarEnableLongHelp()
+
+        elif self.statusbarWin['toggle'].GetSelection() in (1, 2): # Extent
+            sel = self.statusbarWin['toggle'].GetSelection()
+            if sel == 1:
+                region = self.Map.region
+            else:
+                region = self.Map.GetRegion() # computation region
+
+            precision = int(UserSettings.Get(group = 'projection', key = 'format',
+                                             subkey = 'precision'))
+            format = UserSettings.Get(group = 'projection', key = 'format',
+                                      subkey = 'll')
+            
+            if self.statusbarWin['projection'].IsChecked():
+                if not UserSettings.Get(group='projection', key='statusbar', subkey='proj4'):
+                    self.statusbar.SetStatusText(_("Projection not defined (check the settings)"), 0)
+                else:
+                    projOut = UserSettings.Get(group='projection',
+                                               key='statusbar',
+                                               subkey='proj4')
+                    proj, coord1 = utils.ReprojectCoordinates(coord = (region["w"], region["s"]),
+                                                              projOut = projOut, flags = 'd')
+                    proj, coord2 = utils.ReprojectCoordinates(coord = (region["e"], region["n"]),
+                                                          projOut = projOut, flags = 'd')
+                    if sel == 2:
+                        proj, coord3 = utils.ReprojectCoordinates(coord = (0.0, 0.0),
+                                                                  projOut = projOut, flags = 'd')
+                        proj, coord4 = utils.ReprojectCoordinates(coord = (region["ewres"], region["nsres"]),
+                                                                  projOut = projOut, flags = 'd')
+                    if coord1 and coord2:
+                        if proj in ('ll', 'latlong', 'longlat') and format == 'DMS':
+                            w, s = utils.Deg2DMS(coord1[0], coord1[1], string = False,
+                                                 precision = precision)
+                            e, n = utils.Deg2DMS(coord2[0], coord2[1], string = False,
+                                                 precision = precision)
+                            if sel == 1:
+                                self.statusbar.SetStatusText("%s - %s, %s - %s" %
+                                                             (w, e, s, n), 0)
+                            else:
+                                ewres, nsres = utils.Deg2DMS(abs(coord3[0]) - abs(coord4[0]),
+                                                             abs(coord3[1]) - abs(coord4[1]),
+                                                             string = False, hemisphere = False,
+                                                             precision = precision)
+                                self.statusbar.SetStatusText("%s - %s, %s - %s (%s, %s)" %
+                                                             (w, e, s, n, ewres, nsres), 0)
+                        else:
+                            w, s = coord1
+                            e, n = coord2
+                            if sel == 1:
+                                self.statusbar.SetStatusText("%.*f - %.*f, %.*f - %.*f" %
+                                                         (precision, w, precision, e,
+                                                          precision, s, precision, n), 0)
+                            else:
+                                ewres, nsres = coord3
+                                self.statusbar.SetStatusText("%.*f - %.*f, %.*f - %.*f (%.*f, %.*f)" %
+                                                             (precision, w, precision, e,
+                                                              precision, s, precision, n,
+                                                              precision, ewres, precision, nsres), 0)
+                    else:
+                        self.statusbar.SetStatusText(_("Error in projection (check the settings)"), 0)
+            else:
+                if self.Map.projinfo['proj'] == 'll' and format == 'DMS':
+                    w, s = utils.Deg2DMS(region["w"], region["s"],
+                                         string = False, precision = precision)
+                    e, n = utils.Deg2DMS(region["e"], region["n"],
+                                         string = False, precision = precision)
+                    if sel == 1:
+                        self.statusbar.SetStatusText("%s - %s, %s - %s" %
+                                                     (w, e, s, n), 0)
+                    else:
+                        ewres, nsres = utils.Deg2DMS(region['ewres'], region['nsres'],
+                                                     string = False, precision = precision)
+                        self.statusbar.SetStatusText("%s - %s, %s - %s (%s, %s)" %
+                                                     (w, e, s, n, ewres, nsres), 0)
+                else:
+                    w, s = region["w"], region["s"]
+                    e, n = region["e"], region["n"]
+                    if sel == 1:
+                        self.statusbar.SetStatusText("%.*f - %.*f, %.*f - %.*f" %
+                                                     (precision, w, precision, e,
+                                                      precision, s, precision, n), 0)
+                    else:
+                        ewres, nsres = region['ewres'], region['nsres']
+                        self.statusbar.SetStatusText("%.*f - %.*f, %.*f - %.*f (%.*f, %.*f)" %
+                                                     (precision, w, precision, e,
+                                                      precision, s, precision, n,
+                                                      precision, ewres, precision, nsres), 0)
+            # enable long help
+            self.StatusbarEnableLongHelp()
+
+        elif self.statusbarWin['toggle'].GetSelection() == 3: # Show comp. extent
+            self.statusbar.SetStatusText("", 0)
+            self.statusbarWin['region'].Show()
+            # disable long help
+            self.StatusbarEnableLongHelp(False)
+
+        elif self.statusbarWin['toggle'].GetSelection() == 4: # Display mode
+            self.statusbar.SetStatusText("", 0)
+            self.statusbarWin['resolution'].Show()
+            # disable long help
+            self.StatusbarEnableLongHelp(False)
+
+        elif self.statusbarWin['toggle'].GetSelection() == 5: # Display geometry
+            self.statusbar.SetStatusText("rows=%d; cols=%d; nsres=%.2f; ewres=%.2f" %
+                                         (self.Map.region["rows"], self.Map.region["cols"],
+                                          self.Map.region["nsres"], self.Map.region["ewres"]), 0)
+            # enable long help
+            self.StatusbarEnableLongHelp()
+
+        elif self.statusbarWin['toggle'].GetSelection() == 6: # Map scale
+            # TODO: need to be fixed...
+            ### screen X region problem
+            ### user should specify ppm
+            dc = wx.ScreenDC()
+            dpSizePx = wx.DisplaySize()   # display size in pixels
+            dpSizeMM = wx.DisplaySizeMM() # display size in mm (system)
+            dpSizeIn = (dpSizeMM[0] / 25.4, dpSizeMM[1] / 25.4) # inches
+            sysPpi  = dc.GetPPI()
+            comPpi = (dpSizePx[0] / dpSizeIn[0],
+                      dpSizePx[1] / dpSizeIn[1])
+
+            ppi = comPpi                  # pixel per inch
+            self.ppm = ((ppi[0] / 2.54) * 100, # pixel per meter
+                        (ppi[1] / 2.54) * 100)
+
+            Debug.msg(4, "MapFrame.StatusbarUpdate(mapscale): size: px=%d,%d mm=%f,%f "
+                      "in=%f,%f ppi: sys=%d,%d com=%d,%d; ppm=%f,%f" % \
+                          (dpSizePx[0], dpSizePx[1], dpSizeMM[0], dpSizeMM[1],
+                           dpSizeIn[0], dpSizeIn[1],
+                           sysPpi[0], sysPpi[1], comPpi[0], comPpi[1],
+                           self.ppm[0], self.ppm[1]))
+
+            region = self.Map.region
+
+            heightCm = region['rows'] / self.ppm[1] * 100
+            widthCm  = region['cols'] / self.ppm[0] * 100
+
+            Debug.msg(4, "MapFrame.StatusbarUpdate(mapscale): width_cm=%f, height_cm=%f" %
+                      (widthCm, heightCm))
+
+            xscale = (region['e'] - region['w']) / (region['cols'] / self.ppm[0])
+            yscale = (region['n'] - region['s']) / (region['rows'] / self.ppm[1])
+            scale = (xscale + yscale) / 2.
+            
+            Debug.msg(3, "MapFrame.StatusbarUpdate(mapscale): xscale=%f, yscale=%f -> scale=%f" % \
+                          (xscale, yscale, scale))
+
+            self.statusbar.SetStatusText("")
+            try:
+                self.statusbarWin['mapscale'].SetValue("1:%ld" % (scale + 0.5))
+            except TypeError:
+                pass
+            self.mapScaleValue = scale
+            self.statusbarWin['mapscale'].Show()
+
+            # disable long help
+            self.StatusbarEnableLongHelp(False)
+
+        elif self.statusbarWin['toggle'].GetSelection() == 7: # go to
+            self.statusbar.SetStatusText("")
+            region = self.Map.GetCurrentRegion()
+            precision = int(UserSettings.Get(group = 'projection', key = 'format',
+                                             subkey = 'precision'))
+            format = UserSettings.Get(group = 'projection', key = 'format',
+                                      subkey = 'll')
+            
+            if self.statusbarWin['projection'].IsChecked():
+                if not UserSettings.Get(group='projection', key='statusbar', subkey='proj4'):
+                    self.statusbar.SetStatusText(_("Projection not defined (check the settings)"), 0)
+                else:
+                    proj, coord  = utils.ReprojectCoordinates(coord = (region['center_easting'],
+                                                                       region['center_northing']),
+                                                              projOut = UserSettings.Get(group='projection',
+                                                                                         key='statusbar',
+                                                                                         subkey='proj4'),
+                                                              flags = 'd')
+                    if coord:
+                        if proj in ('ll', 'latlong', 'longlat') and format == 'DMS':
+                            self.statusbarWin['goto'].SetValue("%s" % utils.Deg2DMS(coord[0],
+                                                                                    coord[1],
+                                                                                    precision = precision))
+                        else:
+                            self.statusbarWin['goto'].SetValue("%.*f; %.*f" % (precision, coord[0],
+                                                                               precision, coord[1]))
+                    else:
+                        self.statusbar.SetStatusText(_("Error in projection (check the settings)"), 0)
+            else:
+                if self.Map.projinfo['proj'] == 'll' and format == 'DMS':
+                    self.statusbarWin['goto'].SetValue("%s" % utils.Deg2DMS(region['center_easting'], 
+                                                                            region['center_northing'],
+                                                                            precision = precision))
+                else:
+                    self.statusbarWin['goto'].SetValue("%.*f; %.*f" % (precision, region['center_easting'],
+                                                                       precision, region['center_northing']))
+            self.statusbarWin['goto'].Show()
+
+            # disable long help
+            self.StatusbarEnableLongHelp(False)
+        
+        elif self.statusbarWin['toggle'].GetSelection() == 8: # projection
+            self.statusbar.SetStatusText("")
+            epsg = UserSettings.Get(group='projection', key='statusbar', subkey='epsg')
+            if epsg:
+                label = '%s (EPSG: %s)' % (_("Use defined projection"), epsg)
+                self.statusbarWin['projection'].SetLabel(label)
+            else:
+                self.statusbarWin['projection'].SetLabel(_("Use defined projection"))
+            self.statusbarWin['projection'].Show()
+            
+            # disable long help
+            self.StatusbarEnableLongHelp(False)
+            
+        else:
+            self.statusbar.SetStatusText("", 1)
+
+    def StatusbarEnableLongHelp(self, enable=True):
+        """!Enable/disable toolbars long help"""
+        for toolbar in self.toolbars.itervalues():
+            if toolbar:
+                toolbar.EnableLongHelp(enable)
+                
+    def StatusbarReposition(self):
+        """!Reposition checkbox in statusbar"""
+        # reposition checkbox
+        widgets = [(0, self.statusbarWin['region']),
+                   (0, self.statusbarWin['resolution']),
+                   (0, self.statusbarWin['mapscale']),
+                   (0, self.statusbarWin['progress']),
+                   (0, self.statusbarWin['projection']),
+                   (1, self.statusbarWin['toggle']),
+                   (2, self.statusbarWin['mask']),
+                   (3, self.statusbarWin['render'])]
+        for idx, win in widgets:
+            rect = self.statusbar.GetFieldRect(idx)
+            if idx == 0: # show region / mapscale / process bar
+                # -> size
+                wWin, hWin = win.GetBestSize()
+                if win == self.statusbarWin['progress']:
+                    wWin = rect.width - 6
+                # -> position
+                # if win == self.statusbarWin['region']:
+                # x, y = rect.x + rect.width - wWin, rect.y - 1
+                # align left
+                # else:
+                x, y = rect.x + 3, rect.y - 1
+                w, h = wWin, rect.height + 2
+            else: # choice || auto-rendering
+                x, y = rect.x, rect.y - 1
+                w, h = rect.width, rect.height + 2
+                if idx == 2: # mask
+                    x += 5
+                    y += 4
+                elif idx == 3: # render
+                    x += 5
+            win.SetPosition((x, y))
+            win.SetSize((w, h))
+
+    def SaveToFile(self, event):
+        """
+        Save image to file
+        """
+        lext = []
+        for h in self.MapWindow.img.GetHandlers():
+            lext.append(h.GetExtension())
+        
+        filetype =  "BMP file (*.bmp)|*.bmp|"
+        if 'gif' in lext:
+            filetype += "GIF file (*.gif)|*.gif|"
+        if 'jpg' in lext:
+            filetype += "JPG file (*.jpg)|*.jpg|"
+        if 'pcx' in lext:
+            filetype += "PCX file (*.pcx)|*.pcx|"
+        if 'png' in lext:
+            filetype += "PNG file (*.png)|*.png|"
+        if 'pnm' in lext:
+            filetype += "PNM file (*.pnm)|*.pnm|"
+        if 'tif' in lext:
+            filetype += "TIF file (*.tif)|*.tif|"
+        if 'xpm' in lext:
+            filetype += "XPM file (*.xpm)|*.xpm"
+
+        dlg = wx.FileDialog(self, _("Choose a file name to save the image (no need to add extension)"),
+                            defaultDir = "",
+                            defaultFile = "",
+                            wildcard = filetype,
+                            style=wx.SAVE|wx.FD_OVERWRITE_PROMPT)
+        if dlg.ShowModal() == wx.ID_OK:
+            path = dlg.GetPath()
+            if path == None: return
+            base = os.path.splitext(dlg.GetPath())[0]
+            ext = os.path.splitext(dlg.GetPath())[1]
+            if dlg.GetFilterIndex() == 0:
+                type = wx.BITMAP_TYPE_BMP
+                if ext != '.bmp': path = base+'.bmp'
+            if dlg.GetFilterIndex() == 1:
+                type = wx.BITMAP_TYPE_GIF
+                if ext != '.gif': path = base+'.gif'
+            elif dlg.GetFilterIndex() == 2:
+                type = wx.BITMAP_TYPE_JPEG
+                if ext != '.jpg': path = base+'.jpg'
+            elif dlg.GetFilterIndex() == 3:
+                type = wx.BITMAP_TYPE_GIF
+                if ext != '.pcx': path = base+'.pcx'
+            elif dlg.GetFilterIndex() == 4:
+                type = wx.BITMAP_TYPE_PNG
+                if ext != '.png': path = base+'.png'
+            elif dlg.GetFilterIndex() == 5:
+                type = wx.BITMAP_TYPE_PNM
+                if ext != '.pnm': path = base+'.pnm'
+            elif dlg.GetFilterIndex() == 6:
+                type = wx.BITMAP_TYPE_TIF
+                if ext != '.tif': path = base+'.tif'
+            elif dlg.GetFilterIndex() == 7:
+                type = wx.BITMAP_TYPE_XPM
+                if ext != '.xpm': path = base+'.xpm'
+            self.MapWindow.SaveToFile(path, type)
+            
+        dlg.Destroy()
+
+    def PrintMenu(self, event):
+        """
+        Print options and output menu for map display
+        """
+        point = wx.GetMousePosition()
+        printmenu = wx.Menu()
+        # Add items to the menu
+        setup = wx.MenuItem(printmenu, wx.ID_ANY, _('Page setup'))
+        printmenu.AppendItem(setup)
+        self.Bind(wx.EVT_MENU, self.printopt.OnPageSetup, setup)
+
+        preview = wx.MenuItem(printmenu, wx.ID_ANY, _('Print preview'))
+        printmenu.AppendItem(preview)
+        self.Bind(wx.EVT_MENU, self.printopt.OnPrintPreview, preview)
+
+        doprint = wx.MenuItem(printmenu, wx.ID_ANY, _('Print display'))
+        printmenu.AppendItem(doprint)
+        self.Bind(wx.EVT_MENU, self.printopt.OnDoPrint, doprint)
+
+        # Popup the menu.  If an item is selected then its handler
+        # will be called before PopupMenu returns.
+        self.PopupMenu(printmenu)
+        printmenu.Destroy()
+
+    def OnCloseWindow(self, event):
+        """
+        Window closed.
+        Also close associated layer tree page
+        """
+        pgnum = None
+        self.Map.Clean()
+        
+        # close edited map and 3D tools properly
+        if self.toolbars['vdigit']:
+            maplayer = self.toolbars['vdigit'].GetLayer()
+            if maplayer:
+                self.toolbars['vdigit'].OnExit()
+                self.imgVectorMap = None
+
+        if self.toolbars['nviz']:
+            self.toolbars['nviz'].OnExit()
+
+        if not self._layerManager:
+            self.Destroy()
+        elif self.page:
+            pgnum = self.layerbook.GetPageIndex(self.page)
+            if pgnum > -1:
+                self.layerbook.DeletePage(pgnum)
+        
+    def GetRender(self):
+        """
+        Returns the current instance of render.Map()
+        """
+        return self.Map
+
+    def OnQueryDisplay(self, event):
+        """
+        Query currrent raster/vector map layers (display mode)
+        """
+        if self.toolbars['map'].GetAction() == 'displayAttrb': # select previous action
+            self.toolbars['map'].SelectDefault(event)
+            return
+
+        self.toolbars['map'].action['desc'] = 'displayAttrb'
+        
+        # switch GIS Manager to output console to show query results
+        self._layerManager.notebook.SetSelection(1)
+
+        self.MapWindow.mouse['use'] = "query"
+        self.MapWindow.mouse['box'] = "point"
+        self.MapWindow.zoomtype = 0
+
+        # change the cursor
+        self.MapWindow.SetCursor(self.cursors["cross"])
+
+    def OnQueryModify(self, event):
+        """
+        Query vector map layer (edit mode)
+        """
+        if self.toolbars['map'].GetAction() == 'modifyAttrb': # select previous action
+            self.toolbars['map'].SelectDefault(event)
+            return
+        
+        self.toolbars['map'].action['desc'] = 'modifyAttrb'
+        
+        self.MapWindow.mouse['use'] = "queryVector"
+        self.MapWindow.mouse['box'] = "point"
+        self.MapWindow.pen = wx.Pen(colour='Red', width=2, style=wx.SHORT_DASH)
+        self.MapWindow.zoomtype = 0
+
+        # change the cursor
+        self.MapWindow.SetCursor(self.cursors["cross"])
+        
+    def QueryMap(self, x, y):
+        """!Query map layer features
+
+        Currently only raster and vector map layers are supported.
+        
+        @param x,y coordinates
+        """
+        #set query snap distance for v.what at mapunit equivalent of 10 pixels
+        qdist = 10.0 * ((self.Map.region['e'] - self.Map.region['w']) / self.Map.width)
+        east, north = self.MapWindow.Pixel2Cell((x, y))
+
+        num = 0
+        for layer in self.tree.GetSelections():
+            type = self.tree.GetPyData(layer)[0]['maplayer'].GetType()
+            if type in ('raster', 'rgb', 'his',
+                        'vector', 'thememap', 'themechart'):
+                num += 1
+        
+        if num < 1:
+            dlg = wx.MessageDialog(parent=self,
+                                   message=_('No raster or vector map layer selected for querying.'),
+                                   caption=_('No map layer selected'),
+                                   style=wx.OK | wx.ICON_INFORMATION | wx.CENTRE)
+            dlg.ShowModal()
+            dlg.Destroy()
+            return
+        
+        mapname = None
+        raststr = ''
+        vectstr = ''
+        rcmd = ['r.what', '--q']
+        vcmd = ['v.what', '--q']
+        for layer in self.tree.GetSelections():
+            type = self.tree.GetPyData(layer)[0]['maplayer'].GetType()
+            dcmd = self.tree.GetPyData(layer)[0]['cmd']
+            name = utils.GetLayerNameFromCmd(dcmd)
+            if name == '':
+                continue
+            if type in ('raster', 'rgb', 'his'):
+                raststr += "%s," % name
+            elif type in ('vector', 'thememap', 'themechart'):
+                vectstr += "%s," % name
+
+        # use display region settings instead of computation region settings
+        self.tmpreg = os.getenv("GRASS_REGION")
+        os.environ["GRASS_REGION"] = self.Map.SetRegion(windres=False)
+        
+        # build query commands for any selected rasters and vectors
+        if raststr != '':
+            rcmd.append('-f')
+            rcmd.append('input=%s' % raststr.rstrip(','))
+            rcmd.append('east_north=%f,%f' % (float(east), float(north)))
+        
+        if vectstr != '':
+            # check for vector maps open to be edited
+            digitToolbar = self.toolbars['vdigit']
+            if digitToolbar:
+                map = digitToolbar.GetLayer().GetName()
+                vect = []
+                for vector in vectstr.split(','):
+                    if map == vector:
+                        self._layerManager.goutput.WriteWarning("Vector map <%s> "
+                                                                "opened for editing - skipped." % map)
+                        continue
+                    vect.append(vector)
+                vectstr = ','.join(vect)
+                
+            if len(vectstr) <= 1:
+                self._layerManager.goutput.WriteCmdLog("Nothing to query.")
+                return
+            
+            vcmd.append('-a')
+            vcmd.append('map=%s' % vectstr.rstrip(','))
+            vcmd.append('east_north=%f,%f' % (float(east), float(north)))
+            vcmd.append('distance=%f' % float(qdist))
+        
+        # parse query command(s)
+        if self._layerManager:
+            if raststr:
+                self._layerManager.goutput.RunCmd(rcmd,
+                                                  compReg=False,
+                                                  onDone = self._QueryMapDone)
+            if vectstr:
+                self._layerManager.goutput.RunCmd(vcmd,
+                                                  onDone = self._QueryMapDone)
+        else:
+            if raststr:
+                gcmd.RunCommand(rcmd)
+            if vectstr:
+                gcmd.RunCommand(vcmd)
+        
+    def _QueryMapDone(self, returncode):
+        """!Restore settings after querying (restore GRASS_REGION)
+
+        @param returncode command return code
+        """
+        if hasattr(self, "tmpreg"):
+            if self.tmpreg:
+                os.environ["GRASS_REGION"] = self.tmpreg
+            elif os.environ.has_key('GRASS_REGION'):
+                del os.environ["GRASS_REGION"]
+        elif os.environ.has_key('GRASS_REGION'):
+            del os.environ["GRASS_REGION"]
+        
+        if hasattr(self, "tmpreg"):
+            del self.tmpreg
+        
+    def QueryVector(self, x, y):
+        """
+        Query vector map layer features
+
+        Attribute data of selected vector object are displayed in GUI dialog.
+        Data can be modified (On Submit)
+        """
+        if not self.tree.layer_selected or \
+                self.tree.GetPyData(self.tree.layer_selected)[0]['type'] != 'vector':
+            wx.MessageBox(parent=self,
+                          message=_("No vector map selected for querying."),
+                          caption=_("Vector querying"),
+                          style=wx.OK | wx.ICON_INFORMATION | wx.CENTRE)
+            return
+        
+        if self.tree.GetPyData(self.tree.layer_selected)[0]['maplayer'].GetMapset() != \
+                grass.gisenv()['MAPSET']:
+            wx.MessageBox(parent=self,
+                          message=_("Only vector map from the current mapset can be modified."),
+                          caption=_("Vector querying"),
+                          style=wx.OK | wx.ICON_INFORMATION | wx.CENTRE)
+            return
+        
+        posWindow = self.ClientToScreen((x + self.MapWindow.dialogOffset,
+                                         y + self.MapWindow.dialogOffset))
+
+        qdist = 10.0 * ((self.Map.region['e'] - self.Map.region['w']) /
+                        self.Map.width)
+        
+        east, north = self.MapWindow.Pixel2Cell((x, y))
+        
+        mapName = self.tree.GetPyData(self.tree.layer_selected)[0]['maplayer'].name
+        
+        if self.dialogs['attributes'] is None:
+            self.dialogs['attributes'] = \
+                dbm_dialogs.DisplayAttributesDialog(parent=self.MapWindow,
+                                                    map=mapName,
+                                                    query=((east, north), qdist),
+                                                    pos=posWindow,
+                                                    action="update")
+        else:
+            # selection changed?
+            if not self.dialogs['attributes'].mapDBInfo or \
+                    self.dialogs['attributes'].mapDBInfo.map != mapName:
+                self.dialogs['attributes'].UpdateDialog(map=mapName, query=((east, north), qdist))
+            else:
+                self.dialogs['attributes'].UpdateDialog(query=((east, north), qdist))
+                
+        cats = self.dialogs['attributes'].GetCats()
+        
+        try:
+            qlayer = self.Map.GetListOfLayers(l_name=globalvar.QUERYLAYER)[0]
+        except IndexError:
+            qlayer = None
+        
+        if self.dialogs['attributes'].mapDBInfo and cats:
+            # highlight feature & re-draw map
+            if qlayer:
+                qlayer.SetCmd(self.AddTmpVectorMapLayer(mapName, cats,
+                                                        useId=False,
+                                                        addLayer=False))
+            else:
+                qlayer = self.AddTmpVectorMapLayer(mapName, cats, useId=False)
+            
+            # set opacity based on queried layer
+            opacity = self.tree.GetPyData(self.tree.layer_selected)[0]['maplayer'].GetOpacity(float=True)
+            qlayer.SetOpacity(opacity)
+            
+            self.MapWindow.UpdateMap(render=False, renderVector=False)
+            if not self.dialogs['attributes'].IsShown():
+                self.dialogs['attributes'].Show()
+        else:
+            if qlayer:
+                self.Map.DeleteLayer(qlayer)
+                self.MapWindow.UpdateMap(render=False, renderVector=False)
+            if self.dialogs['attributes'].IsShown():
+                self.dialogs['attributes'].Hide()
+        
+    def OnQuery(self, event):
+        """!Query tools menu"""
+        if self.toolbars['map']:
+            self.toolbars['map'].OnTool(event)
+            action = self.toolbars['map'].GetAction()
+        
+        point = wx.GetMousePosition()
+        toolsmenu = wx.Menu()
+        # Add items to the menu
+        display = wx.MenuItem(parentMenu=toolsmenu, id=wx.ID_ANY,
+                              text=_("Query raster/vector map(s) (display mode)"),
+                              kind=wx.ITEM_CHECK)
+        toolsmenu.AppendItem(display)
+        self.Bind(wx.EVT_MENU, self.OnQueryDisplay, display)
+        numLayers = 0
+        for layer in self.tree.GetSelections():
+            type = self.tree.GetPyData(layer)[0]['maplayer'].GetType()
+            if type in ('raster', 'rgb', 'his',
+                        'vector', 'thememap', 'themechart'):
+                numLayers += 1
+        if numLayers < 1:
+            display.Enable(False)
+        
+        if action == "displayAttrb":
+            display.Check(True)
+        
+        modify = wx.MenuItem(parentMenu=toolsmenu, id=wx.ID_ANY,
+                             text=_("Query vector map (edit mode)"),
+                             kind=wx.ITEM_CHECK)
+        toolsmenu.AppendItem(modify)
+        self.Bind(wx.EVT_MENU, self.OnQueryModify, modify)
+        digitToolbar = self.toolbars['vdigit']
+        if self.tree.layer_selected:
+            layer_selected = self.tree.GetPyData(self.tree.layer_selected)[0]['maplayer']
+            if layer_selected.GetType() != 'vector' or \
+                    (digitToolbar and \
+                         digitToolbar.GetLayer() == layer_selected):
+                modify.Enable(False)
+            else:
+                if action == "modifyAttrb":
+                    modify.Check(True)
+        
+        self.PopupMenu(toolsmenu)
+        toolsmenu.Destroy()
+
+    def AddTmpVectorMapLayer(self, name, cats, useId=False, addLayer=True):
+        """
+        Add temporal vector map layer to map composition
+
+        @param name name of map layer
+        @param useId use feature id instead of category 
+        """
+        # color settings from ATM
+        color = UserSettings.Get(group='atm', key='highlight', subkey='color')
+        colorStr = str(color[0]) + ":" + \
+            str(color[1]) + ":" + \
+            str(color[2])
+
+        pattern = ["d.vect",
+                   "map=%s" % name,
+                   "color=%s" % colorStr,
+                   "fcolor=%s" % colorStr,
+                   "width=%d"  % UserSettings.Get(group='atm', key='highlight', subkey='width')]
+        
+        if useId:
+            cmd = pattern
+            cmd.append('-i')
+            cmd.append('cats=%s' % str(cats))
+        else:
+            cmd = []
+            for layer in cats.keys():
+                cmd.append(copy.copy(pattern))
+                lcats = cats[layer]
+                cmd[-1].append("layer=%d" % layer)
+                cmd[-1].append("cats=%s" % utils.ListOfCatsToRange(lcats))
+        
+        #     if self.icon:
+        #         cmd.append("icon=%s" % (self.icon))
+        #     if self.pointsize:
+        #         cmd.append("size=%s" % (self.pointsize))
+
+        if addLayer:
+            if useId:
+                return self.Map.AddLayer(type='vector', name=globalvar.QUERYLAYER, command=cmd,
+                                         l_active=True, l_hidden=True, l_opacity=1.0)
+            else:
+                return self.Map.AddLayer(type='command', name=globalvar.QUERYLAYER, command=cmd,
+                                         l_active=True, l_hidden=True, l_opacity=1.0)
+        else:
+            return cmd
+
+    def OnAnalyze(self, event):
+        """
+        Analysis tools menu
+        """
+        point = wx.GetMousePosition()
+        toolsmenu = wx.Menu()
+        # Add items to the menu
+        measure = wx.MenuItem(toolsmenu, wx.ID_ANY, Icons["measure"].GetLabel())
+        measure.SetBitmap(Icons["measure"].GetBitmap(self.iconsize))
+        toolsmenu.AppendItem(measure)
+        self.Bind(wx.EVT_MENU, self.OnMeasure, measure)
+
+        profile = wx.MenuItem(toolsmenu, wx.ID_ANY, Icons["profile"].GetLabel())
+        profile.SetBitmap(Icons["profile"].GetBitmap(self.iconsize))
+        toolsmenu.AppendItem(profile)
+        self.Bind(wx.EVT_MENU, self.Profile, profile)
+
+        histogram = wx.MenuItem(toolsmenu, wx.ID_ANY, Icons["histogram"].GetLabel())
+        histogram.SetBitmap(Icons["histogram"].GetBitmap(self.iconsize))
+        toolsmenu.AppendItem(histogram)
+        self.Bind(wx.EVT_MENU, self.Histogram, histogram)
+
+        # Popup the menu.  If an item is selected then its handler
+        # will be called before PopupMenu returns.
+        self.PopupMenu(toolsmenu)
+        toolsmenu.Destroy()
+
+    def OnMeasure(self, event):
+        """
+        Init measurement routine that calculates
+        map distance along transect drawn on
+        map display
+        """
+
+        self.totaldist = 0.0 # total measured distance
+
+        # switch GIS Manager to output console to show measure results
+        self._layerManager.notebook.SetSelection(1)
+
+        # change mouse to draw line for measurement
+        self.MapWindow.mouse['use'] = "measure"
+        self.MapWindow.mouse['box'] = "line"
+        self.MapWindow.zoomtype = 0
+        self.MapWindow.pen     = wx.Pen(colour='red', width=2, style=wx.SHORT_DASH)
+        self.MapWindow.polypen = wx.Pen(colour='green', width=2, style=wx.SHORT_DASH)
+
+        # change the cursor
+        self.MapWindow.SetCursor(self.cursors["pencil"])
+
+        # initiating output
+        style = self._layerManager.goutput.cmd_output.StyleWarning
+        self._layerManager.goutput.WriteLog(_('Click and drag with left mouse button '
+                                              'to measure.%s'
+                                              'Double click with left button to clear.') % \
+                                                (os.linesep), style)
+        if self.Map.projinfo['proj'] != 'xy':
+            units = self.Map.projinfo['units']
+            style = self._layerManager.goutput.cmd_output.StyleCommand
+            self._layerManager.goutput.WriteLog(_('Measuring distance') + ' ('
+                                                + units + '):',
+                                                style)
+        else:
+            self._layerManager.goutput.WriteLog(_('Measuring distance:'),
+                                                style)
+
+    def MeasureDist(self, beginpt, endpt):
+        """
+        Calculate map distance from screen distance
+        and print to output window
+        """
+
+        if self._layerManager.notebook.GetSelection() != 1:
+            self._layerManager.notebook.SetSelection(1)
+
+        dist, (north, east) = self.MapWindow.Distance(beginpt, endpt)
+
+        dist = round(dist, 3)
+        d, dunits = self.FormatDist(dist)
+
+        self.totaldist += dist
+        td, tdunits = self.FormatDist(self.totaldist)
+
+        strdist = str(d)
+        strtotdist = str(td)
+
+        if self.Map.projinfo['proj'] == 'xy' or 'degree' not in self.Map.projinfo['unit']:
+            angle = int(math.degrees(math.atan2(north,east)) + 0.5)
+            angle = 180 - angle
+            if angle < 0:
+                angle = 360+angle
+
+            mstring = 'segment = %s %s\ttotal distance = %s %s\tbearing = %d deg' \
+                % (strdist,dunits,strtotdist,tdunits,angle)
+        else:
+            mstring = 'segment = %s %s\ttotal distance = %s %s' \
+                % (strdist,dunits,strtotdist,tdunits)
+
+        self.gismanager.goutput.WriteLog(mstring)
+
+        return dist
+
+    def Profile(self, event):
+        """
+        Init profile canvas and tools
+        """
+        raster = []
+        if self.tree.layer_selected and \
+                self.tree.GetPyData(self.tree.layer_selected)[0]['type'] == 'raster':
+            raster.append(self.tree.GetPyData(self.tree.layer_selected)[0]['maplayer'].name)
+
+        self.profile = profile.ProfileFrame(self,
+                                            id=wx.ID_ANY, pos=wx.DefaultPosition, size=(700,300),
+                                            style=wx.DEFAULT_FRAME_STYLE, rasterList=raster)
+        self.profile.Show()
+        # Open raster select dialog to make sure that a raster (and the desired raster)
+        # is selected to be profiled
+        self.profile.OnSelectRaster(None)
+
+    def FormatDist(self, dist):
+        """!Format length numbers and units in a nice way,
+        as a function of length. From code by Hamish Bowman
+        Grass Development Team 2006"""
+
+        mapunits = self.Map.projinfo['units']
+        if mapunits == 'metres': mapunits = 'meters'
+        outunits = mapunits
+        dist = float(dist)
+        divisor = 1.0
+
+        # figure out which units to use
+        if mapunits == 'meters':
+            if dist > 2500.0:
+                outunits = 'km'
+                divisor = 1000.0
+            else: outunits = 'm'
+        elif mapunits == 'feet':
+            # nano-bug: we match any "feet", but US Survey feet is really
+            #  5279.9894 per statute mile, or 10.6' per 1000 miles. As >1000
+            #  miles the tick markers are rounded to the nearest 10th of a
+            #  mile (528'), the difference in foot flavours is ignored.
+            if dist > 5280.0:
+                outunits = 'miles'
+                divisor = 5280.0
+            else:
+                outunits = 'ft'
+        elif 'degree' in mapunits:
+            if dist < 1:
+                outunits = 'min'
+                divisor = (1/60.0)
+            else:
+                outunits = 'deg'
+
+        # format numbers in a nice way
+        if (dist/divisor) >= 2500.0:
+            outdist = round(dist/divisor)
+        elif (dist/divisor) >= 1000.0:
+            outdist = round(dist/divisor,1)
+        elif (dist/divisor) > 0.0:
+            outdist = round(dist/divisor,int(math.ceil(3-math.log10(dist/divisor))))
+        else:
+            outdist = float(dist/divisor)
+
+        return (outdist, outunits)
+
+
+    def Histogram(self, event):
+        """
+        Init histogram display canvas and tools
+        """
+        self.histogram = histogram.HistFrame(self,
+                                             id=wx.ID_ANY, size=globalvar.HIST_WINDOW_SIZE,
+                                             style=wx.DEFAULT_FRAME_STYLE)
+
+        #show new display
+        self.histogram.Show()
+        self.histogram.Refresh()
+        self.histogram.Update()
+
+
+    def OnDecoration(self, event):
+        """
+        Decorations overlay menu
+        """
+        point = wx.GetMousePosition()
+        decmenu = wx.Menu()
+        # Add items to the menu
+        AddScale = wx.MenuItem(decmenu, wx.ID_ANY, Icons["addbarscale"].GetLabel())
+        AddScale.SetBitmap(Icons["addbarscale"].GetBitmap(self.iconsize))
+        decmenu.AppendItem(AddScale)
+        self.Bind(wx.EVT_MENU, self.OnAddBarscale, AddScale)
+
+        AddLegend = wx.MenuItem(decmenu, wx.ID_ANY, Icons["addlegend"].GetLabel())
+        AddLegend.SetBitmap(Icons["addlegend"].GetBitmap(self.iconsize))
+        decmenu.AppendItem(AddLegend)
+        self.Bind(wx.EVT_MENU, self.OnAddLegend, AddLegend)
+
+        AddText = wx.MenuItem(decmenu, wx.ID_ANY, Icons["addtext"].GetLabel())
+        AddText.SetBitmap(Icons["addtext"].GetBitmap(self.iconsize))
+        decmenu.AppendItem(AddText)
+        self.Bind(wx.EVT_MENU, self.OnAddText, AddText)
+
+        # Popup the menu.  If an item is selected then its handler
+        # will be called before PopupMenu returns.
+        self.PopupMenu(decmenu)
+        decmenu.Destroy()
+
+    def OnAddBarscale(self, event):
+        """
+        Handler for scale/arrow map decoration menu selection.
+        """
+        if self.dialogs['barscale']:
+            return
+
+        id = 0 # unique index for overlay layer
+
+        # If location is latlon, only display north arrow (scale won't work)
+        #        proj = self.Map.projinfo['proj']
+        #        if proj == 'll':
+        #            barcmd = 'd.barscale -n'
+        #        else:
+        #            barcmd = 'd.barscale'
+
+        # decoration overlay control dialog
+        self.dialogs['barscale'] = \
+            gdialogs.DecorationDialog(parent=self, title=_('Scale and North arrow'),
+                                      size=(350, 200),
+                                      style=wx.DEFAULT_DIALOG_STYLE | wx.CENTRE,
+                                      cmd=['d.barscale', 'at=0,5'],
+                                      ovlId=id,
+                                      name='barscale',
+                                      checktxt = _("Show/hide scale and North arrow"),
+                                      ctrltxt = _("scale object"))
+
+        self.dialogs['barscale'].CentreOnParent()
+        ### dialog cannot be show as modal - in the result d.barscale is not selectable
+        ### self.dialogs['barscale'].ShowModal()
+        self.dialogs['barscale'].Show()
+        self.MapWindow.mouse['use'] = 'pointer'        
+
+    def OnAddLegend(self, event):
+        """
+        Handler for legend map decoration menu selection.
+        """
+        if self.dialogs['legend']:
+            return
+        
+        id = 1 # index for overlay layer in render
+
+        cmd = ['d.legend', 'at=5,50,2,5']
+        if self.tree.layer_selected and \
+                self.tree.GetPyData(self.tree.layer_selected)[0]['type'] == 'raster':
+            cmd.append('map=%s' % self.tree.GetPyData(self.tree.layer_selected)[0]['maplayer'].name)
+
+        # Decoration overlay control dialog
+        self.dialogs['legend'] = \
+            gdialogs.DecorationDialog(parent=self, title=('Legend'),
+                                      size=(350, 200),
+                                      style=wx.DEFAULT_DIALOG_STYLE | wx.CENTRE,
+                                      cmd=cmd,
+                                      ovlId=id,
+                                      name='legend',
+                                      checktxt = _("Show/hide legend"),
+                                      ctrltxt = _("legend object")) 
+
+        self.dialogs['legend'].CentreOnParent() 
+        ### dialog cannot be show as modal - in the result d.legend is not selectable
+        ### self.dialogs['legend'].ShowModal()
+        self.dialogs['legend'].Show()
+        self.MapWindow.mouse['use'] = 'pointer'
+
+    def OnAddText(self, event):
+        """
+        Handler for text decoration menu selection.
+        """
+        if self.MapWindow.dragid > -1:
+            id = self.MapWindow.dragid
+        else:
+            # index for overlay layer in render
+            if len(self.MapWindow.textdict.keys()) > 0:
+                id = self.MapWindow.textdict.keys()[-1] + 1
+            else:
+                id = 101
+
+        self.dialogs['text'] = gdialogs.TextLayerDialog(parent=self, ovlId=id, 
+                                                        title=_('Add text layer'),
+                                                        size=(400, 200))
+        self.dialogs['text'].CenterOnParent()
+
+        # If OK button pressed in decoration control dialog
+        if self.dialogs['text'].ShowModal() == wx.ID_OK:
+            text = self.dialogs['text'].GetValues()['text']
+            active = self.dialogs['text'].GetValues()['active']
+            coords, w, h = self.MapWindow.TextBounds(self.dialogs['text'].GetValues())
+        
+            # delete object if it has no text or is not active
+            if text == '' or active == False:
+                try:
+                    self.MapWindow.pdc.ClearId(id)
+                    self.MapWindow.pdc.RemoveId(id)
+                    del self.MapWindow.textdict[id]
+                except:
+                    pass
+                return
+
+            self.MapWindow.pdc.ClearId(id)
+            self.MapWindow.pdc.SetId(id)
+            self.MapWindow.textdict[id] = self.dialogs['text'].GetValues()
+            
+            self.MapWindow.Draw(self.MapWindow.pdcDec, img=self.MapWindow.textdict[id],
+                                drawid=id, pdctype='text', coords=coords)
+            
+            self.MapWindow.UpdateMap(render=False, renderVector=False)
+            
+        self.MapWindow.mouse['use'] = 'pointer'
+
+    def GetOptData(self, dcmd, type, params, propwin):
+        """
+        Callback method for decoration overlay command generated by
+        dialog created in menuform.py
+        """
+        # Reset comand and rendering options in render.Map. Always render decoration.
+        # Showing/hiding handled by PseudoDC
+        self.Map.ChangeOverlay(ovltype=type, type='overlay', name='', command=dcmd,
+                               l_active=True, l_render=False)
+        self.params[type] = params
+        self.propwin[type] = propwin
+
+    def OnZoomMenu(self, event):
+        """
+        Zoom menu
+        """
+        point = wx.GetMousePosition()
+        zoommenu = wx.Menu()
+        # Add items to the menu
+        zoommap = wx.MenuItem(zoommenu, wx.ID_ANY, _('Zoom to selected map(s)'))
+        zoommenu.AppendItem(zoommap)
+        self.Bind(wx.EVT_MENU, self.MapWindow.OnZoomToMap, zoommap)
+
+        zoomwind = wx.MenuItem(zoommenu, wx.ID_ANY, _('Zoom to computational region (set with g.region)'))
+        zoommenu.AppendItem(zoomwind)
+        self.Bind(wx.EVT_MENU, self.MapWindow.ZoomToWind, zoomwind)
+
+        zoomdefault = wx.MenuItem(zoommenu, wx.ID_ANY, _('Zoom to default region'))
+        zoommenu.AppendItem(zoomdefault)
+        self.Bind(wx.EVT_MENU, self.MapWindow.ZoomToDefault, zoomdefault)
+
+        zoomsaved = wx.MenuItem(zoommenu, wx.ID_ANY, _('Zoom to saved region'))
+        zoommenu.AppendItem(zoomsaved)
+        self.Bind(wx.EVT_MENU, self.MapWindow.ZoomToSaved, zoomsaved)
+
+        savewind = wx.MenuItem(zoommenu, wx.ID_ANY, _('Set computational region from display'))
+        zoommenu.AppendItem(savewind)
+        self.Bind(wx.EVT_MENU, self.MapWindow.DisplayToWind, savewind)
+
+        savezoom = wx.MenuItem(zoommenu, wx.ID_ANY, _('Save display geometry to named region'))
+        zoommenu.AppendItem(savezoom)
+        self.Bind(wx.EVT_MENU, self.MapWindow.SaveDisplayRegion, savezoom)
+
+        # Popup the menu.  If an item is selected then its handler
+        # will be called before PopupMenu returns.
+        self.PopupMenu(zoommenu)
+        zoommenu.Destroy()
+
+    def SetProperties(self, render=False, mode=0, showCompExtent=False,
+                      constrainRes=False, projection=False):
+        """!Set properies of map display window"""
+        self.statusbarWin['render'].SetValue(render)
+        self.statusbarWin['toggle'].SetSelection(mode)
+        self.StatusbarUpdate()
+        self.statusbarWin['region'].SetValue(showCompExtent)
+        self.statusbarWin['resolution'].SetValue(constrainRes)
+        self.statusbarWin['projection'].SetValue(projection)
+        if showCompExtent:
+            self.MapWindow.regionCoords = []
+        
+    def IsStandalone(self):
+        """!Check if Map display is standalone"""
+        if self.gismanager:
+            return False
+        
+        return True
+    
+    def GetLayerManager(self):
+        """!Get reference to Layer Manager
+
+        @return window reference
+        @return None (if standalone)
+        """
+        return self.gismanager
+    
+# end of class MapFrame
+
+class MapApp(wx.App):
+    """
+    MapApp class
+    """
+
+    def OnInit(self):
+
+        wx.InitAllImageHandlers()
+        if __name__ == "__main__":
+            Map = render.Map() # instance of Map class to render GRASS display output to PPM file
+        else:
+            Map = None
+
+        self.mapFrm = MapFrame(parent=None, id=wx.ID_ANY, Map=Map,
+                               size=globalvar.MAP_WINDOW_SIZE)
+        #self.SetTopWindow(Map)
+        self.mapFrm.Show()
+
+        if __name__ == "__main__":
+            # redraw map, if new command appears
+            self.redraw = False
+
+
+        return 1
+
+
+# end of class MapApp
+
+if __name__ == "__main__":
+
+    ###### SET command variable
+
+
+    title = "title"
+    cmdfilename = "cmdfilename"
+
+    
+
+    gm_map = MapApp(0)
+    # set title
+    gm_map.mapFrm.SetTitle(_("GRASS GIS Map Display: " +   title +   " - Location: " + grass.gisenv()["LOCATION_NAME"]))
+    
+    gm_map.MainLoop()
+    sys.exit(0)

Added: grass-addons/gui/wxpython/data_catalog/toolbars.py
===================================================================
--- grass-addons/gui/wxpython/data_catalog/toolbars.py	                        (rev 0)
+++ grass-addons/gui/wxpython/data_catalog/toolbars.py	2010-04-23 16:01:07 UTC (rev 42008)
@@ -0,0 +1,1380 @@
+"""
+ at package toolbar
+
+ at brief Toolbars for Map Display window
+
+Classes:
+ - AbstractToolbar
+ - MapToolbar
+ - GRToolbar
+ - GCPToolbar
+ - VDigitToolbar
+ - ProfileToolbar
+ - NvizToolbar
+
+(C) 2007-2008 by the GRASS Development Team This program is free
+software under the GNU General Public License (>=v2). Read the file
+COPYING that comes with GRASS for details.
+
+ at author Michael Barton
+ at author Jachym Cepicky
+ at author Martin Landa <landa.martin gmail.com>
+"""
+
+import wx
+import os, sys
+import platform
+
+import globalvar
+import gcmd
+version = os.getenv("GRASS_VERSION")
+if version == "6.4.0svn":
+    import grassenv
+
+import gdialogs
+import vdigit
+from vdigit import VDigitSettingsDialog as VDigitSettingsDialog
+from debug import Debug as Debug
+from icon import Icons as Icons
+from preferences import globalSettings as UserSettings
+
+gmpath = os.path.join(globalvar.ETCWXDIR, "icons")
+sys.path.append(gmpath)
+
+class AbstractToolbar(object):
+    """Abstract toolbar class"""
+    def __init__(self):
+        pass
+    
+    def InitToolbar(self, parent, toolbar, toolData):
+        """Initialize toolbar, i.e. add tools to the toolbar
+
+        @return list of ids (of added tools)
+        """
+
+        for tool in toolData:
+            self.CreateTool(parent, toolbar, *tool)
+
+        self._toolbar = toolbar
+        self._data = toolData
+        
+        self.parent = parent
+        
+    def ToolbarData(self):
+        """Toolbar data"""
+        return None
+
+    def CreateTool(self, parent, toolbar, tool, label, bitmap, kind,
+                   shortHelp, longHelp, handler):
+        """Add tool to the toolbar
+
+        @return id of tool
+        """
+
+        bmpDisabled=wx.NullBitmap
+
+        if label:
+            Debug.msg(3, "CreateTool(): tool=%d, label=%s bitmap=%s" % \
+                  (tool, label, bitmap))
+            toolWin = toolbar.AddLabelTool(tool, label, bitmap,
+                                           bmpDisabled, kind,
+                                           shortHelp, longHelp)
+            parent.Bind(wx.EVT_TOOL, handler, toolWin)
+        else: # add separator
+            toolbar.AddSeparator()
+
+        return tool
+
+    def GetToolbar(self):
+        """Get toolbar widget reference"""
+        return self._toolbar
+
+    def EnableLongHelp(self, enable=True):
+        """Enable/disable long help
+
+        @param enable True for enable otherwise disable
+        """
+        for tool in self._data:
+            if tool[0] == '': # separator
+                continue
+            
+            if enable:
+                self._toolbar.SetToolLongHelp(tool[0], tool[5])
+            else:
+                self._toolbar.SetToolLongHelp(tool[0], "")
+
+    def OnTool(self, event):
+        """Tool selected"""
+        if self.parent.toolbars['vdigit']:
+            # update vdigit toolbar (unselect currently selected tool)
+            id = self.parent.toolbars['vdigit'].GetAction(type='id')
+            self.parent.toolbars['vdigit'].GetToolbar().ToggleTool(id, False)
+        
+        if event:
+            # deselect previously selected tool
+            id = self.action.get('id', -1)
+            if id != event.GetId():
+                self._toolbar.ToggleTool(self.action['id'], False)
+            else:
+                self._toolbar.ToggleTool(self.action['id'], True)
+            
+            self.action['id'] = event.GetId()
+            
+            event.Skip()
+        else:
+            # initialize toolbar
+            self._toolbar.ToggleTool(self.action['id'], True)
+    
+    def GetAction(self, type='desc'):
+        """Get current action info"""
+        return self.action.get(type, '')
+
+    def SelectDefault(self, event):
+        """Select default tool"""
+        self._toolbar.ToggleTool(self.defaultAction['id'], True)
+        self.defaultAction['bind'](event)
+        self.action = { 'id' : self.defaultAction['id'],
+                        'desc' : self.defaultAction.get('desc', '') }
+        
+    def FixSize(self, width):
+	"""Fix toolbar width on Windows
+        
+	@todo Determine why combobox causes problems here
+	"""
+        if platform.system() == 'Windows':
+            size = self._toolbar.GetBestSize()
+            self._toolbar.SetSize((size[0] + width, size[1]))
+        
+class MapToolbar(AbstractToolbar):
+    """
+    Main Map Display toolbar
+    """
+
+    def __init__(self, mapdisplay, map):
+        AbstractToolbar.__init__(self)
+
+        self.mapcontent = map
+        self.mapdisplay = mapdisplay
+
+        self.toolbar = wx.ToolBar(parent=self.mapdisplay, id=wx.ID_ANY)
+        self.toolbar.SetToolBitmapSize(globalvar.toolbarSize)
+
+        self.InitToolbar(self.mapdisplay, self.toolbar, self.ToolbarData())
+        
+        # optional tools
+        self.combo = wx.ComboBox(parent=self.toolbar, id=wx.ID_ANY, value=_('2D view'),
+                                 choices=[_('2D view'), _('3D view'), _('Digitize')],
+                                 style=wx.CB_READONLY, size=(90, -1))
+        
+        self.comboid = self.toolbar.AddControl(self.combo)
+        self.mapdisplay.Bind(wx.EVT_COMBOBOX, self.OnSelectTool, self.comboid)
+
+        # realize the toolbar
+        self.toolbar.Realize()
+        
+        # workaround for Mac bug. May be fixed by 2.8.8, but not before then.
+        self.combo.Hide()
+        self.combo.Show()
+        
+        # default action
+        self.action = { 'id' : self.pointer }
+        self.defaultAction = { 'id' : self.pointer,
+                               'bind' : self.mapdisplay.OnPointer }
+        self.OnTool(None)
+        
+        self.FixSize(width = 90)
+        
+    def ToolbarData(self):
+        """Toolbar data"""
+
+        self.displaymap = wx.NewId()
+        self.rendermap = wx.NewId()
+        self.erase = wx.NewId()
+        self.pointer = wx.NewId()
+        self.query = wx.NewId()
+        self.pan = wx.NewId()
+        self.zoomin = wx.NewId()
+        self.zoomout = wx.NewId()
+        self.zoomback = wx.NewId()
+        self.zoommenu = wx.NewId()
+        self.analyze = wx.NewId()
+        self.dec = wx.NewId()
+        self.savefile = wx.NewId()
+        self.printmap = wx.NewId()
+
+        # tool, label, bitmap, kind, shortHelp, longHelp, handler
+        return (
+            (self.displaymap, "displaymap", Icons["displaymap"].GetBitmap(),
+             wx.ITEM_NORMAL, Icons["displaymap"].GetLabel(), Icons["displaymap"].GetDesc(),
+             self.mapdisplay.OnDraw),
+            (self.rendermap, "rendermap", Icons["rendermap"].GetBitmap(),
+             wx.ITEM_NORMAL, Icons["rendermap"].GetLabel(), Icons["rendermap"].GetDesc(),
+             self.mapdisplay.OnRender),
+            (self.erase, "erase", Icons["erase"].GetBitmap(),
+             wx.ITEM_NORMAL, Icons["erase"].GetLabel(), Icons["erase"].GetDesc(),
+             self.mapdisplay.OnErase),
+            ("", "", "", "", "", "", ""),
+            (self.pointer, "pointer", Icons["pointer"].GetBitmap(),
+             wx.ITEM_CHECK, Icons["pointer"].GetLabel(), Icons["pointer"].GetDesc(),
+             self.mapdisplay.OnPointer),
+            (self.query, "query", Icons["query"].GetBitmap(),
+             wx.ITEM_CHECK, Icons["query"].GetLabel(), Icons["query"].GetDesc(),
+             self.mapdisplay.OnQuery),
+            (self.pan, "pan", Icons["pan"].GetBitmap(),
+             wx.ITEM_CHECK, Icons["pan"].GetLabel(), Icons["pan"].GetDesc(),
+             self.mapdisplay.OnPan),
+            (self.zoomin, "zoom_in", Icons["zoom_in"].GetBitmap(),
+             wx.ITEM_CHECK, Icons["zoom_in"].GetLabel(), Icons["zoom_in"].GetDesc(),
+             self.mapdisplay.OnZoomIn),
+            (self.zoomout, "zoom_out", Icons["zoom_out"].GetBitmap(),
+             wx.ITEM_CHECK, Icons["zoom_out"].GetLabel(), Icons["zoom_out"].GetDesc(),
+             self.mapdisplay.OnZoomOut),
+            (self.zoomback, "zoom_back", Icons["zoom_back"].GetBitmap(),
+             wx.ITEM_NORMAL, Icons["zoom_back"].GetLabel(), Icons["zoom_back"].GetDesc(),
+             self.mapdisplay.OnZoomBack),
+            (self.zoommenu, "zoommenu", Icons["zoommenu"].GetBitmap(),
+             wx.ITEM_NORMAL, Icons["zoommenu"].GetLabel(), Icons["zoommenu"].GetDesc(),
+             self.mapdisplay.OnZoomMenu),
+            ("", "", "", "", "", "", ""),
+            (self.analyze, "analyze", Icons["analyze"].GetBitmap(),
+             wx.ITEM_NORMAL, Icons["analyze"].GetLabel(), Icons["analyze"].GetDesc(),
+             self.mapdisplay.OnAnalyze),
+            ("", "", "", "", "", "", ""),
+            (self.dec, "overlay", Icons["overlay"].GetBitmap(),
+             wx.ITEM_NORMAL, Icons["overlay"].GetLabel(), Icons["overlay"].GetDesc(),
+             self.mapdisplay.OnDecoration),
+            ("", "", "", "", "", "", ""),
+            (self.savefile, "savefile", Icons["savefile"].GetBitmap(),
+             wx.ITEM_NORMAL, Icons["savefile"].GetLabel(), Icons["savefile"].GetDesc(),
+             self.mapdisplay.SaveToFile),
+            (self.printmap, "printmap", Icons["printmap"].GetBitmap(),
+             wx.ITEM_NORMAL, Icons["printmap"].GetLabel(), Icons["printmap"].GetDesc(),
+             self.mapdisplay.PrintMenu),
+            ("", "", "", "", "", "", "")
+            )
+
+    def OnSelectTool(self, event):
+        """
+        Select / enable tool available in tools list
+        """
+        tool =  event.GetSelection()
+        
+        if tool == 0:
+            self.ExitToolbars()
+            self.Enable2D(True)
+
+        elif tool == 1 and not self.mapdisplay.toolbars['nviz']:
+            self.ExitToolbars()
+            self.mapdisplay.AddToolbar("nviz")
+            
+        elif tool == 2 and not self.mapdisplay.toolbars['vdigit']:
+            self.ExitToolbars()
+            self.mapdisplay.AddToolbar("vdigit")
+
+    def ExitToolbars(self):
+        if self.mapdisplay.toolbars['vdigit']:
+            self.mapdisplay.toolbars['vdigit'].OnExit()
+        if self.mapdisplay.toolbars['nviz']:       
+            self.mapdisplay.toolbars['nviz'].OnExit()
+
+    def Enable2D(self, enabled):
+        """Enable/Disable 2D display mode specific tools"""
+        for tool in (self.pointer,
+                     self.query,
+                     self.pan,
+                     self.zoomin,
+                     self.zoomout,
+                     self.zoomback,
+                     self.zoommenu,
+                     self.analyze,
+                     self.dec,
+                     self.savefile,
+                     self.printmap):
+            self.toolbar.EnableTool(tool, enabled)
+
+class GRToolbar(AbstractToolbar):
+    """
+    Georectification Display toolbar
+    """
+
+    def __init__(self, mapdisplay, map):
+        self.mapcontent = map
+        self.mapdisplay = mapdisplay
+
+        self.toolbar = wx.ToolBar(parent=self.mapdisplay, id=wx.ID_ANY)
+
+        # self.SetToolBar(self.toolbar)
+        self.toolbar.SetToolBitmapSize(globalvar.toolbarSize)
+
+        self.InitToolbar(self.mapdisplay, self.toolbar, self.ToolbarData())
+
+        # realize the toolbar
+        self.toolbar.Realize()
+
+    def ToolbarData(self):
+        """Toolbar data"""
+
+        self.displaymap = wx.NewId()
+        self.rendermap = wx.NewId()
+        self.erase = wx.NewId()
+        self.gcpset = wx.NewId()
+        self.pan = wx.NewId()
+        self.zoomin = wx.NewId()
+        self.zoomout = wx.NewId()
+        self.zoomback = wx.NewId()
+        self.zoomtomap = wx.NewId()
+
+        # tool, label, bitmap, kind, shortHelp, longHelp, handler
+        return (
+            (self.displaymap, "displaymap", Icons["displaymap"].GetBitmap(),
+             wx.ITEM_NORMAL, Icons["displaymap"].GetLabel(), Icons["displaymap"].GetDesc(),
+             self.mapdisplay.OnDraw),
+            (self.rendermap, "rendermap", Icons["rendermap"].GetBitmap(),
+             wx.ITEM_NORMAL, Icons["rendermap"].GetLabel(), Icons["rendermap"].GetDesc(),
+             self.mapdisplay.OnRender),
+            (self.erase, "erase", Icons["erase"].GetBitmap(),
+             wx.ITEM_NORMAL, Icons["erase"].GetLabel(), Icons["erase"].GetDesc(),
+             self.mapdisplay.OnErase),
+            ("", "", "", "", "", "", ""),
+            (self.gcpset, "grGcpSet", Icons["grGcpSet"].GetBitmap(),
+             wx.ITEM_RADIO, Icons["grGcpSet"].GetLabel(), Icons["grGcpSet"].GetDesc(),
+             self.mapdisplay.OnPointer),
+            (self.pan, "pan", Icons["pan"].GetBitmap(),
+             wx.ITEM_RADIO, Icons["pan"].GetLabel(), Icons["pan"].GetDesc(),
+             self.mapdisplay.OnPan),
+            (self.zoomin, "zoom_in", Icons["zoom_in"].GetBitmap(),
+             wx.ITEM_RADIO, Icons["zoom_in"].GetLabel(), Icons["zoom_in"].GetDesc(),
+             self.mapdisplay.OnZoomIn),
+            (self.zoomout, "zoom_out", Icons["zoom_out"].GetBitmap(),
+             wx.ITEM_RADIO, Icons["zoom_out"].GetLabel(), Icons["zoom_out"].GetDesc(),
+             self.mapdisplay.OnZoomOut),
+            (self.zoomback, "zoom_back", Icons["zoom_back"].GetBitmap(),
+             wx.ITEM_NORMAL, Icons["zoom_back"].GetLabel(), Icons["zoom_back"].GetDesc(),
+             self.mapdisplay.OnZoomBack),
+            (self.zoomtomap, "zoomtomap", Icons["zoommenu"].GetBitmap(),
+             wx.ITEM_NORMAL, _("Zoom to map"), _("Zoom to displayed map"),
+             self.OnZoomMap),
+            ("", "", "", "", "", "", ""),
+            )
+
+    def OnZoomMap(self, event):
+        """Zoom to selected map"""
+        layer = self.mapcontent.GetListOfLayers()[0]
+
+        self.mapdisplay.MapWindow.ZoomToMap(layer=layer)
+
+        event.Skip()
+        
+class GCPToolbar(AbstractToolbar):
+    """
+    Toolbar for managing ground control points during georectification
+    """
+    def __init__(self, parent, tbframe):
+        self.parent  = parent # GCP
+        self.tbframe = tbframe
+
+        self.toolbar = wx.ToolBar(parent=self.tbframe, id=wx.ID_ANY)
+
+        # self.SetToolBar(self.toolbar)
+        self.toolbar.SetToolBitmapSize(globalvar.toolbarSize)
+
+        self.InitToolbar(self.tbframe, self.toolbar, self.ToolbarData())
+
+        # realize the toolbar
+        self.toolbar.Realize()
+
+    def ToolbarData(self):
+        
+        self.gcpSave = wx.NewId()
+        self.gcpAdd = wx.NewId()
+        self.gcpDelete = wx.NewId()
+        self.gcpClear = wx.NewId()
+        self.gcpReload = wx.NewId()
+        self.rms = wx.NewId()
+        self.georect = wx.NewId()
+        self.settings = wx.NewId()
+        self.quit = wx.NewId()
+
+        return (
+            (self.gcpSave, 'grGcpSave', Icons["grGcpSave"].GetBitmap(),
+             wx.ITEM_NORMAL, Icons["grGcpSave"].GetLabel(), Icons["grGcpSave"].GetDesc(),
+             self.parent.SaveGCPs),
+            (self.gcpAdd, 'grGrGcpAdd', Icons["grGcpAdd"].GetBitmap(),
+             wx.ITEM_NORMAL, Icons["grGcpAdd"].GetLabel(), Icons["grGcpAdd"].GetDesc(),
+             self.parent.AddGCP),
+            (self.gcpDelete, 'grGrGcpDelete', Icons["grGcpDelete"].GetBitmap(),
+             wx.ITEM_NORMAL, Icons["grGcpDelete"].GetLabel(), Icons["grGcpDelete"].GetDesc(), 
+             self.parent.DeleteGCP),
+            (self.gcpClear, 'grGcpClear', Icons["grGcpClear"].GetBitmap(),
+             wx.ITEM_NORMAL, Icons["grGcpClear"].GetLabel(), Icons["grGcpClear"].GetDesc(), 
+             self.parent.ClearGCP),
+            (self.gcpReload, 'grGcpReload', Icons["grGcpReload"].GetBitmap(),
+             wx.ITEM_NORMAL, Icons["grGcpReload"].GetLabel(), Icons["grGcpReload"].GetDesc(), 
+             self.parent.ReloadGCPs),
+
+            ("", "", "", "", "", "", ""),
+            (self.rms, 'grGcpRms', Icons["grGcpRms"].GetBitmap(),
+             wx.ITEM_NORMAL, Icons["grGcpRms"].GetLabel(), Icons["grGcpRms"].GetDesc(),
+             self.parent.OnRMS),
+            (self.georect, 'grGeorect', Icons["grGeorect"].GetBitmap(), 
+             wx.ITEM_NORMAL, Icons["grGeorect"].GetLabel(), Icons["grGeorect"].GetDesc(),
+             self.parent.OnGeorect),
+            ("", "", "", "", "", "", ""),
+            (self.settings, 'grSettings', Icons["grSettings"].GetBitmap(), 
+             wx.ITEM_NORMAL, Icons["grSettings"].GetLabel(), Icons["grSettings"].GetDesc(),
+             self.parent.OnSettings),
+            (self.quit, 'grGcpQuit', Icons["grGcpQuit"].GetBitmap(), 
+             wx.ITEM_NORMAL, Icons["grGcpQuit"].GetLabel(), Icons["grGcpQuit"].GetDesc(),
+             self.parent.OnQuit)
+            )
+    
+class VDigitToolbar(AbstractToolbar):
+    """
+    Toolbar for digitization
+    """
+
+    def __init__(self, parent, map, layerTree=None, log=None):
+        self.mapcontent    = map       # Map class instance
+        self.parent        = parent    # MapFrame
+        self.layerTree     = layerTree # reference to layer tree associated to map display
+        self.log           = log       # log area
+        
+        # currently selected map layer for editing (reference to MapLayer instance)
+        self.mapLayer = None
+        # list of vector layers from Layer Manager (only in the current mapset)
+        self.layers   = [] 
+
+        self.comboid    = None
+
+        # only one dialog can be open
+        self.settingsDialog   = None
+
+        # create toolbars (two rows optionally)
+        self.toolbar = []
+        self.numOfRows = 1 # number of rows for toolbar
+        for row in range(0, self.numOfRows):
+            self.toolbar.append(wx.ToolBar(parent=self.parent, id=wx.ID_ANY))
+            self.toolbar[row].SetToolBitmapSize(globalvar.toolbarSize)
+            self.toolbar[row].Bind(wx.EVT_TOOL, self.OnTool)
+            
+            # create toolbar
+            if self.numOfRows ==  1:
+                rowdata=None
+            else:
+                rowdata = row
+            self.InitToolbar(self.parent, self.toolbar[row], self.ToolbarData(rowdata))
+
+        # default action (digitize new point, line, etc.)
+        self.action = { 'desc' : 'addLine',
+                        'type' : 'point',
+                        'id'   : self.addPoint }
+        
+        # list of available vector maps
+        self.UpdateListOfLayers(updateTool=True)
+
+        # realize toolbar
+        for row in range(0, self.numOfRows):
+            self.toolbar[row].Realize()
+            # workaround for Mac bug. May be fixed by 2.8.8, but not before then.
+            self.combo.Hide()
+            self.combo.Show()
+
+
+        # disable undo/redo
+        self.toolbar[0].EnableTool(self.undo, False)
+        
+        # toogle to pointer by default
+        self.OnTool(None)
+        
+        self.FixSize(width = 105)
+        
+    def ToolbarData(self, row=None):
+        """
+        Toolbar data
+        """
+        data = []
+        if row is None or row == 0:
+            self.addPoint = wx.NewId()
+            self.addLine = wx.NewId()
+            self.addBoundary = wx.NewId()
+            self.addCentroid = wx.NewId()
+            self.moveVertex = wx.NewId()
+            self.addVertex = wx.NewId()
+            self.removeVertex = wx.NewId()
+            self.splitLine = wx.NewId()
+            self.editLine = wx.NewId()
+            self.moveLine = wx.NewId()
+            self.deleteLine = wx.NewId()
+            self.additionalTools = wx.NewId()
+            self.displayCats = wx.NewId()
+            self.displayAttr = wx.NewId()
+            self.copyCats = wx.NewId()
+
+            data = [("", "", "", "", "", "", ""),
+                    (self.addPoint, "digAddPoint", Icons["digAddPoint"].GetBitmap(),
+                     wx.ITEM_CHECK, Icons["digAddPoint"].GetLabel(), Icons["digAddPoint"].GetDesc(),
+                     self.OnAddPoint),
+                    (self.addLine, "digAddLine", Icons["digAddLine"].GetBitmap(),
+                     wx.ITEM_CHECK, Icons["digAddLine"].GetLabel(), Icons["digAddLine"].GetDesc(),
+                     self.OnAddLine),
+                    (self.addBoundary, "digAddBoundary", Icons["digAddBoundary"].GetBitmap(),
+                     wx.ITEM_CHECK, Icons["digAddBoundary"].GetLabel(), Icons["digAddBoundary"].GetDesc(),
+                     self.OnAddBoundary),
+                    (self.addCentroid, "digAddCentroid", Icons["digAddCentroid"].GetBitmap(),
+                     wx.ITEM_CHECK, Icons["digAddCentroid"].GetLabel(), Icons["digAddCentroid"].GetDesc(),
+                     self.OnAddCentroid),
+                    (self.moveVertex, "digMoveVertex", Icons["digMoveVertex"].GetBitmap(),
+                     wx.ITEM_CHECK, Icons["digMoveVertex"].GetLabel(), Icons["digMoveVertex"].GetDesc(),
+                     self.OnMoveVertex),
+                    (self.addVertex, "digAddVertex", Icons["digAddVertex"].GetBitmap(),
+                     wx.ITEM_CHECK, Icons["digAddVertex"].GetLabel(), Icons["digAddVertex"].GetDesc(),
+                     self.OnAddVertex),
+                    (self.removeVertex, "digRemoveVertex", Icons["digRemoveVertex"].GetBitmap(),
+                     wx.ITEM_CHECK, Icons["digRemoveVertex"].GetLabel(), Icons["digRemoveVertex"].GetDesc(),
+                     self.OnRemoveVertex),
+                    (self.splitLine, "digSplitLine", Icons["digSplitLine"].GetBitmap(),
+                     wx.ITEM_CHECK, Icons["digSplitLine"].GetLabel(), Icons["digSplitLine"].GetDesc(),
+                     self.OnSplitLine),
+                    (self.editLine, "digEditLine", Icons["digEditLine"].GetBitmap(),
+                     wx.ITEM_CHECK, Icons["digEditLine"].GetLabel(), Icons["digEditLine"].GetDesc(),
+                     self.OnEditLine),
+                    (self.moveLine, "digMoveLine", Icons["digMoveLine"].GetBitmap(),
+                     wx.ITEM_CHECK, Icons["digMoveLine"].GetLabel(), Icons["digMoveLine"].GetDesc(),
+                     self.OnMoveLine),
+                    (self.deleteLine, "digDeleteLine", Icons["digDeleteLine"].GetBitmap(),
+                     wx.ITEM_CHECK, Icons["digDeleteLine"].GetLabel(), Icons["digDeleteLine"].GetDesc(),
+                     self.OnDeleteLine),
+                    (self.displayCats, "digDispCats", Icons["digDispCats"].GetBitmap(),
+                     wx.ITEM_CHECK, Icons["digDispCats"].GetLabel(), Icons["digDispCats"].GetDesc(),
+                     self.OnDisplayCats),
+                    (self.copyCats, "digCopyCats", Icons["digCopyCats"].GetBitmap(),
+                     wx.ITEM_CHECK, Icons["digCopyCats"].GetLabel(), Icons["digCopyCats"].GetDesc(),
+                     self.OnCopyCA),
+                    (self.displayAttr, "digDispAttr", Icons["digDispAttr"].GetBitmap(),
+                     wx.ITEM_CHECK, Icons["digDispAttr"].GetLabel(), Icons["digDispAttr"].GetDesc(),
+                     self.OnDisplayAttr),
+                    (self.additionalTools, "digAdditionalTools", Icons["digAdditionalTools"].GetBitmap(),
+                     wx.ITEM_CHECK, Icons["digAdditionalTools"].GetLabel(),
+                     Icons["digAdditionalTools"].GetDesc(),
+                     self.OnAdditionalToolMenu)]
+
+        if row is None or row == 1:
+            self.undo = wx.NewId()
+            self.settings = wx.NewId()
+            self.exit = wx.NewId()
+
+            data.append(("", "", "", "", "", "", ""))
+            data.append((self.undo, "digUndo", Icons["digUndo"].GetBitmap(),
+                         wx.ITEM_NORMAL, Icons["digUndo"].GetLabel(), Icons["digUndo"].GetDesc(),
+                         self.OnUndo))
+            # data.append((self.undo, "digRedo", Icons["digRedo"].GetBitmap(),
+            #             wx.ITEM_NORMAL, Icons["digRedo"].GetLabel(), Icons["digRedo"].GetDesc(),
+            #             self.OnRedo))
+            data.append((self.settings, "digSettings", Icons["digSettings"].GetBitmap(),
+                         wx.ITEM_NORMAL, Icons["digSettings"].GetLabel(), Icons["digSettings"].GetDesc(),
+                         self.OnSettings))
+            data.append((self.exit, "digExit", Icons["quit"].GetBitmap(),
+                         wx.ITEM_NORMAL, Icons["digExit"].GetLabel(), Icons["digExit"].GetDesc(),
+                         self.OnExit))
+
+        return data
+
+    def OnTool(self, event):
+        """Tool selected -> disable selected tool in map toolbar"""
+        # update map toolbar (unselect currently selected tool)
+        id = self.parent.toolbars['map'].GetAction(type='id')
+        self.parent.toolbars['map'].toolbar.ToggleTool(id, False)
+
+        # set cursor
+        cursor = self.parent.cursors["cross"]
+        self.parent.MapWindow.SetCursor(cursor)
+
+        # pointer
+        self.parent.OnPointer(None)
+
+        if event:
+            # deselect previously selected tool
+            id = self.action.get('id', -1)
+            if id != event.GetId():
+                self.toolbar[0].ToggleTool(self.action['id'], False)
+            else:
+                self.toolbar[0].ToggleTool(self.action['id'], True)
+            
+            self.action['id'] = event.GetId()
+            event.Skip()
+        else:
+            # initialize toolbar
+            self.toolbar[0].ToggleTool(self.action['id'], True)
+
+        # clear tmp canvas
+        if self.action['id'] != id:
+            self.parent.MapWindow.ClearLines(pdc=self.parent.MapWindow.pdcTmp)
+            if self.parent.digit and \
+                    len(self.parent.digit.driver.GetSelected()) > 0:
+                # cancel action
+                self.parent.MapWindow.OnMiddleDown(None)
+        
+    def OnAddPoint(self, event):
+        """Add point to the vector map Laier"""
+        Debug.msg (2, "VDigitToolbar.OnAddPoint()")
+        self.action = { 'desc' : "addLine",
+                        'type' : "point",
+                        'id'   : self.addPoint }
+        self.parent.MapWindow.mouse['box'] = 'point'
+
+    def OnAddLine(self, event):
+        """Add line to the vector map layer"""
+        Debug.msg (2, "VDigitToolbar.OnAddLine()")
+        self.action = { 'desc' : "addLine",
+                        'type' : "line",
+                        'id'   : self.addLine }
+        self.parent.MapWindow.mouse['box'] = 'line'
+        ### self.parent.MapWindow.polycoords = [] # reset temp line
+
+    def OnAddBoundary(self, event):
+        """Add boundary to the vector map layer"""
+        Debug.msg (2, "VDigitToolbar.OnAddBoundary()")
+        if self.action['desc'] != 'addLine' or \
+                self.action['type'] != 'boundary':
+            self.parent.MapWindow.polycoords = [] # reset temp line
+        self.action = { 'desc' : "addLine",
+                        'type' : "boundary",
+                        'id'   : self.addBoundary }
+        self.parent.MapWindow.mouse['box'] = 'line'
+
+    def OnAddCentroid(self, event):
+        """Add centroid to the vector map layer"""
+        Debug.msg (2, "VDigitToolbar.OnAddCentroid()")
+        self.action = { 'desc' : "addLine",
+                        'type' : "centroid",
+                        'id'   : self.addCentroid }
+        self.parent.MapWindow.mouse['box'] = 'point'
+
+    def OnExit (self, event=None):
+        """Quit digitization tool"""
+        # stop editing of the currently selected map layer
+        if self.mapLayer:
+            self.StopEditing()
+
+        # close dialogs if still open
+        if self.settingsDialog:
+            self.settingsDialog.OnCancel(None)
+        
+        # disable the toolbar
+        self.parent.RemoveToolbar ("vdigit")
+
+        # set default mouse settings
+        self.parent.MapWindow.mouse['use'] = "pointer"
+        self.parent.MapWindow.mouse['box'] = "point"
+        self.parent.MapWindow.polycoords = []
+        
+    def OnMoveVertex(self, event):
+        """Move line vertex"""
+        Debug.msg(2, "Digittoolbar.OnMoveVertex():")
+        self.action = { 'desc' : "moveVertex",
+                        'id'   : self.moveVertex }
+        self.parent.MapWindow.mouse['box'] = 'point'
+
+    def OnAddVertex(self, event):
+        """Add line vertex"""
+        Debug.msg(2, "Digittoolbar.OnAddVertex():")
+        self.action = { 'desc' : "addVertex",
+                        'id'   : self.addVertex }
+        self.parent.MapWindow.mouse['box'] = 'point'
+
+
+    def OnRemoveVertex(self, event):
+        """Remove line vertex"""
+        Debug.msg(2, "Digittoolbar.OnRemoveVertex():")
+        self.action = { 'desc' : "removeVertex",
+                        'id'   : self.removeVertex }
+        self.parent.MapWindow.mouse['box'] = 'point'
+
+
+    def OnSplitLine(self, event):
+        """Split line"""
+        Debug.msg(2, "Digittoolbar.OnSplitLine():")
+        self.action = { 'desc' : "splitLine",
+                        'id'   : self.splitLine }
+        self.parent.MapWindow.mouse['box'] = 'point'
+
+    def OnEditLine(self, event):
+        """Edit line"""
+        Debug.msg(2, "Digittoolbar.OnEditLine():")
+        self.action = { 'desc' : "editLine",
+                        'id'   : self.editLine }
+        self.parent.MapWindow.mouse['box'] = 'line'
+
+    def OnMoveLine(self, event):
+        """Move line"""
+        Debug.msg(2, "Digittoolbar.OnMoveLine():")
+        self.action = { 'desc' : "moveLine",
+                        'id'   : self.moveLine }
+        self.parent.MapWindow.mouse['box'] = 'box'
+
+    def OnDeleteLine(self, event):
+        """Delete line"""
+        Debug.msg(2, "Digittoolbar.OnDeleteLine():")
+        self.action = { 'desc' : "deleteLine",
+                        'id'   : self.deleteLine }
+        self.parent.MapWindow.mouse['box'] = 'box'
+
+    def OnDisplayCats(self, event):
+        """Display/update categories"""
+        Debug.msg(2, "Digittoolbar.OnDisplayCats():")
+        self.action = { 'desc' : "displayCats",
+                        'id'   : self.displayCats }
+        self.parent.MapWindow.mouse['box'] = 'point'
+
+    def OnDisplayAttr(self, event):
+        """Display/update attributes"""
+        Debug.msg(2, "Digittoolbar.OnDisplayAttr():")
+        self.action = { 'desc' : "displayAttrs",
+                        'id'   : self.displayAttr }
+        self.parent.MapWindow.mouse['box'] = 'point'
+
+    def OnCopyCA(self, event):
+        """Copy categories/attributes menu"""
+        point = wx.GetMousePosition()
+        toolMenu = wx.Menu()
+        # Add items to the menu
+        cats = wx.MenuItem(parentMenu=toolMenu, id=wx.ID_ANY,
+                           text=_('Copy categories'),
+                           kind=wx.ITEM_CHECK)
+        toolMenu.AppendItem(cats)
+        self.parent.MapWindow.Bind(wx.EVT_MENU, self.OnCopyCats, cats)
+        if self.action['desc'] == "copyCats":
+            cats.Check(True)
+
+        attrb = wx.MenuItem(parentMenu=toolMenu, id=wx.ID_ANY,
+                            text=_('Duplicate attributes'),
+                            kind=wx.ITEM_CHECK)
+        toolMenu.AppendItem(attrb)
+        self.parent.MapWindow.Bind(wx.EVT_MENU, self.OnCopyAttrb, attrb)
+        if self.action['desc'] == "copyAttrs":
+            attrb.Check(True)
+
+        # Popup the menu.  If an item is selected then its handler
+        # will be called before PopupMenu returns.
+        self.parent.MapWindow.PopupMenu(toolMenu)
+        toolMenu.Destroy()
+        
+        if self.action['desc'] == "addPoint":
+            self.toolbar[0].ToggleTool(self.copyCats, False)
+        
+    def OnCopyCats(self, event):
+        """Copy categories"""
+        if self.action['desc'] == 'copyCats': # select previous action
+            self.toolbar[0].ToggleTool(self.addPoint, True)
+            self.toolbar[0].ToggleTool(self.copyCats, False)
+            self.OnAddPoint(event)
+            return
+        
+        Debug.msg(2, "Digittoolbar.OnCopyCats():")
+        self.action = { 'desc' : "copyCats",
+                        'id'   : self.copyCats }
+        self.parent.MapWindow.mouse['box'] = 'point'
+
+    def OnCopyAttrb(self, event):
+        if self.action['desc'] == 'copyAttrs': # select previous action
+            self.toolbar[0].ToggleTool(self.addPoint, True)
+            self.toolbar[0].ToggleTool(self.copyCats, False)
+            self.OnAddPoint(event)
+            return
+        
+        Debug.msg(2, "Digittoolbar.OnCopyAttrb():")
+        self.action = { 'desc' : "copyAttrs",
+                        'id'   : self.copyCats }
+        self.parent.MapWindow.mouse['box'] = 'point'
+        
+    def OnUndo(self, event):
+        """Undo previous changes"""
+        self.parent.digit.Undo()
+
+        event.Skip()
+
+    def EnableUndo(self, enable=True):
+        """Enable 'Undo' in toolbar
+
+        @param enable False for disable
+        """
+        if enable:
+            if self.toolbar[0].GetToolEnabled(self.undo) is False:
+                self.toolbar[0].EnableTool(self.undo, True)
+        else:
+            if self.toolbar[0].GetToolEnabled(self.undo) is True:
+                self.toolbar[0].EnableTool(self.undo, False)
+        
+    def OnSettings(self, event):
+        """Show settings dialog"""
+
+        if self.parent.digit is None:
+            reload(vdigit)
+            from vdigit import Digit as Digit
+            self.parent.digit = Digit(mapwindow=self.parent.MapWindow)
+            
+        if not self.settingsDialog:
+            self.settingsDialog = VDigitSettingsDialog(parent=self.parent, title=_("Digitization settings"),
+                                                       style=wx.DEFAULT_DIALOG_STYLE)
+            self.settingsDialog.Show()
+
+    def OnAdditionalToolMenu(self, event):
+        """Menu for additional tools"""
+        point = wx.GetMousePosition()
+        toolMenu = wx.Menu()
+        # Add items to the menu
+        copy = wx.MenuItem(parentMenu=toolMenu, id=wx.ID_ANY,
+                           text=_('Copy features from (background) vector map'),
+                           kind=wx.ITEM_CHECK)
+        toolMenu.AppendItem(copy)
+        self.parent.MapWindow.Bind(wx.EVT_MENU, self.OnCopy, copy)
+        if self.action['desc'] == "copyLine":
+            copy.Check(True)
+
+        flip = wx.MenuItem(parentMenu=toolMenu, id=wx.ID_ANY,
+                           text=_('Flip selected lines/boundaries'),
+                           kind=wx.ITEM_CHECK)
+        toolMenu.AppendItem(flip)
+        self.parent.MapWindow.Bind(wx.EVT_MENU, self.OnFlip, flip)
+        if self.action['desc'] == "flipLine":
+            flip.Check(True)
+
+        merge = wx.MenuItem(parentMenu=toolMenu, id=wx.ID_ANY,
+                            text=_('Merge selected lines/boundaries'),
+                            kind=wx.ITEM_CHECK)
+        toolMenu.AppendItem(merge)
+        self.parent.MapWindow.Bind(wx.EVT_MENU, self.OnMerge, merge)
+        if self.action['desc'] == "mergeLine":
+            merge.Check(True)
+
+        breakL = wx.MenuItem(parentMenu=toolMenu, id=wx.ID_ANY,
+                             text=_('Break selected lines/boundaries at intersection'),
+                             kind=wx.ITEM_CHECK)
+        toolMenu.AppendItem(breakL)
+        self.parent.MapWindow.Bind(wx.EVT_MENU, self.OnBreak, breakL)
+        if self.action['desc'] == "breakLine":
+            breakL.Check(True)
+
+        snap = wx.MenuItem(parentMenu=toolMenu, id=wx.ID_ANY,
+                           text=_('Snap selected lines/boundaries (only to nodes)'),
+                           kind=wx.ITEM_CHECK)
+        toolMenu.AppendItem(snap)
+        self.parent.MapWindow.Bind(wx.EVT_MENU, self.OnSnap, snap)
+        if self.action['desc'] == "snapLine":
+            snap.Check(True)
+
+        connect = wx.MenuItem(parentMenu=toolMenu, id=wx.ID_ANY,
+                              text=_('Connect selected lines/boundaries'),
+                              kind=wx.ITEM_CHECK)
+        toolMenu.AppendItem(connect)
+        self.parent.MapWindow.Bind(wx.EVT_MENU, self.OnConnect, connect)
+        if self.action['desc'] == "connectLine":
+            connect.Check(True)
+
+        query = wx.MenuItem(parentMenu=toolMenu, id=wx.ID_ANY,
+                            text=_('Query features'),
+                            kind=wx.ITEM_CHECK)
+        toolMenu.AppendItem(query)
+        self.parent.MapWindow.Bind(wx.EVT_MENU, self.OnQuery, query)
+        if self.action['desc'] == "queryLine":
+            query.Check(True)
+
+        zbulk = wx.MenuItem(parentMenu=toolMenu, id=wx.ID_ANY,
+                            text=_('Z bulk-labeling of 3D lines'),
+                            kind=wx.ITEM_CHECK)
+        toolMenu.AppendItem(zbulk)
+        self.parent.MapWindow.Bind(wx.EVT_MENU, self.OnZBulk, zbulk)
+        if self.action['desc'] == "zbulkLine":
+            zbulk.Check(True)
+
+        typeconv = wx.MenuItem(parentMenu=toolMenu, id=wx.ID_ANY,
+                               text=_('Feature type conversion'),
+                               kind=wx.ITEM_CHECK)
+        toolMenu.AppendItem(typeconv)
+        self.parent.MapWindow.Bind(wx.EVT_MENU, self.OnTypeConversion, typeconv)
+        if self.action['desc'] == "typeConv":
+            typeconv.Check(True)
+
+        # Popup the menu.  If an item is selected then its handler
+        # will be called before PopupMenu returns.
+        self.parent.MapWindow.PopupMenu(toolMenu)
+        toolMenu.Destroy()
+        
+        if self.action['desc'] == 'addPoint':
+            self.toolbar[0].ToggleTool(self.additionalTools, False)
+        
+    def OnCopy(self, event):
+        """Copy selected features from (background) vector map"""
+        if self.action['desc'] == 'copyLine': # select previous action
+            self.toolbar[0].ToggleTool(self.addPoint, True)
+            self.toolbar[0].ToggleTool(self.additionalTools, False)
+            self.OnAddPoint(event)
+            return
+        
+        Debug.msg(2, "Digittoolbar.OnCopy():")
+        self.action = { 'desc' : "copyLine",
+                        'id'   : self.additionalTools }
+        self.parent.MapWindow.mouse['box'] = 'box'
+
+    def OnFlip(self, event):
+        """Flip selected lines/boundaries"""
+        if self.action['desc'] == 'flipLine': # select previous action
+            self.toolbar[0].ToggleTool(self.addPoint, True)
+            self.toolbar[0].ToggleTool(self.additionalTools, False)
+            self.OnAddPoint(event)
+            return
+        
+        Debug.msg(2, "Digittoolbar.OnFlip():")
+        self.action = { 'desc' : "flipLine",
+                        'id'   : self.additionalTools }
+        self.parent.MapWindow.mouse['box'] = 'box'
+
+    def OnMerge(self, event):
+        """Merge selected lines/boundaries"""
+        if self.action['desc'] == 'mergeLine': # select previous action
+            self.toolbar[0].ToggleTool(self.addPoint, True)
+            self.toolbar[0].ToggleTool(self.additionalTools, False)
+            self.OnAddPoint(event)
+            return
+        
+        Debug.msg(2, "Digittoolbar.OnMerge():")
+        self.action = { 'desc' : "mergeLine",
+                        'id'   : self.additionalTools }
+        self.parent.MapWindow.mouse['box'] = 'box'
+
+    def OnBreak(self, event):
+        """Break selected lines/boundaries"""
+        if self.action['desc'] == 'breakLine': # select previous action
+            self.toolbar[0].ToggleTool(self.addPoint, True)
+            self.toolbar[0].ToggleTool(self.additionalTools, False)
+            self.OnAddPoint(event)
+            return
+        
+        Debug.msg(2, "Digittoolbar.OnBreak():")
+        self.action = { 'desc' : "breakLine",
+                        'id'   : self.additionalTools }
+        self.parent.MapWindow.mouse['box'] = 'box'
+
+    def OnSnap(self, event):
+        """Snap selected features"""
+        if self.action['desc'] == 'snapLine': # select previous action
+            self.toolbar[0].ToggleTool(self.addPoint, True)
+            self.toolbar[0].ToggleTool(self.additionalTools, False)
+            self.OnAddPoint(event)
+            return
+        
+        Debug.msg(2, "Digittoolbar.OnSnap():")
+        self.action = { 'desc' : "snapLine",
+                        'id'   : self.additionalTools }
+        self.parent.MapWindow.mouse['box'] = 'box'
+
+    def OnConnect(self, event):
+        """Connect selected lines/boundaries"""
+        if self.action['desc'] == 'connectLine': # select previous action
+            self.toolbar[0].ToggleTool(self.addPoint, True)
+            self.toolbar[0].ToggleTool(self.additionalTools, False)
+            self.OnAddPoint(event)
+            return
+        
+        Debug.msg(2, "Digittoolbar.OnConnect():")
+        self.action = { 'desc' : "connectLine",
+                        'id'   : self.additionalTools }
+        self.parent.MapWindow.mouse['box'] = 'box'
+
+    def OnQuery(self, event):
+        """Query selected lines/boundaries"""
+        if self.action['desc'] == 'queryLine': # select previous action
+            self.toolbar[0].ToggleTool(self.addPoint, True)
+            self.toolbar[0].ToggleTool(self.additionalTools, False)
+            self.OnAddPoint(event)
+            return
+        
+        Debug.msg(2, "Digittoolbar.OnQuery(): %s" % \
+                      UserSettings.Get(group='vdigit', key='query', subkey='selection'))
+        self.action = { 'desc' : "queryLine",
+                        'id'   : self.additionalTools }
+        self.parent.MapWindow.mouse['box'] = 'box'
+
+    def OnZBulk(self, event):
+        """Z bulk-labeling selected lines/boundaries"""
+        if not self.parent.digit.driver.Is3D():
+            wx.MessageBox(parent=self.parent,
+                          message=_("Vector map is not 3D. Operation canceled."),
+                          caption=_("Error"), style=wx.OK | wx.ICON_ERROR | wx.CENTRE)
+            return
+        
+        if self.action['desc'] == 'zbulkLine': # select previous action
+            self.toolbar[0].ToggleTool(self.addPoint, True)
+            self.toolbar[0].ToggleTool(self.additionalTools, False)
+            self.OnAddPoint(event)
+            return
+        
+        Debug.msg(2, "Digittoolbar.OnZBulk():")
+        self.action = { 'desc' : "zbulkLine",
+                        'id'   : self.additionalTools }
+        self.parent.MapWindow.mouse['box'] = 'line'
+
+    def OnTypeConversion(self, event):
+        """Feature type conversion
+
+        Supported conversions:
+         - point <-> centroid
+         - line <-> boundary
+        """
+        if self.action['desc'] == 'typeConv': # select previous action
+            self.toolbar[0].ToggleTool(self.addPoint, True)
+            self.toolbar[0].ToggleTool(self.additionalTools, False)
+            self.OnAddPoint(event)
+            return
+        
+        Debug.msg(2, "Digittoolbar.OnTypeConversion():")
+        self.action = { 'desc' : "typeConv",
+                        'id'   : self.additionalTools }
+        self.parent.MapWindow.mouse['box'] = 'box'
+
+    def OnSelectMap (self, event):
+        """
+        Select vector map layer for editing
+
+        If there is a vector map layer already edited, this action is
+        firstly terminated. The map layer is closed. After this the
+        selected map layer activated for editing.
+        """
+        if event.GetSelection() == 0: # create new vector map layer
+            if self.mapLayer:
+                openVectorMap = self.mapLayer.GetName(fullyQualified=False)['name']
+            else:
+                openVectorMap = None
+            mapName = gdialogs.CreateNewVector(self.parent,
+                                               exceptMap=openVectorMap, log=self.log,
+                                               cmdDef=(['v.edit', 'tool=create'], "map"),
+                                               disableAdd=True)[0]
+            if mapName:
+                # add layer to map layer tree
+                if self.layerTree:
+                    self.layerTree.AddLayer(ltype='vector',
+                                            lname=mapName,
+                                            lchecked=True,
+                                            lopacity=1.0,
+                                            lcmd=['d.vect', 'map=%s' % mapName])
+                    
+                    vectLayers = self.UpdateListOfLayers(updateTool=True)
+                    selection = vectLayers.index(mapName)
+                else:
+                    pass # TODO (no Layer Manager)
+            else:
+                self.combo.SetValue(_('Select vector map'))
+                return 
+        else:
+            selection = event.GetSelection() - 1 # first option is 'New vector map'
+
+        # skip currently selected map
+        if self.layers[selection] == self.mapLayer:
+            return False
+
+        if self.mapLayer:
+            # deactive map layer for editing
+            self.StopEditing()
+
+        # select the given map layer for editing
+        self.StartEditing(self.layers[selection])
+
+        event.Skip()
+
+        return True
+    
+    def StartEditing (self, mapLayer):
+        """
+        Start editing selected vector map layer.
+
+        @param mapLayer reference to MapLayer instance
+        """
+        # deactive layer
+        self.mapcontent.ChangeLayerActive(mapLayer, False)
+
+        # clean map canvas
+        ### self.parent.MapWindow.EraseMap()
+
+        # unset background map if needed
+        if UserSettings.Get(group='vdigit', key='bgmap',
+                            subkey='value', internal=True) == mapLayer.GetName():
+            UserSettings.Set(group='vdigit', key='bgmap',
+                             subkey='value', value='', internal=True)
+        
+        self.parent.statusbar.SetStatusText(_("Please wait, "
+                                              "opening vector map <%s> for editing...") % \
+                                                mapLayer.GetName(),
+                                            0)
+        
+        # reload vdigit module
+        reload(vdigit)
+        from vdigit import Digit as Digit
+        self.parent.digit = Digit(mapwindow=self.parent.MapWindow)
+        
+        self.mapLayer = mapLayer
+        
+        # open vector map
+        try:
+            self.parent.digit.SetMapName(mapLayer.GetName())
+        except gcmd.DigitError, e:
+            self.mapLayer = None
+            print >> sys.stderr, e # wxMessageBox
+            return False
+        
+        # update toolbar
+        self.combo.SetValue(mapLayer.GetName())
+        self.parent.toolbars['map'].combo.SetValue (_('Digitize'))
+        
+        Debug.msg (4, "VDigitToolbar.StartEditing(): layer=%s" % mapLayer.GetName())
+        
+        # change cursor
+        if self.parent.MapWindow.mouse['use'] == 'pointer':
+            self.parent.MapWindow.SetCursor(self.parent.cursors["cross"])
+        
+        # create pseudoDC for drawing the map
+        self.parent.MapWindow.pdcVector = vdigit.PseudoDC()
+        self.parent.digit.driver.SetDevice(self.parent.MapWindow.pdcVector)
+
+        if not self.parent.MapWindow.resize:
+            self.parent.MapWindow.UpdateMap(render=True)
+
+        opacity = mapLayer.GetOpacity(float=True)
+        if opacity < 1.0:
+            alpha = int(opacity * 255)
+            self.parent.digit.driver.UpdateSettings(alpha)
+        
+        return True
+
+    def StopEditing (self):
+        """Stop editing of selected vector map layer.
+
+        @return True on success
+        @return False on failure
+        """
+        if not self.mapLayer:
+            return False
+        
+        Debug.msg (4, "VDigitToolbar.StopEditing(): layer=%s" % self.mapLayer.GetName())
+        self.combo.SetValue (_('Select vector map'))
+        
+        # save changes
+        if UserSettings.Get(group='vdigit', key='saveOnExit', subkey='enabled') is False:
+            if self.parent.digit.GetUndoLevel() > 0:
+                dlg = wx.MessageDialog(parent=self.parent,
+                                       message=_("Do you want to save changes "
+                                                 "in vector map <%s>?") % self.mapLayer.GetName(),
+                                       caption=_("Save changes?"),
+                                       style=wx.YES_NO | wx.YES_DEFAULT | wx.ICON_QUESTION)
+                if dlg.ShowModal() == wx.ID_NO:
+                    # revert changes
+                    self.parent.digit.Undo(0)
+                dlg.Destroy()
+        
+        self.parent.statusbar.SetStatusText(_("Please wait, "
+                                              "closing and rebuilding topology of "
+                                              "vector map <%s>...") % self.mapLayer.GetName(),
+                                            0)
+        
+        self.parent.digit.SetMapName(None) # -> close map
+        
+        # re-active layer 
+        item = self.parent.tree.FindItemByData('maplayer', self.mapLayer)
+        if item and self.parent.tree.IsItemChecked(item):
+            self.mapcontent.ChangeLayerActive(self.mapLayer, True)
+        
+        # change cursor
+        self.parent.MapWindow.SetCursor(self.parent.cursors["default"])
+        
+        # disable pseudodc for vector map layer
+        self.parent.MapWindow.pdcVector = None
+        self.parent.digit.driver.SetDevice(None)
+
+        # close dialogs
+        for dialog in ('attributes', 'category'):
+            if self.parent.dialogs[dialog]:
+                self.parent.dialogs[dialog].Close()
+                self.parent.dialogs[dialog] = None
+        
+        self.parent.digit.__del__() # FIXME: destructor is not called here (del)
+        self.parent.digit = None
+        
+        self.mapLayer = None
+        
+        self.parent.MapWindow.redrawAll = True
+        
+        return True
+    
+    def UpdateListOfLayers (self, updateTool=False):
+        """
+        Update list of available vector map layers.
+        This list consists only editable layers (in the current mapset)
+
+        Optionally also update toolbar
+        """
+
+        Debug.msg (4, "VDigitToolbar.UpdateListOfLayers(): updateTool=%d" % \
+                   updateTool)
+
+        layerNameSelected = None
+         # name of currently selected layer
+        if self.mapLayer:
+            layerNameSelected = self.mapLayer.GetName()
+
+        # select vector map layer in the current mapset
+        layerNameList = []
+        self.layers = self.mapcontent.GetListOfLayers(l_type="vector",
+                                                      l_mapset=grassenv.GetGRASSVariable('MAPSET'))
+        for layer in self.layers:
+            if not layer.name in layerNameList: # do not duplicate layer
+                layerNameList.append (layer.GetName())
+
+        if updateTool: # update toolbar
+            if not self.mapLayer:
+                value = _('Select vector map')
+            else:
+                value = layerNameSelected
+
+            if not self.comboid:
+                self.combo = wx.ComboBox(self.toolbar[self.numOfRows-1], id=wx.ID_ANY, value=value,
+                                         choices=[_('New vector map'), ] + layerNameList, size=(85, -1),
+                                         style=wx.CB_READONLY)
+                self.comboid = self.toolbar[self.numOfRows-1].InsertControl(0, self.combo)
+                self.parent.Bind(wx.EVT_COMBOBOX, self.OnSelectMap, self.comboid)
+            else:
+                self.combo.SetItems([_('New vector map'), ] + layerNameList)
+            
+            self.toolbar[self.numOfRows-1].Realize()
+
+        return layerNameList
+
+    def GetLayer(self):
+        """Get selected layer for editing -- MapLayer instance"""
+        return self.mapLayer
+
+class ProfileToolbar(AbstractToolbar):
+    """
+    Toolbar for profiling raster map
+    """ 
+    def __init__(self, parent, tbframe):
+        self.parent  = parent # GCP
+        self.tbframe = tbframe
+
+        self.toolbar = wx.ToolBar(parent=self.tbframe, id=wx.ID_ANY)
+
+        # self.SetToolBar(self.toolbar)
+        self.toolbar.SetToolBitmapSize(globalvar.toolbarSize)
+
+        self.InitToolbar(self.tbframe, self.toolbar, self.ToolbarData())
+
+        # realize the toolbar
+        self.toolbar.Realize()
+
+    def ToolbarData(self):
+        """Toolbar data"""
+
+        self.transect = wx.NewId()
+        self.addraster = wx.NewId()
+        self.draw = wx.NewId()
+        self.options = wx.NewId()
+        self.drag = wx.NewId()
+        self.zoom = wx.NewId()
+        self.unzoom = wx.NewId()
+        self.erase = wx.NewId()
+        self.save = wx.NewId()
+        self.printer = wx.NewId()
+        self.quit = wx.NewId()
+                
+        # tool, label, bitmap, kind, shortHelp, longHelp, handler
+        return   (
+            (self.addraster, 'raster', Icons["addrast"].GetBitmap(),
+             wx.ITEM_NORMAL, Icons["addrast"].GetLabel(), Icons["addrast"].GetDesc(),
+             self.parent.OnSelectRaster),
+            (self.transect, 'transect', Icons["transect"].GetBitmap(),
+             wx.ITEM_NORMAL, Icons["transect"].GetLabel(), Icons["transect"].GetDesc(),
+             self.parent.OnDrawTransect),
+            (self.draw, 'profiledraw', Icons["profiledraw"].GetBitmap(),
+             wx.ITEM_NORMAL, Icons["profiledraw"].GetLabel(), Icons["profiledraw"].GetDesc(),
+             self.parent.OnCreateProfile),
+            (self.options, 'options', Icons["profileopt"].GetBitmap(),
+             wx.ITEM_NORMAL, Icons["profileopt"].GetLabel(), Icons["profileopt"].GetDesc(),
+             self.parent.ProfileOptionsMenu),
+            (self.drag, 'drag', Icons['pan'].GetBitmap(),
+             wx.ITEM_NORMAL, Icons["pan"].GetLabel(), Icons["pan"].GetDesc(),
+             self.parent.OnDrag),
+            (self.zoom, 'zoom', Icons['zoom_in'].GetBitmap(),
+             wx.ITEM_NORMAL, Icons["zoom_in"].GetLabel(), Icons["zoom_in"].GetDesc(),
+             self.parent.OnZoom),
+            (self.unzoom, 'unzoom', Icons['zoom_back'].GetBitmap(),
+             wx.ITEM_NORMAL, Icons["zoom_back"].GetLabel(), Icons["zoom_back"].GetDesc(),
+             self.parent.OnRedraw),
+            (self.erase, 'erase', Icons["erase"].GetBitmap(),
+             wx.ITEM_NORMAL, Icons["erase"].GetLabel(), Icons["erase"].GetDesc(),
+             self.parent.OnErase),
+            ("", "", "", "", "", "", ""),
+            (self.save, 'save', Icons["savefile"].GetBitmap(),
+             wx.ITEM_NORMAL, Icons["savefile"].GetLabel(), Icons["savefile"].GetDesc(),
+             self.parent.SaveToFile),
+            (self.printer, 'print', Icons["printmap"].GetBitmap(),
+             wx.ITEM_NORMAL, Icons["printmap"].GetLabel(), Icons["printmap"].GetDesc(),
+             self.parent.PrintMenu),
+            (self.quit, 'quit', Icons["quit"].GetBitmap(),
+             wx.ITEM_NORMAL, Icons["quit"].GetLabel(), Icons["quit"].GetDesc(),
+             self.parent.OnQuit),
+            )
+    
+class NvizToolbar(AbstractToolbar):
+    """
+    Nviz toolbar
+    """
+    def __init__(self, parent, map):
+        self.parent     = parent
+        self.mapcontent = map
+
+        self.toolbar = wx.ToolBar(parent=self.parent, id=wx.ID_ANY)
+
+        # self.SetToolBar(self.toolbar)
+        self.toolbar.SetToolBitmapSize(globalvar.toolbarSize)
+
+        self.InitToolbar(self.parent, self.toolbar, self.ToolbarData())
+
+        # realize the toolbar
+        self.toolbar.Realize()
+
+    def ToolbarData(self):
+        """Toolbar data"""
+
+        self.settings = wx.NewId()
+        self.quit = wx.NewId()
+                
+        # tool, label, bitmap, kind, shortHelp, longHelp, handler
+        return   (
+            (self.settings, "settings", Icons["nvizSettings"].GetBitmap(),
+             wx.ITEM_NORMAL, Icons["nvizSettings"].GetLabel(), Icons["nvizSettings"].GetDesc(),
+             self.OnSettings),
+            (self.quit, 'quit', Icons["quit"].GetBitmap(),
+             wx.ITEM_NORMAL, Icons["quit"].GetLabel(), Icons["quit"].GetDesc(),
+             self.OnExit),
+            )
+
+    def OnSettings(self, event):
+        win = self.parent.nvizToolWin
+        if not win.IsShown():
+            self.parent.nvizToolWin.Show()
+        else:
+            self.parent.nvizToolWin.Hide()
+
+    def OnExit (self, event=None):
+        """Quit nviz tool (swith to 2D mode)"""
+
+        # hide dialogs if still open
+        if self.parent.nvizToolWin:
+            self.parent.nvizToolWin.Hide()
+
+        # disable the toolbar
+        self.parent.RemoveToolbar ("nviz")
+
+        # set default mouse settings
+        self.parent.MapWindow.mouse['use'] = "pointer"
+        self.parent.MapWindow.mouse['box'] = "point"
+        self.parent.MapWindow.polycoords = []
+

Added: grass-addons/gui/wxpython/data_catalog/units.py
===================================================================
--- grass-addons/gui/wxpython/data_catalog/units.py	                        (rev 0)
+++ grass-addons/gui/wxpython/data_catalog/units.py	2010-04-23 16:01:07 UTC (rev 42008)
@@ -0,0 +1,118 @@
+"""!
+ at package units
+
+ at brief Units management
+
+Probably will be replaced by Python SWIG fns in the near future(?)
+
+Usage:
+
+ at code
+from units import Units
+ at endcode
+
+Classes:
+ - BaseUnits
+
+(C) 2009 by the GRASS Development Team
+
+This program is free software under the GNU General Public
+License (>=v2). Read the file COPYING that comes with GRASS
+for details.
+
+ at author Martin Landa <landa.martin gmail.com>
+"""
+
+class BaseUnits:
+    def __init__(self):
+        self._units = dict()
+        self._units['length'] = { 0 : { 'key' : 'mu', 'label' : _('map units') },
+                             1 : { 'key' : 'me', 'label' : _('meters') },
+                             2 : { 'key' : 'km', 'label' : _('kilometers') },
+                             3 : { 'key' : 'mi', 'label' : _('miles') },
+                             4 : { 'key' : 'ft', 'label' : _('feet') } }
+        
+        self._units['area']   = { 0 : { 'key' : 'mu', 'label' : _('sq map units') },
+                             1 : { 'key' : 'me', 'label' : _('sq meters') },
+                             2 : { 'key' : 'km', 'label' : _('sq kilometers') },
+                             3 : { 'key' : 'ar', 'label' : _('acres') },
+                             4 : { 'key' : 'ht', 'label' : _('hectares') } }
+
+    def GetUnitsList(self, type):
+        """!Get list of units (their labels)
+        
+        @param type units type ('length' or 'area')
+        
+        @return list of units labels
+        """
+        result = list()
+        try:
+            keys = self._units[type].keys()
+            keys.sort()
+            for idx in keys:
+                result.append(self._units[type][idx]['label'])
+        except KeyError:
+            pass
+        
+        return result
+
+    def GetUnitsKey(self, type, index):
+        """!Get units key based on index
+        
+        @param type units type ('length' or 'area')
+        @param index units index
+        """
+        return self._units[type][index]['key']
+
+    def GetUnitsIndex(self, type, key):
+        """!Get units index based on key
+        
+        @param type units type ('length' or 'area')
+        @param key units key, e.g. 'me' for meters
+
+        @return index
+        """
+        for k, u in self._units[type].iteritems():
+            if u['key'] == key:
+                return k
+        return 0
+
+Units = BaseUnits()
+
+def ConvertValue(value, type, units):
+    """!Convert value from map units to given units
+
+    Inspired by vector/v.to.db/units.c
+
+    @param value value to be converted
+    @param type units type ('length', 'area')
+    @param unit  destination units
+    """
+    # get map units
+    # TODO
+    
+    f = 1
+    if type == 'length':
+        if units == 'me':
+            f = 1.0
+        elif units == 'km':
+            f = 1.0e-3
+        elif units == 'mi':
+            f = 6.21371192237334e-4
+        elif units == 'ft':
+            f = 3.28083989501312
+    else: # -> area
+        if units == 'me':
+            f = 1.0
+        elif units == 'km':
+            f = 1.0e-6
+        elif units == 'mi':
+            f = 3.86102158542446e-7
+        elif units == 'ft':
+            f = 10.7639104167097
+        elif units == 'ar':
+            f = 2.47105381467165e-4
+        elif units == 'ht':
+            f = 1.0e-4
+
+    return f * value



More information about the grass-commit mailing list