[GRASS-SVN] r53734 - grass/trunk/gui/wxpython/swipe
svn_grass at osgeo.org
svn_grass at osgeo.org
Thu Nov 8 05:27:20 PST 2012
Author: martinl
Date: 2012-11-08 05:27:20 -0800 (Thu, 08 Nov 2012)
New Revision: 53734
Added:
grass/trunk/gui/wxpython/swipe/Makefile
grass/trunk/gui/wxpython/swipe/g.gui.mapswipe.py
Removed:
grass/trunk/gui/wxpython/swipe/main.py
Log:
wxGUI/MapSwipe: add Makefile for g.gui.mapswipe (part 1)
Added: grass/trunk/gui/wxpython/swipe/Makefile
===================================================================
--- grass/trunk/gui/wxpython/swipe/Makefile (rev 0)
+++ grass/trunk/gui/wxpython/swipe/Makefile 2012-11-08 13:27:20 UTC (rev 53734)
@@ -0,0 +1,8 @@
+MODULE_TOPDIR = ../../..
+
+PGM = g.gui.mapswipe
+
+include $(MODULE_TOPDIR)/include/Make/Script.make
+include $(MODULE_TOPDIR)/include/Make/NoHtml.make
+
+default: script
Property changes on: grass/trunk/gui/wxpython/swipe/Makefile
___________________________________________________________________
Added: svn:mime-type
+ text/x-makefile
Added: svn:eol-style
+ native
Copied: grass/trunk/gui/wxpython/swipe/g.gui.mapswipe.py (from rev 53718, grass/trunk/gui/wxpython/swipe/main.py)
===================================================================
--- grass/trunk/gui/wxpython/swipe/g.gui.mapswipe.py (rev 0)
+++ grass/trunk/gui/wxpython/swipe/g.gui.mapswipe.py 2012-11-08 13:27:20 UTC (rev 53734)
@@ -0,0 +1,89 @@
+#!/usr/bin/env python
+############################################################################
+#
+# MODULE: Map Swipe
+# AUTHOR(S): Anna Kratochvilova
+# PURPOSE: The Map Swipe is a wxGUI component which allows the user to
+# interactively compare two maps
+# COPYRIGHT: (C) 2012 by Anna Kratochvilova, and the GRASS Development Team
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+############################################################################
+
+#%module
+#% description: Allows to interactively compare two maps by swiping.
+#%end
+#%option G_OPT_R_INPUT
+#% key: first
+#% description: First (top/right) raster map
+#% required: no
+#%end
+#%option G_OPT_R_INPUT
+#% key: second
+#% description: Second (bottom/left) raster map
+#% required: no
+#%end
+
+
+import os
+import sys
+
+import wx
+import gettext
+
+import grass.script as grass
+
+if __name__ == '__main__':
+ sys.path.append(os.path.join(os.environ['GISBASE'], "etc", "gui", "wxpython"))
+
+from core.settings import UserSettings
+from mapswipe.frame import SwipeMapFrame
+
+
+def main():
+ gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'), unicode = True)
+
+ driver = UserSettings.Get(group = 'display', key = 'driver', subkey = 'type')
+ if driver == 'png':
+ os.environ['GRASS_RENDER_IMMEDIATE'] = 'png'
+ else:
+ os.environ['GRASS_RENDER_IMMEDIATE'] = 'cairo'
+
+ options, flags = grass.parser()
+
+ first = options['first']
+ second = options['second']
+
+ for mapName in [first, second]:
+ if mapName:
+ gfile = grass.find_file(name = mapName)
+ if not gfile['name']:
+ grass.fatal(_("Raster map <%s> not found") % mapName)
+
+ app = wx.PySimpleApp()
+ wx.InitAllImageHandlers()
+
+ frame = SwipeMapFrame()
+
+ if first:
+ frame.SetFirstRaster(first)
+ if second:
+ frame.SetSecondRaster(second)
+
+ frame.Show()
+
+ app.MainLoop()
+
+
+if __name__ == '__main__':
+ main()
+
Deleted: grass/trunk/gui/wxpython/swipe/main.py
===================================================================
--- grass/trunk/gui/wxpython/swipe/main.py 2012-11-08 13:00:57 UTC (rev 53733)
+++ grass/trunk/gui/wxpython/swipe/main.py 2012-11-08 13:27:20 UTC (rev 53734)
@@ -1,89 +0,0 @@
-#!/usr/bin/env python
-############################################################################
-#
-# MODULE: Map Swipe
-# AUTHOR(S): Anna Kratochvilova
-# PURPOSE: The Map Swipe is a wxGUI component which allows the user to
-# interactively compare two maps
-# COPYRIGHT: (C) 2012 by Anna Kratochvilova, and the GRASS Development Team
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-############################################################################
-
-#%module
-#% description: Allows to interactively compare two maps by swiping.
-#%end
-#%option G_OPT_R_INPUT
-#% key: first
-#% description: First (top/right) raster map
-#% required: no
-#%end
-#%option G_OPT_R_INPUT
-#% key: second
-#% description: Second (bottom/left) raster map
-#% required: no
-#%end
-
-
-import os
-import sys
-
-import wx
-import gettext
-
-import grass.script as grass
-
-if __name__ == '__main__':
- sys.path.append(os.path.join(os.environ['GISBASE'], "etc", "gui", "wxpython"))
-
-from core.settings import UserSettings
-from frame import SwipeMapFrame
-
-
-def main():
- gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'), unicode = True)
-
- driver = UserSettings.Get(group = 'display', key = 'driver', subkey = 'type')
- if driver == 'png':
- os.environ['GRASS_RENDER_IMMEDIATE'] = 'png'
- else:
- os.environ['GRASS_RENDER_IMMEDIATE'] = 'cairo'
-
- options, flags = grass.parser()
-
- first = options['first']
- second = options['second']
-
- for mapName in [first, second]:
- if mapName:
- gfile = grass.find_file(name = mapName)
- if not gfile['name']:
- grass.fatal(_("Raster map <%s> not found") % mapName)
-
- app = wx.PySimpleApp()
- wx.InitAllImageHandlers()
-
- frame = SwipeMapFrame()
-
- if first:
- frame.SetFirstRaster(first)
- if second:
- frame.SetSecondRaster(second)
-
- frame.Show()
-
- app.MainLoop()
-
-
-if __name__ == '__main__':
- main()
-
More information about the grass-commit
mailing list