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 -// } - } - }