Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-13969 Expand touch area to include left/right sides of handler and a slight bit beyond

DEN-13977 Increase the active area of the sliders OFF switch

UI-DEN-14838_UI VD S91 [ Sliders ]
UI-DEN-14838_UI VD S91 [ Sliders ]
DEN-14743 Add pairing confirmation dialog

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -1
    • +1
    ./qml/pages/treatment/TreatmentStack.qml
  1. … 41 more files in changeset.
Merge branch 'DEN-14733-UI-BN-S90-2' into staging

    • -20
    • +41
    ./qml/dialogs/DiagnosticsDialog.qml
    • -10
    • +13
    ./qml/pages/treatment/TreatmentStack.qml
  1. … 35 more files in changeset.
Yes, assignments break bindings. RESOLVED

Yes, assignments break bindings.

RESOLVED

Ok, sounds good. RESOLVED

Ok, sounds good.

RESOLVED

Good point, But you can't. The readonly properties are only working with bindings, not assignments. I am using that as a public variable.

Good point,
But you can't.
The readonly properties are only working with bindings, not assignments.
I am using that as a public variable.

Good point, I agree with the two intervals, it would be clarifying. For the counter, though, it might not be always the case. I will start doing it in my next task, since I would like to change all...

Good point,
I agree with the two intervals, it would be clarifying.
For the counter, though, it might not be always the case.
I will start doing it in my next task, since I would like to change all, to be consistent across the entire code base.

If _root.isOpen is not modified outside of this powerItem.qml, You can make it a readonly property and bind it to the powerDialog's property.

If _root.isOpen is not modified outside of this powerItem.qml, You can make it a readonly property and bind it to the powerDialog's property.

Only a suggestion: It is a good idea to append the unit to the end of the variable name especially for time. It helps improve readability and clarity. For instance, here, we have ms and the next o...

Only a suggestion:
It is a good idea to append the unit to the end of the variable name especially for time. It helps improve readability and clarity.

For instance, here, we have ms and the next one, _pendingInterval is in seconds. and I believe _pendingCounter is in minutes based on the .cpp file's comment.

_interval_ms
_pendingInterval_sec
_pendingCounter_min

RESOLVED

RESOLVED

Thanks for the feedback. Fixed.

Thanks for the feedback.
Fixed.

The variable, destination, itself is a QString, you don't need to do QString("%1").arg(destination), you can pass destination in directly.

The variable, destination, itself is a QString, you don't need to do QString("%1").arg(destination), you can pass destination in directly.

DEN-14736 : IMP: DEN-14768 : InTx UF Adj

DEN-14768

Ultrafiltration Adjustment Screen Slider Does Not Update Maximum UF Vol after Duration Settings Adjustment

DEN-14736 : IMP: Updated MsgID 0x2D00

/*!

* \brief The MDGTemperatures class

* \details The DG temperatures data model

*

* | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description |

* |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |

* |0x2D00| 0x080 | 8 | 2 Hz | N | DG | All | DG Temperatures Data |

*

* | Payload ||

* | ||

* | #01:(F32) | \ref Data::mInletPrimaryHeater |

* | #02:(F32) | \ref Data::mHeatDisinfect |

* | #03:(F32) | \ref Data::mOutletPrimaryHeater |

* | #04:(F32) | \ref Data::mConductivitySensor1 |

* | #05:(F32) | \ref Data::mConductivitySensor2 |

* | #06:(F32) | \ref Data::mOutletRedundancy |

* | #07:(F32) | \ref Data::mInletDialysate |

* | #08:(F32) | \ref Data::mPrimaryHeaterThermoCouple |

* | #09:(F32) | \ref Data::mTrimmerHeaterThermoCouple |

* | #10:(F32) | \ref Data::mPrimaryHeaterColdJunction |

* | #11:(F32) | \ref Data::mTrimmerHeaterColdJunction |

* | #12:(F32) | \ref Data::mPrimaryHeaterInternal |

* | #13:(F32) | \ref Data::mTrimmerHeaterInternal |

* | #14:(F32) | \ref Data::mFpgaBoard |

* | #15:(F32) | \ref Data::mLoadCellA1B1 |

* | #16:(F32) | \ref Data::mLoadCellA2B2 |

* | #17:(F32) | \ref Data::mInternalTHDORTD |

* | #18:(F32) | \ref Data::mInternalTDIRTD |

* | #19:(F32) | \ref Data::mInteralTHDRTD |

* | #20:(F32) | \ref Data::mInternalCondSnsrTemp |

* | #21:(F32) | \ref Data::mBaroTempSensor |

*

* \sa Data

*

* <h2 class="groupheader">Logging info</h2>

* | ||

* | ||

* | typeText | Datum |

* | unitText | DG |

* | infoText | Temperatures |

*

*/

    • -7
    • +23
    ./qml/dialogs/DiagnosticsDialog.qml
  1. … 5 more files in changeset.
