Index: denali.pro
===================================================================
diff -u -rfeb7724c8a7a2932650c5daa490c90923c9fbe77 -rfc488cb1a7fa2c998ae1c2912ccb524384820afe
--- denali.pro (.../denali.pro) (revision feb7724c8a7a2932650c5daa490c90923c9fbe77)
+++ denali.pro (.../denali.pro) (revision fc488cb1a7fa2c998ae1c2912ccb524384820afe)
@@ -79,8 +79,6 @@
sources/model/MTreatmentParametersResp.h \
sources/model/MDGDebugText.h \
sources/model/MHDDebugText.h \
- sources/model/MHDSerialNumberResponse.h \
- sources/model/MDGSerialNumberResponse.h \
\ # ---------- Models - Alarm
sources/model/hd/alarm/MAlarmStatusData.h \
sources/model/hd/alarm/MAlarmTriggered.h \
@@ -90,6 +88,7 @@
sources/model/hd/adjustment/MTreatmentAdjustHDVersionsResponse.h \
sources/model/hd/adjustment/MAdjustHDDateTimeResponse.h \
sources/model/hd/adjustment/MAdjustHDServiceResponse.h \
+ sources/model/hd/adjustment/MHDSerialNumberResponse.h \
\ # ---------- Models - HD - Adjustment - In-Treatment
sources/model/hd/adjustment/MTreatmentAdjustRequests.h \
sources/model/hd/adjustment/MTreatmentAdjustDurationResponse.h \
@@ -124,6 +123,7 @@
sources/model/dg/adjustment/MTreatmentAdjustDGVersionsResponse.h \
sources/model/dg/adjustment/MAdjustDGDateTimeResponse.h \
sources/model/dg/adjustment/MAdjustDGServiceResponse.h \
+ sources/model/dg/adjustment/MDGSerialNumberResponse.h \
\ # ---------- Models - DG - Data
sources/model/dg/data/MDGDrainPumpData.h \
sources/model/dg/data/MDGHeatersData.h \
@@ -244,17 +244,16 @@
sources/model/MStartTreatmentResponse.cpp \
sources/model/MTreatmentParametersResp.cpp \
sources/model/MDGDebugText.cpp \
- sources/model/MHDSerialNumberResponse.cpp \
- sources/model/MDGSerialNumberResponse.cpp \
\ # ---------- Models - Alarm
sources/model/hd/alarm/MAlarmStatusData.cpp \
sources/model/hd/alarm/MAlarmTriggered.cpp \
sources/model/hd/alarm/MAlarmCleared.cpp \
sources/model/hd/alarm/MAlarmClearedCondition.cpp \
- \ # ---------- Models - HD - Adjustment - In-Treatment
+ \ # ---------- Models - HD - Adjustment
sources/model/hd/adjustment/MTreatmentAdjustHDVersionsResponse.cpp \
sources/model/hd/adjustment/MAdjustHDDateTimeResponse.cpp \
sources/model/hd/adjustment/MAdjustHDServiceResponse.cpp \
+ sources/model/hd/adjustment/MHDSerialNumberResponse.cpp \
\ # ---------- Models - HD - Adjustment - In-Treatment
sources/model/hd/adjustment/MTreatmentAdjustDurationResponse.cpp \
sources/model/hd/adjustment/MTreatmentAdjustBloodDialysateResponse.cpp \
@@ -288,6 +287,7 @@
sources/model/dg/adjustment/MTreatmentAdjustDGVersionsResponse.cpp \
sources/model/dg/adjustment/MAdjustDGDateTimeResponse.cpp \
sources/model/dg/adjustment/MAdjustDGServiceResponse.cpp \
+ sources/model/dg/adjustment/MDGSerialNumberResponse.cpp \
\ # ---------- Models - DG - Data
sources/model/dg/data/MDGDrainPumpData.cpp \
sources/model/dg/data/MDGHeatersData.cpp \
Index: sources/gui/qml/components/InformationTable.qml
===================================================================
diff -u -r21e68ccf5594b0ca3e0a8c7986e405260d273899 -rfc488cb1a7fa2c998ae1c2912ccb524384820afe
--- sources/gui/qml/components/InformationTable.qml (.../InformationTable.qml) (revision 21e68ccf5594b0ca3e0a8c7986e405260d273899)
+++ sources/gui/qml/components/InformationTable.qml (.../InformationTable.qml) (revision fc488cb1a7fa2c998ae1c2912ccb524384820afe)
@@ -78,15 +78,15 @@
}
text: _root.headerName
color: "white"
- font.pixelSize: Fonts.fontInformationTableHeader
+ font.pixelSize: Fonts.fontPixelInformationTableHeader
}
}
Text {
id: _leftColumnTitle
objectName: _root.objectName + "_leftColumn"
text: _root.leftColumnTitle
- font.pixelSize: Fonts.fontInformationTablePixel
+ font.pixelSize: Fonts.fontPixelInformationTable
color: "white"
anchors {
left: parent.left
@@ -100,7 +100,7 @@
id: _rightColumnTitle
objectName: _root.objectName + "_rightColumn"
text: _root.rightColumnTitle
- font.pixelSize: Fonts.fontInformationTablePixel
+ font.pixelSize: Fonts.fontPixelInformationTable
color: "white"
anchors {
top: _root.headerVisible ? _header.bottom : _root.top
Index: sources/gui/qml/components/InformationTableEntry.qml
===================================================================
diff -u -rc3bf2cd135f9351e16eb0f4237f71a7be38a4ce4 -rfc488cb1a7fa2c998ae1c2912ccb524384820afe
--- sources/gui/qml/components/InformationTableEntry.qml (.../InformationTableEntry.qml) (revision c3bf2cd135f9351e16eb0f4237f71a7be38a4ce4)
+++ sources/gui/qml/components/InformationTableEntry.qml (.../InformationTableEntry.qml) (revision fc488cb1a7fa2c998ae1c2912ccb524384820afe)
@@ -52,7 +52,7 @@
text: key
anchors.left: parent.left
anchors.verticalCenter: _root.verticalCenter
- font.pixelSize: Fonts.fontInformationTablePixel
+ font.pixelSize: Fonts.fontPixelInformationTable
}
Text {
@@ -66,6 +66,6 @@
anchors.left: _line.horizontalCenter
anchors.verticalCenter: _root.verticalCenter
anchors.leftMargin: _root.valueLeftMargin
- font.pixelSize: Fonts.fontInformationTablePixel
+ font.pixelSize: Fonts.fontPixelInformationTable
}
}
Index: sources/gui/qml/globals/Fonts.qml
===================================================================
diff -u -r21e68ccf5594b0ca3e0a8c7986e405260d273899 -rfc488cb1a7fa2c998ae1c2912ccb524384820afe
--- sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision 21e68ccf5594b0ca3e0a8c7986e405260d273899)
+++ sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision fc488cb1a7fa2c998ae1c2912ccb524384820afe)
@@ -69,8 +69,8 @@
readonly property int fontPixelRinsebackAdjustmentButton : 26
readonly property int fontPixelPriming : 20
- readonly property int fontInformationTableHeader : 30
- readonly property int fontInformationTablePixel : 24
+ readonly property int fontPixelInformationTableHeader : 30
+ readonly property int fontPixelInformationTable : 24
readonly property int primingFontSize : 20
readonly property int createTreatmentFontSize : 30
Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentUltrafiltration.qml
===================================================================
diff -u -r21e68ccf5594b0ca3e0a8c7986e405260d273899 -rfc488cb1a7fa2c998ae1c2912ccb524384820afe
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentUltrafiltration.qml (.../PreTreatmentUltrafiltration.qml) (revision 21e68ccf5594b0ca3e0a8c7986e405260d273899)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentUltrafiltration.qml (.../PreTreatmentUltrafiltration.qml) (revision fc488cb1a7fa2c998ae1c2912ccb524384820afe)
@@ -57,7 +57,7 @@
color : "white"
text : qsTr("Ultrafiltration Volume") + " " + Variables.unitTextUltrafiltrationVolume
font {
- pixelSize : Fonts.fontInformationTableHeader
+ pixelSize : Fonts.fontPixelInformationTableHeader
}
anchors {
left : _volumeSlider.left
@@ -72,7 +72,7 @@
color : "white"
text : _root.ufVolume.toFixed(Variables.ultrafiltrationPrecision)
font {
- pixelSize : Fonts.fontInformationTableHeader
+ pixelSize : Fonts.fontPixelInformationTableHeader
}
anchors {
right : _volumeSlider.right
Fisheye: Tag fc488cb1a7fa2c998ae1c2912ccb524384820afe refers to a dead (removed) revision in file `sources/model/MDGSerialNumberResponse.cpp'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag fc488cb1a7fa2c998ae1c2912ccb524384820afe refers to a dead (removed) revision in file `sources/model/MDGSerialNumberResponse.h'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag fc488cb1a7fa2c998ae1c2912ccb524384820afe refers to a dead (removed) revision in file `sources/model/MHDSerialNumberResponse.cpp'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag fc488cb1a7fa2c998ae1c2912ccb524384820afe refers to a dead (removed) revision in file `sources/model/MHDSerialNumberResponse.h'.
Fisheye: No comparison available. Pass `N' to diff?
Index: sources/model/dg/adjustment/MAdjustDGServiceResponse.h
===================================================================
diff -u -rfeb7724c8a7a2932650c5daa490c90923c9fbe77 -rfc488cb1a7fa2c998ae1c2912ccb524384820afe
--- sources/model/dg/adjustment/MAdjustDGServiceResponse.h (.../MAdjustDGServiceResponse.h) (revision feb7724c8a7a2932650c5daa490c90923c9fbe77)
+++ sources/model/dg/adjustment/MAdjustDGServiceResponse.h (.../MAdjustDGServiceResponse.h) (revision fc488cb1a7fa2c998ae1c2912ccb524384820afe)
@@ -14,7 +14,7 @@
/*!
* \brief The MAdjustDGServiceResponse class
- * \details The HD Date and Time adjustment response model
+ * \details The DG Service Date adjustment response model
*
* | MSG | CAN ID | Type | Ack | Src | Dest | Description |
* |:----:|:------:|:----:|:---:|:---:|:----:|:---------------------:|
@@ -50,7 +50,7 @@
public:
Type_Enum typeText () const override { return Type_Enum::eEvent ; }
- Unit_Enum unitText () const override { return Unit_Enum::eHD ; }
+ Unit_Enum unitText () const override { return Unit_Enum::eDG ; }
QString infoText () const override { return QString("ServiceDates") ; }
struct Data {
Index: sources/model/dg/adjustment/MDGSerialNumberResponse.cpp
===================================================================
diff -u
--- sources/model/dg/adjustment/MDGSerialNumberResponse.cpp (revision 0)
+++ sources/model/dg/adjustment/MDGSerialNumberResponse.cpp (revision fc488cb1a7fa2c998ae1c2912ccb524384820afe)
@@ -0,0 +1,22 @@
+#include "MDGSerialNumberResponse.h"
+
+using namespace Model;
+
+QVariantList MDGSerialNumberResponse::parameters() const {
+ return {
+ _data.serialNumber
+ };
+}
+
+bool MDGSerialNumberResponse::fromByteArray(const QByteArray &vByteArray, int *) {
+
+ _data.serialNumber = qPrintable(vByteArray);
+ return true;
+}
+
+
+MDGSerialNumberResponse::Data MDGSerialNumberResponse::data() const {
+ Data data;
+ data.serialNumber = _data.serialNumber;
+ return data;
+}
Index: sources/model/dg/adjustment/MDGSerialNumberResponse.h
===================================================================
diff -u
--- sources/model/dg/adjustment/MDGSerialNumberResponse.h (revision 0)
+++ sources/model/dg/adjustment/MDGSerialNumberResponse.h (revision fc488cb1a7fa2c998ae1c2912ccb524384820afe)
@@ -0,0 +1,64 @@
+#pragma once
+
+// Qt
+
+// Project
+#include "MAbstract.h"
+#include "types.h"
+
+// forward declarations
+class tst_models;
+
+namespace Model {
+
+/*!
+ * \brief The MDGSerialNumberResponse class
+ * \details The DG serial number response data model
+ *
+ * | MSG | CAN ID | Type | Ack | Src | Dst | Description |
+ * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: |
+ * |0x8800| 0x070 | Rsp | Y | DG | UI | DG Serial Number |
+ *
+ * | Payload ||
+ * | ||
+ * | #1:(bytes) | \ref Data::serialNumber + null term |
+ *
+ * \sa Data
+ *
+ *
+ * | ||
+ * | ||
+ * | typeText | Datum |
+ * | unitText | DG |
+ * | infoText | SerialNumber |
+ *
+ */
+class MDGSerialNumberResponse : public MAbstract {
+
+ // friends
+ friend class ::tst_models;
+
+ QVariantList parameters() const override;
+
+ struct {
+ QString serialNumber;
+ } _data;
+
+public:
+
+ Type_Enum typeText () const override { return Type_Enum::eDatum; }
+ Unit_Enum unitText () const override { return Unit_Enum::eDG ; }
+ QString infoText () const override { return QString("SerialNumber"); }
+
+ struct Data {
+ QString serialNumber;
+ };
+
+ MDGSerialNumberResponse() {}
+
+ bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override;
+ Data data ( ) const ;
+};
+}
+
+typedef Model::MDGSerialNumberResponse::Data DGSerialNumberResponseData;
Index: sources/model/hd/adjustment/MHDSerialNumberResponse.cpp
===================================================================
diff -u
--- sources/model/hd/adjustment/MHDSerialNumberResponse.cpp (revision 0)
+++ sources/model/hd/adjustment/MHDSerialNumberResponse.cpp (revision fc488cb1a7fa2c998ae1c2912ccb524384820afe)
@@ -0,0 +1,21 @@
+#include "MHDSerialNumberResponse.h"
+
+using namespace Model;
+
+QVariantList MHDSerialNumberResponse::parameters() const {
+ return {
+ _data.serialNumber
+ };
+}
+
+bool MHDSerialNumberResponse::fromByteArray(const QByteArray &vByteArray, int *) {
+ _data.serialNumber = qPrintable(vByteArray);
+ return true;
+}
+
+
+MHDSerialNumberResponse::Data MHDSerialNumberResponse::data() const {
+ Data data;
+ data.serialNumber = _data.serialNumber;
+ return data;
+}
Index: sources/model/hd/adjustment/MHDSerialNumberResponse.h
===================================================================
diff -u
--- sources/model/hd/adjustment/MHDSerialNumberResponse.h (revision 0)
+++ sources/model/hd/adjustment/MHDSerialNumberResponse.h (revision fc488cb1a7fa2c998ae1c2912ccb524384820afe)
@@ -0,0 +1,64 @@
+#pragma once
+
+// Qt
+
+// Project
+#include "MAbstract.h"
+#include "types.h"
+
+// forward declarations
+class tst_models;
+
+namespace Model {
+
+/*!
+ * \brief The MHDSerialNumberResponse class
+ * \details The HD serial number response data model
+ *
+ * | MSG | CAN ID | Type | Ack | Src | Dst | Description |
+ * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: |
+ * |0x8700| 0x020 | Rsp | Y | HD | UI | HD Serial Number |
+ *
+ * | Payload ||
+ * | ||
+ * | #1:(bytes) | \ref Data::serialNumber + null term |
+ *
+ * \sa Data
+ *
+ *
+ * | ||
+ * | ||
+ * | typeText | Datum |
+ * | unitText | HD |
+ * | infoText | SerialNumber |
+ *
+ */
+class MHDSerialNumberResponse : public MAbstract {
+
+ // friends
+ friend class ::tst_models;
+
+ QVariantList parameters() const override;
+
+ struct {
+ QString serialNumber;
+ } _data;
+
+public:
+
+ Type_Enum typeText () const override { return Type_Enum::eDatum; }
+ Unit_Enum unitText () const override { return Unit_Enum::eHD ; }
+ QString infoText () const override { return QString("SerialNumber"); }
+
+ struct Data {
+ QString serialNumber;
+ };
+
+ MHDSerialNumberResponse() {}
+
+ bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override;
+ Data data ( ) const ;
+};
+}
+
+typedef Model::MHDSerialNumberResponse::Data HDSerialNumberResponseData;
Index: sources/view/VDeviceInformation.cpp
===================================================================
diff -u -rfeb7724c8a7a2932650c5daa490c90923c9fbe77 -rfc488cb1a7fa2c998ae1c2912ccb524384820afe
--- sources/view/VDeviceInformation.cpp (.../VDeviceInformation.cpp) (revision feb7724c8a7a2932650c5daa490c90923c9fbe77)
+++ sources/view/VDeviceInformation.cpp (.../VDeviceInformation.cpp) (revision fc488cb1a7fa2c998ae1c2912ccb524384820afe)
@@ -41,7 +41,7 @@
{
doRequestHDDGVersions();
doRequestServiceData();
- mUIVersion(qApp->applicationVersion());
+ _uiVersion = qApp->applicationVersion();
}
/*!
@@ -51,13 +51,13 @@
*/
QStringList VDeviceInformation::doGetVersionKeys()
{
- return QStringList() << "UI Version"
- << "HD Version"
- << "HD FPGA Version"
- << "HD Serial Number"
- << "DG Version"
- << "DG FPGA Version"
- << "DG Serial Number";
+ return QStringList() << tr("UI Version")
+ << tr("HD Version")
+ << tr("HD FPGA Version")
+ << tr("HD Serial Number")
+ << tr("DG Version")
+ << tr("DG FPGA Version")
+ << tr("DG Serial Number");
}
/*!
@@ -67,13 +67,13 @@
*/
QStringList VDeviceInformation::doGetVersionValues()
{
- return QStringList() << mUIVersion()
- << mHDVersion()
- << mHDFPGAVersion()
- << mHDSerialNumber()
- << mDGVersion()
- << mDGFPGAVersion()
- << mDGSerialNumber();
+ return QStringList() << _uiVersion
+ << _hdVersion
+ << _hdFPGAVersion
+ << _hdSerialNumber
+ << _dgVersion
+ << _dgFPGAVersion
+ << _dgSerialNumber;
}
@@ -84,10 +84,10 @@
*/
QStringList VDeviceInformation::doGetSystemUsageKeys()
{
- return QStringList() << "HD Last Service Date"
- << "HD Next Service Date"
- << "DG Last Service Date"
- << "DG Next Service Date";
+ return QStringList() << tr("HD Last Service Date")
+ << tr("HD Next Service Date")
+ << tr("DG Last Service Date")
+ << tr("DG Next Service Date");
}
/*!
@@ -98,10 +98,10 @@
QStringList VDeviceInformation::doGetSystemUsageValues()
{
- return QStringList() << mHDLastServiceDate()
- << mHDNextServiceDate()
- << mDGLastServiceDate()
- << mDGNextServiceDate();
+ return QStringList() << _hdLastServiceDate
+ << _hdNextServiceDate
+ << _dgLastServiceDate
+ << _dgNextServiceDate;
}
/*!
@@ -112,17 +112,17 @@
void VDeviceInformation::onActionReceive(const AdjustHDVersionsResponseData &vData)
{
- mHDVersion(QString("v%1.%2.%3-%4")
+ _hdVersion = QString("v%1.%2.%3-%4")
.arg(vData.mMajor )
.arg(vData.mMinor )
.arg(vData.mMicro )
- .arg(vData.mBuild ));
+ .arg(vData.mBuild );
- mHDFPGAVersion(QString("%1 v%2.%3 %4")
+ _hdFPGAVersion = QString("%1 v%2.%3 %4")
.arg(vData.mFPGAId )
.arg(vData.mFPGAMajor)
.arg(vData.mFPGAMinor)
- .arg(vData.mFPGALab ));
+ .arg(vData.mFPGALab );
}
/*!
@@ -132,17 +132,17 @@
*/
void VDeviceInformation::onActionReceive(const AdjustDGVersionsResponseData &vData)
{
- mDGVersion(QString("v%1.%2.%3-%4")
+ _dgVersion = QString("v%1.%2.%3-%4")
.arg(vData.mMajor )
.arg(vData.mMinor )
.arg(vData.mMicro )
- .arg(vData.mBuild ));
+ .arg(vData.mBuild );
- mDGFPGAVersion(QString("%1 v%2.%3 %4")
+ _dgFPGAVersion = QString("%1 v%2.%3 %4")
.arg(vData.mFPGAId )
.arg(vData.mFPGAMajor)
.arg(vData.mFPGAMinor)
- .arg(vData.mFPGALab ));
+ .arg(vData.mFPGALab );
}
@@ -153,7 +153,7 @@
*/
void VDeviceInformation::onActionReceive(const HDSerialNumberResponseData &vData)
{
- mHDSerialNumber(vData.serialNumber);
+ _hdSerialNumber = vData.serialNumber;
}
/*!
@@ -163,7 +163,7 @@
*/
void VDeviceInformation::onActionReceive(const DGSerialNumberResponseData &vData)
{
- mDGSerialNumber(vData.serialNumber);
+ _dgSerialNumber = vData.serialNumber;
}
/*!
@@ -176,8 +176,8 @@
quint32 lastService = vData.mLastServiceDateEpoch;
quint32 nextService = vData.mLastServiceDateEpoch + vData.mServiceIntervalSeconds;
- mHDLastServiceDate(epochToString(lastService));
- mHDNextServiceDate(epochToString(nextService));
+ _hdLastServiceDate = epochToString(lastService);
+ _hdNextServiceDate = epochToString(nextService);
}
/*!
@@ -190,8 +190,8 @@
quint32 lastService = vData.mLastServiceDateEpoch;
quint32 nextService = vData.mLastServiceDateEpoch + vData.mServiceIntervalSeconds;
- mDGLastServiceDate(epochToString(lastService));
- mDGNextServiceDate(epochToString(nextService));
+ _dgLastServiceDate = epochToString(lastService);
+ _dgNextServiceDate = epochToString(nextService);
}
/*!
Index: sources/view/VDeviceInformation.h
===================================================================
diff -u -rfeb7724c8a7a2932650c5daa490c90923c9fbe77 -rfc488cb1a7fa2c998ae1c2912ccb524384820afe
--- sources/view/VDeviceInformation.h (.../VDeviceInformation.h) (revision feb7724c8a7a2932650c5daa490c90923c9fbe77)
+++ sources/view/VDeviceInformation.h (.../VDeviceInformation.h) (revision fc488cb1a7fa2c998ae1c2912ccb524384820afe)
@@ -40,21 +40,19 @@
VIEW_DEC_SLOT(AdjustHDServiceResponseData)
VIEW_DEC_SLOT(AdjustDGServiceResponseData)
-protected:
- PROPERTY(QString, mUIVersion, "")
- PROPERTY(QString, mHDVersion, "")
- PROPERTY(QString, mHDFPGAVersion, "")
- PROPERTY(QString, mHDSerialNumber, "")
- PROPERTY(QString, mDGVersion, "")
- PROPERTY(QString, mDGFPGAVersion, "")
- PROPERTY(QString, mDGSerialNumber, "")
+private:
+ QString _uiVersion = "";
+ QString _hdVersion = "";
+ QString _hdFPGAVersion = "";
+ QString _hdSerialNumber = "";
+ QString _dgVersion = "";
+ QString _dgFPGAVersion = "";
+ QString _dgSerialNumber = "";
- PROPERTY(QString, mHDLastServiceDate, "")
- PROPERTY(QString, mHDNextServiceDate, "")
- PROPERTY(QString, mDGLastServiceDate, "")
- PROPERTY(QString, mDGNextServiceDate, "")
- PROPERTY(quint32, mTreatments, 0)
- PROPERTY(quint32, mDialysateLiters, 0)
+ QString _hdLastServiceDate = "";
+ QString _hdNextServiceDate = "";
+ QString _dgLastServiceDate = "";
+ QString _dgNextServiceDate = "";
private:
void init();