Index: denali.pro.user =================================================================== diff -u -r5626bf604947efe5a80c9ca51802aab1a70a6939 -rd6869b2442823e77476ace6df006d0d000ec9b7a --- denali.pro.user (.../denali.pro.user) (revision 5626bf604947efe5a80c9ca51802aab1a70a6939) +++ denali.pro.user (.../denali.pro.user) (revision d6869b2442823e77476ace6df006d0d000ec9b7a) @@ -1,6 +1,6 @@ - + EnvironmentId @@ -72,19 +72,23 @@ 0 0 - true - 2 /home/denali/Project/tmp/build/denali-Desktop_Qt_5_12_5_GCC_64bit-Debug - /home/denali/Project/tmp/build/denali-Desktop_Qt_5_12_5_GCC_64bit-Debug true + qmake + QtProjectManager.QMakeBuildStep + false false + false + false true + Make + Qt4ProjectManager.MakeStep false @@ -100,6 +104,8 @@ true + Make + Qt4ProjectManager.MakeStep true @@ -115,26 +121,30 @@ 2 false + Debug Debug Qt4ProjectManager.Qt4BuildConfiguration 2 - 2 - 2 + true - true - 2 /home/denali/Project/tmp/build/denali-Desktop_Qt_5_12_5_GCC_64bit-Release - /home/denali/Project/tmp/build/denali-Desktop_Qt_5_12_5_GCC_64bit-Release true + qmake + QtProjectManager.QMakeBuildStep + false true + false + false true + Make + Qt4ProjectManager.MakeStep false @@ -150,6 +160,8 @@ true + Make + Qt4ProjectManager.MakeStep true @@ -165,26 +177,30 @@ 2 false + Release Release Qt4ProjectManager.Qt4BuildConfiguration 0 - 2 - 2 + true - true - 2 /home/denali/Project/tmp/build/unittest/tst_threads - /home/denali/Project/tmp/build/unittest/tst_threads true + qmake + QtProjectManager.QMakeBuildStep + false CONFIG+=tst_threads CONFIG+=CodeCoverage false + false + false true + Make + Qt4ProjectManager.MakeStep false @@ -197,27 +213,35 @@ %{buildDir}/denali %{buildDir} + Custom Process Step + ProjectExplorer.ProcessStep true -m denali.csmes -t UnitTests denali.csexe cmcsexeimport %{buildDir} + Custom Process Step + ProjectExplorer.ProcessStep true --csmes=denali.csmes --html=Coverage/index cmreport %{buildDir} + Custom Process Step + ProjectExplorer.ProcessStep true --csmes=denali.csmes --csv-excel=Coverage/coverage.csv cmreport %{buildDir} + Custom Process Step + ProjectExplorer.ProcessStep 6 @@ -228,6 +252,8 @@ true + Make + Qt4ProjectManager.MakeStep true @@ -245,26 +271,30 @@ PATH=/opt/SquishCoco/bin:/opt/SquishCoco/wrapper/bin:/opt/Qt5.12.5/5.12.5/gcc_64/bin:/usr/bin:/home/denali/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin + tst_threads tst_threads Qt4ProjectManager.Qt4BuildConfiguration 2 - 2 - 2 + true - true - 2 /home/denali/Project/tmp/build/unittest/tst_messaging - /home/denali/Project/tmp/build/unittest/tst_messaging true + qmake + QtProjectManager.QMakeBuildStep + false CONFIG+=tst_messaging CONFIG+=CodeCoverage false + false + false true + Make + Qt4ProjectManager.MakeStep false @@ -277,27 +307,35 @@ %{buildDir}/denali %{buildDir} + Custom Process Step + ProjectExplorer.ProcessStep true -m denali.csmes -t UnitTests denali.csexe cmcsexeimport %{buildDir} + Custom Process Step + ProjectExplorer.ProcessStep true --csmes=denali.csmes --html=Coverage/index cmreport %{buildDir} + Custom Process Step + ProjectExplorer.ProcessStep true --csmes=denali.csmes --csv-excel=Coverage/coverage.csv cmreport %{buildDir} + Custom Process Step + ProjectExplorer.ProcessStep 6 @@ -308,6 +346,8 @@ true + Make + Qt4ProjectManager.MakeStep true @@ -325,26 +365,30 @@ PATH=/opt/SquishCoco/bin:/opt/SquishCoco/wrapper/bin:/opt/Qt5.12.5/5.12.5/gcc_64/bin:/usr/bin:/home/denali/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin + tst_messaging tst_messaging Qt4ProjectManager.Qt4BuildConfiguration 2 - 2 - 2 + true - true - 2 /home/denali/Project/tmp/build/denali-Desktop_Qt_5_12_5_GCC_64bit-Profile - /home/denali/Project/tmp/build/denali-Desktop_Qt_5_12_5_GCC_64bit-Profile true + qmake + QtProjectManager.QMakeBuildStep + false true + false + false true + Make + Qt4ProjectManager.MakeStep false @@ -360,6 +404,8 @@ true + Make + Qt4ProjectManager.MakeStep true @@ -375,26 +421,30 @@ 2 false + Profile Profile Qt4ProjectManager.Qt4BuildConfiguration 0 - 2 - 2 + true - true - 2 /home/denali/Project/tmp/build/unittest/tst_canbus - /home/denali/Project/tmp/build/unittest/tst_canbus true + qmake + QtProjectManager.QMakeBuildStep + false CONFIG+=tst_canbus CONFIG+=CodeCoverage false + false + false true + Make + Qt4ProjectManager.MakeStep false @@ -407,27 +457,35 @@ %{buildDir}/denali %{buildDir} + Custom Process Step + ProjectExplorer.ProcessStep true -m denali.csmes -t UnitTests denali.csexe cmcsexeimport %{buildDir} + Custom Process Step + ProjectExplorer.ProcessStep true --csmes=denali.csmes --html=Coverage/index cmreport %{buildDir} + Custom Process Step + ProjectExplorer.ProcessStep true --csmes=denali.csmes --csv-excel=Coverage/coverage.csv cmreport %{buildDir} + Custom Process Step + ProjectExplorer.ProcessStep 6 @@ -438,6 +496,8 @@ true + Make + Qt4ProjectManager.MakeStep true @@ -455,26 +515,30 @@ PATH=/opt/SquishCoco/bin:/opt/SquishCoco/wrapper/bin:/opt/Qt5.12.5/5.12.5/gcc_64/bin:/usr/bin:/home/denali/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin + tst_canbus tst_canbus Qt4ProjectManager.Qt4BuildConfiguration 2 - 2 - 2 + true - true - 2 /home/denali/Project/tmp/build/unittest/tst_logging - /home/denali/Project/tmp/build/unittest/tst_logging true + qmake + QtProjectManager.QMakeBuildStep + false CONFIG+=tst_logging CONFIG+=CodeCoverage false + false + false true + Make + Qt4ProjectManager.MakeStep false @@ -487,27 +551,35 @@ %{buildDir}/denali %{buildDir} + Custom Process Step + ProjectExplorer.ProcessStep true -m denali.csmes -t UnitTests denali.csexe cmcsexeimport %{buildDir} + Custom Process Step + ProjectExplorer.ProcessStep true --csmes=denali.csmes --html=Coverage/index cmreport %{buildDir} + Custom Process Step + ProjectExplorer.ProcessStep true --csmes=denali.csmes --csv-excel=Coverage/coverage.csv cmreport %{buildDir} + Custom Process Step + ProjectExplorer.ProcessStep 6 @@ -518,6 +590,8 @@ true + Make + Qt4ProjectManager.MakeStep true @@ -535,26 +609,30 @@ PATH=/opt/SquishCoco/bin:/opt/SquishCoco/wrapper/bin:/opt/Qt5.12.5/5.12.5/gcc_64/bin:/usr/bin:/home/denali/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin + tst_logging tst_logging Qt4ProjectManager.Qt4BuildConfiguration 2 - 2 - 2 + true - true - 2 /home/denali/Project/tmp/build/unittest/tst_utilities - /home/denali/Project/tmp/build/unittest/tst_utilities true + qmake + QtProjectManager.QMakeBuildStep + false CONFIG+=tst_utilities CONFIG+=CodeCoverage true + false + false true + Make + Qt4ProjectManager.MakeStep false @@ -567,27 +645,35 @@ %{buildDir}/denali %{buildDir} + Custom Process Step + ProjectExplorer.ProcessStep true -m denali.csmes -t UnitTests denali.csexe cmcsexeimport %{buildDir} + Custom Process Step + ProjectExplorer.ProcessStep true --csmes=denali.csmes --html=Coverage/index cmreport %{buildDir} + Custom Process Step + ProjectExplorer.ProcessStep true --csmes=denali.csmes --csv-excel=Coverage/coverage.csv cmreport %{buildDir} + Custom Process Step + ProjectExplorer.ProcessStep 6 @@ -598,6 +684,8 @@ true + Make + Qt4ProjectManager.MakeStep true @@ -615,26 +703,30 @@ PATH=/opt/SquishCoco/bin:/opt/SquishCoco/wrapper/bin:/opt/Qt5.12.5/5.12.5/gcc_64/bin:/usr/bin:/home/denali/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin + tst_utilities tst_utilities Qt4ProjectManager.Qt4BuildConfiguration 2 - 2 - 2 + true - true - 2 /home/denali/Project/tmp/build/unittest/tst_acknow - /home/denali/Project/tmp/build/unittest/tst_acknow true + qmake + QtProjectManager.QMakeBuildStep + false CONFIG+=tst_acknow CONFIG+=CodeCoverage true + false + false true + Make + Qt4ProjectManager.MakeStep false @@ -647,27 +739,35 @@ %{buildDir}/denali %{buildDir} + Custom Process Step + ProjectExplorer.ProcessStep true -m denali.csmes -t UnitTests denali.csexe cmcsexeimport %{buildDir} + Custom Process Step + ProjectExplorer.ProcessStep true --csmes=denali.csmes --html=Coverage/index cmreport %{buildDir} + Custom Process Step + ProjectExplorer.ProcessStep true --csmes=denali.csmes --csv-excel=Coverage/coverage.csv cmreport %{buildDir} + Custom Process Step + ProjectExplorer.ProcessStep 6 @@ -678,6 +778,8 @@ true + Make + Qt4ProjectManager.MakeStep true @@ -695,26 +797,30 @@ PATH=/opt/SquishCoco/bin:/opt/SquishCoco/wrapper/bin:/opt/Qt5.12.5/5.12.5/gcc_64/bin:/usr/bin:/home/denali/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin + tst_acknow tst_acknow Qt4ProjectManager.Qt4BuildConfiguration 2 - 2 - 2 + true - true - 2 /home/denali/Project/tmp/build/unittest/tst_models - /home/denali/Project/tmp/build/unittest/tst_models true + qmake + QtProjectManager.QMakeBuildStep + false CONFIG+=tst_models CONFIG+=CodeCoverage false + false + false true + Make + Qt4ProjectManager.MakeStep false @@ -727,27 +833,35 @@ %{buildDir}/denali %{buildDir} + Custom Process Step + ProjectExplorer.ProcessStep true -m denali.csmes -t UnitTests denali.csexe cmcsexeimport %{buildDir} + Custom Process Step + ProjectExplorer.ProcessStep true --csmes=denali.csmes --html=Coverage/index cmreport %{buildDir} + Custom Process Step + ProjectExplorer.ProcessStep true --csmes=denali.csmes --csv-excel=Coverage/coverage.csv cmreport %{buildDir} + Custom Process Step + ProjectExplorer.ProcessStep 6 @@ -758,6 +872,8 @@ true + Make + Qt4ProjectManager.MakeStep true @@ -775,26 +891,30 @@ PATH=/opt/SquishCoco/bin:/opt/SquishCoco/wrapper/bin:/opt/Qt5.12.5/5.12.5/gcc_64/bin:/usr/bin:/home/denali/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin + tst_models tst_models Qt4ProjectManager.Qt4BuildConfiguration 2 - 2 - 2 + true - true - 2 /home/denali/Project/tmp/build/unittest/tst_initializations - /home/denali/Project/tmp/build/unittest/tst_initializations true + qmake + QtProjectManager.QMakeBuildStep + false CONFIG+=tst_initializations CONFIG+=CodeCoverage false + false + false true + Make + Qt4ProjectManager.MakeStep false @@ -807,27 +927,35 @@ %{buildDir}/denali %{buildDir} + Custom Process Step + ProjectExplorer.ProcessStep true -m denali.csmes -t UnitTests denali.csexe cmcsexeimport %{buildDir} + Custom Process Step + ProjectExplorer.ProcessStep true --csmes=denali.csmes --html=Coverage/index cmreport %{buildDir} + Custom Process Step + ProjectExplorer.ProcessStep true --csmes=denali.csmes --csv-excel=Coverage/coverage.csv cmreport %{buildDir} + Custom Process Step + ProjectExplorer.ProcessStep 6 @@ -838,6 +966,8 @@ true + Make + Qt4ProjectManager.MakeStep true @@ -855,26 +985,30 @@ PATH=/opt/SquishCoco/bin:/opt/SquishCoco/wrapper/bin:/opt/Qt5.12.5/5.12.5/gcc_64/bin:/usr/bin:/home/denali/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin + tst_initializations tst_initializations Qt4ProjectManager.Qt4BuildConfiguration 2 - 2 - 2 + true - true - 2 /home/denali/Project/tmp/build/unittest/tst_views - /home/denali/Project/tmp/build/unittest/tst_views true + qmake + QtProjectManager.QMakeBuildStep + false CONFIG+=tst_views CONFIG+=CodeCoverage false + false + false true + Make + Qt4ProjectManager.MakeStep false @@ -887,27 +1021,35 @@ %{buildDir}/denali %{buildDir} + Custom Process Step + ProjectExplorer.ProcessStep true -m denali.csmes -t UnitTests denali.csexe cmcsexeimport %{buildDir} + Custom Process Step + ProjectExplorer.ProcessStep true --csmes=denali.csmes --html=Coverage/index cmreport %{buildDir} + Custom Process Step + ProjectExplorer.ProcessStep true --csmes=denali.csmes --csv-excel=Coverage/coverage.csv cmreport %{buildDir} + Custom Process Step + ProjectExplorer.ProcessStep 6 @@ -918,6 +1060,8 @@ true + Make + Qt4ProjectManager.MakeStep true @@ -935,11 +1079,11 @@ PATH=/opt/SquishCoco/bin:/opt/SquishCoco/wrapper/bin:/opt/Qt5.12.5/5.12.5/gcc_64/bin:/usr/bin:/home/denali/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin + tst_views tst_views Qt4ProjectManager.Qt4BuildConfiguration 2 - 2 - 2 + true 12 @@ -950,8 +1094,8 @@ ProjectExplorer.BuildSteps.Deploy 1 - - false + Deploy Configuration + ProjectExplorer.DefaultDeployConfiguration 1 @@ -963,14 +1107,6 @@ 250 - - -e - cpu-cycles - --call-graph - dwarf,4096 - -F - 250 - -F true 4096 @@ -1016,11 +1152,11 @@ 2 + denali + Qt4ProjectManager.Qt4RunConfiguration:/home/denali/Project/application/denali.pro - /home/denali/Project/application/denali.pro - false - + 3768 false true true @@ -1043,19 +1179,23 @@ 0 0 - true - 2 /home/denali/Project/tmp/build/denali-Qt_5_12_5_iMX8-Debug - /home/denali/Project/tmp/build/denali-Qt_5_12_5_iMX8-Debug true + qmake + QtProjectManager.QMakeBuildStep + false false + false + false true + Make + Qt4ProjectManager.MakeStep false @@ -1071,6 +1211,8 @@ true + Make + Qt4ProjectManager.MakeStep true @@ -1086,26 +1228,30 @@ 2 false + Debug Debug Qt4ProjectManager.Qt4BuildConfiguration 2 - 2 - 2 + true - true - 2 /home/denali/Project/tmp/build/denali-Qt_5_12_5_iMX8-Release - /home/denali/Project/tmp/build/denali-Qt_5_12_5_iMX8-Release true + qmake + QtProjectManager.QMakeBuildStep + false true + false + false true + Make + Qt4ProjectManager.MakeStep false @@ -1121,6 +1267,8 @@ true + Make + Qt4ProjectManager.MakeStep true @@ -1136,26 +1284,30 @@ 2 false + Release Release Qt4ProjectManager.Qt4BuildConfiguration 0 - 2 - 2 + true - true - 2 /home/denali/Project/tmp/build/denali-Qt_5_12_5_iMX8-Profile - /home/denali/Project/tmp/build/denali-Qt_5_12_5_iMX8-Profile true + qmake + QtProjectManager.QMakeBuildStep + false true + false + false true + Make + Qt4ProjectManager.MakeStep false @@ -1171,6 +1323,8 @@ true + Make + Qt4ProjectManager.MakeStep true @@ -1186,17 +1340,19 @@ 2 false + Profile Profile Qt4ProjectManager.Qt4BuildConfiguration 0 - 2 - 2 + true 3 true + Check for free disk space + RemoteLinux.CheckForFreeDiskSpaceStep @@ -1209,6 +1365,8 @@ true + Kill current application instance + RemoteLinux.KillAppStep @@ -1219,6 +1377,8 @@ true + Deploy files via rsync + RemoteLinux.RsyncDeployStep @@ -1235,8 +1395,8 @@ ProjectExplorer.BuildSteps.Deploy 1 - - false + Deploy to Remote Linux Host + DeployToGenericLinux 1 @@ -1248,14 +1408,6 @@ 250 - - -e - cpu-cycles - --call-graph - dwarf,4096 - -F - 250 - -F true 4096 @@ -1301,15 +1453,14 @@ 1 + denali (on Generic Linux Device (iMX8)) denali (on Generic Linux Device (iMX8)) RemoteLinuxRunConfiguration:/home/denali/Project/application/denali.pro - /home/denali/Project/application/denali.pro 1 false - false - + 3768 false true false Index: denali.qrc =================================================================== diff -u -r34471900489397f483e052870ddc46059cef49fb -rd6869b2442823e77476ace6df006d0d000ec9b7a --- denali.qrc (.../denali.qrc) (revision 34471900489397f483e052870ddc46059cef49fb) +++ denali.qrc (.../denali.qrc) (revision d6869b2442823e77476ace6df006d0d000ec9b7a) @@ -44,6 +44,7 @@ sources/gui/qml/components/TimeText.qml sources/gui/qml/components/ProgressCircle.qml sources/gui/qml/components/Slider.qml + sources/gui/qml/components/SliderCreateTreatment.qml sources/gui/qml/components/ProgressBarEx.qml sources/gui/qml/components/CloseButton.qml sources/gui/qml/components/ConfirmButton.qml Index: sources/gui/qml/components/SliderCreateTreatment.qml =================================================================== diff -u --- sources/gui/qml/components/SliderCreateTreatment.qml (revision 0) +++ sources/gui/qml/components/SliderCreateTreatment.qml (revision d6869b2442823e77476ace6df006d0d000ec9b7a) @@ -0,0 +1,70 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file SliderCreateTreatment.qml + * \date 2020/07/07 + * \author Peter Lucia + * + */ + +// Qt +import QtQuick 2.12 + +// Project +// Qml imports +import "qrc:/globals" +import "qrc:/components" + +Rectangle { + id: _root + + property alias text: _text.text + property alias units: _slider.unit + property alias min: _slider.minimum + property alias max: _slider.maximum + + height: Variables.progressbarRectHeight + width: Variables.progressbarRectWidth + anchors.horizontalCenter: parent.horizontalCenter + color: "transparent"; + + Text { + id: _text + text: "" + anchors.top: parent.top + anchors.left: parent.left + font.pixelSize: Fonts.fontPixelFluidText + color: Colors.textMain; + + } + + Text { + id: _selected_value + anchors.top: parent.top + anchors.right: parent.right + text: "" + font.pixelSize: Fonts.fontPixelFluidUnit + color: Colors.textMain; + + } + + Slider { id : _slider + anchors.horizontalCenter: parent.horizontalCenter; + anchors.bottom: parent.bottom; + width : Variables.progressbarSmallWidth + height : 5 + minimum : 100 + maximum : 500 + unit : qsTr("") + step : Variables.bloodFlowResolution + ticks : true + onValueChanged: { + _selected_value.text = value + unit; + } + } +} Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -rc64e61dd23a44d4b9d76c9e0b8f06bc359497665 -rd6869b2442823e77476ace6df006d0d000ec9b7a --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision c64e61dd23a44d4b9d76c9e0b8f06bc359497665) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision d6869b2442823e77476ace6df006d0d000ec9b7a) @@ -68,8 +68,10 @@ readonly property int progressbarRectWidth : 620 readonly property int sliderTextMargin : 20 + readonly property int createTreatmentSpacing : 60 readonly property int notificationHeight : 60 + readonly property real scrollBarSize : 0.2 // --- PRS --- readonly property int bloodFlowResolution : 25 Index: sources/gui/qml/pages/treatment/TreatmentCreate.qml =================================================================== diff -u -r9baa4f15fe9866be23895f9738b091b3ab078898 -rd6869b2442823e77476ace6df006d0d000ec9b7a --- sources/gui/qml/pages/treatment/TreatmentCreate.qml (.../TreatmentCreate.qml) (revision 9baa4f15fe9866be23895f9738b091b3ab078898) +++ sources/gui/qml/pages/treatment/TreatmentCreate.qml (.../TreatmentCreate.qml) (revision d6869b2442823e77476ace6df006d0d000ec9b7a) @@ -1,14 +1,14 @@ /*! * - * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * Copyright (c) 2020 Diality Inc. - All Rights Reserved. * \copyright \n * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n * IN PART OR IN WHOLE, \n * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n * - * \file ManagerHome.qml - * \date 2019/10/21 - * \author Behrouz NematiPour + * \file TreatmentCreate.qml + * \date 2020/07/07 + * \author Peter Lucia * */ @@ -26,7 +26,8 @@ * which is the default screen in the "Manager" stack */ ScreenItem { id: _root - signal backPressed() + signal clickedBack() + signal clickedContinue() Rectangle { id: _topMenuBar anchors.top: parent.top @@ -37,21 +38,25 @@ BackButton { id : _backButton anchors.verticalCenter: parent.verticalCenter - onPressed: backPressed() + onPressed: clickedBack() } } - ScrollView { - anchors.top: _topMenuBar.bottom; - anchors.left: parent.left; - anchors.bottom: parent.bottom; - width: parent.width; + Flickable { + id: _flickable + anchors.top: _topMenuBar.bottom + anchors.left: parent.left + anchors.bottom: parent.bottom + width: parent.width + contentWidth: parent.width + contentHeight: parent.height + clip: true Rectangle { color: "transparent"; anchors.fill: parent; Column { - spacing: Variables.columnSpacing + spacing: Variables.createTreatmentSpacing anchors.horizontalCenter: parent.horizontalCenter; anchors.fill: parent; @@ -66,55 +71,87 @@ anchors.horizontalCenter: parent.horizontalCenter; text: qsTr("PRESCRIPTION"); color: Colors.textMain; - font.pixelSize: Fonts.fontPixelSection + font.pixelSize: Fonts.fontPixelButton + font.bold: true } - // TODO: make this a component. - Rectangle { - height: Variables.progressbarRectHeight - width: Variables.progressbarRectWidth - anchors.horizontalCenter: parent.horizontalCenter - color: "transparent"; + SliderCreateTreatment { + id: _bloodFlowRate + text: "Blood Flow Rate" + units: qsTr(" mL/min") + min: 100 + max: 500 + } - Text { - text: "Blood Flow Rate" - anchors.top: parent.top - anchors.left: parent.left - font.pixelSize: Fonts.fontPixelFluidText - color: Colors.textMain; + SliderCreateTreatment { + id: _dialysateFlowRate + text: "Dialysate Flow Rate" + units: qsTr(" mL/min") + min: 100 + max: 600 + } - } + SliderCreateTreatment { + id: _duration + text: "Duration" + units: qsTr(" min") + min: 60 + max: 480 + } - Text { - id: _selected_value - anchors.top: parent.top - anchors.right: parent.right - text: "-- mL/min" - font.pixelSize: Fonts.fontPixelFluidUnit - color: Colors.textMain; + SliderCreateTreatment { + id: _heparinDispensingRate + text: "Heparin Dispensing Rate" + units: qsTr(" IU/hr") + min: 0 + max: 1000 + } - } + SliderCreateTreatment { + id: _heparinBolusVolume + text: "Heparin Bolus Volume" + units: qsTr(" IU") + min: 100 + max: 2000 + } - Slider { id : _bloodFlowRate - anchors.horizontalCenter: parent.horizontalCenter; - anchors.bottom: parent.bottom; - width : Variables.progressbarSmallWidth - height : 5 - minimum : 100 - maximum : 500 - unit : qsTr(" mL/min") - step : Variables.bloodFlowResolution - ticks : true - onValueChanged: { - _selected_value.text = value + unit; - } - } + TouchRect { id : _continueRect + anchors.horizontalCenter: parent.horizontalCenter + text.text: qsTr("CONTINUE") + button.onClicked: _root.clickedContinue() } } } + states: State { + when: _flickable.movingVertically + PropertyChanges { + target: _verticalScrollBar + opacity: 0.8 + } + } + } + ScrollBar { + anchors.top: _flickable.top + anchors.bottom: _flickable.bottom + id: _verticalScrollBar + size: Variables.scrollBarSize + active: true + anchors.right: _flickable.right + anchors.rightMargin: 5 + opacity: 0 + orientation: Qt.Vertical + position: _flickable.visibleArea.yPosition + + contentItem: Rectangle { + color: Colors.backgroundRangeRect + implicitWidth: 6 + radius: width / 2 + width: 3 + } + } onVisibleChanged: { Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -r34471900489397f483e052870ddc46059cef49fb -rd6869b2442823e77476ace6df006d0d000ec9b7a --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 34471900489397f483e052870ddc46059cef49fb) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision d6869b2442823e77476ace6df006d0d000ec9b7a) @@ -76,7 +76,7 @@ } TreatmentCreate { id: _treatmentCreate - onBackPressed : pop() + onClickedBack : pop() } }