aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

shoulder_width_b -> shoulder_tip_to_shoulder_tip_b

Browse Source 
--HG--
branch : feature
This commit is contained in:
Roman Telezhynskyi 2015-09-20 13:58:26 +03:00
parent 5a66e753e9
commit 7d72d2d579
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/ifc/xml/vabstractmconverter.cpp
View File

@ -186,8 +186,8 @@ QMultiMap<QString, QString> VAbstractMConverter::OldNamesToNewNames_InV0_3_0()
names.insert(QStringLiteral("armfold_to_armfold_f"), QStringLiteral("chest_width")); names.insert(QStringLiteral("armfold_to_armfold_f"), QStringLiteral("chest_width"));
names.insert(QStringLiteral("armfold_to_armfold_f"), QStringLiteral("front_chest_width")); names.insert(QStringLiteral("armfold_to_armfold_f"), QStringLiteral("front_chest_width"));
// F05 // F05
names.insert(QStringLiteral("shoulder_width_b"), QStringLiteral("arc_behind_shoulder_girdle")); names.insert(QStringLiteral("shoulder_tip_to_shoulder_tip_b"), QStringLiteral("arc_behind_shoulder_girdle"));
names.insert(QStringLiteral("shoulder_width_b"), QStringLiteral("across_back_shoulder_width")); names.insert(QStringLiteral("shoulder_tip_to_shoulder_tip_b"), QStringLiteral("across_back_shoulder_width"));
// F06 // F06
names.insert(QStringLiteral("across_back_b"), QStringLiteral("upper_back_width")); names.insert(QStringLiteral("across_back_b"), QStringLiteral("upper_back_width"));
// F07 // F07

4
src/libs/ifc/xml/vpatternconverter.cpp
View File

@ -882,8 +882,8 @@ QMap<QString, QString> VPatternConverter::OldNamesToNewNames_InV0_2_0()
names.insert(QStringLiteral("chest_width"), QStringLiteral("armfold_to_armfold_f")); names.insert(QStringLiteral("chest_width"), QStringLiteral("armfold_to_armfold_f"));
names.insert(QStringLiteral("front_chest_width"), QStringLiteral("armfold_to_armfold_f")); names.insert(QStringLiteral("front_chest_width"), QStringLiteral("armfold_to_armfold_f"));
// F05 // F05
names.insert(QStringLiteral("arc_behind_shoulder_girdle"), QStringLiteral("shoulder_width_b")); names.insert(QStringLiteral("arc_behind_shoulder_girdle"), QStringLiteral("shoulder_tip_to_shoulder_tip_b"));
names.insert(QStringLiteral("across_back_shoulder_width"), QStringLiteral("shoulder_width_b")); names.insert(QStringLiteral("across_back_shoulder_width"), QStringLiteral("shoulder_tip_to_shoulder_tip_b"));
// F06 // F06
names.insert(QStringLiteral("upper_back_width"), QStringLiteral("across_back_b")); names.insert(QStringLiteral("upper_back_width"), QStringLiteral("across_back_b"));
// F07 // F07

4
src/libs/vmisc/def.cpp
View File

