postrunner 0.7.5 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3e72cd4d14f546d36e537a7e9da9b82be913717
-  data.tar.gz: 5676aa62ed9ee8ac9123e3b0b3f9a086b93d7cba
+  metadata.gz: e282bd17e22dd3984588ac737f95e0bb819ee674
+  data.tar.gz: bf6a551a65a477b2a68526c549488098e9374a00
 SHA512:
-  metadata.gz: 1e8eb20c4e281dd11e28e56678134ed589b0271857d9175cc2bd73b8d60783338bdb55a9eac5e45b6cbe6ef5525516508db2d7c33b845f41a5925b49ebd3bb77
-  data.tar.gz: c2c91df7c337f283080feef69651fc234935dbafaf6a8869e138d7689bee8560188455f20340cd0c8cb983d10af3fa6b05178f464928261c7f26bcd62bc46977
+  metadata.gz: e35e8f9d8604cdf26d76d5686e70739f783e0fc385fa9b686e8abe7d5dcea84e4a0e93f06a8b1bd697d5add11539cbc0d9c8a20ac5b6ab74493c7c7eaa01853f
+  data.tar.gz: 8eb18c7a1af1c8d56889985d4bfa203ca4b2dd39fa7941220ee835613b06a2bdb986bab58fdd95c4b23fc2ee5e7c275e0b4c5d6461ad0fcb68b83815a6892b59

data/lib/postrunner/ActivitySummary.rb

@@ -16,11 +16,16 @@ require 'postrunner/FlexiTable'
 require 'postrunner/ViewFrame'
 require 'postrunner/HRV_Analyzer'
 require 'postrunner/Percentiles'
+require 'postrunner/HRZoneDetector'
 
 module PostRunner
 
   class ActivitySummary
 
+    class HRZone < Struct.new(:index, :low, :high, :time_in_zone,
+                              :percent_in_zone)
+    end
+
     include Fit4Ruby::Converters
 
     def initialize(activity, unit_system, custom_fields)
@@ -33,9 +38,12 @@ module PostRunner
     end
 
     def to_s
-      summary.to_s + "\n" +
-      (@activity.note ? note.to_s + "\n" : '') +
-      laps.to_s
+      s = summary.to_s + "\n" +
+        (@activity.note ? note.to_s + "\n" : '') +
+        laps.to_s
+      s += hr_zones.to_s if has_hr_zones?
+
+      s
     end
 
     def to_html(doc)
@@ -45,6 +53,10 @@ module PostRunner
       ViewFrame.new('note', 'Note', width, note,
                     true).to_html(doc) if @activity.note
       ViewFrame.new('laps', 'Laps', width, laps, true).to_html(doc)
+      if has_hr_zones?
+        ViewFrame.new('hr_zones', 'Heart Rate Zones', width, hr_zones, true).
+          to_html(doc)
+      end
     end
 
     private
@@ -119,8 +131,19 @@ module PostRunner
                 "#{(2 * session.avg_cadence).round} rpm" : '-' ])
       end
 
