Index: sources/gui/GuiGlobals.h =================================================================== diff -u -ra83697952c42b32904752417c50f1391ea768d5f -rb85d475c5be18dbe4ae1b1fa99fdcafb13b2b384 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision a83697952c42b32904752417c50f1391ea768d5f) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision b85d475c5be18dbe4ae1b1fa99fdcafb13b2b384) @@ -485,6 +485,8 @@ // Ultrafiltration typedef GuiActions::UF_Commands GuiUFCommands; typedef GuiActions::UF_Adjustments GuiUFAdjustment; + // Iso UF + typedef GuiActions::ISO_UF_Commands GuiIsoUFCommands; // Saline typedef GuiActions::Fluid_Bolus_States GuiSalineStates; typedef GuiActions::Fluid_Bolus_Commands GuiSalineCommands; Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFState.cpp =================================================================== diff -u -r8d7a40bfbd30d596b4450965597d2e3f2f61326d -rb85d475c5be18dbe4ae1b1fa99fdcafb13b2b384 --- sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFState.cpp (.../VTreatmentAdjustmentIsolatedUFState.cpp) (revision 8d7a40bfbd30d596b4450965597d2e3f2f61326d) +++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFState.cpp (.../VTreatmentAdjustmentIsolatedUFState.cpp) (revision b85d475c5be18dbe4ae1b1fa99fdcafb13b2b384) @@ -27,8 +27,7 @@ */ void View::VTreatmentAdjustmentIsolatedUFState::doPause() { - _data.requestedState = 0; // TODO Update during integration -// _data.requestedState = GuiUFCommands::UF_CMD_PAUSE; + _data.requestedState = GuiIsoUFCommands::ISO_UF_CMD_PAUSE; emit didAdjustment(_data); // notify the controllers to do the adjustment } @@ -38,7 +37,7 @@ */ void View::VTreatmentAdjustmentIsolatedUFState::doResume() { - _data.requestedState = 1; // TODO Update during integration + _data.requestedState = GuiIsoUFCommands::ISO_UF_CMD_RESUME; emit didAdjustment(_data); // notify the controllers to do the adjustment } @@ -48,7 +47,6 @@ */ void View::VTreatmentAdjustmentIsolatedUFState::doEnd() { - _data.requestedState = 2; // TODO Update during integration -// _data.requestedState = GuiUFCommands::UF_CMD_RESUME; + _data.requestedState = GuiIsoUFCommands::ISO_UF_CMD_END; emit didAdjustment(_data); // notify the controllers to do the adjustment }