Mercurial > bmsapp / changeset

changeset

Removed several debug logmessages in tab 3 and database load.

Fri, 04 Nov 2022 20:14:22 +0100

author
Michiel Broek <mbroek@mbse.eu>
date
Fri, 04 Nov 2022 20:14:22 +0100
changeset 432
f189af715073
parent 431
bfac9a7008a3
child 433
40d4d2bb5f11

Removed several debug logmessages in tab 3 and database load.

src/EditProductTab3.cpp file | annotate | diff | comparison | revisions
src/database/db_product.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/EditProductTab3.cpp	Fri Nov 04 15:56:14 2022 +0100
+++ b/src/EditProductTab3.cpp	Fri Nov 04 20:14:22 2022 +0100
@@ -224,9 +224,6 @@
 	}
 	mashtemp = mashtemp / mashtime;
 	mvol = mashinfuse;
-	qDebug() << "  mash time" << mashtime << "temp" << mashtemp << "infuse" << mashinfuse;
-    } else {
-	qDebug() << "  no mash schedule";
     }
 
     /*
@@ -348,11 +345,11 @@
 	    product->fermentables_ok = false;
 	}
     }
-    qDebug() << "  adjust to 100" << product->fermentables_use100;
-    qDebug() << "  supplies" << product->fermentables_ok;
-    qDebug() << "  colort" << colort << "colorh" << colorh << "colorn" << colorn;
-    qDebug() << "  psugar" << psugar << "pcara" << pcara << "mvol" << mvol;
-    qDebug() << "  sugarsf" << sugarsf << "sugarsm" << sugarsm;
+//    qDebug() << "  adjust to 100" << product->fermentables_use100;
+//    qDebug() << "  supplies" << product->fermentables_ok;
+//    qDebug() << "  colort" << colort << "colorh" << colorh << "colorn" << colorn;
+//    qDebug() << "  psugar" << psugar << "pcara" << pcara << "mvol" << mvol;
+//    qDebug() << "  sugarsf" << sugarsf << "sugarsm" << sugarsm;
 
     double v = s / sugardensity + mvol;
     s = 1000 * s / (v * 10); //deg. Plato
@@ -361,7 +358,7 @@
 
     /* Estimate total recipe OG */
     product->est_og = Utils::estimate_sg(sugarsf + addedS, product->batch_size);
