bmsapp: comparison src/EditRecipeTab5.cpp

-:b5b2483f3a3f
+:58e4ce7dd217
 QTableWidgetItem *item;
 qDebug() << "refreshYeasts" << recipe->yeasts.size();
 std::sort(recipe->yeasts.begin(), recipe->yeasts.end(), yeast_sort_test);
-/*
-* During filling the table turn off the cellChanged signal because every cell that is filled
-* triggers the cellChanged signal. The QTableWidget has no better signal to use.
-*/
-this->ignoreChanges = true;
 const QStringList labels({tr("Yeast"), tr("Laboratory"), tr("Code"), tr("Type"), tr("Use for"), tr("Min. °C"), tr("Max. °C"),
 		              tr("Tol. %"), tr("Attn. %"), tr("Amount"), tr("Delete"), tr("Edit") });
 ui->yeastsTable->setColumnCount(12);
 ui->yeastsTable->setColumnWidth(0, 200);	/* Yeast	*/
 pLayout->addWidget(btn_edit);
 pLayout->setContentsMargins(5, 0, 5, 0);
 pWidget->setLayout(pLayout);
 ui->yeastsTable->setCellWidget(i, 11, pWidget);
 }
-this->ignoreChanges = false;
 }
 /*
 * The results are not stored line in EditProduct. This is just a hint.
 int rc = QMessageBox::warning(this, tr("Delete yeast"), tr("Delete %1").arg(recipe->yeasts.at(row).y_name),
 QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
 if (rc == QMessageBox::No)
 return;
-this->ignoreChanges = true;
 recipe->yeasts.removeAt(row);
-this->ignoreChanges = false;
 is_changed();
 emit refreshAll();
 }
 void EditRecipe::yeast_amount_changed(double val)
 {
 QTableWidgetItem *item;
 qDebug() << "yeast_amount_changed()" << recipe->yeasts_row << val;
-this->ignoreChanges = true;
+if (recipe->yeasts.at(recipe->yeasts_row).y_form == 0) {
-recipe->yeasts[recipe->yeasts_row].y_amount = val / 1000.0;
+	recipe->yeasts[recipe->yeasts_row].y_amount = val;
-item = new QTableWidgetItem(QString("%1 gr").arg(val, 2, 'f', 1, '0'));
+item = new QTableWidgetItem(QString("%1 pack").arg(val, 1, 'f', 0, '0'));
+} else if (recipe->yeasts.at(recipe->yeasts_row).y_form == 1) {
+	recipe->yeasts[recipe->yeasts_row].y_amount = val / 1000.0;
+item = new QTableWidgetItem(QString("%1 gr").arg(val, 3, 'f', 2, '0'));
+} else {
+recipe->yeasts[recipe->yeasts_row].y_amount = val / 1000.0;
+item = new QTableWidgetItem(QString("%1 ml").arg(val, 3, 'f', 2, '0'));
+}
 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
-ui->yeastsTable->setItem(recipe->yeasts_row, 8, item);
+ui->yeastsTable->setItem(recipe->yeasts_row, 9, item);
-this->ignoreChanges = false;
 calcYeast();
 is_changed();
 }
 qDebug() << "found" << query.value(0).toString() << query.value(2).toString();
 /*
 * Replace the yeast record contents
 */
-this->ignoreChanges = true;
 recipe->yeasts[recipe->yeasts_row].y_name = query.value(0).toString();
 recipe->yeasts[recipe->yeasts_row].y_laboratory = query.value(1).toString();
 recipe->yeasts[recipe->yeasts_row].y_product_id = query.value(2).toString();
 recipe->yeasts[recipe->yeasts_row].y_type = query.value(3).toInt();
 recipe->yeasts[recipe->yeasts_row].y_form = query.value(4).toInt();
 * Update the visible fields
 */
 ynameEdit->setText(recipe->yeasts.at(recipe->yeasts_row).y_name);
 ylaboratoryEdit->setText(recipe->yeasts.at(recipe->yeasts_row).y_laboratory);
 yproduct_idEdit->setText(recipe->yeasts.at(recipe->yeasts_row).y_product_id);
