wxGUI: wx.Color to wx.Colour because of wxPython 2.9

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

gui/wxpython/gmodeler/model.py

@@ -909,7 +909,7 @@ class ModelAction(ModelObject, ogl.RectangleShape):
             color = UserSettings.Get(group='modeler', key='action',
                                      subkey=('color', 'invalid'))
         
-        wxColor = wx.Color(color[0], color[1], color[2])
+        wxColor = wx.Colour(color[0], color[1], color[2])
         self.SetBrush(wx.Brush(wxColor))
         
     def _setPen(self):
@@ -1211,7 +1211,7 @@ class ModelData(ModelObject, ogl.EllipseShape):
         else:
             color = UserSettings.Get(group = 'modeler', key = 'action',
                                      subkey = ('color', 'invalid'))
-        wxColor = wx.Color(color[0], color[1], color[2])
+        wxColor = wx.Colour(color[0], color[1], color[2])
         self.SetBrush(wx.Brush(wxColor))
         
     def _setPen(self):
@@ -1403,7 +1403,7 @@ class ModelLoop(ModelItem, ogl.RectangleShape):
             color = UserSettings.Get(group='modeler', key='loop',
                                      subkey=('color', 'valid'))
         
-        wxColor = wx.Color(color[0], color[1], color[2])
+        wxColor = wx.Colour(color[0], color[1], color[2])
         self.SetBrush(wx.Brush(wxColor))
 
     def Enable(self, enabled = True):

gui/wxpython/gui_core/dialogs.py

@@ -98,7 +98,7 @@ class SimpleDialog(wx.Dialog):
 
     def ValidatorCallback(self, win):
         GMessage(parent = self, message = self.warning)
-        # self.informLabel.SetForegroundColour(wx.Color(255, 0, 0))
+        # self.informLabel.SetForegroundColour(wx.Colour(255, 0, 0))
         # self.informLabel.SetLabel(self.warning)
 
 

gui/wxpython/gui_core/widgets.py

@@ -402,7 +402,7 @@ class SymbolButton(BitmapTextButton):
         
         dc = wx.MemoryDC()
         dc.SelectObject(buffer)
-        maskColor = wx.Color(255, 255, 255)
+        maskColor = wx.Colour(255, 255, 255)
         dc.SetBrush(wx.Brush(maskColor))
         dc.Clear()
         
@@ -422,23 +422,23 @@ class SymbolButton(BitmapTextButton):
         
     def DrawRecord(self, dc, size):
         """!Draw record symbol"""
-        dc.SetBrush(wx.Brush(wx.Color(255, 0, 0)))
+        dc.SetBrush(wx.Brush(wx.Colour(255, 0, 0)))
         dc.DrawCircle(size[0]/2, size[1] / 2, size[0] / 2)
         
     def DrawStop(self, dc, size):
         """!Draw stop symbol"""
-        dc.SetBrush(wx.Brush(wx.Color(50, 50, 50)))
+        dc.SetBrush(wx.Brush(wx.Colour(50, 50, 50)))
         dc.DrawRectangle(0, 0, size[0], size[1])
         
     def DrawPlay(self, dc, size):
         """!Draw play symbol"""
-        dc.SetBrush(wx.Brush(wx.Color(0, 255, 0)))
+        dc.SetBrush(wx.Brush(wx.Colour(0, 255, 0)))
         points = (wx.Point(0, 0), wx.Point(0, size[1]), wx.Point(size[0], size[1] / 2))
         dc.DrawPolygon(points)
         
     def DrawPause(self, dc, size):
         """!Draw pause symbol"""
-        dc.SetBrush(wx.Brush(wx.Color(50, 50, 50)))
+        dc.SetBrush(wx.Brush(wx.Colour(50, 50, 50)))
         dc.DrawRectangle(0, 0, 2 * size[0] / 5, size[1])
         dc.DrawRectangle(3 * size[0] / 5, 0, 2 * size[0] / 5, size[1])
 

gui/wxpython/iclass/plots.py

@@ -170,7 +170,7 @@ class PlotPanel(scrolled.ScrolledPanel):
         minim = bandValues.min
         maxim = bandValues.max
         points = [(minim, level), (maxim, level)]
-        color = wx.Color(*map(int, color.split(':')))
+        color = wx.Colour(*map(int, color.split(':')))
         return plot.PolyLine(points, colour = color, width = 4)
         
     def DrawInvisibleLine(self, level):

gui/wxpython/nviz/tools.py

@@ -3227,14 +3227,14 @@ class NvizToolWindow(FN.FlatNotebook):
         return str(color[0]) + ':' + str(color[1]) + ':' + str(color[2])
     
     def _getColorFromString(self, color, delim = ':'):
-        """!Convert color string (R:G:B) to wx.Color
+        """!Convert color string (R:G:B) to wx.Colour
 
         @param color string
         @param delim delimiter
 
