Fixed issue #539. Infinite alert loop "Gradation doesn't support inches" when

loading standard table.
(grafted from 9e1dee53ca8fb5d116359f9aff4b62220a10bb39)

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2016-09-27 14:18:08 +03:00
parent 4bd615cda4
commit bf1e4aeb0c
2 changed files with 7 additions and 0 deletions

View File

@ -64,6 +64,7 @@
- Called the main app in console mode doesn't show opening file error in some cases. - Called the main app in console mode doesn't show opening file error in some cases.
- [#553] Tape.exe crash. Issue with the Search field. - [#553] Tape.exe crash. Issue with the Search field.
- [#569] Tape app. Options that open new file open new instance even if a user doesn't want this. - [#569] Tape app. Options that open new file open new instance even if a user doesn't want this.
- [#539] Infinite alert loop "Gradation doesn't support inches" when loading standard table.
# Version 0.4.4 April 12, 2016 # Version 0.4.4 April 12, 2016
- Updated measurement templates with all measurements. Added new template Aldrich/Women measurements. - Updated measurement templates with all measurements. Added new template Aldrich/Women measurements.

View File

@ -446,6 +446,12 @@ bool MainWindow::LoadMeasurements(const QString &path)
return false; return false;
} }
if (qApp->patternUnit() == Unit::Inch && m->Type() == MeasurementsType::Standard)
{
qWarning()<<tr("Gradation doesn't support inches");
return false;
}
if (m->Type() == MeasurementsType::Standard) if (m->Type() == MeasurementsType::Standard)
{ {
m->SetDataSize(); m->SetDataSize();