wxGUI/mapcalc: checkbox to add created raster map to layer tree

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@43974 15284696-431f-4ddb-bdfa-cd5b030d7da7

gui/wxpython/gui_modules/layertree.py

@@ -61,8 +61,7 @@ except ImportError:
 TREE_ITEM_HEIGHT = 25
 
 class LayerTree(treemixin.DragAndDrop, CT.CustomTreeCtrl):
-    """
-    Creates layer tree structure
+    """!Creates layer tree structure
     """
     def __init__(self, parent,
                  id = wx.ID_ANY, style=wx.SUNKEN_BORDER,
@@ -640,7 +639,7 @@ class LayerTree(treemixin.DragAndDrop, CT.CustomTreeCtrl):
         self.EditLabel(self.layer_selected)
 
     def AddLayer(self, ltype, lname=None, lchecked=None,
-                 lopacity=1.0, lcmd=None, lgroup=None, lvdigit=None, lnviz=None):
+                 lopacity=1.0, lcmd=None, lgroup=None, lvdigit=None, lnviz=None, multiple = True):
         """!Add new item to the layer tree, create corresponding MapLayer instance.
         Launch property dialog if needed (raster, vector, etc.)
 
@@ -652,14 +651,25 @@ class LayerTree(treemixin.DragAndDrop, CT.CustomTreeCtrl):
         @param lgroup index of group item (-1 for root) or None
         @param lvdigit vector digitizer settings (eg. geometry attributes)
         @param lnviz layer Nviz properties
+        @param multiple True to allow multiple map layers in layer tree
         """
+        if lname and not multiple:
+            # check for duplicates
+            item = self.GetFirstVisibleItem()
+            while item and item.IsOk():
+                if self.GetPyData(item)[0]['type'] == 'vector':
+                    name = self.GetPyData(item)[0]['maplayer'].GetName()
+                    if name == lname:
+                        return
+                item = self.GetNextVisible(item)
+        
         self.first = True
         params = {} # no initial options parameters
 
         # deselect active item
         if self.layer_selected:
             self.SelectItem(self.layer_selected, select=False)
-
+        
         Debug.msg (3, "LayerTree().AddLayer(): ltype=%s" % (ltype))
         
         if ltype == 'command':
@@ -1368,20 +1378,20 @@ class LayerTree(treemixin.DragAndDrop, CT.CustomTreeCtrl):
                     mapWin.ResetView()
         
     def ReorderLayers(self):
-        """!Add commands from data associated with
-        any valid layers (checked or not) to layer list in order to
-        match layers in layer tree."""
+        """!Add commands from data associated with any valid layers
+        (checked or not) to layer list in order to match layers in
+        layer tree."""
 
         # make a list of visible layers
         treelayers = []
-
+        
         vislayer = self.GetFirstVisibleItem()
-
+        
         if not vislayer or self.GetPyData(vislayer) is None:
             return
-
+        
         itemList = ""
-
+        
         for item in range(self.GetCount()):
             itemList += self.GetItemText(vislayer) + ','
             if self.GetPyData(vislayer)[0]['type'] != 'group':
@@ -1391,15 +1401,15 @@ class LayerTree(treemixin.DragAndDrop, CT.CustomTreeCtrl):
                 break
             else:
                 vislayer = self.GetNextVisible(vislayer)
-
+        
         Debug.msg (4, "LayerTree.ReorderLayers(): items=%s" % \
                    (itemList))
-
+        
         # reorder map layers
         treelayers.reverse()
         self.Map.ReorderLayers(treelayers)
         self.reorder = False
-
+        
     def ChangeLayer(self, item):
         """!Change layer"""
         type = self.GetPyData(item)[0]['type']

gui/wxpython/gui_modules/mcalc_builder.py

@@ -24,6 +24,8 @@ if not os.getenv("GRASS_WXBUNDLED"):
     globalvar.CheckForWx()
 import wx
 
+import grass.script as grass
+
 import gcmd
 import gselect
 import menuform
@@ -218,6 +220,12 @@ class MapCalcFrame(wx.Frame):
                                      label=_("Allow output files to overwrite existing files"))
         self.overwrite.SetValue(UserSettings.Get(group='cmd', key='overwrite', subkey='enabled'))
         
+        self.addbox = wx.CheckBox(parent=self.panel,
+                                  label=_('Add created raster map into layer tree'), style = wx.NO_BORDER)
+        self.addbox.SetValue(UserSettings.Get(group='cmd', key='addNewLayer', subkey='enabled'))
+        if not self.parent or self.parent.GetName() != 'LayerManager':
+            self.addbox.Hide()
+        
         #
         # Bindings
         #
@@ -328,15 +336,18 @@ class MapCalcFrame(wx.Frame):
                   border = 5)
         sizer.Add(item = self.overwrite, proportion = 0,
                   flag = wx.EXPAND | wx.LEFT | wx.RIGHT,
+                  border = 5)
+        if self.addbox.IsShown():
+            sizer.Add(item = self.addbox, proportion = 0,
+                      flag = wx.EXPAND | wx.LEFT | wx.TOP | wx.RIGHT,
                       border = 5)
         sizer.Add(item = buttonSizer4, proportion = 0,
                   flag = wx.ALL | wx.ALIGN_RIGHT, border = 1)
         
-        self.panel.SetAutoLayout(True)        
+        self.panel.SetAutoLayout(True)
         self.panel.SetSizer(sizer)
         sizer.Fit(self.panel)
         
-        self.Fit()
         self.Layout()
         
     def AddMark(self,event):
@@ -419,12 +430,12 @@ class MapCalcFrame(wx.Frame):
         
         mctxt = self.text_mcalc.GetValue().strip().replace("\n"," ")
         mctxt = mctxt.replace(" " , "")
-
+        
         if self.log:
             cmd = [self.cmd, str('expression=%s = %s' % (name, mctxt))]
             if self.overwrite.IsChecked():
                 cmd.append('--overwrite')
-            self.log.RunCmd(cmd)
+            self.log.RunCmd(cmd, onDone = self.OnDone)
             self.parent.Raise()
         else:
             if self.overwrite.IsChecked():
@@ -435,6 +446,19 @@ class MapCalcFrame(wx.Frame):
                             expression = "%s=%s" % (name, mctxt),
                             overwrite = overwrite)
         
+    def OnDone(self, cmd, returncode):
+        """!Add create map to the layer tree"""
+        if not self.addbox.IsChecked():
+            return
+        name = self.newmaptxt.GetValue().strip() + '@' + grass.gisenv()['MAPSET']
+        self.parent.GetLayerTree().AddLayer(ltype = 'vector',
+                                            lname = name,
+                                            lcmd = ['d.rast', 'map=%s' % name],
+                                            multiple = False)
+        display = self.parent.GetLayerTree().GetMapDisplay()
+        if display and display.IsAutoRendered():
+            display.GetWindow().UpdateMap(render = True)
+        
     def OnClear(self, event):
         """!Clears text area
         """