Procházet zdrojové kódy

wxGUI: fixes g.gui.gmodeler - Set comment after erasure (https://trac.osgeo.org/grass/ticket/2904)
(merge https://trac.osgeo.org/grass/changeset/67856 from trunk)


git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@67858 15284696-431f-4ddb-bdfa-cd5b030d7da7

Martin Landa před 9 roky
rodič
revize
016f2d9aab
2 změnil soubory, kde provedl 12 přidání a 3 odebrání
  1. 1 0
      gui/wxpython/gmodeler/frame.py
  2. 11 3
      gui/wxpython/gmodeler/model.py

+ 1 - 0
gui/wxpython/gmodeler/frame.py

@@ -1374,6 +1374,7 @@ class ModelEvtHandler(ogl.ShapeEvtHandler):
             comment = dlg.GetValue()
             shape.SetComment(comment)
             self.frame.ModelChanged()
+            self.frame.canvas.Refresh()
         dlg.Destroy()
 
     def _onSelectShape(self, shape, append=False):

+ 11 - 3
gui/wxpython/gmodeler/model.py

@@ -1071,17 +1071,25 @@ class ModelAction(ModelObject, ogl.DividedShape):
 
     def SetComment(self, comment):
         """Set comment"""
+        self.comment = comment
+
         if self.regionComment is None:
             self.regionComment = ogl.ShapeRegion()
             self.regionComment.SetFormatMode(ogl.FORMAT_CENTRE_HORIZ)
             font = wx.SystemSettings_GetFont(wx.SYS_DEFAULT_GUI_FONT)
             font.SetStyle(wx.ITALIC)
             self.regionComment.SetFont(font)
+
+        self.regionComment.SetText(comment)
+            
+        if self.comment:
             self.AddRegion(self.regionComment)
             self.regionLabel.SetProportions(0.0, 0.4)
-            
-        self.comment = comment
-        self.regionComment.SetText(comment)
+        else:
+            self.ClearRegions()
+            self.AddRegion(self.regionLabel)
+            self.regionLabel.SetProportions(0.0, 1.0)
+        
         self.SetRegionSizes()
         self.ReformatRegions()