Index: sources/gui/qml/components/LabelValue.qml =================================================================== diff -u -r7805806e4370be4d9207872e916f478875bd4ba6 -rdb6925e589ca85f2272af31d5f90f41452b342a7 --- sources/gui/qml/components/LabelValue.qml (.../LabelValue.qml) (revision 7805806e4370be4d9207872e916f478875bd4ba6) +++ sources/gui/qml/components/LabelValue.qml (.../LabelValue.qml) (revision db6925e589ca85f2272af31d5f90f41452b342a7) @@ -18,6 +18,7 @@ property string bottomText : "" property string bottomTextColor : Colors.textTextRectLabel property alias bottomTextFont : _bottomText.font + property int bottomTextTopMargin : 0 property string unitText : "" @@ -46,7 +47,8 @@ Text { id: _bottomText anchors { - top: showCenterText ? _centerText.bottom :_topText.bottom + top : showCenterText ? _centerText.bottom :_topText.bottom + topMargin : bottomTextTopMargin horizontalCenter: leftAlign ? undefined : _topText.horizontalCenter } text: _root.bottomText Index: sources/gui/qml/globals/Colors.qml =================================================================== diff -u -r526fb054edbbeebdcce33ca630ae08ba04067fac -rdb6925e589ca85f2272af31d5f90f41452b342a7 --- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 526fb054edbbeebdcce33ca630ae08ba04067fac) +++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision db6925e589ca85f2272af31d5f90f41452b342a7) @@ -41,8 +41,9 @@ readonly property color backgroundMainMenu : "#0F2841" //// ----- @LEAHIZED readonly property color backgroundDottedMenu : "#64809D" readonly property color backgroundSlider : "#195187" - readonly property color treatmentSectionHeader : Qt.darker (backgroundMain, 1.2) - readonly property color treatmentSectionMain : Qt.darker (backgroundMain, 1.1) + readonly property color treatmentSectionHeader : "#1A2E42" + readonly property color treatmentSectionMain : "#1A3046" + readonly property color treatmentFlowComponent : "#1F3D5A" readonly property color sliderHighlightColor : "orange" readonly property color sliderProgressBorderActive : white Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -r7805806e4370be4d9207872e916f478875bd4ba6 -rdb6925e589ca85f2272af31d5f90f41452b342a7 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 7805806e4370be4d9207872e916f478875bd4ba6) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision db6925e589ca85f2272af31d5f90f41452b342a7) @@ -260,6 +260,7 @@ readonly property string unitTextFlowRate : qsTr("mL/min") readonly property string unitTextDispensingRate : qsTr("mL/hr") readonly property string unitTextRate : qsTr("L/h") + readonly property string unitTextDialCond : qsTr("mS/cm") // - Vitals readonly property string unitTextBloodPressure : qsTr("mmHg") readonly property string unitTextHeartBeat : qsTr("BPM" ) Index: sources/gui/qml/pages/treatment/TreatmentHome.qml =================================================================== diff -u -r7805806e4370be4d9207872e916f478875bd4ba6 -rdb6925e589ca85f2272af31d5f90f41452b342a7 --- sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision 7805806e4370be4d9207872e916f478875bd4ba6) +++ sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision db6925e589ca85f2272af31d5f90f41452b342a7) @@ -19,9 +19,10 @@ // Project // Qml imports -import "../../globals" -import "../../components" -import "sections" +import "qrc:/globals" +import "qrc:/components" +import "qrc:/dialogs" +import "qrc:/pages/treatment/sections" /*! * \brief ManagerHome is the screen @@ -46,11 +47,14 @@ onLogVitalTime: _vitalsTreatmentArea.updateVitalTime() AutoHideInfo { id: _lockDialog + objectName : "lockDialog" + width: 600 height: 600 backgroundColor: "#091E31" Rectangle { id: _mainCircle + objectName: "lockDialogMainCircle" anchors { top: parent.top topMargin: Variables.defaultMargin * 3 @@ -65,6 +69,8 @@ border.width: 3 Image { id : _iconImage + objectName: "lockDialogIcon" + anchors.centerIn : parent height : 80 width : 80 @@ -74,6 +80,8 @@ } Rectangle { id: _innerCircle + objectName: "lockDialogInnerCircle" + anchors.centerIn: parent color: "transparent" border.color: _treatmentParametersMonitor.editEnabled ? "#8FC1FE" : @@ -87,6 +95,8 @@ } Column { id: _column + objectName: "column" + spacing: Variables.defaultMargin anchors { @@ -96,6 +106,8 @@ } Row { id: _topRow + objectName: "topRow" + spacing: Variables.defaultMargin height: cellHeight @@ -105,24 +117,32 @@ height: cellHeight TreatmentTime { id: _treatmentTime + objectName: "treatmentTime" + onClicked: { sectionTimeClicked() } } } - TreatmentSaline { id: _salineTreatmentArea + TreatmentSaline { id: treatmentSaline + objectName: "treatmentSaline" + width: cellWidth + Variables.defaultMargin height: cellHeight } - TreatmentVitals { id: _vitalsTreatmentArea + TreatmentVitals { id: treatmentVitals + objectName: "treatmentVitals" + width: cellWidth + Variables.defaultMargin height: cellHeight onEditClicked: sectionVitalsClicked() // TODO: Keep???? Text { id: _vitalCountdown + objectName: "vitalCountdown" + color : "gray" anchors { top : parent.top @@ -138,24 +158,32 @@ } } - TreatmentPressures { id: _pressureTreatmentArea + TreatmentPressures { id: treatmentPressures + objectName: "treatmentPressures" + width: (cellWidth * 3) - (Variables.defaultMargin * 2) // without auto layouts needs to fine tune height: cellHeight onEditClicked: sectionPressuresClicked() } } Row { id: _bottomRow + objectName: "bottomRow" + spacing: Variables.defaultMargin height: cellHeight - TreatmentUltrafiltration { id: _ultrafiltrationTreatmentArea; + TreatmentUltrafiltration { id: treatmentUltrafiltration; + objectName: "treatmentUltrafiltration" + width: cellWidth * 3 height: cellHeight onEditClicked : sectionUltrafiltrationClicked() } - TreatmentFlows { id: _treatmentParametersMonitor + TreatmentFlows { id: treatmentFlows + objectName: "treatmentFlows" + width: cellWidth * 4 height: cellHeight Index: sources/gui/qml/pages/treatment/TreatmentSectionIcon.qml =================================================================== diff -u -r7805806e4370be4d9207872e916f478875bd4ba6 -rdb6925e589ca85f2272af31d5f90f41452b342a7 --- sources/gui/qml/pages/treatment/TreatmentSectionIcon.qml (.../TreatmentSectionIcon.qml) (revision 7805806e4370be4d9207872e916f478875bd4ba6) +++ sources/gui/qml/pages/treatment/TreatmentSectionIcon.qml (.../TreatmentSectionIcon.qml) (revision db6925e589ca85f2272af31d5f90f41452b342a7) @@ -25,6 +25,7 @@ width : iconSize height : iconSize + radius : iconSize border.color: "transparent" Image { id : _iconImage Index: sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml =================================================================== diff -u -r7805806e4370be4d9207872e916f478875bd4ba6 -rdb6925e589ca85f2272af31d5f90f41452b342a7 --- sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml (.../TreatmentFlows.qml) (revision 7805806e4370be4d9207872e916f478875bd4ba6) +++ sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml (.../TreatmentFlows.qml) (revision db6925e589ca85f2272af31d5f90f41452b342a7) @@ -32,45 +32,63 @@ header.showLock: true contentItem: Row { id: _row + objectName: "row" + property int cellWidth : (contentItem.width / 4) - (Variables.defaultMargin) + 5 spacing: Variables.defaultMargin topPadding: -Variables.defaultMargin TreatmentFlowsComponent { id: _bloodFlow - title: qsTr("Blood Flow") - height: contentItem.height // 2 - width: _row.cellWidth - value: "320"//Variables.notSetVariable(vTreatmentBloodFlow.bloodFlow_PresFlow) - unitText: Variables.unitTextFlowRate + objectName : "bloodFlowComponent" + title : qsTr("Blood Flow") + height : contentItem.height // 2 + width : _row.cellWidth + value : "320"//Variables.notSetVariable(vTreatmentBloodFlow.bloodFlow_PresFlow) + unitText : Variables.unitTextFlowRate + buttonsEnabled : editEnabled + + onIncrement : print(" increment blood flow") + onDecrement : print(" decrement blood flow") } TreatmentFlowsComponent { id: _dialysateFlow - title: qsTr("Dialysate Flow") - height: contentItem.height // 2 - width: _row.cellWidth - value: Variables.notSetVariable(vTreatmentBloodFlow.dialysateFlow_PresFlow) - unitText: Variables.unitTextFlowRate + objectName : "dialysateFlowComponent" + title : qsTr("Dialysate Flow") + height : contentItem.height // 2 + width : _row.cellWidth + value : Variables.notSetVariable(vTreatmentBloodFlow.dialysateFlow_PresFlow) + unitText : Variables.unitTextFlowRate + buttonsEnabled : editEnabled + + onIncrement : print(" increment dial flow") + onDecrement : print(" decrement dial flow") } - TreatmentFlowsComponent { id: _dialysateTemp - title: qsTr("Dialysat Temp.") - height: contentItem.height // 2 - width: _row.cellWidth - value: Variables.notSetVariable(vTreatmentBloodFlow.bloodFlow_PresFlow) - unitText: Variables.unitTextTemperature + objectName : "dialysateTempComponent" + title : qsTr("Dialysat Temp.") + height : contentItem.height // 2 + width : _row.cellWidth + value : Variables.notSetVariable(vTreatmentBloodFlow.bloodFlow_PresFlow) + unitText : Variables.unitTextTemperature + buttonsEnabled : editEnabled + + onIncrement : print(" increment dial temp") + onDecrement : print(" decrement dial temp") } - - TreatmentFlowsComponent { id: _dialysateCond - title: qsTr("Dialysat Cond.") - height: contentItem.height // 2 - width: _row.cellWidth - value: Variables.notSetVariable(vTreatmentBloodFlow.bloodFlow_PresFlow) - unitText: Variables.unitTextDialCond - showButtons: false + objectName : "dialysateCondComponent" + title : qsTr("Dialysate Cond.") + height : contentItem.height // 2 + width : _row.cellWidth + value : Variables.notSetVariable(vTreatmentBloodFlow.bloodFlow_PresFlow) + unitText : Variables.unitTextDialCond + showButtons : false + + onIncrement : print(" increment dial cond") + onDecrement : print(" decrement dial cond") } } } Index: sources/gui/qml/pages/treatment/sections/TreatmentFlowsComponent.qml =================================================================== diff -u -r7805806e4370be4d9207872e916f478875bd4ba6 -rdb6925e589ca85f2272af31d5f90f41452b342a7 --- sources/gui/qml/pages/treatment/sections/TreatmentFlowsComponent.qml (.../TreatmentFlowsComponent.qml) (revision 7805806e4370be4d9207872e916f478875bd4ba6) +++ sources/gui/qml/pages/treatment/sections/TreatmentFlowsComponent.qml (.../TreatmentFlowsComponent.qml) (revision db6925e589ca85f2272af31d5f90f41452b342a7) @@ -5,14 +5,10 @@ // Project // Qml imports -//import "qrc:/globals" -//import "qrc:/components" -//import "qrc:/pages/treatment" +import "qrc:/globals" +import "qrc:/components" +import "qrc:/pages/treatment" -import "../../../globals" -import "../../../components" -import "../" - Rectangle { id: _root property string title : "" @@ -21,102 +17,79 @@ property bool showButtons : true property bool buttonsEnabled: true + property int iconSize : 70 color: Colors.treatmentFlowComponent radius: 5 + signal increment + signal decrement + Text { id: _title + objectName: "title" + anchors { horizontalCenter : _root.horizontalCenter top : parent.top topMargin : Variables.defaultMargin } - width : _root.width - height : Variables.contentHeight - text : _root.title - color : Colors.pressuresText font { pixelSize : 28 weight : Font.Medium } + + width : _root.width + height : Variables.contentHeight + text : _root.title + color : Colors.pressuresText horizontalAlignment : Text.AlignHCenter } - Row { id: _row + objectName: "row" + anchors { top : _title.bottom topMargin : Variables.defaultMargin horizontalCenter : _root.horizontalCenter - -// left : _root.left -// leftMargin : Variables.defaultMargin } LabelValue { id: _value -// height: 50 -// width: 100//_root.width - topTextFont.pixelSize: 65 + objectName: "value" + height: 50 + width: 150//_root.width + topTextFont.pixelSize: 60 topTextFont.weight: Font.Medium topText: value bottomText: _root.unitText - bottomTextFont.pixelSize: 24 + bottomTextFont.pixelSize: 22 + bottomTextTopMargin: Variables.defaultMargin } Column { id: _column + objectName: "column" + visible: showButtons - spacing: Variables.defaultMargin + spacing: Variables.defaultMargin * 2 - TreatmentSectionIcon { id : _upArrowIcon -// anchors { -// top : header.bottom -// topMargin : Variables.defaultMargin -// right : parent.right -// rightMargin : Variables.defaultMargin -// } + objectName: "upArrowIcon" enabled : buttonsEnabled - iconSize : 70 + iconSize : _root.iconSize iconImage.source : enabled ? "qrc:/images/arrowUpActive" : "qrc:/images/arrowUpInactive" - - onClicked : { - // TODO - } + onClicked : _root.increment() } - TreatmentSectionIcon { id : _downArrowIcon -// anchors { -// top : header.bottom -// topMargin : Variables.defaultMargin -// right : parent.right -// rightMargin : Variables.defaultMargin -// } - + objectName: "downArrowIcon" enabled : buttonsEnabled - iconSize : 70 + iconSize : _root.iconSize iconImage.source : enabled ? "qrc:/images/arrowDownActive" : "qrc:/images/arrowDownInactive" - - onClicked : { - // TODO - } + onClicked : _root.decrement() } - - } - -// LabelValue { id: _value1 -// height: 50 -// width: 100//_root.width -// topTextFont.pixelSize: Fonts.fontPixelVitals -// topTextFont.weight: Font.Medium -// topText: value -// bottomText: unitText -// } - } - }