diff --git a/src/dialogs/app/dialogincrements.cpp b/src/dialogs/app/dialogincrements.cpp index af95d1807..11659bf90 100644 --- a/src/dialogs/app/dialogincrements.cpp +++ b/src/dialogs/app/dialogincrements.cpp @@ -45,7 +45,7 @@ DialogIncrements::DialogIncrements(VContainer *data, VPattern *doc, QWidget *par ui->tableWidgetIncrement->setItemDelegateForColumn(3, doubleDelegate); ui->tableWidgetIncrement->setItemDelegateForColumn(4, doubleDelegate); - FillStandardTable(); + FillMeasurements(); FillIncrementTable(); FillLengthLines(); FillLengthSplines(); @@ -62,12 +62,12 @@ DialogIncrements::DialogIncrements(VContainer *data, VPattern *doc, QWidget *par ui->tabWidget->setCurrentIndex(0); } -void DialogIncrements::FillStandardTable() +void DialogIncrements::FillMeasurements() { - const QHash *standardTable = data->DataMeasurements(); + const QHash *table = data->DataMeasurements(); qint32 currentRow = -1; - QHashIterator i(*standardTable); - ui->tableWidgetStandard->setRowCount ( standardTable->size() ); + QHashIterator i(*table); + ui->tableWidgetStandard->setRowCount ( table->size() ); while (i.hasNext()) { i.next(); @@ -276,7 +276,7 @@ void DialogIncrements::FullUpdateFromFile() &DialogIncrements::cellChanged); ui->tableWidgetStandard->clearContents(); - FillStandardTable(); + FillMeasurements(); ui->tableWidgetIncrement->clearContents(); FillIncrementTable(); diff --git a/src/dialogs/app/dialogincrements.h b/src/dialogs/app/dialogincrements.h index 7ea4841a4..e78120b3c 100644 --- a/src/dialogs/app/dialogincrements.h +++ b/src/dialogs/app/dialogincrements.h @@ -105,9 +105,9 @@ private: */ qint32 column; /** - * @brief FillStandardTable fill data for standard table + * @brief FillMeasurements load measurements data */ - void FillStandardTable(); + void FillMeasurements(); /** * @brief FillIncrementTable fill data for increment table */ diff --git a/src/dialogs/app/dialogincrements.ui b/src/dialogs/app/dialogincrements.ui index a6ad81fab..4ae845d75 100644 --- a/src/dialogs/app/dialogincrements.ui +++ b/src/dialogs/app/dialogincrements.ui @@ -7,7 +7,7 @@ 0 0 897 - 422 + 566 @@ -20,7 +20,7 @@ Increments - + :/icon/64x64/icon64x64.png:/icon/64x64/icon64x64.png @@ -39,14 +39,109 @@ QTabWidget::North - 1 + 0 - Sizes table + Measurements - - + + + + + + + Load another measurements table + + + + + + + ... + + + + + + + + + + + + + + Family name + + + + + + + + + + + + + + + 84 + 0 + + + + Given name + + + + + + + + + + + + + + + 84 + 0 + + + + Birth date + + + + + + + + + + + + + + + 84 + 0 + + + + Sex + + + + + + + + + true @@ -112,7 +207,7 @@ - In growths + In heights @@ -192,7 +287,7 @@ - In growths + In heights @@ -353,7 +448,6 @@ - tabWidget tableWidgetStandard tableWidgetIncrement toolButtonAdd @@ -363,7 +457,7 @@ tableWidgetArcs - +