فهرست منبع

Allow black in wxplot (prevents key error); Prevent list index error.

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@53274 15284696-431f-4ddb-bdfa-cd5b030d7da7
Maris Nartiss 12 سال پیش
والد
کامیت
326cde7ee1
1فایلهای تغییر یافته به همراه2 افزوده شده و 2 حذف شده
  1. 2 2
      gui/wxpython/wxplot/base.py

+ 2 - 2
gui/wxpython/wxplot/base.py

@@ -115,7 +115,7 @@ class BasePlotFrame(wx.Frame):
                 
                 
         self.colorDict = {}
         self.colorDict = {}
         for clr in grass.named_colors.iterkeys():
         for clr in grass.named_colors.iterkeys():
-            if clr == 'white' or clr == 'black': continue
+            if clr == 'white': continue
             r = grass.named_colors[clr][0] * 255
             r = grass.named_colors[clr][0] * 255
             g = grass.named_colors[clr][1] * 255
             g = grass.named_colors[clr][1] * 255
             b = grass.named_colors[clr][2] * 255
             b = grass.named_colors[clr][2] * 255
@@ -217,7 +217,7 @@ class BasePlotFrame(wx.Frame):
             else:
             else:
                 rdict[r]['pstyle'] = 'solid'
                 rdict[r]['pstyle'] = 'solid'
                         
                         
-            if idx <= len(self.colorList):
+            if idx < len(self.colorList):
                 if idx == 0:
                 if idx == 0:
                     # use saved color for first plot
                     # use saved color for first plot
                     if self.properties['raster']['pcolor'] != None:
                     if self.properties['raster']['pcolor'] != None: