[GRASS-SVN] r74095 - grass/trunk/gui/wxpython/timeline

svn_grass at osgeo.org svn_grass at osgeo.org
Fri Feb 15 19:30:40 PST 2019


Author: annakrat
Date: 2019-02-15 19:30:39 -0800 (Fri, 15 Feb 2019)
New Revision: 74095

Modified:
   grass/trunk/gui/wxpython/timeline/frame.py
   grass/trunk/gui/wxpython/timeline/g.gui.timeline.py
Log:
wxGUI/timeline: fix #3753

Modified: grass/trunk/gui/wxpython/timeline/frame.py
===================================================================
--- grass/trunk/gui/wxpython/timeline/frame.py	2019-02-16 03:14:38 UTC (rev 74094)
+++ grass/trunk/gui/wxpython/timeline/frame.py	2019-02-16 03:30:39 UTC (rev 74095)
@@ -286,7 +286,7 @@
             startY = self.timeData[name]['south']
             dY = self.timeData[name]['north'] - np.array(startY)
 
-            color = colors.next()
+            color = next(colors)
             plots.append(self.axes3d.bar3d(startX, startY, startZ, dX, dY, dZ,
                                            color=color, alpha=ALPHA))
 
@@ -334,9 +334,9 @@
             # TODO: mixed
             if mapType == 'interval':
                 end = convert(self.timeData[name]['end_datetime'])
-                lookUpData = zip(start, end)
+                lookUpData = list(zip(start, end))
                 duration = end - np.array(start)
-                barData = zip(start, duration)
+                barData = list(zip(start, duration))
                 lookUp.AddDataset(type_='bar', yrange=(i - 0.1, i + 0.1),
                                   xranges=lookUpData, datasetName=name)
 
@@ -348,7 +348,7 @@
                     yrange=i,
                     xranges=pointData,
                     datasetName=name)
-            color = colors.next()
+            color = next(colors)
             if mapType == 'interval':
                 plots.append(
                     self.axes2d.broken_barh(

Modified: grass/trunk/gui/wxpython/timeline/g.gui.timeline.py
===================================================================
--- grass/trunk/gui/wxpython/timeline/g.gui.timeline.py	2019-02-16 03:14:38 UTC (rev 74094)
+++ grass/trunk/gui/wxpython/timeline/g.gui.timeline.py	2019-02-16 03:30:39 UTC (rev 74095)
@@ -50,7 +50,7 @@
         # TODO: why do we need this special check here, the reason of error
         # is wrong intallation or something, no need to report this to the
         # user in a nice way
-        gscript.fatal(e.message)
+        gscript.fatal(str(e))
 
     datasets = options['inputs'].strip().split(',')
     datasets = [data for data in datasets if data]



More information about the grass-commit mailing list