Fixed issue #688. Difficult to enter numbers in Tape.
(grafted from 4c3cac37331437d3a6e9764d38351156c82fd731) --HG-- branch : develop
This commit is contained in:
parent
118c8c970f
commit
8d10ff5234
|
@ -8,6 +8,7 @@
|
||||||
- [#686] Seam allowance not placed correctly.
|
- [#686] Seam allowance not placed correctly.
|
||||||
- [#687] Wrong seam allowance.
|
- [#687] Wrong seam allowance.
|
||||||
- [#689] Grainline default values swapped around.
|
- [#689] Grainline default values swapped around.
|
||||||
|
- [#688] Difficult to enter numbers in Tape.
|
||||||
|
|
||||||
# Version 0.5.0 May 9, 2017
|
# Version 0.5.0 May 9, 2017
|
||||||
- [#581] User can now filter input lists by keyword in function wizard.
|
- [#581] User can now filter input lists by keyword in function wizard.
|
||||||
|
|
|
@ -1435,6 +1435,12 @@ void TMainWindow::ChangedHeight(const QString &text)
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
void TMainWindow::ShowMData()
|
void TMainWindow::ShowMData()
|
||||||
|
{
|
||||||
|
ShowNewMData(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
void TMainWindow::ShowNewMData(bool fresh)
|
||||||
{
|
{
|
||||||
if (ui->tableWidget->rowCount() > 0)
|
if (ui->tableWidget->rowCount() > 0)
|
||||||
{
|
{
|
||||||
|
@ -1487,9 +1493,12 @@ void TMainWindow::ShowMData()
|
||||||
const qreal value = UnitConvertor(data->GetTableValue(meash->GetName(), mType), mUnit, pUnit);
|
const qreal value = UnitConvertor(data->GetTableValue(meash->GetName(), mType), mUnit, pUnit);
|
||||||
ui->labelCalculatedValue->setText(qApp->LocaleToString(value) + " " +postfix);
|
ui->labelCalculatedValue->setText(qApp->LocaleToString(value) + " " +postfix);
|
||||||
|
|
||||||
|
if (fresh)
|
||||||
|
{
|
||||||
ui->doubleSpinBoxBaseValue->setValue(meash->GetBase());
|
ui->doubleSpinBoxBaseValue->setValue(meash->GetBase());
|
||||||
ui->doubleSpinBoxInSizes->setValue(meash->GetKsize());
|
ui->doubleSpinBoxInSizes->setValue(meash->GetKsize());
|
||||||
ui->doubleSpinBoxInHeights->setValue(meash->GetKheight());
|
ui->doubleSpinBoxInHeights->setValue(meash->GetKheight());
|
||||||
|
}
|
||||||
|
|
||||||
ui->labelCalculatedValue->blockSignals(false);
|
ui->labelCalculatedValue->blockSignals(false);
|
||||||
ui->doubleSpinBoxBaseValue->blockSignals(false);
|
ui->doubleSpinBoxBaseValue->blockSignals(false);
|
||||||
|
@ -1740,7 +1749,7 @@ void TMainWindow::SaveMBaseValue(double value)
|
||||||
ui->tableWidget->selectRow(row);
|
ui->tableWidget->selectRow(row);
|
||||||
ui->tableWidget->blockSignals(false);
|
ui->tableWidget->blockSignals(false);
|
||||||
|
|
||||||
ShowMData();
|
ShowNewMData(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
@ -1765,7 +1774,7 @@ void TMainWindow::SaveMSizeIncrease(double value)
|
||||||
ui->tableWidget->selectRow(row);
|
ui->tableWidget->selectRow(row);
|
||||||
ui->tableWidget->blockSignals(false);
|
ui->tableWidget->blockSignals(false);
|
||||||
|
|
||||||
ShowMData();
|
ShowNewMData(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
@ -1790,7 +1799,7 @@ void TMainWindow::SaveMHeightIncrease(double value)
|
||||||
ui->tableWidget->selectRow(row);
|
ui->tableWidget->selectRow(row);
|
||||||
ui->tableWidget->blockSignals(false);
|
ui->tableWidget->blockSignals(false);
|
||||||
|
|
||||||
ShowMData();
|
ShowNewMData(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
|
@ -162,6 +162,7 @@ private:
|
||||||
void InitComboBoxUnits();
|
void InitComboBoxUnits();
|
||||||
void InitGender(QComboBox *gender);
|
void InitGender(QComboBox *gender);
|
||||||
|
|
||||||
|
void ShowNewMData(bool fresh);
|
||||||
void ShowUnits();
|
void ShowUnits();
|
||||||
void ShowHeaderUnits(QTableWidget *table, int column, const QString &unit);
|
void ShowHeaderUnits(QTableWidget *table, int column, const QString &unit);
|
||||||
void UpdateRecentFileActions();
|
void UpdateRecentFileActions();
|
||||||
|
|
Loading…
Reference in New Issue
Block a user