Index: sources/view/VPriming.h =================================================================== diff -u -r1a7d3535b65d7edf23bc6638c4113e4b55c49c2a -r0401b9a1fb6f89f0ec83571f2f868956c7500a0f --- sources/view/VPriming.h (.../VPriming.h) (revision 1a7d3535b65d7edf23bc6638c4113e4b55c49c2a) +++ sources/view/VPriming.h (.../VPriming.h) (revision 0401b9a1fb6f89f0ec83571f2f868956c7500a0f) @@ -30,29 +30,34 @@ VPriming(QObject *parent = NULL); private: - PROPERTY(quint32 , currentState , 0) - PROPERTY(quint32 , secondsRemaining , 0) - PROPERTY(quint32 , secondsTotal , 0) - PROPERTY(bool , continueEnabled , true) // TODO: Set to False when FW supports priming + PROPERTY(bool , checkingInstallationComplete , false) + PROPERTY(bool , creatingDialysateComplete , false) + PROPERTY(bool , primingLinesComplete , false) + PROPERTY(bool , primingComplete , false) + PROPERTY(quint32 , currentState , 0) + PROPERTY(quint32 , secondsRemaining , 0) + PROPERTY(quint32 , secondsTotal , 0) + PROPERTY(bool , continueEnabled , true) // TODO: Set to False when FW supports priming - QString continueBtnText = "Continue to Treatment"; - - - Q_PROPERTY(QString continueBtnText READ getContinueBtnText NOTIFY continueBtnTextChanged) - enum PrimingStates { - CHECKING_INSTALLATION = 0, + STARTING = 0, + CHECKING_INSTALLATION, CREATING_DIALYSATE, PRIMING_LINES, PRIMING_COMPLETE }; + QString continueBtnText = "CONTINUE TO TREATMENT"; + + Q_PROPERTY(QString continueBtnText READ getContinueBtnText NOTIFY continueBtnTextChanged) + signals: void continueBtnTextChanged(); private slots: void onActionReceive(const PrimingData &data); public slots: QString getContinueBtnText() { return continueBtnText; } + quint32 getStateCheckingInstallation() { return static_cast(CHECKING_INSTALLATION); } }; }