Mercurial > bmsapp / changeset

--- a/src/EditProductTab6.cpp	Thu Feb 02 17:14:28 2023 +0100
+++ b/src/EditProductTab6.cpp	Fri Feb 03 11:59:17 2023 +0100
@@ -295,18 +295,22 @@
 #endif
 		}
 
-		initcells = (product->yeasts.at(i).cells / 1000000) * product->yeasts.at(i).amount * (product->starter_viability / 100.0);
+		double cells = product->yeasts.at(i).cells;
+		if (product->yeasts.at(i).yp_cells > 0) {	// Use from yeastpack if set
+		    cells = product->yeasts.at(i).yp_cells;
+		}
+		initcells = (cells / 1000000) * product->yeasts.at(i).amount * (product->starter_viability / 100.0);
 		if (product->yeasts.at(i).form == YEAST_FORMS_LIQUID)
-		    initcells = (product->yeasts.at(i).cells / 1000000000) * product->yeasts.at(i).amount * (product->starter_viability / 100.0);
+		    initcells = (cells / 1000000000) * product->yeasts.at(i).amount * (product->starter_viability / 100.0);
 
 		needed = round(product->yeast_pitchrate * volume * plato * 10.0) / 10.0;
 		ui->neededShow->setValue(needed);
-		if (needed > initcells) {
+		if ((0.9 * needed) > initcells) {	// Allow 90% underpitch without a starter
 		    maybe_starter = true;
 		}
 
 #ifdef DEBUG_YEAST
-		qDebug() << "  Pitchrate:" << product->yeast_pitchrate << "needed:" << needed << "initcells:" << initcells << "starter" << maybe_starter;
+		qDebug() << "  Pitchrate:" << product->yeast_pitchrate << "needed:" << 0.9 * needed << "/" << needed << "initcells:" << initcells << "starter" << maybe_starter;
 #endif
 	    }
 	    break;
@@ -337,6 +341,8 @@
 
 	const QStringList labels({tr("Method"), tr("Volume"), tr("Inj. factor"), tr("New cells"), tr("Total cells"), tr("Grow factor"), "" });
 	ui->starterTable->show();
+	ui->restartLabel->show();
+	ui->restartButton->show();
 	ui->starterTable->setEditTriggers(QAbstractItemView::NoEditTriggers);
 	ui->starterTable->clear();
 	ui->starterTable->setColumnCount(7);
@@ -352,6 +358,8 @@
 	calcSteps(product->starter_type, initcells, needed);
     } else {
 	ui->starterTable->hide();
+	ui->restartLabel->hide();
+	ui->restartButton->hide();
     }
     calcBU();
 }

--- a/translations/bmsapp_nl.ts	Thu Feb 02 17:14:28 2023 +0100
+++ b/translations/bmsapp_nl.ts	Fri Feb 03 11:59:17 2023 +0100
@@ -5300,7 +5300,7 @@
     <message>
         <location filename="../src/EditProductTab6.cpp" line="1291"/>
         <source>Select package:</source>
-        <translation type="unfinished"></translation>
+        <translation>Kies verpakking:</translation>
     </message>
     <message>
         <location filename="../src/EditProductTab6.cpp" line="1360"/>
@@ -8045,7 +8045,7 @@
     <message>
         <location filename="../src/EditRecipeTab5.cpp" line="41"/>
         <source>STA</source>
-        <translation type="unfinished">STA</translation>
+        <translation>STA</translation>
     </message>
     <message>
         <location filename="../src/EditRecipeTab5.cpp" line="280"/>
@@ -9177,7 +9177,7 @@
     <message>
         <location filename="../ui/EditYeastPack.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="unfinished">Dialog</translation>
+        <translation>Dialog</translation>
     </message>
     <message>
         <source>Name:</source>
@@ -9186,12 +9186,12 @@
     <message>
         <location filename="../ui/EditYeastPack.ui" line="29"/>
         <source>Package:</source>
