[GRASS-SVN] r54848 - grass/trunk/gui/wxpython/rlisetup

[svn_grass at osgeo.org]

Author: lucadelu
Date: 2013-02-02 11:48:09 -0800 (Sat, 02 Feb 2013)
New Revision: 54848

Modified:
   grass/trunk/gui/wxpython/rlisetup/frame.py
   grass/trunk/gui/wxpython/rlisetup/functions.py
   grass/trunk/gui/wxpython/rlisetup/g.gui.rlisetup.py
   grass/trunk/gui/wxpython/rlisetup/wizard.py
Log:
fix r.li.setup on windows, some cleaning of code

Modified: grass/trunk/gui/wxpython/rlisetup/frame.py
===================================================================
--- grass/trunk/gui/wxpython/rlisetup/frame.py	2013-02-02 19:17:20 UTC (rev 54847)
+++ grass/trunk/gui/wxpython/rlisetup/frame.py	2013-02-02 19:48:09 UTC (rev 54848)
@@ -17,7 +17,7 @@
 class RLiSetupFrame(wx.Frame):
 
     def __init__(self, parent, giface = None, id=wx.ID_ANY, title=_("GRASS" \
-                 " GIS Setup for r.li modules"), 
+                 " GIS Setup for r.li modules"),
                  style=wx.DEFAULT_FRAME_STYLE | wx.RESIZE_BORDER, **kwargs):
         ###VARIABLES
         self.parent = parent

Modified: grass/trunk/gui/wxpython/rlisetup/functions.py
===================================================================
--- grass/trunk/gui/wxpython/rlisetup/functions.py	2013-02-02 19:17:20 UTC (rev 54847)
+++ grass/trunk/gui/wxpython/rlisetup/functions.py	2013-02-02 19:48:09 UTC (rev 54848)
@@ -6,7 +6,7 @@
 """
 import wx
 import os
-from grass.script import core as grass
+import sys
 
 
 def checkValue(value):
@@ -17,11 +17,19 @@
 
 
 def retRLiPath():
-    major_version = int(grass.version()['version'].split('.', 1)[0])
-    rlipath = os.path.join(os.environ['HOME'], '.grass%d' % major_version,
-                           'r.li')
+    # configuration directory
+    if sys.platform == 'win32':
+        grass_config_dirname = "GRASS7"
+        grass_config_dir = os.path.join(os.getenv('APPDATA'),
+                                        grass_config_dirname)
+    else:
+        grass_config_dirname = ".grass7"
+        grass_config_dir = os.path.join(os.getenv('HOME'),
+                                        grass_config_dirname)
+
+    rlipath = os.path.join(grass_config_dir, 'r.li')
     if os.path.exists(rlipath):
         return rlipath
     else:
         os.mkdir(rlipath)
-        return rlipath
\ No newline at end of file
+        return rlipath

Modified: grass/trunk/gui/wxpython/rlisetup/g.gui.rlisetup.py
===================================================================
--- grass/trunk/gui/wxpython/rlisetup/g.gui.rlisetup.py	2013-02-02 19:17:20 UTC (rev 54847)
+++ grass/trunk/gui/wxpython/rlisetup/g.gui.rlisetup.py	2013-02-02 19:48:09 UTC (rev 54848)
@@ -38,17 +38,17 @@
 from core.giface import StandaloneGrassInterface
 from rlisetup.frame import RLiSetupFrame
 
+
 def main():
-    import gettext
-    gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'), unicode = True)
-    
+    gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'),
+                    unicode = True)
     app = wx.PySimpleApp()
     wx.InitAllImageHandlers()
     frame = RLiSetupFrame(parent = None, giface = StandaloneGrassInterface())
     frame.Show()
-    
+
     app.MainLoop()
-    
+
 if __name__ == "__main__":
     options, flags = grass.parser()
     main()

Modified: grass/trunk/gui/wxpython/rlisetup/wizard.py
===================================================================
--- grass/trunk/gui/wxpython/rlisetup/wizard.py	2013-02-02 19:17:20 UTC (rev 54847)
+++ grass/trunk/gui/wxpython/rlisetup/wizard.py	2013-02-02 19:48:09 UTC (rev 54848)
@@ -140,7 +140,7 @@
             self.per_x = float(self.SF_X) / float(self.rasterinfo['cols'])
             self.per_y = float(self.SF_Y) / float(self.rasterinfo['rows'])
             self.per_rl = float(self.SF_RL) / float(self.rasterinfo['rows'])
-            self.per_cl = float(self.SF_CL) / float(self.rasterinfo['cols'])            
+            self.per_cl = float(self.SF_CL) / float(self.rasterinfo['cols'])
         elif self.startpage.region == 'key':
             self._temp_region()
             self.SF_X = float(self.keyboardpage.col_up)