Index: ConfirmTreatmentTableEntry.qml
===================================================================
diff -u -r0401b9a1fb6f89f0ec83571f2f868956c7500a0f -rd94a2b9334b1b35739b637472e8c3054d7b9b804
--- ConfirmTreatmentTableEntry.qml (.../ConfirmTreatmentTableEntry.qml) (revision 0401b9a1fb6f89f0ec83571f2f868956c7500a0f)
+++ ConfirmTreatmentTableEntry.qml (.../ConfirmTreatmentTableEntry.qml) (revision d94a2b9334b1b35739b637472e8c3054d7b9b804)
@@ -21,6 +21,10 @@
import "qrc:/globals"
import "qrc:/components"
+/*!
+ * \brief ConfirmTreatmentTableEntry - A cell of a confirm treatment
+ * parameters table with configurable key name, value name, and dimensions.
+ */
Rectangle {
id: _root
property var key: "Key"
@@ -47,7 +51,6 @@
anchors.left: parent.left
anchors.verticalCenter: _root.verticalCenter
font.pixelSize: Fonts.crTreatmentTableFontSize
-
}
Text {
@@ -60,5 +63,4 @@
anchors.leftMargin: 3*Variables.createTreatmentMargin
font.pixelSize: Fonts.crTreatmentTableFontSize
}
-
}
Fisheye: Tag d94a2b9334b1b35739b637472e8c3054d7b9b804 refers to a dead (removed) revision in file `ProgressLine.qml'.
Fisheye: No comparison available. Pass `N' to diff?
Index: denali.qrc
===================================================================
diff -u -rf8321d4b6a5489f797122321a4821b4eeaaa50cb -rd94a2b9334b1b35739b637472e8c3054d7b9b804
--- denali.qrc (.../denali.qrc) (revision f8321d4b6a5489f797122321a4821b4eeaaa50cb)
+++ denali.qrc (.../denali.qrc) (revision d94a2b9334b1b35739b637472e8c3054d7b9b804)
@@ -80,7 +80,6 @@
sources/gui/qml/components/ImageLogoDDarkTransparent.qml
sources/gui/qml/components/PrimingTimer.qml
ConfirmTreatmentTableEntry.qml
- ProgressLine.qml
sources/gui/qml/components/DebugDataColumn.qml
sources/gui/qml/components/CheckListItem.qml
Index: sources/gui/qml/components/ConfirmTreatmentSubTable.qml
===================================================================
diff -u -r074b32b5cc08f41f2d9ce0d021f2151b76bba5ad -rd94a2b9334b1b35739b637472e8c3054d7b9b804
--- sources/gui/qml/components/ConfirmTreatmentSubTable.qml (.../ConfirmTreatmentSubTable.qml) (revision 074b32b5cc08f41f2d9ce0d021f2151b76bba5ad)
+++ sources/gui/qml/components/ConfirmTreatmentSubTable.qml (.../ConfirmTreatmentSubTable.qml) (revision d94a2b9334b1b35739b637472e8c3054d7b9b804)
@@ -6,7 +6,7 @@
* IN PART OR IN WHOLE, \n
* WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n
*
- * \file ConfirmTreatmentTable.qml
+ * \file ConfirmTreatmentSubTable.qml
* \date 2020/08/25
* \author Peter Lucia
*
@@ -46,12 +46,9 @@
key: prescriptionKeys[index]
value: prescriptionValues[index]
}
-
-
}
}
-
GridLayout {
id: _operating_grid
anchors.top: parent.top
Index: sources/gui/qml/components/TopMenuBarCreateTreatment.qml
===================================================================
diff -u -r0d59385f134f65a19dace1e2b46eb2631924396e -rd94a2b9334b1b35739b637472e8c3054d7b9b804
--- sources/gui/qml/components/TopMenuBarCreateTreatment.qml (.../TopMenuBarCreateTreatment.qml) (revision 0d59385f134f65a19dace1e2b46eb2631924396e)
+++ sources/gui/qml/components/TopMenuBarCreateTreatment.qml (.../TopMenuBarCreateTreatment.qml) (revision d94a2b9334b1b35739b637472e8c3054d7b9b804)
@@ -22,6 +22,10 @@
import "qrc:/globals"
import "qrc:/components"
+/*!
+ * \brief TopMenuBarCreateTreatment - Contains a back button as well
+ * as the current progress in each of the pre-treatment steps.
+ */
Rectangle { id: _root
height: Variables.topBarMenuHeight
color: Colors.backgroundMainMenu
@@ -50,7 +54,6 @@
}
-
Row {
anchors.centerIn: parent
spacing: 5
@@ -60,34 +63,71 @@
state: "active"
}
- ProgressLine { id: _confirm_line
+ Line { id: _confirm_line
+ length: 120
+ color: Colors.createTreatmentInactive
+ radius: 5
anchors.verticalCenter: _create.verticalCenter
+ states: [
+ State {
+ name: "active"
+ PropertyChanges { target: _confirm_line; thickness: 3; color: Colors.createTreatmentActive; }
+ },
+ State {
+ name: "inactive"
+ PropertyChanges { target: _confirm_line; thickness: 1; color: Colors.createTreatmentInactive; }
+ }
+ ]
}
CircleWithText { id: _confirm
text: "CONFIRM"
}
- ProgressLine { id: _priming_line
+ Line { id: _priming_line
+ length: 120
+ color: Colors.createTreatmentInactive
+ radius: 5
anchors.verticalCenter: _create.verticalCenter
+
+ states: [
+ State {
+ name: "active"
+ PropertyChanges { target: _priming_line; thickness: 3; color: Colors.createTreatmentActive; }
+ },
+ State {
+ name: "inactive"
+ PropertyChanges { target: _priming_line; thickness: 1; color: Colors.createTreatmentInactive; }
+ }
+ ]
}
CircleWithText { id: _prime
text: "PRIME"
-
}
- ProgressLine { id: _begin_line
+ Line { id: _begin_line
+ length: 120
+ color: Colors.createTreatmentInactive
+ radius: 5
anchors.verticalCenter: _create.verticalCenter
+ states: [
+ State {
+ name: "active"
+ PropertyChanges { target: _begin_line; thickness: 3; color: Colors.createTreatmentActive; }
+ },
+ State {
+ name: "inactive"
+ PropertyChanges { target: _begin_line; thickness: 1; color: Colors.createTreatmentInactive; }
+ }
+ ]
}
CircleWithText { id: _begin
text: "BEGIN"
}
-
-
}
}
Index: sources/view/VTreatmentBegin.h
===================================================================
diff -u -r53134008481fd775533e8988b7436f2f75e47336 -rd94a2b9334b1b35739b637472e8c3054d7b9b804
--- sources/view/VTreatmentBegin.h (.../VTreatmentBegin.h) (revision 53134008481fd775533e8988b7436f2f75e47336)
+++ sources/view/VTreatmentBegin.h (.../VTreatmentBegin.h) (revision d94a2b9334b1b35739b637472e8c3054d7b9b804)
@@ -24,8 +24,8 @@
protected:
// coco begin validated: This has been validated manually
- // Def Min Max Res
- TREATMENT_PARAMETER(float, ufVolume, 0.1, 0, 8.0, 0.1 ) // mL
+ // Def Min Max Res
+ TREATMENT_PARAMETER(float, ufVolume, 0.1, 0, 8.0, 0.1 ) // mL
// coco end
protected:
PROPERTY(bool, continueEnabled, false)