-        <translation type="unfinished"></translation>
+        <translation>Verpakking:</translation>
     </message>
     <message>
         <location filename="../ui/EditYeastPack.ui" line="45"/>
         <source>Notes:</source>
-        <translation type="unfinished">Opmerkingen:</translation>
+        <translation>Opmerkingen:</translation>
     </message>
     <message>
         <source>Name of the yeast</source>
@@ -9200,105 +9200,107 @@
     <message>
         <location filename="../ui/EditYeastPack.ui" line="64"/>
         <source>Name of the yeast package</source>
-        <translation type="unfinished"></translation>
+        <translation>Naam van de gist verpakking</translation>
     </message>
     <message>
         <location filename="../ui/EditYeastPack.ui" line="77"/>
         <source>Notes and usage tips.</source>
-        <translation type="unfinished">Opmerkingen en gebruik tips.</translation>
+        <translation>Opmerkingen en gebruik tips.</translation>
     </message>
     <message>
         <location filename="../ui/EditYeastPack.ui" line="96"/>
         <source>Quit</source>
-        <translation type="unfinished">Terug</translation>
+        <translation>Terug</translation>
     </message>
     <message>
         <location filename="../ui/EditYeastPack.ui" line="116"/>
         <source>Save</source>
-        <translation type="unfinished">Bewaar</translation>
+        <translation>Bewaar</translation>
     </message>
     <message>
         <location filename="../ui/EditYeastPack.ui" line="136"/>
         <source>Delete</source>
-        <translation type="unfinished">Verwijder</translation>
+        <translation>Verwijder</translation>
     </message>
     <message>
         <location filename="../ui/EditYeastPack.ui" line="153"/>
         <source>Form:</source>
-        <translation type="unfinished">Vorm:</translation>
+        <translation>Vorm:</translation>
     </message>
     <message>
         <location filename="../ui/EditYeastPack.ui" line="169"/>
         <source>Laboratory:</source>
-        <translation type="unfinished">Laboratorium:</translation>
+        <translation>Laboratorium:</translation>
     </message>
     <message>
         <location filename="../ui/EditYeastPack.ui" line="217"/>
         <source>Billion cells:</source>
-        <translation type="unfinished"></translation>
+        <translation>Miljard cellen:</translation>
     </message>
     <message>
         <location filename="../ui/EditYeastPack.ui" line="233"/>
         <source>If set this will override the yeast cells setting.
 Use with great care!</source>
-        <translation type="unfinished"></translation>
+        <translation>Wordt gebruikt in plaats van gist cellen indien ingesteld.
+Gebruik alleen indien nuttig!</translation>
     </message>
     <message>
         <location filename="../ui/EditYeastPack.ui" line="276"/>
         <source>Viability:</source>
-        <translation type="unfinished"></translation>
+        <translation>Levelsvatbaarheid:</translation>
     </message>
     <message>
         <location filename="../ui/EditYeastPack.ui" line="292"/>
         <source>The viability after one month.</source>
-        <translation type="unfinished"></translation>
+        <translation>De levensvatbaarheid na een maand.</translation>
     </message>
     <message>
         <location filename="../ui/EditYeastPack.ui" line="320"/>
         <source>Package size:</source>
-        <translation type="unfinished"></translation>
+        <translation>Verpakking grootte:</translation>
     </message>
     <message>
         <location filename="../ui/EditYeastPack.ui" line="336"/>
         <source>The contents size of one package.</source>
-        <translation type="unfinished"></translation>
+        <translation>De inhoud grootte van een enkel pakket.</translation>
     </message>
     <message>
         <location filename="../ui/EditYeastPack.ui" line="345"/>
         <source> xx</source>
-        <translation type="unfinished"></translation>
+        <translation> xx</translation>
     </message>
     <message>
         <location filename="../ui/EditYeastPack.ui" line="367"/>
         <source>Used in yeasts:</source>
