From 666dd664eb9b62d9bedcaa47db12ead3010df68e Mon Sep 17 00:00:00 2001
From: dismine <dismine@gmail.com>
Date: Mon, 13 Jan 2014 02:48:31 +0200
Subject: [PATCH] Delete nodes from detail. Fix for union details.

--HG--
branch : feature
---
 src/container/vcontainer.h                |  1 +
 src/dialogs/dialogdetail.cpp              | 10 +++++++
 src/dialogs/dialogdetail.h                |  1 +
 src/dialogs/dialogdetail.ui               | 14 ++++++++--
 src/geometry/vdetail.cpp                  | 23 +++++++++++++++
 src/geometry/vdetail.h                    |  1 +
 src/tools/nodeDetails/vabstractnode.cpp   | 34 +++++++++++++++++++++++
 src/tools/nodeDetails/vabstractnode.h     |  1 +
 src/tools/nodeDetails/vnodearc.cpp        |  6 ++++
 src/tools/nodeDetails/vnodearc.h          |  1 +
 src/tools/nodeDetails/vnodepoint.cpp      |  6 ++++
 src/tools/nodeDetails/vnodepoint.h        |  1 +
 src/tools/nodeDetails/vnodespline.cpp     |  6 ++++
 src/tools/nodeDetails/vnodespline.h       |  1 +
 src/tools/nodeDetails/vnodesplinepath.cpp |  6 ++++
 src/tools/nodeDetails/vnodesplinepath.h   |  1 +
 src/tools/vabstracttool.cpp               |  4 ++-
 src/tools/vtooldetail.cpp                 | 11 ++++++++
 src/xml/vdomdocument.cpp                  |  1 +
 19 files changed, 126 insertions(+), 3 deletions(-)

diff --git a/src/container/vcontainer.h b/src/container/vcontainer.h
index 3db6e1744..c91009ada 100644
--- a/src/container/vcontainer.h
+++ b/src/container/vcontainer.h
@@ -279,6 +279,7 @@ public:
      * @brief ClearLineAngles clear angles of lines
      */
     inline void         ClearLineAngles() {lineAngles.clear();}
+    inline void         ClearDetails() {details.clear();}
     /**
      * @brief SetSize set value of size
      * @param size value of size in mm
diff --git a/src/dialogs/dialogdetail.cpp b/src/dialogs/dialogdetail.cpp
index 1d57d7505..d0801cfff 100644
--- a/src/dialogs/dialogdetail.cpp
+++ b/src/dialogs/dialogdetail.cpp
@@ -56,6 +56,8 @@ DialogDetail::DialogDetail(const VContainer *data, QWidget *parent)
     connect(ui.checkBoxSeams, &QCheckBox::clicked, this, &DialogDetail::ClickedSeams);
     connect(ui.checkBoxClosed, &QCheckBox::clicked, this, &DialogDetail::ClickedClosed);
     connect(ui.lineEditNameDetail, &QLineEdit::textChanged, this, &DialogDetail::NamePointChanged);
+
+    connect(ui.toolButtonDelete, &QToolButton::clicked, this, &DialogDetail::DeleteItem);
 }
 
 void DialogDetail::ChoosedObject(qint64 id, const Scene::Scenes &type)
@@ -80,6 +82,7 @@ void DialogDetail::ChoosedObject(qint64 id, const Scene::Scenes &type)
                 qWarning()<<tr("Got wrong scene object. Ignore.");
                 break;
         }
+        ui.toolButtonDelete->setEnabled(true);
         this->show();
     }
 }
@@ -170,6 +173,7 @@ void DialogDetail::setDetails(const VDetail &value)
     ui.doubleSpinBoxSeams->setValue(details.getWidth());
     ui.listWidget->setCurrentRow(0);
     ui.listWidget->setFocus(Qt::OtherFocusReason);
+    ui.toolButtonDelete->setEnabled(true);
 }
 
 void DialogDetail::BiasXChanged(qreal d)
@@ -215,3 +219,9 @@ void DialogDetail::ObjectChanged(int row)
     ui.doubleSpinBoxBiasX->setValue(toMM(node.getMx()));
     ui.doubleSpinBoxBiasY->setValue(toMM(node.getMy()));
 }
+
+void DialogDetail::DeleteItem()
+{
+    qint32 row = ui.listWidget->currentRow();
+    delete ui.listWidget->item( row );
+}
diff --git a/src/dialogs/dialogdetail.h b/src/dialogs/dialogdetail.h
index 476b7cc90..4328afef9 100644
--- a/src/dialogs/dialogdetail.h
+++ b/src/dialogs/dialogdetail.h
@@ -91,6 +91,7 @@ public slots:
      * @param row number of row
      */
     void             ObjectChanged(int row);
