Commit cb6dedc3 authored by Marc Duez's avatar Marc Duez

cidjil.cpp/export.js : export vidjil soft version

parent d5286cc2
......@@ -641,14 +641,19 @@ int main (int argc, char **argv)
//////////////////////////////////
// Display version information or git log
string soft_version = "vidjil ";
#ifdef RELEASE_TAG
cout << "# version: vidjil " << RELEASE_TAG << endl ;
soft_version.append(": ");
soft_version.append(RELEASE_TAG);
#else
cout << "# development version" << endl ;
#endif
#ifdef GIT_VERSION
cout << "# git: " << GIT_VERSION << endl ;
soft_version.append(": ");
soft_version.append(GIT_VERSION);
#endif
......@@ -1230,6 +1235,9 @@ int main (int argc, char **argv)
JsonArray json_timestamp;
json_timestamp.add(time_buffer);
JsonArray json_soft;
json_soft.add(soft_version);
JsonArray json_log;
json_log.add(stream_segmentation_info.str());
......@@ -1244,7 +1252,8 @@ int main (int argc, char **argv)
json_samples=new JsonList();
json_samples->add("number", 1);
json_samples->add("original_names", json_original_names);
//json_samples->add("vidjil_timestamp", json_timestamp);
json_samples->add("run_timestamp", json_timestamp);
json_samples->add("producer", json_soft);
json_samples->add("log", json_log);
json_samples->add("commandline", json_cmdline);
......
......@@ -148,9 +148,15 @@ Report.prototype = {
var sinfo = this.container("Sample info ("+m.getStrTime(time)+")")
var left = $('<div/>', {class: 'flex'}).appendTo(sinfo);
var soft_version = "unknow"
if (typeof m.samples.producer != 'undefined')
soft_version = m.samples.producer[time]
var command = "unknow"
if (typeof m.samples.commandline != 'undefined')
command = m.samples.commandline[time]
var sample_timestamp = "unknow"
if (typeof m.samples.run_timestamp != 'undefined')
sample_timestamp = m.samples.run_timestamp[time]
var label = $('<div/>', {class: 'float-left'}).appendTo(left);
$('<div/>', {class: 'case label', text : "Filename:" }).appendTo(label);
......@@ -162,9 +168,9 @@ Report.prototype = {
var value = $('<div/>', {class: 'float-left'}).appendTo(left);
$('<div/>', {class: 'case', text : m.samples.original_names[time]}).appendTo(value);
$('<div/>', {class: 'case', text : m.getSampleTime(time)}).appendTo(value);
$('<div/>', {class: 'case', text : ""}).appendTo(value);
$('<div/>', {class: 'case', text : soft_version}).appendTo(value);
$('<div/>', {class: 'case', text : command}).appendTo(value);
$('<div/>', {class: 'case', text : ""}).appendTo(value);
$('<div/>', {class: 'case', text : sample_timestamp}).appendTo(value);
var note = $('<div/>', {class: 'float-left'}).appendTo(left);
$('<div/>', {class: 'case label', text : "User note" }).appendTo(note);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment