resizeColumnsToContents() causing disappearance of the formula column.

This commit is contained in:
Roman Telezhynskyi 2020-04-06 15:48:20 +03:00
parent 59376ebd9b
commit e07058453a
2 changed files with 10 additions and 16 deletions

View File

@ -95,9 +95,8 @@ DialogIncrements::DialogIncrements(VContainer *data, VPattern *doc, QWidget *par
qCDebug(vDialog, "Showing variables."); qCDebug(vDialog, "Showing variables.");
ShowUnits(); ShowUnits();
const bool freshCall = true; FillIncrements();
FillIncrements(freshCall); FillPreviewCalculations();
FillPreviewCalculations(freshCall);
FillLengthsLines(); FillLengthsLines();
FillLengthLinesAngles(); FillLengthLinesAngles();
FillLengthsCurves(); FillLengthsCurves();
@ -182,15 +181,15 @@ DialogIncrements::DialogIncrements(VContainer *data, VPattern *doc, QWidget *par
/** /**
* @brief FillIncrementTable fill data for increment table * @brief FillIncrementTable fill data for increment table
*/ */
void DialogIncrements::FillIncrements(bool freshCall) void DialogIncrements::FillIncrements()
{ {
FillIncrementsTable(ui->tableWidgetIncrement, data->DataIncrementsWithSeparators(), false, freshCall); FillIncrementsTable(ui->tableWidgetIncrement, data->DataIncrementsWithSeparators(), false);
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void DialogIncrements::FillPreviewCalculations(bool freshCall) void DialogIncrements::FillPreviewCalculations()
{ {
FillIncrementsTable(ui->tableWidgetPC, data->DataIncrementsWithSeparators(), true, freshCall); FillIncrementsTable(ui->tableWidgetPC, data->DataIncrementsWithSeparators(), true);
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
@ -869,7 +868,7 @@ void DialogIncrements::RefreshPattern()
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void DialogIncrements::FillIncrementsTable(QTableWidget *table, void DialogIncrements::FillIncrementsTable(QTableWidget *table,
const QMap<QString, QSharedPointer<VIncrement> > &increments, const QMap<QString, QSharedPointer<VIncrement> > &increments,
bool takePreviewCalculations, bool freshCall) bool takePreviewCalculations)
{ {
SCASSERT(table != nullptr) SCASSERT(table != nullptr)
@ -920,11 +919,6 @@ void DialogIncrements::FillIncrementsTable(QTableWidget *table,
} }
} }
if (freshCall)
{
table->resizeColumnsToContents();
table->resizeRowsToContents();
}
table->horizontalHeader()->setStretchLastSection(true); table->horizontalHeader()->setStretchLastSection(true);
table->blockSignals(false); table->blockSignals(false);
} }

View File

@ -111,10 +111,10 @@ private:
void FillIncrementsTable(QTableWidget *table, void FillIncrementsTable(QTableWidget *table,
const QMap<QString, QSharedPointer<VIncrement> > &increments, const QMap<QString, QSharedPointer<VIncrement> > &increments,
bool takePreviewCalculations, bool freshCall = false); bool takePreviewCalculations);
void FillIncrements(bool freshCall = false); void FillIncrements();
void FillPreviewCalculations(bool freshCall = false); void FillPreviewCalculations();
void FillLengthsLines(); void FillLengthsLines();
void FillLengthLinesAngles(); void FillLengthLinesAngles();
void FillLengthsCurves(); void FillLengthsCurves();