From 8a6ed9e42680a3041ebfd0afa7e9275ee12b961c Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Thu, 9 Mar 2017 15:52:41 +0200 Subject: [PATCH 1/6] Fixed typo. --HG-- branch : develop --- src/libs/vmisc/debugbreak.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/vmisc/debugbreak.h b/src/libs/vmisc/debugbreak.h index eba63febe..36cdd69e0 100644 --- a/src/libs/vmisc/debugbreak.h +++ b/src/libs/vmisc/debugbreak.h @@ -110,7 +110,7 @@ __inline__ static void debug_break(void) #if defined(_WIN32) || defined(_WIN64) /* SIGTRAP available only on POSIX-compliant operating systems * use builtin trap instead */ - HAVE_TRAP_INSTRUCTIO ? trap_instruction() : __builtin_trap(); + HAVE_TRAP_INSTRUCTION ? trap_instruction() : __builtin_trap(); #else if (HAVE_TRAP_INSTRUCTION) { From 506ca0612c3469ab64589e5f315a58ca8c129add Mon Sep 17 00:00:00 2001 From: Murloc Date: Thu, 9 Mar 2017 21:41:48 +0100 Subject: [PATCH 2/6] Add 200 in heights --HG-- branch : feature --- ChangeLog.txt | 1 + src/app/valentina/dialogs/dialogpatternproperties.cpp | 4 +++- src/app/valentina/dialogs/dialogpatternproperties.ui | 10 ++++++++++ src/libs/ifc/xml/vabstractpattern.cpp | 5 +++++ src/libs/ifc/xml/vabstractpattern.h | 1 + src/libs/vmisc/def.h | 2 +- src/libs/vpatterndb/variables/vmeasurement.cpp | 2 +- 7 files changed, 22 insertions(+), 3 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 7cb5477de..788da933b 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,4 +1,5 @@ # Version 0.5.0 +- Add 200 in heights - [#581] User can now filter input lists by keyword in function wizard. - [#24] User can now add labels with different information on the detail - [#505] New installer script based on Inno Setup 5. diff --git a/src/app/valentina/dialogs/dialogpatternproperties.cpp b/src/app/valentina/dialogs/dialogpatternproperties.cpp index 32317f765..5392f45af 100644 --- a/src/app/valentina/dialogs/dialogpatternproperties.cpp +++ b/src/app/valentina/dialogs/dialogpatternproperties.cpp @@ -38,7 +38,7 @@ #include "../core/vapplication.h" // calc how many combinations we have -static const int heightsCount = (static_cast(GHeights::H194) - +static const int heightsCount = (static_cast(GHeights::H200) - (static_cast(GHeights::H50) - heightStep))/heightStep; static const int sizesCount = (static_cast(GSizes::S72) - (static_cast(GSizes::S22) - sizeStep))/sizeStep; @@ -469,6 +469,7 @@ void DialogPatternProperties::SetHeightsChecked(bool enabled) ui->checkBoxH182->setChecked(enabled); ui->checkBoxH188->setChecked(enabled); ui->checkBoxH194->setChecked(enabled); + ui->checkBoxH200->setChecked(enabled); } //--------------------------------------------------------------------------------------------------------------------- @@ -532,6 +533,7 @@ void DialogPatternProperties::InitHeights() Init(ui->checkBoxH182, static_cast(GHeights::H182), &DialogPatternProperties::CheckStateHeight); Init(ui->checkBoxH188, static_cast(GHeights::H188), &DialogPatternProperties::CheckStateHeight); Init(ui->checkBoxH194, static_cast(GHeights::H194), &DialogPatternProperties::CheckStateHeight); + Init(ui->checkBoxH200, static_cast(GHeights::H200), &DialogPatternProperties::CheckStateHeight); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/valentina/dialogs/dialogpatternproperties.ui b/src/app/valentina/dialogs/dialogpatternproperties.ui index 173d4e34e..6af2721d1 100644 --- a/src/app/valentina/dialogs/dialogpatternproperties.ui +++ b/src/app/valentina/dialogs/dialogpatternproperties.ui @@ -722,6 +722,16 @@ + + + + 200 + + + true + + + diff --git a/src/libs/ifc/xml/vabstractpattern.cpp b/src/libs/ifc/xml/vabstractpattern.cpp index 64abed537..8e714f415 100644 --- a/src/libs/ifc/xml/vabstractpattern.cpp +++ b/src/libs/ifc/xml/vabstractpattern.cpp @@ -143,6 +143,7 @@ const QString VAbstractPattern::AttrH176 = QStringLiteral("h176"); const QString VAbstractPattern::AttrH182 = QStringLiteral("h182"); const QString VAbstractPattern::AttrH188 = QStringLiteral("h188"); const QString VAbstractPattern::AttrH194 = QStringLiteral("h194"); +const QString VAbstractPattern::AttrH200 = QStringLiteral("h200"); const QString VAbstractPattern::AttrS22 = QStringLiteral("s22"); const QString VAbstractPattern::AttrS24 = QStringLiteral("s24"); @@ -862,6 +863,7 @@ QMap VAbstractPattern::GetGradationHeights() const map.insert(GHeights::H182, true); map.insert(GHeights::H188, true); map.insert(GHeights::H194, true); + map.insert(GHeights::H200, true); QDomNodeList tags = elementsByTagName(TagGradation); if (tags.size() == 0) @@ -916,6 +918,7 @@ QMap VAbstractPattern::GetGradationHeights() const map.insert(GHeights::H182, GetParametrBool(domElement, AttrH182, defValue)); map.insert(GHeights::H188, GetParametrBool(domElement, AttrH188, defValue)); map.insert(GHeights::H194, GetParametrBool(domElement, AttrH194, defValue)); + map.insert(GHeights::H200, GetParametrBool(domElement, AttrH200, defValue)); return map; break; case 1: // TagSizes @@ -981,6 +984,7 @@ void VAbstractPattern::SetGradationHeights(const QMap &options) domElement.removeAttribute(AttrH182); domElement.removeAttribute(AttrH188); domElement.removeAttribute(AttrH194); + domElement.removeAttribute(AttrH200); } else { @@ -1009,6 +1013,7 @@ void VAbstractPattern::SetGradationHeights(const QMap &options) SetAttribute(domElement, AttrH182, options.value(GHeights::H182)); SetAttribute(domElement, AttrH188, options.value(GHeights::H188)); SetAttribute(domElement, AttrH194, options.value(GHeights::H194)); + SetAttribute(domElement, AttrH200, options.value(GHeights::H200)); } modified = true; diff --git a/src/libs/ifc/xml/vabstractpattern.h b/src/libs/ifc/xml/vabstractpattern.h index 3e221ab73..bdc11de53 100644 --- a/src/libs/ifc/xml/vabstractpattern.h +++ b/src/libs/ifc/xml/vabstractpattern.h @@ -253,6 +253,7 @@ public: static const QString AttrH182; static const QString AttrH188; static const QString AttrH194; + static const QString AttrH200; static const QString AttrS22; static const QString AttrS24; diff --git a/src/libs/vmisc/def.h b/src/libs/vmisc/def.h index 74afc98f8..c8149b503 100644 --- a/src/libs/vmisc/def.h +++ b/src/libs/vmisc/def.h @@ -211,7 +211,7 @@ enum class GHeights : unsigned char { ALL, H50=50, H56=56, H62=62, H68=68, H74=74, H80=80, H86=86, H92=92, H98=98, H104=104, H110=110, H116=116, H122=122, H128=128, H134=134, H140=140, H146=146, H152=152, H158=158, H164=164, H170=170, H176=176, H182=182, H188=188, - H194=194}; + H194=194, H200=200}; static const int sizeStep = 2; enum class GSizes : unsigned char { ALL, diff --git a/src/libs/vpatterndb/variables/vmeasurement.cpp b/src/libs/vpatterndb/variables/vmeasurement.cpp index 52a5cd874..d5e224a6e 100644 --- a/src/libs/vpatterndb/variables/vmeasurement.cpp +++ b/src/libs/vpatterndb/variables/vmeasurement.cpp @@ -158,7 +158,7 @@ QStringList VMeasurement::WholeListHeights(Unit patternUnit) return list; } - for (int i = static_cast(GHeights::H50); i<= static_cast(GHeights::H194); i = i+heightStep) + for (int i = static_cast(GHeights::H50); i<= static_cast(GHeights::H200); i = i+heightStep) { ListValue(list, i, patternUnit); } From 3e1cde0719a852eb9364be5dabc652d487303619 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 10 Mar 2017 11:22:15 +0200 Subject: [PATCH 3/6] Updated file format version. --HG-- branch : feature --- ChangeLog.txt | 1 - src/libs/ifc/schema.qrc | 1 + src/libs/ifc/schema/pattern/v0.4.3.xsd | 871 +++++++++++++++++++++++++ src/libs/ifc/xml/vpatternconverter.cpp | 23 +- src/libs/ifc/xml/vpatternconverter.h | 4 +- 5 files changed, 894 insertions(+), 6 deletions(-) create mode 100644 src/libs/ifc/schema/pattern/v0.4.3.xsd diff --git a/ChangeLog.txt b/ChangeLog.txt index 788da933b..7cb5477de 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,5 +1,4 @@ # Version 0.5.0 -- Add 200 in heights - [#581] User can now filter input lists by keyword in function wizard. - [#24] User can now add labels with different information on the detail - [#505] New installer script based on Inno Setup 5. diff --git a/src/libs/ifc/schema.qrc b/src/libs/ifc/schema.qrc index 95b4fe6f2..1056de83e 100644 --- a/src/libs/ifc/schema.qrc +++ b/src/libs/ifc/schema.qrc @@ -26,6 +26,7 @@ schema/pattern/v0.4.0.xsd schema/pattern/v0.4.1.xsd schema/pattern/v0.4.2.xsd + schema/pattern/v0.4.3.xsd schema/standard_measurements/v0.3.0.xsd schema/standard_measurements/v0.4.0.xsd schema/standard_measurements/v0.4.1.xsd diff --git a/src/libs/ifc/schema/pattern/v0.4.3.xsd b/src/libs/ifc/schema/pattern/v0.4.3.xsd new file mode 100644 index 000000000..f671f2b8a --- /dev/null +++ b/src/libs/ifc/schema/pattern/v0.4.3.xsd @@ -0,0 +1,871 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/libs/ifc/xml/vpatternconverter.cpp b/src/libs/ifc/xml/vpatternconverter.cpp index 4b8f40465..64fc3c4e6 100644 --- a/src/libs/ifc/xml/vpatternconverter.cpp +++ b/src/libs/ifc/xml/vpatternconverter.cpp @@ -58,8 +58,8 @@ class QDomElement; */ const QString VPatternConverter::PatternMinVerStr = QStringLiteral("0.1.0"); -const QString VPatternConverter::PatternMaxVerStr = QStringLiteral("0.4.2"); -const QString VPatternConverter::CurrentSchema = QStringLiteral("://schema/pattern/v0.4.2.xsd"); +const QString VPatternConverter::PatternMaxVerStr = QStringLiteral("0.4.3"); +const QString VPatternConverter::CurrentSchema = QStringLiteral("://schema/pattern/v0.4.3.xsd"); //VPatternConverter::PatternMinVer; // <== DON'T FORGET TO UPDATE TOO!!!! //VPatternConverter::PatternMaxVer; // <== DON'T FORGET TO UPDATE TOO!!!! @@ -202,6 +202,8 @@ QString VPatternConverter::XSDSchema(int ver) const case (0x000401): return QStringLiteral("://schema/pattern/v0.4.1.xsd"); case (0x000402): + return QStringLiteral("://schema/pattern/v0.4.2.xsd"); + case (0x000403): return CurrentSchema; default: InvalidVersion(ver); @@ -315,6 +317,10 @@ void VPatternConverter::ApplyPatches() ValidateXML(XSDSchema(0x000402), m_convertedFileName); V_FALLTHROUGH case (0x000402): + ToV0_4_3(); + ValidateXML(XSDSchema(0x000403), m_convertedFileName); + V_FALLTHROUGH + case (0x000403): break; default: InvalidVersion(m_ver); @@ -333,7 +339,7 @@ void VPatternConverter::DowngradeToCurrentMaxVersion() bool VPatternConverter::IsReadOnly() const { // Check if attribute readOnly was not changed in file format - Q_STATIC_ASSERT_X(VPatternConverter::PatternMaxVer == CONVERTER_VERSION_CHECK(0, 4, 2), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMaxVer == CONVERTER_VERSION_CHECK(0, 4, 3), "Check attribute readOnly."); // Possibly in future attribute readOnly will change position etc. @@ -638,6 +644,17 @@ void VPatternConverter::ToV0_4_2() Save(); } +//--------------------------------------------------------------------------------------------------------------------- +void VPatternConverter::ToV0_4_3() +{ + // TODO. Delete if minimal supported version is 0.4.3 + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < CONVERTER_VERSION_CHECK(0, 4, 3), + "Time to refactor the code."); + + SetVersion(QStringLiteral("0.4.3")); + Save(); +} + //--------------------------------------------------------------------------------------------------------------------- void VPatternConverter::TagUnitToV0_2_0() { diff --git a/src/libs/ifc/xml/vpatternconverter.h b/src/libs/ifc/xml/vpatternconverter.h index 82636f2b5..649acd5e8 100644 --- a/src/libs/ifc/xml/vpatternconverter.h +++ b/src/libs/ifc/xml/vpatternconverter.h @@ -55,10 +55,10 @@ public: // GCC 4.6 doesn't allow constexpr and const together #if !defined(__INTEL_COMPILER) && !defined(__clang__) && defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) <= 406 static Q_DECL_CONSTEXPR int PatternMinVer = CONVERTER_VERSION_CHECK(0, 1, 0); - static Q_DECL_CONSTEXPR int PatternMaxVer = CONVERTER_VERSION_CHECK(0, 4, 2); + static Q_DECL_CONSTEXPR int PatternMaxVer = CONVERTER_VERSION_CHECK(0, 4, 3); #else static Q_DECL_CONSTEXPR const int PatternMinVer = CONVERTER_VERSION_CHECK(0, 1, 0); - static Q_DECL_CONSTEXPR const int PatternMaxVer = CONVERTER_VERSION_CHECK(0, 4, 2); + static Q_DECL_CONSTEXPR const int PatternMaxVer = CONVERTER_VERSION_CHECK(0, 4, 3); #endif protected: From 77a3845374b005803f9b28c257981ab745d2798b Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 10 Mar 2017 11:39:20 +0200 Subject: [PATCH 4/6] Updated multisize file format version. --HG-- branch : feature --- src/libs/ifc/schema.qrc | 1 + .../schema/standard_measurements/v0.4.4.xsd | 178 ++++++++++++++++++ src/libs/ifc/xml/vpatternconverter.h | 1 + src/libs/ifc/xml/vvstconverter.cpp | 23 ++- src/libs/ifc/xml/vvstconverter.h | 5 +- 5 files changed, 203 insertions(+), 5 deletions(-) create mode 100644 src/libs/ifc/schema/standard_measurements/v0.4.4.xsd diff --git a/src/libs/ifc/schema.qrc b/src/libs/ifc/schema.qrc index 1056de83e..12129b994 100644 --- a/src/libs/ifc/schema.qrc +++ b/src/libs/ifc/schema.qrc @@ -32,6 +32,7 @@ schema/standard_measurements/v0.4.1.xsd schema/standard_measurements/v0.4.2.xsd schema/standard_measurements/v0.4.3.xsd + schema/standard_measurements/v0.4.4.xsd schema/individual_measurements/v0.2.0.xsd schema/individual_measurements/v0.3.0.xsd schema/individual_measurements/v0.3.1.xsd diff --git a/src/libs/ifc/schema/standard_measurements/v0.4.4.xsd b/src/libs/ifc/schema/standard_measurements/v0.4.4.xsd new file mode 100644 index 000000000..48b01bf06 --- /dev/null +++ b/src/libs/ifc/schema/standard_measurements/v0.4.4.xsd @@ -0,0 +1,178 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/libs/ifc/xml/vpatternconverter.h b/src/libs/ifc/xml/vpatternconverter.h index 649acd5e8..73310c676 100644 --- a/src/libs/ifc/xml/vpatternconverter.h +++ b/src/libs/ifc/xml/vpatternconverter.h @@ -103,6 +103,7 @@ private: void ToV0_4_0(); void ToV0_4_1(); void ToV0_4_2(); + void ToV0_4_3(); void TagUnitToV0_2_0(); void TagIncrementToV0_2_0(); diff --git a/src/libs/ifc/xml/vvstconverter.cpp b/src/libs/ifc/xml/vvstconverter.cpp index 7d66e5492..a23a21280 100644 --- a/src/libs/ifc/xml/vvstconverter.cpp +++ b/src/libs/ifc/xml/vvstconverter.cpp @@ -54,8 +54,8 @@ */ const QString VVSTConverter::MeasurementMinVerStr = QStringLiteral("0.3.0"); -const QString VVSTConverter::MeasurementMaxVerStr = QStringLiteral("0.4.3"); -const QString VVSTConverter::CurrentSchema = QStringLiteral("://schema/standard_measurements/v0.4.3.xsd"); +const QString VVSTConverter::MeasurementMaxVerStr = QStringLiteral("0.4.4"); +const QString VVSTConverter::CurrentSchema = QStringLiteral("://schema/standard_measurements/v0.4.4.xsd"); //VVSTConverter::MeasurementMinVer; // <== DON'T FORGET TO UPDATE TOO!!!! //VVSTConverter::MeasurementMaxVer; // <== DON'T FORGET TO UPDATE TOO!!!! @@ -87,6 +87,8 @@ QString VVSTConverter::XSDSchema(int ver) const case (0x000402): return QStringLiteral("://schema/standard_measurements/v0.4.2.xsd"); case (0x000403): + return QStringLiteral("://schema/standard_measurements/v0.4.3.xsd"); + case (0x000404): return CurrentSchema; default: InvalidVersion(ver); @@ -116,6 +118,10 @@ void VVSTConverter::ApplyPatches() ValidateXML(XSDSchema(0x000403), m_convertedFileName); V_FALLTHROUGH case (0x000403): + ToV0_4_4(); + ValidateXML(XSDSchema(0x000404), m_convertedFileName); + V_FALLTHROUGH + case (0x000404): break; default: InvalidVersion(m_ver); @@ -134,7 +140,7 @@ void VVSTConverter::DowngradeToCurrentMaxVersion() bool VVSTConverter::IsReadOnly() const { // Check if attribute read-only was not changed in file format - Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMaxVer == CONVERTER_VERSION_CHECK(0, 4, 3), + Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMaxVer == CONVERTER_VERSION_CHECK(0, 4, 4), "Check attribute read-only."); // Possibly in future attribute read-only will change position etc. @@ -363,3 +369,14 @@ void VVSTConverter::ToV0_4_3() SetVersion(QStringLiteral("0.4.3")); Save(); } + +//--------------------------------------------------------------------------------------------------------------------- +void VVSTConverter::ToV0_4_4() +{ + // TODO. Delete if minimal supported version is 0.4.4 + Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < CONVERTER_VERSION_CHECK(0, 4, 4), + "Time to refactor the code."); + + SetVersion(QStringLiteral("0.4.4")); + Save(); +} diff --git a/src/libs/ifc/xml/vvstconverter.h b/src/libs/ifc/xml/vvstconverter.h index 15872915f..5d20be30d 100644 --- a/src/libs/ifc/xml/vvstconverter.h +++ b/src/libs/ifc/xml/vvstconverter.h @@ -51,10 +51,10 @@ public: // GCC 4.6 doesn't allow constexpr and const together #if !defined(__INTEL_COMPILER) && !defined(__clang__) && defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) <= 406 static Q_DECL_CONSTEXPR int MeasurementMinVer = CONVERTER_VERSION_CHECK(0, 3, 0); - static Q_DECL_CONSTEXPR int MeasurementMaxVer = CONVERTER_VERSION_CHECK(0, 4, 3); + static Q_DECL_CONSTEXPR int MeasurementMaxVer = CONVERTER_VERSION_CHECK(0, 4, 4); #else static Q_DECL_CONSTEXPR const int MeasurementMinVer = CONVERTER_VERSION_CHECK(0, 3, 0); - static Q_DECL_CONSTEXPR const int MeasurementMaxVer = CONVERTER_VERSION_CHECK(0, 4, 3); + static Q_DECL_CONSTEXPR const int MeasurementMaxVer = CONVERTER_VERSION_CHECK(0, 4, 4); #endif protected: @@ -84,6 +84,7 @@ private: void ToV0_4_1(); void ToV0_4_2(); void ToV0_4_3(); + void ToV0_4_4(); }; //--------------------------------------------------------------------------------------------------------------------- From 11a2302b94a7a86d19d4f7c993f7ddc1803e3611 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 10 Mar 2017 11:39:28 +0200 Subject: [PATCH 5/6] Code style. --HG-- branch : feature --- src/app/valentina/dialogs/dialogpatternproperties.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/valentina/dialogs/dialogpatternproperties.cpp b/src/app/valentina/dialogs/dialogpatternproperties.cpp index 5392f45af..a5aa27e79 100644 --- a/src/app/valentina/dialogs/dialogpatternproperties.cpp +++ b/src/app/valentina/dialogs/dialogpatternproperties.cpp @@ -39,7 +39,7 @@ // calc how many combinations we have static const int heightsCount = (static_cast(GHeights::H200) - - (static_cast(GHeights::H50) - heightStep))/heightStep; + (static_cast(GHeights::H50) - heightStep))/heightStep; static const int sizesCount = (static_cast(GSizes::S72) - (static_cast(GSizes::S22) - sizeStep))/sizeStep; //--------------------------------------------------------------------------------------------------------------------- From 14732da2a5a9bbe2a64eb9d8e5723bc6caf784ef Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 10 Mar 2017 11:44:55 +0200 Subject: [PATCH 6/6] Updated man pages. --HG-- branch : feature --- dist/OBS_debian/debian.tape.1 | 4 ++-- dist/OBS_debian/debian.valentina.1 | 4 ++-- dist/debian/tape.1 | 4 ++-- dist/debian/valentina.1 | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dist/OBS_debian/debian.tape.1 b/dist/OBS_debian/debian.tape.1 index a3eccfd7b..703b309f5 100644 --- a/dist/OBS_debian/debian.tape.1 +++ b/dist/OBS_debian/debian.tape.1 @@ -1,6 +1,6 @@ .\" Manpage for tape. .\" Contact dismine@gmail.com to correct errors. -.TH tape 1 "21 October, 2015" "tape man page" +.TH tape 1 "10 March, 2017" "tape man page" .SH NAME Tape \- Valentina's measurements editor. .SH SYNOPSIS @@ -21,7 +21,7 @@ Displays this help. .IP "-v, --version" Displays version information. .IP "-e, --height " -Open with the base height. Valid values: 92, 98, 104, 110, 116, 122, 128, 134, 140, 146, 152, 158, 164, 170, 176, 182, 188, 194cm. +Open with the base height. Valid values: 92, 98, 104, 110, 116, 122, 128, 134, 140, 146, 152, 158, 164, 170, 176, 182, 188, 194, 200cm. .IP "-s, --size " Open with the base size. Valid values: 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56cm. .IP "-u, --unit " diff --git a/dist/OBS_debian/debian.valentina.1 b/dist/OBS_debian/debian.valentina.1 index 0057404f3..2af6450c7 100644 --- a/dist/OBS_debian/debian.valentina.1 +++ b/dist/OBS_debian/debian.valentina.1 @@ -1,6 +1,6 @@ .\" Manpage for valentina. .\" Contact dismine@gmail.com to correct errors. -.TH valentina 1 "21 October, 2015" "valentina man page" +.TH valentina 1 "10 March, 2017" "valentina man page" .SH NAME Valentina \- Pattern making program. .SH SYNOPSIS @@ -49,7 +49,7 @@ The path to output destination folder. By default the directory at which the app .IP "-x, --gsize " .RB "Set size value a pattern file, that was opened with standard measurements " "(export mode)" ". Valid values: 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56cm." .IP "-e, --gheight " -.RB "Set height value a pattern file, that was opened with standard measurements (" "export mode" "). Valid values: 92, 98, 104, 110, 116, 122, 128, 134, 140, 146, 152, 158, 164, 170, 176, 182, 188, 194cm." +.RB "Set height value a pattern file, that was opened with standard measurements (" "export mode" "). Valid values: 92, 98, 104, 110, 116, 122, 128, 134, 140, 146, 152, 158, 164, 170, 176, 182, 188, 194, 200cm." .IP "-p, --pageformat