-        @return wx.Color instance
+        @return wx.Colour instance
         """
-        return wx.Color(*map(int, color.split(delim)))
+        return wx.Colour(*map(int, color.split(delim)))
     
     def _get3dRange(self, name):
         """!Gelper func for getting range of 3d map"""

gui/wxpython/psmap/dialogs.py

@@ -4344,7 +4344,7 @@ class ImageDialog(PsmapDialog):
         buffer = wx.EmptyBitmap(*self.previewSize)
         dc = wx.MemoryDC()
         dc.SelectObject(buffer)
-        dc.SetBrush(wx.Brush(wx.Color(250, 250, 250)))
+        dc.SetBrush(wx.Brush(wx.Colour(250, 250, 250)))
         dc.Clear()
         extent = dc.GetTextExtent(warning)
         posX = self.previewSize[0] / 2 - extent[0] / 2

gui/wxpython/psmap/frame.py

@@ -89,15 +89,15 @@ class PsMapFrame(wx.Frame):
         self.pen = {
             'paper': wx.Pen(colour = "BLACK", width = 1),
             'margins': wx.Pen(colour = "GREY", width = 1),
-            'map': wx.Pen(colour = wx.Color(86, 122, 17), width = 2),
-            'rasterLegend': wx.Pen(colour = wx.Color(219, 216, 4), width = 2),
-            'vectorLegend': wx.Pen(colour = wx.Color(219, 216, 4), width = 2),
-            'mapinfo': wx.Pen(colour = wx.Color(5, 184, 249), width = 2),
-            'scalebar': wx.Pen(colour = wx.Color(150, 150, 150), width = 2),
-            'image': wx.Pen(colour = wx.Color(255, 150, 50), width = 2),
-            'northArrow': wx.Pen(colour = wx.Color(200, 200, 200), width = 2),
-            'point': wx.Pen(colour = wx.Color(100, 100, 100), width = 2),
-            'line': wx.Pen(colour = wx.Color(0, 0, 0), width = 2),
+            'map': wx.Pen(colour = wx.Colour(86, 122, 17), width = 2),
+            'rasterLegend': wx.Pen(colour = wx.Colour(219, 216, 4), width = 2),
+            'vectorLegend': wx.Pen(colour = wx.Colour(219, 216, 4), width = 2),
+            'mapinfo': wx.Pen(colour = wx.Colour(5, 184, 249), width = 2),
+            'scalebar': wx.Pen(colour = wx.Colour(150, 150, 150), width = 2),
+            'image': wx.Pen(colour = wx.Colour(255, 150, 50), width = 2),
+            'northArrow': wx.Pen(colour = wx.Colour(200, 200, 200), width = 2),
+            'point': wx.Pen(colour = wx.Colour(100, 100, 100), width = 2),
+            'line': wx.Pen(colour = wx.Colour(0, 0, 0), width = 2),
             'box': wx.Pen(colour = 'RED', width = 2, style = wx.SHORT_DASH),
             'select': wx.Pen(colour = 'BLACK', width = 1, style = wx.SHORT_DASH),
             'resize': wx.Pen(colour = 'BLACK', width = 1)
@@ -105,14 +105,14 @@ class PsMapFrame(wx.Frame):
         self.brush = {
             'paper': wx.WHITE_BRUSH,
             'margins': wx.TRANSPARENT_BRUSH,
-            'map': wx.Brush(wx.Color(151, 214, 90)),
-            'rasterLegend': wx.Brush(wx.Color(250, 247, 112)),
-            'vectorLegend': wx.Brush(wx.Color(250, 247, 112)),
-            'mapinfo': wx.Brush(wx.Color(127, 222, 252)),
-            'scalebar': wx.Brush(wx.Color(200, 200, 200)),
-            'image': wx.Brush(wx.Color(255, 200, 50)),
-            'northArrow': wx.Brush(wx.Color(255, 255, 255)),
-            'point': wx.Brush(wx.Color(200, 200, 200)),
+            'map': wx.Brush(wx.Colour(151, 214, 90)),
+            'rasterLegend': wx.Brush(wx.Colour(250, 247, 112)),
+            'vectorLegend': wx.Brush(wx.Colour(250, 247, 112)),
+            'mapinfo': wx.Brush(wx.Colour(127, 222, 252)),
+            'scalebar': wx.Brush(wx.Colour(200, 200, 200)),
+            'image': wx.Brush(wx.Colour(255, 200, 50)),
+            'northArrow': wx.Brush(wx.Colour(255, 255, 255)),
+            'point': wx.Brush(wx.Colour(200, 200, 200)),
             'line': wx.TRANSPARENT_BRUSH,
             'box': wx.TRANSPARENT_BRUSH,
             'select':wx.TRANSPARENT_BRUSH,
@@ -1914,7 +1914,7 @@ class PsMapBufferedWindow(wx.Window):
                 pdc.SetFont(font)
                 textExtent = dc.GetTextExtent(text)
                 textRect = wx.Rect(0, 0, *textExtent).CenterIn(bb)
-            pdc.SetTextForeground(wx.Color(100,100,100,200)) 
+            pdc.SetTextForeground(wx.Colour(100,100,100,200)) 
             pdc.SetBackgroundMode(wx.TRANSPARENT)
             pdc.DrawText(text = text, x = textRect.x, y = textRect.y)
                 

gui/wxpython/psmap/utils.py

@@ -148,7 +148,7 @@ def convertRGB(rgb):
         color = (grass.parse_color(rgb)[0]*255,
                  grass.parse_color(rgb)[1]*255,
                  grass.parse_color(rgb)[2]*255)
-        color = wx.Color(*color)
+        color = wx.Colour(*color)
         if color.IsOk():
             return color
         else:  

gui/wxpython/vdigit/wxdisplay.py

@@ -927,7 +927,7 @@ class DisplayDriver:
                                                           subkey = 'value'))
                 continue
             
-            color = wx.Color(UserSettings.Get(group = 'vdigit', key = 'symbol',
+            color = wx.Colour(UserSettings.Get(group = 'vdigit', key = 'symbol',
                                               subkey = [key, 'color'])[0],
                              UserSettings.Get(group = 'vdigit', key = 'symbol',
                                               subkey = [key, 'color'])[1],

gui/wxpython/web_services/widgets.py

@@ -641,7 +641,7 @@ class WSPanel(wx.Panel):
             lcmd.append('-o')
 
             c = self.params['bgcolor'].GetColour()
-            hex_color = wx.Color(c[0], c[1], c[2]).GetAsString(wx.C2S_HTML_SYNTAX)
+            hex_color = wx.Colour(c[0], c[1], c[2]).GetAsString(wx.C2S_HTML_SYNTAX)
             lcmd.append("bgcolor=" + '0x' + hex_color[1:]) 
 
         lcmd.append("map=" + self.o_layer_name)

gui/wxpython/wxplot/base.py

@@ -110,7 +110,7 @@ class BasePlotFrame(wx.Frame):
 
 
     def _createColorDict(self):
-        """!Create color dictionary to return wx.Color tuples
+        """!Create color dictionary to return wx.Colour tuples
         for assigning colors to images in imagery groups"""
                 
         self.colorDict = {}
