bmsapp: comparison src/EditRecipeTab4.cpp

-:b5b2483f3a3f
+:58e4ce7dd217
 QTableWidgetItem *item;
 qDebug() << "refreshMiscs" << recipe->miscs.size();
 std::sort(recipe->miscs.begin(), recipe->miscs.end(), misc_sort_test);
-/*
+const QSignalBlocker blocker1(ui->bs_cacl2Edit);
-* During filling the table turn off the cellChanged signal because every cell that is filled
+const QSignalBlocker blocker2(ui->bs_caso4Edit);
-* triggers the cellChanged signal. The QTableWidget has no better signal to use.
+const QSignalBlocker blocker3(ui->bs_mgso4Edit);
-*/
+const QSignalBlocker blocker4(ui->bs_naclEdit);
-this->ignoreChanges = true;
+const QSignalBlocker blocker5(ui->bs_mgcl2Edit);
+const QSignalBlocker blocker6(ui->bs_nahco3Edit);
+const QSignalBlocker blocker7(ui->bs_caco3Edit);
+const QSignalBlocker blocker8(ui->mw_acidPick);
+const QSignalBlocker blocker9(ui->mw_acidvolEdit);
 const QStringList labels({tr("Ingredient"), tr("Type"), tr("Use at"), tr("Time"), tr("Amount"), tr("Delete"), tr("Edit") });
 ui->miscsTable->setColumnCount(7);
 ui->miscsTable->setColumnWidth(0, 300);	/* Ingredient	*/
 ui->mw_acidpercEdit->setValue(my_acids.at(3).AcidPrc);
 ui->mw_acidvolEdit->setValue(recipe->miscs.at(i).m_amount * 1000.0);
 	    }
 	}
 }
-this->ignoreChanges = false;
 }
 /*
 * Manipulate the memory array and update the miscs table.
 /*
 * Edit brewing salt and recalculate.
 */
 void EditRecipe::set_brewing_salt(QString salt, double val)
 {
-if (this->ignoreChanges)
-	return;
 val = round(val * 100.0) / 100.0;
 qDebug() << "set_brewing_salt" << salt << val;
 brewing_salt_sub(salt, val);
 calcWater();
 is_changed();
 int rc = QMessageBox::warning(this, tr("Delete misc"), tr("Delete %1").arg(recipe->miscs.at(row).m_name),
 QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
 if (rc == QMessageBox::No)
 return;
-this->ignoreChanges = true;
 recipe->miscs.removeAt(row);
-this->ignoreChanges = false;
 is_changed();
 emit refreshAll();
 }
 void EditRecipe::misc_amount_changed(double val)
 {
 QTableWidgetItem *item;
 qDebug() << "misc_amount_changed()" << recipe->miscs_row << val;
-this->ignoreChanges = true;
 recipe->miscs[recipe->miscs_row].m_amount = val / 1000.0;
 if (recipe->miscs.at(recipe->miscs_row).m_amount_is_weight) {
 item = new QTableWidgetItem(QString("%1 gr").arg(recipe->miscs.at(recipe->miscs_row).m_amount * 1000.0, 3, 'f', 2, '0'));
 } else {
 item = new QTableWidgetItem(QString("%1 ml").arg(recipe->miscs.at(recipe->miscs_row).m_amount * 1000.0, 3, 'f', 2, '0'));
 }
 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
 ui->miscsTable->setItem(recipe->miscs_row, 4, item);
-this->ignoreChanges = false;
 is_changed();
 }
 void EditRecipe::misc_time_changed(int val)
 {
 QTableWidgetItem *item;
 qDebug() << "misc_time_changed()" << recipe->miscs_row << val;
-this->ignoreChanges = true;
 if (recipe->miscs.at(recipe->miscs_row).m_use_use == 2) {       // Boil
 	recipe->miscs[recipe->miscs_row].m_time = val;
 	item = new QTableWidgetItem(QString("%1 min.").arg(val, 1, 'f', 0, '0'));
 } else if (recipe->miscs.at(recipe->miscs_row).m_use_use == 3 || recipe->miscs.at(recipe->miscs_row).m_use_use == 4) {  // Primary or secondary
 	recipe->miscs[recipe->miscs_row].m_time = val * 1440;
 	item = new QTableWidgetItem(QString(""));
 }
 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
 ui->miscsTable->setItem(recipe->miscs_row, 3, item);
-this->ignoreChanges = false;
 is_changed();
 }
 void EditRecipe::misc_select_changed(int val)
 qDebug() << "found" << query.value(0).toString();
 /*
 * Replace the misc record contents
 */
-this->ignoreChanges = true;
 recipe->miscs[recipe->miscs_row].m_name = query.value(0).toString();
 recipe->miscs[recipe->miscs_row].m_type = query.value(1).toInt();
 recipe->miscs[recipe->miscs_row].m_use_use = query.value(2).toInt();
 recipe->miscs[recipe->miscs_row].m_time = query.value(3).toDouble();
 recipe->miscs[recipe->miscs_row].m_amount_is_weight = query.value(4).toInt() ? true:false;
 	item = new QTableWidgetItem(QString("%1 ml").arg(recipe->miscs.at(recipe->miscs_row).m_amount * 1000.0, 3, 'f', 2, '0'));
 }
 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
 ui->miscsTable->setItem(recipe->miscs_row, 4, item);
-this->ignoreChanges = false;
 is_changed();
 emit refreshAll();
 }
 void EditRecipe::misc_useat_changed(int val)
 {
 QTableWidgetItem *item;
 qDebug() << "misc_useat_changed" << val;
-this->ignoreChanges = true;
 recipe->miscs[recipe->miscs_row].m_use_use = val;
 item = new QTableWidgetItem(m_uses[val]);
 item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
 ui->miscsTable->setItem(recipe->miscs_row, 2, item);
 item = new QTableWidgetItem(QString(""));
 }
 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
 ui->miscsTable->setItem(recipe->miscs_row, 3, item);
-this->ignoreChanges = false;
 is_changed();
 }
 void EditRecipe::editMiscRow_clicked()
 double amount;
 if (recipe->miscs.size() == 0)
 	return;
-this->ignoreChanges = true;
+const QSignalBlocker blocker1(ui->bs_cacl2Edit);
+const QSignalBlocker blocker2(ui->bs_caso4Edit);
+const QSignalBlocker blocker3(ui->bs_mgso4Edit);
+const QSignalBlocker blocker4(ui->bs_naclEdit);
+const QSignalBlocker blocker5(ui->bs_mgcl2Edit);
+const QSignalBlocker blocker6(ui->bs_nahco3Edit);
+const QSignalBlocker blocker7(ui->bs_caco3Edit);
+const QSignalBlocker blocker9(ui->mw_acidvolEdit);
 for (int i = 0; i < recipe->miscs.size(); i++) {
 	amount = recipe->miscs.at(i).m_amount * factor;
 	recipe->miscs[i].m_amount = amount;
 	/*
 } else if (recipe->miscs.at(i).m_name == "Zwavelzuur" || recipe->miscs.at(i).m_name == "Sulfuric") {
 ui->mw_acidvolEdit->setValue(recipe->miscs.at(i).m_amount * 1000.0);
 }
 }
 }
-this->ignoreChanges = false;
+}
-}

Mercurial > bmsapp / file comparison

comparison: src/EditRecipeTab4.cpp

src/EditRecipeTab4.cpp