-        <translation type="unfinished"></translation>
+        <translation>Gebruikt in gisten:</translation>
     </message>
     <message>
         <location filename="../ui/EditYeastPack.ui" line="408"/>
         <source>Max viability:</source>
-        <translation type="unfinished"></translation>
+        <translation>Maximum levensvatbaarheid:</translation>
     </message>
     <message>
         <location filename="../ui/EditYeastPack.ui" line="424"/>
         <source>For most 100% is good, some liquid yeast start at 97%</source>
-        <translation type="unfinished"></translation>
+        <translation>Meestal 100%, sommige vloeibare gisten beginnen met 97%</translation>
     </message>
     <message>
         <location filename="../ui/EditYeastPack.ui" line="433"/>
         <location filename="../ui/EditYeastPack.ui" line="471"/>
         <source> %</source>
-        <translation type="unfinished"> %</translation>
+        <translation> %</translation>
     </message>
     <message>
         <location filename="../ui/EditYeastPack.ui" line="455"/>
         <source>The yeast health after six months since production.
 This is a calculated from the Viability and Max values.</source>
-        <translation type="unfinished"></translation>
+        <translation>De gist conditie na zes maanden sinds de productie.
+Berekend van de Levensvatbaarheid en Max waardes.</translation>
     </message>
     <message>
         <location filename="../ui/EditYeastPack.ui" line="490"/>
         <source>6 months health:</source>
-        <translation type="unfinished"></translation>
+        <translation>6 maanden conditie:</translation>
     </message>
     <message>
         <source>Best for:</source>
@@ -9307,7 +9309,7 @@
     <message>
         <location filename="../ui/EditYeastPack.ui" line="204"/>
         <source>Yeast laboratory</source>
-        <translation type="unfinished">Gist laboratorium</translation>
+        <translation>Gist laboratorium</translation>
     </message>
     <message>
         <source>Billion cells/gram:</source>
@@ -9316,7 +9318,7 @@
     <message>
         <location filename="../ui/EditYeastPack.ui" line="259"/>
         <source>Clone</source>
-        <translation type="unfinished">Kloon</translation>
+        <translation>Kloon</translation>
     </message>
     <message>
         <source>Spice</source>
@@ -9369,47 +9371,47 @@
     <message>
         <location filename="../src/EditYeastPack.cpp" line="33"/>
         <source>Liquid</source>
-        <translation type="unfinished">Vloeibaar</translation>
+        <translation>Vloeibaar</translation>
     </message>
     <message>
         <location filename="../src/EditYeastPack.cpp" line="34"/>
         <source>Dry</source>
-        <translation type="unfinished">Droog</translation>
+        <translation>Droog</translation>
     </message>
     <message>
         <location filename="../src/EditYeastPack.cpp" line="35"/>
         <source>Slant</source>
-        <translation type="unfinished">Schuine buis</translation>
+        <translation>Schuine buis</translation>
     </message>
     <message>
         <location filename="../src/EditYeastPack.cpp" line="36"/>
         <source>Culture</source>
-        <translation type="unfinished">Slurry</translation>
+        <translation>Slurry</translation>
     </message>
     <message>
         <location filename="../src/EditYeastPack.cpp" line="37"/>
         <source>Frozen</source>
-        <translation type="unfinished">Ingevroren</translation>
+        <translation>Ingevroren</translation>
     </message>
     <message>
         <location filename="../src/EditYeastPack.cpp" line="38"/>
         <source>Bottle</source>
-        <translation type="unfinished"></translation>
+        <translation>Fles</translation>
     </message>
     <message>
         <location filename="../src/EditYeastPack.cpp" line="39"/>
         <source>Dried</source>
-        <translation type="unfinished">Gedroogd</translation>
+        <translation>Gedroogd</translation>
     </message>
     <message>
         <location filename="../src/EditYeastPack.cpp" line="95"/>
         <source>BMSapp - Add new yeast package</source>