-    qDebug() << "  OG" << ui->est_ogEdit->value() << product->est_og;
+//    qDebug() << "  OG" << ui->est_ogEdit->value() << product->est_og;
     if (product->stage > PROD_STAGE_BREW) {
 	ui->est_ogLabel->setText(tr("Final OG:"));
 	ui->est_ogEdit->setValue(product->og);
@@ -380,7 +377,7 @@
     /* Estimate SG in kettle before boil */
     product->preboil_sg = Utils::estimate_sg(sugarsm, product->boil_size);
     ui->brew_preboilsgShow->setValue(product->preboil_sg);
-    qDebug() << "  preboil SG" << product->preboil_sg;
+//    qDebug() << "  preboil SG" << product->preboil_sg;
 
     /*
      * Recalculate volumes
@@ -458,7 +455,7 @@
 	color = Utils::kw_to_ebc(product->color_method, cw);
 	//qDebug() << "  oud EBC" << color << "new EBC" << Utils::kw_to_newebc(product->color_method, cw) << "SRM" << Utils::kw_to_srm(product->color_method, cw);
     }
-    qDebug() << "  color" << ui->est_colorEdit->value() << color << product->est_color;
+    //qDebug() << "  color" << ui->est_colorEdit->value() << color << product->est_color;
     product->est_color = color;
     ui->est_color2Edit->setValue(color);
     ui->est_color2Edit->setStyleSheet(Utils::ebc_to_style(color));
@@ -481,10 +478,10 @@
     ui->perc_sugarsShow->setValue(round(psugar));
     ui->perc_caraShow->setValue(round(pcara));
     if (product->mashs_kg > 0) {
-	qDebug() << "  lintner" << lintner << "  mashkg" << product->mashs_kg << "final" << round(lintner / product->mashs_kg);
+//	qDebug() << "  lintner" << lintner << "  mashkg" << product->mashs_kg << "final" << round(lintner / product->mashs_kg);
 	ui->lintnerShow->setValue(round(lintner / product->mashs_kg));
     } else {
-	qDebug() << "  lintner N/A";
+//	qDebug() << "  lintner N/A";
 	ui->lintnerShow->setValue(0);
     }
 
@@ -513,7 +510,7 @@
 		product->yeasts_ok = false;
 	    }
 	}
-	qDebug() << "  est SVG" << svg;
+//	qDebug() << "  est SVG" << svg;
     }
     if (svg == 0)
 	svg = 77.0;
@@ -523,9 +520,9 @@
 	product->est_fg = Utils::estimate_fg(psugar, pcara, mashinfuse / product->mashs_kg, mashtime, mashtemp, svg, product->est_og);
     else
 	product->est_fg = Utils::estimate_fg(psugar, pcara, 0, 0, 0, svg, product->est_og);
-    qDebug() << "  est FG" << ui->est_fgEdit->value() << product->est_fg;
+//    qDebug() << "  est FG" << ui->est_fgEdit->value() << product->est_fg;
     product->est_abv = Utils::abvol(product->est_og, product->est_fg);
-    qDebug() << "  est ABV" << ui->est_abvEdit->value() << product->est_abv;
+//    qDebug() << "  est ABV" << ui->est_abvEdit->value() << product->est_abv;
 
     if (product->stage > PROD_STAGE_TERTIARY) {
 	ui->est_fgLabel->setText(tr("Final FG:"));
@@ -705,7 +702,6 @@
 
     QPushButton *pb = qobject_cast<QPushButton *>(QObject::sender());
     int row = pb->objectName().toInt();
-    qDebug() << "Delete fermentable row" << row << product->fermentables.size();
 
     if (product->fermentables.size() < 1)
 	return;
@@ -855,7 +851,7 @@
 	}
 	product->fermentables[product->fermentables_row].adjust_to_total_100 = true;
     } else {
-	qDebug() << "bug";
+	qWarning() << "ferment_to100_changed(" << val << ") bug triggered";
 	return;
     }
 
--- a/src/database/db_product.cpp	Fri Nov 04 15:56:14 2022 +0100
+++ b/src/database/db_product.cpp	Fri Nov 04 20:14:22 2022 +0100
@@ -33,9 +33,9 @@
 	return false;
     }
 
-    QSqlRecord rec = query.record();
-    for (int i = 0; i < rec.count(); i++)
-	qDebug() << i << rec.fieldName(i) << query.value(i);
+//    QSqlRecord rec = query.record();
+//    for (int i = 0; i < rec.count(); i++)
+//	qDebug() << i << rec.fieldName(i) << query.value(i);
 
     prod->record = query.value("record").toInt();
     prod->uuid = query.value("uuid").toString();
@@ -321,7 +321,7 @@
 		    }
 		    prod->fermentables.append(f);
 		}
-		qDebug() << "fermentables" << prod->fermentables.size() << percentcheck;
+//		qDebug() << "fermentables" << prod->fermentables.size() << percentcheck;
 		if (percentcheck == 0 && prod->fermentables.size()) {
 		    /* Missing percentages, fix it. */
 		    double total = 0;
@@ -334,11 +334,10 @@
 			    prod->fermentables[i].percentage = round((prod->fermentables.at(i).amount / total) * 10000.0) / 100.0;
 		    }
 		    qInfo() << " fixed missing percentages";
-//		    is_changed();
 		}
 	}
     } else {
-	qDebug() << "empty fermentables";
+	qInfo() << "empty fermentables";
     }
 
     const auto& h_json = query.value("json_hops").toString();
@@ -389,10 +388,10 @@
 		    }
 		    prod->hops.append(h);
 		}
