Mercurial > bmsapp / changeset

changeset

Removed several development debug messages. Implemented delete and add data row.

Mon, 16 Oct 2023 13:25:58 +0200

author
Michiel Broek <mbroek@mbse.eu>
date
Mon, 16 Oct 2023 13:25:58 +0200
changeset 512
1dfae8de6ca9
parent 511
c6fa5be47634
child 513
74835ade981e

Removed several development debug messages. Implemented delete and add data row.

src/CalibrateiSpindel.cpp file | annotate | diff | comparison | revisions
translations/bmsapp_en.ts file | annotate | diff | comparison | revisions
translations/bmsapp_nl.ts file | annotate | diff | comparison | revisions 
--- a/src/CalibrateiSpindel.cpp	Mon Oct 16 11:39:20 2023 +0200
+++ b/src/CalibrateiSpindel.cpp	Mon Oct 16 13:25:58 2023 +0200
@@ -57,7 +57,6 @@
 	_node = query.value("node").toString();
 	_alias = query.value("alias").toString();
 	ui->nameEdit->setText(_node+"/"+_alias);
-	qDebug() << query.value("calibrate").toString();
 
 	QJsonParseError parseError;
         const auto& json = query.value("calibrate").toString();
@@ -73,14 +72,11 @@
 		QJsonArray polyData = jsonObj.value("polyData").toArray();
 		for (int i = 0; i < polyData.size(); i++) {
 		    Old[i] = New[i] = polyData.at(i).toDouble();
-		    qDebug() << i << New[i];
 		}
 		_data_old = QString("(%1 * x^3) + (%2 * x^2) + (%3 * x) + %4").arg(Old[0], 0, 'f', 9, '0').arg(Old[1], 0, 'f', 9, '0').arg(Old[2], 0, 'f', 9, '0').arg(Old[3], 0, 'f', 9, '0');
 		ui->oldEdit->setText(_data_old);
 
-	    	qDebug() << "calData:  " << jsonObj["calData"].toArray();
 		QJsonArray calData = jsonObj.value("calData").toArray();
-		qDebug() << calData;
 		oldtotal = 0;
 		for (int i = 0; i < calData.size(); i++) {
 		    QJsonObject calObj = calData.at(i).toObject();
@@ -99,7 +95,6 @@
     }
 
     connect(ui->dataTable, SIGNAL(cellChanged(int, int)), this, SLOT(cell_Changed(int, int)));
-//    connect(parent, SIGNAL(updateiSpindel(QString)), this, SLOT(refreshiSpindel(QString)));
     emit refreshTable();
 }
 
@@ -140,7 +135,6 @@
     this->dataHasErrors = false;
 
     for (int i = 0; i < newtotal; i++) {
-	qDebug() << i << nCal[i].sg << nCal[i].plato << nCal[i].angle;
 
 	y[i] = nCal[i].plato;
 	x[i] = nCal[i].angle;
@@ -195,7 +189,6 @@
         ui->dataTable->setCellWidget(i, 3, pWidget);
     }
     int rc = Polyfit::polyfit(newtotal, x, y, 4, New);
-    qDebug() << "poly:" << rc << New[0] << New[1] << New[2] << New[3];
 
     _data_new = QString("(%1 * x^3) + (%2 * x^2) + (%3 * x) + %4").arg(New[0], 0, 'f', 9, '0').arg(New[1], 0, 'f', 9, '0').arg(New[2], 0, 'f', 9, '0').arg(New[3], 0, 'f', 9, '0');
     ui->newEdit->setText(_data_new);
@@ -204,7 +197,6 @@
      * Check the new formula against the old formula.
      */
     this->textIsChanged = (_data_old.compare(_data_new) == 0) ? false:true;
-    qDebug() << "changed" << this->textIsChanged << _data_old.compare(_data_new);
     CalibrateiSpindel::WindowTitle();
 
     new_plot = new QLineSeries();
@@ -255,6 +247,7 @@
 CalibrateiSpindel::~CalibrateiSpindel()
 {
     delete ui;
+    emit entry_changed();
 }
 
 
@@ -336,19 +329,8 @@
 	return;
     }
 
-    if (row == (newtotal - 1)) {
-	qDebug() << "Delete last row";
-	newtotal--;
-    } else {
-	newtotal--;
-    	for (int i = row; i < newtotal; i++) {
-	    nCal[i].sg = nCal[i+1].sg;
-	    nCal[i].plato = nCal[i+1].plato;
-	    nCal[i].angle = nCal[i+1].angle;
-	    qDebug() << i << " < " << i+1;
-    	}
-    }
-
+    nCal.removeAt(row);
+    newtotal--;
     emit refreshTable();
 }
 
