Merge branch 'V8_4_BR'

[modules/smesh.git] / src / SMESHGUI / SMESHGUI_Make2DFrom3DOp.cxx

diff --git a/src/SMESHGUI/SMESHGUI_Make2DFrom3DOp.cxx b/src/SMESHGUI/SMESHGUI_Make2DFrom3DOp.cxx
index 199bdf420e29ce3ff830d3d64cc28956da8e89a3..45362c9c009c5ece3c1ef4ed550075cd83254ac3 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_Make2DFrom3DOp.cxx
+++ b/src/SMESHGUI/SMESHGUI_Make2DFrom3DOp.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -238,7 +238,7 @@ void SMESHGUI_Make2DFrom3DOp::startOperation()
   if( !myDlg )
     myDlg = new SMESHGUI_Make2DFrom3DDlg( desktop() );
 
-  myHelpFileName = "make_2dmesh_from_3d_page.html";
+  myHelpFileName = "make_2dmesh_from_3d.html";
 
   SMESHGUI_SelectionOp::startOperation();
 
@@ -299,14 +299,14 @@ void SMESHGUI_Make2DFrom3DOp::selectionDone()
       myDlg->selectObject( names, types, ids );
 
       // enable/desable "new mesh" button
-      bool isMesh = true; // EAP - it's sometimes necessary to copy to a new mesh
-      // for ( int i = 0; i < ids.count() && isMesh; ++i )
-      // {
-      //   _PTR(SObject) sobj =
-      //     SMESHGUI::activeStudy()->studyDS()->FindObjectID( ids[i].toLatin1().constData() );
-      //   mySrcMesh = SMESH::SObjectToInterface<SMESH::SMESH_Mesh>( sobj );  
-      //   isMesh = !mySrcMesh->_is_nil();
-      // }
+      bool isMesh = true;
+      for ( int i = 0; i < ids.count() && isMesh; ++i )
+      {
+        _PTR(SObject) sobj =
+          SMESHGUI::activeStudy()->studyDS()->FindObjectID( ids[i].toLatin1().constData() );
+        mySrcMesh = SMESH::SObjectToInterface<SMESH::SMESH_Mesh>( sobj );  
+        //isMesh = !mySrcMesh->_is_nil(); // EAP - it's sometimes necessary to copy to a new mesh
+      }
       myDlg->setNewMeshEnabled( isMesh );
     }
     catch ( const SALOME::SALOME_Exception& S_ex ) {