-		qDebug() << "hops" << prod->hops.size();
+//		qDebug() << "hops" << prod->hops.size();
 	    }
     } else {
-	qDebug() << "empty hops";
+	qInfo() << "empty hops";
     }
 
     const auto& json = query.value("json_miscs").toString();
@@ -424,10 +423,10 @@
                     }
 		    prod->miscs.append(m);
 		}
-		qDebug() << "miscs" << prod->miscs.size();
+//		qDebug() << "miscs" << prod->miscs.size();
 	    }
     } else {
-	qDebug() << "empty miscs";
+	qInfo() << "empty miscs";
     }
 
     const auto& y_json = query.value("json_yeasts").toString();
@@ -507,10 +506,10 @@
 		    }
 		    prod->yeasts.append(y);
 		}
-		qDebug() << "yeasts" << prod->yeasts.size();
+//		qDebug() << "yeasts" << prod->yeasts.size();
 	    }
     } else {
-	qDebug() << "empty yeasts";
+	qInfo() << "empty yeasts";
     }
 
     const auto& ma_json = query.value("json_mashs").toString().trimmed();
@@ -539,9 +538,9 @@
 		}
 	    }
     } else {
-	qDebug() << "empty mashs";
+	qInfo() << "empty mashs";
     }
-    qDebug() << "mashs" << prod->mashs.size();
+//    qDebug() << "mashs" << prod->mashs.size();
 
     return true;
 }
--- a/translations/bmsapp_en.ts	Fri Nov 04 15:56:14 2022 +0100
+++ b/translations/bmsapp_en.ts	Fri Nov 04 20:14:22 2022 +0100
@@ -2913,7 +2913,7 @@
     </message>
     <message>
         <location filename="../ui/EditProduct.ui" line="4137"/>
-        <location filename="../src/EditProductTab3.cpp" line="1114"/>
+        <location filename="../src/EditProductTab3.cpp" line="1115"/>
         <location filename="../src/EditProductTab5.cpp" line="719"/>
         <source>Mash</source>
         <translation type="unfinished"></translation>
@@ -4116,32 +4116,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="361"/>
+        <location filename="../src/EditProductTab3.cpp" line="363"/>
         <source>Final OG:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="461"/>
+        <location filename="../src/EditProductTab3.cpp" line="463"/>
         <source>Final EBC:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="526"/>
+        <location filename="../src/EditProductTab3.cpp" line="528"/>
         <source>Final FG:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="529"/>
+        <location filename="../src/EditProductTab3.cpp" line="531"/>
         <source>Final ABV:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="708"/>
+        <location filename="../src/EditProductTab3.cpp" line="709"/>
         <source>Delete fermentable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="708"/>
+        <location filename="../src/EditProductTab3.cpp" line="709"/>
         <location filename="../src/EditProductTab4.cpp" line="358"/>
         <location filename="../src/EditProductTab5.cpp" line="400"/>
         <location filename="../src/EditProductTab6.cpp" line="748"/>
@@ -4151,46 +4151,46 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1024"/>
+        <location filename="../src/EditProductTab3.cpp" line="1025"/>
         <location filename="../src/EditProductTab5.cpp" line="644"/>
         <source>Current ingredient:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1029"/>
+        <location filename="../src/EditProductTab3.cpp" line="1030"/>
         <source>Supplier:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1034"/>
+        <location filename="../src/EditProductTab3.cpp" line="1035"/>
         <source>Amount in kg:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1039"/>
+        <location filename="../src/EditProductTab3.cpp" line="1040"/>
         <source>Percentage in batch:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1044"/>
+        <location filename="../src/EditProductTab3.cpp" line="1045"/>
         <source>Auto fill to 100%:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1049"/>
+        <location filename="../src/EditProductTab3.cpp" line="1050"/>
         <location filename="../src/EditProductTab4.cpp" line="630"/>
         <location filename="../src/EditProductTab6.cpp" line="1007"/>
         <source>Use at:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1054"/>
