diff --git a/FileSets/v2.73/OverviewHubEnhanced.qml b/FileSets/v2.73/OverviewHubEnhanced.qml index d8b85193..c910dc61 100644 --- a/FileSets/v2.73/OverviewHubEnhanced.qml +++ b/FileSets/v2.73/OverviewHubEnhanced.qml @@ -38,6 +38,8 @@ OverviewPage { property double alternatorFlow: showAlternator ? noNoise (sys.alternator.power) : 0 property bool showAcLoads: isMulti || sys.acLoad.power.valid || veDirectInverterService != "" property bool showDcSystem: (hasDcSystemItem.valid && hasDcSystemItem.value > 0) || showAllTiles + property bool showInverter: inverterService != "" || showAllTiles + property bool hasAcSolarOnAcIn1: sys.pvOnAcIn1.power.valid property bool hasAcSolarOnAcIn2: sys.pvOnAcIn2.power.valid property bool hasAcSolarOnIn: hasAcSolarOnAcIn1 || hasAcSolarOnAcIn2 @@ -327,6 +329,7 @@ OverviewPage { top: parent.top; topMargin: 3 } inverterService: root.inverterService + visible: showInverter ////// add power bar graph PowerGaugeMulti { @@ -339,7 +342,7 @@ OverviewPage { horizontalCenter: parent.horizontalCenter } inverterService: root.inverterService - show: showGauges + visible: showGauges && showInverter } DetailTarget { id: multiTarget; detailsPage: "DetailInverter.qml"; width: 60; height: 60 } } @@ -358,6 +361,7 @@ OverviewPage { { text: wallClock.time font.pixelSize: 18 + color: showInverter || darkMode ? "white" : "black" anchors { top: multi.top; topMargin: 96 @@ -919,7 +923,7 @@ OverviewPage { visible: showAcInput ballCount: 2 path: straight - active: root.active + active: root.active && showAcInput && showInverter value: flow(sys.acInput ? sys.acInput.power : 0) anchors { @@ -932,7 +936,7 @@ OverviewPage { id: multiToAcLoads ballCount: 2 path: straight - active: root.active && ( showAcLoads || showAllTiles ) + active: root.active && ( showAcLoads && showInverter ) value: flow(sys.acLoad.power) anchors { @@ -971,7 +975,7 @@ OverviewPage { id: dcBus2 ballCount: 2 path: straight - active: root.active + active: root.active && ( showInverter || showDcSolar ) value: -Utils.sign (noNoise (sys.pvCharger.power) + noNoise (sys.vebusDc.power)) startPointVisible: false endPointVisible: false @@ -1007,7 +1011,7 @@ OverviewPage { id: multiToDcConnect ballCount: showTanksTemps ? 2 : 4 path: straight - active: root.active + active: root.active && showInverter value: -flow(sys.vebusDc.power); startPointVisible: false @@ -1041,7 +1045,7 @@ OverviewPage { id: batteryToDcBus2 ballCount: 1 path: straight - active: root.active + active: root.active && ( showInverter || showDcSolar ) value: Utils.sign(noNoise(sys.pvCharger.power) + noNoise(sys.vebusDc.power) + alternatorFlow) startPointVisible: false diff --git a/FileSets/v3.01/OverviewFlowComplex.qml b/FileSets/v3.01/OverviewFlowComplex.qml index 8d1c480d..225ded80 100644 --- a/FileSets/v3.01/OverviewFlowComplex.qml +++ b/FileSets/v3.01/OverviewFlowComplex.qml @@ -357,6 +357,7 @@ OverviewPage { MultiEnhancedGP { id: multi iconId: "overview-inverter-short" + visible: showInverter anchors { horizontalCenter: parent.horizontalCenter top: acInBox.top @@ -373,14 +374,14 @@ OverviewPage { horizontalCenter: multi.horizontalCenter } inverterService: root.inverterService - visible: showGauges + visible: showGauges && showInverter } DetailTarget { id: multiTarget; detailsPage: "DetailInverter.qml"; width: 60; height: 60 } } TileText { text: wallClock.time - color: "white" + color: showInverter || darkMode ? "white" : "black" width: inOutTileWidth wrapMode: Text.WordWrap font.pixelSize: 16 diff --git a/FileSets/v3.01/OverviewHubEnhanced.qml b/FileSets/v3.01/OverviewHubEnhanced.qml index 18f400d1..acbbb325 100644 --- a/FileSets/v3.01/OverviewHubEnhanced.qml +++ b/FileSets/v3.01/OverviewHubEnhanced.qml @@ -43,6 +43,7 @@ OverviewPage { property double alternatorFlow: showAlternator ? noNoise (sys.alternator.power) : 0 property bool showAcLoads: isMulti || sys.acLoad.power.valid || veDirectInverterService != "" property bool showDcSystem: (hasDcSystemItem.valid && hasDcSystemItem.value > 0) || showAllTiles + property bool showInverter: inverterService != "" || showAllTiles property bool hasAcSolarOnAcIn1: sys.pvOnAcIn1.power.valid property bool hasAcSolarOnAcIn2: sys.pvOnAcIn2.power.valid @@ -335,6 +336,7 @@ OverviewPage { horizontalCenter: parent.horizontalCenter top: parent.top; topMargin: 3 } + visible: showInverter inverterService: root.inverterService ////// add power bar graph PowerGaugeMulti @@ -348,7 +350,7 @@ OverviewPage { horizontalCenter: parent.horizontalCenter } inverterService: root.inverterService - visible: showGauges + visible: showGauges && showInverter } DetailTarget { id: multiTarget; detailsPage: "DetailInverter.qml"; width: 60; height: 60 } } @@ -367,6 +369,7 @@ OverviewPage { { text: wallClock.time font.pixelSize: 18 + color: showInverter || darkMode ? "white" : "black" anchors { top: multi.top; topMargin: 96 @@ -980,7 +983,7 @@ OverviewPage { visible: showAcInput ballCount: 2 path: straight - active: root.active + active: root.active && showAcInput && showInverter value: flow(sys.acInput ? sys.acInput.power : 0) anchors { @@ -993,7 +996,7 @@ OverviewPage { id: multiToAcLoads ballCount: 2 path: straight - active: root.active && ( showAcLoads || showAllTiles ) + active: root.active && ( showAcLoads && showInverter ) value: flow(sys.acLoad.power) anchors { @@ -1007,7 +1010,7 @@ OverviewPage { id: pvInverterToMulti ballCount: 3 path: corner - active: root.active && showAcSolar + active: root.active && showAcSolar && showInverter value: Utils.sign(noNoise(sys.pvOnAcOut.power) + noNoise(sys.pvOnAcIn1.power) + noNoise(sys.pvOnAcIn2.power)) anchors { @@ -1032,7 +1035,7 @@ OverviewPage { id: dcBus2 ballCount: 2 path: straight - active: root.active + active: root.active && ( showInverter || showDcSolar ) value: -Utils.sign (noNoise (sys.pvCharger.power) + noNoise (sys.vebusDc.power)) startPointVisible: false endPointVisible: false @@ -1068,7 +1071,7 @@ OverviewPage { id: multiToDcConnect ballCount: showTanksTemps ? 2 : 4 path: straight - active: root.active + active: root.active && showInverter value: -flow(sys.vebusDc.power); startPointVisible: false @@ -1102,7 +1105,7 @@ OverviewPage { id: batteryToDcBus2 ballCount: 1 path: straight - active: root.active + active: root.active && ( showInverter || showDcSolar ) value: Utils.sign(noNoise(sys.pvCharger.power) + noNoise(sys.vebusDc.power) + alternatorFlow) startPointVisible: false diff --git a/FileSets/v3.40~26/OverviewFlowComplex.qml b/FileSets/v3.40~26/OverviewFlowComplex.qml index 55a375b1..23564eab 100644 --- a/FileSets/v3.40~26/OverviewFlowComplex.qml +++ b/FileSets/v3.40~26/OverviewFlowComplex.qml @@ -357,6 +357,7 @@ OverviewPage { MultiEnhancedGP { id: multi iconId: "overview-inverter-short" + visible: showInverter anchors { horizontalCenter: parent.horizontalCenter top: acInBox.top @@ -373,14 +374,14 @@ OverviewPage { horizontalCenter: multi.horizontalCenter } inverterService: root.inverterService - visible: showGauges + visible: showGauges && showInverter } DetailTarget { id: multiTarget; detailsPage: "DetailInverter.qml"; width: 60; height: 60 } } TileText { text: wallClock.time - color: "white" + color: showInverter || darkMode ? "white" : "black" width: inOutTileWidth wrapMode: Text.WordWrap font.pixelSize: 16 diff --git a/FileSets/v3.40~26/OverviewHubEnhanced.qml b/FileSets/v3.40~26/OverviewHubEnhanced.qml index 53523ac6..49032144 100644 --- a/FileSets/v3.40~26/OverviewHubEnhanced.qml +++ b/FileSets/v3.40~26/OverviewHubEnhanced.qml @@ -43,6 +43,7 @@ OverviewPage { property double alternatorFlow: showAlternator ? noNoise (sys.alternator.power) : 0 property bool showAcLoads: isMulti || sys.acLoad.power.valid || veDirectInverterService != "" property bool showDcSystem: (hasDcSystemItem.valid && hasDcSystemItem.value > 0) || showAllTiles + property bool showInverter: inverterService != "" || showAllTiles property bool hasAcSolarOnAcIn1: sys.pvOnAcIn1.power.valid property bool hasAcSolarOnAcIn2: sys.pvOnAcIn2.power.valid @@ -335,6 +336,7 @@ OverviewPage { top: parent.top; topMargin: 3 } inverterService: root.inverterService + visible: showInverter ////// add power bar graph PowerGaugeMulti { @@ -347,7 +349,7 @@ OverviewPage { horizontalCenter: parent.horizontalCenter } inverterService: root.inverterService - visible: showGauges + visible: showGauges && showInverter } DetailTarget { id: multiTarget; detailsPage: "DetailInverter.qml"; width: 60; height: 60 } } @@ -366,6 +368,7 @@ OverviewPage { { text: wallClock.time font.pixelSize: 18 + color: showInverter || darkMode ? "white" : "black" anchors { top: multi.top; topMargin: 96 @@ -974,10 +977,9 @@ OverviewPage { OverviewConnection { id: acInToMulti - visible: showAcInput ballCount: 2 path: straight - active: root.active + active: root.active && showAcInput && showInverter value: flow(sys.acInput ? sys.acInput.power : 0) anchors { @@ -990,7 +992,7 @@ OverviewPage { id: multiToAcLoads ballCount: 2 path: straight - active: root.active && ( showAcLoads || showAllTiles ) + active: root.active && ( showAcLoads && showInverter ) value: flow(sys.acLoad.power) anchors { @@ -1004,7 +1006,7 @@ OverviewPage { id: pvInverterToMulti ballCount: 3 path: corner - active: root.active && showAcSolar + active: root.active && showAcSolar && showInverter value: Utils.sign(noNoise(sys.pvOnAcOut.power) + noNoise(sys.pvOnAcIn1.power) + noNoise(sys.pvOnAcIn2.power)) anchors { @@ -1029,7 +1031,7 @@ OverviewPage { id: dcBus2 ballCount: 2 path: straight - active: root.active + active: root.active && ( showInverter || showDcSolar ) value: -Utils.sign (noNoise (sys.pvCharger.power) + noNoise (sys.inverterChargerDc.power)) startPointVisible: false endPointVisible: false @@ -1065,7 +1067,7 @@ OverviewPage { id: multiToDcConnect ballCount: showTanksTemps ? 2 : 4 path: straight - active: root.active + active: root.active && showInverter value: -flow(sys.inverterChargerDc.power); startPointVisible: false @@ -1099,7 +1101,7 @@ OverviewPage { id: batteryToDcBus2 ballCount: 1 path: straight - active: root.active + active: root.active && ( showInverter || showDcSolar ) value: Utils.sign(noNoise(sys.pvCharger.power) + noNoise(sys.inverterChargerDc.power) + alternatorFlow) startPointVisible: false diff --git a/FileSets/v3.40~8/OverviewFlowComplex.qml b/FileSets/v3.40~8/OverviewFlowComplex.qml index 77e37a1d..8e8153f1 100644 --- a/FileSets/v3.40~8/OverviewFlowComplex.qml +++ b/FileSets/v3.40~8/OverviewFlowComplex.qml @@ -357,6 +357,7 @@ OverviewPage { MultiEnhancedGP { id: multi iconId: "overview-inverter-short" + visible: showInverter anchors { horizontalCenter: parent.horizontalCenter top: acInBox.top @@ -373,14 +374,14 @@ OverviewPage { horizontalCenter: multi.horizontalCenter } inverterService: root.inverterService - visible: showGauges + visible: showGauges && showInverter } DetailTarget { id: multiTarget; detailsPage: "DetailInverter.qml"; width: 60; height: 60 } } TileText { text: wallClock.time - color: "white" + color: showInverter || darkMode ? "white" : "black" width: inOutTileWidth wrapMode: Text.WordWrap font.pixelSize: 16 diff --git a/FileSets/v3.40~8/OverviewHubEnhanced.qml b/FileSets/v3.40~8/OverviewHubEnhanced.qml index c6ca2a4c..68a85723 100644 --- a/FileSets/v3.40~8/OverviewHubEnhanced.qml +++ b/FileSets/v3.40~8/OverviewHubEnhanced.qml @@ -43,6 +43,7 @@ OverviewPage { property double alternatorFlow: showAlternator ? noNoise (sys.alternator.power) : 0 property bool showAcLoads: isMulti || sys.acLoad.power.valid || veDirectInverterService != "" property bool showDcSystem: (hasDcSystemItem.valid && hasDcSystemItem.value > 0) || showAllTiles + property bool showInverter: inverterService != "" || showAllTiles property bool hasAcSolarOnAcIn1: sys.pvOnAcIn1.power.valid property bool hasAcSolarOnAcIn2: sys.pvOnAcIn2.power.valid @@ -335,6 +336,7 @@ OverviewPage { top: parent.top; topMargin: 3 } inverterService: root.inverterService + visible: showInverter ////// add power bar graph PowerGaugeMulti { @@ -347,7 +349,7 @@ OverviewPage { horizontalCenter: parent.horizontalCenter } inverterService: root.inverterService - visible: showGauges + visible: showGauges && showInverter } DetailTarget { id: multiTarget; detailsPage: "DetailInverter.qml"; width: 60; height: 60 } } @@ -366,6 +368,7 @@ OverviewPage { { text: wallClock.time font.pixelSize: 18 + color: showInverter || darkMode ? "white" : "black" anchors { top: multi.top; topMargin: 96 @@ -977,7 +980,7 @@ OverviewPage { visible: showAcInput ballCount: 2 path: straight - active: root.active + active: root.active && showAcInput && showInverter value: flow(sys.acInput ? sys.acInput.power : 0) anchors { @@ -990,7 +993,7 @@ OverviewPage { id: multiToAcLoads ballCount: 2 path: straight - active: root.active && ( showAcLoads || showAllTiles ) + active: root.active && ( showAcLoads && showInverter ) value: flow(sys.acLoad.power) anchors { @@ -1004,7 +1007,7 @@ OverviewPage { id: pvInverterToMulti ballCount: 3 path: corner - active: root.active && showAcSolar + active: root.active && showAcSolar && showInverter value: Utils.sign(noNoise(sys.pvOnAcOut.power) + noNoise(sys.pvOnAcIn1.power) + noNoise(sys.pvOnAcIn2.power)) anchors { @@ -1029,7 +1032,7 @@ OverviewPage { id: dcBus2 ballCount: 2 path: straight - active: root.active + active: root.active && ( showInverter || showDcSolar ) value: -Utils.sign (noNoise (sys.pvCharger.power) + noNoise (sys.vebusDc.power)) startPointVisible: false endPointVisible: false @@ -1065,7 +1068,7 @@ OverviewPage { id: multiToDcConnect ballCount: showTanksTemps ? 2 : 4 path: straight - active: root.active + active: root.active && showInverter value: -flow(sys.vebusDc.power); startPointVisible: false @@ -1099,7 +1102,7 @@ OverviewPage { id: batteryToDcBus2 ballCount: 1 path: straight - active: root.active + active: root.active && ( showInverter || showDcSolar ) value: Utils.sign(noNoise(sys.pvCharger.power) + noNoise(sys.vebusDc.power) + alternatorFlow) startPointVisible: false diff --git a/changes b/changes index 712137a6..cfe2b917 100644 --- a/changes +++ b/changes @@ -1,3 +1,7 @@ +v10.39: + hide multi tile if no inverter + add support for v3.40~26 + v10.38: add support for v3.33 diff --git a/version b/version index 77e65003..6acd4c4a 100644 --- a/version +++ b/version @@ -1 +1 @@ -v10.38 +v10.39