Explorar o código

Fixed bugs in display decorations. Opening properties dialogs caused errors and dialogs would not close. Ported from develbranch_6

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@32807 15284696-431f-4ddb-bdfa-cd5b030d7da7
Michael Barton %!s(int64=16) %!d(string=hai) anos
pai
achega
529c510045
Modificáronse 1 ficheiros con 8 adicións e 9 borrados
  1. 8 9
      gui/wxpython/gui_modules/gdialogs.py

+ 8 - 9
gui/wxpython/gui_modules/gdialogs.py

@@ -374,24 +374,23 @@ class DecorationDialog(wx.Dialog):
         self.parent.MapWindow.overlays[self.ovlId]['propwin'] = propwin
         self.parent.MapWindow.overlays[self.ovlId]['propwin'] = propwin
 
 
         # change parameters for item in layers list in render.Map
         # change parameters for item in layers list in render.Map
-        # "Use mouse..." (-m) flag causes GUI freeze, trac #119
+        # "Use mouse..." (-m) flag causes GUI freeze and is pointless here, trac #119
+        
         try:
         try:
             self.parent.MapWindow.overlays[self.ovlId]['cmd'].remove('-m')
             self.parent.MapWindow.overlays[self.ovlId]['cmd'].remove('-m')
         except ValueError:
         except ValueError:
             pass
             pass
-        
+            
         self.parent.Map.ChangeOverlay(id=self.ovlId, type=self.name,
         self.parent.Map.ChangeOverlay(id=self.ovlId, type=self.name,
                                       command=self.parent.MapWindow.overlays[self.ovlId]['cmd'],
                                       command=self.parent.MapWindow.overlays[self.ovlId]['cmd'],
                                       l_active=self.parent.MapWindow.overlays[self.ovlId]['layer'].IsActive(),
                                       l_active=self.parent.MapWindow.overlays[self.ovlId]['layer'].IsActive(),
                                       l_render=False, l_hidden=True)
                                       l_render=False, l_hidden=True)
-
-        if self.name == 'legend' and \
-                params and \
-                not self.btnOK.IsEnabled():
-            self.btnOK.Enable()
+        if  self.name == 'legend':
+            if params and not self.btnOK.IsEnabled():
+                self.btnOK.Enable()
         
         
-        self.SetTitle(_('Legend of raster map <%s>') % \
-                      utils.GetLayerNameFromCmd(self.parent.MapWindow.overlays[self.ovlId]['cmd']))
+            #self.SetTitle(_('Legend of raster map <%s>') % \
+            #              utils.GetLayerNameFromCmd(self.parent.MapWindow.overlays[self.ovlId]['cmd']))
             
             
 class TextLayerDialog(wx.Dialog):
 class TextLayerDialog(wx.Dialog):
     """
     """