Index: sources/gui/qml/dialogs/CalibrationDialog.qml =================================================================== diff -u -r4f856b4068a1a5a131a74b5bcece7b6212b5c8d9 -rb2a0a682b4f9bcf52352e6cb6206ba10f09c7847 --- sources/gui/qml/dialogs/CalibrationDialog.qml (.../CalibrationDialog.qml) (revision 4f856b4068a1a5a131a74b5bcece7b6212b5c8d9) +++ sources/gui/qml/dialogs/CalibrationDialog.qml (.../CalibrationDialog.qml) (revision b2a0a682b4f9bcf52352e6cb6206ba10f09c7847) @@ -14,7 +14,7 @@ property string titleText : "" property string componentName : "" property var entries : [] - property var rejections : vCalibrationSettings.rejectionReasons + property var rejections : vCalibrationSettings.model.get(_root.sensorIndex).rejections property var entryNames : vCalibrationSettings.columnTitle property var model : null property alias numPad : _numPad @@ -55,9 +55,6 @@ vCalibrationSettings.doAdjustment(_root.index, _root.sensorIndex, payload) - - // REMOVE LATER TO THE ACCEPT OF THE RESPONSE MESSAGE ***** - close() } function confirmEnabled() { @@ -70,12 +67,12 @@ } function openDialog (vIndex, vSensorIndex, vRecord){ - _root.model = vRecord - _root.index = vIndex - _root.sensorIndex = vSensorIndex - _root.titleText = vRecord.title - _root.componentName = vRecord.component - _root.entries = vRecord.payload + _root.model = vRecord + _root.index = vIndex + _root.sensorIndex = vSensorIndex + _root.titleText = vRecord.title + _root.componentName = vRecord.component + _root.entries = vRecord.payload open() } @@ -201,13 +198,15 @@ _root.numPad.validatorMin, _root.numPad.validatorMax, "") + + onTextEdited: if ( _root.rejections[index] ) { vCalibrationSettings.clearRejectionReason(index, _root.sensorIndex) } } Text { id : _textEntryCalTime anchors.centerIn : parent text : modelData ?? Variables.emptyEntry font.pixelSize : Fonts.fontPixelTextRectExtra - color : Colors.offWhite + color : _root.rejections[index] ? Colors.red : Colors.offWhite visible : isCalTime } }