linse/seweb
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes for select_instrument

Browse Source
This commit is contained in:
zolliker
2025-04-25 09:00:47 +02:00
parent 09bf402bbb
commit 8f7406c31b
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/jsFiles/SEAWebClientMain.js
View File

@ -78,8 +78,8 @@ new Settings()
.treat("hideRightPart", "hr", to_bool, false) //used to completely disable the right part .treat("hideRightPart", "hr", to_bool, false) //used to completely disable the right part
.treat("wideGraphs", "wg", to_bool, false) //used to toggle the size of the graphs part .treat("wideGraphs", "wg", to_bool, false) //used to toggle the size of the graphs part
.treat("showAsync", "sa", to_bool, false) .treat("showAsync", "sa", to_bool, false)
.treat("device", "dev", 0, "") .treat("device", "device", 0, "")
.treat("server", "srv", 0, "") .treat("stream", "stream", 0, "")
.treat("instrument", "instrument", 0, "") .treat("instrument", "instrument", 0, "")
.treat("timerange", "time", 0, "-1800,0") .treat("timerange", "time", 0, "-1800,0")
@ -87,7 +87,7 @@ if (window.instrument) {
window.clientTags = "&instrument=" + window.instrument; window.clientTags = "&instrument=" + window.instrument;
} else { } else {
let args = ''; let args = '';
if (window.server) { args += "&stream=" + window.server; } if (window.stream) { args += "&stream=" + window.stream; }
if (window.device) { args += "&device=" + window.device; } if (window.device) { args += "&device=" + window.device; }
window.clientTags = args; window.clientTags = args;
} }

2
influxgraph.py
View File

@ -160,6 +160,8 @@ class InfluxGraph(HandlerBase):
if self.instrument: if self.instrument:
streams, tags, self.device_name = self.server.lookup_streams(self.instrument, **self.init_tags) streams, tags, self.device_name = self.server.lookup_streams(self.instrument, **self.init_tags)
self.tags = {**self.init_tags, **tags} self.tags = {**self.init_tags, **tags}
else:
self.tags = self.init_tags
blocks = self.get_available_variables(start_time, end_time, self.chart_configs, userconfiguration) blocks = self.get_available_variables(start_time, end_time, self.chart_configs, userconfiguration)
# initialize self.last_values to keep track of the available variables # initialize self.last_values to keep track of the available variables
self.last_values = {var["name"]: [0, None] for block in blocks for var in block["curves"]} self.last_values = {var["name"]: [0, None] for block in blocks for var in block["curves"]}

2
webserver.py
View File

@ -297,7 +297,7 @@ def replace_by_empty(file):
@app.route('/') @app.route('/')
def default(): def default():
if not any(flask.request.values.get(k) for k in ('instrument', 'server', 'device')): if not any(flask.request.values.get(k) for k in ('instrument', 'stream', 'device')):
if not server.single_instrument: if not server.single_instrument:
return select_experiment() return select_experiment()
return general_file('SEAWebClient.html') return general_file('SEAWebClient.html')