mirror of
https://gitlab.com/smart-pattern/valentina.git
synced 2024-07-01 08:38:15 +02:00
Merge with develop.
--HG-- branch : feature
This commit is contained in:
Roman Telezhynskyi
commit
fa50c1f4f7
4
dist/OBS_debian/debian.tape.1
vendored
4
dist/OBS_debian/debian.tape.1
vendored
|
|
@ -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 <The base 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 <The base 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 <The pattern unit>"
|
||||
|
|
|
|||
4
dist/OBS_debian/debian.valentina.1
vendored
4
dist/OBS_debian/debian.valentina.1
vendored
|
|
@ -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 <The size value>"
|
||||
.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 <The height value>"
|
||||
.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 <Template number>"
|
||||
.RB "Number corresponding to page template (default = 0, " "export mode" "):"
|
||||
.RS
|
||||
|
|
|
|||
4
dist/debian/tape.1
vendored
4
dist/debian/tape.1
vendored
|
|
@ -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 <The base 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 <The base 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 <The pattern unit>"
|
||||
|
|
|
|||
4
dist/debian/valentina.1
vendored
4
dist/debian/valentina.1
vendored
|
|
@ -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 <The size value>"
|
||||
.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 <The height value>"
|
||||
.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 <Template number>"
|
||||
.RB "Number corresponding to page template (default = 0, " "export mode" "):"
|
||||
.RS
|
||||
|
|
|
|||
|
|
@ -38,8 +38,8 @@
|
|||
#include "../core/vapplication.h"
|
||||
|
||||
// calc how many combinations we have
|
||||
static const int heightsCount = (static_cast<int>(GHeights::H194) -
|
||||
(static_cast<int>(GHeights::H50) - heightStep))/heightStep;
|
||||
static const int heightsCount = (static_cast<int>(GHeights::H200) -
|
||||
(static_cast<int>(GHeights::H50) - heightStep))/heightStep;
|
||||
static const int sizesCount = (static_cast<int>(GSizes::S72) - (static_cast<int>(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<int>(GHeights::H182), &DialogPatternProperties::CheckStateHeight);
|
||||
Init(ui->checkBoxH188, static_cast<int>(GHeights::H188), &DialogPatternProperties::CheckStateHeight);
|
||||
Init(ui->checkBoxH194, static_cast<int>(GHeights::H194), &DialogPatternProperties::CheckStateHeight);
|
||||
Init(ui->checkBoxH200, static_cast<int>(GHeights::H200), &DialogPatternProperties::CheckStateHeight);
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -722,6 +722,16 @@
|
|||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="7" column="2">
|
||||
<widget class="QCheckBox" name="checkBoxH200">
|
||||
<property name="text">
|
||||
<string>200</string>
|
||||
</property>
|
||||
<property name="checked">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@
|
|||
<file>schema/standard_measurements/v0.4.1.xsd</file>
|
||||
<file>schema/standard_measurements/v0.4.2.xsd</file>
|
||||
<file>schema/standard_measurements/v0.4.3.xsd</file>
|
||||
<file>schema/standard_measurements/v0.4.4.xsd</file>
|
||||
<file>schema/individual_measurements/v0.2.0.xsd</file>
|
||||
<file>schema/individual_measurements/v0.3.0.xsd</file>
|
||||
<file>schema/individual_measurements/v0.3.1.xsd</file>
|
||||
|
|
|
|||
|
|
@ -49,6 +49,7 @@
|
|||
<xs:attribute name="h182" type="xs:boolean"/>
|
||||
<xs:attribute name="h188" type="xs:boolean"/>
|
||||
<xs:attribute name="h194" type="xs:boolean"/>
|
||||
<xs:attribute name="h200" type="xs:boolean"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="sizes">
|
||||
|
|
@ -519,7 +520,6 @@
|
|||
<xs:attribute name="length" type="xs:string"/>
|
||||
<xs:attribute name="rotation" type="xs:string"/>
|
||||
<xs:attribute name="arrows" type="arrowType"/>
|
||||
<xs:attribute name="centerPin" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="topPin" type="xs:unsignedInt"/>
|
||||
<xs:attribute name="bottomPin" type="xs:unsignedInt"/>
|
||||
</xs:complexType>
|
||||
|
|
@ -699,6 +699,7 @@
|
|||
<xs:enumeration value="182"/>
|
||||
<xs:enumeration value="188"/>
|
||||
<xs:enumeration value="194"/>
|
||||
<xs:enumeration value="200"/>
|
||||
<xs:enumeration value="500"/>
|
||||
<xs:enumeration value="560"/>
|
||||
<xs:enumeration value="620"/>
|
||||
|
|
@ -724,6 +725,7 @@
|
|||
<xs:enumeration value="1820"/>
|
||||
<xs:enumeration value="1880"/>
|
||||
<xs:enumeration value="1940"/>
|
||||
<xs:enumeration value="2000"/>
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
<xs:simpleType name="baseSize">
|
||||
|
|
@ -746,6 +748,14 @@
|
|||
<xs:enumeration value="52"/>
|
||||
<xs:enumeration value="54"/>
|
||||
<xs:enumeration value="56"/>
|
||||
<xs:enumeration value="58"/>
|
||||
<xs:enumeration value="60"/>
|
||||
<xs:enumeration value="62"/>
|
||||
<xs:enumeration value="64"/>
|
||||
<xs:enumeration value="66"/>
|
||||
<xs:enumeration value="68"/>
|
||||
<xs:enumeration value="70"/>
|
||||
<xs:enumeration value="72"/>
|
||||
<xs:enumeration value="220"/>
|
||||
<xs:enumeration value="240"/>
|
||||
<xs:enumeration value="260"/>
|
||||
|
|
|
|||
178
src/libs/ifc/schema/standard_measurements/v0.4.4.xsd
Normal file
178
src/libs/ifc/schema/standard_measurements/v0.4.4.xsd
Normal file
|
|
@ -0,0 +1,178 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
|
||||
<xs:element name="vst">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="version" type="formatVersion"/>
|
||||
<xs:element name="read-only" type="xs:boolean"/>
|
||||
<xs:element name="notes" type="xs:string" minOccurs="0" maxOccurs="1"/>
|
||||
<xs:element name="unit" type="units"/>
|
||||
<xs:element name="pm_system" type="psCode"/>
|
||||
<xs:element name="size">
|
||||
<xs:complexType>
|
||||
<xs:attribute name="base" type="baseSize" use="required"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="height">
|
||||
<xs:complexType>
|
||||
<xs:attribute name="base" type="baseHeight" use="required"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="body-measurements">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="m" minOccurs="0" maxOccurs="unbounded">
|
||||
<xs:complexType>
|
||||
<xs:attribute name="name" type="shortName" use="required"/>
|
||||
<xs:attribute name="base" type="xs:double" use="required"/>
|
||||
<xs:attribute name="height_increase" type="xs:double" use="required"/>
|
||||
<xs:attribute name="size_increase" type="xs:double" use="required"/>
|
||||
<xs:attribute name="full_name" type="xs:string"/>
|
||||
<xs:attribute name="description" type="xs:string"/>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
<xs:unique name="measurementName">
|
||||
<xs:selector xpath="body-measurements/m"/>
|
||||
<xs:field xpath="@name"/>
|
||||
</xs:unique>
|
||||
</xs:element>
|
||||
<xs:simpleType name="shortName">
|
||||
<xs:restriction base="xs:string">
|
||||
<xs:pattern value="^([^\p{Nd}\p{Zs}*/&|!<>^\-()–+−=?:;'\"]){1,1}([^\p{Zs}*/&|!<>^\-()–+−=?:;\"]){0,}$"/>
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
<xs:simpleType name="units">
|
||||
<xs:restriction base="xs:string">
|
||||
<xs:enumeration value="mm"/>
|
||||
<xs:enumeration value="cm"/>
|
||||
<xs:enumeration value="inch"/>
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
<xs:simpleType name="formatVersion">
|
||||
<xs:restriction base="xs:string">
|
||||
<xs:pattern value="^(0|([1-9][0-9]*))\.(0|([1-9][0-9]*))\.(0|([1-9][0-9]*))$"/>
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
<xs:simpleType name="psCode">
|
||||
<xs:restriction base="xs:string">
|
||||
<xs:pattern value="^^(([0-9]|[1-4][0-9]|5[0-4])|998)$"/>
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
<xs:simpleType name="baseHeight">
|
||||
<xs:restriction base="xs:unsignedInt">
|
||||
<xs:enumeration value="50"/>
|
||||
<xs:enumeration value="56"/>
|
||||
<xs:enumeration value="62"/>
|
||||
<xs:enumeration value="68"/>
|
||||
<xs:enumeration value="74"/>
|
||||
<xs:enumeration value="80"/>
|
||||
<xs:enumeration value="86"/>
|
||||
<xs:enumeration value="92"/>
|
||||
<xs:enumeration value="98"/>
|
||||
<xs:enumeration value="104"/>
|
||||
<xs:enumeration value="110"/>
|
||||
<xs:enumeration value="116"/>
|
||||
<xs:enumeration value="122"/>
|
||||
<xs:enumeration value="128"/>
|
||||
<xs:enumeration value="134"/>
|
||||
<xs:enumeration value="140"/>
|
||||
<xs:enumeration value="146"/>
|
||||
<xs:enumeration value="152"/>
|
||||
<xs:enumeration value="158"/>
|
||||
<xs:enumeration value="164"/>
|
||||
<xs:enumeration value="170"/>
|
||||
<xs:enumeration value="176"/>
|
||||
<xs:enumeration value="182"/>
|
||||
<xs:enumeration value="188"/>
|
||||
<xs:enumeration value="194"/>
|
||||
<xs:enumeration value="200"/>
|
||||
<xs:enumeration value="500"/>
|
||||
<xs:enumeration value="560"/>
|
||||
<xs:enumeration value="620"/>
|
||||
<xs:enumeration value="680"/>
|
||||
<xs:enumeration value="740"/>
|
||||
<xs:enumeration value="800"/>
|
||||
<xs:enumeration value="860"/>
|
||||
<xs:enumeration value="920"/>
|
||||
<xs:enumeration value="980"/>
|
||||
<xs:enumeration value="1040"/>
|
||||
<xs:enumeration value="1100"/>
|
||||
<xs:enumeration value="1160"/>
|
||||
<xs:enumeration value="1220"/>
|
||||
<xs:enumeration value="1280"/>
|
||||
<xs:enumeration value="1340"/>
|
||||
<xs:enumeration value="1400"/>
|
||||
<xs:enumeration value="1460"/>
|
||||
<xs:enumeration value="1520"/>
|
||||
<xs:enumeration value="1580"/>
|
||||
<xs:enumeration value="1640"/>
|
||||
<xs:enumeration value="1700"/>
|
||||
<xs:enumeration value="1760"/>
|
||||
<xs:enumeration value="1820"/>
|
||||
<xs:enumeration value="1880"/>
|
||||
<xs:enumeration value="1940"/>
|
||||
<xs:enumeration value="2000"/>
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
<xs:simpleType name="baseSize">
|
||||
<xs:restriction base="xs:unsignedInt">
|
||||
<xs:enumeration value="22"/>
|
||||
<xs:enumeration value="24"/>
|
||||
<xs:enumeration value="26"/>
|
||||
<xs:enumeration value="28"/>
|
||||
<xs:enumeration value="30"/>
|
||||
<xs:enumeration value="32"/>
|
||||
<xs:enumeration value="34"/>
|
||||
<xs:enumeration value="36"/>
|
||||
<xs:enumeration value="38"/>
|
||||
<xs:enumeration value="40"/>
|
||||
<xs:enumeration value="42"/>
|
||||
<xs:enumeration value="44"/>
|
||||
<xs:enumeration value="46"/>
|
||||
<xs:enumeration value="48"/>
|
||||
<xs:enumeration value="50"/>
|
||||
<xs:enumeration value="52"/>
|
||||
<xs:enumeration value="54"/>
|
||||
<xs:enumeration value="56"/>
|
||||
<xs:enumeration value="58"/>
|
||||
<xs:enumeration value="60"/>
|
||||
<xs:enumeration value="62"/>
|
||||
<xs:enumeration value="64"/>
|
||||
<xs:enumeration value="66"/>
|
||||
<xs:enumeration value="68"/>
|
||||
<xs:enumeration value="70"/>
|
||||
<xs:enumeration value="72"/>
|
||||
<xs:enumeration value="220"/>
|
||||
<xs:enumeration value="240"/>
|
||||
<xs:enumeration value="260"/>
|
||||
<xs:enumeration value="280"/>
|
||||
<xs:enumeration value="300"/>
|
||||
<xs:enumeration value="320"/>
|
||||
<xs:enumeration value="340"/>
|
||||
<xs:enumeration value="360"/>
|
||||
<xs:enumeration value="380"/>
|
||||
<xs:enumeration value="400"/>
|
||||
<xs:enumeration value="420"/>
|
||||
<xs:enumeration value="440"/>
|
||||
<xs:enumeration value="460"/>
|
||||
<xs:enumeration value="480"/>
|
||||
<xs:enumeration value="500"/>
|
||||
<xs:enumeration value="520"/>
|
||||
<xs:enumeration value="540"/>
|
||||
<xs:enumeration value="560"/>
|
||||
<xs:enumeration value="580"/>
|
||||
<xs:enumeration value="600"/>
|
||||
<xs:enumeration value="620"/>
|
||||
<xs:enumeration value="640"/>
|
||||
<xs:enumeration value="660"/>
|
||||
<xs:enumeration value="680"/>
|
||||
<xs:enumeration value="700"/>
|
||||
<xs:enumeration value="720"/>
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
</xs:schema>
|
||||
|
|
@ -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<GHeights, bool> 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<GHeights, bool> 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<GHeights, bool> &options)
|
|||
domElement.removeAttribute(AttrH182);
|
||||
domElement.removeAttribute(AttrH188);
|
||||
domElement.removeAttribute(AttrH194);
|
||||
domElement.removeAttribute(AttrH200);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -1009,6 +1013,7 @@ void VAbstractPattern::SetGradationHeights(const QMap<GHeights, bool> &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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
};
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -158,7 +158,7 @@ QStringList VMeasurement::WholeListHeights(Unit patternUnit)
|
|||
return list;
|
||||
}
|
||||
|
||||
for (int i = static_cast<int>(GHeights::H50); i<= static_cast<int>(GHeights::H194); i = i+heightStep)
|
||||
for (int i = static_cast<int>(GHeights::H50); i<= static_cast<int>(GHeights::H200); i = i+heightStep)
|
||||
{
|
||||
ListValue(list, i, patternUnit);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue