From 6b695fac5717f92f37996f914fafb65d3e3a975d Mon Sep 17 00:00:00 2001 From: dismine Date: Wed, 28 May 2014 18:28:39 +0300 Subject: [PATCH] Fixed issue #84. --HG-- branch : develop --- .../resources/tables/standard/GOST_man_ru.vst | 254 +++++++++--------- src/app/xml/vstandardmeasurements.cpp | 8 +- src/app/xml/vstandardmeasurements.h | 2 +- 3 files changed, 132 insertions(+), 132 deletions(-) diff --git a/src/app/share/resources/tables/standard/GOST_man_ru.vst b/src/app/share/resources/tables/standard/GOST_man_ru.vst index 0240a7df5..0174079d7 100644 --- a/src/app/share/resources/tables/standard/GOST_man_ru.vst +++ b/src/app/share/resources/tables/standard/GOST_man_ru.vst @@ -7,147 +7,147 @@ - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - + + + - - - - - - - + + + + + + + - - + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/app/xml/vstandardmeasurements.cpp b/src/app/xml/vstandardmeasurements.cpp index 5c82c89fa..1af4aa15a 100644 --- a/src/app/xml/vstandardmeasurements.cpp +++ b/src/app/xml/vstandardmeasurements.cpp @@ -34,7 +34,7 @@ const QString VStandardMeasurements::TagDescription = QStringLiteral("descr const QString VStandardMeasurements::TagSize = QStringLiteral("size"); const QString VStandardMeasurements::TagHeight = QStringLiteral("height"); const QString VStandardMeasurements::AttrValue = QStringLiteral("value"); -const QString VStandardMeasurements::AttrSize_increace = QStringLiteral("size_increace"); +const QString VStandardMeasurements::AttrSize_increase = QStringLiteral("size_increase"); const QString VStandardMeasurements::AttrHeight_increase = QStringLiteral("height_increase"); //--------------------------------------------------------------------------------------------------------------------- @@ -217,17 +217,17 @@ void VStandardMeasurements::Measurement(const QString &tag) if (domElement.isNull() == false) { const qreal value = GetParametrDouble(domElement, AttrValue, "0.0"); - const qreal size_increace = GetParametrDouble(domElement, AttrSize_increace, "0.0"); + const qreal size_increase = GetParametrDouble(domElement, AttrSize_increase, "0.0"); const qreal height_increase = GetParametrDouble(domElement, AttrHeight_increase, "0.0"); if (Unit() == Valentina::Mm)// Convert to Cm. { - data->AddMeasurement(tag, VMeasurement(value/10.0, size_increace/10.0, height_increase/10.0, + data->AddMeasurement(tag, VMeasurement(value/10.0, size_increase/10.0, height_increase/10.0, qApp->GuiText(tag), qApp->Description(tag), tag)); } else// Cm or inch. { - data->AddMeasurement(tag, VMeasurement(value, size_increace, height_increase, qApp->GuiText(tag), + data->AddMeasurement(tag, VMeasurement(value, size_increase, height_increase, qApp->GuiText(tag), qApp->Description(tag), tag)); } } diff --git a/src/app/xml/vstandardmeasurements.h b/src/app/xml/vstandardmeasurements.h index a970f46c4..5b2b89c18 100644 --- a/src/app/xml/vstandardmeasurements.h +++ b/src/app/xml/vstandardmeasurements.h @@ -53,7 +53,7 @@ public: static const QString TagSize; static const QString TagHeight; static const QString AttrValue; - static const QString AttrSize_increace; + static const QString AttrSize_increase; static const QString AttrHeight_increase; private: void Measurement(const QString &tag);