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

Fixed Issue #151.

Browse Source 
--HG--
branch : feature
This commit is contained in:
dismine 2014-05-15 12:47:08 +03:00
parent e3593bf577
commit aea360d8de
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/app/options.cpp
View File

@ -28,6 +28,7 @@
#include "options.h" #include "options.h"
//measurements
const QString headGirth = QStringLiteral("head_girth"); const QString headGirth = QStringLiteral("head_girth");
const QString midNeckGirth = QStringLiteral("mid_neck_girth"); const QString midNeckGirth = QStringLiteral("mid_neck_girth");
const QString neckBaseGirth = QStringLiteral("neck_base_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 backShoulderToWaistLength = QStringLiteral("back_shoulder_to_waist_length");
const QString frontNeckArc = QStringLiteral("front_neck_arc"); const QString frontNeckArc = QStringLiteral("front_neck_arc");
const QString backNeckArc = QStringLiteral("back_neck_arc"); const QString backNeckArc = QStringLiteral("back_neck_arc");
const QString frontUpperBustArc = QStringLiteral("front_upper_bust_arc"); const QString frontUpperChestArc = QStringLiteral("front_upper_chest_arc");
const QString backUpperBustArc = QStringLiteral("back_upper_bust_arc"); const QString backUpperChestArc = QStringLiteral("back_upper_chest_arc");
const QString frontWaistArc = QStringLiteral("front_waist_arc"); const QString frontWaistArc = QStringLiteral("front_waist_arc");
const QString backWaistArc = QStringLiteral("back_waist_arc"); const QString backWaistArc = QStringLiteral("back_waist_arc");
const QString frontUpperHipArc = QStringLiteral("front_upper_hip_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 waistToKneeHeight = QStringLiteral("waist_to_knee_height");
const QString crotchHeight = QStringLiteral("crotch_height"); const QString crotchHeight = QStringLiteral("crotch_height");
//variables
const QString line_ = QStringLiteral("Line_"); const QString line_ = QStringLiteral("Line_");
const QString angleLine_ = QStringLiteral("AngleLine_"); const QString angleLine_ = QStringLiteral("AngleLine_");
const QString arc_ = QStringLiteral("Arc_"); const QString arc_ = QStringLiteral("Arc_");
const QString spl_ = QStringLiteral("Spl_"); const QString spl_ = QStringLiteral("Spl_");
const QString splPath = QStringLiteral("splPath"); const QString splPath = QStringLiteral("splPath");
//functions
const QString sin_F = QStringLiteral("sin"); const QString sin_F = QStringLiteral("sin");
const QString cos_F = QStringLiteral("cos"); const QString cos_F = QStringLiteral("cos");
const QString tan_F = QStringLiteral("tan"); const QString tan_F = QStringLiteral("tan");

4
src/app/options.h
View File

@ -148,8 +148,8 @@ extern const QString frontShoulderToWaistLength;
extern const QString backShoulderToWaistLength; extern const QString backShoulderToWaistLength;
extern const QString frontNeckArc; extern const QString frontNeckArc;
extern const QString backNeckArc; extern const QString backNeckArc;
extern const QString frontUpperBustArc; extern const QString frontUpperChestArc;
extern const QString backUpperBustArc; extern const QString backUpperChestArc;
extern const QString frontWaistArc; extern const QString frontWaistArc;
extern const QString backWaistArc; extern const QString backWaistArc;
extern const QString frontUpperHipArc; extern const QString frontUpperHipArc;

6
src/app/widgets/vapplication.cpp
View File

@ -146,7 +146,7 @@ QString VApplication::pathToTables() const
{ {
if (_patternType == Pattern::Individual) if (_patternType == Pattern::Individual)
{ {
return "://tables/individual/individual.vit"; return QStringLiteral("://tables/individual/individual.vit");
} }
else else
{ {
@ -317,9 +317,9 @@ void VApplication::InitMeasurements()
InitMeasurement(backNeckArc, QStringLiteral("Back Neck arc"), QStringLiteral("NeckPoint to NeckPoint across Nape")); 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")); QStringLiteral("Back UpperBust side to side"));
InitMeasurement(frontWaistArc, QStringLiteral("Front Waist arc"), QStringLiteral("Front Waist side to side")); InitMeasurement(frontWaistArc, QStringLiteral("Front Waist arc"), QStringLiteral("Front Waist side to side"));