+    void             DeleteItem();
 private:
     /**
      * @brief ui keeps information about user interface
diff --git a/src/dialogs/dialogdetail.ui b/src/dialogs/dialogdetail.ui
index 3775555bd..6519b344d 100644
--- a/src/dialogs/dialogdetail.ui
+++ b/src/dialogs/dialogdetail.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>544</width>
-    <height>327</height>
+    <width>565</width>
+    <height>324</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -211,6 +211,16 @@
             </property>
            </widget>
           </item>
+          <item>
+           <widget class="QToolButton" name="toolButtonDelete">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="text">
+             <string>Delete</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
diff --git a/src/geometry/vdetail.cpp b/src/geometry/vdetail.cpp
index 59dfd3a3a..d771cdd59 100644
--- a/src/geometry/vdetail.cpp
+++ b/src/geometry/vdetail.cpp
@@ -232,6 +232,29 @@ VDetail VDetail::RemoveEdge(const ptrdiff_t &index) const
     return det;
 }
 
+QList<qint64> VDetail::Missing(const VDetail &det) const
+{
+    QList<qint64> list;
+    if(nodes.size() == det.CountNode())
+    {
+        return list;
+    }
+
+    qint32 j = 0;
+    for(qint32 i = 0; i < nodes.size(); ++i)
+    {
+        if(nodes[i].getId() == det.at(j).getId())
+        {
+            ++j;
+        }
+        else
+        {
+            list.append(nodes[i].getId());
+        }
+    }
+    return list;
+}
+
 QVector<VNodeDetail> VDetail::listNodePoint() const
 {
     QVector<VNodeDetail> list;
diff --git a/src/geometry/vdetail.h b/src/geometry/vdetail.h
index 9edbdfdbf..4825a8a13 100644
--- a/src/geometry/vdetail.h
+++ b/src/geometry/vdetail.h
@@ -183,6 +183,7 @@ public:
     ptrdiff_t      Edge(const qint64 &p1, const qint64 &p2)const;
     void           NodeOnEdge(const ptrdiff_t &index, VNodeDetail &p1, VNodeDetail &p2)const;
     VDetail        RemoveEdge(const ptrdiff_t &index) const;
+    QList<qint64>  Missing(const VDetail &det) const;
 private:
     qint64         _id;
     /**
diff --git a/src/tools/nodeDetails/vabstractnode.cpp b/src/tools/nodeDetails/vabstractnode.cpp
index 0b964aea2..4a9464eb2 100644
--- a/src/tools/nodeDetails/vabstractnode.cpp
+++ b/src/tools/nodeDetails/vabstractnode.cpp
@@ -39,6 +39,40 @@ VAbstractNode::VAbstractNode(VDomDocument *doc, VContainer *data, const qint64 &
     _referens = 0;
 }
 
+void VAbstractNode::DeleteNode()
+{
+    if (_referens <= 1)
+    {
+        //remove from xml file
+        QDomElement domElement = doc->elementById(QString().setNum(id));
+        if (domElement.isElement())
+        {
+            QDomNode element = domElement.parentNode();
+            if (element.isNull() == false)
+            {
+                if (element.isElement())
+                {
+                    RemoveReferens();//deincrement referens
+                    element.removeChild(domElement);//remove form file
+                    emit toolhaveChange();//set enabled save button
+                }
+                else
+                {
+                    qWarning()<<"parent isn't element"<<Q_FUNC_INFO;
+                }
+            }
+            else
+            {
+                qWarning()<<"parent isNull"<<Q_FUNC_INFO;
+            }
+        }
+        else
+        {
+            qWarning()<<"Can't get element by id form file = "<<id<<Q_FUNC_INFO;
+        }
+    }
+}
+
 void VAbstractNode::AddToModeling(const QDomElement &domElement)
 {
     QDomElement modelingElement;
diff --git a/src/tools/nodeDetails/vabstractnode.h b/src/tools/nodeDetails/vabstractnode.h
index f4726933f..8d1de516d 100644
--- a/src/tools/nodeDetails/vabstractnode.h
+++ b/src/tools/nodeDetails/vabstractnode.h
@@ -54,6 +54,7 @@ public:
      */
     static const QString AttrIdObject;
     static const QString AttrIdTool;
