Browse Source

wxGUI/timeline: fix https://trac.osgeo.org/grass/ticket/2275 - search path

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@60052 15284696-431f-4ddb-bdfa-cd5b030d7da7
Anna Petrášová 11 years ago
parent
commit
673adbef07
1 changed files with 8 additions and 0 deletions
  1. 8 0
      gui/wxpython/timeline/frame.py

+ 8 - 0
gui/wxpython/timeline/frame.py

@@ -344,6 +344,8 @@ class TimelineFrame(wx.Frame):
         datasets = datasets.split(',')
         datasets = datasets.split(',')
         try:
         try:
             datasets = self._checkDatasets(datasets)
             datasets = self._checkDatasets(datasets)
+            if not datasets:
+                return
         except GException:
         except GException:
             GError(parent=self, message=_("Invalid input data"))
             GError(parent=self, message=_("Invalid input data"))
             return
             return
@@ -395,6 +397,8 @@ class TimelineFrame(wx.Frame):
         # flatten this list
         # flatten this list
         if allDatasets:
         if allDatasets:
             allDatasets = reduce(lambda x, y: x + y, reduce(lambda x, y: x + y, allDatasets))
             allDatasets = reduce(lambda x, y: x + y, reduce(lambda x, y: x + y, allDatasets))
+            mapsets = tgis.get_tgis_c_library_interface().available_mapsets()
+            allDatasets = [i for i in sorted(allDatasets, key=lambda l: mapsets.index(l[1]))]
 
 
         for dataset in datasets:
         for dataset in datasets:
             errorMsg = _("Space time dataset <%s> not found.") % dataset
             errorMsg = _("Space time dataset <%s> not found.") % dataset
@@ -420,6 +424,8 @@ class TimelineFrame(wx.Frame):
                 if dlg.ShowModal() == wx.ID_OK:
                 if dlg.ShowModal() == wx.ID_OK:
                     index = dlg.GetSelection()
                     index = dlg.GetSelection()
                     validated.append(allDatasets[indices[index]])
                     validated.append(allDatasets[indices[index]])
+                else:
+                    continue
             else:
             else:
                 validated.append(allDatasets[indices[0]])
                 validated.append(allDatasets[indices[0]])
 
 
@@ -436,6 +442,8 @@ class TimelineFrame(wx.Frame):
             return
             return
         try:
         try:
             datasets = self._checkDatasets(datasets)
             datasets = self._checkDatasets(datasets)
+            if not datasets:
+                return
         except GException:
         except GException:
             GError(parent=self, message=_("Invalid input data"))
             GError(parent=self, message=_("Invalid input data"))
             return
             return