[GRASS-SVN] r58559 - grass/trunk/gui/wxpython/gmodeler

svn_grass at osgeo.org svn_grass at osgeo.org
Mon Dec 30 03:47:33 PST 2013


Author: martinl
Date: 2013-12-30 03:47:32 -0800 (Mon, 30 Dec 2013)
New Revision: 58559

Modified:
   grass/trunk/gui/wxpython/gmodeler/model.py
Log:
wxGUI/modeler: update _setPen for ModelData items


Modified: grass/trunk/gui/wxpython/gmodeler/model.py
===================================================================
--- grass/trunk/gui/wxpython/gmodeler/model.py	2013-12-30 11:25:50 UTC (rev 58558)
+++ grass/trunk/gui/wxpython/gmodeler/model.py	2013-12-30 11:47:32 UTC (rev 58559)
@@ -1205,7 +1205,7 @@
             self.SetCanvas(self.parent)
             self.SetX(x)
             self.SetY(y)
-            self.SetPen(wx.BLACK_PEN)
+            self._setPen()
             self._setBrush()
             self.SetLabel()
             
@@ -1218,10 +1218,7 @@
         self.intermediate = im
   
     def OnDraw(self, dc):
-        pen = wx.Pen(wx.BLACK, 1, wx.SOLID)
-        if self.intermediate:
-            pen.SetStyle(wx.SHORT_DASH)
-        self.SetPen(pen)
+        self._setPen()
         
         ogl.EllipseShape.OnDraw(self, dc)
         
@@ -1320,8 +1317,12 @@
         else:
             width = int(UserSettings.Get(group = 'modeler', key = 'action',
                                          subkey = ('width', 'default')))
-            
-        pen = wx.Pen(wx.BLACK, width, wx.SOLID)
+        if self.intermediate:
+            style = wx.DOT
+        else:
+            style = wx.SOLID
+        
+        pen = wx.Pen(wx.BLACK, width, style)
         self.SetPen(pen)
         
     def SetLabel(self):



More information about the grass-commit mailing list