+        <location filename="../src/EditProductTab3.cpp" line="1055"/>
         <location filename="../src/EditProductTab5.cpp" line="670"/>
         <source>Select ingredient:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1059"/>
+        <location filename="../src/EditProductTab3.cpp" line="1060"/>
         <location filename="../src/EditProductTab4.cpp" line="640"/>
         <location filename="../src/EditProductTab5.cpp" line="675"/>
         <location filename="../src/EditProductTab6.cpp" line="992"/>
@@ -4198,23 +4198,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1064"/>
+        <location filename="../src/EditProductTab3.cpp" line="1065"/>
         <source>Max in batch:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1115"/>
-        <location filename="../src/EditProductTab5.cpp" line="720"/>
-        <source>Boil</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../src/EditProductTab3.cpp" line="1116"/>
-        <source>Fermentation</source>
+        <location filename="../src/EditProductTab5.cpp" line="720"/>
+        <source>Boil</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/EditProductTab3.cpp" line="1117"/>
+        <source>Fermentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/EditProductTab3.cpp" line="1118"/>
         <source>Lagering</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11649,8 +11649,8 @@
         <location filename="../src/database/db_recipe.cpp" line="654"/>
         <location filename="../src/database/db_recipe.cpp" line="687"/>
         <location filename="../src/database/db_product.cpp" line="31"/>
-        <location filename="../src/database/db_product.cpp" line="1014"/>
-        <location filename="../src/database/db_product.cpp" line="1047"/>
+        <location filename="../src/database/db_product.cpp" line="1013"/>
+        <location filename="../src/database/db_product.cpp" line="1046"/>
         <source>Database error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11663,8 +11663,8 @@
     <message>
         <location filename="../src/database/db_recipe.cpp" line="655"/>
         <location filename="../src/database/db_recipe.cpp" line="688"/>
-        <location filename="../src/database/db_product.cpp" line="1015"/>
-        <location filename="../src/database/db_product.cpp" line="1048"/>
+        <location filename="../src/database/db_product.cpp" line="1014"/>
+        <location filename="../src/database/db_product.cpp" line="1047"/>
         <source>MySQL error: %1
 %2
 %3</source>
--- a/translations/bmsapp_nl.ts	Fri Nov 04 15:56:14 2022 +0100
+++ b/translations/bmsapp_nl.ts	Fri Nov 04 20:14:22 2022 +0100
@@ -2994,7 +2994,7 @@
     </message>
     <message>
         <location filename="../ui/EditProduct.ui" line="4137"/>
-        <location filename="../src/EditProductTab3.cpp" line="1114"/>
+        <location filename="../src/EditProductTab3.cpp" line="1115"/>
         <location filename="../src/EditProductTab5.cpp" line="719"/>
         <source>Mash</source>
         <translation>Maischen</translation>
@@ -4478,22 +4478,22 @@
         <translation>Vergistbaar ingredient is al verwerkt</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="361"/>
+        <location filename="../src/EditProductTab3.cpp" line="363"/>
         <source>Final OG:</source>
         <translation>Finale OG:</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="461"/>
+        <location filename="../src/EditProductTab3.cpp" line="463"/>
         <source>Final EBC:</source>
         <translation>Finale EBC:</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="526"/>
+        <location filename="../src/EditProductTab3.cpp" line="528"/>
         <source>Final FG:</source>
         <translation>Finale FG:</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="529"/>
+        <location filename="../src/EditProductTab3.cpp" line="531"/>
         <source>Final ABV:</source>
         <translation>Finale ABV:</translation>
     </message>
@@ -4510,12 +4510,12 @@
         <translation type="vanished">Finale FG:</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="708"/>
+        <location filename="../src/EditProductTab3.cpp" line="709"/>
         <source>Delete fermentable</source>
         <translation>Verwijder vergistbaar ingredient</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="708"/>
+        <location filename="../src/EditProductTab3.cpp" line="709"/>
         <location filename="../src/EditProductTab4.cpp" line="358"/>
         <location filename="../src/EditProductTab5.cpp" line="400"/>
         <location filename="../src/EditProductTab6.cpp" line="748"/>
