Index: sources/gui/qml/dialogs/AcidConcentrateAdjustment.qml =================================================================== diff -u -r40ddf63592b60608ae34aeb3099fe4e62ae45054 -r95f6f36face64c2afdabe1904df649738f554709 --- sources/gui/qml/dialogs/AcidConcentrateAdjustment.qml (.../AcidConcentrateAdjustment.qml) (revision 40ddf63592b60608ae34aeb3099fe4e62ae45054) +++ sources/gui/qml/dialogs/AcidConcentrateAdjustment.qml (.../AcidConcentrateAdjustment.qml) (revision 95f6f36face64c2afdabe1904df649738f554709) @@ -78,10 +78,10 @@ height : _root.controlHeight contentItem : ValueAdjuster{ id: _potassiumVolumeControl - minimum : vTreatmentRanges.potassiumMin - maximum : vTreatmentRanges.potassiumMax - step : vTreatmentRanges.potassiumRes - defaultValue : vTreatmentRanges.potassiumDef + minimum : vTreatmentRanges.acidConcentratePotassiumMin + maximum : vTreatmentRanges.acidConcentratePotassiumMax + step : vTreatmentRanges.acidConcentratePotassiumRes + defaultValue : vTreatmentRanges.acidConcentratePotassiumDef decimal : Variables.potassiumPrecision } } @@ -99,10 +99,10 @@ height : _root.controlHeight contentItem : ValueAdjuster { id: _calciumVolumeControl - minimum : vTreatmentRanges.calciumMin - maximum : vTreatmentRanges.calciumMax - step : vTreatmentRanges.calciumRes - defaultValue : vTreatmentRanges.calciumDef + minimum : vTreatmentRanges.acidConcentrateCalciumMin + maximum : vTreatmentRanges.acidConcentrateCalciumMax + step : vTreatmentRanges.acidConcentrateCalciumRes + defaultValue : vTreatmentRanges.acidConcentrateCalciumDef decimal : Variables.calciumPrecision } } Index: sources/view/hd/data/VTreatmentRanges.cpp =================================================================== diff -u -r40ddf63592b60608ae34aeb3099fe4e62ae45054 -r95f6f36face64c2afdabe1904df649738f554709 --- sources/view/hd/data/VTreatmentRanges.cpp (.../VTreatmentRanges.cpp) (revision 40ddf63592b60608ae34aeb3099fe4e62ae45054) +++ sources/view/hd/data/VTreatmentRanges.cpp (.../VTreatmentRanges.cpp) (revision 95f6f36face64c2afdabe1904df649738f554709) @@ -129,15 +129,15 @@ // FROMVARIANT_WITHRETURN ( heparinStopTimeRes , "Heparin Stop Time Ranges" , "Heparin_Stop_Time_Res" , UInt , isConfigsOk ); // FROMVARIANT_WITHRETURN ( heparinStopTimeDef , "Heparin Stop Time Ranges" , "Heparin_Stop_Time_Def" , UInt , isConfigsOk ); - FROMVARIANT_WITHRETURN ( potassiumDef , "Potassium" , "Potassium_Def" , Float , isConfigsOk ); - FROMVARIANT_WITHRETURN ( potassiumMin , "Potassium" , "Potassium_Min" , Float , isConfigsOk ); - FROMVARIANT_WITHRETURN ( potassiumMax , "Potassium" , "Potassium_Max" , Float , isConfigsOk ); - FROMVARIANT_WITHRETURN ( potassiumRes , "Potassium" , "Potassium_Res" , Float , isConfigsOk ); + FROMVARIANT_WITHRETURN ( acidConcentratePotassiumDef , "Acid Concentrate Ranges" , "Acid_Concentrate_Potassium_Def" , Float , isConfigsOk ); + FROMVARIANT_WITHRETURN ( acidConcentratePotassiumMin , "Acid Concentrate Ranges" , "Acid_Concentrate_Potassium_Min" , Float , isConfigsOk ); + FROMVARIANT_WITHRETURN ( acidConcentratePotassiumMax , "Acid Concentrate Ranges" , "Acid_Concentrate_Potassium_Max" , Float , isConfigsOk ); + FROMVARIANT_WITHRETURN ( acidConcentratePotassiumRes , "Acid Concentrate Ranges" , "Acid_Concentrate_Potassium_Res" , Float , isConfigsOk ); - FROMVARIANT_WITHRETURN ( calciumDef , "Calcium" , "Calcium_Def" , Float , isConfigsOk ); - FROMVARIANT_WITHRETURN ( calciumMin , "Calcium" , "Calcium_Min" , Float , isConfigsOk ); - FROMVARIANT_WITHRETURN ( calciumMax , "Calcium" , "Calcium_Max" , Float , isConfigsOk ); - FROMVARIANT_WITHRETURN ( calciumRes , "Calcium" , "Calcium_Res" , Float , isConfigsOk ); + FROMVARIANT_WITHRETURN ( acidConcentrateCalciumDef , "Acid Concentrate Ranges" , "Acid_Concentrate_Calcium_Def" , Float , isConfigsOk ); + FROMVARIANT_WITHRETURN ( acidConcentrateCalciumMin , "Acid Concentrate Ranges" , "Acid_Concentrate_Calcium_Min" , Float , isConfigsOk ); + FROMVARIANT_WITHRETURN ( acidConcentrateCalciumMax , "Acid Concentrate Ranges" , "Acid_Concentrate_Calcium_Max" , Float , isConfigsOk ); + FROMVARIANT_WITHRETURN ( acidConcentrateCalciumRes , "Acid Concentrate Ranges" , "Acid_Concentrate_Calcium_Res" , Float , isConfigsOk ); FROMVARIANT_WITHRETURN ( salineBolusVolumeDef , "Saline Bolus Volume Ranges" , "Saline_Bolus_Volume_Def" , UInt , isConfigsOk ); FROMVARIANT_WITHRETURN ( salineBolusVolumeMin , "Saline Bolus Volume Ranges" , "Saline_Bolus_Volume_Min" , UInt , isConfigsOk ); Index: sources/view/hd/data/VTreatmentRanges.h =================================================================== diff -u -r40ddf63592b60608ae34aeb3099fe4e62ae45054 -r95f6f36face64c2afdabe1904df649738f554709 --- sources/view/hd/data/VTreatmentRanges.h (.../VTreatmentRanges.h) (revision 40ddf63592b60608ae34aeb3099fe4e62ae45054) +++ sources/view/hd/data/VTreatmentRanges.h (.../VTreatmentRanges.h) (revision 95f6f36face64c2afdabe1904df649738f554709) @@ -52,8 +52,8 @@ RANGESET( float , heparinBolusVolume , 0) RANGESET( quint32 , heparinStopTime , 0) RANGESET( quint32 , salineBolusVolume , 0) - RANGESET( float , potassium , 0) - RANGESET( float , calcium , 0) + RANGESET( float , acidConcentratePotassium , 0) + RANGESET( float , acidConcentrateCalcium , 0) READONLY( QStringList , heparinTypeOptions ,{}) READONLY( QStringList , acidConcentrateOptions ,{})