wxplot: use wxpython plotting instead of our old copy, adjust to use python properties

gui/wxpython/iclass/plots.py

@@ -17,7 +17,7 @@ for details.
 
 import wx
 
-import gui_core.wxlibplot as plot
+import wx.lib.plot as plot
 import wx.lib.scrolledpanel as scrolled
 from core.gcmd import GError
 
@@ -146,7 +146,7 @@ class PlotPanel(scrolled.ScrolledPanel):
 
     def EnableZoom(self, type, enable=True):
         for canvas in self.canvasList:
-            canvas.SetEnableZoom(enable)
+            canvas.enableZoom = enable
 
         #canvas.zoom = type
 
@@ -177,8 +177,8 @@ class PlotPanel(scrolled.ScrolledPanel):
         for band in self.bandList:
             canvas = plot.PlotCanvas(self.canvasPanel)
             canvas.SetMinSize((-1, 140))
-            canvas.SetFontSizeTitle(10)
-            canvas.SetFontSizeAxis(8)
+            canvas.fontSizeTitle = 10
+            canvas.fontSizeAxis = 8
             self.canvasList.append(canvas)
 
             self.canvasSizer.Add(
@@ -218,7 +218,7 @@ class PlotPanel(scrolled.ScrolledPanel):
     def DrawCoincidencePlots(self):
         """Draw coincidence plots"""
         for bandIdx in range(len(self.bandList)):
-            self.canvasList[bandIdx].SetYSpec(type='none')
+            self.canvasList[bandIdx].ySpec = 'none'
             lines = []
             level = 0.5
             lines.append(self.DrawInvisibleLine(level))
@@ -267,7 +267,7 @@ class PlotPanel(scrolled.ScrolledPanel):
         self.histogramLines = []
         for bandIdx in range(len(self.bandList)):
             self.canvasList[bandIdx].Clear()
-            self.canvasList[bandIdx].SetYSpec(type='auto')
+            self.canvasList[bandIdx].ySpec = 'auto'
             histgramLine = self.CreateHistogramLine(
                 bandValues=statistics.bands[bandIdx])
 

gui/wxpython/wxplot/base.py

@@ -21,7 +21,7 @@ import six
 
 import wx
 
-import gui_core.wxlibplot as plot
+import wx.lib.plot as plot
 from core.globalvar import ICONDIR
 from core.settings import UserSettings
 from wxplot.dialogs import TextDialog, OptDialog
@@ -105,7 +105,7 @@ class BasePlotFrame(wx.Frame):
         self.client = plot.PlotCanvas(self)
 
         # define the function for drawing pointLabels
-        self.client.SetPointLabelFunc(self.DrawPointLabel)
+        self.client.pointLabelFunc = self.DrawPointLabel
 
         # Create mouse event for showing cursor coords in status bar
         self.client.canvas.Bind(wx.EVT_LEFT_DOWN, self.OnMouseLeftDown)
@@ -187,19 +187,19 @@ class BasePlotFrame(wx.Frame):
         self.zoom = False  # zooming disabled
         self.drag = False  # draging disabled
         # vertical and horizontal scrollbars
-        self.client.SetShowScrollbars(True)
+        self.client.showScrollbars = True
 
         # x and y axis set to normal (non-log)
-        self.client.setLogScale((False, False))
+        self.client.logScale = (False, False)
         if self.properties['x-axis']['prop']['type']:
-            self.client.SetXSpec(self.properties['x-axis']['prop']['type'])
+            self.client.xSpec = self.properties['x-axis']['prop']['type']
         else:
-            self.client.SetXSpec('auto')
+            self.client.xSpec = 'auto'
 
         if self.properties['y-axis']['prop']['type']:
-            self.client.SetYSpec(self.properties['y-axis']['prop']['type'])
+            self.client.ySpec = self.properties['y-axis']['prop']['type']
         else:
-            self.client.SetYSpec('auto')
+            self.client.ySpec = 'auto'
 
     def InitRasterOpts(self, rasterList, plottype):
         """Initialize or update raster dictionary for plotting
@@ -337,26 +337,24 @@ class BasePlotFrame(wx.Frame):
         """Set plot and text options
         """
         self.client.SetFont(self.properties['font']['wxfont'])
-        self.client.SetFontSizeTitle(
-            self.properties['font']['prop']['titleSize'])
-        self.client.SetFontSizeAxis(
-            self.properties['font']['prop']['axisSize'])
+        self.client.fontSizeTitle = self.properties['font']['prop']['titleSize']
+        self.client.fontSizeAxis = self.properties['font']['prop']['axisSize']
 
-        self.client.SetEnableZoom(self.zoom)
-        self.client.SetEnableDrag(self.drag)
+        self.client.enableZoom = self.zoom
+        self.client.enableDrag = self.drag
 
         #
         # axis settings
         #
         if self.properties['x-axis']['prop']['type'] == 'custom':
-            self.client.SetXSpec('min')
+            self.client.xSpec = 'min'
         else:
-            self.client.SetXSpec(self.properties['x-axis']['prop']['type'])
+            self.client.xSpec = self.properties['x-axis']['prop']['type']
 
         if self.properties['y-axis']['prop']['type'] == 'custom':
-            self.client.SetYSpec('min')
+            self.client.ySpec = 'min'
         else:
-            self.client.SetYSpec(self.properties['y-axis']['prop'])
+            self.client.ySpec = self.properties['y-axis']['prop']['type']
 
         if self.properties['x-axis']['prop']['type'] == 'custom' and self.properties[
                 'x-axis']['prop']['min'] < self.properties['x-axis']['prop']['max']:
@@ -376,32 +374,28 @@ class BasePlotFrame(wx.Frame):
 
         if self.properties['x-axis']['prop']['log'] == True:
             self.properties['x-axis']['axis'] = None
-            self.client.SetXSpec('min')
+            self.client.xSpec = 'min'
         if self.properties['y-axis']['prop']['log'] == True:
             self.properties['y-axis']['axis'] = None
-            self.client.SetYSpec('min')
+            self.client.ySpec = 'min'
 
-        self.client.setLogScale((self.properties['x-axis']['prop']['log'],
-                                 self.properties['y-axis']['prop']['log']))
+        self.client.logScale = (self.properties['x-axis']['prop']['log'],
+                                self.properties['y-axis']['prop']['log'])
 
         #
         # grid settings
         #
-        self.client.SetEnableGrid(self.properties['grid']['enabled'])
-
-        self.client.SetGridColour(
-            wx.Colour(
-                self.properties['grid']['color'][0],
-                self.properties['grid']['color'][1],
-                self.properties['grid']['color'][2],
-                255))
+        self.client.enableGrid = self.properties['grid']['enabled']
+        gridpen = wx.Pen(colour=wx.Colour(self.properties['grid']['color'][0],
+                                          self.properties['grid']['color'][1],
+                                          self.properties['grid']['color'][2], 255))
+        self.client.gridPen = gridpen
 
         #
         # legend settings
         #
-        self.client.SetFontSizeLegend(
-            self.properties['font']['prop']['legendSize'])
-        self.client.SetEnableLegend(self.properties['legend']['enabled'])
+        self.client.fontSizeLegend = self.properties['font']['prop']['legendSize']
+        self.client.enableLegend = self.properties['legend']['enabled']
 
     def DrawPlot(self, plotlist):
         """Draw line and point plot from list plot elements.
@@ -413,14 +407,14 @@ class BasePlotFrame(wx.Frame):
                                       ylabel)
 
         if self.properties['x-axis']['prop']['type'] == 'custom':
