From: eap <eap@opencascade.com>
Date: Mon, 28 Mar 2011 12:22:53 +0000 (+0000)
Subject: 0020978: EDF 1475 SMESH: Convert linear to quadratic on a submesh
X-Git-Tag: Start_BR_19998_21191~4
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=9e3ba593d523e41dabd369657ab59b8b9c10346b;p=modules%2Fsmesh.git

0020978: EDF 1475 SMESH: Convert linear to quadratic on a submesh
   fix a bug found by Renaud (note 0010641)
---

diff --git a/src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx b/src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx
index d9cf28486..f91e5b368 100644
--- a/src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx
+++ b/src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx
@@ -234,20 +234,21 @@ bool SMESHGUI_ConvToQuadOp::onApply()
   {
     SMESH::SMESH_MeshEditor_var aEditor = mesh->GetMeshEditor();
     aResult = true; 
+    SMESH::SMESH_Mesh_var sourceMesh = SMESH::SObjectToInterface<SMESH::SMESH_Mesh>( pObj );  
     if( !myDlg->CurrentRB() )
     {
       bool aParam = true;
       if( myDlg->IsEnabledCheck() )
         aParam = myDlg->IsMediumNdsOnGeom();
 
-      if ( myDlg->isWarningShown() )
+      if ( sourceMesh->_is_nil() )
         aEditor->ConvertToQuadraticObject( aParam, idSource );
       else
         aEditor->ConvertToQuadratic( aParam );
     }
     else
     {
-      if ( myDlg->isWarningShown() )
+      if ( sourceMesh->_is_nil() )
         aEditor->ConvertFromQuadraticObject( idSource );
       else
         aEditor->ConvertFromQuadratic();