From 2cb4b1849132d58a9bbf77fe894d874a31e2efaa Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <kroluku@gmail.com>
Date: Tue, 21 Jul 2015 19:13:09 +0300
Subject: [PATCH] Show column Calculated value.

--HG--
branch : feature
---
 src/app/tape/tmainwindow.cpp | 35 ++++++++++++++++++++++++++++++++---
 src/app/tape/tmainwindow.h   |  3 +++
 src/app/tape/tmainwindow.ui  |  4 ++--
 3 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/src/app/tape/tmainwindow.cpp b/src/app/tape/tmainwindow.cpp
index eae3f41bc..2f9f9cbe9 100644
--- a/src/app/tape/tmainwindow.cpp
+++ b/src/app/tape/tmainwindow.cpp
@@ -384,7 +384,8 @@ void TMainWindow::AddCustom()
     if (mType == MeasurementsType::Individual)
     {
         AddCell(name, currentRow, 0, id); // name
-        AddCell("0", currentRow, 2); // value
+        AddCell("0", currentRow, 1); // calculated value
+        AddCell("0", currentRow, 2); // formula
     }
     else
     {
@@ -399,6 +400,9 @@ void TMainWindow::AddCustom()
     ui->tableWidget->blockSignals(false);
 
     ui->tableWidget->selectRow(currentRow);
+    ui->tableWidget->resizeColumnsToContents();
+    ui->tableWidget->resizeRowsToContents();
+    ui->tableWidget->horizontalHeader()->setStretchLastSection(true);
 
     MeasurementsWasSaved(false);
 }
@@ -615,17 +619,42 @@ void TMainWindow::InitTable()
 {
     if (mType == MeasurementsType::Standard)
     {
-        ui->tableWidget->setColumnHidden( 2, true );// value
+        ui->tableWidget->setColumnHidden( 2, true );// formula
     }
     else
     {
-        ui->tableWidget->setColumnHidden( 1, true );// calculated value
         ui->tableWidget->setColumnHidden( 3, true );// base value
         ui->tableWidget->setColumnHidden( 4, true );// in sizes
         ui->tableWidget->setColumnHidden( 5, true );// in heights
     }
 
     connect(ui->tableWidget, &QTableWidget::itemSelectionChanged, this, &TMainWindow::ShowMData);
+
+    ShowUnits();
+
+    ui->tableWidget->resizeColumnsToContents();
+    ui->tableWidget->resizeRowsToContents();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void TMainWindow::ShowUnits()
+{
+    const QString unit = VDomDocument::UnitsToStr(mUnit);
+
+    ShowHeaderUnits(ui->tableWidget, 1, unit);// calculated value
+    ShowHeaderUnits(ui->tableWidget, 3, unit);// base value
+    ShowHeaderUnits(ui->tableWidget, 4, unit);// in sizes
+    ShowHeaderUnits(ui->tableWidget, 5, unit);// in heights
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void TMainWindow::ShowHeaderUnits(QTableWidget *table, int column, const QString &unit)
+{
+    SCASSERT(table != nullptr);
+
+    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/tape/tmainwindow.h b/src/app/tape/tmainwindow.h
index 1511e9733..b43ca4ac4 100644
--- a/src/app/tape/tmainwindow.h
+++ b/src/app/tape/tmainwindow.h
@@ -93,6 +93,9 @@ private:
     void InitWindow();
     void InitTable();
 
+    void ShowUnits();
+    void ShowHeaderUnits(QTableWidget *table, int column, const QString &unit);
+
     void MeasurementsWasSaved(bool saved);
     void SetCurrentFile(const QString &fileName);
     bool SaveMeasurements(const QString &fileName, QString &error);
diff --git a/src/app/tape/tmainwindow.ui b/src/app/tape/tmainwindow.ui
index 681673f1b..c4cf1aaae 100644
--- a/src/app/tape/tmainwindow.ui
+++ b/src/app/tape/tmainwindow.ui
@@ -72,7 +72,7 @@
           </column>
           <column>
            <property name="text">
-            <string>Value</string>
+            <string>Formula</string>
            </property>
           </column>
           <column>
@@ -343,7 +343,7 @@
            <item row="4" column="1">
             <widget class="QLabel" name="labelCalculatedValue">
              <property name="text">
-              <string notr="true">0</string>
+              <string notr="true"/>
              </property>
             </widget>
            </item>