diff --git a/raspberry-backend/static/js/Chart-display.js b/raspberry-backend/static/js/Chart-display.js index b19a3eff216e5f772c182f7dea220c31bb27aca7..de0db844e918573755db99c39458c1f46f0cf47a 100644 --- a/raspberry-backend/static/js/Chart-display.js +++ b/raspberry-backend/static/js/Chart-display.js @@ -95,8 +95,11 @@ function requestChartVar() { url: '/live-data', success: function(point) { fio_reading = (point["pressure_buffer"]).toFixed(0) ; + p_plateau_reading = (point["pressure_inhale"]).toFixed(0) ; //console.log(fio_reading); - fio_gauge.data.datasets[0].gaugeData['value'] = fio_reading; + obj["fio_gauge"].data.datasets[0].gaugeData['value'] = fio_reading; + obj["p_plateau_gauge"].data.datasets[0].gaugeData['value'] = p_plateau_reading; + var seconds = point["timestamp"]/1000; // get difference between last time stamp and this and apply to existing points @@ -134,7 +137,9 @@ function requestChartVar() { chart_pressure.update(); chart_flow.update(); chart_volume.update(); - fio_gauge.update(); + obj["fio_gauge"].update(); + obj["p_plateau_gauge"].update(); + }, cache: false @@ -373,8 +378,8 @@ $(document).ready(function() { }); }); - -var ctx = document.getElementById("example_gauge").getContext("2d"); +/* +var ctx = document.getElementById("gauge_example").getContext("2d"); fio_gauge = new Chart(ctx, { type: "tsgauge", data: { @@ -392,4 +397,34 @@ fio_gauge = new Chart(ctx, { events: [] } }); +*/ + +var obj = {}; +function create_gauge_chart(var_name) { + var ctx = document.getElementById("gauge_"+var_name).getContext("2d"); + obj[var_name + "_gauge"] = new Chart(ctx, { + renderTo: 'gauge_' + var_name, + type: "tsgauge", + data: { + datasets: [{ + backgroundColor: ["#0fdc63", "#fd9704", "#ff7143"], + borderWidth: 0, + gaugeData: { + value: 0, + valueColor: "#ff7143" + }, + gaugeLimits: [0, 50, 100] + }] + }, + options: { + events: [] + } + }); + +} + +["fio", "p_plateau"].forEach(create_gauge_chart); + + + diff --git a/raspberry-backend/templates/index.html b/raspberry-backend/templates/index.html index a18751bcb4959dea688549dd0ab142819f0aff98..20f391ad228fb53d674ac88ee67b7260530e0e04 100644 --- a/raspberry-backend/templates/index.html +++ b/raspberry-backend/templates/index.html @@ -63,10 +63,10 @@ <div class="card-reading br-red"> <div class="card-header d-flex align-items-center justify-content-between py-1 min-height-1b"> - <a class="small text-dark col-center" href="#">FIO<sub>2</sub></a> + <a class="small text-dark col-center" href="#">FIO<sub>2</sub> (cmH2O) </a> </div> <!-- <div class="card-body px-1 py-1 tiny ml-auto mr-auto"><input class = "input-reading py-0" id = "fio2" value="62" type="number" readOnly disabled>%</div> --> - <div class = "main-chart-container"><canvas id="example_gauge"></canvas></div> + <div class = "main-chart-container"><canvas id="gauge_fio"></canvas></div> </div> <div class="card-reading"> @@ -82,9 +82,10 @@ <div class="card-reading"> <div class="card-header d-flex align-items-center justify-content-between py-1 min-height-1b"> - <a class="small text-dark col-center" href="#">P<sub>Plateau</sub></a><br> + <a class="small text-dark col-center" href="#">P<sub>Plateau</sub> (cmH2O) </a><br> </div> - <div class="card-body px-1 py-1 tiny ml-auto mr-auto"><input class = "input-reading" id = "p_plateau" value=4.0 readOnly disabled>cmH2O</div> + <!-- <div class="card-body px-1 py-1 tiny ml-auto mr-auto"><input class = "input-reading" id = "p_plateau" value=4.0 readOnly disabled>cmH2O</div> --> + <div class = "main-chart-container"><canvas id="gauge_p_plateau"></canvas></div> </div> <div class="card-reading"> <div class="card-header d-flex align-items-center justify-content-between py-1 min-height-1b"> @@ -156,10 +157,10 @@ {% block scripts %} <script type=text/javascript> +/* function update_variables() { $.getJSON("live-data", function (data) { -/* document.getElementById("pressure_buffer").innerHTML = data.pressure_buffer.toPrecision(5); document.getElementById("pressure_inhale").innerHTML = data.pressure_inhale.toPrecision(5); //document.getElementById("temperature_buffer").innerHTML = data.temperature_buffer.toPrecision(5); @@ -171,7 +172,7 @@ document.getElementById("pressure_diff_patient").innerHTML = data.pressure_diff_patient.toPrecision(5); document.getElementById("fsm_state").innerHTML = data.fsm_state.toPrecision(1); //document.getElementById("version").innerHTML = data.version.toPrecision(1); //Commented because not included in the html part -*/ + //document.getElementById("pressure_buffer").innerHTML = (data.pressure_buffer).toFixed(2); //document.getElementById("pressure_inhale").innerHTML = (data.pressure_inhale).toFixed(2); //document.getElementById("temperature_buffer").innerHTML = (data.temperature_buffer).toFixed(2); @@ -187,6 +188,7 @@ ); } setInterval('update_variables()', 1000); +*/ </script>