github/psa_car_controller
1
0
Fork 0
mirror of https://github.com/flobz/psa_car_controller.git synced 2026-08-26 10:17:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

add temperature graph

Browse Source
This commit is contained in:
Florian Bezannier
2021-03-23 18:45:43 +01:00
parent 36a8379817
commit bdad100739
4 changed files with 40 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/figures.py
+19 -2
View File
@@ -4,6 +4,7 @@ from typing import List
import dash_bootstrap_components as dbc
import dash_table
import numpy as np
from dash_core_components import Graph
from dash_table.Format import Format, Scheme, Symbol
from dateutil.relativedelta import relativedelta
from pandas import DataFrame
@@ -46,6 +47,7 @@ consumption_fig = None
consumption_df = None
trips_map = None
consumption_fig_by_speed = None
consumption_graph_by_temp = None
table_fig = None
pandas_options.display.float_format = '${:.2f}'.format
info = ""
@@ -53,9 +55,9 @@ battery_info = dbc.Alert("No data to show", color="danger")
battery_table = None
def get_figures(trips: Trips, charging: List[dict]):
def get_figures(trips: Trips, charging: tuple[dict]):
global consumption_fig, consumption_df, trips_map, consumption_fig_by_speed, table_fig, info, battery_info, \
battery_table
battery_table, consumption_graph_by_temp
lats = []
lons = []
names = []
@@ -164,3 +166,18 @@ def get_figures(trips: Trips, charging: List[dict]):
'format': deepcopy(nb_format).symbol_suffix(" kWh").precision(3)}],
data=charging,
)
consumption_by_temp_df = consumption_df[consumption_df["consumption_by_temp"].notnull()]
if len(consumption_by_temp_df) > 0:
consumption_fig_by_temp = px.histogram(consumption_by_temp_df, x="consumption_by_temp", y="consumption_km",
histfunc="avg", title="Consumption by temperature")
consumption_fig_by_temp.update_traces(xbins_size=2)
consumption_fig_by_temp.update_layout(bargap=0.05)
consumption_fig_by_temp.add_trace(
go.Scatter(mode="markers", x=consumption_by_temp_df["consumption_by_temp"],
y=consumption_by_temp_df["consumption_km"], name="Trips"))
consumption_fig_by_temp.update_layout(xaxis_title="average temperature in °C",
yaxis_title="Consumption kWh/100Km")
consumption_graph_by_temp = Graph(figure=consumption_fig_by_temp, id="consumption_fig_by_temp")
else:
consumption_graph_by_temp = Graph(style={'display': 'none'})
web/views.py
+7 -4
View File
@@ -24,6 +24,7 @@ min_date = max_date = min_millis = max_millis = step = marks = None
@dash_app.callback(Output('trips_map', 'figure'),
Output('consumption_fig', 'figure'),
Output('consumption_fig_by_speed', 'figure'),
Output('consumption_fig_by_temp', 'graph'),
Output('consumption', 'children'),
Output('tab_trips', 'children'),
Output('tab_battery', 'children'),
@@ -42,13 +43,14 @@ def display_value(value):
filtered_chargings = MyPSACC.get_chargings(mini, maxi)
figures.get_figures(filtered_trips, filtered_chargings)
consumption = "Average consumption: {:.1f} kWh/100km".format(float(figures.consumption_df["consumption_km"].mean()))
return figures.trips_map, figures.consumption_fig, figures.consumption_fig_by_speed, consumption, figures.table_fig, \
figures.battery_info, figures.battery_table, max_millis, step, marks
return figures.trips_map, figures.consumption_fig, figures.consumption_fig_by_speed,\
figures.consumption_graph_by_temp, consumption, figures.table_fig, figures.battery_info, \
figures.battery_table, max_millis, step, marks
@app.route('/getvehicles')
def get_vehicules():
return jsonify(myp.getVIN())
return jsonify(myp.get_vehicles())
@app.route('/get_vehicleinfo/<string:vin>')
@@ -166,7 +168,8 @@ try:
html.H2(id="consumption",
children=figures.info),
dcc.Graph(figure=figures.consumption_fig, id="consumption_fig"),
dcc.Graph(figure=figures.consumption_fig_by_speed, id="consumption_fig_by_speed")
dcc.Graph(figure=figures.consumption_fig_by_speed, id="consumption_fig_by_speed"),
figures.consumption_graph_by_temp
]),
dbc.Tab(label="Trips", tab_id="trips", id="tab_trips", children=[figures.table_fig]),
dbc.Tab(label="Battery", tab_id="battery", id="tab_battery", children=[figures.battery_info]),