Fix incorrect calculation of value for multisize measurements in Valentina.
This commit is contained in:
parent
80b6c97b3a
commit
1b64cba897
|
@ -1,3 +1,6 @@
|
|||
# Version 0.7.46 (unreleased)
|
||||
- Fix incorrect calculation of value for multisize measurements in Valentina.
|
||||
|
||||
# Version 0.7.45 Feb 26, 2021
|
||||
- Fix incorrect seam allowance for angle type second edge right angle.
|
||||
- Fix regression with country flags.
|
||||
|
|
|
@ -554,20 +554,7 @@ bool MainWindow::LoadMeasurements(const QString &path)
|
|||
return false;
|
||||
}
|
||||
|
||||
if (m->Type() == MeasurementsType::Multisize)
|
||||
{
|
||||
StoreMultisizeMDimensions();
|
||||
|
||||
doc->SetPatternWasChanged(true);
|
||||
emit doc->UpdatePatternLabel();
|
||||
}
|
||||
else if (m->Type() == MeasurementsType::Individual)
|
||||
{
|
||||
StoreIndividualMDimensions();
|
||||
|
||||
doc->SetPatternWasChanged(true);
|
||||
emit doc->UpdatePatternLabel();
|
||||
}
|
||||
StoreDimensions();
|
||||
|
||||
return true;
|
||||
}
|
||||
|
@ -622,20 +609,7 @@ bool MainWindow::UpdateMeasurements(const QString &path, qreal baseA, qreal base
|
|||
return false;
|
||||
}
|
||||
|
||||
if (m->Type() == MeasurementsType::Multisize)
|
||||
{
|
||||
StoreMultisizeMDimensions();
|
||||
|
||||
doc->SetPatternWasChanged(true);
|
||||
emit doc->UpdatePatternLabel();
|
||||
}
|
||||
else if (m->Type() == MeasurementsType::Individual)
|
||||
{
|
||||
StoreIndividualMDimensions();
|
||||
|
||||
doc->SetPatternWasChanged(true);
|
||||
emit doc->UpdatePatternLabel();
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
@ -1998,6 +1972,7 @@ void MainWindow::SyncMeasurements()
|
|||
statusBar()->showMessage(msg, 5000);
|
||||
VWidgetPopup::PopupMessage(this, msg);
|
||||
doc->LiteParseTree(Document::FullLiteParse);
|
||||
StoreDimensions();
|
||||
mChanges = false;
|
||||
mChangesAsked = true;
|
||||
measurementsSyncTimer->stop();
|
||||
|
@ -2230,6 +2205,25 @@ void MainWindow::SetDimensionBases()
|
|||
SetBase(2, dimensionC, m_currentDimensionC);
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
void MainWindow::StoreDimensions()
|
||||
{
|
||||
if (m->Type() == MeasurementsType::Multisize)
|
||||
{
|
||||
StoreMultisizeMDimensions();
|
||||
|
||||
doc->SetPatternWasChanged(true);
|
||||
emit doc->UpdatePatternLabel();
|
||||
}
|
||||
else if (m->Type() == MeasurementsType::Individual)
|
||||
{
|
||||
StoreIndividualMDimensions();
|
||||
|
||||
doc->SetPatternWasChanged(true);
|
||||
emit doc->UpdatePatternLabel();
|
||||
}
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
#if defined(Q_OS_MAC)
|
||||
void MainWindow::OpenAt(QAction *where)
|
||||
|
@ -3920,6 +3914,7 @@ void MainWindow::GradationChanged()
|
|||
m_currentDimensionA, m_currentDimensionB, m_currentDimensionC))
|
||||
{
|
||||
doc->LiteParseTree(Document::FullLiteParse);
|
||||
StoreDimensions();
|
||||
emit sceneDetails->DimensionsChanged();
|
||||
}
|
||||
else
|
||||
|
|
|
@ -413,6 +413,8 @@ private:
|
|||
|
||||
QVector<qreal> DimensionRestrictedValues(int index, const MeasurementDimension_p &dimension);
|
||||
void SetDimensionBases();
|
||||
|
||||
void StoreDimensions();
|
||||
};
|
||||
|
||||
#endif // MAINWINDOW_H
|
||||
|
|
Loading…
Reference in New Issue
Block a user