From 7b0253d95e1b19dd3a635af589a29fe823ebe76e Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <kroluku@gmail.com>
Date: Fri, 14 Apr 2017 12:04:03 +0300
Subject: [PATCH] Resolved resizing tables after update.

--HG--
branch : release
---
 src/app/tape/tmainwindow.cpp                  | 19 ++++++++++++-------
 src/app/tape/tmainwindow.h                    |  4 ++--
 .../valentina/dialogs/dialogincrements.cpp    | 13 +++++++++----
 src/app/valentina/dialogs/dialogincrements.h  |  2 +-
 4 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/app/tape/tmainwindow.cpp b/src/app/tape/tmainwindow.cpp
index 1959c538f..f0b5eb2ee 100644
--- a/src/app/tape/tmainwindow.cpp
+++ b/src/app/tape/tmainwindow.cpp
@@ -304,7 +304,8 @@ bool TMainWindow::LoadFile(const QString &path)
 
             InitWindow();
 
-            RefreshData();
+            const bool freshCall = true;
+            RefreshData(freshCall);
 
             if (ui->tableWidget->rowCount() > 0)
             {
@@ -2382,17 +2383,17 @@ void TMainWindow::SetDefaultSize(int value)
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void TMainWindow::RefreshData()
+void TMainWindow::RefreshData(bool freshCall)
 {
     VContainer::ClearUniqueNames();
     data->ClearVariables(VarType::Measurement);
     m->ReadMeasurements();
 
-    RefreshTable();
+    RefreshTable(freshCall);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-void TMainWindow::RefreshTable()
+void TMainWindow::RefreshTable(bool freshCall)
 {
     ui->tableWidget->blockSignals(true);
     ui->tableWidget->clearContents();
@@ -2478,8 +2479,11 @@ void TMainWindow::RefreshTable()
         }
     }
 
-    ui->tableWidget->resizeColumnsToContents();
-    ui->tableWidget->resizeRowsToContents();
+    if (freshCall)
+    {
+        ui->tableWidget->resizeColumnsToContents();
+        ui->tableWidget->resizeRowsToContents();
+    }
     ui->tableWidget->horizontalHeader()->setStretchLastSection(true);
     ui->tableWidget->blockSignals(false);
 
@@ -2884,7 +2888,8 @@ bool TMainWindow::LoadFromExistingFile(const QString &path)
             InitWindow();
 
             m->ClearForExport();
-            RefreshData();
+            const bool freshCall = true;
+            RefreshData(freshCall);
 
             if (ui->tableWidget->rowCount() > 0)
             {
diff --git a/src/app/tape/tmainwindow.h b/src/app/tape/tmainwindow.h
index 6d8984442..b70c7c2c9 100644
--- a/src/app/tape/tmainwindow.h
+++ b/src/app/tape/tmainwindow.h
@@ -178,8 +178,8 @@ private:
     void       SetDefaultHeight(int value);
     void       SetDefaultSize(int value);
 
-    void RefreshData();
-    void RefreshTable();
+    void RefreshData(bool freshCall = false);
+    void RefreshTable(bool freshCall = false);
 
     QString GetCustomName() const;
     QString ClearCustomName(const QString &name) const;
diff --git a/src/app/valentina/dialogs/dialogincrements.cpp b/src/app/valentina/dialogs/dialogincrements.cpp
index b96cc22a8..d7aa4bf70 100644
--- a/src/app/valentina/dialogs/dialogincrements.cpp
+++ b/src/app/valentina/dialogs/dialogincrements.cpp
@@ -80,7 +80,8 @@ DialogIncrements::DialogIncrements(VContainer *data, VPattern *doc, QWidget *par
     qCDebug(vDialog, "Showing variables.");
     ShowUnits();
 
-    FillIncrements();
+    const bool freshCall = true;
+    FillIncrements(freshCall);
     FillLengthsLines();
     FillLengthLinesAngles();
     FillLengthsCurves();
@@ -130,7 +131,7 @@ DialogIncrements::DialogIncrements(VContainer *data, VPattern *doc, QWidget *par
 /**
  * @brief FillIncrementTable fill data for increment table
  */
-void DialogIncrements::FillIncrements()
+void DialogIncrements::FillIncrements(bool freshCall)
 {
     ui->tableWidgetIncrement->blockSignals(true);
     ui->tableWidgetIncrement->clearContents();
@@ -171,8 +172,12 @@ void DialogIncrements::FillIncrements()
 
         AddCell(ui->tableWidgetIncrement, formula, currentRow, 2, Qt::AlignVCenter); // formula
     }
-    ui->tableWidgetIncrement->resizeColumnsToContents();
-    ui->tableWidgetIncrement->resizeRowsToContents();
+
+    if (freshCall)
+    {
+        ui->tableWidgetIncrement->resizeColumnsToContents();
+        ui->tableWidgetIncrement->resizeRowsToContents();
+    }
     ui->tableWidgetIncrement->horizontalHeader()->setStretchLastSection(true);
     ui->tableWidgetIncrement->blockSignals(false);
 }
diff --git a/src/app/valentina/dialogs/dialogincrements.h b/src/app/valentina/dialogs/dialogincrements.h
index 2b19efe85..39cec4a7d 100644
--- a/src/app/valentina/dialogs/dialogincrements.h
+++ b/src/app/valentina/dialogs/dialogincrements.h
@@ -92,7 +92,7 @@ private:
     template <typename T>
     void                 FillTable(const QMap<QString, T> &varTable, QTableWidget *table);
 
-    void                 FillIncrements();
+    void                 FillIncrements(bool freshCall = false);
     void                 FillLengthsLines();
     void                 FillLengthLinesAngles();
     void                 FillLengthsCurves();