+if (recipe->yeasts.at(recipe->yeasts_row).y_form == 0) {
+	yamountEdit->setDecimals(0);
+	yamountEdit->setSingleStep(1.0);
+	yamountLabel->setText(tr("Total packs:"));
+} else if (recipe->yeasts.at(recipe->yeasts_row).y_form == 1) {
+	yamountEdit->setDecimals(1);
+	yamountEdit->setSingleStep(0.5);
+	yamountLabel->setText(tr("Amount in gr:"));
+} else {
+	yamountEdit->setDecimals(1);
+	yamountEdit->setSingleStep(0.5);
+	yamountLabel->setText(tr("Amount in ml:"));
+}
 ui->yeastsTable->setItem(recipe->yeasts_row, 0, new QTableWidgetItem(recipe->yeasts.at(recipe->yeasts_row).y_name));
 ui->yeastsTable->setItem(recipe->yeasts_row, 1, new QTableWidgetItem(recipe->yeasts.at(recipe->yeasts_row).y_laboratory));
 ui->yeastsTable->setItem(recipe->yeasts_row, 2, new QTableWidgetItem(recipe->yeasts.at(recipe->yeasts_row).y_product_id));
 item = new QTableWidgetItem(QString("%1").arg(recipe->yeasts.at(recipe->yeasts_row).y_attenuation, 2, 'f', 1, '0'));
 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
 ui->yeastsTable->setItem(recipe->yeasts_row, 8, item);
-this->ignoreChanges = false;
 calcYeast();
 is_changed();
 }
 void EditRecipe::yeast_useat_changed(int val)
 {
 qDebug() << "yeast_useat_changed()" << recipe->yeasts_row << val;
-this->ignoreChanges = true;
 recipe->yeasts[recipe->yeasts_row].y_use = val;
 QTableWidgetItem *item = new QTableWidgetItem(y_use[val]);
 item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
 ui->yeastsTable->setItem(recipe->yeasts_row, 5, item);
-this->ignoreChanges = false;
 is_changed();
 emit refreshAll();
 }
 QLabel *instockLabel = new QLabel(dialog);
 instockLabel->setObjectName(QString::fromUtf8("instockLabel"));
 instockLabel->setText(tr("In stock:"));
 instockLabel->setGeometry(QRect(525,100, 121, 20));
 instockLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
-QLabel *amountLabel = new QLabel(dialog);
+yamountLabel = new QLabel(dialog);
-amountLabel->setObjectName(QString::fromUtf8("amountLabel"));
+yamountLabel->setObjectName(QString::fromUtf8("amountLabel"));
-amountLabel->setText(tr("Amount in gr:"));
+if (recipe->yeasts.at(recipe->yeasts_row).y_form == 0)
-amountLabel->setGeometry(QRect(10, 130, 141, 20));
+	yamountLabel->setText(tr("Total packs:"));
-amountLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
+else if (recipe->yeasts.at(recipe->yeasts_row).y_form == 1)
+	yamountLabel->setText(tr("Amount in gr:"));
+else
+	yamountLabel->setText(tr("Amount in ml:"));
+yamountLabel->setGeometry(QRect(10, 130, 141, 20));
+yamountLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
 QLabel *useatLabel = new QLabel(dialog);
 useatLabel->setObjectName(QString::fromUtf8("useatLabel"));
 useatLabel->setText(tr("Use at:"));
 useatLabel->setGeometry(QRect(10, 160, 141, 20));
 useatLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
 yamountEdit = new QDoubleSpinBox(dialog);
 yamountEdit->setObjectName(QString::fromUtf8("yamountEdit"));
 yamountEdit->setGeometry(QRect(160, 130, 121, 24));
 yamountEdit->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
 yamountEdit->setAccelerated(true);
-yamountEdit->setDecimals(1);
+if (recipe->yeasts.at(recipe->yeasts_row).y_form == 0) {
-yamountEdit->setMaximum(1000000.0);
+	yamountEdit->setDecimals(0);
-yamountEdit->setSingleStep(0.5);
+yamountEdit->setSingleStep(1.0);
-yamountEdit->setValue(recipe->yeasts.at(recipe->yeasts_row).y_amount * 1000.0);
+	yamountEdit->setValue(recipe->yeasts.at(recipe->yeasts_row).y_amount);
+} else if (recipe->yeasts.at(recipe->yeasts_row).y_form == 1) {
+	yamountEdit->setDecimals(1);
+	yamountEdit->setSingleStep(0.5);
+	yamountEdit->setValue(recipe->yeasts.at(recipe->yeasts_row).y_amount * 1000.0);
+} else {
+	yamountEdit->setDecimals(1);
+yamountEdit->setSingleStep(0.5);
+	yamountEdit->setValue(recipe->yeasts.at(recipe->yeasts_row).y_amount * 1000.0);
+}
+yamountEdit->setMaximum(1000000000.0);
 useatEdit = new QComboBox(dialog);
 useatEdit->setObjectName(QString::fromUtf8("useatEdit"));
 useatEdit->setGeometry(QRect(160, 160, 161, 23));
 useatEdit->addItem(tr("Primary"));
 useatEdit->addItem(tr("Secondary"));

Mercurial > bmsapp / file comparison

comparison: src/EditRecipeTab5.cpp

src/EditRecipeTab5.cpp