Skip to content

Commit

Permalink
Add Status Bar
Browse files Browse the repository at this point in the history 
New Status bar shows log header information, sample rate, loop time,
flight mode and bookmarks.
  • Loading branch information
Gary Keeble committed May 16, 2016
1 parent 2755e99 commit 44e3119
Show file tree
Hide file tree
Showing 3 changed files with 210 additions and 17 deletions.
64 changes: 64 additions & 0 deletions css/main.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -470,3 +470,67 @@ progress {
.navbar-inverse .navbar-brand {
color: #EAEAEA;
}

#status-bar {
position: fixed;
bottom: 0px;
width: 88%;
height: 20px;
line-height: 20px;
padding: 0 10px 0 10px;
border-top: 1px solid #7d7d79;
background-color: #bfbeb5;
}

#status-bar div {
float: left;
padding-right: 10px;
margin-right: 10px;
border-right: 1px solid #7d7d79;
}

#status-bar .version {
float: right;
margin: 0;
padding: 0;
border: 0;
}

#status-bar .bookmark-1,
#status-bar .bookmark-2,
#status-bar .bookmark-3,
#status-bar .bookmark-4,
#status-bar .bookmark-5,
#status-bar .bookmark-6,
#status-bar .bookmark-7,
#status-bar .bookmark-8,
#status-bar .bookmark-9 {
background-color: red;
color : white;
padding-left: 0;
padding-right: 0;
width: 30px;
margin-right: 0px;
margin-left: 0px;
text-align: center;
visibility: hidden;
cursor: pointer;
}

#status-bar .marker-offset {
visibility: hidden;
cursor: pointer;
}

#status-bar .bookmark-clear {
background-color: blue;
color : white;
padding-left: 0;
padding-right: 0;
width: 60px;
margin-right: 0px;
margin-left: 0px;
text-align: center;
visibility: hidden;
cursor: pointer;
}
61 changes: 52 additions & 9 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,12 +146,6 @@ <h3 class="log-filename"></h3>
<p class="log-device-uid form-control-static"></p>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">Battery</label>
<div class="col-sm-9">
<p class="log-cells form-control-static"></p>
</div>
</div>
</div>
</div>

Expand Down Expand Up @@ -239,9 +233,6 @@ <h4>Time</h4>
<div class="form-group">
<input type="text" class="form-control graph-time" value="1.0" size="8">
</div>
<div class="form-group graph-time-marker-group">
<input type="text" class="form-control graph-time-marker" value="0" size="8">
</div>
</div>
</li>
<li class="log-sync-panel">
Expand Down Expand Up @@ -299,6 +290,58 @@ <h4>Field values</h4>
</tr>
</table>
</div>

<div id="status-bar">
<div>
<span class="version">-</span>
</div>
<div>
<span class="log-cells">-</span>
</div>
<div>
<span class="looptime">-</span>
</div>
<div>
<span class="lograte">-</span>
</div>
<div>
<span class="flight-mode">-</span>
</div>
<div>
<span class="marker-offset">00:00.000</span>
</div>
<div class="bookmark-1">
<span>1</span>
</div>
<div class="bookmark-2">
<span>2</span>
</div>
<div class="bookmark-3">
<span>3</span>
</div>
<div class="bookmark-4">
<span>4</span>
</div>
<div class="bookmark-5">
<span>5</span>
</div>
<div class="bookmark-6">
<span>6</span>
</div>
<div class="bookmark-7">
<span>7</span>
</div>
<div class="bookmark-8">
<span>8</span>
</div>
<div class="bookmark-9">
<span>9</span>
</div>
<div class="bookmark-clear">
<span>Clear All</span>
</div>
</div>

</div>
<!-- /container -->

