Sat, 14 Oct 2023 17:18:52 +0200
Added the cell edit function.
--- a/src/CalibrateiSpindel.cpp Sat Oct 14 16:10:14 2023 +0200 +++ b/src/CalibrateiSpindel.cpp Sat Oct 14 17:18:52 2023 +0200 @@ -268,6 +268,34 @@ qDebug() << "Cell at row " + QString::number(nRow) + " column " + QString::number(nCol) + " was changed."; + if (nCol == 0) { // SG changed + double d = ui->dataTable->item(nRow, 0)->text().toDouble(); + if (d < 1.000 || d > 1.100) { + QMessageBox::warning(this, tr("iSpindel calibrate"), tr("The SG must be between 1.000 and 1.100.")); + return; + } + nCal[nRow].sg = d; + nCal[nRow].plato = Utils::sg_to_plato(d); + qDebug() << "sg" << nCal[nRow].sg << "plato" << nCal[nRow].plato; + } else if (nCol == 1) { + double d = ui->dataTable->item(nRow, 1)->text().toDouble(); + if (d < 0 || d > 25) { + QMessageBox::warning(this, tr("iSpindel calibrate"), tr("Plato must be between 0 and 25.")); + return; + } + nCal[nRow].plato = d; + nCal[nRow].sg = Utils::plato_to_sg(d); + qDebug() << "sg" << nCal[nRow].sg << "plato" << nCal[nRow].plato; + } else if (nCol == 2) { + double d = ui->dataTable->item(nRow, 2)->text().toDouble(); + if (d < 10 || d > 80) { + QMessageBox::warning(this, tr("iSpindel calibrate"), tr("The tilt angles must be between 10 and 80.")); + return; + } + nCal[nRow].angle = d; + } + + emit refreshTable(); }
--- a/translations/bmsapp_en.ts Sat Oct 14 16:10:14 2023 +0200 +++ b/translations/bmsapp_en.ts Sat Oct 14 17:18:52 2023 +0200 @@ -101,7 +101,7 @@ </message> <message> <location filename="../src/CalibrateiSpindel.cpp" line="105"/> - <location filename="../src/CalibrateiSpindel.cpp" line="196"/> + <location filename="../src/CalibrateiSpindel.cpp" line="187"/> <source>Angle</source> <translation type="unfinished"></translation> </message> @@ -112,32 +112,50 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/CalibrateiSpindel.cpp" line="184"/> + <location filename="../src/CalibrateiSpindel.cpp" line="175"/> <source>Old</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/CalibrateiSpindel.cpp" line="185"/> + <location filename="../src/CalibrateiSpindel.cpp" line="176"/> <source>New</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/CalibrateiSpindel.cpp" line="188"/> + <location filename="../src/CalibrateiSpindel.cpp" line="179"/> <source>Calibration plot</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/CalibrateiSpindel.cpp" line="244"/> + <location filename="../src/CalibrateiSpindel.cpp" line="235"/> + <location filename="../src/CalibrateiSpindel.cpp" line="274"/> + <location filename="../src/CalibrateiSpindel.cpp" line="283"/> + <location filename="../src/CalibrateiSpindel.cpp" line="292"/> <source>iSpindel calibrate</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/CalibrateiSpindel.cpp" line="244"/> + <location filename="../src/CalibrateiSpindel.cpp" line="235"/> <source>You cannot delete too many rows.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/CalibrateiSpindel.cpp" line="290"/> + <location filename="../src/CalibrateiSpindel.cpp" line="274"/> + <source>The SG must be between 1.000 and 1.100.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/CalibrateiSpindel.cpp" line="283"/> + <source>Plato must be between 0 and 25.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/CalibrateiSpindel.cpp" line="292"/> + <source>The tilt angles must be between 10 and 80.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/CalibrateiSpindel.cpp" line="309"/> <source>BMSapp - Calibrate iSpindel %1</source> <translation type="unfinished"></translation> </message>
--- a/translations/bmsapp_nl.ts Sat Oct 14 16:10:14 2023 +0200 +++ b/translations/bmsapp_nl.ts Sat Oct 14 17:18:52 2023 +0200 @@ -155,7 +155,7 @@ </message> <message> <location filename="../src/CalibrateiSpindel.cpp" line="105"/> - <location filename="../src/CalibrateiSpindel.cpp" line="196"/> + <location filename="../src/CalibrateiSpindel.cpp" line="187"/> <source>Angle</source> <translation type="unfinished"></translation> </message> @@ -166,32 +166,50 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/CalibrateiSpindel.cpp" line="184"/> + <location filename="../src/CalibrateiSpindel.cpp" line="175"/> <source>Old</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/CalibrateiSpindel.cpp" line="185"/> + <location filename="../src/CalibrateiSpindel.cpp" line="176"/> <source>New</source> <translation type="unfinished">Nieuw</translation> </message> <message> - <location filename="../src/CalibrateiSpindel.cpp" line="188"/> + <location filename="../src/CalibrateiSpindel.cpp" line="179"/> <source>Calibration plot</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/CalibrateiSpindel.cpp" line="244"/> + <location filename="../src/CalibrateiSpindel.cpp" line="235"/> + <location filename="../src/CalibrateiSpindel.cpp" line="274"/> + <location filename="../src/CalibrateiSpindel.cpp" line="283"/> + <location filename="../src/CalibrateiSpindel.cpp" line="292"/> <source>iSpindel calibrate</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/CalibrateiSpindel.cpp" line="244"/> + <location filename="../src/CalibrateiSpindel.cpp" line="235"/> <source>You cannot delete too many rows.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/CalibrateiSpindel.cpp" line="290"/> + <location filename="../src/CalibrateiSpindel.cpp" line="274"/> + <source>The SG must be between 1.000 and 1.100.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/CalibrateiSpindel.cpp" line="283"/> + <source>Plato must be between 0 and 25.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/CalibrateiSpindel.cpp" line="292"/> + <source>The tilt angles must be between 10 and 80.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/CalibrateiSpindel.cpp" line="309"/> <source>BMSapp - Calibrate iSpindel %1</source> <translation type="unfinished"></translation> </message>