Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r8350b02fa06da7cb6d7f085f88f55bf505ae78df -rcaf45633324f0abb5ced699731f8d6f1c4de4510 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 8350b02fa06da7cb6d7f085f88f55bf505ae78df) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision caf45633324f0abb5ced699731f8d6f1c4de4510) @@ -364,7 +364,60 @@ {Gui::GuiActionType::ID_DDCalibrationPressureRsp , 6 * 4 }, // 6 parameters each 4 bytes {Gui::GuiActionType::ID_AdjustDDCalibrationPressureReq , 4 * 4 }, // 4 parameters each 4 bytes - {Gui::GuiActionType::ID_AdjustDDCalibrationPressureRsp , 6 * 4 }, // 5 parameters each 4 bytes + {Gui::GuiActionType::ID_AdjustDDCalibrationPressureRsp , 6 * 4 }, // 6 parameters each 4 bytes + + {Gui::GuiActionType::ID_DDCalibrationTemperatureReq , 1 * 4 }, // 1 parameter each 4 bytes + {Gui::GuiActionType::ID_DDCalibrationTemperatureRsp , 6 * 4 }, // 6 parameters each 4 bytes + + {Gui::GuiActionType::ID_AdjustDDCalibrationTemperatureReq , 4 * 4 }, // 4 parameters each 4 bytes + {Gui::GuiActionType::ID_AdjustDDCalibrationTemperatureRsp , 6 * 4 }, // 6 parameters each 4 bytes + + {Gui::GuiActionType::ID_DDCalibrationConcentratePumpReq , 1 * 4 }, // 1 parameter each 4 bytes + {Gui::GuiActionType::ID_DDCalibrationConcentratePumpRsp , 6 * 4 }, // 6 parameters each 4 bytes + + {Gui::GuiActionType::ID_AdjustDDCalibrationConcentratePumpReq , 4 * 4 }, // 4 parameters each 4 bytes + {Gui::GuiActionType::ID_AdjustDDCalibrationConcentratePumpRsp , 6 * 4 }, // 6 parameters each 4 bytes + + {Gui::GuiActionType::ID_DDCalibrationD12DialysatePumpReq , 0 * 4 }, // 0 parameter each 4 bytes + {Gui::GuiActionType::ID_DDCalibrationD12DialysatePumpRsp , 4 * 4 }, // 4 parameters each 4 bytes + + {Gui::GuiActionType::ID_AdjustDDCalibrationD12DialysatePumpReq , 2 * 4 }, // 2 parameters each 4 bytes + {Gui::GuiActionType::ID_AdjustDDCalibrationD12DialysatePumpRsp , 4 * 4 }, // 4 parameters each 4 bytes + + {Gui::GuiActionType::ID_DDCalibrationD48DialysatePumpReq , 0 * 4 }, // 0 parameter each 4 bytes + {Gui::GuiActionType::ID_DDCalibrationD48DialysatePumpRsp , 5 * 4 }, // 5 parameters each 4 bytes + + {Gui::GuiActionType::ID_AdjustDDCalibrationD48DialysatePumpReq , 3 * 4 }, // 3 parameters each 4 bytes + {Gui::GuiActionType::ID_AdjustDDCalibrationD48DialysatePumpRsp , 5 * 4 }, // 1 parameter each 4 bytes + + {Gui::GuiActionType::ID_DDCalibrationAcidConcentratesReq , 1 * 4 }, // 1 parameter each 4 bytes + {Gui::GuiActionType::ID_DDCalibrationAcidConcentratesRsp , 8 * 4 }, // 8 parameters each 4 bytes + + {Gui::GuiActionType::ID_AdjustDDCalibrationAcidConcentratesReq , 6 * 4 }, // 6 parameters each 4 bytes + {Gui::GuiActionType::ID_AdjustDDCalibrationAcidConcentratesRsp , 8 * 4 }, // 8 parameters each 4 bytes + + {Gui::GuiActionType::ID_DDCalibrationBicarbConcentratesReq , 1 * 4 }, // 1 parameter each 4 bytes + {Gui::GuiActionType::ID_DDCalibrationBicarbConcentratesRsp , 8 * 4 }, // 8 parameters each 4 bytes + + {Gui::GuiActionType::ID_AdjustDDCalibrationBicarbConcentratesReq , 6 * 4 }, // 6 parameters each 4 bytes + {Gui::GuiActionType::ID_AdjustDDCalibrationBicarbConcentratesRsp , 8 * 4 }, // 8 parameters each 4 bytes + + {Gui::GuiActionType::ID_DDCalibrationAccelerometerSensorReq , 0 * 4 }, // 0 parameter each 4 bytes + {Gui::GuiActionType::ID_DDCalibrationAccelerometerSensorRsp , 6 * 4 }, // 6 parameters each 4 bytes + + {Gui::GuiActionType::ID_AdjustDDCalibrationAccelerometerSensorReq, 4 * 4 }, // 4 parameters each 4 bytes + {Gui::GuiActionType::ID_AdjustDDCalibrationAccelerometerSensorRsp, 6 * 4 }, // 6 parameters each 4 bytes + + {Gui::GuiActionType::ID_DDCalibrationBloodLeakSensorReq , 0 * 4 }, // 0 parameter each 4 bytes + {Gui::GuiActionType::ID_DDCalibrationBloodLeakSensorRsp , 4 * 4 }, // 4 parameters each 4 bytes + + {Gui::GuiActionType::ID_AdjustDDCalibrationBloodLeakSensorReq , 2 * 4 }, // 2 parameters each 4 bytes + {Gui::GuiActionType::ID_AdjustDDCalibrationBloodLeakSensorRsp , 4 * 4 }, // 4 parameters each 4 bytes + + {Gui::GuiActionType::ID_DDCalibrationConductivitySensorReq , 1 * 4 }, // 1 parameter each 4 bytes + {Gui::GuiActionType::ID_DDCalibrationConductivitySensorRsp , 16 * 4 }, // 16 parameters each 4 bytes + {Gui::GuiActionType::ID_AdjustDDCalibrationConductivitySensorReq , 14 * 4 }, // 14 parameters each 4 bytes + {Gui::GuiActionType::ID_AdjustDDCalibrationConductivitySensorRsp , 16 * 4 }, // 16 parameters each 4 bytes }; /*! Index: sources/gui/GuiGlobals.h =================================================================== diff -u -rb50ec62b54a1af1755922c833e1ccaabb50bb59e -rcaf45633324f0abb5ced699731f8d6f1c4de4510 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision b50ec62b54a1af1755922c833e1ccaabb50bb59e) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision caf45633324f0abb5ced699731f8d6f1c4de4510) @@ -374,47 +374,46 @@ ID_AdjustDDCalibrationTemperatureReq = 0x1E01, // 286 //// ----- @LEAHIZED ID_AdjustDDCalibrationTemperatureRsp = 0x1F01, // 287 //// ----- @LEAHIZED - ID_DDCalibrationConcentratePumpReq = 0x2001, - ID_DDCalibrationConcentratePumpRsp = 0x2101, - ID_AdjustDDCalibrationConcentratePumpReq = 0x2201, - ID_AdjustDDCalibrationConcentratePumpRsp = 0x2301, + ID_DDCalibrationConcentratePumpReq = 0x2001, // 288 //// ----- @LEAHIZED + ID_DDCalibrationConcentratePumpRsp = 0x2101, // 289 //// ----- @LEAHIZED + ID_AdjustDDCalibrationConcentratePumpReq = 0x2201, // 290 //// ----- @LEAHIZED + ID_AdjustDDCalibrationConcentratePumpRsp = 0x2301, // 291 //// ----- @LEAHIZED -// = 0x2401, -// = 0x2501, -// = 0x2601, -// = 0x2701, + ID_DDCalibrationD12DialysatePumpReq = 0x2401, // 292 //// ----- @LEAHIZED + ID_DDCalibrationD12DialysatePumpRsp = 0x2501, // 293 //// ----- @LEAHIZED + ID_AdjustDDCalibrationD12DialysatePumpReq = 0x2601, // 294 //// ----- @LEAHIZED + ID_AdjustDDCalibrationD12DialysatePumpRsp = 0x2701, // 295 //// ----- @LEAHIZED -// = 0x2801, -// = 0x2901, -// = 0x2A01, -// = 0x2B01, + ID_DDCalibrationD48DialysatePumpReq = 0x2801, // 296 //// ----- @LEAHIZED + ID_DDCalibrationD48DialysatePumpRsp = 0x2901, // 297 //// ----- @LEAHIZED + ID_AdjustDDCalibrationD48DialysatePumpReq = 0x2A01, // 298 //// ----- @LEAHIZED + ID_AdjustDDCalibrationD48DialysatePumpRsp = 0x2B01, // 299 //// ----- @LEAHIZED -// = 0x2C01, -// = 0x2D01, -// = 0x2E01, -// = 0x2F01, + ID_DDCalibrationAcidConcentratesReq = 0x2C01, // 300 //// ----- @LEAHIZED + ID_DDCalibrationAcidConcentratesRsp = 0x2D01, // 301 //// ----- @LEAHIZED + ID_AdjustDDCalibrationAcidConcentratesReq = 0x2E01, // 302 //// ----- @LEAHIZED + ID_AdjustDDCalibrationAcidConcentratesRsp = 0x2F01, // 303 //// ----- @LEAHIZED -// = 0x3001, -// = 0x3101, -// = 0x3201, -// = 0x3301, + ID_DDCalibrationBicarbConcentratesReq = 0x3001, // 304 //// ----- @LEAHIZED + ID_DDCalibrationBicarbConcentratesRsp = 0x3101, // 305 //// ----- @LEAHIZED + ID_AdjustDDCalibrationBicarbConcentratesReq = 0x3201, // 306 //// ----- @LEAHIZED + ID_AdjustDDCalibrationBicarbConcentratesRsp = 0x3301, // 307 //// ----- @LEAHIZED -// = 0x3401, -// = 0x3501, -// = 0x3601, -// = 0x3701, + ID_DDCalibrationAccelerometerSensorReq = 0x3401, // 308 //// ----- @LEAHIZED + ID_DDCalibrationAccelerometerSensorRsp = 0x3501, // 309 //// ----- @LEAHIZED + ID_AdjustDDCalibrationAccelerometerSensorReq= 0x3601, // 310 //// ----- @LEAHIZED + ID_AdjustDDCalibrationAccelerometerSensorRsp= 0x3701, // 311 //// ----- @LEAHIZED -// = 0x3801, -// = 0x3901, -// = 0x3A01, -// = 0x3B01, + ID_DDCalibrationBloodLeakSensorReq = 0x3801, // 312 //// ----- @LEAHIZED + ID_DDCalibrationBloodLeakSensorRsp = 0x3901, // 313 //// ----- @LEAHIZED + ID_AdjustDDCalibrationBloodLeakSensorReq = 0x3A01, // 314 //// ----- @LEAHIZED + ID_AdjustDDCalibrationBloodLeakSensorRsp = 0x3B01, // 315 //// ----- @LEAHIZED -// = 0x3C01, -// = 0x3D01, -// = 0x3E01, -// = 0x3F01, + ID_DDCalibrationConductivitySensorReq = 0x3C01, // 316 //// ----- @LEAHIZED + ID_DDCalibrationConductivitySensorRsp = 0x3D01, // 317 //// ----- @LEAHIZED + ID_AdjustDDCalibrationConductivitySensorReq = 0x3E01, // 318 //// ----- @LEAHIZED + ID_AdjustDDCalibrationConductivitySensorRsp = 0x3F01, // 319 //// ----- @LEAHIZED - }; enum class GuiActionsData_Enum /*: quint8 QML does not support*/ { @@ -504,7 +503,7 @@ Q_ENUM(DD_Heat_UI_States) Q_ENUM(DD_Valves) Q_ENUM(PressureSensors) - Q_ENUM(SENSORS_NAME) // temperature + Q_ENUM(TemperatureSensors) Q_ENUM(ConcentratePumps) Q_ENUM(dd_acid_types) Q_ENUM(dd_bicarb_types) @@ -587,7 +586,7 @@ // DD Valves typedef GuiActions::DD_Valves GuiDDValves; typedef GuiActions::PressureSensors GuiDDCalibrationPressure; - typedef GuiActions::SENSORS_NAME GuiDDCalibrationTemperature; + typedef GuiActions::TemperatureSensors GuiDDCalibrationTemperature; typedef GuiActions::ConcentratePumps GuiDDCalibrationConcentratePump; typedef GuiActions::dd_acid_types GuiDDCalibrationAcidType; typedef GuiActions::dd_bicarb_types GuiDDCalibrationBicarbType; Index: sources/view/settings/VCalibrationSettings.cpp =================================================================== diff -u -r4b5d1e497ef4f425cd03540dbbeef1d8197aed1d -rcaf45633324f0abb5ced699731f8d6f1c4de4510 --- sources/view/settings/VCalibrationSettings.cpp (.../VCalibrationSettings.cpp) (revision 4b5d1e497ef4f425cd03540dbbeef1d8197aed1d) +++ sources/view/settings/VCalibrationSettings.cpp (.../VCalibrationSettings.cpp) (revision caf45633324f0abb5ced699731f8d6f1c4de4510) @@ -102,46 +102,46 @@ case eTemperature : { QVariantList initPayloadValues = initList ( { tr("Gain"), tr("Offset"), tr("Cal Time") } ) ; - _calibrationList.insertRow( GuiDDCalibrationTemperature::D1_TEMP, {{ eRole_Title, tr("Heat exchanger Inlet")}, { eRole_Component, tr("D1" )}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); - _calibrationList.insertRow( GuiDDCalibrationTemperature::D78_TEMP, {{ eRole_Title, tr("Heat exchanger Outlet")}, { eRole_Component, tr("D78")}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); - _calibrationList.insertRow( GuiDDCalibrationTemperature::D4_TEMP, {{ eRole_Title, tr("Hydraulics Primary Heater")}, { eRole_Component, tr("D4" )}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); - _calibrationList.insertRow( GuiDDCalibrationTemperature::D50_TEMP, {{ eRole_Title, tr("Trimmer Heater")}, { eRole_Component, tr("D50")}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); - _calibrationList.insertRow( GuiDDCalibrationTemperature::D99_TEMP, {{ eRole_Title, tr("Conductivity")}, { eRole_Component, tr("D99")}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); - _calibrationList.insertRow( GuiDDCalibrationTemperature::BRD_TEMP, {{ eRole_Title, tr("Barometric")}, { eRole_Component, tr("BRD")}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); + _calibrationList.insertRow( GuiDDCalibrationTemperature::D1_TEMP, {{ eRole_Title, tr("Heat exchanger Inlet")}, { eRole_Component, tr("D1" )}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); + _calibrationList.insertRow( GuiDDCalibrationTemperature::D78_TEMP, {{ eRole_Title, tr("Heat exchanger Outlet")}, { eRole_Component, tr("D78")}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); + _calibrationList.insertRow( GuiDDCalibrationTemperature::D4_TEMP, {{ eRole_Title, tr("Hydraulics Primary Heater")}, { eRole_Component, tr("D4" )}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); + _calibrationList.insertRow( GuiDDCalibrationTemperature::D50_TEMP, {{ eRole_Title, tr("Trimmer Heater")}, { eRole_Component, tr("D50")}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); + _calibrationList.insertRow( GuiDDCalibrationTemperature::D99_TEMP, {{ eRole_Title, tr("Conductivity")}, { eRole_Component, tr("D99")}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); + _calibrationList.insertRow( GuiDDCalibrationTemperature::BRD_TEMP, {{ eRole_Title, tr("Barometric")}, { eRole_Component, tr("BRD")}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); break; } case eConcentratePump : { QVariantList initPayloadValues = initList ( { tr("Gain"), tr("Offset"), tr("Cal Time") } ) ; - _calibrationList.appendRow( {{ eRole_Title, tr("Acid")}, { eRole_Component, tr("D11_CP1" )}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); - _calibrationList.appendRow( {{ eRole_Title, tr("Bicarbonate")}, { eRole_Component, tr("D10_CP2" )}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); - _calibrationList.appendRow( {{ eRole_Title, tr("Ultrafiltration")}, { eRole_Component, tr("D76" )}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); + _calibrationList.insertRow( GuiDDCalibrationConcentratePump::D11_PUMP, {{ eRole_Title, tr("Acid")}, { eRole_Component, tr("D11_CP1" )}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); + _calibrationList.insertRow( GuiDDCalibrationConcentratePump::D10_PUMP, {{ eRole_Title, tr("Bicarbonate")}, { eRole_Component, tr("D10_CP2" )}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); + _calibrationList.insertRow( GuiDDCalibrationConcentratePump::D76_PUMP, {{ eRole_Title, tr("Ultrafiltration")}, { eRole_Component, tr("D76" )}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); break; } case eDialysatePumpD12 : { QVariantList initPayloadValues = initList ( { tr("Target Pump Speed"), tr("Cal Time") } ) ; - _calibrationList.appendRow( {{ eRole_Title, tr("Fresh Dialysate Pump")}, { eRole_Component, tr("D12" )}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); + _calibrationList.appendRow( {{ eRole_Title, tr("Fresh Dialysate Pump")}, { eRole_Component, tr("D12" )}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); break; } case eDialysatePumpD48 : { QVariantList initPayloadValues = initList ( { tr("Gain"), tr("Offset"), tr("Cal Time") } ) ; - _calibrationList.appendRow( {{ eRole_Title, tr("Spent Dialysate Pump")}, { eRole_Component, tr("D48" )}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); + _calibrationList.appendRow( {{ eRole_Title, tr("Spent Dialysate Pump")}, { eRole_Component, tr("D48" )}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); break; } case eAcidTypes : { QVariantList initPayloadValues = initList ( { tr("Mix Ratio"), tr("Full Bottle Vol. (mL)"), tr("Cond. (uS/cm)"), tr("Temp (°C)"), tr("Cal Time") } ) ; - _calibrationList.appendRow( {{ eRole_Title, tr("08-1251-1")}, { eRole_Component, tr("")}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); - _calibrationList.appendRow( {{ eRole_Title, tr("08-2251-0")}, { eRole_Component, tr("")}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); - _calibrationList.appendRow( {{ eRole_Title, tr("08-3251-9")}, { eRole_Component, tr("")}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); + _calibrationList.insertRow( GuiDDCalibrationAcidType::ACID_08_1251_1, {{ eRole_Title, tr("08-1251-1")}, { eRole_Component, tr("")}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); + _calibrationList.insertRow( GuiDDCalibrationAcidType::ACID_08_2251_0, {{ eRole_Title, tr("08-2251-0")}, { eRole_Component, tr("")}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); + _calibrationList.insertRow( GuiDDCalibrationAcidType::ACID_08_3251_9, {{ eRole_Title, tr("08-3251-9")}, { eRole_Component, tr("")}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); break; } case eBicarbTypes : { QVariantList initPayloadValues = initList ( { tr("Mix Ratio"), tr("Start Volume (mL)"), tr("Cond. (uS/cm)"), tr("Temp (°C)"), tr("Cal Time") } ) ; - _calibrationList.appendRow( {{ eRole_Title, tr("08-677753-0")}, { eRole_Component, tr("")}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); + _calibrationList.insertRow( GuiDDCalibrationBicarbType::BICARB_08_677753_0, {{ eRole_Title, tr("08-677753-0")}, { eRole_Component, tr("")}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); break; } case eAccelerometer : @@ -159,11 +159,11 @@ case eConductivity : { QVariantList initPayloadValues = initList ( { tr("Coeff 1"),tr("Coeff 2"),tr("Coeff 3"),tr("Coeff 4"),tr("Coeff 5"),tr("Coeff 6"),tr("Coeff 7"), tr("Coeff 8"),tr("Coeff 9"),tr("Coeff 10"),tr("Coeff 11"),tr("Coeff 12"),tr("Cal Time") } ) ; - _calibrationList.appendRow( {{ eRole_Title, tr("Closed Loop Control of Dosing")}, { eRole_Component, tr("D17")}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); - _calibrationList.appendRow( {{ eRole_Title, tr("Closed Loop Control of Dosing")}, { eRole_Component, tr("D27")}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); - _calibrationList.appendRow( {{ eRole_Title, tr("Water, Bicarbonate, and Acid")}, { eRole_Component, tr("D29")}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); - _calibrationList.appendRow( {{ eRole_Title, tr("Self Test")}, { eRole_Component, tr("D43")}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); - _calibrationList.appendRow( {{ eRole_Title, tr("Water and Bicarb Collective")}, { eRole_Component, tr("D74")}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); + _calibrationList.insertRow( GuiDDCalibrationConductivitySensor::D17_COND, {{ eRole_Title, tr("Closed Loop Control of Dosing")}, { eRole_Component, tr("D17")}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); + _calibrationList.insertRow( GuiDDCalibrationConductivitySensor::D27_COND, {{ eRole_Title, tr("Closed Loop Control of Dosing")}, { eRole_Component, tr("D27")}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); + _calibrationList.insertRow( GuiDDCalibrationConductivitySensor::D29_COND, {{ eRole_Title, tr("Water, Bicarbonate, and Acid")}, { eRole_Component, tr("D29")}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); + _calibrationList.insertRow( GuiDDCalibrationConductivitySensor::D43_COND, {{ eRole_Title, tr("Self Test")}, { eRole_Component, tr("D43")}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); + _calibrationList.insertRow( GuiDDCalibrationConductivitySensor::D74_COND, {{ eRole_Title, tr("Water and Bicarb Collective")}, { eRole_Component, tr("D74")}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); break; } } Index: sources/view/settings/VCalibrationSettings.h =================================================================== diff -u -rb2a0a682b4f9bcf52352e6cb6206ba10f09c7847 -rcaf45633324f0abb5ced699731f8d6f1c4de4510 --- sources/view/settings/VCalibrationSettings.h (.../VCalibrationSettings.h) (revision b2a0a682b4f9bcf52352e6cb6206ba10f09c7847) +++ sources/view/settings/VCalibrationSettings.h (.../VCalibrationSettings.h) (revision caf45633324f0abb5ced699731f8d6f1c4de4510) @@ -50,13 +50,9 @@ // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI TRIGGER( bool , adjustment , 0 ) -// TRIGGER( bool , rejected , 0 ) - PROPERTY(QStringList , columnTitle , {}) - - Q_PROPERTY(MListModel* model READ model NOTIFY didModelChange) VIEW_DEC_CLASS(VCalibrationSettings);