async? async!
This commit is contained in:
@@ -1,8 +1,6 @@
|
|||||||
var globalObject;
|
var globalObject;
|
||||||
$('#update').click(function () {
|
$('#update').click(function () {
|
||||||
updateData();
|
updateData();
|
||||||
fillTable(globalObject, $('table'));
|
|
||||||
graphSpectralData(globalObject, $('#spectrogram'));
|
|
||||||
});
|
});
|
||||||
// jQuery event binder
|
// jQuery event binder
|
||||||
|
|
||||||
@@ -12,7 +10,10 @@ function updateData () {
|
|||||||
// I understand how bad this line looks. Please don't judge me...
|
// I understand how bad this line looks. Please don't judge me...
|
||||||
$.get(url, function (data, status) { // standard jQuery AJAX
|
$.get(url, function (data, status) { // standard jQuery AJAX
|
||||||
globalObject = data;
|
globalObject = data;
|
||||||
console.log(data);
|
})
|
||||||
|
.done(function () {
|
||||||
|
fillTable(globalObject, $('table'));
|
||||||
|
graphSpectralData(globalObject, $('#spectrogram'));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -29,10 +30,10 @@ function graphSpectralData(obj, dom) {
|
|||||||
var chart = new Chart(dom, {
|
var chart = new Chart(dom, {
|
||||||
type: 'line',
|
type: 'line',
|
||||||
data: {
|
data: {
|
||||||
labels: obj[0].keys(),
|
labels: Object.keys(obj[0]),
|
||||||
datasets: [{
|
datasets: [{
|
||||||
label: 'Spectrometer data',
|
label: 'Spectrometer data',
|
||||||
data: obj[0].values()
|
data: Object.values(obj[0])
|
||||||
}]
|
}]
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -17,6 +17,7 @@
|
|||||||
<button id="update" class="btn btn-primary m-1 float-right">Get data</button>
|
<button id="update" class="btn btn-primary m-1 float-right">Get data</button>
|
||||||
<p id="debug">
|
<p id="debug">
|
||||||
</p>
|
</p>
|
||||||
|
<canvas id="spectrogram" width="720" height="720"></canvas>
|
||||||
<table class="table table-sm">
|
<table class="table table-sm">
|
||||||
<thead class="thead-dark">
|
<thead class="thead-dark">
|
||||||
<tr>
|
<tr>
|
||||||
|
|||||||
Reference in New Issue
Block a user