@@ -356,6 +338,17 @@
 void CalibrateiSpindel::on_addButton_clicked()
 {
     qDebug() << "Add row" << newtotal;
+    this->ignoreChanges = true;
+
+    Calibrate c;
+    c.plato = 10.0;
+    c.angle = 50.0;
+    c.sg = Utils::plato_to_sg(10.0);
+    nCal.append(c);
+    newtotal++;
+
+    this->ignoreChanges = false;
+    emit refreshTable();
 }
 
 
@@ -376,7 +369,6 @@
 	}
 	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) {
@@ -385,7 +377,6 @@
 	}
 	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) {
--- a/translations/bmsapp_en.ts	Mon Oct 16 11:39:20 2023 +0200
+++ b/translations/bmsapp_en.ts	Mon Oct 16 13:25:58 2023 +0200
@@ -85,100 +85,100 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/CalibrateiSpindel.cpp" line="123"/>
+        <location filename="../src/CalibrateiSpindel.cpp" line="118"/>
         <source>SG</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/CalibrateiSpindel.cpp" line="123"/>
+        <location filename="../src/CalibrateiSpindel.cpp" line="118"/>
         <source>°Plato</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/CalibrateiSpindel.cpp" line="123"/>
-        <location filename="../src/CalibrateiSpindel.cpp" line="232"/>
+        <location filename="../src/CalibrateiSpindel.cpp" line="118"/>
+        <location filename="../src/CalibrateiSpindel.cpp" line="224"/>
         <source>Angle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/CalibrateiSpindel.cpp" line="123"/>
-        <location filename="../src/CalibrateiSpindel.cpp" line="189"/>
+        <location filename="../src/CalibrateiSpindel.cpp" line="118"/>
+        <location filename="../src/CalibrateiSpindel.cpp" line="183"/>
         <source>Del</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/CalibrateiSpindel.cpp" line="220"/>
+        <location filename="../src/CalibrateiSpindel.cpp" line="212"/>
         <source>Old</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/CalibrateiSpindel.cpp" line="221"/>
+        <location filename="../src/CalibrateiSpindel.cpp" line="213"/>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/CalibrateiSpindel.cpp" line="224"/>
+        <location filename="../src/CalibrateiSpindel.cpp" line="216"/>
         <source>Calibration plot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/CalibrateiSpindel.cpp" line="264"/>
+        <location filename="../src/CalibrateiSpindel.cpp" line="257"/>
         <source>iSpindel calibrate changed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/CalibrateiSpindel.cpp" line="264"/>
+        <location filename="../src/CalibrateiSpindel.cpp" line="257"/>
         <source>The calibration data has been modified. Save changes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/CalibrateiSpindel.cpp" line="269"/>
+        <location filename="../src/CalibrateiSpindel.cpp" line="262"/>
         <source>Data is changed but has errors, not saving.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/CalibrateiSpindel.cpp" line="316"/>
+        <location filename="../src/CalibrateiSpindel.cpp" line="309"/>
         <source>Database error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/CalibrateiSpindel.cpp" line="317"/>
+        <location filename="../src/CalibrateiSpindel.cpp" line="310"/>
         <source>MySQL error: %1
 %2
 %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/CalibrateiSpindel.cpp" line="269"/>
-        <location filename="../src/CalibrateiSpindel.cpp" line="335"/>
-        <location filename="../src/CalibrateiSpindel.cpp" line="374"/>
-        <location filename="../src/CalibrateiSpindel.cpp" line="383"/>
-        <location filename="../src/CalibrateiSpindel.cpp" line="392"/>
+        <location filename="../src/CalibrateiSpindel.cpp" line="262"/>
+        <location filename="../src/CalibrateiSpindel.cpp" line="328"/>
+        <location filename="../src/CalibrateiSpindel.cpp" line="367"/>
+        <location filename="../src/CalibrateiSpindel.cpp" line="376"/>
+        <location filename="../src/CalibrateiSpindel.cpp" line="385"/>
         <source>iSpindel calibrate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/CalibrateiSpindel.cpp" line="335"/>
+        <location filename="../src/CalibrateiSpindel.cpp" line="328"/>
         <source>You cannot delete too many rows.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/CalibrateiSpindel.cpp" line="374"/>
+        <location filename="../src/CalibrateiSpindel.cpp" line="367"/>
         <source>The SG must be between 1.000 and 1.100.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/CalibrateiSpindel.cpp" line="383"/>
+        <location filename="../src/CalibrateiSpindel.cpp" line="376"/>
         <source>Plato must be between 0 and 25.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/CalibrateiSpindel.cpp" line="392"/>
+        <location filename="../src/CalibrateiSpindel.cpp" line="385"/>
         <source>The tilt angles must be between 10 and 80.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/CalibrateiSpindel.cpp" line="409"/>
+        <location filename="../src/CalibrateiSpindel.cpp" line="402"/>
         <source>BMSapp - Calibrate iSpindel %1</source>
         <translation type="unfinished"></translation>
     </message>
--- a/translations/bmsapp_nl.ts	Mon Oct 16 11:39:20 2023 +0200
+++ b/translations/bmsapp_nl.ts	Mon Oct 16 13:25:58 2023 +0200
@@ -143,64 +143,64 @@
         <translation type="unfinished">Terug</translation>
     </message>
     <message>
-        <location filename="../src/CalibrateiSpindel.cpp" line="123"/>
+        <location filename="../src/CalibrateiSpindel.cpp" line="118"/>
         <source>SG</source>
         <translation type="unfinished">SG</translation>
     </message>
     <message>
-        <location filename="../src/CalibrateiSpindel.cpp" line="123"/>
+        <location filename="../src/CalibrateiSpindel.cpp" line="118"/>
         <source>°Plato</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/CalibrateiSpindel.cpp" line="123"/>
-        <location filename="../src/CalibrateiSpindel.cpp" line="232"/>
+        <location filename="../src/CalibrateiSpindel.cpp" line="118"/>
+        <location filename="../src/CalibrateiSpindel.cpp" line="224"/>
         <source>Angle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/CalibrateiSpindel.cpp" line="123"/>
-        <location filename="../src/CalibrateiSpindel.cpp" line="189"/>
+        <location filename="../src/CalibrateiSpindel.cpp" line="118"/>
+        <location filename="../src/CalibrateiSpindel.cpp" line="183"/>
         <source>Del</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/CalibrateiSpindel.cpp" line="220"/>
+        <location filename="../src/CalibrateiSpindel.cpp" line="212"/>
         <source>Old</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/CalibrateiSpindel.cpp" line="221"/>
+        <location filename="../src/CalibrateiSpindel.cpp" line="213"/>
         <source>New</source>
         <translation type="unfinished">Nieuw</translation>
     </message>
     <message>
-        <location filename="../src/CalibrateiSpindel.cpp" line="224"/>
+        <location filename="../src/CalibrateiSpindel.cpp" line="216"/>
         <source>Calibration plot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/CalibrateiSpindel.cpp" line="264"/>
+        <location filename="../src/CalibrateiSpindel.cpp" line="257"/>
         <source>iSpindel calibrate changed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/CalibrateiSpindel.cpp" line="264"/>
+        <location filename="../src/CalibrateiSpindel.cpp" line="257"/>
         <source>The calibration data has been modified. Save changes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/CalibrateiSpindel.cpp" line="269"/>
+        <location filename="../src/CalibrateiSpindel.cpp" line="262"/>
         <source>Data is changed but has errors, not saving.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/CalibrateiSpindel.cpp" line="316"/>
+        <location filename="../src/CalibrateiSpindel.cpp" line="309"/>
         <source>Database error</source>
         <translation type="unfinished">Database fout</translation>
     </message>
     <message>
-        <location filename="../src/CalibrateiSpindel.cpp" line="317"/>
+        <location filename="../src/CalibrateiSpindel.cpp" line="310"/>
         <source>MySQL error: %1
 %2
 %3</source>
@@ -209,36 +209,36 @@
 %3</translation>
     </message>
     <message>
-        <location filename="../src/CalibrateiSpindel.cpp" line="269"/>
-        <location filename="../src/CalibrateiSpindel.cpp" line="335"/>
-        <location filename="../src/CalibrateiSpindel.cpp" line="374"/>
-        <location filename="../src/CalibrateiSpindel.cpp" line="383"/>
-        <location filename="../src/CalibrateiSpindel.cpp" line="392"/>
+        <location filename="../src/CalibrateiSpindel.cpp" line="262"/>
+        <location filename="../src/CalibrateiSpindel.cpp" line="328"/>
+        <location filename="../src/CalibrateiSpindel.cpp" line="367"/>
+        <location filename="../src/CalibrateiSpindel.cpp" line="376"/>
+        <location filename="../src/CalibrateiSpindel.cpp" line="385"/>
         <source>iSpindel calibrate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/CalibrateiSpindel.cpp" line="335"/>
+        <location filename="../src/CalibrateiSpindel.cpp" line="328"/>
         <source>You cannot delete too many rows.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/CalibrateiSpindel.cpp" line="374"/>
+        <location filename="../src/CalibrateiSpindel.cpp" line="367"/>
         <source>The SG must be between 1.000 and 1.100.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/CalibrateiSpindel.cpp" line="383"/>
+        <location filename="../src/CalibrateiSpindel.cpp" line="376"/>
         <source>Plato must be between 0 and 25.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/CalibrateiSpindel.cpp" line="392"/>
+        <location filename="../src/CalibrateiSpindel.cpp" line="385"/>
         <source>The tilt angles must be between 10 and 80.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/CalibrateiSpindel.cpp" line="409"/>
+        <location filename="../src/CalibrateiSpindel.cpp" line="402"/>
         <source>BMSapp - Calibrate iSpindel %1</source>
         <translation type="unfinished"></translation>
     </message>

Mercurial Repository: bmsapp

mercurial