Fixed issue #196. Detail Editor crashes on Delete.

--HG--
branch : develop

src/app/dialogs/tools/dialogdetail.cpp

@@ -44,7 +44,7 @@
  * @param parent parent widget
  */
 DialogDetail::DialogDetail(const VContainer *data, const quint32 &toolId, QWidget *parent)
-    :DialogTool(data, toolId, parent), ui(), details(VDetail()), supplement(true), closed(true)
+    :DialogTool(data, toolId, parent), ui(), detail(VDetail()), supplement(true), closed(true)
 {
     ui.setupUi(this);
     labelEditNamePoint = ui.labelEditNameDetail;
@@ -110,7 +110,22 @@ void DialogDetail::ChosenObject(quint32 id, const SceneObject &type)
                 qDebug()<<tr("Got wrong scene object. Ignore.");
                 break;
         }
-        ui.toolButtonDelete->setEnabled(true);
+
+        if (ui.listWidget->count() > 0)
+        {
+            EnableObjectGUI(true);
+        }
+
+        if (CreateDetail().ContourPoints(data).size() < 3)
+        {
+            ValidObjects(false);
+        }
+        else
+        {
+            ValidObjects(true);
+
+        }
+
         this->show();
     }
 }
@@ -118,16 +133,8 @@ void DialogDetail::ChosenObject(quint32 id, const SceneObject &type)
 //---------------------------------------------------------------------------------------------------------------------
 void DialogDetail::SaveData()
 {
-    details.Clear();
+    detail.Clear();
-    for (qint32 i = 0; i < ui.listWidget->count(); ++i)
+    detail = CreateDetail();
-    {
-        QListWidgetItem *item = ui.listWidget->item(i);
-        details.append( qvariant_cast<VNodeDetail>(item->data(Qt::UserRole)));
-    }
-    details.setWidth(ui.doubleSpinBoxSeams->value());
-    details.setName(ui.lineEditNameDetail->text());
-    details.setSeamAllowance(supplement);
-    details.setClosed(closed);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -202,26 +209,62 @@ void DialogDetail::NewItem(quint32 id, const Tool &typeTool, const NodeDetail &t
     ui.doubleSpinBoxBiasY->blockSignals(false);
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+VDetail DialogDetail::CreateDetail() const
+{
+    VDetail detail;
+    for (qint32 i = 0; i < ui.listWidget->count(); ++i)
+    {
+        QListWidgetItem *item = ui.listWidget->item(i);
+        detail.append( qvariant_cast<VNodeDetail>(item->data(Qt::UserRole)));
+    }
+    detail.setWidth(ui.doubleSpinBoxSeams->value());
+    detail.setName(ui.lineEditNameDetail->text());
+    detail.setSeamAllowance(supplement);
+    detail.setClosed(closed);
+    return detail;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogDetail::ValidObjects(bool value)
+{
+    flagError = value;
+    CheckState();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogDetail::EnableObjectGUI(bool value)
+{
+    ui.toolButtonDelete->setEnabled(value);
+    ui.doubleSpinBoxBiasX->setEnabled(value);
+    ui.doubleSpinBoxBiasY->setEnabled(value);
+
+    if (value == false)
+    {
+        ui.checkBoxReverse->setEnabled(value);
+    }
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 /**
  * @brief setDetails set detail
  * @param value detail
  */
-void DialogDetail::setDetails(const VDetail &value)
+void DialogDetail::setDetail(const VDetail &value)
 {
-    details = value;
+    detail = value;
     ui.listWidget->clear();
-    for (int i = 0; i < details.CountNode(); ++i)
+    for (int i = 0; i < detail.CountNode(); ++i)
     {
-        NewItem(details.at(i).getId(), details.at(i).getTypeTool(), details.at(i).getTypeNode(), details.at(i).getMx(),
+        NewItem(detail.at(i).getId(), detail.at(i).getTypeTool(), detail.at(i).getTypeNode(), detail.at(i).getMx(),
-                details.at(i).getMy(), details.at(i).getReverse());
+                detail.at(i).getMy(), detail.at(i).getReverse());
     }
-    ui.lineEditNameDetail->setText(details.getName());
+    ui.lineEditNameDetail->setText(detail.getName());
-    ui.checkBoxSeams->setChecked(details.getSeamAllowance());
+    ui.checkBoxSeams->setChecked(detail.getSeamAllowance());
-    ui.checkBoxClosed->setChecked(details.getClosed());
+    ui.checkBoxClosed->setChecked(detail.getClosed());
-    ClickedClosed(details.getClosed());
+    ClickedClosed(detail.getClosed());
-    ClickedSeams(details.getSeamAllowance());
+    ClickedSeams(detail.getSeamAllowance());
-    ui.doubleSpinBoxSeams->setValue(details.getWidth());
+    ui.doubleSpinBoxSeams->setValue(detail.getWidth());
     ui.listWidget->setCurrentRow(0);
     ui.listWidget->setFocus(Qt::OtherFocusReason);
     ui.toolButtonDelete->setEnabled(true);
@@ -297,7 +340,7 @@ void DialogDetail::ClickedReverse(bool checked)
  */
 void DialogDetail::ObjectChanged(int row)
 {
-    if (ui.listWidget->count() == 0)
+    if (ui.listWidget->count() == 0 || row == -1)
     {
         return;
     }
@@ -323,8 +366,16 @@ void DialogDetail::ObjectChanged(int row)
  */
 void DialogDetail::DeleteItem()
 {
-    qint32 row = ui.listWidget->currentRow();
+    if (ui.listWidget->count() == 1)
-    delete ui.listWidget->item( row );
+    {
+        EnableObjectGUI(false);
+    }
+
+    delete ui.listWidget->item( ui.listWidget->currentRow() );
+    if (CreateDetail().ContourPoints(data).size() < 3 )
+    {
+        ValidObjects(false);
+    }
 }
 
 

src/app/dialogs/tools/dialogdetail.h

@@ -42,8 +42,8 @@ class DialogDetail : public DialogTool
 public:
     DialogDetail(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr);
 
-    VDetail          getDetails() const;
+    VDetail          getDetail() const;
-    void             setDetails(const VDetail &value);
+    void             setDetail(const VDetail &value);
 public slots:
     virtual void     ChosenObject(quint32 id, const SceneObject &type);
     void             BiasXChanged(qreal d);
@@ -64,8 +64,8 @@ private:
     /** @brief ui keeps information about user interface */
     Ui::DialogDetail ui;
 
-    /** @brief details detail */
+    /** @brief detail detail */
-    VDetail          details;
+    VDetail          detail;
 
     /** @brief supplement keep option supplement of seams */
     bool             supplement;
@@ -75,6 +75,9 @@ private:
 
     void             NewItem(quint32 id, const Tool &typeTool, const NodeDetail &typeNode,
                              qreal mx = 0, qreal my = 0, bool reverse = false);
+    VDetail          CreateDetail() const;
+    void             ValidObjects(bool value);
+    void             EnableObjectGUI(bool value);
 };
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -82,9 +85,9 @@ private:
  * @brief getDetails return detail
  * @return detail
  */
-inline VDetail DialogDetail::getDetails() const
+inline VDetail DialogDetail::getDetail() const
 {
-    return details;
+    return detail;
 }
 
 #endif // DIALOGDETAIL_H

src/app/tools/vtooldetail.cpp

@@ -129,7 +129,7 @@ void VToolDetail::setDialog()
     DialogDetail *dialogTool = qobject_cast<DialogDetail*>(dialog);
     SCASSERT(dialogTool != nullptr);
     VDetail detail = VAbstractTool::data.GetDetail(id);
-    dialogTool->setDetails(detail);
+    dialogTool->setDetail(detail);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -145,7 +145,7 @@ void VToolDetail::Create(DialogTool *dialog, VMainGraphicsScene *scene, VPattern
     SCASSERT(dialog != nullptr);
     DialogDetail *dialogTool = qobject_cast<DialogDetail*>(dialog);
     SCASSERT(dialogTool != nullptr);
-    VDetail detail = dialogTool->getDetails();
+    VDetail detail = dialogTool->getDetail();
     VDetail det;
     qApp->getUndoStack()->beginMacro("add detail");
     for (int i = 0; i< detail.CountNode(); ++i)
@@ -260,7 +260,7 @@ void VToolDetail::FullUpdateFromGuiOk(int result)
         SCASSERT(dialog != nullptr);
         DialogDetail *dialogTool = qobject_cast<DialogDetail*>(dialog);
         SCASSERT(dialogTool != nullptr);
-        VDetail newDet = dialogTool->getDetails();
+        VDetail newDet = dialogTool->getDetail();
         VDetail oldDet = VAbstractTool::data.GetDetail(id);
 
         SaveDetailOptions *saveCommand = new SaveDetailOptions(oldDet, newDet, doc, id, this->scene());