-        <translation type="unfinished"></translation>
+        <translation>BMSapp - Nieuwe gist verpakking</translation>
     </message>
     <message>
         <location filename="../src/EditYeastPack.cpp" line="97"/>
         <source>BMSapp - Edit yeast package %1</source>
-        <translation type="unfinished"></translation>
+        <translation>BMSapp - Wijzig gist verpakking %1</translation>
     </message>
     <message>
         <source>Edit Misc</source>
@@ -9423,24 +9425,24 @@
         <location filename="../src/EditYeastPack.cpp" line="113"/>
         <location filename="../src/EditYeastPack.cpp" line="117"/>
         <source>Edit Yeast Package</source>
-        <translation type="unfinished"></translation>
+        <translation>Wijzig gist verpakking</translation>
     </message>
     <message>
         <location filename="../src/EditYeastPack.cpp" line="113"/>
         <source>Laboratory name empty or too short.</source>
-        <translation type="unfinished"></translation>
+        <translation>Laboratorium naam leeg of te kort.</translation>
     </message>
     <message>
         <location filename="../src/EditYeastPack.cpp" line="117"/>
         <source>Package name empty or too short.</source>
-        <translation type="unfinished"></translation>
+        <translation>Verpakking naam leeg of te kort.</translation>
     </message>
     <message>
         <location filename="../src/EditYeastPack.cpp" line="147"/>
         <location filename="../src/EditYeastPack.cpp" line="182"/>
         <location filename="../src/EditYeastPack.cpp" line="207"/>
         <source>Database error</source>
-        <translation type="unfinished">Database fout</translation>
+        <translation>Database fout</translation>
     </message>
     <message>
         <location filename="../src/EditYeastPack.cpp" line="148"/>
@@ -9449,39 +9451,39 @@
         <source>MySQL error: %1
 %2
 %3</source>
-        <translation type="unfinished">MySQL fout: %1
+        <translation>MySQL fout: %1
 %2
 %3</translation>
     </message>
     <message>
         <location filename="../src/EditYeastPack.cpp" line="197"/>
         <source>Delete yeast pack</source>
-        <translation type="unfinished"></translation>
+        <translation>Verwijder hist verpakking</translation>
     </message>
     <message>
         <location filename="../src/EditYeastPack.cpp" line="197"/>
         <source>Delete %1</source>
-        <translation type="unfinished">Verwijder %1</translation>
+        <translation>Verwijder %1</translation>
     </message>
     <message>
         <location filename="../src/EditYeastPack.cpp" line="242"/>
         <source> gr</source>
-        <translation type="unfinished"> gr</translation>
+        <translation> gr</translation>
     </message>
     <message>
         <location filename="../src/EditYeastPack.cpp" line="244"/>
         <source> ml</source>
-        <translation type="unfinished"> ml</translation>
+        <translation> ml</translation>
     </message>
     <message>
         <location filename="../src/EditYeastPack.cpp" line="292"/>
         <source>Yeast package changed</source>
-        <translation type="unfinished"></translation>
+        <translation>Gist verpakking gewijzigd</translation>
     </message>
     <message>
         <location filename="../src/EditYeastPack.cpp" line="292"/>
         <source>The yeast package has been modified. Save changes?</source>
-        <translation type="unfinished"></translation>
+        <translation>Deze gist verpakking is gewijzigd. Wijzigingen opslaan?</translation>
     </message>
 </context>
 <context>
@@ -10472,27 +10474,27 @@
     <message>
         <location filename="../src/InventoryYeastPacks.cpp" line="52"/>
         <source>Quit</source>
-        <translation type="unfinished">Terug</translation>
+        <translation>Terug</translation>
     </message>
     <message>
         <location filename="../src/InventoryYeastPacks.cpp" line="61"/>
         <source>Export</source>
