Mercurial > bmsapp / changeset

--- a/src/EditProductTab1.cpp	Sat Oct 08 10:26:31 2022 +0200
+++ b/src/EditProductTab1.cpp	Sat Oct 08 14:33:36 2022 +0200
@@ -172,7 +172,7 @@
 void EditProduct::boil_time_changed(int val)
 {
     qDebug() << "boil_time_changed" << val;
-    double new_evap = (0.1 * product->batch_size) * val / 60.0;
+    double new_evap = product->eq_evap_rate * val / 60.0;
     product->boil_size = product->batch_size + new_evap;
     product->boil_time = val;
     ui->boil_sizeEdit->setValue(product->boil_size);
@@ -187,7 +187,7 @@
 {
     qDebug() << "batch_size_changed" << val << "old" << product->batch_size;
 
-    double evap = (0.1 * val) * product->boil_time / 60.0;
+    double evap = product->eq_evap_rate * product->boil_time / 60.0;
     product->boil_size = val + evap;
     double factor = val / product->batch_size;
     ui->boil_sizeEdit->setValue(product->boil_size);
@@ -276,8 +276,6 @@
     ui->notesEdit->setReadOnly(locked);
     ui->batch_sizeEdit->setReadOnly(stage > PROD_STAGE_WAIT);
     ui->batch_sizeEdit->setButtonSymbols((stage > PROD_STAGE_WAIT) ? QAbstractSpinBox::NoButtons : QAbstractSpinBox::UpDownArrows);
-    ui->boil_sizeEdit->setReadOnly(stage > PROD_STAGE_WAIT);
-    ui->boil_sizeEdit->setButtonSymbols((stage > PROD_STAGE_WAIT) ? QAbstractSpinBox::NoButtons : QAbstractSpinBox::UpDownArrows);
     ui->boil_timeEdit->setReadOnly(stage > PROD_STAGE_WAIT);
     ui->boil_timeEdit->setButtonSymbols((stage > PROD_STAGE_WAIT) ? QAbstractSpinBox::NoButtons : QAbstractSpinBox::UpDownArrows);
     ui->efficiencyEdit->setReadOnly(stage > PROD_STAGE_WAIT);

--- a/src/EditRecipeTab1.cpp	Sat Oct 08 10:26:31 2022 +0200
+++ b/src/EditRecipeTab1.cpp	Sat Oct 08 14:33:36 2022 +0200
@@ -224,8 +224,6 @@
     ui->notesEdit->setReadOnly(val);
     ui->batch_sizeEdit->setReadOnly(val);
     ui->batch_sizeEdit->setButtonSymbols(val ? QAbstractSpinBox::NoButtons : QAbstractSpinBox::UpDownArrows);
-    ui->boil_sizeEdit->setReadOnly(val);
-    ui->boil_sizeEdit->setButtonSymbols(val ? QAbstractSpinBox::NoButtons : QAbstractSpinBox::UpDownArrows);
     ui->boil_timeEdit->setReadOnly(val);
     ui->boil_timeEdit->setButtonSymbols(val ? QAbstractSpinBox::NoButtons : QAbstractSpinBox::UpDownArrows);
     ui->efficiencyEdit->setReadOnly(val);

--- a/ui/EditProduct.ui	Sat Oct 08 10:26:31 2022 +0200
+++ b/ui/EditProduct.ui	Sat Oct 08 14:33:36 2022 +0200
@@ -374,7 +374,7 @@
          <rect>
           <x>890</x>
           <y>150</y>
-          <width>101</width>
+          <width>86</width>
           <height>24</height>
          </rect>
         </property>
@@ -382,10 +382,10 @@
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
         <property name="readOnly">
-         <bool>false</bool>
+         <bool>true</bool>
         </property>
         <property name="buttonSymbols">
-         <enum>QAbstractSpinBox::UpDownArrows</enum>
+         <enum>QAbstractSpinBox::NoButtons</enum>
         </property>
         <property name="accelerated">
          <bool>false</bool>

--- a/ui/EditRecipe.ui	Sat Oct 08 10:26:31 2022 +0200
+++ b/ui/EditRecipe.ui	Sat Oct 08 14:33:36 2022 +0200
@@ -371,7 +371,7 @@
          <rect>
           <x>890</x>
           <y>180</y>
-          <width>101</width>
+          <width>86</width>
           <height>24</height>
          </rect>
         </property>
@@ -379,10 +379,10 @@
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
         <property name="readOnly">
-         <bool>false</bool>
+         <bool>true</bool>
         </property>
         <property name="buttonSymbols">
-         <enum>QAbstractSpinBox::UpDownArrows</enum>
+         <enum>QAbstractSpinBox::NoButtons</enum>
         </property>
         <property name="accelerated">
          <bool>true</bool>