#26, #27 - Minor changes.

applications/gps/GPS Watch/models/GPS Watch/Library/Tracking/Tracking.xtuml

@@ -614,9 +614,14 @@ INSERT INTO SPR_RS
 	VALUES ("ed04bab6-e3c0-4b26-966f-cd9f67796268",
 	'lapResetPressed',
 	'',
-	'select any workoutTimer from instances of WorkoutTimer;
+	'// Find the singleton instance of the workout timer 
+// and forward this signal, as an event, to it.
+
+select any workoutTimer from instances of WorkoutTimer;
 if (not empty workoutTimer)
   generate WorkoutTimer2:lapResetPressed() to workoutTimer;
+else
+  LOG::LogFailure( message:"Tracking:UI:lapResetPressed - No WorkoutTimer, so nothing to do." );
 end if;
 ',
 	1);
@@ -802,7 +807,12 @@ INSERT INTO SPR_RS
 	VALUES ("8481453b-752a-4e7c-ac84-b4ce7e52d397",
 	'heartRateChanged',
 	'',
-	'select any session from instances of WorkoutSession;
+	'// Find the singleton instance of the workout session
+// and forward this signal, as an event, to it.
+// If there is no active workout session, then this 
+// sample is simply ignored and not recorded.
+
+select any session from instances of WorkoutSession;
 if (not empty session)
   session.addHeartRateSample(heartRate: param.heartRate);
 end if;',

applications/gps/GPS Watch/models/GPS Watch/Library/Tracking/Tracking/Tracking.xtuml

@@ -650,7 +650,7 @@ INSERT INTO DIM_ND
 	"c85dddfc-7bfd-4a3a-924d-c08dfb7789fc");
 INSERT INTO DIM_GE
 	VALUES (4020.000000,
-	3012.000000,
+	2988.000000,
 	"c85dddfc-7bfd-4a3a-924d-c08dfb7789fc",
 	"00000000-0000-0000-0000-000000000000");
 INSERT INTO DIM_ELE
@@ -675,7 +675,7 @@ INSERT INTO DIM_CON
 INSERT INTO DIM_CON
 	VALUES ("1c984d5f-b52e-4939-9c2b-a85c90354056",
 	4220.000000,
-	3048.000000,
+	3047.000000,
 	"c85dddfc-7bfd-4a3a-924d-c08dfb7789fc");
 INSERT INTO GD_GE
 	VALUES ("17626a8c-5485-4483-a50d-c2aeb018ecea",
@@ -1072,7 +1072,7 @@ INSERT INTO DIM_ND
 	"40c3f186-2b44-4174-8bf2-8f036b5a1418");
 INSERT INTO DIM_GE
 	VALUES (4220.000000,
-	3049.000000,
+	3053.000000,
 	"40c3f186-2b44-4174-8bf2-8f036b5a1418",
 	"00000000-0000-0000-0000-000000000000");
 INSERT INTO DIM_ELE
@@ -1091,7 +1091,7 @@ INSERT INTO DIM_ND
 	"75a0a8f3-1b58-4555-83a2-c94327f6402c");
 INSERT INTO DIM_GE
 	VALUES (4377.000000,
-	2980.000000,
+	2991.000000,
 	"75a0a8f3-1b58-4555-83a2-c94327f6402c",
 	"00000000-0000-0000-0000-000000000000");
 INSERT INTO DIM_ELE
@@ -1138,7 +1138,7 @@ INSERT INTO GD_LS
 INSERT INTO DIM_WAY
 	VALUES ("9cb3540f-3851-4f83-bde8-59fe96be92fd",
 	4220.000000,
-	3048.000000,
+	3047.000000,
 	"61caeb60-d784-4cc9-9e84-f6fc041b2fdb",
 	"00000000-0000-0000-0000-000000000000",
 	"00000000-0000-0000-0000-000000000000");
@@ -1152,7 +1152,7 @@ INSERT INTO DIM_WAY
 INSERT INTO DIM_WAY
 	VALUES ("83cdcbe5-dfe9-47bc-921e-98e48983f76a",
 	4372.000000,
-	3050.000000,
+	3047.000000,
 	"61caeb60-d784-4cc9-9e84-f6fc041b2fdb",
 	"00000000-0000-0000-0000-000000000000",
 	"00000000-0000-0000-0000-000000000000");

applications/gps/GPS Watch/models/GPS Watch/Library/Tracking/Tracking/WorkoutTimer/WorkoutTimer.xtuml

@@ -1,18 +1,22 @@
--- BP 7.1 content: ModelClass syschar: 3 persistence-version: 7.1.6
+-- BP 7.1.6 content: ModelClass syschar: 3 persistence-version: 7.1.6
 
 INSERT INTO O_OBJ
 	VALUES ("8d4b82cf-ec16-4fd9-925b-0e51eb64a2f7",
 	'WorkoutTimer',
 	1,
 	'WorkoutTimer',
-	'The WorkoutTimer controls the lifecycle of workouts. There should
-never be more than one instance of this class at any time.
+	'As a singleton, no more than one instance of this class exists 
+at any given time.
 
-The WorkoutTimer has the responsibility to start and stop the GPS
-upon activation/deactivation of the timer.
+Along with managing the stopwatch portion of the application,
+this class also knows:
+- Track points are stored only when the stopwatch is running.
+- How to handle the lap/reset signal based on whether the 
+stopwatch is currently running.
 
-While being active, the WorkoutTimer should keep track of elapsed
-time. Time can only be reset while being inactive.  ',
+',
+	"00000000-0000-0000-0000-000000000000",
+	"c4cafc68-b5c2-f769-2746-b4aaac0bac84",
 	"00000000-0000-0000-0000-000000000000");
 INSERT INTO O_TFR
 	VALUES ("1363f0df-e630-4deb-a831-ed6cbcc9a974",