Index: denali.pro.user =================================================================== diff -u -r20b286ab574a6b8ad25a51aeb3477506f7dafc5d -r2721daffd0af06accf99ed7c9a1b5a7035f8634f --- denali.pro.user (.../denali.pro.user) (revision 20b286ab574a6b8ad25a51aeb3477506f7dafc5d) +++ denali.pro.user (.../denali.pro.user) (revision 2721daffd0af06accf99ed7c9a1b5a7035f8634f) @@ -1,6 +1,6 @@ - + EnvironmentId Index: sources/gui/qml/dialogs/AlarmListDialog.qml =================================================================== diff -u -r20b286ab574a6b8ad25a51aeb3477506f7dafc5d -r2721daffd0af06accf99ed7c9a1b5a7035f8634f --- sources/gui/qml/dialogs/AlarmListDialog.qml (.../AlarmListDialog.qml) (revision 20b286ab574a6b8ad25a51aeb3477506f7dafc5d) +++ sources/gui/qml/dialogs/AlarmListDialog.qml (.../AlarmListDialog.qml) (revision 2721daffd0af06accf99ed7c9a1b5a7035f8634f) @@ -110,13 +110,13 @@ } ScrollBar { - visible : vAlarmActiveList.adjustment_Accepted + visible : vAlarmActiveList.adjustment_Accepted && ( flickable.height < flickable.contentHeight ) anchors.fill: _flickable flickable : _flickable backColor : Colors.backgroundDialog } - Flickable { id: _flickable + Flickable { id : _flickable clip : true visible : vAlarmActiveList.adjustment_Accepted anchors { @@ -126,8 +126,8 @@ bottomMargin : Variables.mainMenuHeight + Variables.minVGap horizontalCenter: parent.horizontalCenter } - width : Variables.dialogWidth - Variables.minVGap2 * 2 // * 2 : for each side - height : Variables.dialogHeight - _titleBar.height - Variables.minVGap * 2 // * 2 : for each side + width : Variables.dialogWidth - Variables.minVGap2 * 2 // * 2 : for each side + height : Variables.dialogHeight - Variables.minVGap * 2 - _titleBar.height // * 2 : for each side contentWidth : width contentHeight: _alarmGrid.height @@ -136,7 +136,7 @@ height : rowCount * ( rowSpacing + itemHeight ) width : parent.width colCount : 1 - rowCount : 10 + rowCount : vAlarmActiveList.alarmIDs.length itemHeight : 80 itemWidth : Variables.dialogWidth - Variables.minVGap2 * (2 + 1) // * 2 : for each side & + 1 to not cover the scrollbar rowSpacing : 0 Index: sources/view/hd/alarm/VAlarmActiveList.cpp =================================================================== diff -u -r376859852f4d1a07263c44524aec347db29e0133 -r2721daffd0af06accf99ed7c9a1b5a7035f8634f --- sources/view/hd/alarm/VAlarmActiveList.cpp (.../VAlarmActiveList.cpp) (revision 376859852f4d1a07263c44524aec347db29e0133) +++ sources/view/hd/alarm/VAlarmActiveList.cpp (.../VAlarmActiveList.cpp) (revision 2721daffd0af06accf99ed7c9a1b5a7035f8634f) @@ -19,6 +19,19 @@ VIEW_DEF_CLASS_ADJUSTMENT(VAlarmActiveList) +#define PROPERTY_ALARM_SET(vIndex) \ + a##vIndex##ID ( vData.mAlarmID##vIndex ) ; \ + if ( vData.mAlarmID##vIndex ) { \ + a##vIndex##Text ( alarmIDText ( vData.mAlarmID##vIndex ) ); \ + aListID += QString::number ( _a##vIndex##ID ); \ + aListText += _a##vIndex##Text ; \ + } \ + else { a##vIndex##Text ( "" ); } \ + +#define PROPERTY_ALARM_RESET(vIndex) \ + a##vIndex##ID ( 0 ) ; \ + a##vIndex##Text ( "" ); \ + /*! \brief Connection Initializer \details All the class signal/slot connections are defined here. */ @@ -36,83 +49,40 @@ { adjustment_Accepted ( vData.mAccepted ); adjustment_Reason ( vData.mReason ); - if (vData.mAccepted) { - status (""); - a0ID ( vData.mAlarmID0 ); - a1ID ( vData.mAlarmID1 ); - a2ID ( vData.mAlarmID2 ); - a3ID ( vData.mAlarmID3 ); - a4ID ( vData.mAlarmID4 ); - a5ID ( vData.mAlarmID5 ); - a6ID ( vData.mAlarmID6 ); - a7ID ( vData.mAlarmID7 ); - a8ID ( vData.mAlarmID8 ); - a9ID ( vData.mAlarmID9 ); - a0Text ( alarmIDText( vData.mAlarmID0 )); - a1Text ( alarmIDText( vData.mAlarmID1 )); - a2Text ( alarmIDText( vData.mAlarmID2 )); - a3Text ( alarmIDText( vData.mAlarmID3 )); - a4Text ( alarmIDText( vData.mAlarmID4 )); - a5Text ( alarmIDText( vData.mAlarmID5 )); - a6Text ( alarmIDText( vData.mAlarmID6 )); - a7Text ( alarmIDText( vData.mAlarmID7 )); - a8Text ( alarmIDText( vData.mAlarmID8 )); - a9Text ( alarmIDText( vData.mAlarmID9 )); - - alarmIDs ( { QString::number( _a0ID ), - QString::number( _a1ID ), - QString::number( _a2ID ), - QString::number( _a3ID ), - QString::number( _a4ID ), - QString::number( _a5ID ), - QString::number( _a6ID ), - QString::number( _a7ID ), - QString::number( _a8ID ), - QString::number( _a9ID ), - } ); - - alarmTexts ( { _a0Text, - _a1Text, - _a2Text, - _a3Text, - _a4Text, - _a5Text, - _a6Text, - _a7Text, - _a8Text, - _a9Text, - } ); + QStringList aListID ; + QStringList aListText; + QString aStatus ; + if (vData.mAccepted) { + PROPERTY_ALARM_SET ( 0 ); + PROPERTY_ALARM_SET ( 1 ); + PROPERTY_ALARM_SET ( 2 ); + PROPERTY_ALARM_SET ( 3 ); + PROPERTY_ALARM_SET ( 4 ); + PROPERTY_ALARM_SET ( 5 ); + PROPERTY_ALARM_SET ( 6 ); + PROPERTY_ALARM_SET ( 7 ); + PROPERTY_ALARM_SET ( 8 ); + PROPERTY_ALARM_SET ( 9 ); } else { - status (tr("No Active Alarm List\n%1").arg(text())); - a0ID ( 0 ); - a1ID ( 0 ); - a2ID ( 0 ); - a3ID ( 0 ); - a4ID ( 0 ); - a5ID ( 0 ); - a6ID ( 0 ); - a7ID ( 0 ); - a8ID ( 0 ); - a9ID ( 0 ); - - a0Text ( "" ); - a1Text ( "" ); - a2Text ( "" ); - a3Text ( "" ); - a4Text ( "" ); - a5Text ( "" ); - a6Text ( "" ); - a7Text ( "" ); - a8Text ( "" ); - a9Text ( "" ); - - alarmIDs ( {} ); - - alarmTexts ( {} ); + aStatus = tr("No Active Alarm List\n%1").arg(text()); + PROPERTY_ALARM_RESET ( 0 ); + PROPERTY_ALARM_RESET ( 1 ); + PROPERTY_ALARM_RESET ( 2 ); + PROPERTY_ALARM_RESET ( 3 ); + PROPERTY_ALARM_RESET ( 4 ); + PROPERTY_ALARM_RESET ( 5 ); + PROPERTY_ALARM_RESET ( 6 ); + PROPERTY_ALARM_RESET ( 7 ); + PROPERTY_ALARM_RESET ( 8 ); + PROPERTY_ALARM_RESET ( 9 ); } + status ( aStatus ); + alarmIDs ( aListID ); + alarmTexts ( aListText ); + // *** has to be the last to let the information to be set and then emit the signal *** // *** otherwise will use the Previous values before being set. *** adjustment ( true );