Merge branch 'User-Configurable-Time'

p'"

This reverts commit a681053, reversing
changes made to 6b02ca2.

Author: Gary Keeble

index.html

@@ -196,7 +196,15 @@ <h4>Zoom</h4>
                 <div class="form-inline">
                     <div class="form-group">
                         <div class="graph-zoom-control btn-group btn-group-vertical"></div> 
-                        <input type="text" class="form-control graph-zoom" value="1.0" size="6">
+                        <input type="text" class="form-control graph-zoom" value="-" size="6">
+                    </div>
+                </div>
+            </li>
+            <li class="log-chart-time-panel">
+                <h4>Time</h4>
+                <div class="form-inline">
+                    <div class="form-group">
+                        <input type="text" class="form-control graph-time" value="1.0" size="8">
                     </div>
                 </div>
             </li>

js/grapher.js

@@ -438,6 +438,8 @@ function FlightLogGrapher(flightLog, graphConfig, canvas, craftCanvas, options)
             frameLabelTextWidthFrameTime = canvasContext.measureText("00:00.000").width;
 
         canvasContext.fillText(formatTime(timeMsec, true), canvas.width - frameLabelTextWidthFrameTime - 8, canvas.height - 8 - drawingParams.fontSizeFrameLabel - 8);
+        // update time field on toolbar
+        $(".graph-time").val(formatTime(timeMsec, true));
     }
 
     /**

js/main.js

@@ -748,7 +748,23 @@ function BlackboxLogViewer() {
             }
         });
 
-        
+        // Add user configurable start time
+        $(".graph-time").change(function() {
+
+            // the log is offset by the minTime
+            var newTime = stringTimetoMsec($(".graph-time").val());
+                   
+            if (!isNaN(newTime)) {
+                if (hasVideo) {
+                    setVideoTime(newTime / 1000000 + videoOffset);
+                } else {
+                    newTime += flightLog.getMinTime();
+                    setCurrentBlackboxTime(newTime);
+                }
+                invalidateGraph();               
+            }
+        });
+       
         var 
             graphConfigDialog = new GraphConfigurationDialog($("#dlgGraphConfiguration"), function(newConfig) {
                 graphConfig = newConfig;
@@ -845,8 +861,12 @@ function BlackboxLogViewer() {
 
         $(document).keydown(function(e) {
             var shifted = (e.altKey || e.shiftKey || e.ctrlKey || e.metaKey);
-
-            if (graph && $(e.target).parents('.modal').length == 0) {
+            if(e.which === 13 && e.target.type === 'text' && $(e.target).parents('.modal').length == 0) {
+                // pressing return on a text field clears the focus.
+                $(e.target).blur();                
+            }
+            // keyboard controls are disabled on modal dialog boxes and text entry fields
+            if (graph && e.target.type != 'text' && $(e.target).parents('.modal').length == 0) {
                 switch (e.which) {
                     case "I".charCodeAt(0):
                         if (!(shifted)) {

js/tools.js

@@ -184,4 +184,20 @@ function formatTime(msec, displayMsec) {
 
     return (hours ? leftPad(hours, "0", 2) + ":" : "") + leftPad(mins, "0", 2) + ":" + leftPad(secs, "0", 2)
         + (displayMsec ? "." + leftPad(msec, "0", 3) : "");
+}
+
+function stringTimetoMsec(input) {
+    try {
+            var matches = input.match(/([0-9]+)(\D)*([0-9]+)*\D*([0-9]+)*/);
+
+            if(matches.length>2) { // there is a placeholder - either : or .
+                if(matches[2] == ':'){ // time has been entered MM:SS.SSS
+                   return matches[1] * 60 * 1000000 + ((matches[3])?matches[3]:0) * 1000000 + ((matches[4])?(matches[4] + "00").slice(0,3):0) * 1000 
+                } else {
+                   return matches[1] * 1000000 + ((matches[3])?(matches[3] + "00").slice(0,3):0) * 1000;
+                }
+            } else return matches[1] * 1000000;
+        } catch(e) {
+            return 0;
+        }
 }