-      t.row([ 'Training Effect:', session.total_training_effect ?
-              session.total_training_effect : '-' ])
+      if @fit_activity.physiological_metrics &&
+         (physiological_metrics = @fit_activity.physiological_metrics.last)
+        if physiological_metrics.anaerobic_training_effect
+          t.row([ 'Anaerobic Training Effect:',
+                  physiological_metrics.anaerobic_training_effect ])
+        end
+        if physiological_metrics.aerobic_training_effect
+          t.row([ 'Aerobic Training Effect:',
+                  physiological_metrics.aerobic_training_effect ])
+        end
+      elsif session.total_training_effect
+        t.row([ 'Aerobic Training Effect:', session.total_training_effect ])
+      end
 
       rec_info = @fit_activity.recovery_info
       t.row([ 'Ignored Recovery Time:',
@@ -178,6 +201,140 @@ module PostRunner
       t
     end
 
+    def hr_zones
+      session = @fit_activity.sessions[0]
+
+      t = FlexiTable.new
+      t.head
+      t.row([ 'Zone', 'Exertion', 'Min. HR [bpm]', 'Max. HR [bpm]',
+              'Time in Zone', '% of Time in Zone' ])
+      t.set_column_attributes([
+        { :halign => :right },
+        { :halign => :left},
+        { :halign => :right },
+        { :halign => :right },
+        { :halign => :right },
+        { :halign => :right },
+      ])
+      t.body
+
+      # Calculate the total time in all the 5 relevant zones. We'll need this
+      # later as the basis for the percentage values.
+      total_secs = 0
+      zones = gather_hr_zones
+
+      zones.each do |zone|
+        t.cell(zone.index + 1)
+        t.cell([ 'Warm Up', 'Easy', 'Aerobic', 'Threshold', 'Maximum' ][zone.index])
+        t.cell(zone.low)
+        t.cell(zone.high)
+        t.cell(secsToHMS(zone.time_in_zone))
+        t.cell('%.0f%%' % zone.percent_in_zone)
+
+        t.new_row
+      end
+
+      t
+    end
+
+    def has_hr_zones?
+      # Depending on the age of the device we may have heart rate zone data
+      # with zone boundaries, without zone boundaries or no data at all.
+      if @fit_activity.heart_rate_zones.empty?
+        # The FIT file has no heart_rate_zone records. It might have a
+        # time_in_hr_zone record for the session.
+        counted_zones = 0
+        total_time_in_zone = 0
+        each_hr_zone_with_index do |secs_in_zone, i|
+          if secs_in_zone
+            counted_zones += 1
+            total_time_in_zone += secs_in_zone
+          end
+        end
+
+        return counted_zones == 5 && total_time_in_zone > 0.0
+      else
+        # The FIT file has explicit heart_rate_zones records. We need the
+        # session record that has type 19.
+        @fit_activity.heart_rate_zones.each do |hrz|
+          if hrz.type == 18 && hrz.heart_rate_zones &&
+             !hrz.heart_rate_zones.empty?
+            return true
+          end
+        end
+      end
+    end
+
+    def gather_hr_zones
+      zones = []
+
+      if @fit_activity.heart_rate_zones.empty?
+        # The FIT file has no heart_rate_zone records. It might have a
+        # time_in_hr_zone record for the session.
+        counted_zones = 0
+        total_time_in_zone = 0
+        each_hr_zone_with_index do |secs_in_zone, i|
+          if secs_in_zone
+            counted_zones += 1
+            total_time_in_zone += secs_in_zone
+          end
+        end
+
+        if counted_zones == 5 && total_time_in_zone > 0.0
+          session = @fit_activity.sessions[0]
+          hr_mins = HRZoneDetector::detect_zones(
+            @fit_activity.records, session.time_in_hr_zone[0..5])
+          0.upto(4) do |i|
+            low = hr_mins[i + 1]
+            high = i == HRZoneDetector::GARMIN_ZONES - 1 ?
+              session.max_heart_rate || '-' :
+              hr_mins[i + 2].nil? || hr_mins[i + 2] == 0 ? '-' :
+              (hr_mins[i + 2] - 1)
+            tiz = @fit_activity.sessions[0].time_in_hr_zone[i + 1]
+            piz = tiz / total_time_in_zone * 100.0
+            zones << HRZone.new(i, low, high, tiz, piz)
+          end
+        end
+      else
+        @fit_activity.heart_rate_zones.each do |zone|
+          if zone.type == 18
+            total_time = 0.0
+            if zone.time_in_hr_zone
+              zone.time_in_hr_zone.each { |tiz| total_time += tiz }
+            end
+            break if total_time <= 0.0
+            if zone.heart_rate_zones
+              zone.heart_rate_zones.each_with_index do |hr, i|
+                break if i > 4
+                zones << HRZone.new(i, hr, zone.heart_rate_zones[i + 1],
+                                    zone.time_in_hr_zone[i + 1],
+                                    zone.time_in_hr_zone[i + 1] /
+                                    total_time * 100.0)
+              end
+            end
+            break
+          end
+        end
+      end
+
+      zones
+    end
+
+    def each_hr_zone_with_index
+      return unless (zones = @fit_activity.sessions[0].time_in_hr_zone)
+
+      zones.each_with_index do |secs_in_zone, i|
+        # There seems to be a zone 0 in the FIT files that isn't displayed on
+        # the watch or Garmin Connect. Just ignore it.
+        next if i == 0
+        # There are more zones in the FIT file, but they are not displayed on
+        # the watch or on the GC.
+        break if i >= 6
+
+        yield(secs_in_zone, i)
+      end
+    end
+
     def local_value(fdr, field, format, units)
       unit = units[@unit_system]
       value = fdr.get_as(field, unit)

data/lib/postrunner/ChartView.rb

@@ -75,6 +75,13 @@ module PostRunner
           :colors => '#900000',
           :show => false
         },
+        {
+          :id => 'performance_condition',
+          :label => 'Performance Condition',
+          :graph => :line_graph,
+          :colors => '#7CB7E7',
+          :show => true
+        },
         {
           :id => 'run_cadence',
           :label => 'Run Cadence',

data/lib/postrunner/HRZoneDetector.rb

@@ -0,0 +1,77 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = HRZoneDetector.rb -- PostRunner - Manage the data from your Garmin sport devices.
+#
+# Copyright (c) 2017 by Chris Schlaeger <cs@taskjuggler.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+
+module PostRunner
+
+  module HRZoneDetector
+
+    # Number of heart rate zones supported by Garmin devices.
+    GARMIN_ZONES = 5
+    # Maximum heart rate that can be stored in FIT files.
+    MAX_HR = 255
+
+    def HRZoneDetector::detect_zones(fit_records, secs_in_zones)
+      if fit_records.empty?
+        raise RuntimeError, "records must not be empty"
+      end
+      if secs_in_zones.size != GARMIN_ZONES + 1
+        raise RuntimeError, "secs_in_zones must have #{GARMIN_ZONES + 1} " +
+          "elements"
+      end
+
+      # We generate a histogram of the time spent at each integer heart rate.
+      histogram = Array.new(MAX_HR + 1, 0)
+
+      last_timestamp = nil
+      fit_records.each do |record|
+        next unless record.heart_rate
+
+        if last_timestamp
+          # We ignore all intervals that are larger than 10 seconds. This
+          # potentially conflicts with smart recording, but I can't see how a
+          # larger sampling interval can yield usable results.
+          if (delta_t = record.timestamp - last_timestamp) <= 10
+            histogram[record.heart_rate] += delta_t
+          end
+        end
+        last_timestamp = record.timestamp
+      end
+
+      # We'll process zones 5 downto 1.
+      zone = GARMIN_ZONES
+      hr_mins = Array.new(GARMIN_ZONES)
+      # Sum of time spent in current zone.
+      secs_in_current_zone = 0
+      # We process the histogramm from highest to smallest HR value. Whenever
+      # we have accumulated the provided amount of time we have found a HR
+      # zone boundary. We complete the current zone and continue with the next
+      # one.
+      MAX_HR.downto(0) do |i|
+        secs_in_current_zone += histogram[i]
+
+        if secs_in_current_zone > secs_in_zones[zone]
+          # In case we have collected more time than was specified for the
+          # zone we carry the delta over to the next zone.
+          secs_in_current_zone -= secs_in_zones[zone]
+          # puts "Zone #{zone}: #{secs_in_current_zone}  #{secs_in_zones[zone]}"
+          break if (zone -= 1) < 0
+        end
+        hr_mins[zone] = i
+      end
+
+      hr_mins
+    end
+
+  end
+
+end
+

data/lib/postrunner/Main.rb

@@ -92,6 +92,8 @@ module PostRunner
                     "#{VERSION}!")
         end
         return -1
+      ensure
+        @db.exit if @db
       end
     end
 
@@ -103,7 +105,7 @@ module PostRunner
 
         opts.separator <<"EOT"
 
-Copyright (c) 2014, 2015, 2016 by Chris Schlaeger
+Copyright (c) 2014, 2015, 2016, 2017 by Chris Schlaeger
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of version 2 of the GNU General Public License as published by the

data/lib/postrunner/PersonalRecords.rb

@@ -346,6 +346,9 @@ module PostRunner
       # meters)
       speed_records = {}
 
+      # Ignore FIT files that don't have an activity or session
+      return unless activity.fit_activity && activity.fit_activity.sessions
+
       segment_start_time = activity.fit_activity.sessions[0].start_time
       segment_start_distance = 0.0
 

data/lib/postrunner/version.rb

@@ -3,7 +3,7 @@
 #
 # = version.rb -- PostRunner - Manage the data from your Garmin sport devices.
 #
-# Copyright (c) 2014, 2015, 2016 by Chris Schlaeger <cs@taskjuggler.org>
+# Copyright (c) 2014, 2015, 2016, 2017 by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
@@ -11,5 +11,5 @@
 #
 
 module PostRunner
-  VERSION = '0.7.5'
+  VERSION = '0.8.0'
 end

data/postrunner.gemspec

@@ -10,14 +10,15 @@ GEM_SPEC = Gem::Specification.new do |spec|
   spec.email         = ["cs@taskjuggler.org"]
   spec.summary       = %q{Application to manage and analyze Garmin FIT files.}
   spec.description   = %q{PostRunner is an application to manage FIT files
-such as those produced by Garmin products like the Forerunner 620 (FR620) and
-Fenix 3 or Fenix 3HR. It allows you to import the files from the device and
-analyze the data. In addition to the common features like plotting pace, heart
-rates, elevation and other captured values it also provides a heart rate
-variability (HRV) analysis. It can also update satellite orbit prediction
-(EPO) data on the device to speed-up GPS fix times. It is an offline alternative
-to Garmin Connect. The software has been developed and tested on Linux but
-should work on other operating systems as well.}
+such as those produced by Garmin products like the Forerunner 620 (FR620),
+Fenix 3, Fenix 3HR, Fenix 5 (S and X). It allows you to import the files from
+the device and analyze the data. In addition to the common features like
+plotting pace, heart rates, elevation and other captured values it also
+provides a heart rate variability (HRV) and sleep analysis. It can also update
+satellite orbit prediction (EPO) data on the device to speed-up GPS fix times.
+It is an offline alternative to Garmin Connect. The software has been
+developed and tested on Linux but should work on other operating systems as
+well.}
   spec.homepage      = 'https://github.com/scrapper/postrunner'
   spec.license       = "GNU GPL version 2"
 
