Mercurial > bmsapp / file diff

--- a/src/EditProductTab3.cpp	Fri Apr 29 17:07:35 2022 +0200
+++ b/src/EditProductTab3.cpp	Fri Apr 29 20:29:26 2022 +0200
@@ -40,9 +40,9 @@
 	pLayout->setAlignment(Qt::AlignCenter);
 	pLayout->setContentsMargins(0, 0, 0, 0);
 	pWidget->setLayout(pLayout);
-	ui->fermentablesTable->setCellWidget(row, 9, pWidget);
+	ui->fermentablesTable->setCellWidget(row, 10, pWidget);
     } else {
-	ui->fermentablesTable->removeCellWidget(row, 9);
+	ui->fermentablesTable->removeCellWidget(row, 10);
     }
 }
 
@@ -58,20 +58,21 @@
     std::sort(product->fermentables.begin(), product->fermentables.end(), ferment_sort_test);
 
     const QStringList labels({tr("Supplier"), tr("Fermentable"), tr("EBC"), tr("Type"), tr("Graintype"), tr("When"), tr("Yield"),
-		    	      tr("Amount"), tr("Procent"), tr("100%"), tr("Delete"), tr("Edit") });
-    ui->fermentablesTable->setColumnCount(12);
-    ui->fermentablesTable->setColumnWidth(0, 150);     /* Supplier	*/
-    ui->fermentablesTable->setColumnWidth(1, 225);     /* Fermentable	*/
-    ui->fermentablesTable->setColumnWidth(2,  50);     /* Color		*/
+		    	      tr("Amount"), tr("Stock"), tr("Procent"), tr("100%"), tr("Delete"), tr("Edit") });
+    ui->fermentablesTable->setColumnCount(13);
+    ui->fermentablesTable->setColumnWidth(0, 130);     /* Supplier	*/
+    ui->fermentablesTable->setColumnWidth(1, 210);     /* Fermentable	*/
+    ui->fermentablesTable->setColumnWidth(2,  45);     /* Color		*/
     ui->fermentablesTable->setColumnWidth(3,  75);     /* Type		*/
     ui->fermentablesTable->setColumnWidth(4,  75);     /* Graintype	*/
-    ui->fermentablesTable->setColumnWidth(5,  82);     /* Added		*/
-    ui->fermentablesTable->setColumnWidth(6,  60);     /* Yield		*/
-    ui->fermentablesTable->setColumnWidth(7,  90);     /* Amount	*/
-    ui->fermentablesTable->setColumnWidth(8,  60);     /* Procent	*/
-    ui->fermentablesTable->setColumnWidth(9,  50);     /* 100%		*/
-    ui->fermentablesTable->setColumnWidth(10, 80);     /* Delete	*/
-    ui->fermentablesTable->setColumnWidth(11, 80);     /* Edit		*/
+    ui->fermentablesTable->setColumnWidth(5,  77);     /* Added		*/
+    ui->fermentablesTable->setColumnWidth(6,  55);     /* Yield		*/
+    ui->fermentablesTable->setColumnWidth(7,  80);     /* Amount	*/
+    ui->fermentablesTable->setColumnWidth(8,  80);     /* Stock		*/
+    ui->fermentablesTable->setColumnWidth(9,  55);     /* Procent	*/
+    ui->fermentablesTable->setColumnWidth(10, 50);     /* 100%		*/
+    ui->fermentablesTable->setColumnWidth(11, 80);     /* Delete	*/
+    ui->fermentablesTable->setColumnWidth(12, 80);     /* Edit		*/
     ui->fermentablesTable->setHorizontalHeaderLabels(labels);
     ui->fermentablesTable->verticalHeader()->hide();
     ui->fermentablesTable->setRowCount(product->fermentables.size());
@@ -106,13 +107,17 @@
         item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
         ui->fermentablesTable->setItem(i, 7, item);
 
+	item = new QTableWidgetItem(QString("%1 Kg").arg(product->fermentables.at(i).f_inventory, 4, 'f', 3, '0'));
+        item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
+        ui->fermentablesTable->setItem(i, 8, item);
+
 	if (product->fermentables.at(i).f_added < 4) {
             item = new QTableWidgetItem(QString("%1%").arg(product->fermentables.at(i).f_percentage, 2, 'f', 1, '0'));
 	} else {
 	    item = new QTableWidgetItem(QString(""));	// Blank for bottling and kegging.
 	}
         item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
-        ui->fermentablesTable->setItem(i, 8, item);
+        ui->fermentablesTable->setItem(i, 9, item);
 
 	to100Fermentables(i);
 
@@ -126,7 +131,7 @@
         pLayout->addWidget(btn_dele);
         pLayout->setContentsMargins(5, 0, 5, 0);
         pWidget->setLayout(pLayout);
-        ui->fermentablesTable->setCellWidget(i, 10, pWidget);
+        ui->fermentablesTable->setCellWidget(i, 11, pWidget);
 
 	pWidget = new QWidget();
 	QPushButton* btn_edit = new QPushButton();
@@ -137,7 +142,7 @@
         pLayout->addWidget(btn_edit);
 	pLayout->setContentsMargins(5, 0, 5, 0);
         pWidget->setLayout(pLayout);
-        ui->fermentablesTable->setCellWidget(i, 11, pWidget);
+        ui->fermentablesTable->setCellWidget(i, 12, pWidget);
     }
 }
 
@@ -213,6 +218,7 @@
     	product->est_abv = 0;
     	ui->calEdit->setValue(0);
 	product->mashs_kg = 0;
+	ui->mash_kgEdit->setValue(0);
 	return;
     }
     qDebug() << "  adjust to 100" << product->fermentables_use100;
@@ -289,11 +295,8 @@
     ui->est_color2Edit->setStyleSheet(Utils::ebc_to_style(color));
     ui->est_colorShow->setValue(color);
 
-    /*
-     * We don't have a equipment profile in products,
-     * so we assume a certain guessed mashtun size.
-     */
-    ui->perc_mashShow->setValue(round(product->mashs_kg / (product->boil_size / 3) * 100));
+    ui->perc_mashShow->setValue(round(product->mashs_kg / product->eq_mash_max * 100));
+    ui->mash_kgEdit->setValue(product->mashs_kg);
     ui->perc_sugarsShow->setValue(round(psugar));
     ui->perc_caraShow->setValue(round(pcara));
     if (product->mashs_kg > 0) {