yevi.org/ha_client
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 64 Wiki Activity

WIP #120 combined history state

Browse Source
This commit is contained in:
Yegor Vialov 2018-10-31 01:02:53 +02:00
parent 07258477b3
commit 1853bd466e
1 changed files with 51 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
lib/entity_widgets/history_chart/combined_history_chart.dart
View File

@ -26,7 +26,11 @@ class _CombinedHistoryChartWidgetState extends State<CombinedHistoryChartWidget>
List<String> selectedStates = []; List<String> selectedStates = [];
List<int> colorIndexes = []; List<int> colorIndexes = [];
if ((_selectedId > -1) && (_parsedHistory != null) && (_parsedHistory.first.data.length >= (_selectedId + 1))) { if ((_selectedId > -1) && (_parsedHistory != null) && (_parsedHistory.first.data.length >= (_selectedId + 1))) {
selectedTime = _parsedHistory.first.data[_selectedId].time; selectedTime = _parsedHistory.first.data[_selectedId].startTime;
_parsedHistory.where((item) { return item.id == "state"; }).forEach((item) {
selectedStates.add("${item.data[_selectedId].state}");
colorIndexes.add(item.data[_selectedId].colorId);
});
_parsedHistory.where((item) { return item.id == "value"; }).forEach((item) { _parsedHistory.where((item) { return item.id == "value"; }).forEach((item) {
selectedStates.add("${item.data[_selectedId].value}"); selectedStates.add("${item.data[_selectedId].value}");
colorIndexes.add(item.data[_selectedId].colorId); colorIndexes.add(item.data[_selectedId].colorId);
@ -62,6 +66,11 @@ class _CombinedHistoryChartWidgetState extends State<CombinedHistoryChartWidget>
listener: (model) => _onSelectionChanged(model), listener: (model) => _onSelectionChanged(model),
) )
], ],
customSeriesRenderers: [
new charts.SymbolAnnotationRendererConfig(
customRendererId: "stateBars"
)
],
), ),
) )
], ],
@ -80,7 +89,7 @@ class _CombinedHistoryChartWidgetState extends State<CombinedHistoryChartWidget>
List<charts.Series<CombinedEntityStateHistoryMoment, DateTime>> _parseHistory() { List<charts.Series<CombinedEntityStateHistoryMoment, DateTime>> _parseHistory() {
TheLogger.debug(" parsing history..."); TheLogger.debug(" parsing history...");
Map<String, List<CombinedEntityStateHistoryMoment>> dataList = {}; Map<String, List<CombinedEntityStateHistoryMoment>> numericDataLists = {};
int colorIdCounter = 0; int colorIdCounter = 0;
widget.config.numericAttributesToShow.forEach((String attrName) { widget.config.numericAttributesToShow.forEach((String attrName) {
TheLogger.debug(" parsing attribute $attrName"); TheLogger.debug(" parsing attribute $attrName");
@ -88,37 +97,61 @@ class _CombinedHistoryChartWidgetState extends State<CombinedHistoryChartWidget>
DateTime now = DateTime.now(); DateTime now = DateTime.now();
for (var i = 0; i < widget.rawHistory.length; i++) { for (var i = 0; i < widget.rawHistory.length; i++) {
var stateData = widget.rawHistory[i]; var stateData = widget.rawHistory[i];
DateTime time = DateTime.tryParse(stateData["last_updated"])?.toLocal(); DateTime startTime = DateTime.tryParse(stateData["last_updated"])?.toLocal();
if (stateData["attributes"] != null) { DateTime endTime;
data.add(CombinedEntityStateHistoryMoment(_parseToDouble(stateData["attributes"]["$attrName"]), stateData["state"], time, i, colorIdCounter)); if (i < (widget.rawHistory.length - 1)) {
endTime = DateTime.tryParse(widget.rawHistory[i+1]["last_updated"])?.toLocal();
} else { } else {
data.add(CombinedEntityStateHistoryMoment(null, stateData["state"], time, i, colorIdCounter)); endTime = now;
}
if (stateData["attributes"] != null) {
data.add(CombinedEntityStateHistoryMoment(_parseToDouble(stateData["attributes"]["$attrName"]), stateData["state"], startTime, endTime, i, colorIdCounter));
} else {
data.add(CombinedEntityStateHistoryMoment(null, stateData["state"], startTime, endTime, i, colorIdCounter));
} }
} }
data.add(CombinedEntityStateHistoryMoment(data.last.value, data.last.state, now, widget.rawHistory.length, colorIdCounter)); data.add(CombinedEntityStateHistoryMoment(data.last.value, data.last.state, now, null, widget.rawHistory.length, colorIdCounter));
dataList.addAll({attrName: data}); numericDataLists.addAll({attrName: data});
colorIdCounter += 1; colorIdCounter += 1;
}); });
if ((_selectedId == -1) && (dataList.isNotEmpty)) { if ((_selectedId == -1) && (numericDataLists.isNotEmpty)) {
_selectedId = 0; _selectedId = 0;
} }
List<charts.Series<CombinedEntityStateHistoryMoment, DateTime>> result = []; List<charts.Series<CombinedEntityStateHistoryMoment, DateTime>> result = [];
dataList.forEach((attrName, dataItem) { numericDataLists.forEach((attrName, dataList) {
TheLogger.debug(" adding ${dataItem.length} data values"); TheLogger.debug(" adding ${dataList.length} data values");
result.addAll([ result.add(
new charts.Series<CombinedEntityStateHistoryMoment, DateTime>( new charts.Series<CombinedEntityStateHistoryMoment, DateTime>(
id: "value", id: "value",
colorFn: (CombinedEntityStateHistoryMoment historyMoment, __) => EntityColors.chartHistoryStateColor("_", historyMoment.colorId), colorFn: (CombinedEntityStateHistoryMoment historyMoment, __) => EntityColors.chartHistoryStateColor("_", historyMoment.colorId),
radiusPxFn: (CombinedEntityStateHistoryMoment historyMoment, __) => (historyMoment.id == _selectedId) ? 5.0 : 1.0, radiusPxFn: (CombinedEntityStateHistoryMoment historyMoment, __) => (historyMoment.id == _selectedId) ? 5.0 : 1.0,
domainFn: (CombinedEntityStateHistoryMoment historyMoment, _) => historyMoment.time, domainFn: (CombinedEntityStateHistoryMoment historyMoment, _) => historyMoment.startTime,
measureFn: (CombinedEntityStateHistoryMoment historyMoment, _) => historyMoment.value, measureFn: (CombinedEntityStateHistoryMoment historyMoment, _) => historyMoment.value,
data: dataItem, data: dataList,
/*domainLowerBoundFn: (CombinedEntityStateHistoryMoment historyMoment, _) => historyMoment.time.subtract(Duration(hours: 1)), /*domainLowerBoundFn: (CombinedEntityStateHistoryMoment historyMoment, _) => historyMoment.time.subtract(Duration(hours: 1)),
domainUpperBoundFn: (CombinedEntityStateHistoryMoment historyMoment, _) => historyMoment.time.add(Duration(hours: 1)),*/ domainUpperBoundFn: (CombinedEntityStateHistoryMoment historyMoment, _) => historyMoment.time.add(Duration(hours: 1)),*/
) )
]); );
}); });
result.add(
new charts.Series<CombinedEntityStateHistoryMoment, DateTime>(
id: 'state',
radiusPxFn: (CombinedEntityStateHistoryMoment historyMoment, __) => (historyMoment.id == _selectedId) ? 6.0 : 4.0,
colorFn: (CombinedEntityStateHistoryMoment historyMoment, __) => EntityColors.chartHistoryStateColor(historyMoment.state, historyMoment.colorId),
domainFn: (CombinedEntityStateHistoryMoment historyMoment, _) => historyMoment.startTime,
domainLowerBoundFn: (CombinedEntityStateHistoryMoment historyMoment, _) => historyMoment.startTime,
domainUpperBoundFn: (CombinedEntityStateHistoryMoment historyMoment, _) => historyMoment.endTime ?? DateTime.now(),
// No measure values are needed for symbol annotations.
measureFn: (_, __) => null,
data: numericDataLists[numericDataLists.keys.first],
)
// Configure our custom symbol annotation renderer for this series.
..setAttribute(charts.rendererIdKey, 'stateBars')
// Optional radius for the annotation shape. If not specified, this will
// default to the same radius as the points.
//..setAttribute(charts.boundsLineRadiusPxKey, 3.5)
);
return result; return result;
} }
@ -241,11 +274,12 @@ class CombinedHistoryControlWidget extends StatelessWidget {
} }
class CombinedEntityStateHistoryMoment { class CombinedEntityStateHistoryMoment {
final DateTime time; final DateTime startTime;
final DateTime endTime;
final double value; final double value;
final int id; final int id;
final int colorId; final int colorId;
final String state; final String state;
CombinedEntityStateHistoryMoment(this.value, this.state, this.time, this.id, this.colorId); CombinedEntityStateHistoryMoment(this.value, this.state, this.startTime, this.endTime, this.id, this.colorId);
} }