aboutsummaryrefslogtreecommitdiffstats
path: root/python/gui
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2018-12-19 16:29:39 +0100
committerMatthias P. Braendli <matthias.braendli@mpb.li>2018-12-19 16:29:39 +0100
commit49620ea6940543a875e0499a1554b33ffb85fa85 (patch)
tree9576eaa3311e56992168165245b20626941d7f78 /python/gui
parentf4ca82137e850e30d31e7008b34800d8b2699e5d (diff)
downloaddabmod-49620ea6940543a875e0499a1554b33ffb85fa85.tar.gz
dabmod-49620ea6940543a875e0499a1554b33ffb85fa85.tar.bz2
dabmod-49620ea6940543a875e0499a1554b33ffb85fa85.zip
GUI: Combine model plots into single plot
Diffstat (limited to 'python/gui')
-rw-r--r--python/gui/static/js/odr-predistortion.js13
-rw-r--r--python/gui/templates/predistortion.html13
2 files changed, 15 insertions, 11 deletions
diff --git a/python/gui/static/js/odr-predistortion.js b/python/gui/static/js/odr-predistortion.js
index 59dcd82..f46219c 100644
--- a/python/gui/static/js/odr-predistortion.js
+++ b/python/gui/static/js/odr-predistortion.js
@@ -43,18 +43,13 @@ function resultrefresh() {
$('#dpdcapturestats').attr('src', "");
}
- if (data['amplot']) {
- $('#dpdamplot').attr('src', data['amplot']);
- }
- else {
- $('#dpdamplot').attr('src', "");
- }
+ $('#dpdmodeldata').html(data['modeldata']);
- if (data['pmplot']) {
- $('#dpdpmplot').attr('src', data['pmplot']);
+ if (data['modelplot']) {
+ $('#dpdmodelplot').attr('src', data['modelplot']);
}
else {
- $('#dpdpmplot').attr('src', "");
+ $('#dpdmodelplot').attr('src', "");
}
});
diff --git a/python/gui/templates/predistortion.html b/python/gui/templates/predistortion.html
index d953dff..d102101 100644
--- a/python/gui/templates/predistortion.html
+++ b/python/gui/templates/predistortion.html
@@ -47,8 +47,17 @@
<div class="panel panel-default">
<div class="panel-heading">AM/AM and AM/PM Model</div>
<div class="panel-body">
- <img id="dpdamplot" />
- <img id="dpdpmplot" />
+ <div class="container-fluid">
+ <div class="row">
+ <div class="col-sm-2">
+ <p>Model data:</p>
+ </div>
+ <div class="col-sm-10">
+ <pre id="dpdmodeldata"></pre>
+ </div>
+ </div>
+ </div>
+ <img id="dpdmodelplot" />
</div>
</div>