Merge branch 'master' into development

Author: sreeder

src/wizard/controller/frmSeriesDialog.py

@@ -84,6 +84,7 @@ def onNew(self, event):
                                             wiz.result.ResultID)
 
             r_id = r[0].ResultID
+
 
             detailedResults = read.getDetailedResultInfo("Time series coverage")
             self.seriesSelectPanel.listCtrl.SetObjects(detailedResults)

tests/test_app/configFile/test2.yaml

@@ -1,4 +1,5 @@
 ## Configuration file
+
 ## Last modified: 2017-06-28 13:22
 ---
 Custom_file_id:
@@ -10,50 +11,50 @@ Custom_file_id:
     UserName: ODM
   Mappings:
     AirTemperature-C:
-      CalculateAggInterval: false
-      IntendedTimeSpacing: 15
+      CalculateAggInterval: 'false'
+      IntendedTimeSpacing: 10
       IntendedTimeSpacingUnitID: 102
-      LastByteRead: '2345'
-      ResultID: 1
+      LastByteRead: 0
+      ResultID: 5
     NetRadiation-Watts/m2:
       CalculateAggInterval: false
-      IntendedTimeSpacing: 15
+      IntendedTimeSpacing: 10
       IntendedTimeSpacingUnitID: 102
       LastByteRead: '2345'
       ResultID: 2
     Precipitation-mm:
       CalculateAggInterval: false
-      IntendedTimeSpacing: 15
+      IntendedTimeSpacing: 10
       IntendedTimeSpacingUnitID: 102
       LastByteRead: '2345'
       ResultID: 3
     RelativeHumidity-%:
       CalculateAggInterval: false
-      IntendedTimeSpacing: 15
+      IntendedTimeSpacing: 10
       IntendedTimeSpacingUnitID: 102
       LastByteRead: '2345'
       ResultID: 4
     SnowDepth-cm:
       CalculateAggInterval: false
-      IntendedTimeSpacing: 15
+      IntendedTimeSpacing: 10
       IntendedTimeSpacingUnitID: 102
       LastByteRead: '2345'
       ResultID: 5
     SolarRadiation-Watts/m2:
       CalculateAggInterval: false
-      IntendedTimeSpacing: 15
+      IntendedTimeSpacing: 10
       IntendedTimeSpacingUnitID: 102
       LastByteRead: '2345'
       ResultID: 6
     WindDirection-Degree:
       CalculateAggInterval: false
-      IntendedTimeSpacing: 15
+      IntendedTimeSpacing: 10
       IntendedTimeSpacingUnitID: 102
       LastByteRead: '2345'
       ResultID: 7
     WindSpeed-m/s:
       CalculateAggInterval: false
-      IntendedTimeSpacing: 15
+      IntendedTimeSpacing: 10
       IntendedTimeSpacingUnitID: 102
       LastByteRead: '2345'
       ResultID: 8