-            self.client.SetXSpec('min')
+            self.client.xSpec = 'min'
         else:
-            self.client.SetXSpec(self.properties['x-axis']['prop']['type'])
+            self.client.xSpec = self.properties['x-axis']['prop']['type']
 
         if self.properties['y-axis']['prop']['type'] == 'custom':
-            self.client.SetYSpec('min')
+            self.client.ySpec = 'min'
         else:
-            self.client.SetYSpec(self.properties['y-axis']['prop']['type'])
+            self.client.ySpec = self.properties['y-axis']['prop']['type']
 
         self.client.Draw(self.plot, self.properties['x-axis']['axis'],
                          self.properties['y-axis']['axis'])
@@ -454,16 +448,16 @@ class BasePlotFrame(wx.Frame):
         """
         self.zoom = True
         self.drag = False
-        self.client.SetEnableZoom(self.zoom)
-        self.client.SetEnableDrag(self.drag)
+        self.client.enableZoom = self.zoom
+        self.client.enableDrag = self.drag
 
     def OnDrag(self, event):
         """Enable dragging and disable zooming
         """
         self.zoom = False
         self.drag = True
-        self.client.SetEnableDrag(self.drag)
-        self.client.SetEnableZoom(self.zoom)
+        self.client.enableDrag = self.drag
+        self.client.enableZoom = self.zoom
 
     def OnRedraw(self, event):
         """Redraw the plot window. Unzoom to original size
