Refactoring.
--HG-- branch : develop
This commit is contained in:
parent
7ed0f2760b
commit
d7e9f8cb8b
|
@ -847,69 +847,68 @@ void VPattern::ParseCurrentPP()
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
QString VPattern::GetLabelBase(unsigned int index) const
|
QString VPattern::GetLabelBase(unsigned int index) const
|
||||||
{
|
{
|
||||||
QStringList list = VApplication::LabelLanguages();
|
const QStringList list = VApplication::LabelLanguages();
|
||||||
|
const QString def = QStringLiteral("A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z");
|
||||||
QStringList alphabet;
|
QStringList alphabet;
|
||||||
switch (list.indexOf(qApp->ValentinaSettings()->GetLabelLanguage()))
|
switch (list.indexOf(qApp->ValentinaSettings()->GetLabelLanguage()))
|
||||||
{
|
{
|
||||||
case 0: // de
|
case 0: // de
|
||||||
{
|
{
|
||||||
QString al = QStringLiteral("A,Ä,B,C,D,E,F,G,H,I,J,K,L,M,N,O,Ö,P,Q,R,S,ß,T,U,Ü,V,W,X,Y,Z");
|
const QString al = QStringLiteral("A,Ä,B,C,D,E,F,G,H,I,J,K,L,M,N,O,Ö,P,Q,R,S,ß,T,U,Ü,V,W,X,Y,Z");
|
||||||
alphabet = al.split(",");
|
alphabet = al.split(",");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 1: // en
|
case 1: // en
|
||||||
{
|
{
|
||||||
QString al = QStringLiteral("A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z");
|
alphabet = def.split(",");
|
||||||
alphabet = al.split(",");
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 2: // fr
|
case 2: // fr
|
||||||
{
|
{
|
||||||
QString al = QStringLiteral("A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z");
|
const QString al = QStringLiteral("A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z");
|
||||||
alphabet = al.split(",");
|
alphabet = al.split(",");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 3: // ru
|
case 3: // ru
|
||||||
{
|
{
|
||||||
QString al = QStringLiteral("А,Б,В,Г,Д,Е,Ж,З,И,К,Л,М,Н,О,П,Р,С,Т,У,Ф,Х,Ц,Ч,Ш,Щ,Э,Ю,Я");
|
const QString al = QStringLiteral("А,Б,В,Г,Д,Е,Ж,З,И,К,Л,М,Н,О,П,Р,С,Т,У,Ф,Х,Ц,Ч,Ш,Щ,Э,Ю,Я");
|
||||||
alphabet = al.split(",");
|
alphabet = al.split(",");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 4: // uk
|
case 4: // uk
|
||||||
{
|
{
|
||||||
QString al = QStringLiteral("А,Б,В,Г,Д,Е,Ж,З,І,Ї,Й,К,Л,М,Н,О,П,Р,С,Т,У,Ф,Х,Ц,Ч,Ш,Щ,Є,Ю,Я");
|
const QString al = QStringLiteral("А,Б,В,Г,Д,Е,Ж,З,І,Ї,Й,К,Л,М,Н,О,П,Р,С,Т,У,Ф,Х,Ц,Ч,Ш,Щ,Є,Ю,Я");
|
||||||
alphabet = al.split(",");
|
alphabet = al.split(",");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 5: // hr
|
case 5: // hr
|
||||||
{
|
{
|
||||||
QString al = QStringLiteral("A,B,C,Č,Ć,D,Dž,Ð,E,F,G,H,I,J,K,L,Lj,M,N,Nj,O,P,R,S,Š,T,U,V,Z,Ž");
|
const QString al = QStringLiteral("A,B,C,Č,Ć,D,Dž,Ð,E,F,G,H,I,J,K,L,Lj,M,N,Nj,O,P,R,S,Š,T,U,V,Z,Ž");
|
||||||
alphabet = al.split(",");
|
alphabet = al.split(",");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 6: // sr
|
case 6: // sr
|
||||||
{
|
{
|
||||||
QString al = QStringLiteral("А,Б,В,Г,Д,Ђ,Е,Ж,З,И,Ј,К,Л,Љ,М,Н,Њ,О,П,Р,С,Т,Ћ,У,Ф,Х,Ц,Ч,Џ,Ш");
|
const QString al = QStringLiteral("А,Б,В,Г,Д,Ђ,Е,Ж,З,И,Ј,К,Л,Љ,М,Н,Њ,О,П,Р,С,Т,Ћ,У,Ф,Х,Ц,Ч,Џ,Ш");
|
||||||
alphabet = al.split(",");
|
alphabet = al.split(",");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 7: // bs
|
case 7: // bs
|
||||||
{
|
{
|
||||||
QString al = QStringLiteral("A,B,C,Č,Ć,D,Dž,Ð,E,F,G,H,I,J,K,L,Lj,M,N,Nj,O,P,R,S,Š,T,U,V,Z,Ž");
|
const QString al = QStringLiteral("A,B,C,Č,Ć,D,Dž,Ð,E,F,G,H,I,J,K,L,Lj,M,N,Nj,O,P,R,S,Š,T,U,V,Z,Ž");
|
||||||
alphabet = al.split(",");
|
alphabet = al.split(",");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
default: // en
|
default: // en
|
||||||
{
|
{
|
||||||
QString al = QStringLiteral("A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z");
|
alphabet = def.split(",");
|
||||||
alphabet = al.split(",");
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
QString base;
|
QString base;
|
||||||
int count = qFloor(index/static_cast<unsigned int>(alphabet.size()));
|
const int count = qFloor(index/static_cast<unsigned int>(alphabet.size()));
|
||||||
int number = static_cast<int>(index) - alphabet.size() * count;
|
const int number = static_cast<int>(index) - alphabet.size() * count;
|
||||||
int i = 0;
|
int i = 0;
|
||||||
do
|
do
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue
Block a user