diff --git a/src/app/dialogs/app/dialogincrements.cpp b/src/app/dialogs/app/dialogincrements.cpp index 1c0c8103a..f64242add 100644 --- a/src/app/dialogs/app/dialogincrements.cpp +++ b/src/app/dialogs/app/dialogincrements.cpp @@ -94,6 +94,7 @@ DialogIncrements::DialogIncrements(VContainer *data, VPattern *doc, QWidget *par FillMeasurements(); FillIncrements(); FillLengthLines(); + FillLengthLinesAngle(); FillLengthSplines(); FillLengthArcs(); @@ -355,6 +356,12 @@ void DialogIncrements::FillLengthLines() FillTable(data->DataLengthLines(), ui->tableWidgetLines); } +//--------------------------------------------------------------------------------------------------------------------- +void DialogIncrements::FillLengthLinesAngle() +{ + FillTable(data->DataAngleLines(), ui->tableWidgetLinesAngle); +} + //--------------------------------------------------------------------------------------------------------------------- /** * @brief FillLengthSplines fill data for table of splines lengths @@ -385,25 +392,27 @@ void DialogIncrements::SetItemViewOnly(QTableWidgetItem *item) //--------------------------------------------------------------------------------------------------------------------- void DialogIncrements::ShowUnits() { - ShowHeaderUnits(ui->tableWidgetIncrement, 2);// base value - ShowHeaderUnits(ui->tableWidgetIncrement, 3);// in sizes - ShowHeaderUnits(ui->tableWidgetIncrement, 4);// in heights + const QString unit = VDomDocument::UnitsToStr(qApp->patternUnit()); - ShowHeaderUnits(ui->tableWidgetMeasurements, 2);// base value - ShowHeaderUnits(ui->tableWidgetMeasurements, 3);// in sizes - ShowHeaderUnits(ui->tableWidgetMeasurements, 4);// in heights + ShowHeaderUnits(ui->tableWidgetIncrement, 2, unit);// base value + ShowHeaderUnits(ui->tableWidgetIncrement, 3, unit);// in sizes + ShowHeaderUnits(ui->tableWidgetIncrement, 4, unit);// in heights - ShowHeaderUnits(ui->tableWidgetLines, 1);// lengths - ShowHeaderUnits(ui->tableWidgetSplines, 1);// lengths - ShowHeaderUnits(ui->tableWidgetArcs, 1);// lengths + ShowHeaderUnits(ui->tableWidgetMeasurements, 2, unit);// base value + ShowHeaderUnits(ui->tableWidgetMeasurements, 3, unit);// in sizes + ShowHeaderUnits(ui->tableWidgetMeasurements, 4, unit);// in heights + + ShowHeaderUnits(ui->tableWidgetLines, 1, unit);// lengths + ShowHeaderUnits(ui->tableWidgetSplines, 1, unit);// lengths + ShowHeaderUnits(ui->tableWidgetArcs, 1, unit);// lengths + ShowHeaderUnits(ui->tableWidgetLinesAngle, 1, "°");// lengths } //--------------------------------------------------------------------------------------------------------------------- -void DialogIncrements::ShowHeaderUnits(QTableWidget *table, int column) +void DialogIncrements::ShowHeaderUnits(QTableWidget *table, int column, const QString &unit) { SCASSERT(table != nullptr); - const QString unit = VDomDocument::UnitsToStr(qApp->patternUnit()); const QString header = table->horizontalHeaderItem(column)->text(); const QString unitHeader = QString("%1 (%2)").arg(header).arg(unit); table->horizontalHeaderItem(column)->setText(unitHeader); diff --git a/src/app/dialogs/app/dialogincrements.h b/src/app/dialogs/app/dialogincrements.h index e91df636f..d45f7dab2 100644 --- a/src/app/dialogs/app/dialogincrements.h +++ b/src/app/dialogs/app/dialogincrements.h @@ -99,6 +99,7 @@ private: template void FillTable(const QMap varTable, QTableWidget *table); void FillLengthLines(); + void FillLengthLinesAngle(); void FillLengthSplines(); void FillLengthArcs(); void AddIncrementToFile(const quint32 &id, const QString &name, const qreal &base, @@ -106,7 +107,7 @@ private: void HideColumns(QTableWidget *table); void SetItemViewOnly(QTableWidgetItem *item); void ShowUnits(); - void ShowHeaderUnits(QTableWidget *table, int column); + void ShowHeaderUnits(QTableWidget *table, int column, const QString &unit); void ShowSuccess() const; }; diff --git a/src/app/dialogs/app/dialogincrements.ui b/src/app/dialogs/app/dialogincrements.ui index 72dbd4d04..1f2a3ccce 100644 --- a/src/app/dialogs/app/dialogincrements.ui +++ b/src/app/dialogs/app/dialogincrements.ui @@ -39,7 +39,7 @@ QTabWidget::North - 0 + 3 @@ -118,8 +118,8 @@ 0 0 - 939 - 411 + 559 + 82 @@ -548,6 +548,45 @@ + + + Lines angle + + + + + + QAbstractItemView::NoEditTriggers + + + true + + + false + + + 137 + + + false + + + false + + + + Line + + + + + Angle + + + + + + Curves