From: Paul RASCLE <paul.rascle@edf.fr>
Date: Wed, 10 Apr 2019 14:01:10 +0000 (+0200)
Subject: Merge branch 'BR_H2018_3' into BR_2018_V8_5
X-Git-Tag: SH_V2_2_0~99^2~24
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=fdc5c57ab3563074e3fa9c44c2c2f8b3ab582f0c;hp=58d58848fd9a381ce77e4889d275a980e4d9c452;p=modules%2Fhydro.git

Merge branch 'BR_H2018_3' into BR_2018_V8_5
---

diff --git a/src/HYDROGUI/HYDROGUI_Operation.cxx b/src/HYDROGUI/HYDROGUI_Operation.cxx
index 30caab31..80365156 100644
--- a/src/HYDROGUI/HYDROGUI_Operation.cxx
+++ b/src/HYDROGUI/HYDROGUI_Operation.cxx
@@ -232,7 +232,10 @@ void HYDROGUI_Operation::apply()
   catch ( Standard_Failure )
   {
     Handle(Standard_Failure) aFailure = Standard_Failure::Caught();
-    anErrorMsg = aFailure->GetMessageString();
+    if (aFailure)
+      anErrorMsg = aFailure->GetMessageString();
+    else
+      anErrorMsg = "failure unknown: catch ( Standard_Failure ) does not give access to failure!";
     aResult = false;
   }
   catch ( ... )
diff --git a/src/HYDROGUI/HYDROGUI_ProfileInterpolateDlg.cxx b/src/HYDROGUI/HYDROGUI_ProfileInterpolateDlg.cxx
index fe3f1beb..e4abcac6 100644
--- a/src/HYDROGUI/HYDROGUI_ProfileInterpolateDlg.cxx
+++ b/src/HYDROGUI/HYDROGUI_ProfileInterpolateDlg.cxx
@@ -87,7 +87,7 @@ HYDROGUI_ProfileInterpolateDlg::HYDROGUI_ProfileInterpolateDlg( HYDROGUI_Module*
     connect( myProfileFinish, SIGNAL( objectSelected( const QString& ) ), this, SIGNAL( profileFinishChanged( const QString& ) ) );
 
     connect( myProfileNumber, SIGNAL( valueChanged( int ) ), this, SIGNAL( profileNumberChanged( int ) ) );
-    connect( myParams, SIGNAL( editingFinished() ), this, SIGNAL( onParametersEditingFinished() ) );
+    connect( myParams, SIGNAL( editingFinished() ), this, SLOT( onParametersEditingFinished() ) );
 
     new HYDROGUI_OCCSelector( module(), viewer(), selectionMgr() );
 
diff --git a/src/HYDROGUI/HYDROGUI_ProfileInterpolateOp.cxx b/src/HYDROGUI/HYDROGUI_ProfileInterpolateOp.cxx
index 3ea3a5ea..6df4127f 100644
--- a/src/HYDROGUI/HYDROGUI_ProfileInterpolateOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_ProfileInterpolateOp.cxx
@@ -81,7 +81,7 @@ void HYDROGUI_ProfileInterpolateOp::abortOperation()
 {
     if ( !myPreview.IsNull() )
     {
-        HYDROGUI_ProfileInterpolateDlg* aDlg = new HYDROGUI_ProfileInterpolateDlg( module(), getName() );
+        HYDROGUI_ProfileInterpolateDlg* aDlg = ::qobject_cast<HYDROGUI_ProfileInterpolateDlg*>( inputPanel() );
         if ( aDlg && !aDlg->getAISContext().IsNull() )
         {
             aDlg->getAISContext()->Remove( myPreview, false );
@@ -96,7 +96,7 @@ void HYDROGUI_ProfileInterpolateOp::commitOperation()
 {
     if ( !myPreview.IsNull() )
     {
-        HYDROGUI_ProfileInterpolateDlg* aDlg = new HYDROGUI_ProfileInterpolateDlg( module(), getName() );
+        HYDROGUI_ProfileInterpolateDlg* aDlg = ::qobject_cast<HYDROGUI_ProfileInterpolateDlg*>( inputPanel() );
         if ( aDlg && !aDlg->getAISContext().IsNull() )
         {
             aDlg->getAISContext()->Remove( myPreview, false );