fix for strange v1 file

source/mpower.py

@@ -64,7 +64,7 @@ def inferHeader(self, time=0):
         max_power = max(int(p) for p in self.power)
         print ("%d %d" % (average_power, max_power))
         self.header.setSummary(time=time, distance=0, average_power=average_power, max_power=max_power)
-        
+
 class LineIterator(object):
     def __init__(self, stream):
         self._parts = re.split("\r\r\n|\r\n|\n|\r", stream.read())
@@ -149,7 +149,7 @@ def load_csv(self):
                     self._load_csv_chunk(reader)
             except StopIteration:
                 pass
-                
+
     def _parse_stages_time(self, time):
         # I've seen mm:ss or mm:ss:00 so far 
         parts = time.split(':')
@@ -313,16 +313,25 @@ def _load_v1_header(self, reader):
 
     def _load_v1_data(self, reader):
         """ Read Echelon 1 time series """
+        last_time = 0
+
         for row in reader:
-            if len(row):
+            if len(row) == 0:
+                break
+            elif len(row) == 6:
+                last_time = float(row[0]) * 60
                 self.ride.addSample(
                     power=row[3],
                     rpm=row[5],
                     hr=row[4],
                     distance=float(row[1]) * 1000.0
                 )
             else:
-                break
+                print ("skip %r" % row)
+
+        if self.ride.header.time == 0:
+            print ("v1 header missing")
+            self.ride.inferHeader(last_time)
 
     def _load_v3(self, reader):
         """ So called v3 is a messed up version of v1. I suspect it's an earlier firmware. """

source/mpowertcx.py

@@ -39,7 +39,7 @@ def __init__(self, version):
 class MainWindow(QMainWindow, Ui_MainWindow):
     def __init__(self):
         super(MainWindow, self).__init__()
-        self.version = "v1.1.9"
+        self.version = "v1.1.10"
         self.settings = QSettings("j33433", "MPowerTCX")
         self.include_speed_key = "include_speed"
         self.power_adjust_key = "power_adjust"

source/physics.py

@@ -31,12 +31,12 @@ def gravity(self, grade):
         return self.g * math.sin(math.atan(grade)) * self.mass
 
     def get_power(self, t):
-        if t > 20:
+        if t > 50:
             return 220
-        elif t > 10: 
+        elif t > 40: 
             return 60
         else:
-            return 500
+            return 300
 
     def next_velocity(self):
         t = self.x * self.dt