# HG changeset patch
# User Nicolas Saunier <nicolas.saunier@polymtl.ca>
# Date 1376451405 14400
# Node ID 365d8dee44f3dd75ab9b72b4b4b2b5739e08baa5
# Parent  5eeb3b9fb568a2c19ea630f9cab3a94b6fe5bdcf
last changes for TRB14

diff -r 5eeb3b9fb568 -r 365d8dee44f3 python/events.py
--- a/python/events.py	Mon Aug 12 22:50:42 2013 -0400
+++ b/python/events.py	Tue Aug 13 23:36:45 2013 -0400
@@ -39,7 +39,7 @@
     indicatorNameToIndices = utils.inverseEnumeration(indicatorNames)
 
     indicatorShortNames = ['CCDP',
-                           'CCAng',
+                           'CCA',
                            'Dist',
                            'MinDist',
                            'VA',
@@ -49,6 +49,17 @@
                            'P(SEA)',
                            'pPET']
 
+    indicatorUnits = ['',
+                      'rad',
+                      'm',
+                      'm',
+                      'rad',
+                      'm/s',
+                      '',
+                      's',
+                      '',
+                      '']
+
     def __init__(self, num = None, timeInterval = None, roaduserNum1 = None, roaduserNum2 = None, roadUser1 = None, roadUser2 = None, categoryNum = None):
         moving.STObject.__init__(self, num, timeInterval)
         self.roadUserNumbers = set([roaduserNum1, roaduserNum2])
diff -r 5eeb3b9fb568 -r 365d8dee44f3 python/indicators.py
--- a/python/indicators.py	Mon Aug 12 22:50:42 2013 -0400
+++ b/python/indicators.py	Tue Aug 13 23:36:45 2013 -0400
@@ -74,14 +74,14 @@
     def getValues(self):
         return [self.__getitem__(t) for t in self.timeInterval]
 
-    def plot(self, options = '', xfactor = 1., timeShift = 0, **kwargs):
+    def plot(self, options = '', xfactor = 1., yfactor = 1., timeShift = 0, **kwargs):
         from matplotlib.pylab import plot,ylim
         if self.getTimeInterval().length() == 1:
             marker = 'o'
         else:
             marker = ''
         time = sorted(self.values.keys())
-        plot([(x+timeShift)/xfactor for x in time], [self.values[i] for i in time], options+marker, **kwargs)
+        plot([(x+timeShift)/xfactor for x in time], [self.values[i]/yfactor for i in time], options+marker, **kwargs)
         if self.maxValue:
             ylim(ymax = self.maxValue)