ETM-Schurig
/
nymea-app
mirror of https://github.com/nymea/nymea-app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix dashboard chart item for legacy charts

pull/1009/head
Michael Zanetti 2023-04-20 14:16:09 +02:00
parent cc2ac961ed
commit e6c4206860
1 changed files with 43 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
nymea-app/ui/mainviews/dashboard/DashboardGraphDelegate.qml
View File

@ -45,35 +45,53 @@ DashboardDelegateBase {
readonly property StateType stateType: thing ? thing.thingClass.stateTypes.getStateType(item.stateTypeId) : null
readonly property State state: thing ? thing.states.getState(item.stateTypeId) : null
contentItem: StateChart {
id: graph
contentItem: Loader {
width: root.width
height: root.height
title: root.state && root.stateType ? root.thing.name + ", " + root.stateType.displayName + ": " + Types.toUiValue(root.state.value, root.stateType.unit).toFixed(0) + Types.toUiUnit(root.stateType.unit) : ""
thing: root.thing
color: root.thing ? app.interfaceToColor(root.thing.thingClass.interfaces[0]) : Style.accentColor
// iconSource: ""// app.interfaceToIcon(interfaceName)
implicitHeight: width * .6
// property string interfaceName: parent.interfaceName
stateType: root.stateType
// property State state: root.state
sourceComponent: {
if (engine.jsonRpcClient.ensureServerVersion("8.0")) {
return stateChartComponent
} else {
return graphComponent
}
}
}
// contentItem: GenericTypeGraph {
// id: graph
// width: root.width
// height: root.height
// title: root.state && root.stateType ? root.thing.name + " " + Types.toUiValue(root.state.value, root.stateType.unit) + Types.toUiUnit(root.stateType.unit) : ""
Component {
id: stateChartComponent
StateChart {
id: graph
title: root.state && root.stateType ? root.thing.name + ", " + root.stateType.displayName + ": " + Types.toUiValue(root.state.value, root.stateType.unit).toFixed(0) + Types.toUiUnit(root.stateType.unit) : ""
thing: root.thing
color: root.thing ? app.interfaceToColor(root.thing.thingClass.interfaces[0]) : Style.accentColor
// iconSource: ""// app.interfaceToIcon(interfaceName)
implicitHeight: width * .6
// property string interfaceName: parent.interfaceName
stateType: root.stateType
// property State state: root.state
}
}
Component {
id: graphComponent
GenericTypeGraph {
id: graph
title: root.state && root.stateType ? root.thing.name + " " + Types.toUiValue(root.state.value, root.stateType.unit) + Types.toUiUnit(root.stateType.unit) : ""
thing: root.thing
color: "blue"//app.interfaceToColor(interfaceName)
iconSource: ""// app.interfaceToIcon(interfaceName)
implicitHeight: width * .6
// property string interfaceName: parent.interfaceName
stateType: root.stateType
property State state: root.state
}
}
// thing: root.thing
// color: "blue"//app.interfaceToColor(interfaceName)
// iconSource: ""// app.interfaceToIcon(interfaceName)
// implicitHeight: width * .6
//// property string interfaceName: parent.interfaceName
// stateType: root.stateType
// property State state: root.state
// }
}