Просмотр исходного кода

g.gui.tplot: fixed bugs when coordinates are missing or not in the right region

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@67424 15284696-431f-4ddb-bdfa-cd5b030d7da7
Luca Delucchi 9 лет назад
Родитель
Сommit
97f8885fa5
1 измененных файлов с 23 добавлено и 1 удалено
  1. 23 1
      gui/wxpython/tplot/frame.py

+ 23 - 1
gui/wxpython/tplot/frame.py

@@ -545,6 +545,11 @@ class TplotFrame(wx.Frame):
                 xdata.append(self.convert(values['start_datetime']))
                 ydata.append(values['value'])
 
+            if len(ydata) == ydata.count(None):
+                GError(parent=self, showTraceback=False,
+                       message=_("Problem getting data from raster temporal"
+                                 " dataset. Empty list of values."))
+                return
             self.lookUp.AddDataset(yranges=ydata, xranges=xdata,
                                    datasetName=name)
             color = self.colors.next()
@@ -579,6 +584,11 @@ class TplotFrame(wx.Frame):
                 xdata.append(self.convert(values['start_datetime']))
                 ydata.append(values['value'])
 
+            if len(ydata) == ydata.count(None):
+                GError(parent=self, showTraceback=False,
+                       message=_("Problem getting data from raster temporal"
+                                 " dataset. Empty list of values."))
+                return
             self.lookUp.AddDataset(yranges=ydata, xranges=xdata,
                                    datasetName=name)
             color = self.colors.next()
@@ -611,6 +621,11 @@ class TplotFrame(wx.Frame):
                 xdata.append(self.convert(values['start_datetime']))
                 ydata.append(values['value'])
 
+            if len(ydata) == ydata.count(None):
+                GError(parent=self, showTraceback=False,
+                       message=_("Problem getting data from raster temporal"
+                                 " dataset. Empty list of values."))
+                return
             self.lookUp.AddDataset(yranges=ydata, xranges=xdata,
                                    datasetName=name)
             color = self.colors.next()
@@ -664,6 +679,10 @@ class TplotFrame(wx.Frame):
                     GError(parent=self, message=_("Invalid input coordinates"),
                            showTraceback=False)
                     return
+                if not self.poi:
+                    GError(parent=self, message=_("Invalid input coordinates"),
+                           showTraceback=False)
+                    return
         # check raster dataset
         if datasetsR:
             datasetsR = datasetsR.split(',')
@@ -675,7 +694,10 @@ class TplotFrame(wx.Frame):
                 GError(parent=self, message=_("Invalid input raster dataset"),
                        showTraceback=False)
                 return
-
+            if not self.poi:
+                GError(parent=self, message=_("Invalid input coordinates"),
+                       showTraceback=False)
+                return
             self.datasetsR = datasetsR
 
         # check vector dataset