palo/valentina
1
0
Fork 0
mirror of https://gitlab.com/smart-pattern/valentina.git synced 2024-06-25 22:04:29 +02:00
Code Issues Projects Releases Wiki Activity

Show column Calculated value.

Browse source 
--HG--
branch : feature
This commit is contained in:
Roman Telezhynskyi 2015-07-21 19:13:09 +03:00
parent 930c7cbf42
commit 2cb4b18491
3 changed files with 37 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/app/tape/tmainwindow.cpp
View file

@ -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);
}
//---------------------------------------------------------------------------------------------------------------------

3
src/app/tape/tmainwindow.h
View file

@ -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);

4
src/app/tape/tmainwindow.ui
View file

@ -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>