+    virtual void DeleteNode();
 protected:
     /**
      * @brief idNode
diff --git a/src/tools/nodeDetails/vnodearc.cpp b/src/tools/nodeDetails/vnodearc.cpp
index ae9d6a66c..2a9208197 100644
--- a/src/tools/nodeDetails/vnodearc.cpp
+++ b/src/tools/nodeDetails/vnodearc.cpp
@@ -78,6 +78,12 @@ void VNodeArc::Create(VDomDocument *doc, VContainer *data, qint64 id, qint64 idA
     }
 }
 
+void VNodeArc::DeleteNode()
+{
+    VAbstractNode::DeleteNode();
+    this->setVisible(false);
+}
+
 void VNodeArc::FullUpdateFromFile()
 {
     RefreshGeometry();
diff --git a/src/tools/nodeDetails/vnodearc.h b/src/tools/nodeDetails/vnodearc.h
index 1e263a44f..787025a96 100644
--- a/src/tools/nodeDetails/vnodearc.h
+++ b/src/tools/nodeDetails/vnodearc.h
@@ -70,6 +70,7 @@ public:
      * @brief ToolType
      */
     static const QString ToolType;
+    virtual void DeleteNode();
 public slots:
     /**
      * @brief FullUpdateFromFile
diff --git a/src/tools/nodeDetails/vnodepoint.cpp b/src/tools/nodeDetails/vnodepoint.cpp
index 509a426d8..5d48ce2a5 100644
--- a/src/tools/nodeDetails/vnodepoint.cpp
+++ b/src/tools/nodeDetails/vnodepoint.cpp
@@ -89,6 +89,12 @@ void VNodePoint::Create(VDomDocument *doc, VContainer *data, qint64 id, qint64 i
     }
 }
 
+void VNodePoint::DeleteNode()
+{
+    VAbstractNode::DeleteNode();
+    this->setVisible(false);
+}
+
 void VNodePoint::FullUpdateFromFile()
 {
     RefreshPointGeometry(*VAbstractTool::data.GeometricObject<const VPointF *>(id));
diff --git a/src/tools/nodeDetails/vnodepoint.h b/src/tools/nodeDetails/vnodepoint.h
index ba95a89b6..ac40a57e1 100644
--- a/src/tools/nodeDetails/vnodepoint.h
+++ b/src/tools/nodeDetails/vnodepoint.h
@@ -71,6 +71,7 @@ public:
      * @brief ToolType
      */
     static const QString ToolType;
+    virtual void DeleteNode();
 public slots:
     /**
      * @brief FullUpdateFromFile
diff --git a/src/tools/nodeDetails/vnodespline.cpp b/src/tools/nodeDetails/vnodespline.cpp
index 22255e243..f6ce6014d 100644
--- a/src/tools/nodeDetails/vnodespline.cpp
+++ b/src/tools/nodeDetails/vnodespline.cpp
@@ -81,6 +81,12 @@ VNodeSpline *VNodeSpline::Create(VDomDocument *doc, VContainer *data, qint64 id,
     return spl;
 }
 
+void VNodeSpline::DeleteNode()
+{
+    VAbstractNode::DeleteNode();
+    this->setVisible(false);
+}
+
 void VNodeSpline::FullUpdateFromFile()
 {
     RefreshGeometry();
diff --git a/src/tools/nodeDetails/vnodespline.h b/src/tools/nodeDetails/vnodespline.h
index 36426b92e..eb62f8dcd 100644
--- a/src/tools/nodeDetails/vnodespline.h
+++ b/src/tools/nodeDetails/vnodespline.h
@@ -72,6 +72,7 @@ public:
      * @brief ToolType
      */
     static const QString ToolType;
