Index: simulator/Simulator.ui =================================================================== diff -u -r63183a23c930b861a2f59b8dc62ea520d597ee96 -raa43a427ef1ad4d467585e321ead04b11b1cf1be --- simulator/Simulator.ui (.../Simulator.ui) (revision 63183a23c930b861a2f59b8dc62ea520d597ee96) +++ simulator/Simulator.ui (.../Simulator.ui) (revision aa43a427ef1ad4d467585e321ead04b11b1cf1be) @@ -6,1176 +6,2952 @@ 0 0 - 919 - 869 + 831 + 911 + + + 10 + + Form - + - - - - - Saline Bolus Adjustment + + + + + + 10 + - - Qt::AlignCenter - - - - - - - Accept - - - - - - - - 0 - 0 - - - - - - - - - 50 - 0 - - - - reason - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - Reject - - - - - - - - 50 - 0 - - - - mL - - - - - - - - 0 - 0 - - - - - 100 - - - - - 200 - - - - - 300 - - - - - - - - - - - - - - - - - Qt::Vertical - - - - - - - - - - 0 - 0 - - - - - - - - UF Pause - - - Qt::AlignCenter - - - - - - - - 50 - 0 - - - - reason - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - Pause - - - - - - - Reject - - - - - - - - - - - - - - - - Qt::Vertical - - - - - - - - - Resume - - - - - - - Reject - - - - - - - UF Resume - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - - 50 - 0 - - - - reason - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - - Qt::Horizontal - - - - - - - Qt::Horizontal - - - - - - - - - - 75 - 0 - - - - Target - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - - 0 - - - - - - - Saline Bolus Data - - - Qt::AlignCenter - - - - - - - Max - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - 300 - - Qt::Horizontal + Qt::Vertical - - - - - 50 - 0 - - - - 300 - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - 1000 - - - Qt::Horizontal - - - - - - - 300 - - - Qt::Horizontal - - - - - - - - 75 - 0 - - - - Cumulative - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - - Volume - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - - - 50 - 0 - - - - 1000 - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - 300 - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - 0 - - - - - - - 0 - - - - - - - - - - - - 50 - 0 - - - - reason - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - UF Edit Volume - - - Qt::AlignCenter - - - - - - - Reject - - - - - - - - - - - - - - - 0 - 0 - - - - - - - - Next - - - - - - - - - - - UF delivered Volume - - - Qt::AlignCenter - - - - - - - 8000 - - - Qt::Horizontal - - - - - - - - 50 - 0 - - - - 8000 - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - Qt::Horizontal - - - - - - - - - + + + + + + + 0 + 0 + + - Dialysate + Max - Qt::AlignCenter + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - Range - - - - + + + + 0 + 0 + + 50 0 + + + 10 + + - mL/min + 300 + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - - + + + + + 0 + 0 + + - 600 + Max + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - - + + + + + 0 + 0 + + 50 0 + + + 10 + + - mL/min + 1000 + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - - + + - + 0 0 - - 100 + + + 75 + 0 + - - 600 + + + 10 + - - 50 + + Cumulative + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + - - + + - + 0 0 - - 100 + + + 10 + - - 600 + + 0 - - 50 + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - + + + + + 0 + 0 + + + + + 10 + + + + background-color: rgb(233, 185, 110); + - Min + Saline Bolus Data + + Qt::AlignCenter + - - - - Max + + + + + 10 + + + 1000 + + + Qt::Horizontal + - - + + + + + 0 + 0 + + + + + 10 + + - 100 + Max + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - - - - - - + + + + + 0 + 0 + + + + + 10 + + - Duration + 0 - Qt::AlignCenter + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - + + + + + 0 + 0 + + + + + 10 + + - Range + Volume + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + - - - - 480 + + + + + 10 + + + 300 + + + Qt::Horizontal + - - + + + + + 0 + 0 + + - 50 + 75 0 + + + 10 + + - min + Target + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + - - + + - + 0 0 + + + 10 + + + + 300 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 10 + + + + 0 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 10 + + - 480 + 300 + + Qt::Horizontal + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + + 10 + + + + background-color: rgb(245, 121, 0); +color: rgb(238, 238, 236); + + + Treatment States + + + Qt::AlignCenter + + + + + + + + + + 325 + 260 + + + + + 8 + + + + QAbstractItemView::NoEditTriggers + + + QAbstractItemView::SingleSelection + + + QAbstractItemView::SelectRows + + + true + + + 43 + + + 300 + + + 21 + + + + 0 + + + + + 1 + + + + + 2 + + + + + 3 + + + + + 4 + + + + + 5 + + + + + 6 + + + + + 7 + + + + + 8 + + + + + 9 + + + + + 10 + + + + + Treatment States (subMode) + + + + + TREATMENT_START_STATE + + + + + TREATMENT_DIALYSIS_STATE + + + + + TREATMENT_STOP_STATE + + + + + TREATMENT_RINSEBACK_STATE + + + + + TREATMENT_RINSEBACK_PAUSE_STATE + + + + + TREATMENT_RECIRC_SETUP_STATE + + + + + TREATMENT_RECIRC_STATE + + + + + TREATMENT_RECIRC_PAUSE_STATE + + + + + TREATMENT_RECIRC_STOP_STATE + + + + + TREATMENT_DIALYSIS_END_STATE + + + + + TREATMENT_END_STATE + + + + + + + + + 160 + 225 + + + + + 8 + + + + QAbstractItemView::NoEditTriggers + + + QAbstractItemView::SingleSelection + + + QAbstractItemView::SelectRows + + + 150 + + + 18 + + + + 0 + + + + + 1 + + + + + 2 + + + + + 3 + + + + + 4 + + + + + UF States + + + + + UF_START_STATE + + + + + UF_PAUSED_STATE + + + + + UF_RUNNING_STATE + + + + + UF_OFF_STATE + + + + + UF_COMPLETED_STATE + + + + + + + + + 310 + 0 + + + + + 8 + + + + QAbstractItemView::NoEditTriggers + + + QAbstractItemView::SingleSelection + + + QAbstractItemView::SelectRows + + + 300 + + + 18 + + + + 0 + + + + + 1 + + + + + 2 + + + + + 3 + + + + + Saline States + + + + + SALINE_BOLUS_STATE_IDLE + + + ItemIsSelectable|ItemIsEnabled + + + + + SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP + + + + + SALINE_BOLUS_STATE_IN_PROGRESS + + + + + SALINE_BOLUS_STATE_MAX_DELIVERED + + + + + + + + + + + + + 10 + + + + Qt::Vertical + + + + + - + + + + 0 + 0 + + 50 0 + + + 10 + + - min + reason + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + 0 + 0 + + + + + 10 + + + + background-color: rgb(114, 159, 207); + + + UF Confirm Volume + + + Qt::AlignCenter + + + + + + + + 10 + + + + Reject + + + + + + + + 0 + 0 + + + + + 10 + + + + QFrame::StyledPanel + + + QFrame::Plain + + + + + + - + - + 0 0 - - 480 + + + 10 + - + + + + 10 + + - Min + Confirm - - + + + + + 10 + + - Max + Rate - - + + + + + 10 + + - 0 + Duration - - + + + + + + + 10 + + + + Qt::Vertical + + + + + + + + + + 10 + + + + background-color: rgb(173, 127, 168); + + + Dialysate + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 10 + + + + Range + + + + + + + + 0 + 0 + + + + + 50 + 0 + + + + + 10 + + + + mL/min + + + + + + + + 0 + 0 + + + + + 10 + + + + 600 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 50 + 0 + + + + + 10 + + + + mL/min + + + + + + + + 0 + 0 + + + + + 10 + + + + 100 + + + 600 + + + 50 + + + + + + + + 0 + 0 + + + + + 10 + + + + 100 + + + 600 + + + 50 + + + + + + + + 0 + 0 + + + + + 10 + + + + Min + + + + + + + + 0 + 0 + + + + + 10 + + + + Max + + + + + + + + 0 + 0 + + + + + 10 + + + + 100 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + + + 10 + + + + background-color: rgb(173, 127, 168); + + + Ultrafiltration + + + Qt::AlignCenter + + + + + + + + 10 + + + + Range + + + + + + + + 0 + 0 + + + + + 50 + 0 + + + + + 10 + + + + mL + + + + + + + + 0 + 0 + + + + + 10 + + + + 8000 + + + + + + + + 0 + 0 + + + + + 10 + + + + Min + + + + + + + + 0 + 0 + + + + + 10 + + + + 8000 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 50 + 0 + + + + + 10 + + + + mL + + + + + + + + 0 + 0 + + + + + 10 + + + + 8000 + + + + + + + + 0 + 0 + + + + + 10 + + + + Max + + + + + + + + 0 + 0 + + + + + 10 + + + + 0 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + 10 + + + + Qt::Horizontal + + + + + + + + 10 + + + + background-color: rgb(117, 80, 123); +color: rgb(238, 238, 236); + + + Treatment Ranges + + + Qt::AlignCenter + + + + + + + + + + 10 + + + + background-color: rgb(173, 127, 168); + + + Duration + + + Qt::AlignCenter + + + + + + + + 10 + + + + Range + + + + + + + + 0 + 0 + + + + + 10 + + + + 480 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 50 + 0 + + + + + 10 + + + + min + + + + + + + + 0 + 0 + + + + + 10 + + + + 480 + + + + + + + + 0 + 0 + + + + + 50 + 0 + + + + + 10 + + + + min + + + + + + + + 0 + 0 + + + + + 10 + + + + 480 + + + + + + + + 0 + 0 + + + + + 10 + + + + Min + + + + + + + + 0 + 0 + + + + + 10 + + + + Max + + + + + + + + 0 + 0 + + + + + 10 + + + + 0 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + 10 + + + + Qt::Vertical + + + + + + + + + + 10 + + + + Qt::Horizontal + + + + + + + + + + 10 + + + + Reject + + + + + + + + 0 + 0 + + + + + 10 + + + + - + + + + 10 + + + + background-color: rgb(114, 159, 207); + - UF Volume + UF Pause Qt::AlignCenter - - + + + + + 0 + 0 + + + + + 10 + + + + QFrame::StyledPanel + + + QFrame::Plain + - Range + - - + + + + + 0 + 0 + + 50 0 + + + 10 + + - mL + reason + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + - - + + + + + 10 + + + + Pause + + + + + + + + + + 10 + + + + Qt::Vertical + + + + + + + + 10 + + + + background-color: rgb(52, 101, 164); +color: rgb(238, 238, 236); + + + Ultrafiltration + + + Qt::AlignCenter + + + + + + + + 10 + + + + Qt::Horizontal + + + + + + + + + + 10 + + + + Resume + + + + + + + + 10 + + + + Reject + + + + + + + + 10 + + + + background-color: rgb(114, 159, 207); + + + UF Resume + + + Qt::AlignCenter + + + + + - + 0 0 - - 8000 + + + 10 + - - + + + + + 0 + 0 + + + + + 10 + + + + QFrame::StyledPanel + + + QFrame::Plain + - Min + - - + + + + + 0 + 0 + + + + + 50 + 0 + + + + + 10 + + - 8000 + reason + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + 10 + + + + Qt::Vertical + + + + + - + + + + 0 + 0 + + 50 0 + + + 10 + + - mL + reason + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + 0 + 0 + + + + + 10 + + + + background-color: rgb(114, 159, 207); + + + UF Edit Volume + + + Qt::AlignCenter + + + + + + + + 10 + + + + Reject + + + + + + + + 0 + 0 + + + + + 10 + + + + QFrame::StyledPanel + + + QFrame::Plain + + + + + + - + - + 0 0 + + + 10 + + + + + + + + + 10 + + + + Next + + + + + + + + + + + + 10 + + 8000 + + Qt::Horizontal + - - + + + + + 0 + 0 + + + + + 10 + + - Max + Volume + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + - - + + + + + 0 + 0 + + + + + 10 + + + + background-color: rgb(114, 159, 207); + + UF delivered Volume + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 10 + + + 0 + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 0 + 0 + + + + + 10 + + + + Max + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 50 + 0 + + + + + 10 + + + + 8000 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + - - - - Treatment Ranges + + + + + 10 + - - Qt::AlignCenter + + Qt::Horizontal - - - - - - Qt::Horizontal - - - - - - - - - Treatment States + + + + + 10 + - - Qt::AlignCenter + + Qt::Horizontal - - - - + + + + + + + 10 + + + + background-color: rgb(233, 185, 110); + + + Saline Bolus Adjustment + + + Qt::AlignCenter + + + + + + + + 10 + + + + Accept + + + + + + + + 0 + 0 + + + + + 10 + + + + + + + + + 0 + 0 + + - 325 - 400 + 50 + 0 - - QAbstractItemView::NoEditTriggers + + + 10 + - - QAbstractItemView::SingleSelection + + reason - - QAbstractItemView::SelectRows + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - false - - - 300 - - + + + + + + + 10 + + + + Reject + + + + + + + + 0 + 0 + + + + + 50 + 0 + + + + + 10 + + + + mL + + + + + + + + 0 + 0 + + + + + 10 + + + - 0 + 100 - - + + - 1 + 200 - - + + - 2 + 300 - - - - 3 - - - - - 4 - - - - - 5 - - - - - 6 - - - - - 7 - - - - - 8 - - - - - 9 - - - - - 10 - - - - - Treatment States (subMode) - - - - - TREATMENT_START_STATE - + + + + + + + 0 + 0 + + + + + 10 + + + + QFrame::StyledPanel + + + QFrame::Plain + + + + + + + + + + + + + 10 + + + + Qt::Horizontal + + + + + + + + 10 + + + + background-color: rgb(193, 125, 17); +color: rgb(238, 238, 236); + + + Saline Bolus + + + Qt::AlignCenter + + + + + + + QLayout::SetFixedSize + + + - - TREATMENT_DIALYSIS_STATE - + + + + 0 + 0 + + + + + 10 + + + + Min + + - - TREATMENT_STOP_STATE - + + + + 0 + 0 + + + + + 10 + + + + Max + + - - - TREATMENT_RINSEBACK_STATE - + + + + + 0 + 0 + + + + + 10 + + + + 8000 + + - - - TREATMENT_RINSEBACK_PAUSE_STATE - + + + + + 0 + 0 + + + + + 10 + + + + background-color: rgb(229, 156, 156); + + + Venous + + + Qt::AlignCenter + + - - - TREATMENT_RECIRC_SETUP_STATE - + + + + + 0 + 0 + + + + + 10 + + + + 0 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + - - - TREATMENT_RECIRC_STATE - + + + + + 0 + 0 + + + + + 50 + 0 + + + + + 10 + + + + mmHg + + - - - TREATMENT_RECIRC_PAUSE_STATE - + + + + + 0 + 0 + + + + + 50 + 0 + + + + + 10 + + + + mmHg + + - - - TREATMENT_RECIRC_STOP_STATE - + + + + + 0 + 0 + + + + + 10 + + + + 8000 + + - - - TREATMENT_DIALYSIS_END_STATE - + + + + + 0 + 0 + + + + + 10 + + + + Range + + - - - TREATMENT_END_STATE - + + + + + 0 + 0 + + + + + 10 + + + + 0 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + - + + + + Qt::Vertical + + + QSizePolicy::Preferred + + + + 20 + 40 + + + + + - - - - - 200 - 225 - - - - QAbstractItemView::NoEditTriggers - - - QAbstractItemView::SingleSelection - - - QAbstractItemView::SelectRows - - - 180 - - - - 0 - - - - - 1 - - - - - 2 - - - - - 3 - - - - - 4 - - - - - UF States - - - - - UF_START_STATE - + + + + + + + 0 + 0 + + + + + 10 + + + + background-color: rgb(229, 156, 156); + + + Arterial + + + Qt::AlignCenter + + - - - UF_PAUSED_STATE - + + + + + 0 + 0 + + + + + 10 + + + + Range + + + + + + + 0 + 0 + + + + + 10 + + + + 480 + + + - - UF_RUNNING_STATE - + + + + 0 + 0 + + + + + 10 + + + + Max + + - - - UF_OFF_STATE - + + + + + 0 + 0 + + + + + 10 + + + + 0 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + - - - UF_COMPLETED_STATE - + + + + + 0 + 0 + + + + + 50 + 0 + + + + + 10 + + + + mmHg + + - + + + + + 0 + 0 + + + + + 50 + 0 + + + + + 10 + + + + mmHg + + + + + + + + 0 + 0 + + + + + 10 + + + + 480 + + + + + + + + 0 + 0 + + + + + 10 + + + + Min + + + + + + + + 0 + 0 + + + + + 10 + + + + 0 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Qt::Vertical + + + QSizePolicy::Preferred + + + + 20 + 40 + + + + + - - - - - 360 - 0 - + + + + + 10 + - - QAbstractItemView::NoEditTriggers + + Qt::Vertical - - QAbstractItemView::SingleSelection + + + + + + + 10 + - - QAbstractItemView::SelectRows + + Qt::Vertical - - 350 - - - - 0 - - - - - 1 - - - - - 2 - - - - - 3 - - - - - Saline States - - - - - SALINE_BOLUS_STATE_IDLE - - - ItemIsSelectable|ItemIsEnabled - + + + + + + QLayout::SetFixedSize + + + + + + 0 + 0 + + + + + 10 + + + + background-color: rgb(229, 156, 156); + + + Adjustment + + + Qt::AlignCenter + + - - SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP - + + + + 0 + 0 + + + + + 10 + + + + Confirm + + - - SALINE_BOLUS_STATE_IN_PROGRESS - + + + + 0 + 0 + + + + + 10 + + + + Reject + + - - - SALINE_BOLUS_STATE_MAX_DELIVERED - + + + + + 0 + 0 + + + + + 10 + + + + 100 + + + 600 + + + 50 + + + + + + + 0 + 0 + + + + + 50 + 0 + + + + + 10 + + + + reason + + + + + + + + 0 + 0 + + + + + 10 + + + + QFrame::StyledPanel + + + QFrame::Plain + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + 10 + + + + background-color: rgb(164, 0, 0); +color: rgb(238, 238, 236); + + + In-Line Blood Pressures Limits + + + Qt::AlignCenter + - + Qt::Vertical + + QSizePolicy::Expanding + 20 @@ -1195,11 +2971,11 @@ setNum(int) - 891 + 394 192 - 858 + 394 170 @@ -1211,12 +2987,12 @@ setNum(int) - 891 - 240 + 394 + 303 - 891 - 218 + 394 + 262 @@ -1227,14 +3003,30 @@ setNum(int) - 392 - 276 + 394 + 238 - 396 - 261 + 394 + 216 + + sldUfVolume + valueChanged(int) + lblSalineTarget_2 + setNum(int) + + + 581 + 291 + + + 556 + 277 + + +