Index: denali.pro =================================================================== diff -u -r62d4bbefa96100e5a01194c0b704fe32d9db56ec -r0af01ff89762b5934bb00500ce563a3dc700efed --- denali.pro (.../denali.pro) (revision 62d4bbefa96100e5a01194c0b704fe32d9db56ec) +++ denali.pro (.../denali.pro) (revision 0af01ff89762b5934bb00500ce563a3dc700efed) @@ -121,7 +121,6 @@ sources/model/hd/data/MTreatmentRecirculateData.h \ sources/model/hd/data/MTreatmentBloodPrimeData.h \ sources/model/hd/data/MPrimingData.h \ - sources/model/hd/data/MAlarmVolumeData.h \ \ # ---------- Models - DG - Adjustment sources/model/dg/adjustment/MTreatmentAdjustDGVersionsResponse.h \ sources/model/dg/adjustment/MAdjustDGDateTimeResponse.h \ @@ -289,7 +288,6 @@ sources/model/hd/data/MTreatmentRecirculateData.cpp \ sources/model/hd/data/MTreatmentBloodPrimeData.cpp \ sources/model/hd/data/MPrimingData.cpp \ - sources/model/hd/data/MAlarmVolumeData.cpp \ \ # ---------- Models - DG - Adjustment sources/model/dg/adjustment/MTreatmentAdjustDGVersionsResponse.cpp \ sources/model/dg/adjustment/MAdjustDGDateTimeResponse.cpp \ Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r62d4bbefa96100e5a01194c0b704fe32d9db56ec -r0af01ff89762b5934bb00500ce563a3dc700efed --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 62d4bbefa96100e5a01194c0b704fe32d9db56ec) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 0af01ff89762b5934bb00500ce563a3dc700efed) @@ -92,7 +92,6 @@ ID_Recirculate = 0x5A00, // 90 ID_BloodPrime = 0x5900, // 89 ID_HDAccelerometerData = 0x3300, // 51 - ID_AlarmVolumeData = 0x7D00, // 125 // Alarm Messages ID_AlarmStatus = 0x0200, Index: sources/model/MModel.h =================================================================== diff -u -r62d4bbefa96100e5a01194c0b704fe32d9db56ec -r0af01ff89762b5934bb00500ce563a3dc700efed --- sources/model/MModel.h (.../MModel.h) (revision 62d4bbefa96100e5a01194c0b704fe32d9db56ec) +++ sources/model/MModel.h (.../MModel.h) (revision 0af01ff89762b5934bb00500ce563a3dc700efed) @@ -74,7 +74,6 @@ #include "MAdjustDGDateTimeResponse.h" #include "MHDSerialNumberResponse.h" #include "MDGSerialNumberResponse.h" -#include "MAlarmVolumeData.h" #include "MAdjustHDServiceResponse.h" #include "MAdjustDGServiceResponse.h" #include "MAdjustHDAlarmVolumeResponse.h" @@ -218,7 +217,6 @@ REGISTER_METATYPE( AlarmStatusData ) \ REGISTER_METATYPE( AlarmTriggeredData ) \ REGISTER_METATYPE( AlarmClearedData ) \ - REGISTER_METATYPE( AlarmVolumeData ) \ /* coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now. REGISTER_METATYPE( AlarmClearedConditionData ) \ coco end */ \ @@ -327,7 +325,6 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AlarmStatusData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AlarmTriggeredData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AlarmClearedData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AlarmVolumeData ) \ /* coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now. ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AlarmClearedConditionData ) \ coco end */ \ @@ -439,7 +436,6 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AlarmStatusData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AlarmTriggeredData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AlarmClearedData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( AlarmVolumeData ) \ /* coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now. ACTION_RECEIVE_BRIDGE_DEFINITION( AlarmClearedConditionData ) \ coco end */ \ @@ -593,7 +589,6 @@ ACTION_RECEIVE_SIGNAL( AlarmTriggeredData ) \ ACTION_RECEIVE_SIGNAL( AlarmClearedData ) \ ACTION_RECEIVE_SIGNAL( AlarmClearedConditionData ) \ - ACTION_RECEIVE_SIGNAL( AlarmVolumeData ) \ ACTION_RECEIVE_SIGNAL( DGROPumpData ) \ ACTION_RECEIVE_SIGNAL( DGPressuresData ) \ ACTION_RECEIVE_SIGNAL( DGDrainPumpData ) \ Fisheye: Tag 0af01ff89762b5934bb00500ce563a3dc700efed refers to a dead (removed) revision in file `sources/model/hd/data/MAlarmVolumeData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0af01ff89762b5934bb00500ce563a3dc700efed refers to a dead (removed) revision in file `sources/model/hd/data/MAlarmVolumeData.h'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/view/VBrightness.cpp =================================================================== diff -u -rbd560752aaa76183f168f0af6ad97b75b6b57c79 -r0af01ff89762b5934bb00500ce563a3dc700efed --- sources/view/VBrightness.cpp (.../VBrightness.cpp) (revision bd560752aaa76183f168f0af6ad97b75b6b57c79) +++ sources/view/VBrightness.cpp (.../VBrightness.cpp) (revision 0af01ff89762b5934bb00500ce563a3dc700efed) @@ -46,7 +46,7 @@ brightness(vBrightness); - _processSetBrightness.start(Brightness_Set, QStringList() << QString("%0").arg(vBrightness)); + _processSetBrightness.start(Brightness_Set, QStringList() << QString("%1").arg(vBrightness)); } /*!