Index: sources/view/td/data/VTreatmentRanges.cpp =================================================================== diff -u -r1a46e7e1fd9da0fcfa8359a194610c55adfff04f -r63d974e3d2d03c93e0398de17bd6ca2d2e039982 --- sources/view/td/data/VTreatmentRanges.cpp (.../VTreatmentRanges.cpp) (revision 1a46e7e1fd9da0fcfa8359a194610c55adfff04f) +++ sources/view/td/data/VTreatmentRanges.cpp (.../VTreatmentRanges.cpp) (revision 63d974e3d2d03c93e0398de17bd6ca2d2e039982) @@ -243,7 +243,6 @@ FROMVARIANT_WITHRETURN ( salineBolusVolumeRes , "Saline Bolus Volume Ranges" , "Saline_Bolus_Volume_Res" , UInt , isConfigsOk ); heparinTypeOptions ( _Settings.keys(mCategory , "Heparin Type Options" )); - acidConcentrateOptions ( _Settings.keys(mCategory , "Acid Concentrate Options" )); bicarbonateConcentrateOptions ( _Settings.keys(mCategory , "Bicarbonate Concentrate Options" )); dialyzerTypeOptions ( _Settings.keys(mCategory , "Dialyzer Type Options" )); bloodPressureMeasureInterval ( _Settings.keys(mCategory , "Vitals Measurement Interval Options" )); @@ -252,23 +251,17 @@ dryBicabCartridgeSizeOptions ( _Settings.keys(mCategory , "Dry Bicarb Cartridge Size" )); waterSampleTestResultRequired ( _Settings.keys(mCategory , "Water Sample Test Result Required" )); hepatitisStatus ( _Settings.keys(mCategory , "Hepatitis Status" )); - QVariantList mAcidConcentrateValues = _Settings.values(mCategory , "Acid Concentrate Options" ); + QStringList mAcidConcentrateKeys = _Settings.keys(mCategory , "Acid Concentrate Options" ); + QVariantList mAcidConcentrateValues = _Settings.values(mCategory , "Acid Concentrate Options" ); -// for (int i = 0; i < _acidConcentrateValues.size(); ++i) { -// bool ok = false; -// _acidConcentrateValues[i] = _Settings.value(mCategory, "Acid Concentrate Options" , _acidConcentrateOptions[i] ).toFloat(&ok); -// isConfigsOk = isConfigsOk && ok; -// } - - - for (int i = 0; i < _acidConcentrateOptions.size(); ++i) { + for (int i = 0; i < mAcidConcentrateKeys.size(); ++i) { bool ok = false; -// _acidConcentrateValues[i] = _Settings.value(mCategory, "Acid Concentrate Options" , _acidConcentrateOptions[i] ).toFloat(&ok); - _acidConcentrateModel.insertRow( i, {{ eRole_Key, _acidConcentrateOptions[i]}, { eRole_Value, mAcidConcentrateValues[i].toFloat(&ok) }}); - + _acidConcentrateModel.insertRow( i, {{ eRole_Key, mAcidConcentrateKeys[i]}, { eRole_Value, mAcidConcentrateValues[i].toFloat(&ok) }}); isConfigsOk = isConfigsOk && ok; } + acidConcentrateOptions (_acidConcentrateModel.getAllByRole(eRole_Key)); + isConfigsOk = isConfigsOk && !_heparinTypeOptions .isEmpty(); if ( _heparinTypeOptions.isEmpty() ) { heparinTypeOptions({"-- --"}); } isConfigsOk = isConfigsOk && !_acidConcentrateOptions .isEmpty();