Browse Source

wxNviz: ColorTable class changed to base class for deriving RasterColorTable, VectorColorTable, ThematicVectorTable

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@47500 15284696-431f-4ddb-bdfa-cd5b030d7da7
Anna Petrášová 14 năm trước cách đây
mục cha
commit
fc27308dfc

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1333 - 663
gui/wxpython/gui_modules/colorrules.py


+ 1 - 1
gui/wxpython/gui_modules/nviz_mapdisp.py

@@ -1895,7 +1895,7 @@ class GLWindow(MapWindow, glcanvas.GLCanvas):
         cmd += subcmd
         
         # background
-        subcmd  = "bgcolor=%d:%d:%d " % (self.view['background']['color'])
+        subcmd  = "bgcolor=%d:%d:%d " % (self.view['background']['color'][:3])
         if self.view['background']['color'] != (255, 255, 255):
             cmd += subcmd
         cmd += "\\\n"

+ 1 - 1
gui/wxpython/gui_modules/nviz_tools.py

@@ -3207,7 +3207,7 @@ class NvizToolWindow(FN.FlatNotebook):
             
     def OnSetThematic(self, event):
         """!Set options for thematic points"""
-        ctable = colorrules.ColorTable(self, raster = False, nviz = True)
+        ctable = colorrules.ThematicVectorTable(self)
         ctable.CentreOnScreen()
         ctable.Show()
         

+ 2 - 2
gui/wxpython/wxgui.py

@@ -1039,9 +1039,9 @@ class GMFrame(wx.Frame):
         cmd = self.GetMenuCmd(event)
         
         if cmd[0] == 'r.colors':
-            ctable = colorrules.ColorTable(self, raster = True)
+            ctable = colorrules.RasterColorTable(self)
         else:
-            ctable = colorrules.ColorTable(self, raster = False)
+            ctable = colorrules.VectorColorTable(self)
         ctable.CentreOnScreen()
         ctable.Show()