@@ -4525,46 +4525,46 @@
         <translation>Verwijder %1</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1024"/>
+        <location filename="../src/EditProductTab3.cpp" line="1025"/>
         <location filename="../src/EditProductTab5.cpp" line="644"/>
         <source>Current ingredient:</source>
         <translation>Huidig ingredient:</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1029"/>
+        <location filename="../src/EditProductTab3.cpp" line="1030"/>
         <source>Supplier:</source>
         <translation>Leverancier:</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1034"/>
+        <location filename="../src/EditProductTab3.cpp" line="1035"/>
         <source>Amount in kg:</source>
         <translation>Gewicht in kg:</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1039"/>
+        <location filename="../src/EditProductTab3.cpp" line="1040"/>
         <source>Percentage in batch:</source>
         <translation>Percentage in stort:</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1044"/>
+        <location filename="../src/EditProductTab3.cpp" line="1045"/>
         <source>Auto fill to 100%:</source>
         <translation>Aanvullen tot 100%:</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1049"/>
+        <location filename="../src/EditProductTab3.cpp" line="1050"/>
         <location filename="../src/EditProductTab4.cpp" line="630"/>
         <location filename="../src/EditProductTab6.cpp" line="1007"/>
         <source>Use at:</source>
         <translation>Toevoegen bij:</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1054"/>
+        <location filename="../src/EditProductTab3.cpp" line="1055"/>
         <location filename="../src/EditProductTab5.cpp" line="670"/>
         <source>Select ingredient:</source>
         <translation>Kies ingredient:</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1059"/>
+        <location filename="../src/EditProductTab3.cpp" line="1060"/>
         <location filename="../src/EditProductTab4.cpp" line="640"/>
         <location filename="../src/EditProductTab5.cpp" line="675"/>
         <location filename="../src/EditProductTab6.cpp" line="992"/>
@@ -4572,23 +4572,23 @@
         <translation>In voorraad:</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1064"/>
+        <location filename="../src/EditProductTab3.cpp" line="1065"/>
         <source>Max in batch:</source>
         <translation>Max. in stort:</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1115"/>
+        <location filename="../src/EditProductTab3.cpp" line="1116"/>
         <location filename="../src/EditProductTab5.cpp" line="720"/>
         <source>Boil</source>
         <translation>Koken</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1116"/>
+        <location filename="../src/EditProductTab3.cpp" line="1117"/>
         <source>Fermentation</source>
         <translation>Hoofdvergisting</translation>
     </message>
     <message>
-        <location filename="../src/EditProductTab3.cpp" line="1117"/>
+        <location filename="../src/EditProductTab3.cpp" line="1118"/>
         <source>Lagering</source>
         <translation>Nagisting/lagering</translation>
     </message>
@@ -13082,8 +13082,8 @@
         <location filename="../src/database/db_recipe.cpp" line="654"/>
         <location filename="../src/database/db_recipe.cpp" line="687"/>
         <location filename="../src/database/db_product.cpp" line="31"/>
-        <location filename="../src/database/db_product.cpp" line="1014"/>
-        <location filename="../src/database/db_product.cpp" line="1047"/>
+        <location filename="../src/database/db_product.cpp" line="1013"/>
+        <location filename="../src/database/db_product.cpp" line="1046"/>
         <source>Database error</source>
         <translation>Database fout</translation>
     </message>
@@ -13096,8 +13096,8 @@
     <message>
         <location filename="../src/database/db_recipe.cpp" line="655"/>
         <location filename="../src/database/db_recipe.cpp" line="688"/>
-        <location filename="../src/database/db_product.cpp" line="1015"/>
-        <location filename="../src/database/db_product.cpp" line="1048"/>
+        <location filename="../src/database/db_product.cpp" line="1014"/>
+        <location filename="../src/database/db_product.cpp" line="1047"/>
         <source>MySQL error: %1
 %2
 %3</source>

Mercurial Repository: bmsapp

mercurial