Sat, 19 Nov 2022 13:55:12 +0100
Toon ook de gewenste en verwachte hergisting druk.
--- a/src/DetailCO2meter.cpp Fri Nov 18 16:57:02 2022 +0100 +++ b/src/DetailCO2meter.cpp Sat Nov 19 13:55:12 2022 +0100 @@ -83,7 +83,8 @@ _beername = query.value("beername").toString(); sql = "SELECT " - "st_carb_min,st_carb_max,secondary_temp,primary_end_temp,bottle_carbonation_temp" + "st_carb_min,st_carb_max,secondary_temp,primary_end_temp,bottle_carbonation_temp," + "bottle_carbonation" " FROM products WHERE code=:code AND name=:name"; query2.prepare(sql); query2.bindValue(":code", _beercode); @@ -98,13 +99,16 @@ TSec = 18; double carbtemp = query2.value("bottle_carbonation_temp").toDouble(); - double barmin = Utils::GetPressureBar(Utils::CarbCO2toS(query2.value("st_carb_min").toDouble(), TSec, 1), carbtemp); - double barmax = Utils::GetPressureBar(Utils::CarbCO2toS(query2.value("st_carb_max").toDouble(), TSec, 1), carbtemp); + double barmin = Utils::GetPressureBar(Utils::CarbCO2toS(query2.value("st_carb_min").toDouble(), TSec, 1), carbtemp); + double barmax = Utils::GetPressureBar(Utils::CarbCO2toS(query2.value("st_carb_max").toDouble(), TSec, 1), carbtemp); + double barthis = Utils::GetPressureBar(Utils::CarbCO2toS(query2.value("bottle_carbonation").toDouble(), TSec, 1), carbtemp); ui->minVol->setValue(query2.value("st_carb_min").toDouble()); ui->maxVol->setValue(query2.value("st_carb_max").toDouble()); + ui->thisVol->setValue(query2.value("bottle_carbonation").toDouble()); ui->minBar->setValue(barmin); ui->maxBar->setValue(barmax); - qDebug() << " beerdata" << TSec << carbtemp << barmin << barmax; + ui->thisBar->setValue(barthis); + qDebug() << " beerdata" << TSec << carbtemp << barmin << barmax << barthis; ui->barMeter->setNominal(barmin); ui->barMeter->setCritical(barmax);
--- a/src/Utils.cpp Fri Nov 18 16:57:02 2022 +0100 +++ b/src/Utils.cpp Sat Nov 19 13:55:12 2022 +0100 @@ -797,7 +797,7 @@ P = 0; P = round(P * 100.0) / 100.0; - qDebug() << " GetPressureBar(" << gl << "," << T << ") P:" << P; + //qDebug() << " GetPressureBar(" << gl << "," << T << ") P:" << P; return P; }
--- a/translations/bmsapp_en.ts Fri Nov 18 16:57:02 2022 +0100 +++ b/translations/bmsapp_en.ts Sat Nov 19 13:55:12 2022 +0100 @@ -354,37 +354,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/DetailCO2meter.ui" line="519"/> - <source>Maximum</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/DetailCO2meter.ui" line="597"/> - <source>Minimum</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/DetailCO2meter.ui" line="503"/> - <source>Vol CO2:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/DetailCO2meter.ui" line="456"/> - <source>Bar:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/DetailCO2meter.ui" line="620"/> + <location filename="../ui/DetailCO2meter.ui" line="425"/> + <source>The minimum calculated pressure in Bar for this beerstyle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/DetailCO2meter.ui" line="459"/> + <source>Bar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/DetailCO2meter.ui" line="475"/> + <source>The maximum volumes CO2 for this beerstyle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/DetailCO2meter.ui" line="509"/> + <source>Vol CO2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/DetailCO2meter.ui" line="525"/> + <source>Maximum:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/DetailCO2meter.ui" line="541"/> + <source>The minimum volumes CO2 for this beerstyle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/DetailCO2meter.ui" line="575"/> + <source>The maximum calculated pressure in Bar for this beerstyle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/DetailCO2meter.ui" line="609"/> + <source>Minimum:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/DetailCO2meter.ui" line="632"/> <source>Style limits</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/DetailCO2meter.ui" line="652"/> + <location filename="../ui/DetailCO2meter.ui" line="648"/> + <source>The expected calculated pressure in Bar for this beer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/DetailCO2meter.ui" line="682"/> + <source>This beer:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/DetailCO2meter.ui" line="698"/> + <source>The desired volumes CO2 for this beer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/DetailCO2meter.ui" line="748"/> <source>Quit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/DetailCO2meter.ui" line="669"/> + <location filename="../ui/DetailCO2meter.ui" line="765"/> <source>Log</source> <translation type="unfinished"></translation> </message> @@ -394,12 +429,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/DetailCO2meter.cpp" line="118"/> + <location filename="../src/DetailCO2meter.cpp" line="122"/> <source>Online</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/DetailCO2meter.cpp" line="141"/> + <location filename="../src/DetailCO2meter.cpp" line="145"/> <source>Offline</source> <translation type="unfinished"></translation> </message> @@ -896,57 +931,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="425"/> - <source>Temperature</source> + <location filename="../ui/DetailiSpindel.ui" line="412"/> + <source>Current status:</source> <translation type="unfinished"></translation> </message> <message> <location filename="../ui/DetailiSpindel.ui" line="441"/> + <source>Temperature</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/DetailiSpindel.ui" line="457"/> <source>Shows the temperature</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="483"/> + <location filename="../ui/DetailiSpindel.ui" line="499"/> <source>Apperant Attenuation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="516"/> - <source>Fermentation progress</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../ui/DetailiSpindel.ui" line="532"/> + <source>Fermentation progress</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/DetailiSpindel.ui" line="548"/> <source>OG</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="545"/> + <location filename="../ui/DetailiSpindel.ui" line="561"/> <source>SG</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="558"/> + <location filename="../ui/DetailiSpindel.ui" line="574"/> <source>SVG</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="571"/> + <location filename="../ui/DetailiSpindel.ui" line="587"/> <source>ABV</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="584"/> + <location filename="../ui/DetailiSpindel.ui" line="600"/> <source>Battery</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="683"/> + <location filename="../ui/DetailiSpindel.ui" line="699"/> <source>Quit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="700"/> + <location filename="../ui/DetailiSpindel.ui" line="716"/> <source>Log</source> <translation type="unfinished"></translation> </message>
--- a/translations/bmsapp_nl.ts Fri Nov 18 16:57:02 2022 +0100 +++ b/translations/bmsapp_nl.ts Sat Nov 19 13:55:12 2022 +0100 @@ -403,29 +403,80 @@ <translation>Toont de temperatuur</translation> </message> <message> - <location filename="../ui/DetailCO2meter.ui" line="519"/> + <location filename="../ui/DetailCO2meter.ui" line="425"/> + <source>The minimum calculated pressure in Bar for this beerstyle</source> + <translation>De minimum berekende druk in Bar voor deze bierstijl</translation> + </message> + <message> + <location filename="../ui/DetailCO2meter.ui" line="459"/> + <source>Bar</source> + <translation>Bar</translation> + </message> + <message> + <location filename="../ui/DetailCO2meter.ui" line="475"/> + <source>The maximum volumes CO2 for this beerstyle</source> + <translation>De maximum volumes CO2 voor deze bierstijl</translation> + </message> + <message> + <location filename="../ui/DetailCO2meter.ui" line="509"/> + <source>Vol CO2</source> + <translation>Vol CO2</translation> + </message> + <message> + <location filename="../ui/DetailCO2meter.ui" line="525"/> + <source>Maximum:</source> + <translation>Maximum:</translation> + </message> + <message> + <location filename="../ui/DetailCO2meter.ui" line="541"/> + <source>The minimum volumes CO2 for this beerstyle</source> + <translation>De minimum volumes CO2 voor deze bierstijl</translation> + </message> + <message> + <location filename="../ui/DetailCO2meter.ui" line="575"/> + <source>The maximum calculated pressure in Bar for this beerstyle</source> + <translation>De maximum berekende druk in Bar voor deze bierstijl</translation> + </message> + <message> + <location filename="../ui/DetailCO2meter.ui" line="609"/> + <source>Minimum:</source> + <translation>Minimum:</translation> + </message> + <message> + <location filename="../ui/DetailCO2meter.ui" line="648"/> + <source>The expected calculated pressure in Bar for this beer</source> + <translation>De berekende verwachte druk in Bar voor dit bier</translation> + </message> + <message> + <location filename="../ui/DetailCO2meter.ui" line="682"/> + <source>This beer:</source> + <translation>Dit bier:</translation> + </message> + <message> + <location filename="../ui/DetailCO2meter.ui" line="698"/> + <source>The desired volumes CO2 for this beer</source> + <translation>De gewenste volumes CO2 voor dit bier</translation> + </message> + <message> <source>Maximum</source> - <translation>Maximum</translation> - </message> - <message> - <location filename="../ui/DetailCO2meter.ui" line="597"/> + <translation type="vanished">Maximum</translation> + </message> + <message> <source>Minimum</source> - <translation>Minimum</translation> - </message> - <message> - <location filename="../ui/DetailCO2meter.ui" line="620"/> + <translation type="vanished">Minimum</translation> + </message> + <message> + <location filename="../ui/DetailCO2meter.ui" line="632"/> <source>Style limits</source> <translation>Stijl limieten</translation> </message> <message> - <location filename="../ui/DetailCO2meter.ui" line="503"/> <source>Vol CO2:</source> - <translation>Vol CO2:</translation> - </message> - <message> - <location filename="../ui/DetailCO2meter.ui" line="456"/> + <translation type="vanished">Vol CO2:</translation> + </message> + <message> <source>Bar:</source> - <translation>Druk bar:</translation> + <translation type="vanished">Druk bar:</translation> </message> <message> <source>Shows the beer temperature</source> @@ -436,12 +487,12 @@ <translation type="obsolete">Toont de lucht temperatuur</translation> </message> <message> - <location filename="../ui/DetailCO2meter.ui" line="652"/> + <location filename="../ui/DetailCO2meter.ui" line="748"/> <source>Quit</source> <translation>Terug</translation> </message> <message> - <location filename="../ui/DetailCO2meter.ui" line="669"/> + <location filename="../ui/DetailCO2meter.ui" line="765"/> <source>Log</source> <translation>Log</translation> </message> @@ -451,12 +502,12 @@ <translation>BMSapp - Details carbonatie</translation> </message> <message> - <location filename="../src/DetailCO2meter.cpp" line="118"/> + <location filename="../src/DetailCO2meter.cpp" line="122"/> <source>Online</source> <translation>Online</translation> </message> <message> - <location filename="../src/DetailCO2meter.cpp" line="141"/> + <location filename="../src/DetailCO2meter.cpp" line="145"/> <source>Offline</source> <translation>Offline</translation> </message> @@ -953,12 +1004,17 @@ <translation>Densiteit SG:</translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="425"/> - <source>Temperature</source> - <translation>Temperatuur</translation> + <location filename="../ui/DetailiSpindel.ui" line="412"/> + <source>Current status:</source> + <translation>Huidige status:</translation> </message> <message> <location filename="../ui/DetailiSpindel.ui" line="441"/> + <source>Temperature</source> + <translation>Temperatuur</translation> + </message> + <message> + <location filename="../ui/DetailiSpindel.ui" line="457"/> <source>Shows the temperature</source> <translation>Toont de temperatuur</translation> </message> @@ -967,47 +1023,47 @@ <translation type="obsolete">Toont de lucht temperatuur</translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="483"/> + <location filename="../ui/DetailiSpindel.ui" line="499"/> <source>Apperant Attenuation</source> <translation>Schijnbare vergisting</translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="516"/> - <source>Fermentation progress</source> - <translation>Vergisting voortgang</translation> - </message> - <message> <location filename="../ui/DetailiSpindel.ui" line="532"/> + <source>Fermentation progress</source> + <translation>Vergisting voortgang</translation> + </message> + <message> + <location filename="../ui/DetailiSpindel.ui" line="548"/> <source>OG</source> <translation>OG</translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="545"/> + <location filename="../ui/DetailiSpindel.ui" line="561"/> <source>SG</source> <translation>SG</translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="558"/> + <location filename="../ui/DetailiSpindel.ui" line="574"/> <source>SVG</source> <translation>SVG</translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="571"/> + <location filename="../ui/DetailiSpindel.ui" line="587"/> <source>ABV</source> <translation>ABV</translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="584"/> + <location filename="../ui/DetailiSpindel.ui" line="600"/> <source>Battery</source> <translation>Batterij</translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="683"/> + <location filename="../ui/DetailiSpindel.ui" line="699"/> <source>Quit</source> <translation>Terug</translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="700"/> + <location filename="../ui/DetailiSpindel.ui" line="716"/> <source>Log</source> <translation>Log</translation> </message>
--- a/ui/DetailCO2meter.ui Fri Nov 18 16:57:02 2022 +0100 +++ b/ui/DetailCO2meter.ui Sat Nov 19 13:55:12 2022 +0100 @@ -22,7 +22,7 @@ <x>740</x> <y>0</y> <width>261</width> - <height>121</height> + <height>231</height> </rect> </property> <widget class="QLabel" name="powerLabel"> @@ -409,18 +409,21 @@ <x>740</x> <y>240</y> <width>261</width> - <height>161</height> + <height>181</height> </rect> </property> <widget class="QDoubleSpinBox" name="minBar"> <property name="geometry"> <rect> - <x>100</x> - <y>90</y> + <x>180</x> + <y>80</y> <width>71</width> <height>24</height> </rect> </property> + <property name="toolTip"> + <string>The minimum calculated pressure in Bar for this beerstyle</string> + </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property> @@ -446,14 +449,14 @@ <widget class="QLabel" name="st_barLabel"> <property name="geometry"> <rect> - <x>10</x> - <y>90</y> - <width>81</width> + <x>180</x> + <y>60</y> + <width>71</width> <height>20</height> </rect> </property> <property name="text"> - <string>Bar:</string> + <string>Bar</string> </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> @@ -462,12 +465,15 @@ <widget class="QDoubleSpinBox" name="maxVol"> <property name="geometry"> <rect> - <x>180</x> - <y>60</y> + <x>100</x> + <y>110</y> <width>71</width> <height>24</height> </rect> </property> + <property name="toolTip"> + <string>The maximum volumes CO2 for this beerstyle</string> + </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property> @@ -493,14 +499,14 @@ <widget class="QLabel" name="volLabel"> <property name="geometry"> <rect> - <x>10</x> + <x>100</x> <y>60</y> - <width>81</width> + <width>71</width> <height>20</height> </rect> </property> <property name="text"> - <string>Vol CO2:</string> + <string>Vol CO2</string> </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> @@ -509,14 +515,14 @@ <widget class="QLabel" name="maxLabel"> <property name="geometry"> <rect> - <x>180</x> - <y>120</y> - <width>71</width> + <x>10</x> + <y>110</y> + <width>81</width> <height>20</height> </rect> </property> <property name="text"> - <string>Maximum</string> + <string>Maximum:</string> </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> @@ -526,11 +532,14 @@ <property name="geometry"> <rect> <x>100</x> - <y>60</y> + <y>80</y> <width>71</width> <height>24</height> </rect> </property> + <property name="toolTip"> + <string>The minimum volumes CO2 for this beerstyle</string> + </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property> @@ -557,11 +566,14 @@ <property name="geometry"> <rect> <x>180</x> - <y>90</y> + <y>110</y> <width>71</width> <height>24</height> </rect> </property> + <property name="toolTip"> + <string>The maximum calculated pressure in Bar for this beerstyle</string> + </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property> @@ -587,14 +599,14 @@ <widget class="QLabel" name="minLabel"> <property name="geometry"> <rect> - <x>100</x> - <y>120</y> - <width>71</width> + <x>10</x> + <y>80</y> + <width>81</width> <height>20</height> </rect> </property> <property name="text"> - <string>Minimum</string> + <string>Minimum:</string> </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> @@ -623,6 +635,90 @@ <set>Qt::AlignCenter</set> </property> </widget> + <widget class="QDoubleSpinBox" name="thisBar"> + <property name="geometry"> + <rect> + <x>180</x> + <y>140</y> + <width>71</width> + <height>24</height> + </rect> + </property> + <property name="toolTip"> + <string>The expected calculated pressure in Bar for this beer</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="buttonSymbols"> + <enum>QAbstractSpinBox::NoButtons</enum> + </property> + <property name="accelerated"> + <bool>false</bool> + </property> + <property name="decimals"> + <number>2</number> + </property> + <property name="maximum"> + <double>45.000000000000000</double> + </property> + <property name="singleStep"> + <double>1.000000000000000</double> + </property> + </widget> + <widget class="QLabel" name="thisLabel"> + <property name="geometry"> + <rect> + <x>10</x> + <y>140</y> + <width>81</width> + <height>20</height> + </rect> + </property> + <property name="text"> + <string>This beer:</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + </widget> + <widget class="QDoubleSpinBox" name="thisVol"> + <property name="geometry"> + <rect> + <x>100</x> + <y>140</y> + <width>71</width> + <height>24</height> + </rect> + </property> + <property name="toolTip"> + <string>The desired volumes CO2 for this beer</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="buttonSymbols"> + <enum>QAbstractSpinBox::NoButtons</enum> + </property> + <property name="accelerated"> + <bool>false</bool> + </property> + <property name="decimals"> + <number>2</number> + </property> + <property name="maximum"> + <double>45.000000000000000</double> + </property> + <property name="singleStep"> + <double>1.000000000000000</double> + </property> + </widget> </widget> <widget class="QGroupBox" name="buttonBox"> <property name="geometry">
--- a/ui/DetailiSpindel.ui Fri Nov 18 16:57:02 2022 +0100 +++ b/ui/DetailiSpindel.ui Sat Nov 19 13:55:12 2022 +0100 @@ -399,6 +399,22 @@ <bool>true</bool> </property> </widget> + <widget class="QLabel" name="statusLabel"> + <property name="geometry"> + <rect> + <x>410</x> + <y>70</y> + <width>141</width> + <height>20</height> + </rect> + </property> + <property name="text"> + <string>Current status:</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + </widget> </widget> <widget class="QGroupBox" name="thermoBox"> <property name="enabled">