Merge branch 'govss' into elevationgain-computationfix

bundles/net.tourbook.chart/src/net/tourbook/chart/ChartComponentGraph.java

@@ -826,7 +826,7 @@ private boolean canChartBeOverlapped(final ArrayList<GraphDrawingData> allGraphD
       for (final GraphDrawingData graphDrawingData : allGraphDrawingData) {
 
          final ChartType chartType = graphDrawingData.getChartType();
-
+//TODO ASk wolfgang if we can support line and bars ?
          if (chartType != ChartType.LINE && chartType != ChartType.HORIZONTAL_BAR) {
             return false;
          }

bundles/net.tourbook.common/src/net/tourbook/common/UI.java

@@ -1302,7 +1302,7 @@ public static String nanoTime(final int nanoValue) {
    }
 
    /**
-    * Opens the control context menu, the menue is aligned below the control to the right side
+    * Opens the control context menu, the menu is aligned below the control to the right side
     *
     * @param control
     *           Controls which menu is opened

bundles/net.tourbook.device/src/net/tourbook/device/suunto/Suunto9DeviceDataReader.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (C) 2005, 2019 Wolfgang Schramm and Contributors
+ * Copyright (C) 2018, 2019 Frédéric Bard and Contributors
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License as published by the Free Software

bundles/net.tourbook.device/src/net/tourbook/device/suunto/Suunto9ImportPreferences.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (C) 2005, 2019 Wolfgang Schramm and Contributors
+ * Copyright (C) 2018, 2019 Frédéric Bard and Contributors
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License as published by the Free Software

bundles/net.tourbook.device/src/net/tourbook/device/suunto/SuuntoJsonProcessor.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (C) 2005, 2019 Wolfgang Schramm and Contributors
+ * Copyright (C) 2018, 2019 Frédéric Bard and Contributors
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License as published by the Free Software

bundles/net.tourbook/plugin.properties

@@ -42,6 +42,9 @@ Command_Device_ReceiveFromSerialPort_Directly_Tooltip    = Receive tours of a sp
 Command_GeoParts          = Compare Geo Tour
 Command_GeoParts_Mnemonic = o
 
+Command_PerformanceModelingChart          = Performance Modeling Chart
+Command_PerformanceModelingChart_Mnemonic = f
+
 Command_PicDir_History_Backward          = Backward History
 Command_PicDir_History_Forward           = Forward History
 Command_PicDir_ShowNaviationHistory      = Show Navigation History
@@ -89,13 +92,13 @@ Pref_Page_Views_Color       = Color
 Pref_Page_Weather           = Weather
 
 Product_about = MyTourbook\n\
-                \n\
-                Version: {0}\n\
-                \n\
-                (c) Copyright Wolfgang Schramm and Contributors 2005, {1}.\n\
-                All rights reserved.\n\
-                \n\
-                http://mytourbook.sourceforge.net
+\n\
+Version: {0}\n\
+\n\
+(c) Copyright Wolfgang Schramm and Contributors 2005, {1}.\n\
+All rights reserved.\n\
+\n\
+http://mytourbook.sourceforge.net
 
 Shortcut_Key_App_Calendar                 = M1+M2+C
 Shortcut_Key_App_ImportFromFile           = M1+I
@@ -296,6 +299,7 @@ preference_page_Chart_Colors   = Colors
 preference_page_Graphs         = Tour Chart
 preference_page_People         = People
 preference_page_Proxy          = Proxy
+preference_page_TrainingStress = Training Stress
 preference_page_appearance     = Appearance
 preference_page_computedValues = Computed Values
 preference_page_data_import    = Import
@@ -314,27 +318,30 @@ view_category_tour          = 2. Tour Properties
 view_category_tourDirectory = 1. Tour Directories
 view_category_tour_map      = 4. Maps
 
-view_name_Analyzer                  = Tour Analyzer
-view_name_Book                      = Tour Book
-view_name_Book_Mnemonic             = B
-view_name_Calendar                  = Calendar
-view_name_Calendar_Mnemonic         = C
-view_name_Chart                     = Tour Chart
-view_name_ChartProperty             = Chart Properties
-view_name_Compare_Result            = Compare Result
-view_name_Data_Import               = Tour Import
-view_name_Data_Import_Mnemonic      = I
-view_name_Marker                    = Tour Marker
-view_name_Marker_Mnemonic           = M
-view_name_ReferenceTours            = Reference Tours
-view_name_ReferenceTours_Mnemonic   = R
-view_name_Segmenter                 = Tour Segmenter
-view_name_Statistics                = Statistics
-view_name_Statistics_Mnemonic       = S
-view_name_map_properties            = Map Properties
-view_name_merge_tours               = Merge Tours
-view_name_tagView                   = Tagged Tours
-view_name_tourCatalog_comparedTour  = Compared Tour
-view_name_tourCatalog_referenceTour = Reference Tour
-view_name_tourCatalog_statistics    = Year Statistic
-view_name_tour_map                  = 2D Tour Map
+view_name_Analyzer                          = Tour Analyzer
+view_name_Book                              = Tour Book
+view_name_Book_Mnemonic                     = B
+view_name_Calendar                          = Calendar
+view_name_Calendar_Mnemonic                 = C
+view_name_Chart                             = Tour Chart
+view_name_ChartProperty                     = Chart Properties
+view_name_Compare_Result                    = Compare Result
+view_name_Data_Import                       = Tour Import
+view_name_Data_Import_Mnemonic              = I
+view_name_Marker                            = Tour Marker
+view_name_Marker_Mnemonic                   = M
+view_name_PerformanceModelingChart          = Performance Modeling Chart
+view_name_PerformanceModelingChart_Mnemonic = F
+view_name_ReferenceTours                    = Reference Tours
+view_name_ReferenceTours_Mnemonic           = R
+view_name_Segmenter                         = Tour Segmenter
+view_name_Statistics                        = Statistics
+view_name_Statistics_Mnemonic               = S
+view_name_Training_Stress                   = Training Stress
+view_name_map_properties                    = Map Properties
+view_name_merge_tours                       = Merge Tours
+view_name_tagView                           = Tagged Tours
+view_name_tourCatalog_comparedTour          = Compared Tour
+view_name_tourCatalog_referenceTour         = Reference Tour
+view_name_tourCatalog_statistics            = Year Statistic
+view_name_tour_map                          = 2D Tour Map

bundles/net.tourbook/plugin.xml

@@ -410,8 +410,8 @@
          id="net.tourbook.preferences.PrefPageStatistic"
          class="net.tourbook.preferences.PrefPageStatistic"
       />
-
-
+      
+      
       <!--
          View
       -->
@@ -745,10 +745,10 @@
                mnemonic="%command_tourCompare_wizard_mnemonic"/>
 
             <command
-               commandId   ="net.tourbook.command.GeoParts"
-               icon      ="icons/geo-parts.png"
-               label      ="%Command_GeoParts"
-               mnemonic   ="%Command_GeoParts_Mnemonic"/>
+               commandId="net.tourbook.command.GeoParts"
+               icon="icons/geo-parts.png"
+               label="%Command_GeoParts"
+               mnemonic="%Command_GeoParts_Mnemonic"/>
 
             <command
                commandId="command.net.tourbook.ui.views.TourChartSmoothingView"
@@ -769,6 +769,13 @@
                icon="icons/pulse-zones.png"
                label="%View_Name_Training"
                mnemonic="%View_Name_Training_Mnemonic"/>
+
+            <!-- Performance Chart -->
+            <command
+               commandId="net.tourbook.command.PerformanceModelingChartView"
+               icon="icons/performance-chart.png"
+               label="%Command_PerformanceModelingChart"
+               mnemonic="%Command_PerformanceModelingChart_Mnemonic"/>
 
             <!-- Conconi Test -->
             <command
@@ -906,6 +913,13 @@ THIS IS NOT YET FULLY IMPLEMENTED
                icon="icons/statistics.png"
                label="%view_name_Statistics"
                mnemonic="%view_name_Statistics_Mnemonic"/>
+
+            <!-- Performance Chart -->
+            <command 
+               commandId="net.tourbook.command.PerformanceModelingChartView"
+               icon="icons/performance-chart.png"
+               label="%view_name_PerformanceModelingChart"
+               mnemonic="%view_name_PerformanceModelingChart_Mnemonic"/>
 
          </toolbar>
       </menuContribution>
@@ -1137,7 +1151,7 @@ THIS IS NOT YET FULLY IMPLEMENTED
       </menuContribution>
 
    </extension>
-
+   
    <extension point="org.eclipse.ui.commands">
 
       <command
@@ -1315,7 +1329,13 @@ THIS IS NOT YET FULLY IMPLEMENTED
          name           ="%Command_GeoParts"
          defaultHandler ="net.tourbook.ui.views.geoCompare.ActionHandler_OpenView_GeoParts"
       />
-
+
+       <command
+         id             ="net.tourbook.command.PerformanceModelingChartView"
+         name           ="%Command_PerformanceModelingChart"
+         defaultHandler ="net.tourbook.ui.views.performanceModelingChart.ActionHandlerOpenViewPerformanceModelingChart"
+      />
+
       <command
          id             ="net.tourbook.command.tourChart.tool.graphAnalyzer"
          name           ="%command_tourChart_tool_graphAnalyzer"
@@ -1737,6 +1757,14 @@ THIS IS NOT YET FULLY IMPLEMENTED
             id          ="net.tourbook.training.TrainingView"
             name        ="%View_Name_Training"
          />
+
+         <view
+            category    ="net.tourbook.category.Tools"
+            class       ="net.tourbook.ui.views.performanceModelingChart.PerformanceModelingChartView"
+            icon        ="icons/performance-chart.png"
+            id          ="net.tourbook.ui.views.performanceModelingChart.PerformanceModelingChartView"
+            name        ="%view_name_PerformanceModelingChart"
+         />
 
 
       <!-- Compare tours -->