@@ -490,7 +484,7 @@ class BasePlotFrame(wx.Frame):
     def OnMotion(self, event):
         """Indicate when mouse is outside the plot area
         """
-        if self.client.GetEnablePointLabel() is True:
+        if self.client.enablePointLabel:
             # make up dict with info for the pointLabel
             # I've decided to mark the closest point on the closest curve
             dlst = self.client.GetClosestPoint(
@@ -560,7 +554,7 @@ class BasePlotFrame(wx.Frame):
         self.ylabel = dlg.ylabel
 
         if self.plot:
-            self.plot.setTitle(dlg.ptitle)
+            self.plot.title = dlg.ptitle
 
         self.OnRedraw(event=None)
 
@@ -568,14 +562,12 @@ class BasePlotFrame(wx.Frame):
         x, y = self._getPlotLabels()
 
         self.client.SetFont(self.properties['font']['wxfont'])
-        self.client.SetFontSizeTitle(
-            self.properties['font']['prop']['titleSize'])
-        self.client.SetFontSizeAxis(
-            self.properties['font']['prop']['axisSize'])
+        self.client.fontSizeTitle = self.properties['font']['prop']['titleSize']
+        self.client.fontSizeAxis = self.properties['font']['prop']['axisSize']
 
         if self.plot:
-            self.plot.setXLabel(x)
-            self.plot.setYLabel(y)
+            self.plot.xLabel = x
+            self.plot.yLabel = y
 
     def PlotText(self, event):
         """Set custom text values for profile title and axis labels.

gui/wxpython/wxplot/histogram.py

@@ -20,7 +20,7 @@ import sys
 import wx
 
 import grass.script as grass
-import gui_core.wxlibplot as plot
+import wx.lib.plot as plot
 from gui_core.wrap import StockCursor
 from gui_core.toolbars import BaseToolbar, BaseIcons
 from wxplot.base import BasePlotFrame, PlotIcons

gui/wxpython/wxplot/profile.py

@@ -23,7 +23,7 @@ import numpy
 
 import wx
 
-import gui_core.wxlibplot as plot
+import wx.lib.plot as plot
 import grass.script as grass
 from wxplot.base import BasePlotFrame, PlotIcons
 from gui_core.toolbars import BaseToolbar, BaseIcons

gui/wxpython/wxplot/scatter.py

@@ -20,7 +20,7 @@ import sys
 import wx
 
 import grass.script as grass
-import gui_core.wxlibplot as plot
+import wx.lib.plot as plot
 from wxplot.base import BasePlotFrame, PlotIcons
 from gui_core.toolbars import BaseToolbar, BaseIcons
 from gui_core.wrap import StockCursor