Commit 620e1b7f authored by DonLakeFlyer's avatar DonLakeFlyer

Fix APM power calculators

parent a99d190a
...@@ -369,8 +369,14 @@ SetupPage { ...@@ -369,8 +369,14 @@ SetupPage {
QGCButton { QGCButton {
text: qsTr("Calculate") text: qsTr("Calculate")
onClicked: showDialog(calcVoltageMultiplierDlgComponent, qsTr("Calculate Voltage Multiplier"), qgcView.showDialogDefaultWidth, StandardButton.Close)
visible: _showAdvanced visible: _showAdvanced
onClicked: {
_calcVoltageDlgVehicleVoltage = vehicleVoltage
_calcVoltageDlgBattVoltMultParam = battVoltMult
showDialog(calcVoltageMultiplierDlgComponent, qsTr("Calculate Voltage Multiplier"), qgcView.showDialogDefaultWidth, StandardButton.Close)
}
} }
QGCLabel { QGCLabel {
...@@ -395,8 +401,13 @@ SetupPage { ...@@ -395,8 +401,13 @@ SetupPage {
QGCButton { QGCButton {
text: qsTr("Calculate") text: qsTr("Calculate")
onClicked: showDialog(calcAmpsPerVoltDlgComponent, qsTr("Calculate Amps per Volt"), qgcView.showDialogDefaultWidth, StandardButton.Close)
visible: _showAdvanced visible: _showAdvanced
onClicked: {
_calcAmpsPerVoltDlgVehicleCurrent = vehicleCurrent
_calcAmpsPerVoltDlgBattAmpPerVoltParam = battAmpPerVolt
showDialog(calcAmpsPerVoltDlgComponent, qsTr("Calculate Amps per Volt"), qgcView.showDialogDefaultWidth, StandardButton.Close)
}
} }
QGCLabel { QGCLabel {
...@@ -411,6 +422,10 @@ SetupPage { ...@@ -411,6 +422,10 @@ SetupPage {
} // Column } // Column
} // Component - powerSetupComponent } // Component - powerSetupComponent
// Must be set prior to use of calcVoltageMultiplierDlgComponent
property Fact _calcVoltageDlgVehicleVoltage
property Fact _calcVoltageDlgBattVoltMultParam
Component { Component {
id: calcVoltageMultiplierDlgComponent id: calcVoltageMultiplierDlgComponent
...@@ -444,10 +459,10 @@ SetupPage { ...@@ -444,10 +459,10 @@ SetupPage {
QGCTextField { id: measuredVoltage } QGCTextField { id: measuredVoltage }
QGCLabel { text: qsTr("Vehicle voltage:") } QGCLabel { text: qsTr("Vehicle voltage:") }
QGCLabel { text: vehicleVoltage.valueString } FactLabel { fact: _calcVoltageDlgVehicleVoltage }
QGCLabel { text: qsTr("Voltage multiplier:") } QGCLabel { text: qsTr("Voltage multiplier:") }
FactLabel { fact: battVoltMult } FactLabel { fact: _calcVoltageDlgBattVoltMultParam }
} }
QGCButton { QGCButton {
...@@ -458,9 +473,9 @@ SetupPage { ...@@ -458,9 +473,9 @@ SetupPage {
if (measuredVoltageValue == 0 || isNaN(measuredVoltageValue)) { if (measuredVoltageValue == 0 || isNaN(measuredVoltageValue)) {
return return
} }
var newVoltageMultiplier = (measuredVoltageValue * battVoltMult.value) / vehicleVoltage.value var newVoltageMultiplier = (measuredVoltageValue * _calcVoltageDlgBattVoltMultParam.value) / _calcVoltageDlgVehicleVoltage.value
if (newVoltageMultiplier > 0) { if (newVoltageMultiplier > 0) {
battVoltMult.value = newVoltageMultiplier _calcVoltageDlgBattVoltMultParam.value = newVoltageMultiplier
} }
} }
} }
...@@ -469,6 +484,10 @@ SetupPage { ...@@ -469,6 +484,10 @@ SetupPage {
} // QGCViewDialog } // QGCViewDialog
} // Component - calcVoltageMultiplierDlgComponent } // Component - calcVoltageMultiplierDlgComponent
// Must be set prior to use of calcAmpsPerVoltDlgComponent
property Fact _calcAmpsPerVoltDlgVehicleCurrent
property Fact _calcAmpsPerVoltDlgBattAmpPerVoltParam
Component { Component {
id: calcAmpsPerVoltDlgComponent id: calcAmpsPerVoltDlgComponent
...@@ -502,10 +521,10 @@ SetupPage { ...@@ -502,10 +521,10 @@ SetupPage {
QGCTextField { id: measuredCurrent } QGCTextField { id: measuredCurrent }
QGCLabel { text: qsTr("Vehicle current:") } QGCLabel { text: qsTr("Vehicle current:") }
QGCLabel { text: vehicleCurrent.valueString } FactLabel { fact: _calcAmpsPerVoltDlgVehicleCurrent }
QGCLabel { text: qsTr("Amps per volt:") } QGCLabel { text: qsTr("Amps per volt:") }
FactLabel { fact: battAmpPerVolt } FactLabel { fact: _calcAmpsPerVoltDlgBattAmpPerVoltParam }
} }
QGCButton { QGCButton {
...@@ -516,9 +535,9 @@ SetupPage { ...@@ -516,9 +535,9 @@ SetupPage {
if (measuredCurrentValue == 0) { if (measuredCurrentValue == 0) {
return return
} }
var newAmpsPerVolt = (measuredCurrentValue * battAmpPerVolt.value) / vehicleCurrent.value var newAmpsPerVolt = (measuredCurrentValue * _calcAmpsPerVoltDlgBattAmpPerVoltParam.value) / _calcAmpsPerVoltDlgVehicleCurrent.value
if (newAmpsPerVolt != 0) { if (newAmpsPerVolt != 0) {
battAmpPerVolt.value = newAmpsPerVolt _calcAmpsPerVoltDlgBattAmpPerVoltParam.value = newAmpsPerVolt
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment