From 31390b34d76300b9e5401174234ed493e4724dee Mon Sep 17 00:00:00 2001 From: Patrick Linstruth Date: Sat, 4 May 2019 08:23:44 -0700 Subject: [PATCH 1/2] Updated ChangeLog --- ChangeLog | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ChangeLog b/ChangeLog index 77e21f25..4ce026c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18645,3 +18645,6 @@ * Cleaned up a compiler warning for 'RDMacroEvent'. 2019-05-03 Fred Gleason * Updated the package version to 3.0.0rc02. +2019-05-04 Patrick Linstruth + * Fixed bug in clock schedule rules where "or After" schedule codes + were not displayed correctly. From 45790ad80eaba55a282c281390dc79d4c0c87403 Mon Sep 17 00:00:00 2001 From: Patrick Linstruth Date: Sat, 4 May 2019 08:24:02 -0700 Subject: [PATCH 2/2] Fixed bug in clock schedule rules where "or After" schedule codes were not displayed correctly. --- lib/rdschedruleslist.cpp | 2 +- rdlogmanager/edit_schedcoderules.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/rdschedruleslist.cpp b/lib/rdschedruleslist.cpp index 495dba7c..1c54f35c 100644 --- a/lib/rdschedruleslist.cpp +++ b/lib/rdschedruleslist.cpp @@ -64,7 +64,7 @@ RDSchedRulesList::RDSchedRulesList(QString clockname,RDConfig *config) min_wait[i] = q1->value(1).toInt(); not_after[i] = q1->value(2).toString(); or_after[i] = q1->value(3).toString(); - or_after_II[i] = q1->value(3).toString(); + or_after_II[i] = q1->value(4).toString(); } else { max_row[i] = 1; diff --git a/rdlogmanager/edit_schedcoderules.cpp b/rdlogmanager/edit_schedcoderules.cpp index b639c26c..bf590206 100644 --- a/rdlogmanager/edit_schedcoderules.cpp +++ b/rdlogmanager/edit_schedcoderules.cpp @@ -146,7 +146,7 @@ editSchedCodeRules::editSchedCodeRules(Q3ListViewItem *item, } comboBox_not_after->setCurrentText(item->text(3)); comboBox_or_after->setCurrentText(item->text(4)); - comboBox_or_after->setCurrentText(item->text(5)); + comboBox_or_after_II->setCurrentText(item->text(5)); label_description = new QLabel(this); label_description->setGeometry( QRect( 200, 40, 300, 40 ) );