aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash on Windows.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2021-01-27 09:27:34 +02:00
parent 70ea54992f
commit 1019f91d5b
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp
View File

@ -508,7 +508,10 @@ void DialogSeamAllowance::SaveData()
SavePatternTemplateData(); SavePatternTemplateData();
SavePatternMaterialData(); SavePatternMaterialData();
if (m_doc != nullptr)
{
emit m_doc->UpdatePatternLabel(); emit m_doc->UpdatePatternLabel();
}
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
@ -611,6 +614,10 @@ void DialogSeamAllowance::showEvent(QShowEvent *event)
if (m_doc != nullptr) if (m_doc != nullptr)
{ {
uiTabLabels->lineEditPatternName->setText(m_doc->GetPatternName());
uiTabLabels->lineEditPatternNumber->setText(m_doc->GetPatternNumber());
uiTabLabels->lineEditCompanyName->setText(m_doc->GetCompanyName());
VSettings *settings = qApp->ValentinaSettings(); VSettings *settings = qApp->ValentinaSettings();
m_patternMaterials = m_doc->GetPatternMaterials(); m_patternMaterials = m_doc->GetPatternMaterials();
@ -3181,10 +3188,6 @@ void DialogSeamAllowance::InitLabelsTab()
// Pattern label data // Pattern label data
uiTabLabels->lineEditCustomerEmail->setClearButtonEnabled(true); uiTabLabels->lineEditCustomerEmail->setClearButtonEnabled(true);
uiTabLabels->lineEditPatternName->setText(m_doc->GetPatternName());
uiTabLabels->lineEditPatternNumber->setText(m_doc->GetPatternNumber());
uiTabLabels->lineEditCompanyName->setText(m_doc->GetCompanyName());
uiTabLabels->lineEditCustomerName->setText(qApp->GetCustomerName()); uiTabLabels->lineEditCustomerName->setText(qApp->GetCustomerName());
uiTabLabels->lineEditCustomerEmail->setText(qApp->CustomerEmail()); uiTabLabels->lineEditCustomerEmail->setText(qApp->CustomerEmail());
uiTabLabels->dateEditCustomerBirthDate->setDate(qApp->GetCustomerBirthDate()); uiTabLabels->dateEditCustomerBirthDate->setDate(qApp->GetCustomerBirthDate());
@ -3716,7 +3719,7 @@ void DialogSeamAllowance::EnablePatternLabelFormulaControls(bool enable)
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void DialogSeamAllowance::SavePatternLabelData() void DialogSeamAllowance::SavePatternLabelData()
{ {
if (m_patternLabelDataChanged) if (m_patternLabelDataChanged && m_doc != nullptr)
{ {
m_doc->SetPatternName(uiTabLabels->lineEditPatternName->text()); m_doc->SetPatternName(uiTabLabels->lineEditPatternName->text());
m_doc->SetPatternNumber(uiTabLabels->lineEditPatternNumber->text()); m_doc->SetPatternNumber(uiTabLabels->lineEditPatternNumber->text());
@ -3738,7 +3741,7 @@ void DialogSeamAllowance::SavePatternLabelData()
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void DialogSeamAllowance::SavePatternTemplateData() void DialogSeamAllowance::SavePatternTemplateData()
{ {
if (m_patternTemplateDataChanged) if (m_patternTemplateDataChanged && m_doc != nullptr)
{ {
m_doc->SetPatternLabelTemplate(m_patternTemplateLines); m_doc->SetPatternLabelTemplate(m_patternTemplateLines);
m_patternTemplateDataChanged = false; m_patternTemplateDataChanged = false;
@ -3748,7 +3751,7 @@ void DialogSeamAllowance::SavePatternTemplateData()
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void DialogSeamAllowance::SavePatternMaterialData() void DialogSeamAllowance::SavePatternMaterialData()
{ {
if (m_patternMaterialsChanged) if (m_patternMaterialsChanged && m_doc != nullptr)
{ {
m_doc->SetPatternMaterials(m_patternMaterials); m_doc->SetPatternMaterials(m_patternMaterials);
m_patternMaterialsChanged = false; m_patternMaterialsChanged = false;
@ -3811,6 +3814,11 @@ void DialogSeamAllowance::EditPatternLabel()
} }
} }
if (m_doc == nullptr)
{
return;
}
DialogEditLabel editor(m_doc, data); DialogEditLabel editor(m_doc, data);
m_patternTemplateDataChanged ? editor.SetTemplate(m_patternTemplateLines) m_patternTemplateDataChanged ? editor.SetTemplate(m_patternTemplateLines)