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

Fixed same measurement with different param for export bug

Browse Source
This commit is contained in:
l_samenv
2024-08-28 10:23:07 +02:00
parent 144a6aa763
commit fcee45817f
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
influxgraph.py
View File

@ -32,7 +32,7 @@ class InfluxGraph:
self.livemode = self.HISTORICAL
self.end_query = 0
self.lastvalues = {}
self.variables = []
self.variables = {} # name:label
def milliseconds_to_nano(self, milliseconds):
"""
@ -141,7 +141,7 @@ class InfluxGraph:
blocks = self.influx_data_getter.get_available_variables_at_time([start_time, end_time])
device_name = self.influx_data_getter.get_device_name(end_time)
# updates the self.variables attribute to keep track of the available variables
self.variables = [variable["name"] for block in blocks for variable in block["curves"]]
self.variables = {variable["name"]:variable["label"] for block in blocks for variable in block["curves"]}
assign_colors_to_curves(blocks)
result = dict(type='var_list')
@ -185,7 +185,7 @@ class InfluxGraph:
queried_variables = variables.split(',')
if interval != "None" : interval = int(interval)
df = self.influx_data_getter.get_curves_data_frame(queried_variables, [start, end], interval)
df = self.influx_data_getter.get_curves_data_frame(queried_variables, [start, end], interval, self.variables)
mem = io.BytesIO()
df.to_csv(mem, sep="\t", index=False, float_format="%.15g", na_rep=nan)
@ -207,7 +207,7 @@ class InfluxGraph:
return None
now, = self.get_abs_time([0])
result = self.influx_data_getter.poll_last_values(self.variables, self.lastvalues, now)
result = self.influx_data_getter.poll_last_values(list(self.variables.keys()), self.lastvalues, now)
for variable in self.lastvalues.keys():
if variable in result.keys():