+    virtual void DeleteNode();
 public slots:
     /**
      * @brief FullUpdateFromFile
diff --git a/src/tools/nodeDetails/vnodesplinepath.cpp b/src/tools/nodeDetails/vnodesplinepath.cpp
index f73420ee6..590fd4f19 100644
--- a/src/tools/nodeDetails/vnodesplinepath.cpp
+++ b/src/tools/nodeDetails/vnodesplinepath.cpp
@@ -85,6 +85,12 @@ void VNodeSplinePath::Create(VDomDocument *doc, VContainer *data, qint64 id, qin
     }
 }
 
+void VNodeSplinePath::DeleteNode()
+{
+    VAbstractNode::DeleteNode();
+    this->setVisible(false);
+}
+
 void VNodeSplinePath::FullUpdateFromFile()
 {
     RefreshGeometry();
diff --git a/src/tools/nodeDetails/vnodesplinepath.h b/src/tools/nodeDetails/vnodesplinepath.h
index 2d7721442..854b7185b 100644
--- a/src/tools/nodeDetails/vnodesplinepath.h
+++ b/src/tools/nodeDetails/vnodesplinepath.h
@@ -71,6 +71,7 @@ public:
      * @brief ToolType
      */
     static const QString ToolType;
+    virtual void DeleteNode();
 public slots:
     /**
      * @brief FullUpdateFromFile
diff --git a/src/tools/vabstracttool.cpp b/src/tools/vabstracttool.cpp
index e1699d6a3..eb762bd41 100644
--- a/src/tools/vabstracttool.cpp
+++ b/src/tools/vabstracttool.cpp
@@ -178,6 +178,7 @@ void VAbstractTool::RemoveAllChild(QDomElement &domElement)
     }
 }
 
+//TODO see method deleteNode. I think no need have QGraphicsItem. QObject can delete yourself.
 void VAbstractTool::DeleteTool(QGraphicsItem *tool)
 {
     if (_referens <= 1)
@@ -198,7 +199,8 @@ void VAbstractTool::DeleteTool(QGraphicsItem *tool)
                     {
                         scene->removeItem(tool);//remove form scene
                     }
-                    emit toolhaveChange();//set enabled save button
+                    doc->FullUpdateTree();
+                    //emit toolhaveChange();//set enabled save button
                 }
                 else
                 {
diff --git a/src/tools/vtooldetail.cpp b/src/tools/vtooldetail.cpp
index 0999c4c59..7f00c0771 100644
--- a/src/tools/vtooldetail.cpp
+++ b/src/tools/vtooldetail.cpp
@@ -185,6 +185,17 @@ void VToolDetail::FullUpdateFromGui(int result)
             {
                AddNode(domElement, det[i]);
             }
+            VDetail detail = VAbstractTool::data.GetDetail(id);
+            QList<qint64> list = detail.Missing(det);
+            QHash<qint64, VDataTool*>* tools = doc->getTools();
+            if(list.size()>0)
+            {
+                for(qint32 i = 0; i < list.size(); ++i)
+                {
+                    VAbstractNode *node = qobject_cast<VAbstractNode *>(tools->value(list[i]));
+                    node->DeleteNode();
+                }
+            }
             emit FullUpdateTree();
         }
     }
diff --git a/src/xml/vdomdocument.cpp b/src/xml/vdomdocument.cpp
index 395cdbb87..51a034214 100644
--- a/src/xml/vdomdocument.cpp
+++ b/src/xml/vdomdocument.cpp
@@ -350,6 +350,7 @@ void VDomDocument::Parse(const Document::Documents &parse, VMainGraphicsScene *s
     data->ClearLengthArcs();
     data->ClearLengthSplines();
     data->ClearLineAngles();
+    data->ClearDetails();
     history.clear();
     QDomElement rootElement = this->documentElement();
     QDomNode domNode = rootElement.firstChild();