aw/valentina_old
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Height is not a circumference, but still a distance.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2020-10-05 10:14:31 +03:00
parent cfe46d97e4
commit 214170a9b2
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/tape/dialogs/dialogsetupmultisize.cpp
View File

@ -365,7 +365,7 @@ void DialogSetupMultisize::InitDimensionMinMax(QSpinBox *spinboxMinValue, QSpinB
spinboxMinValue->blockSignals(true); spinboxMinValue->blockSignals(true);
const QString unitStr = " " + UnitsToStr(dimension->Units()); const QString unitStr = " " + UnitsToStr(dimension->Units());
if (c) if (c || dimension->Type() == MeasurementDimension::X)
{ {
spinboxMinValue->setSuffix(unitStr); spinboxMinValue->setSuffix(unitStr);
} }
@ -376,7 +376,7 @@ void DialogSetupMultisize::InitDimensionMinMax(QSpinBox *spinboxMinValue, QSpinB
spinboxMinValue->blockSignals(false); spinboxMinValue->blockSignals(false);
spinboxMaxValue->blockSignals(true); spinboxMaxValue->blockSignals(true);
if (c) if (c || dimension->Type() == MeasurementDimension::X)
{ {
spinboxMaxValue->setSuffix(unitStr); spinboxMaxValue->setSuffix(unitStr);
} }
@ -405,7 +405,7 @@ void DialogSetupMultisize::InitDimensionStep(QComboBox *comboBoxStep,
for(auto step : steps) for(auto step : steps)
{ {
comboBoxStep->addItem(QString("%1%2").arg(c && fc ? step*2 : step) comboBoxStep->addItem(QString("%1%2").arg(c && fc ? step*2 : step)
.arg(c ? unitStr : QString()), step); .arg(c || dimension->Type() == MeasurementDimension::X ? unitStr : QString()), step);
} }
comboBoxStep->setCurrentIndex(-1); // force a user to select comboBoxStep->setCurrentIndex(-1); // force a user to select
@ -590,7 +590,8 @@ void DialogSetupMultisize::UpdateBase(QComboBox *comboBoxBase,
for(auto base : bases) for(auto base : bases)
{ {
comboBoxBase->addItem(QString("%1%2").arg(c && fc ? base * 2 : base).arg(c ? unitStr : QString()), base); comboBoxBase->addItem(QString("%1%2").arg(c && fc ? base * 2 : base)
.arg(c || dimension->Type() == MeasurementDimension::X ? unitStr : QString()), base);
} }
comboBoxBase->setCurrentIndex(comboBoxBase->findData(oldBase)); comboBoxBase->setCurrentIndex(comboBoxBase->findData(oldBase));