Browse Source

wxGUI: remove redundant profile.py and histogram2.py modules
minor clean up in wxplot modules


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

Martin Landa 13 years ago
parent
commit
9a09e3e796

+ 2 - 2
gui/wxpython/gui_modules/__init__.py

@@ -15,7 +15,6 @@ all = [
     "goutput.py",
     "gselect.py",
     "histogram.py",
-    "histogram2.py",
     "layertree.py",
     "location_wizard.py",
     "mapdisp_window.py",
@@ -29,7 +28,6 @@ all = [
     "nviz_tools.py",
     "ogc_services.py",
     "preferences.py",
-    "profile.py",
     "render.py",
     "rules.py",
     "sqlbuilder.py",
@@ -40,6 +38,8 @@ all = [
     "vdigit.py",
     "workspace.py",
     "wxnviz.py",
+    "wxplot.py",
+    "wxplot_dialogs.py",
     "wxvdriver.py",
     "wxvdigit.py",
 ]

File diff suppressed because it is too large
+ 0 - 1353
gui/wxpython/gui_modules/histogram2.py


File diff suppressed because it is too large
+ 0 - 1433
gui/wxpython/gui_modules/profile.py


+ 6 - 10
gui/wxpython/gui_modules/wxplot.py

@@ -1,14 +1,12 @@
 """!
-@package histogram2.py
+@package wxplot.py
 
-Raster histogramming using PyPlot (wx.lib.plot.py); replacement for
-d.hist
+Iinteractive plotting using PyPlot (wx.lib.plot.py). 
 
 Classes:
+ - AbstractPlotFrame
  - HistFrame
- - SetupHistogramDialog
- - TextDialog
- - OptDialog
+ - ProfileFrame
 
 (C) 2011 by the GRASS Development Team
 
@@ -27,11 +25,9 @@ import wx.lib.colourselect as  csel
 
 import globalvar
 import gcmd
-from gselect     import Select
 from render      import Map
 from toolbars    import Histogram2Toolbar
 from toolbars    import ProfileToolbar
-from debug       import Debug
 from preferences import globalSettings as UserSettings
 
 import wxplot_dialogs as dialogs
@@ -52,7 +48,7 @@ except ImportError:
 
 class AbstractPlotFrame(wx.Frame):
     """!Abstract PyPlot display frame class"""
-    def __init__(self, parent = None, id = wx.ID_ANY, title='', size = (700,300),
+    def __init__(self, parent = None, id = wx.ID_ANY, title='', size = (700, 300),
                  style = wx.DEFAULT_FRAME_STYLE, rasterList = [],  **kwargs):
 
         wx.Frame.__init__(self, parent, id, title, size = size, style = style, **kwargs)
@@ -979,4 +975,4 @@ class ProfileFrame(AbstractPlotFrame):
                                         
                 file.close()
 
-        dlg.Destroy()
+        dlg.Destroy()

+ 2 - 6
gui/wxpython/gui_modules/wxplot_dialogs.py

@@ -1,8 +1,8 @@
 """!
 @package wxplot_dialogs.py
 
-GRASS interactive plotting using PyPlot (wx.lib.plot.py). Dialogs for different
-    plotting routines
+Iinteractive plotting using PyPlot (wx.lib.plot.py). Dialogs for
+different plotting routines.
 
 Classes:
  - ProfileRasterDialog
@@ -27,13 +27,9 @@ import wx.lib.colourselect as  csel
 import globalvar
 import gcmd
 from gselect     import Select
-from render      import Map
-from toolbars    import Histogram2Toolbar
-from debug       import Debug
 from preferences import globalSettings as UserSettings
 
 from grass.script import core   as grass
-from grass.script import raster as raster
 
 class ProfileRasterDialog(wx.Dialog):
     def __init__(self, parent, id = wx.ID_ANY,