@ -158,7 +158,7 @@ const QString shoulderLength_M = QStringLiteral("shoulder_length"
const QString shoulderWidthF_M = QStringLiteral("shoulder_width_f"); // F02 const QString shoulderWidthF_M = QStringLiteral("shoulder_width_f"); // F02
const QString acrossChestF_M = QStringLiteral("across_chest_f"); // F03 const QString acrossChestF_M = QStringLiteral("across_chest_f"); // F03
const QString armfoldToArmfoldF_M = QStringLiteral("armfold_to_armfold_f"); // F04 const QString armfoldToArmfoldF_M = QStringLiteral("armfold_to_armfold_f"); // F04
const QString shoulderWidthB_M = QStringLiteral("shoulder_width_b"); // F05 const QString shoulderTipToShoulderTipB_M = QStringLiteral("shoulder_tip_to_shoulder_tip_b"); // F05
const QString acrossBackB_M = QStringLiteral("across_back_b"); // F06 const QString acrossBackB_M = QStringLiteral("across_back_b"); // F06
const QString armfoldToArmfoldB_M = QStringLiteral("armfold_to_armfold_b"); // F07 const QString armfoldToArmfoldB_M = QStringLiteral("armfold_to_armfold_b"); // F07
const QString shoulderTipToShoulderTipHalfF_M = QStringLiteral("shoulder_tip_to_shoulder_tip_half_f"); // F08 const QString shoulderTipToShoulderTipHalfF_M = QStringLiteral("shoulder_tip_to_shoulder_tip_half_f"); // F08
@ -715,7 +715,7 @@ QStringList ListGroupF()
<< shoulderWidthF_M // F02 << shoulderWidthF_M // F02
<< acrossChestF_M // F03 << acrossChestF_M // F03
<< armfoldToArmfoldF_M // F04 << armfoldToArmfoldF_M // F04
<< shoulderWidthB_M // F05 << shoulderTipToShoulderTipB_M // F05
<< acrossBackB_M // F06 << acrossBackB_M // F06
<< armfoldToArmfoldB_M // F07 << armfoldToArmfoldB_M // F07
<< shoulderTipToShoulderTipHalfF_M // F08 << shoulderTipToShoulderTipHalfF_M // F08

2
src/libs/vmisc/def.h
View File

@ -316,7 +316,7 @@ extern const QString shoulderLength_M; // F01
extern const QString shoulderWidthF_M; // F02 extern const QString shoulderWidthF_M; // F02
extern const QString acrossChestF_M; // F03 extern const QString acrossChestF_M; // F03
extern const QString armfoldToArmfoldF_M; // F04 extern const QString armfoldToArmfoldF_M; // F04
extern const QString shoulderWidthB_M; // F05 extern const QString shoulderTipToShoulderTipB_M; // F05
extern const QString acrossBackB_M; // F06 extern const QString acrossBackB_M; // F06
extern const QString armfoldToArmfoldB_M; // F07 extern const QString armfoldToArmfoldB_M; // F07
extern const QString shoulderTipToShoulderTipHalfF_M; // F08 extern const QString shoulderTipToShoulderTipHalfF_M; // F08

4
src/libs/vpatterndb/vtranslatemeasurements.cpp
View File

@ -1046,12 +1046,12 @@ void VTranslateMeasurements::InitGroupF()
"not parallel to floor.", "Full measurement description."); "not parallel to floor.", "Full measurement description.");
InitMeasurement(armfoldToArmfoldF_M, m, g, d, "F04"); InitMeasurement(armfoldToArmfoldF_M, m, g, d, "F04");
//================================================================================================================= //=================================================================================================================
m = QmuTranslation::translate("Measurements", "shoulder_width_b", m = QmuTranslation::translate("Measurements", "shoulder_tip_to_shoulder_tip_b",
"Name in a formula. Don't use math symbols and space in name!!!!"); "Name in a formula. Don't use math symbols and space in name!!!!");
g = QmuTranslation::translate("Measurements", "Shoulder Width (back)", "Full measurement name."); g = QmuTranslation::translate("Measurements", "Shoulder Width (back)", "Full measurement name.");
d = QmuTranslation::translate("Measurements", "From Shoulder Tip to Shoulder Tip, curved around the back.", d = QmuTranslation::translate("Measurements", "From Shoulder Tip to Shoulder Tip, curved around the back.",
"Full measurement description."); "Full measurement description.");
InitMeasurement(shoulderWidthB_M, m, g, d, "F05"); InitMeasurement(shoulderTipToShoulderTipB_M, m, g, d, "F05");
//================================================================================================================= //=================================================================================================================
m = QmuTranslation::translate("Measurements", "across_back_b", m = QmuTranslation::translate("Measurements", "across_back_b",
"Name in a formula. Don't use math symbols and space in name!!!!"); "Name in a formula. Don't use math symbols and space in name!!!!");