Index: denali.pro.user =================================================================== diff -u -r583d1953c783940c93f22c37b23daadb1ff3a09c -r4b7b2f3079f81ff442fcbbde5d5e5465f5937417 --- denali.pro.user (.../denali.pro.user) (revision 583d1953c783940c93f22c37b23daadb1ff3a09c) +++ denali.pro.user (.../denali.pro.user) (revision 4b7b2f3079f81ff442fcbbde5d5e5465f5937417) @@ -1,6 +1,6 @@ - + EnvironmentId Index: resources/settings/instructions/instructions.conf =================================================================== diff -u -rc6cfb5043fc9c29cc039e36915368bcd3a63baa6 -r4b7b2f3079f81ff442fcbbde5d5e5465f5937417 --- resources/settings/instructions/instructions.conf (.../instructions.conf) (revision c6cfb5043fc9c29cc039e36915368bcd3a63baa6) +++ resources/settings/instructions/instructions.conf (.../instructions.conf) (revision 4b7b2f3079f81ff442fcbbde5d5e5465f5937417) @@ -8,44 +8,46 @@ Insert cartridge using alignment pins Sample^Water Sample Result =2.png HD machine door open / HD machine door closed Sample^Water Sample Result =3.png +[Sample^Water Sample Result Failed] +. Unlock pump track . Lock pump track Sample^Water Sample Result Failed=1.png +Insert cartridge using alignment pins Sample^Water Sample Result Failed=2.png +HD machine door open / HD machine door closed Sample^Water Sample Result Failed=3.png + +[Consumables^Consumables Installation] +. Unlock pump track . Lock pump track Consumables^Consumables Installation=1.png +Insert cartridge using alignment pins Consumables^Consumables Installation=2.png +HD machine door open / HD machine door closed Consumables^Consumables Installation=3.png + [Disposables^Cartridge Installation] . Unlock pump track . Lock pump track Disposables^Cartridge Installation=1.png +Install the Dialyzer v2 = slide1_filter_v2.png +Install the Dialyzer v2b = slide1_filter_v2b.png Insert cartridge using alignment pins Disposables^Cartridge Installation=2.png +empty image= +=3.png HD machine door open / HD machine door closed Disposables^Cartridge Installation=3.png -[Connection^Start Treatment] -. Unlock pump track . Lock pump track Connection^Start Treatment=1.png -Insert cartridge using alignment pins Connection^Start Treatment=2.png -HD machine door open / HD machine door closed Connection^Start Treatment=3.png +[Disposables^Cartridge Connection] +. Unlock pump track . Lock pump track Disposables^Cartridge Connection=1.png +Connect dialyzer v1 = slide2_filter-connect_v1.png +Insert cartridge using alignment pins Disposables^Cartridge Connection=2.png +HD machine door open / HD machine door closed Disposables^Cartridge Connection=3.png -[Connection^Patient Connection] -. Unlock pump track . Lock pump track Connection^Patient Connection=1.png -Insert cartridge using alignment pins Connection^Patient Connection=2.png -HD machine door open / HD machine door closed Connection^Patient Connection=3.png - -[Disposables^Saline Bag] +[Disposables^Heparin Syringe] . Unlock pump track . Lock pump track Disposables^Saline Bag=1.png Insert cartridge using alignment pins Disposables^Saline Bag=2.png HD machine door open / HD machine door closed Disposables^Saline Bag=3.png -[Disposables^Heparin Syringe] -. Unlock pump track . Lock pump track Disposables^Heparin Syringe=1.png -Insert cartridge using alignment pins Disposables^Heparin Syringe=2.png -HD machine door open / HD machine door closed Disposables^Heparin Syringe=3.png +[Disposables^Saline Bag] -[Disposables^Cartridge Connection] -. Unlock pump track . Lock pump track Disposables^Cartridge Connection=1.png -Insert cartridge using alignment pins Disposables^Cartridge Connection=2.png -HD machine door open / HD machine door closed Disposables^Cartridge Connection=3.png +[Connection^Patient Connection] +. Unlock pump track . Lock pump track Connection^Patient Connection=1.png +Insert cartridge using alignment pins Connection^Patient Connection=2.png +HD machine door open / HD machine door closed Connection^Patient Connection=3.png -[Consumables^Consumables Installation] -. Unlock pump track . Lock pump track Consumables^Consumables Installation=1.png -Insert cartridge using alignment pins Consumables^Consumables Installation=2.png -HD machine door open / HD machine door closed Consumables^Consumables Installation=3.png +[Connection^Start Treatment] +. Unlock pump track . Lock pump track Connection^Start Treatment=1.png +Insert cartridge using alignment pins Connection^Start Treatment=2.png +HD machine door open / HD machine door closed Connection^Start Treatment=3.png -[Sample^Water Sample Result Failed] -. Unlock pump track . Lock pump track Sample^Water Sample Result Failed=1.png -Insert cartridge using alignment pins Sample^Water Sample Result Failed=2.png -HD machine door open / HD machine door closed Sample^Water Sample Result Failed=3.png - Index: resources/settings/instructions/slide1_filter_v2.png =================================================================== diff -u Binary files differ Index: resources/settings/instructions/slide1_filter_v2b.png =================================================================== diff -u Binary files differ Index: resources/settings/instructions/slide2_filter-connect_v1.png =================================================================== diff -u Binary files differ Index: sources/gui/qml/compounds/InstructionView.qml =================================================================== diff -u -r821bf955d0ba7e028bccfee7c04ca77cf80a0bd4 -r4b7b2f3079f81ff442fcbbde5d5e5465f5937417 --- sources/gui/qml/compounds/InstructionView.qml (.../InstructionView.qml) (revision 821bf955d0ba7e028bccfee7c04ca77cf80a0bd4) +++ sources/gui/qml/compounds/InstructionView.qml (.../InstructionView.qml) (revision 4b7b2f3079f81ff442fcbbde5d5e5465f5937417) @@ -63,6 +63,9 @@ bottomMargin: _root.frameVGap } radius : _root.innerRadius + // DEBUG : This helps getting the final size of the available room for the instruction images. + // onWidthChanged : console.debug( " ----- ", "_innerFrame.width :" , width ) + // onHeightChanged : console.debug( " ----- ", "_innerFrame.height:" , height) } Item { id: _containerSwipeView @@ -91,7 +94,7 @@ font.pixelSize: Fonts.fontPixelDialogText } Image { id: _image - source: _root.stepImages.length ? "file:" + _root.location + _root.stepImages[_swipeview.currentIndex] : "" + source: _root.stepImages.length && _root.stepImages[_swipeview.currentIndex] ? "file:" + _root.location + _root.stepImages[_swipeview.currentIndex] : "" width : _innerFrame.width height : _innerFrame.height anchors.centerIn: parent @@ -106,6 +109,7 @@ } StepIndicator { id: _indicator + visible : _root.stepNames.length currentComplete : true hideLabels : true stepNames : _root.stepNames Index: sources/gui/qml/pages/pretreatment/PreTreatmentConsumablesStack.qml =================================================================== diff -u -rc6cfb5043fc9c29cc039e36915368bcd3a63baa6 -r4b7b2f3079f81ff442fcbbde5d5e5465f5937417 --- sources/gui/qml/pages/pretreatment/PreTreatmentConsumablesStack.qml (.../PreTreatmentConsumablesStack.qml) (revision c6cfb5043fc9c29cc039e36915368bcd3a63baa6) +++ sources/gui/qml/pages/pretreatment/PreTreatmentConsumablesStack.qml (.../PreTreatmentConsumablesStack.qml) (revision 4b7b2f3079f81ff442fcbbde5d5e5465f5937417) @@ -48,8 +48,8 @@ hasCheckList : true checkListStepNames : [ //qsTr("Water Quality Check"), // this happens too fast and can't be sent to the UI. - qsTr("BiCarb Pump Check") , - qsTr("Acid Pump Check") , + qsTr("BiCarb Pump Check"), + qsTr("Acid Pump Check" ), ] } Index: sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml =================================================================== diff -u -rc6cfb5043fc9c29cc039e36915368bcd3a63baa6 -r4b7b2f3079f81ff442fcbbde5d5e5465f5937417 --- sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml (.../PreTreatmentPrimeStack.qml) (revision c6cfb5043fc9c29cc039e36915368bcd3a63baa6) +++ sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml (.../PreTreatmentPrimeStack.qml) (revision 4b7b2f3079f81ff442fcbbde5d5e5465f5937417) @@ -51,9 +51,9 @@ hasCheckList : true checkListStepNames : [ qsTr("Used Cartridge Check" ), - qsTr("Occolusion Sensors Check" ), + qsTr("Occlusion Sensors Check" ), qsTr("Pressure Sensors Check" ), - qsTr("Syringe Pump Check" ), + qsTr("Syringe Pump Check" ), ] } @@ -134,9 +134,9 @@ Connections { target: vPreTreatmentAdjustmentDisposablesPrime onAdjustmentTriggered : { if ( vPreTreatmentAdjustmentDisposablesPrime.adjustment_Accepted ) { - _preTreatmentDrySelfTest.reasonText = "" + _preTreatmentDisposablesPrime.reasonText = "" } else { - _preTreatmentDrySelfTest.reasonText = vPreTreatmentAdjustmentDisposablesPrime.text() + _preTreatmentDisposablesPrime.reasonText = vPreTreatmentAdjustmentDisposablesPrime.text() } } }