Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

wxGUI/g.gui.mapswipe: fix hit Apply button if first and second raster aren't chosen #1042

Merged
merged 1 commit into from
Oct 27, 2020
Merged

wxGUI/g.gui.mapswipe: fix hit Apply button if first and second raster aren't chosen #1042

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 20 additions & 17 deletions gui/wxpython/mapswipe/frame.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,14 +398,15 @@ def OnApplyInputChanges(self):
self.rasters['first'], self.rasters['second'] = first, second
res1 = self.SetFirstRaster(name=self.rasters['first'])
res2 = self.SetSecondRaster(name=self.rasters['second'])
if not (res1 and res2) and first and second:
if not (res1 and res2) and (first or second):
message = ''
if not res1:
if first and not res1:
message += _("Map <%s> not found. ") % self.rasters[
'first']
if not res2:
if second and not res2:
message += _("Map <%s> not found.") % self.rasters[
'second']
if message:
GError(parent=self, message=message)
return
self.ZoomToMap()
Expand All @@ -420,25 +421,27 @@ def OnApplyInputChanges(self):

def SetFirstRaster(self, name):
"""Set raster map to first Map"""
raster = grass.find_file(name=name, element='cell')
if raster['fullname']:
self.rasters['first'] = raster['fullname']
self.SetLayer(
name=raster['fullname'],
mapInstance=self.GetFirstMap())
return True
if name:
raster = grass.find_file(name=name, element='cell')
if raster.get('fullname'):
self.rasters['first'] = raster['fullname']
self.SetLayer(
name=raster['fullname'],
mapInstance=self.GetFirstMap())
return True

return False

def SetSecondRaster(self, name):
"""Set raster map to second Map"""
raster = grass.find_file(name=name, element='cell')
if raster['fullname']:
self.rasters['second'] = raster['fullname']
self.SetLayer(
name=raster['fullname'],
mapInstance=self.GetSecondMap())
return True
if name:
raster = grass.find_file(name=name, element='cell')
if raster.get('fullname'):
self.rasters['second'] = raster['fullname']
self.SetLayer(
name=raster['fullname'],
mapInstance=self.GetSecondMap())
return True

return False

Expand Down