From: asl <asl@opencascade.com>
Date: Wed, 20 Sep 2017 11:40:08 +0000 (+0300)
Subject: refs #1335: delete profile point via keyboard "Delete"
X-Git-Tag: v2.1~66^2~33
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=931d822245bc349d80eca7ff89b89dcc918c49ea;p=modules%2Fhydro.git

refs #1335: delete profile point via keyboard "Delete"
---

diff --git a/src/HYDROGUI/HYDROGUI_DeleteOp.cxx b/src/HYDROGUI/HYDROGUI_DeleteOp.cxx
index 8425cb1d..7164ea8a 100644
--- a/src/HYDROGUI/HYDROGUI_DeleteOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_DeleteOp.cxx
@@ -23,6 +23,7 @@
 #include "HYDROGUI_Tool.h"
 #include "HYDROGUI_Tool2.h"
 #include "HYDROGUI_UpdateFlags.h"
+#include "HYDROGUI_ProfileOp.h"
 
 #include <HYDROData_Object.h>
 #include <HYDROData_Document.h>
@@ -31,6 +32,7 @@
 
 #include <SUIT_Desktop.h>
 #include <SUIT_MessageBox.h>
+#include <SUIT_Study.h>
 
 #include <QSet>
 
@@ -46,6 +48,20 @@ HYDROGUI_DeleteOp::~HYDROGUI_DeleteOp()
 
 void HYDROGUI_DeleteOp::startOperation()
 {
+  QList<SUIT_Operation*> operations = study()->operations();
+  int n = operations.size();
+  if( n>=2 )
+  {
+    SUIT_Operation* anOtherOp = operations[n-2];
+    HYDROGUI_ProfileOp* aProfileOp = dynamic_cast<HYDROGUI_ProfileOp*>( anOtherOp );
+    if( aProfileOp )
+    {
+      aProfileOp->deleteSelected();
+      abort();
+      return;
+    }
+  }
+
   HYDROGUI_Operation::startOperation();
 
   HYDROData_SequenceOfObjects aSeq = HYDROGUI_Tool::GetSelectedObjects( module() );
diff --git a/src/HYDROGUI/HYDROGUI_ProfileOp.cxx b/src/HYDROGUI/HYDROGUI_ProfileOp.cxx
index 11a60f85..ab8f669b 100644
--- a/src/HYDROGUI/HYDROGUI_ProfileOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_ProfileOp.cxx
@@ -25,6 +25,7 @@
 #include <HYDROData_Document.h>
 #include <HYDROData_Profile.h>
 #include <HYDROGUI_CurveCreatorProfile.h>
+#include <HYDROGUI_DeleteOp.h>
 #include <CurveCreator_Displayer.hxx>
 
 #include <LightApp_Application.h>
@@ -279,3 +280,12 @@ void HYDROGUI_ProfileOp::erasePreview()
     }
   }
 }
+
+bool HYDROGUI_ProfileOp::isValid( SUIT_Operation* theOtherOp ) const
+{
+  HYDROGUI_DeleteOp* aDelOp = dynamic_cast<HYDROGUI_DeleteOp*>( theOtherOp );
+  if( aDelOp )
+    return true;
+  else
+    return false;
+}
diff --git a/src/HYDROGUI/HYDROGUI_ProfileOp.h b/src/HYDROGUI/HYDROGUI_ProfileOp.h
index b9590309..2d773d8e 100644
--- a/src/HYDROGUI/HYDROGUI_ProfileOp.h
+++ b/src/HYDROGUI/HYDROGUI_ProfileOp.h
@@ -36,6 +36,8 @@ public:
   void                       deleteSelected();
   bool                       deleteEnabled();
 
+  virtual bool isValid( SUIT_Operation* theOtherOp ) const;
+
 protected:
   virtual void               startOperation();
   virtual void               abortOperation();