Index: denali.pro.user =================================================================== diff -u -r7edcaf054062754370e0abd165f17ca9941b7d07 -r9f63306043e9a184ce3e71c573ef0a15d8644f95 --- denali.pro.user (.../denali.pro.user) (revision 7edcaf054062754370e0abd165f17ca9941b7d07) +++ denali.pro.user (.../denali.pro.user) (revision 9f63306043e9a184ce3e71c573ef0a15d8644f95) @@ -1,6 +1,6 @@ - + EnvironmentId @@ -89,7 +89,7 @@ Desktop Qt 5.12.5 GCC 64bit Desktop Qt 5.12.5 GCC 64bit qt.qt5.5125.gcc_64_kit - 1 + 0 0 0 @@ -1185,7 +1185,7 @@ false true - /home/denali/Projects/tmp/build/denali-Desktop_Qt_5_12_5_GCC_64bit-Release + /home/denali/Projects/tmp/build/denali-Desktop_Qt_5_12_5_GCC_64bit-Debug 1 @@ -1196,7 +1196,7 @@ Qt 5.12.5 (iMX8) Qt 5.12.5 (iMX8) {5d6458ef-f917-4aef-a092-c77bbe106149} - 0 + 1 0 0 @@ -1475,12 +1475,12 @@ 1 - denali (on Generic Linux Device (iMX8))2 + denali (on UI Test Board) RemoteLinuxRunConfiguration:/home/denali/Projects/application/denali.pro 1 false - -u + 3768 false true Index: sources/gui/qml/components/CircleWithText.qml =================================================================== diff -u -rc71deaab48699cffdf9db816dfac2778d79c2238 -r9f63306043e9a184ce3e71c573ef0a15d8644f95 --- sources/gui/qml/components/CircleWithText.qml (.../CircleWithText.qml) (revision c71deaab48699cffdf9db816dfac2778d79c2238) +++ sources/gui/qml/components/CircleWithText.qml (.../CircleWithText.qml) (revision 9f63306043e9a184ce3e71c573ef0a15d8644f95) @@ -22,6 +22,9 @@ import "qrc:/globals" import "qrc:/components" +/*! + * \brief A filled circle with text below it, used to build a step-by-step progress indicator + */ Rectangle { id: _root property int diameter : 10 property var text : "" Index: sources/gui/qml/components/RangeRect.qml =================================================================== diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -r9f63306043e9a184ce3e71c573ef0a15d8644f95 --- sources/gui/qml/components/RangeRect.qml (.../RangeRect.qml) (revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e) +++ sources/gui/qml/components/RangeRect.qml (.../RangeRect.qml) (revision 9f63306043e9a184ce3e71c573ef0a15d8644f95) @@ -26,6 +26,7 @@ Rectangle { id: _root signal clicked(var vMouseEvent) signal dragged(var vMouseEvent) + signal pressChanged() property int decimal : 0 @@ -88,5 +89,8 @@ onClicked: { _root.clicked(mouse) } + onPressedChanged: { + _root.pressChanged(); + } } } Index: sources/gui/qml/components/RectSelectCreateTreatment.qml =================================================================== diff -u -r20a67175350b1c20f078bade73a77d48c4647832 -r9f63306043e9a184ce3e71c573ef0a15d8644f95 --- sources/gui/qml/components/RectSelectCreateTreatment.qml (.../RectSelectCreateTreatment.qml) (revision 20a67175350b1c20f078bade73a77d48c4647832) +++ sources/gui/qml/components/RectSelectCreateTreatment.qml (.../RectSelectCreateTreatment.qml) (revision 9f63306043e9a184ce3e71c573ef0a15d8644f95) @@ -22,7 +22,10 @@ import "qrc:/globals" import "qrc:/components" -// TODO: if possible, make this a component +/*! + * \brief A selectable grid of options with customizable number of rows and columns + * where only one option is selected by the user + */ Rectangle { id: _root anchors.horizontalCenter: parent.horizontalCenter Index: sources/gui/qml/components/Slider.qml =================================================================== diff -u -r7edcaf054062754370e0abd165f17ca9941b7d07 -r9f63306043e9a184ce3e71c573ef0a15d8644f95 --- sources/gui/qml/components/Slider.qml (.../Slider.qml) (revision 7edcaf054062754370e0abd165f17ca9941b7d07) +++ sources/gui/qml/components/Slider.qml (.../Slider.qml) (revision 9f63306043e9a184ce3e71c573ef0a15d8644f95) @@ -133,6 +133,9 @@ setValue(vMouseEvent.x) progressRectClicked() } + onPressChanged: { + _root.pressChanged() + } } // used loader for performance since it may not always be required. Index: sources/gui/qml/components/SliderCreateTreatment.qml =================================================================== diff -u -r20a67175350b1c20f078bade73a77d48c4647832 -r9f63306043e9a184ce3e71c573ef0a15d8644f95 --- sources/gui/qml/components/SliderCreateTreatment.qml (.../SliderCreateTreatment.qml) (revision 20a67175350b1c20f078bade73a77d48c4647832) +++ sources/gui/qml/components/SliderCreateTreatment.qml (.../SliderCreateTreatment.qml) (revision 9f63306043e9a184ce3e71c573ef0a15d8644f95) @@ -20,6 +20,9 @@ import "qrc:/globals" import "qrc:/components" +/*! + * \brief Slider component with a title and the currently selected value + */ Rectangle { id: _root @@ -88,7 +91,6 @@ ticks : true onValueChanged: { _selected_value.text = value + " " + _root.units - sliderChanged() } onActiveChanged: { @@ -103,8 +105,8 @@ onProgressRectClicked: { setActive(true); setValid(true); } onProgressRectDragged: { setActive(true); setValid(true); } + onPressChanged: { _root.sliderChanged(); } onDragged: { setActive(true); setValid(true); } onClicked: { setActive(true); setValid(true); } - } } Index: sources/gui/qml/components/SliderDoubleCreateTreatment.qml =================================================================== diff -u -r20a67175350b1c20f078bade73a77d48c4647832 -r9f63306043e9a184ce3e71c573ef0a15d8644f95 --- sources/gui/qml/components/SliderDoubleCreateTreatment.qml (.../SliderDoubleCreateTreatment.qml) (revision 20a67175350b1c20f078bade73a77d48c4647832) +++ sources/gui/qml/components/SliderDoubleCreateTreatment.qml (.../SliderDoubleCreateTreatment.qml) (revision 9f63306043e9a184ce3e71c573ef0a15d8644f95) @@ -20,6 +20,9 @@ import "qrc:/globals" import "qrc:/components" +/*! + * \brief Two side-by-side sliders that fit the width of a normal slider component + */ Rectangle { id: _root Index: sources/gui/qml/components/TouchRect.qml =================================================================== diff -u -r7edcaf054062754370e0abd165f17ca9941b7d07 -r9f63306043e9a184ce3e71c573ef0a15d8644f95 --- sources/gui/qml/components/TouchRect.qml (.../TouchRect.qml) (revision 7edcaf054062754370e0abd165f17ca9941b7d07) +++ sources/gui/qml/components/TouchRect.qml (.../TouchRect.qml) (revision 9f63306043e9a184ce3e71c573ef0a15d8644f95) @@ -88,7 +88,7 @@ function setSelected(isSelected) { _root.selected = isSelected if (_root.selected) { - _root.color = Colors.backgroundBtnSelectDark + _root.color = Colors.backgroundButtonSelectDark } else { _root.color = backgroundColor Index: sources/gui/qml/globals/Colors.qml =================================================================== diff -u -r20a67175350b1c20f078bade73a77d48c4647832 -r9f63306043e9a184ce3e71c573ef0a15d8644f95 --- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 20a67175350b1c20f078bade73a77d48c4647832) +++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 9f63306043e9a184ce3e71c573ef0a15d8644f95) @@ -26,7 +26,7 @@ readonly property color backgroundMain : "#1A344D" readonly property color backgroundButtonNormal : "Transparent" readonly property color backgroundButtonSelect : "#438FEB" - readonly property color backgroundBtnSelectDark : "#214773" + readonly property color backgroundButtonSelectDark : "#214773" readonly property color backgroundDialog : "#254670" readonly property color backgroundMenu : "#14314C" readonly property color backgroundMainMenu : "#0D2639"