Expand Down
102 changes: 94 additions & 8 deletions js/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,12 +134,13 @@ function BlackboxLogViewer() {

if (frame) {

var currentFlightMode = frame[flightLog.getMainFieldIndexByName("flightModeFlags")];

if(hasTable) { // Only redraw the table if it is enabled

var
rows = [],
rowCount = Math.ceil(fieldNames.length / 2),
currentFlightMode = frame[flightLog.getMainFieldIndexByName("flightModeFlags")];
rowCount = Math.ceil(fieldNames.length / 2);

for (i = 0; i < rowCount; i++) {
var
Expand All @@ -164,14 +165,21 @@ function BlackboxLogViewer() {
}

table.append(rows.join(""));

}

// update time field on toolbar

// Update flight mode flags on status bar
$("#status-bar .flight-mode").text(
fieldPresenter.decodeFieldToFriendly(null, 'flightModeFlags', currentFlightMode, null)
);

// update time field on status bar
$(".graph-time").val(formatTime((currentBlackboxTime-flightLog.getMinTime())/1000, true));
if(hasMarker) {
$(".graph-time-marker").val(formatTime((currentBlackboxTime-markerTime)/1000, true));
$("#status-bar .marker-offset").text('Marker Offset ' + formatTime((currentBlackboxTime-markerTime)/1000, true) + 'ms');
}


// Update the Legend Values
if(graphLegend) graphLegend.updateValues(flightLog, frame);
}
Expand Down Expand Up @@ -313,7 +321,7 @@ function BlackboxLogViewer() {
*/
function renderSelectedLogInfo() {
$(".log-index").val(flightLog.getLogIndex());

if (flightLog.getNumCellsEstimate()) {
$(".log-cells").text(flightLog.getNumCellsEstimate() + "S (" + Number(flightLog.getReferenceVoltageMillivolts() / 1000).toFixed(2) + "V)");
$(".log-cells-header,.log-cells").css('display', 'block');
Expand All @@ -328,6 +336,12 @@ function BlackboxLogViewer() {
$(".log-device-uid-header,.log-device-uid").css('display', 'none');
}

// Add log version information to status bar
var sysConfig = flightLog.getSysConfig();
$('#status-bar .version').text( ((sysConfig['Firmware revision']!=null)?(sysConfig['Firmware revision']):''));
$('#status-bar .looptime').text( ((sysConfig['loopTime']!=null)?(sysConfig['loopTime'] +'us (' + (1000000/sysConfig['loopTime']).toFixed(0) + 'Hz)'):''));
$('#status-bar .lograte').text( ((sysConfig['frameIntervalPDenom']!=null && sysConfig['frameIntervalPNum']!=null)?( 'Logging Sample Rate : ' + sysConfig['frameIntervalPNum'] +'/' + sysConfig['frameIntervalPDenom']):''));

seekBar.setTimeRange(flightLog.getMinTime(), flightLog.getMaxTime(), currentBlackboxTime);
seekBar.setActivityRange(flightLog.getSysConfig().minthrottle, flightLog.getSysConfig().maxthrottle);

Expand Down Expand Up @@ -954,6 +968,65 @@ function BlackboxLogViewer() {

keysDialog.show();
});

$("#status-bar .marker-offset").click(function(e) {
setCurrentBlackboxTime(markerTime);
invalidateGraph();
});

$('#status-bar .bookmark-1').click(function(e) {
setCurrentBlackboxTime(bookmarkTimes[1]);
invalidateGraph();
});

$('#status-bar .bookmark-2').click(function(e) {
setCurrentBlackboxTime(bookmarkTimes[2]);
invalidateGraph();
});

$('#status-bar .bookmark-3').click(function(e) {
setCurrentBlackboxTime(bookmarkTimes[3]);
invalidateGraph();
});

$('#status-bar .bookmark-4').click(function(e) {
setCurrentBlackboxTime(bookmarkTimes[4]);
invalidateGraph();
});

$('#status-bar .bookmark-5').click(function(e) {
setCurrentBlackboxTime(bookmarkTimes[5]);
invalidateGraph();
});

$('#status-bar .bookmark-6').click(function(e) {
setCurrentBlackboxTime(bookmarkTimes[6]);
invalidateGraph();
});

$('#status-bar .bookmark-7').click(function(e) {
setCurrentBlackboxTime(bookmarkTimes[7]);
invalidateGraph();
});

$('#status-bar .bookmark-8').click(function(e) {
setCurrentBlackboxTime(bookmarkTimes[8]);
invalidateGraph();
});

$('#status-bar .bookmark-9').click(function(e) {
setCurrentBlackboxTime(bookmarkTimes[9]);
invalidateGraph();
});

$('#status-bar .bookmark-clear').click(function(e) {
bookmarkTimes = null;
for(var i=1; i<=9; i++) {
$('#status-bar .bookmark-'+ i).css('visibility', 'hidden' );
}
$('#status-bar .bookmark-clear').css('visibility', 'hidden' );
invalidateGraph();
});

if (FlightLogVideoRenderer.isSupported()) {
$(".btn-video-export").click(function(e) {
Expand Down Expand Up @@ -1038,15 +1111,17 @@ function BlackboxLogViewer() {
case "M".charCodeAt(0):
if (e.altKey && hasMarker && hasVideo && hasLog) { // adjust the video sync offset and remove marker
try{
setVideoOffset(videoOffset + (stringTimetoMsec($(".graph-time-marker").val()) / 1000000), true);
setVideoOffset(videoOffset + (stringTimetoMsec($("#status-bar .marker-offset").text()) / 1000000), true);
} catch(e) {
console.log('Failed to set video offset');
}
} else { // Add a marker to graph window
markerTime = currentBlackboxTime;
$(".graph-time-marker").val(formatTime(0));
$("#status-bar .marker-offset").text('Marker Offset ' + formatTime(0) + 'ms');

}
setMarker(!hasMarker);
$("#status-bar .marker-offset").css('visibility', (hasMarker)?'visible':'hidden');
invalidateGraph();
e.preventDefault();
break;
Expand Down Expand Up @@ -1084,13 +1159,24 @@ function BlackboxLogViewer() {
// Special Case : Shift Alt 0 clears all bookmarks
if(e.which==48) {
bookmarkTimes = null;
for(var i=1; i<=9; i++) {
$('#status-bar .bookmark-'+ i).css('visibility', 'hidden' );
}
$('#status-bar .bookmark-clear').css('visibility', 'hidden' );
} else {
if(bookmarkTimes==null) bookmarkTimes = new Array();
if (bookmarkTimes[e.which-48] == null) {
bookmarkTimes[e.which-48] = currentBlackboxTime; // Save current time to bookmark
} else {
bookmarkTimes[e.which-48] = null; // clear the bookmark
}
$('#status-bar .bookmark-'+(e.which-48)).css('visibility', ((bookmarkTimes[e.which-48]!=null)?('visible'):('hidden')) );
var countBookmarks = 0;
for(var i=0; i<=9; i++) {
countBookmarks += (bookmarkTimes[i]!=null)?1:0;
}
$('#status-bar .bookmark-clear').css('visibility', ((countBookmarks>0)?('visible'):('hidden')) );

}
invalidateGraph();
}
Expand Down

0 comments on commit 44e3119

Please sign in to comment.