From 0c96577f06a3417b5c975cb4ec28e065be7951e3 Mon Sep 17 00:00:00 2001
From: Jacob Wikmark <jacob@wikmark.se>
Date: Fri, 9 Mar 2018 12:20:41 +0100
Subject: [PATCH] proper time axis
---
src/tanklabgui.jl | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/tanklabgui.jl b/src/tanklabgui.jl
index 40f0395..7804572 100644
--- a/src/tanklabgui.jl
+++ b/src/tanklabgui.jl
@@ -52,20 +52,23 @@ function makegui(P, plottingframerate = 10, guiframerate = 10)
Node(:div, tankg, id="tanks", attributes=tankattr)
end
+ glnv = (0:maxplotlength)*P.h
w2, graphic2 = @construct for
plotdummy in checkbox(false, label="This button does nothing")
- if length(gui.data[1])>maxplotlength
- start = length(gui.data[1])-maxplotlength
+ dataln = length(gui.data[1])
+ if dataln>maxplotlength
+ start = dataln-maxplotlength
else
start=1
end
- p = plot(layout=(2,1), size=(700, 600))
- plot!(p[1], gui.data[1][start:end], label="y", ylim = boundsupper)
- plot!(p[1], gui.data[2][start:end], label="r")
- plot!(p[2], gui.data[3][start:end], label="P", ylim = boundslower)
- plot!(p[2], gui.data[4][start:end], label="I")
- plot!(p[2], gui.data[5][start:end], label="D")
- plot!(p[2], gui.data[6][start:end], label="Tot", color=:black)
+ lnv = glnv[1:min(dataln, maxplotlength+1)]
+ p = plot(layout=(2,1), size=(700, 600), xlabel = "seconds")
+ plot!(p[1], lnv, gui.data[1][start:end], label="y", ylim = boundsupper)
+ plot!(p[1], lnv, gui.data[2][start:end], label="r")
+ plot!(p[2], lnv, gui.data[3][start:end], label="P", ylim = boundslower)
+ plot!(p[2], lnv, gui.data[4][start:end], label="I")
+ plot!(p[2], lnv, gui.data[5][start:end], label="D")
+ plot!(p[2], lnv, gui.data[6][start:end], label="Tot", color=:black)
end
#-----------------------------------------------#
--
GitLab