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

Sorting by name for length of lines, curves and arcs. New aligment for name of

Browse Source 
length of curves.

--HG--
branch : develop
This commit is contained in:
dismine 2013-10-15 14:01:36 +03:00
parent 11b7c6a1f0
commit eb03e8165e
1 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
dialogs/dialogincrements.cpp
View File

@ -162,8 +162,16 @@ void DialogIncrements::FillIncrementTable(){
void DialogIncrements::FillLengthLines(){ void DialogIncrements::FillLengthLines(){
const QHash<QString, qreal> *linesTable = data->DataLengthLines(); const QHash<QString, qreal> *linesTable = data->DataLengthLines();
QHashIterator<QString, qreal> iHash(*linesTable);
QMap<QString, qreal> map;
//Sorting QHash by name
while (iHash.hasNext()) {
iHash.next();
map.insert(iHash.key(), iHash.value());
}
qint32 currentRow = -1; qint32 currentRow = -1;
QHashIterator<QString, qreal> i(*linesTable); QMapIterator<QString, qreal> i(map);
while (i.hasNext()) { while (i.hasNext()) {
i.next(); i.next();
qreal length = i.value(); qreal length = i.value();
@ -186,8 +194,16 @@ void DialogIncrements::FillLengthLines(){
void DialogIncrements::FillLengthSplines(){ void DialogIncrements::FillLengthSplines(){
const QHash<QString, qreal> *splinesTable = data->DataLengthSplines(); const QHash<QString, qreal> *splinesTable = data->DataLengthSplines();
QHashIterator<QString, qreal> iHash(*splinesTable);
QMap<QString, qreal> map;
//Sorting QHash by name
while (iHash.hasNext()) {
iHash.next();
map.insert(iHash.key(), iHash.value());
}
qint32 currentRow = -1; qint32 currentRow = -1;
QHashIterator<QString, qreal> i(*splinesTable); QMapIterator<QString, qreal> i(map);
while (i.hasNext()) { while (i.hasNext()) {
i.next(); i.next();
qreal length = i.value(); qreal length = i.value();
@ -195,7 +211,7 @@ void DialogIncrements::FillLengthSplines(){
ui->tableWidgetSplines->setRowCount ( splinesTable->size() ); ui->tableWidgetSplines->setRowCount ( splinesTable->size() );
QTableWidgetItem *item = new QTableWidgetItem(QString(i.key())); QTableWidgetItem *item = new QTableWidgetItem(QString(i.key()));
item->setTextAlignment(Qt::AlignHCenter); item->setTextAlignment(Qt::AlignLeft);
item->setFont(QFont("Times", 12, QFont::Bold)); item->setFont(QFont("Times", 12, QFont::Bold));
ui->tableWidgetSplines->setItem(currentRow, 0, item); ui->tableWidgetSplines->setItem(currentRow, 0, item);
@ -210,8 +226,16 @@ void DialogIncrements::FillLengthSplines(){
void DialogIncrements::FillLengthArcs(){ void DialogIncrements::FillLengthArcs(){
const QHash<QString, qreal> *arcsTable = data->DataLengthArcs(); const QHash<QString, qreal> *arcsTable = data->DataLengthArcs();
QHashIterator<QString, qreal> iHash(*arcsTable);
QMap<QString, qreal> map;
//Sorting QHash by name
while (iHash.hasNext()) {
iHash.next();
map.insert(iHash.key(), iHash.value());
}
qint32 currentRow = -1; qint32 currentRow = -1;
QHashIterator<QString, qreal> i(*arcsTable); QMapIterator<QString, qreal> i(map);
while (i.hasNext()) { while (i.hasNext()) {
i.next(); i.next();
qreal length = i.value(); qreal length = i.value();