@@ -350,7 +350,7 @@ class BasePlotFrame(wx.Frame):
         #
         self.client.SetEnableGrid(self.properties['grid']['enabled'])
                 
-        self.client.SetGridColour(wx.Color(self.properties['grid']['color'][0],
+        self.client.SetGridColour(wx.Colour(self.properties['grid']['color'][0],
                                            self.properties['grid']['color'][1],
                                            self.properties['grid']['color'][2],
                                            255))

gui/wxpython/wxplot/histogram.py

@@ -191,7 +191,7 @@ class Histogram2Frame(BasePlotFrame):
 
         for r in self.rasterList:
             if len(self.raster[r]['datalist']) > 0:
-                col = wx.Color(self.raster[r]['pcolor'][0],
+                col = wx.Colour(self.raster[r]['pcolor'][0],
                                self.raster[r]['pcolor'][1],
                                self.raster[r]['pcolor'][2],
                                255)

gui/wxpython/wxplot/profile.py

@@ -288,7 +288,7 @@ class ProfileFrame(BasePlotFrame):
         if len(self.seglist) > 0 :
             self.ppoints = plot.PolyMarker(self.seglist,
                                            legend = ' ' + self.properties['marker']['legend'],
-                                           colour = wx.Color(self.properties['marker']['color'][0],
+                                           colour = wx.Colour(self.properties['marker']['color'][0],
                                                            self.properties['marker']['color'][1],
                                                            self.properties['marker']['color'][2],
                                                            255),
@@ -299,7 +299,7 @@ class ProfileFrame(BasePlotFrame):
 
         # Add profile distance/elevation pairs to plot data list for each raster profiled
         for r in self.rasterList:
-            col = wx.Color(self.raster[r]['pcolor'][0],
+            col = wx.Colour(self.raster[r]['pcolor'][0],
                            self.raster[r]['pcolor'][1],
                            self.raster[r]['pcolor'][2],
                            255)

gui/wxpython/wxplot/scatter.py

@@ -215,7 +215,7 @@ class ScatterFrame(BasePlotFrame):
                 self.raster[rpair]['datalist'] == None: return
             
             if len(self.raster[rpair]['datalist']) > 0:
-                col = wx.Color(self.raster[rpair]['pcolor'][0],
+                col = wx.Colour(self.raster[rpair]['pcolor'][0],
                                self.raster[rpair]['pcolor'][1],
                                self.raster[rpair]['pcolor'][2],
                                255)