浏览代码

wxGUI/swipe: fix checking params

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@52630 15284696-431f-4ddb-bdfa-cd5b030d7da7
Vaclav Petras 12 年之前
父节点
当前提交
3fbca3b4af
共有 1 个文件被更改,包括 11 次插入9 次删除
  1. 11 9
      gui/wxpython/swipe/main.py

+ 11 - 9
gui/wxpython/swipe/main.py

@@ -44,20 +44,22 @@ def main():
     first = options['first']
     first = options['first']
     second = options['second']
     second = options['second']
 
 
-    gfile = grass.find_file(name = first)
-    if not gfile['name']:
-        grass.fatal(_("Raster map <%s> not found") % first)
-
-    gfile = grass.find_file(name = second)
-    if not gfile['name']:
-        grass.fatal(_("Raster map <%s> not found") % 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()
     app = wx.PySimpleApp()
     wx.InitAllImageHandlers()
     wx.InitAllImageHandlers()
 
 
     frame = SwipeMapFrame()
     frame = SwipeMapFrame()
-    frame.SetFirstRaster(first)
-    frame.SetSecondRaster(second)
+    
+    if first:
+        frame.SetFirstRaster(first)
+    if second:
+        frame.SetSecondRaster(second)
+
     frame.Show()
     frame.Show()
 
 
     app.MainLoop()
     app.MainLoop()