diff options
Diffstat (limited to 'mainwindow.cpp')
-rw-r--r-- | mainwindow.cpp | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/mainwindow.cpp b/mainwindow.cpp index 44a3a2e..62702cd 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -12,7 +12,12 @@ MainWindow::MainWindow(QWidget *parent) connect(&m_wire,&Wire::calculation, [&]() { ui->lineEditWireGauge->setText(m_wire.gauge()); ui->lineEditWireWeight->setText(QString::number(m_wire.weight())); - ui->lineEditPeakCurrent->setText(QString::number(m_wire.peakCurrent())); + }); + + connect(&m_battery,&Battery::calculation, [&]() { + ui->lineEditCellCount->setText(QString::number(m_battery.seriesCells())+"S"); + ui->lineEditVoltageRange->setText(QString::number(m_battery.minimumPackVoltage())+" - "+QString::number(m_battery.maximumPackVoltage())); + ui->lineEditPeakCurrent->setText(QString::number(m_battery.peakCurrent())); }); } @@ -27,6 +32,7 @@ void MainWindow::on_spinBoxPeakSystemPower_valueChanged(double arg1) m_wire.setPeakSystemPower(arg1); m_wire.calculate(); m_battery.setPeakSystemPower(arg1); + m_battery.calculate(); } void MainWindow :: initializeGraphics() @@ -38,6 +44,7 @@ void MainWindow :: initializeGraphics() void MainWindow::on_comboBoxBatteryChemistry_currentIndexChanged(int index) { m_battery.changeBatteryChemistry(index); + m_battery.calculate(); } @@ -54,9 +61,10 @@ void MainWindow::on_comboBoxWireMaterial_currentIndexChanged(int index) void MainWindow::on_doubleSpinBoxSystemVoltage_valueChanged(double arg1) { - m_wire.setSystemVoltage(arg1); - m_wire.calculate(); + //m_wire.setSystemVoltage(arg1); + //m_wire.calculate(); m_battery.setSystemVoltage(arg1); + m_battery.calculate(); } @@ -66,3 +74,10 @@ void MainWindow::on_doubleSpinBoxEstimatedWireLength_valueChanged(double arg1) m_wire.calculate(); } + +void MainWindow::on_lineEditVoltageRange_textChanged(const QString &arg1) +{ + m_wire.setSystemVoltage((arg1.split(" -")[0]).toDouble()); + m_wire.calculate(); +} + |