-        <translation type="unfinished">Exporteer</translation>
+        <translation>Exporteer</translation>
     </message>
     <message>
         <location filename="../src/InventoryYeastPacks.cpp" line="70"/>
         <source>New</source>
-        <translation type="unfinished">Nieuw</translation>
+        <translation>Nieuw</translation>
     </message>
     <message>
         <location filename="../src/InventoryYeastPacks.cpp" line="95"/>
         <source>Laboratory</source>
-        <translation type="unfinished">Laboratorium</translation>
+        <translation>Laboratorium</translation>
     </message>
     <message>
         <location filename="../src/InventoryYeastPacks.cpp" line="173"/>
         <source>BeerXML doesn&apos;t support export yeast packages.</source>
-        <translation type="unfinished"></translation>
+        <translation>BeerXML ondersteunt geen export van gist verpakkingen.</translation>
     </message>
     <message>
         <source>Product id</source>
@@ -10505,7 +10507,7 @@
     <message>
         <location filename="../src/InventoryYeastPacks.cpp" line="95"/>
         <source>Form</source>
-        <translation type="unfinished">Vorm</translation>
+        <translation>Vorm</translation>
     </message>
     <message>
         <source>Stock</source>
@@ -10515,22 +10517,22 @@
         <location filename="../src/InventoryYeastPacks.cpp" line="95"/>
         <location filename="../src/InventoryYeastPacks.cpp" line="131"/>
         <source>Edit</source>
-        <translation type="unfinished">Wijzig</translation>
+        <translation>Wijzig</translation>
     </message>
     <message>
         <location filename="../src/InventoryYeastPacks.cpp" line="95"/>
         <source>Package</source>
-        <translation type="unfinished">Verpakken</translation>
+        <translation>Verpakking</translation>
     </message>
     <message>
         <location filename="../src/InventoryYeastPacks.cpp" line="95"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation>Grootte</translation>
     </message>
     <message>
         <location filename="../src/InventoryYeastPacks.cpp" line="140"/>
         <source>Total items: %1</source>
-        <translation type="unfinished">Totaal items: %1</translation>
+        <translation>Totaal items: %1</translation>
     </message>
     <message>
         <source>Save File</source>
@@ -10956,7 +10958,7 @@
     <message>
         <location filename="../ui/MainWindow.ui" line="527"/>
         <source>Yeast Packages</source>
-        <translation type="unfinished"></translation>
+        <translation>Gist verpakkingen</translation>
     </message>
 </context>
 <context>

--- a/ui/EditYeastPack.ui	Thu Feb 02 17:14:28 2023 +0100
+++ b/ui/EditYeastPack.ui	Fri Feb 03 11:59:17 2023 +0100
@@ -207,9 +207,9 @@
      <widget class="QLabel" name="cellsLabel">
       <property name="geometry">
        <rect>
-        <x>100</x>
+        <x>50</x>
         <y>280</y>
-        <width>141</width>
+        <width>191</width>
         <height>20</height>
        </rect>
       </property>
@@ -266,9 +266,9 @@
      <widget class="QLabel" name="viabilityLabel">
       <property name="geometry">
        <rect>
-        <x>100</x>
+        <x>50</x>
         <y>310</y>
-        <width>141</width>
+        <width>191</width>
         <height>20</height>
        </rect>
       </property>
@@ -310,9 +310,9 @@
      <widget class="QLabel" name="sizeLabel">
       <property name="geometry">
        <rect>
-        <x>100</x>
+        <x>50</x>
         <y>370</y>
-        <width>141</width>
+        <width>191</width>
         <height>20</height>
        </rect>
       </property>
@@ -398,9 +398,9 @@
      <widget class="QLabel" name="maxLabel">
       <property name="geometry">
        <rect>
-        <x>100</x>
+        <x>50</x>
         <y>340</y>
-        <width>141</width>
+        <width>191</width>
         <height>20</height>
        </rect>
       </property>