Index: sources/view/td/data/VTreatmentRanges.cpp =================================================================== diff -u -r1132f049e169cc87a059261f72fca0ceb7d739f1 -r1a46e7e1fd9da0fcfa8359a194610c55adfff04f --- sources/view/td/data/VTreatmentRanges.cpp (.../VTreatmentRanges.cpp) (revision 1132f049e169cc87a059261f72fca0ceb7d739f1) +++ sources/view/td/data/VTreatmentRanges.cpp (.../VTreatmentRanges.cpp) (revision 1a46e7e1fd9da0fcfa8359a194610c55adfff04f) @@ -242,16 +242,17 @@ FROMVARIANT_WITHRETURN ( salineBolusVolumeMax , "Saline Bolus Volume Ranges" , "Saline_Bolus_Volume_Max" , UInt , isConfigsOk ); 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" )); - treatmentModalityOptions ( _Settings.keys(mCategory , "Treatment Modality" )); - hdfTreatmentModeOptions ( _Settings.keys(mCategory , "HDF Treatment Mode" )); - dryBicabCartridgeSizeOptions ( _Settings.keys(mCategory , "Dry Bicarb Cartridge Size" )); - waterSampleTestResultRequired ( _Settings.keys(mCategory , "Water Sample Test Result Required" )); - QVariantList mAcidConcentrateValues = _Settings.values(mCategory , "Acid Concentrate Options" ); + 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" )); + treatmentModalityOptions ( _Settings.keys(mCategory , "Treatment Modality" )); + hdfTreatmentModeOptions ( _Settings.keys(mCategory , "HDF Treatment Mode" )); + 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" ); // for (int i = 0; i < _acidConcentrateValues.size(); ++i) { // bool ok = false; @@ -265,10 +266,7 @@ // _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) }}); - - isConfigsOk = isConfigsOk && ok; - } isConfigsOk = isConfigsOk && !_heparinTypeOptions .isEmpty(); @@ -281,6 +279,7 @@ isConfigsOk = isConfigsOk && !_hdfTreatmentModeOptions .isEmpty(); isConfigsOk = isConfigsOk && !_dryBicabCartridgeSizeOptions .isEmpty(); isConfigsOk = isConfigsOk && !_waterSampleTestResultRequired.isEmpty(); + isConfigsOk = isConfigsOk && !_hepatitisStatus .isEmpty(); vitalsInterval(_bloodPressureMeasureInterval.indexOf(_vitalsDef)); @@ -389,5 +388,10 @@ FROMVARIANT_WITHRETURN ( weightMax , "Weight Ranges" , "Weight_Max" , Float , isConfigsOk ); FROMVARIANT_WITHRETURN ( weightRes , "Weight Ranges" , "Weight_Res" , Float , isConfigsOk ); + FROMVARIANT_WITHRETURN ( primeDiscardVolumeDef , "Prime Discard Volume Ranges" , "Prime_Discard_Volume_Def" , UInt , isConfigsOk ); + FROMVARIANT_WITHRETURN ( primeDiscardVolumeMin , "Prime Discard Volume Ranges" , "Prime_Discard_Volume_Min" , UInt , isConfigsOk ); + FROMVARIANT_WITHRETURN ( primeDiscardVolumeMax , "Prime Discard Volume Ranges" , "Prime_Discard_Volume_Max" , UInt , isConfigsOk ); + FROMVARIANT_WITHRETURN ( primeDiscardVolumeRes , "Prime Discard Volume Ranges" , "Prime_Discard_Volume_Res" , UInt , isConfigsOk ); + emit didTreatmentRangesDone( isConfigsOk ); }