DEN-14736 : IMP: Updated MsgID 0x2000

/*!

* \brief The MDGPressures class

* \details The DG pressures data model

*

* | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description |

* |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |

* |0x2000| 0x080 | 8 | 1 Hz | N | DG | All | DG Pressures Data |

*

* | Payload ||

* | ||

* | #1:(F32) | \ref Data::mROInletPSI |

* | #2:(F32) | \ref Data::mROOutletPSI |

* | #3:(F32) | \ref Data::mDrainInletPSI |

* | #4:(F32) | \ref Data::mDrainOutletPSI |

* | #5:(F32) | \ref Data::mBarometricPSI |

*

* \sa Data

*

* <h2 class="groupheader">Logging info</h2>

* | ||

* | ||

* | typeText | Datum |

* | unitText | DG |

* | infoText | Pressures |

*

*/

    • -10
    • +15
    ./qml/dialogs/DiagnosticsDialog.qml
  1. … 4 more files in changeset.
DEN-14736 : IMP: Updated MsgID 0x2C00

/*!

* \brief The MDGHeaters class

* \details The DG heaters data model

*

* | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description |

* |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |

* |0x2C00| 0x080 | 8 | 2 Hz | N | DG | All | DG Heaters Data |

*

* | Payload ||

* | ||

* | # 1:(F32) | \ref Data::mMainPrimayHeaterDC |

* | # 2:(F32) | \ref Data::mSmallPrimaryHeaterDC |

* | # 3:(F32) | \ref Data::mTrimmerHeaterDC |

* | # 4:(F32) | \ref Data::mPrimaryTargetTemp |

* | # 5:(F32) | \ref Data::mTrimmerTargetTemp |

* | # 6:(F32) | \ref Data::mPrimaryHeaterState |

* | # 7:(F32) | \ref Data::mTrimmerHeaterState |

* | # 8:(F32) | \ref Data::mPrimaryEfficiency |

* | # 9:(F32) | \ref Data::mPrimaryCalcTargetTemp |

* | #10:(F32) | \ref Data::mTrimmerCalcCurrentTemp |

* | #11:(F32) | \ref Data::mTrimmerUseLastDC |

*

* \sa Data

*

* <h2 class="groupheader">Logging info</h2>

* | ||

* | ||

* | typeText | Datum |

* | unitText | DG |

* | infoText | Heaters |

*

*/

  1. … 6 more files in changeset.
DEN-14743 Bluetooth bug fixes - improve connection handling and message display

  1. … 4 more files in changeset.
So we will likely remove this TODO and comment later? RESOLVED.

So we will likely remove this TODO and comment later?
RESOLVED.

RESOLVED.

RESOLVED.

It was removed. UI sends an alarmTriggered to HD for that, and should not display a dialog by itself. Since on the device, if there is no other alarm HD will eventually display it, and if there is ...

It was removed.
UI sends an alarmTriggered to HD for that, and should not display a dialog by itself.
Since on the device, if there is no other alarm HD will eventually display it, and if there is HD will override it.
It was just a bug in development then, which was always displaying a useless dialog on VM that doesn't even have a physical SD Card.

I laughed loud for a while https://devapps.diality.us/static/s73b8n/2static/images/wiki/icons/emoticons/biggrin.gif This is the spell checker dictionary. Since my spell checker was complaining and ...

I laughed loud for a while
This is the spell checker dictionary.
Since my spell checker was complaining and it was bugging me, and I always look at it like there is a bug in that area, I add her name so spell checker won't highlight it anymore.
It is a comment I have about the decision we made to remind me why I have that line of code commented.

RESOLVED.

RESOLVED.