From aea360d8de1d3d28b8f7a16738a7c95436e41fa8 Mon Sep 17 00:00:00 2001 From: dismine Date: Thu, 15 May 2014 12:47:08 +0300 Subject: [PATCH] Fixed Issue #151. --HG-- branch : feature --- src/app/options.cpp | 7 +++++-- src/app/options.h | 4 ++-- src/app/widgets/vapplication.cpp | 6 +++--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/app/options.cpp b/src/app/options.cpp index 564378961..789858892 100644 --- a/src/app/options.cpp +++ b/src/app/options.cpp @@ -28,6 +28,7 @@ #include "options.h" +//measurements const QString headGirth = QStringLiteral("head_girth"); const QString midNeckGirth = QStringLiteral("mid_neck_girth"); const QString neckBaseGirth = QStringLiteral("neck_base_girth"); @@ -63,8 +64,8 @@ const QString frontShoulderToWaistLength = QStringLiteral("front_shoulder_to_wa const QString backShoulderToWaistLength = QStringLiteral("back_shoulder_to_waist_length"); const QString frontNeckArc = QStringLiteral("front_neck_arc"); const QString backNeckArc = QStringLiteral("back_neck_arc"); -const QString frontUpperBustArc = QStringLiteral("front_upper_bust_arc"); -const QString backUpperBustArc = QStringLiteral("back_upper_bust_arc"); +const QString frontUpperChestArc = QStringLiteral("front_upper_chest_arc"); +const QString backUpperChestArc = QStringLiteral("back_upper_chest_arc"); const QString frontWaistArc = QStringLiteral("front_waist_arc"); const QString backWaistArc = QStringLiteral("back_waist_arc"); const QString frontUpperHipArc = QStringLiteral("front_upper_hip_arc"); @@ -109,12 +110,14 @@ const QString waistToHipHeight = QStringLiteral("waist_to_hip_height" const QString waistToKneeHeight = QStringLiteral("waist_to_knee_height"); const QString crotchHeight = QStringLiteral("crotch_height"); +//variables const QString line_ = QStringLiteral("Line_"); const QString angleLine_ = QStringLiteral("AngleLine_"); const QString arc_ = QStringLiteral("Arc_"); const QString spl_ = QStringLiteral("Spl_"); const QString splPath = QStringLiteral("splPath"); +//functions const QString sin_F = QStringLiteral("sin"); const QString cos_F = QStringLiteral("cos"); const QString tan_F = QStringLiteral("tan"); diff --git a/src/app/options.h b/src/app/options.h index 08fc5bd09..bbc2323e7 100644 --- a/src/app/options.h +++ b/src/app/options.h @@ -148,8 +148,8 @@ extern const QString frontShoulderToWaistLength; extern const QString backShoulderToWaistLength; extern const QString frontNeckArc; extern const QString backNeckArc; -extern const QString frontUpperBustArc; -extern const QString backUpperBustArc; +extern const QString frontUpperChestArc; +extern const QString backUpperChestArc; extern const QString frontWaistArc; extern const QString backWaistArc; extern const QString frontUpperHipArc; diff --git a/src/app/widgets/vapplication.cpp b/src/app/widgets/vapplication.cpp index 064b89958..23132be74 100644 --- a/src/app/widgets/vapplication.cpp +++ b/src/app/widgets/vapplication.cpp @@ -146,7 +146,7 @@ QString VApplication::pathToTables() const { if (_patternType == Pattern::Individual) { - return "://tables/individual/individual.vit"; + return QStringLiteral("://tables/individual/individual.vit"); } else { @@ -317,9 +317,9 @@ void VApplication::InitMeasurements() InitMeasurement(backNeckArc, QStringLiteral("Back Neck arc"), QStringLiteral("NeckPoint to NeckPoint across Nape")); - InitMeasurement(frontUpperBustArc, QStringLiteral("front_upper-bust_arc"), QStringLiteral("front_upper-bust_arc")); + InitMeasurement(frontUpperChestArc, QStringLiteral("front_upper-bust_arc"), QStringLiteral("front_upper-bust_arc")); - InitMeasurement(backUpperBustArc, QStringLiteral("Back UpperBust arc"), + InitMeasurement(backUpperChestArc, QStringLiteral("Back UpperBust arc"), QStringLiteral("Back UpperBust side to side")); InitMeasurement(frontWaistArc, QStringLiteral("Front Waist arc"), QStringLiteral("Front Waist side to side"));