From 0e39b31f7654cf99e82890f4538b02c77a55fe31 Mon Sep 17 00:00:00 2001 From: Pos <pierpaolo.mancini@mail.polimi.it> Date: Thu, 12 Aug 2021 14:51:01 +0200 Subject: [PATCH] valuesViewer small fix --- Modules/ValuesViewer/valueelement.cpp | 9 +++++++-- Modules/ValuesViewer/valuesviewermodule.cpp | 3 ++- SkywardHub.pro.user | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Modules/ValuesViewer/valueelement.cpp b/Modules/ValuesViewer/valueelement.cpp index 630ef206..d54c7ecb 100644 --- a/Modules/ValuesViewer/valueelement.cpp +++ b/Modules/ValuesViewer/valueelement.cpp @@ -134,8 +134,13 @@ QString ValueElement::getCurrentValue() const bool ValueElement::updateCurrentValue(const QString &value) { - if(value == getReceivedValue()){ - currentValue = getDisplayedValue(); + if(getReceivedValue() == "" || value == getReceivedValue()){ + if(getDisplayedValue() != ""){ + currentValue = getDisplayedValue(); + } + else{ + currentValue = value; + } return true; } return false; diff --git a/Modules/ValuesViewer/valuesviewermodule.cpp b/Modules/ValuesViewer/valuesviewermodule.cpp index e92507ff..b3491cf9 100644 --- a/Modules/ValuesViewer/valuesviewermodule.cpp +++ b/Modules/ValuesViewer/valuesviewermodule.cpp @@ -103,6 +103,7 @@ void ValuesViewerModule::createLabels() } int col = 0; + int row = 0; for (int i = 0; i < rules.count(); i++ ) { QLabel *label; @@ -112,9 +113,9 @@ void ValuesViewerModule::createLabels() } else{ label = createView(rules[i]); - int row = i/columns; if(col == columns){ col = 0; + row++; } ui->mainLayout_grid->addWidget(label, row, col); col++; diff --git a/SkywardHub.pro.user b/SkywardHub.pro.user index 6bb8e65b..7d4088b0 100644 --- a/SkywardHub.pro.user +++ b/SkywardHub.pro.user @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE QtCreatorProject> -<!-- Written by QtCreator 4.14.2, 2021-08-11T21:04:23. --> +<!-- Written by QtCreator 4.14.2, 2021-08-12T14:50:14. --> <qtcreator> <data> <variable>EnvironmentId</variable> -- GitLab