@@ -27,8 +28,8 @@ should work on other operating systems as well.}
   spec.require_paths = ["lib"]
   spec.required_ruby_version = '>=2.0'
 
-  spec.add_dependency 'fit4ruby', '~> 1.5.1'
-  spec.add_dependency 'perobs', '~> 2.4.1'
+  spec.add_dependency 'fit4ruby', '~> 1.6.0'
+  spec.add_dependency 'perobs', '~> 3.0.1'
   spec.add_dependency 'nokogiri', '~> 1.6'
 
   spec.add_development_dependency 'bundler', '~> 1.6'

data/spec/PostRunner_spec.rb

@@ -31,7 +31,9 @@ describe PostRunner::Main do
       $stderr = old_stderr
     end
 
-    { :retval => retval, :stdout => stdout.string, :stderr => stderr.string }
+    stdout.rewind
+    stderr.rewind
+    { :retval => retval, :stdout => stdout.read, :stderr => stderr.read}
   end
 
   before(:all) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postrunner
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.8.0
 platform: ruby
 authors:
 - Chris Schlaeger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-26 00:00:00.000000000 Z
+date: 2017-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fit4ruby
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: perobs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: 3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -110,14 +110,15 @@ dependencies:
         version: 0.8.7
 description: |-
   PostRunner is an application to manage FIT files
