From b4ced822e0a2cbfab98b71c5b716d55d4b75f1a2 Mon Sep 17 00:00:00 2001
From: BojanKverh <bojan.kverh@gmail.com>
Date: Sun, 21 Aug 2016 11:48:51 +0200
Subject: [PATCH] Fixed material attribute writing to XML and removed commented
 out lines

--HG--
branch : feature
---
 src/libs/vtools/dialogs/tools/dialogdetail.cpp     | 7 +++----
 src/libs/vtools/tools/vtooldetail.cpp              | 8 ++++++++
 src/libs/vtools/undocommands/savedetailoptions.cpp | 6 ++++++
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/libs/vtools/dialogs/tools/dialogdetail.cpp b/src/libs/vtools/dialogs/tools/dialogdetail.cpp
index 8d16da5f4..4a95b77bc 100644
--- a/src/libs/vtools/dialogs/tools/dialogdetail.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogdetail.cpp
@@ -129,7 +129,6 @@ DialogDetail::DialogDetail(const VContainer *data, const quint32 &toolId, QWidge
                    << QApplication::translate("Detail", "Interfacing", 0)
                    << QApplication::translate("Detail", "Interlining", 0);
 
-    //ui.comboBoxMaterial->addItems(m_qslMaterials);
     for (int i = 0; i < m_qslMaterials.count(); ++i)
     {
         ui.comboBoxMaterial->addItem(m_qslMaterials[i], i);
@@ -253,7 +252,8 @@ void DialogDetail::AddUpdate()
     QStringList qslUserMaterials = qApp->Settings()->GetUserDefinedMaterials();
 
     int i = ui.comboBoxMaterial->currentData().toInt();
-    if (i < m_qslMaterials.count() && mcp.m_qsMaterialUserDef == m_qslMaterials[i])
+    QString qsMat = ui.comboBoxMaterial->currentText();
+    if (i < m_qslMaterials.count() && qsMat == m_qslMaterials[i])
     {
         mcp.m_eMaterial = MaterialType(i);
         mcp.m_qsMaterialUserDef.clear();
@@ -261,7 +261,7 @@ void DialogDetail::AddUpdate()
     else
     {
         mcp.m_eMaterial = MaterialType::mtUserDefined;
-        mcp.m_qsMaterialUserDef = ui.comboBoxMaterial->currentText();
+        mcp.m_qsMaterialUserDef = qsMat;
         // check if we have new user defined material
         bool bFound = false;
         for (int i = 0; i < qslUserMaterials.count() && bFound == false; ++i)
@@ -832,7 +832,6 @@ void DialogDetail::SetEditMode()
     }
     else
     {
-        //ui.comboBoxMaterial->setCurrentText(m_qslMaterials[int(mcp.m_eMaterial)]);
         ui.comboBoxMaterial->setCurrentIndex(int(mcp.m_eMaterial));
     }
     ui.spinBoxCutNumber->setValue(mcp.m_iCutNumber);
diff --git a/src/libs/vtools/tools/vtooldetail.cpp b/src/libs/vtools/tools/vtooldetail.cpp
index 8377ea9f2..2b5e4f35e 100644
--- a/src/libs/vtools/tools/vtooldetail.cpp
+++ b/src/libs/vtools/tools/vtooldetail.cpp
@@ -452,6 +452,10 @@ void VToolDetail::AddToFile()
         {
             doc->SetAttribute(domMCP, VAbstractPattern::AttrUserDefined, mcp.m_qsMaterialUserDef);
         }
+        else
+        {
+            domMCP.removeAttribute(VAbstractPattern::AttrUserDefined);
+        }
         doc->SetAttribute(domMCP, VAbstractPattern::AttrCutNumber, mcp.m_iCutNumber);
         doc->SetAttribute(domMCP, VAbstractPattern::AttrPlacement, int(mcp.m_ePlacement));
         domData.appendChild(domMCP);
@@ -514,6 +518,10 @@ void VToolDetail::RefreshDataInFile()
             {
                 doc->SetAttribute(domMCP, VAbstractPattern::AttrUserDefined, mcp.m_qsMaterialUserDef);
             }
+            else
+            {
+                domMCP.removeAttribute(VAbstractPattern::AttrUserDefined);
+            }
             doc->SetAttribute(domMCP, VAbstractPattern::AttrCutNumber, mcp.m_iCutNumber);
             doc->SetAttribute(domMCP, VAbstractPattern::AttrPlacement, int(mcp.m_ePlacement));
             domData.appendChild(domMCP);
diff --git a/src/libs/vtools/undocommands/savedetailoptions.cpp b/src/libs/vtools/undocommands/savedetailoptions.cpp
index fc4d76c6e..e16d4c107 100644
--- a/src/libs/vtools/undocommands/savedetailoptions.cpp
+++ b/src/libs/vtools/undocommands/savedetailoptions.cpp
@@ -163,8 +163,14 @@ void SaveDetailOptions::SavePatternPieceData(QDomElement &domElement, const VDet
         doc->SetAttribute(domMCP, VAbstractPattern::AttrMaterial, int(mcp.m_eMaterial));
         if (mcp.m_eMaterial == MaterialType::mtUserDefined)
         {
+            qDebug() << "USER DEFINED MATERIAL";
             doc->SetAttribute(domMCP, VAbstractPattern::AttrUserDefined, mcp.m_qsMaterialUserDef);
         }
+        else
+        {
+            qDebug() << "PREDEFINED MATERIAL";
+            domMCP.removeAttribute(VAbstractPattern::AttrUserDefined);
+        }
         doc->SetAttribute(domMCP, VAbstractPattern::AttrCutNumber, mcp.m_iCutNumber);
         doc->SetAttribute(domMCP, VAbstractPattern::AttrPlacement, int(mcp.m_ePlacement));
         domData.appendChild(domMCP);