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

Added new local variable "CurrentSeamAllowance".

Browse Source 
--HG--
branch : feature
This commit is contained in:
Roman Telezhynskyi 2017-01-20 15:58:35 +02:00
parent 121f003e7c
commit 25a2717682
4 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/libs/ifc/ifcdef.cpp
View File

@ -167,29 +167,30 @@ const QString ColorDeepSkyBlue = QStringLiteral("deepskyblue");
const QString ColorCornFlowerBlue = QStringLiteral("cornflowerblue"); const QString ColorCornFlowerBlue = QStringLiteral("cornflowerblue");
//variables //variables
const QString line_ = QStringLiteral("Line_"); const QString line_ = QStringLiteral("Line_");
const QString angleLine_ = QStringLiteral("AngleLine_"); const QString angleLine_ = QStringLiteral("AngleLine_");
const QString spl_ = QStringLiteral(SPL_); const QString spl_ = QStringLiteral(SPL_);
const QString arc_ = QStringLiteral(ARC_); const QString arc_ = QStringLiteral(ARC_);
const QString splPath = QStringLiteral("SplPath"); const QString splPath = QStringLiteral("SplPath");
const QString radius_V = QStringLiteral("Radius"); const QString radius_V = QStringLiteral("Radius");
const QString radiusArc_ = radius_V + arc_; const QString radiusArc_ = radius_V + arc_;
const QString angle1_V = QStringLiteral("Angle1"); const QString angle1_V = QStringLiteral("Angle1");
const QString angle2_V = QStringLiteral("Angle2"); const QString angle2_V = QStringLiteral("Angle2");
const QString c1Length_V = QStringLiteral("C1Length"); const QString c1Length_V = QStringLiteral("C1Length");
const QString c2Length_V = QStringLiteral("C2Length"); const QString c2Length_V = QStringLiteral("C2Length");
const QString c1LengthSpl_ = c1Length_V + spl_; const QString c1LengthSpl_ = c1Length_V + spl_;
const QString c2LengthSpl_ = c2Length_V + spl_; const QString c2LengthSpl_ = c2Length_V + spl_;
const QString c1LengthSplPath = c1Length_V + splPath; const QString c1LengthSplPath = c1Length_V + splPath;
const QString c2LengthSplPath = c2Length_V + splPath; const QString c2LengthSplPath = c2Length_V + splPath;
const QString angle1Arc_ = angle1_V + arc_; const QString angle1Arc_ = angle1_V + arc_;
const QString angle2Arc_ = angle2_V + arc_; const QString angle2Arc_ = angle2_V + arc_;
const QString angle1Spl_ = angle1_V + spl_; const QString angle1Spl_ = angle1_V + spl_;
const QString angle2Spl_ = angle2_V + spl_; const QString angle2Spl_ = angle2_V + spl_;
const QString angle1SplPath = angle1_V + splPath; const QString angle1SplPath = angle1_V + splPath;
const QString angle2SplPath = angle2_V + splPath; const QString angle2SplPath = angle2_V + splPath;
const QString seg_ = QStringLiteral("Seg_"); const QString seg_ = QStringLiteral("Seg_");
const QString currentLength = QStringLiteral("CurrentLength"); const QString currentLength = QStringLiteral("CurrentLength");
const QString currentSeamAllowance = QStringLiteral("CurrentSeamAllowance");
const QStringList builInVariables = QStringList() << line_ const QStringList builInVariables = QStringList() << line_
<< angleLine_ << angleLine_
@ -205,6 +206,7 @@ const QStringList builInVariables = QStringList() << line_
<< angle2SplPath << angle2SplPath
<< seg_ << seg_
<< currentLength << currentLength
<< currentSeamAllowance
<< c1LengthSpl_ << c1LengthSpl_
<< c2LengthSpl_ << c2LengthSpl_
<< c1LengthSplPath << c1LengthSplPath

1
src/libs/ifc/ifcdef.h
View File

@ -197,6 +197,7 @@ extern const QString angle1SplPath;
extern const QString angle2SplPath; extern const QString angle2SplPath;
extern const QString seg_; extern const QString seg_;
extern const QString currentLength; extern const QString currentLength;
extern const QString currentSeamAllowance;
extern const QStringList builInVariables; extern const QStringList builInVariables;

2
src/libs/vpatterndb/vtranslatevars.cpp
View File

@ -388,6 +388,8 @@ void VTranslateVars::InitVariables()
"Do not add symbol _ to the end of the name")); "Do not add symbol _ to the end of the name"));
variables.insert(seg_, translate("VTranslateVars", "Seg_", "Segment. Left symbol _ in the name")); variables.insert(seg_, translate("VTranslateVars", "Seg_", "Segment. Left symbol _ in the name"));
variables.insert(currentLength, translate("VTranslateVars", "CurrentLength", "Do not add space between words")); variables.insert(currentLength, translate("VTranslateVars", "CurrentLength", "Do not add space between words"));
variables.insert(currentSeamAllowance, translate("VTranslateVars", "CurrentSeamAllowance",
"Do not add space between words"));
variables.insert(c1LengthSpl_, translate("VTranslateVars", "C1LengthSpl_", "Left symbol _ in the name")); variables.insert(c1LengthSpl_, translate("VTranslateVars", "C1LengthSpl_", "Left symbol _ in the name"));
variables.insert(c2LengthSpl_, translate("VTranslateVars", "C2LengthSpl_", "Left symbol _ in the name")); variables.insert(c2LengthSpl_, translate("VTranslateVars", "C2LengthSpl_", "Left symbol _ in the name"));
variables.insert(c1LengthSplPath, translate("VTranslateVars", "C1LengthSplPath", variables.insert(c1LengthSplPath, translate("VTranslateVars", "C1LengthSplPath",

1
src/test/TranslationsTest/tst_buitinregexp.cpp
View File

@ -138,6 +138,7 @@ void TST_BuitInRegExp::TestCheckUnderlineExists_data()
data.insert(angle2SplPath, false); data.insert(angle2SplPath, false);
data.insert(seg_, true); data.insert(seg_, true);
data.insert(currentLength, false); data.insert(currentLength, false);
data.insert(currentSeamAllowance, false);
data.insert(c1LengthSpl_, true); data.insert(c1LengthSpl_, true);
data.insert(c2LengthSpl_, true); data.insert(c2LengthSpl_, true);
data.insert(c1LengthSplPath, false); data.insert(c1LengthSplPath, false);