Fixed missing measurement head_girth -> head_circ in conversion.
--HG-- branch : develop
This commit is contained in:
parent
d104b8bd7e
commit
2b8fb91d17
|
@ -40,6 +40,7 @@
|
||||||
<m name="hand_length" base="128" description="" size_increase="2" height_increase="2" full_name=""/>
|
<m name="hand_length" base="128" description="" size_increase="2" height_increase="2" full_name=""/>
|
||||||
<m name="hand_palm_width" base="0" description="" size_increase="0" height_increase="0" full_name=""/>
|
<m name="hand_palm_width" base="0" description="" size_increase="0" height_increase="0" full_name=""/>
|
||||||
<m name="head_chin_to_neck_back" base="109" description="" size_increase="1" height_increase="0" full_name=""/>
|
<m name="head_chin_to_neck_back" base="109" description="" size_increase="1" height_increase="0" full_name=""/>
|
||||||
|
<m name="head_circ" base="576" description="" size_increase="4" height_increase="4" full_name=""/>
|
||||||
<m name="head_crown_to_neck_back" base="0" description="" size_increase="0" height_increase="0" full_name=""/>
|
<m name="head_crown_to_neck_back" base="0" description="" size_increase="0" height_increase="0" full_name=""/>
|
||||||
<m name="head_length" base="246" description="" size_increase="-2" height_increase="6" full_name=""/>
|
<m name="head_length" base="246" description="" size_increase="-2" height_increase="6" full_name=""/>
|
||||||
<m name="height_ankle" base="0" description="" size_increase="0" height_increase="0" full_name=""/>
|
<m name="height_ankle" base="0" description="" size_increase="0" height_increase="0" full_name=""/>
|
||||||
|
|
|
@ -52,6 +52,7 @@ void VAbstractMConverter::AddRootComment()
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
QMultiMap<QString, QString> VAbstractMConverter::OldNamesToNewNames_InV0_3_0()
|
QMultiMap<QString, QString> VAbstractMConverter::OldNamesToNewNames_InV0_3_0()
|
||||||
{
|
{
|
||||||
|
// new name, old name
|
||||||
QMultiMap<QString, QString> names;
|
QMultiMap<QString, QString> names;
|
||||||
|
|
||||||
// A02
|
// A02
|
||||||
|
@ -307,5 +308,7 @@ QMultiMap<QString, QString> VAbstractMConverter::OldNamesToNewNames_InV0_3_0()
|
||||||
// P12
|
// P12
|
||||||
names.insert(QStringLiteral("armscye_arc"), QStringLiteral("arc_through_shoulder_joint"));
|
names.insert(QStringLiteral("armscye_arc"), QStringLiteral("arc_through_shoulder_joint"));
|
||||||
|
|
||||||
|
names.insert(QStringLiteral("head_circ"), QStringLiteral("head_girth"));
|
||||||
|
|
||||||
return names;
|
return names;
|
||||||
}
|
}
|
||||||
|
|
|
@ -750,6 +750,7 @@ QStringList VPatternConverter::ListPathPointExpressionsV0_1_4() const
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
QMap<QString, QString> VPatternConverter::OldNamesToNewNames_InV0_2_0()
|
QMap<QString, QString> VPatternConverter::OldNamesToNewNames_InV0_2_0()
|
||||||
{
|
{
|
||||||
|
// old name, new name
|
||||||
QMap<QString, QString> names;
|
QMap<QString, QString> names;
|
||||||
|
|
||||||
// A02
|
// A02
|
||||||
|
@ -976,5 +977,7 @@ QMap<QString, QString> VPatternConverter::OldNamesToNewNames_InV0_2_0()
|
||||||
// P12
|
// P12
|
||||||
names.insert(QStringLiteral("arc_through_shoulder_joint"), QStringLiteral("armscye_arc"));
|
names.insert(QStringLiteral("arc_through_shoulder_joint"), QStringLiteral("armscye_arc"));
|
||||||
|
|
||||||
|
names.insert(QStringLiteral("head_girth"), QStringLiteral("head_circ"));
|
||||||
|
|
||||||
return names;
|
return names;
|
||||||
}
|
}
|
||||||
|
|
|
@ -647,6 +647,13 @@ QStringList VMeasurements::ListKnown() const
|
||||||
bool VMeasurements::IsDefinedKnownNamesValid() const
|
bool VMeasurements::IsDefinedKnownNamesValid() const
|
||||||
{
|
{
|
||||||
QStringList names = AllGroupNames();
|
QStringList names = AllGroupNames();
|
||||||
|
|
||||||
|
if (type == MeasurementsType::Standard)
|
||||||
|
{
|
||||||
|
names.append(size_M);
|
||||||
|
names.append(height_M);
|
||||||
|
}
|
||||||
|
|
||||||
QSet<QString> set;
|
QSet<QString> set;
|
||||||
foreach (const QString &var, names)
|
foreach (const QString &var, names)
|
||||||
{
|
{
|
||||||
|
|
|
@ -964,9 +964,7 @@ QStringList AllGroupNames()
|
||||||
<< ListGroupN()
|
<< ListGroupN()
|
||||||
<< ListGroupO()
|
<< ListGroupO()
|
||||||
<< ListGroupP()
|
<< ListGroupP()
|
||||||
<< ListGroupQ()
|
<< ListGroupQ();
|
||||||
<< size_M
|
|
||||||
<< height_M;
|
|
||||||
|
|
||||||
return originalNames;
|
return originalNames;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user