From 29582687e503a80bb2db833c0716e9e2af62dc9b Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 3 Feb 2021 17:17:43 +0200 Subject: [PATCH] Values for waist and hip swapped for individual measurements. --- ChangeLog.txt | 3 ++- src/app/valentina/mainwindow.cpp | 4 ++-- src/libs/vformat/vmeasurements.cpp | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index cc30a1b4d..d7b6eedd0 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,5 +1,6 @@ # Version 0.7.44 (unreleased) -- Placeholder %size% has incorrect value. +- Placeholder %size% has incorrect value. +- Values for waist and hip swapped for individual measurements. # Version 0.7.43 Jan 31, 2021 - Improve Windows installer. Avoid crashing on checking if a program is still running. diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp index 468f468dd..1be52ee8a 100644 --- a/src/app/valentina/mainwindow.cpp +++ b/src/app/valentina/mainwindow.cpp @@ -2142,10 +2142,10 @@ void MainWindow::StoreIndividualMDimensions() qApp->SetDimensionSize(valid ? *measurements.value(name)->GetValue() : 0); break; case IMD::W: - qApp->SetDimensionHip(valid ? *measurements.value(name)->GetValue() : 0); + qApp->SetDimensionWaist(valid ? *measurements.value(name)->GetValue() : 0); break; case IMD::Z: - qApp->SetDimensionWaist(valid ? *measurements.value(name)->GetValue() : 0); + qApp->SetDimensionHip(valid ? *measurements.value(name)->GetValue() : 0); break; case IMD::N: default: diff --git a/src/libs/vformat/vmeasurements.cpp b/src/libs/vformat/vmeasurements.cpp index eca655d69..6ae147f8f 100644 --- a/src/libs/vformat/vmeasurements.cpp +++ b/src/libs/vformat/vmeasurements.cpp @@ -1096,9 +1096,9 @@ QString VMeasurements::IMDName(IMD type) case IMD::Y: return tr("Size"); case IMD::W: - return tr("Hip"); - case IMD::Z: return tr("Waist"); + case IMD::Z: + return tr("Hip"); default: return QString(); }