-  such as those produced by Garmin products like the Forerunner 620 (FR620) and
-  Fenix 3 or Fenix 3HR. It allows you to import the files from the device and
-  analyze the data. In addition to the common features like plotting pace, heart
-  rates, elevation and other captured values it also provides a heart rate
-  variability (HRV) analysis. It can also update satellite orbit prediction
-  (EPO) data on the device to speed-up GPS fix times. It is an offline alternative
-  to Garmin Connect. The software has been developed and tested on Linux but
-  should work on other operating systems as well.
+  such as those produced by Garmin products like the Forerunner 620 (FR620),
+  Fenix 3, Fenix 3HR, Fenix 5 (S and X). It allows you to import the files from
+  the device and analyze the data. In addition to the common features like
+  plotting pace, heart rates, elevation and other captured values it also
+  provides a heart rate variability (HRV) and sleep analysis. It can also update
+  satellite orbit prediction (EPO) data on the device to speed-up GPS fix times.
+  It is an offline alternative to Garmin Connect. The software has been
+  developed and tested on Linux but should work on other operating systems as
+  well.
 email:
 - cs@taskjuggler.org
 executables:
@@ -154,6 +155,7 @@ files:
 - lib/postrunner/FitFileStore.rb
 - lib/postrunner/FlexiTable.rb
 - lib/postrunner/HRV_Analyzer.rb
+- lib/postrunner/HRZoneDetector.rb
 - lib/postrunner/HTMLBuilder.rb
 - lib/postrunner/LinearPredictor.rb
 - lib/postrunner/Log.rb
@@ -339,7 +341,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: Application to manage and analyze Garmin FIT files.
@@ -351,4 +353,3 @@ test_files:
 - spec/PostRunner_spec.rb
 - spec/View_spec.rb
 - spec/spec_helper.rb
-has_rdoc: