changeset
Changes in de iSpindel detail screen. Added a calibrate button and display the last update date and time.
Thu, 12 Oct 2023 17:03:50 +0200
- author
- Michiel Broek <mbroek@mbse.eu>
- date
- Thu, 12 Oct 2023 17:03:50 +0200
- changeset 502
- 0f15edebc665
- parent 501
- a01ae5ff0e96
- child 503
- 61c114afb0ee
Changes in de iSpindel detail screen. Added a calibrate button and display the last update date and time.
--- a/src/DetailiSpindel.cpp Sun Aug 20 11:40:51 2023 +0200 +++ b/src/DetailiSpindel.cpp Thu Oct 12 17:03:50 2023 +0200 @@ -110,6 +110,7 @@ ui->platoEdit->setText(QString("%1").arg(query.value("gravity").toDouble(), 4, 'f', 3, '0')); double sg = Utils::plato_to_sg(query.value("gravity").toDouble()); ui->sgEdit->setText(QString("%1").arg(sg, 5, 'f', 4, '0')); + ui->lastEdit->setText(query.value("lastseen").toDateTime().toString("dd MMM HH:mm:ss")); if (query.value("gravity").toDouble()) { double o_plato = query.value("og_gravity").toDouble(); @@ -177,7 +178,7 @@ /* - * Receive signals destined for all co2meters. + * Receive signals destined for all iSpindels. * Check if the signal is for us. */ void DetailiSpindel::refreshiSpindel(QString data)
--- a/translations/bmsapp_en.ts Sun Aug 20 11:40:51 2023 +0200 +++ b/translations/bmsapp_en.ts Thu Oct 12 17:03:50 2023 +0200 @@ -865,138 +865,148 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="38"/> + <location filename="../ui/DetailiSpindel.ui" line="42"/> <source>Power</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="54"/> + <location filename="../ui/DetailiSpindel.ui" line="58"/> <source>Alarm</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="70"/> - <location filename="../ui/DetailiSpindel.ui" line="96"/> + <location filename="../ui/DetailiSpindel.ui" line="74"/> + <location filename="../ui/DetailiSpindel.ui" line="100"/> <source>Color Led component</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="73"/> - <location filename="../ui/DetailiSpindel.ui" line="99"/> + <location filename="../ui/DetailiSpindel.ui" line="77"/> + <location filename="../ui/DetailiSpindel.ui" line="103"/> <source>Led indicator</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="125"/> + <location filename="../ui/DetailiSpindel.ui" line="129"/> <source>Uuid:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="141"/> + <location filename="../ui/DetailiSpindel.ui" line="145"/> <source>System and unit:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="157"/> + <location filename="../ui/DetailiSpindel.ui" line="161"/> <source>Code and beer:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="173"/> + <location filename="../ui/DetailiSpindel.ui" line="177"/> <source>Working mode:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="189"/> + <location filename="../ui/DetailiSpindel.ui" line="193"/> <source>Battery voltage:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="205"/> + <location filename="../ui/DetailiSpindel.ui" line="209"/> <source>Tilt angle°:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="228"/> + <location filename="../ui/DetailiSpindel.ui" line="232"/> <source>iSpindel overview</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="305"/> + <location filename="../ui/DetailiSpindel.ui" line="309"/> <source>Choose beer:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="367"/> + <location filename="../ui/DetailiSpindel.ui" line="371"/> <source>Density °Plato:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="383"/> + <location filename="../ui/DetailiSpindel.ui" line="387"/> <source>Density SG:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="412"/> + <location filename="../ui/DetailiSpindel.ui" line="416"/> <source>Current status:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="441"/> + <location filename="../ui/DetailiSpindel.ui" line="432"/> + <source>Last seen:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/DetailiSpindel.ui" line="474"/> <source>Temperature</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="457"/> + <location filename="../ui/DetailiSpindel.ui" line="490"/> <source>Shows the temperature</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="499"/> - <source>Apperant Attenuation</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../ui/DetailiSpindel.ui" line="532"/> + <source>Apperant Attenuation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/DetailiSpindel.ui" line="565"/> <source>Fermentation progress</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="548"/> + <location filename="../ui/DetailiSpindel.ui" line="581"/> <source>OG</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="561"/> + <location filename="../ui/DetailiSpindel.ui" line="594"/> <source>SG</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="574"/> + <location filename="../ui/DetailiSpindel.ui" line="607"/> <source>SVG</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="587"/> + <location filename="../ui/DetailiSpindel.ui" line="620"/> <source>ABV</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="600"/> + <location filename="../ui/DetailiSpindel.ui" line="633"/> <source>Battery</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="699"/> + <location filename="../ui/DetailiSpindel.ui" line="732"/> <source>Quit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="716"/> + <location filename="../ui/DetailiSpindel.ui" line="749"/> <source>Log</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../ui/DetailiSpindel.ui" line="766"/> + <source>Calibrate</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../src/DetailiSpindel.cpp" line="41"/> <source>BMSapp - Details iSpindel</source> <translation type="unfinished"></translation> @@ -1007,7 +1017,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/DetailiSpindel.cpp" line="158"/> + <location filename="../src/DetailiSpindel.cpp" line="159"/> <source>Offline</source> <translation type="unfinished"></translation> </message>
--- a/translations/bmsapp_nl.ts Sun Aug 20 11:40:51 2023 +0200 +++ b/translations/bmsapp_nl.ts Thu Oct 12 17:03:50 2023 +0200 @@ -945,138 +945,148 @@ <translation>Dialog</translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="38"/> + <location filename="../ui/DetailiSpindel.ui" line="42"/> <source>Power</source> <translation>Power</translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="54"/> + <location filename="../ui/DetailiSpindel.ui" line="58"/> <source>Alarm</source> <translation>Alarm</translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="70"/> - <location filename="../ui/DetailiSpindel.ui" line="96"/> + <location filename="../ui/DetailiSpindel.ui" line="74"/> + <location filename="../ui/DetailiSpindel.ui" line="100"/> <source>Color Led component</source> <translation></translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="73"/> - <location filename="../ui/DetailiSpindel.ui" line="99"/> + <location filename="../ui/DetailiSpindel.ui" line="77"/> + <location filename="../ui/DetailiSpindel.ui" line="103"/> <source>Led indicator</source> <translation></translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="125"/> + <location filename="../ui/DetailiSpindel.ui" line="129"/> <source>Uuid:</source> <translation>Uuid:</translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="141"/> + <location filename="../ui/DetailiSpindel.ui" line="145"/> <source>System and unit:</source> <translation>Systeem en unit:</translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="157"/> + <location filename="../ui/DetailiSpindel.ui" line="161"/> <source>Code and beer:</source> <translation>Code en bier:</translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="173"/> + <location filename="../ui/DetailiSpindel.ui" line="177"/> <source>Working mode:</source> <translation>Werking manier:</translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="189"/> + <location filename="../ui/DetailiSpindel.ui" line="193"/> <source>Battery voltage:</source> <translation>Batterij voltage:</translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="205"/> + <location filename="../ui/DetailiSpindel.ui" line="209"/> <source>Tilt angle°:</source> <translation>Tilt hoek°:</translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="228"/> + <location filename="../ui/DetailiSpindel.ui" line="232"/> <source>iSpindel overview</source> <translation>iSpindel overzicht</translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="305"/> + <location filename="../ui/DetailiSpindel.ui" line="309"/> <source>Choose beer:</source> <translation>Kies bier:</translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="367"/> + <location filename="../ui/DetailiSpindel.ui" line="371"/> <source>Density °Plato:</source> <translation>Densiteit °Plato:</translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="383"/> + <location filename="../ui/DetailiSpindel.ui" line="387"/> <source>Density SG:</source> <translation>Densiteit SG:</translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="412"/> + <location filename="../ui/DetailiSpindel.ui" line="416"/> <source>Current status:</source> <translation>Huidige status:</translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="441"/> + <location filename="../ui/DetailiSpindel.ui" line="432"/> + <source>Last seen:</source> + <translation type="unfinished">Laatst gezien:</translation> + </message> + <message> + <location filename="../ui/DetailiSpindel.ui" line="474"/> <source>Temperature</source> <translation>Temperatuur</translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="457"/> + <location filename="../ui/DetailiSpindel.ui" line="490"/> <source>Shows the temperature</source> <translation>Toont de temperatuur</translation> </message> <message> + <location filename="../ui/DetailiSpindel.ui" line="766"/> + <source>Calibrate</source> + <translation type="unfinished"></translation> + </message> + <message> <source>Shows the air temperature</source> <translation type="obsolete">Toont de lucht temperatuur</translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="499"/> + <location filename="../ui/DetailiSpindel.ui" line="532"/> <source>Apperant Attenuation</source> <translation>Schijnbare vergisting</translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="532"/> + <location filename="../ui/DetailiSpindel.ui" line="565"/> <source>Fermentation progress</source> <translation>Vergisting voortgang</translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="548"/> + <location filename="../ui/DetailiSpindel.ui" line="581"/> <source>OG</source> <translation>OG</translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="561"/> + <location filename="../ui/DetailiSpindel.ui" line="594"/> <source>SG</source> <translation>SG</translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="574"/> + <location filename="../ui/DetailiSpindel.ui" line="607"/> <source>SVG</source> <translation>SVG</translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="587"/> + <location filename="../ui/DetailiSpindel.ui" line="620"/> <source>ABV</source> <translation>ABV</translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="600"/> + <location filename="../ui/DetailiSpindel.ui" line="633"/> <source>Battery</source> <translation>Batterij</translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="699"/> + <location filename="../ui/DetailiSpindel.ui" line="732"/> <source>Quit</source> <translation>Terug</translation> </message> <message> - <location filename="../ui/DetailiSpindel.ui" line="716"/> + <location filename="../ui/DetailiSpindel.ui" line="749"/> <source>Log</source> <translation>Log</translation> </message> @@ -1091,7 +1101,7 @@ <translation>Online</translation> </message> <message> - <location filename="../src/DetailiSpindel.cpp" line="158"/> + <location filename="../src/DetailiSpindel.cpp" line="159"/> <source>Offline</source> <translation>Offline</translation> </message>
--- a/ui/DetailiSpindel.ui Sun Aug 20 11:40:51 2023 +0200 +++ b/ui/DetailiSpindel.ui Thu Oct 12 17:03:50 2023 +0200 @@ -13,6 +13,10 @@ <property name="windowTitle"> <string>Dialog</string> </property> + <property name="windowIcon"> + <iconset resource="../../../../../../home/mbroek/MyProjects/bmsapp/resources/icons.qrc"> + <normaloff>:/icons/bms/beer.png</normaloff>:/icons/bms/beer.png</iconset> + </property> <layout class="QGridLayout" name="gridLayout"> <item row="0" column="0"> <widget class="QWidget" name="topWidget" native="true"> @@ -236,7 +240,7 @@ <rect> <x>160</x> <y>40</y> - <width>271</width> + <width>261</width> <height>23</height> </rect> </property> @@ -252,7 +256,7 @@ <rect> <x>160</x> <y>70</y> - <width>181</width> + <width>261</width> <height>23</height> </rect> </property> @@ -402,9 +406,9 @@ <widget class="QLabel" name="statusLabel"> <property name="geometry"> <rect> - <x>410</x> + <x>430</x> <y>70</y> - <width>141</width> + <width>121</width> <height>20</height> </rect> </property> @@ -415,6 +419,35 @@ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property> </widget> + <widget class="QLabel" name="lastLabel"> + <property name="geometry"> + <rect> + <x>410</x> + <y>130</y> + <width>141</width> + <height>20</height> + </rect> + </property> + <property name="text"> + <string>Last seen:</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + </widget> + <widget class="QLineEdit" name="lastEdit"> + <property name="geometry"> + <rect> + <x>560</x> + <y>130</y> + <width>121</width> + <height>23</height> + </rect> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + </widget> </widget> <widget class="QGroupBox" name="thermoBox"> <property name="enabled"> @@ -509,7 +542,7 @@ <x>740</x> <y>130</y> <width>261</width> - <height>281</height> + <height>231</height> </rect> </property> <widget class="QLabel" name="progressLabel"> @@ -675,16 +708,16 @@ <property name="geometry"> <rect> <x>740</x> - <y>420</y> + <y>370</y> <width>261</width> - <height>111</height> + <height>161</height> </rect> </property> <widget class="QPushButton" name="quitButton"> <property name="geometry"> <rect> <x>90</x> - <y>70</y> + <y>120</y> <width>80</width> <height>23</height> </rect> @@ -707,7 +740,7 @@ <property name="geometry"> <rect> <x>90</x> - <y>20</y> + <y>70</y> <width>80</width> <height>23</height> </rect> @@ -720,6 +753,23 @@ <normaloff>:/icons/silk/chart_line.png</normaloff>:/icons/silk/chart_line.png</iconset> </property> </widget> + <widget class="QPushButton" name="calButton"> + <property name="geometry"> + <rect> + <x>90</x> + <y>20</y> + <width>80</width> + <height>23</height> + </rect> + </property> + <property name="text"> + <string>Calibrate</string> + </property> + <property name="icon"> + <iconset resource="../../../../../../home/mbroek/MyProjects/bmsapp/resources/icons.qrc"> + <normaloff>:/icons/silk/wrench.png</normaloff>:/icons/silk/wrench.png</iconset> + </property> + </widget> </widget> </widget> </item> @@ -739,6 +789,19 @@ </customwidgets> <tabstops> <tabstop>quitButton</tabstop> + <tabstop>uuidEdit</tabstop> + <tabstop>systemEdit</tabstop> + <tabstop>statusEdit</tabstop> + <tabstop>codeEdit</tabstop> + <tabstop>codePick</tabstop> + <tabstop>modeEdit</tabstop> + <tabstop>lastEdit</tabstop> + <tabstop>voltEdit</tabstop> + <tabstop>platoEdit</tabstop> + <tabstop>tiltEdit</tabstop> + <tabstop>sgEdit</tabstop> + <tabstop>logButton</tabstop> + <tabstop>calButton</tabstop> </tabstops> <resources> <include location="../../../../../../home/mbroek/MyProjects/bmsapp/resources/icons.qrc"/>
