3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-06-02 02:42:05 +02:00
Code Issues Projects Releases Packages Wiki Activity

[ui] simplify loading of statistics file

Browse source 
* NodeLog: remove intermediate property for Loader
* StatViewer
   * keep only one function to load source file
   * only send request only after the previous one fully completed
  * update deltaTime before initializing charts
  * reset "sourceModified" property when source changes
This commit is contained in:
Yann Lanthony 2019-08-06 10:22:40 +02:00
parent 1822bbe13d
commit bedda0c5b6
No known key found for this signature in database
GPG key ID: 519FAE6DF7A70642
2 changed files with 29 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

59
meshroom/ui/qml/GraphEditor/StatViewer.qml
View file

@ -15,7 +15,7 @@ Item {
property var sourceModified: undefined
property var jsonObject
property int nbReads: 1
property var deltaTime: 1
property real deltaTime: 1
property var cpuLineSeries: []
property int nbCores: 0
@ -64,47 +64,47 @@ Item {
"#BF360C"
]
onSourceChanged: function() {
onSourceChanged: {
sourceModified = undefined;
resetCharts()
readSourceFile()
}
Timer {
interval: root.deltaTime * 60000; running: true; repeat: true
onTriggered: function() {
var xhr = new XMLHttpRequest;
xhr.open("GET", source);
id: reloadTimer
interval: root.deltaTime * 60000; running: true; repeat: false
onTriggered: readSourceFile()
xhr.onreadystatechange = function() {
if (xhr.readyState === XMLHttpRequest.DONE) {
if(sourceModified === undefined || sourceModified < xhr.getResponseHeader('Last-Modified')) {
var jsonString = xhr.responseText;
jsonObject= JSON.parse(jsonString);
root.jsonObject = jsonObject;
resetCharts()
sourceModified = xhr.getResponseHeader('Last-Modified')
root.createCharts()
}
}
};
xhr.send();
}
}
function readSourceFile() {
if(!Filepath.urlToString(source).endsWith("statistics"))
return;
var xhr = new XMLHttpRequest;
xhr.open("GET", source);
xhr.onreadystatechange = function() {
if (xhr.readyState === XMLHttpRequest.DONE) {
var jsonString = xhr.responseText;
if (xhr.readyState === XMLHttpRequest.DONE && xhr.status == 200) {
jsonObject= JSON.parse(jsonString);
root.jsonObject = jsonObject;
if(sourceModified === undefined || sourceModified < xhr.getResponseHeader('Last-Modified')) {
var jsonObject;
root.createCharts()
try {
jsonObject = JSON.parse(xhr.responseText);
}
catch(exc)
{
console.warning("Failed to parse statistics file: " + source)
root.jsonObject = {};
return;
}
root.jsonObject = jsonObject;
resetCharts();
sourceModified = xhr.getResponseHeader('Last-Modified')
root.createCharts();
reloadTimer.restart();
}
}
};
xhr.send();
@ -119,16 +119,13 @@ Item {
}
function createCharts() {
root.deltaTime = jsonObject.interval / 60.0;
initCpuChart()
initRamChart()
initGpuChart()
root.deltaTime = jsonObject.interval /60
}
/**************************
*** CPU ***
**************************/