X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_AddQuadraticElementDlg.cxx;h=5a51a1a635714f0316db0a1b025f66c12dc46628;hp=427e65ac8a7b8e3e3393be0f3c464308ecd07627;hb=e85e13ee2a8e2484050471ff8e4dea298abe481a;hpb=3a821b48ba986795abde72f524fa1a62a5802df2 diff --git a/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx b/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx index 427e65ac8..5a51a1a63 100644 --- a/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2020 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -546,67 +546,67 @@ void SMESHGUI_AddQuadraticElementDlg::Init() case SMDSEntity_Quad_Edge: aNumRows = 1; myNbCorners = 2; - myHelpFileName = "adding_quadratic_elements_page.html#?"; //Adding_edges + myHelpFileName = "adding_quadratic_elements.html#?"; //Adding_edges break; case SMDSEntity_Quad_Triangle: aNumRows = 3; myNbCorners = 3; - myHelpFileName = "adding_quadratic_elements_page.html#?"; //Adding_triangles + myHelpFileName = "adding_quadratic_elements.html#?"; //Adding_triangles break; case SMDSEntity_BiQuad_Triangle: aNumRows = 3; myNbCorners = 3; myNbCenterNodes = 1; - myHelpFileName = "adding_quadratic_elements_page.html#?"; //Adding_triangles + myHelpFileName = "adding_quadratic_elements.html#?"; //Adding_triangles break; case SMDSEntity_Quad_Quadrangle: aNumRows = 4; myNbCorners = 4; - myHelpFileName = "adding_quadratic_elements_page.html#?"; //Adding_quadrangles + myHelpFileName = "adding_quadratic_elements.html#?"; //Adding_quadrangles break; case SMDSEntity_BiQuad_Quadrangle: aNumRows = 4; myNbCorners = 4; myNbCenterNodes = 1; - myHelpFileName = "adding_quadratic_elements_page.html#?"; //Adding_quadrangles + myHelpFileName = "adding_quadratic_elements.html#?"; //Adding_quadrangles break; case SMDSEntity_Quad_Polygon: aNumRows = 5; myNbCorners = 0; // no limit - myHelpFileName = "adding_quadratic_elements_page.html#?"; //Adding_polygons + myHelpFileName = "adding_quadratic_elements.html#?"; //Adding_polygons break; case SMDSEntity_Quad_Tetra: aNumRows = 6; myNbCorners = 4; - myHelpFileName = "adding_quadratic_elements_page.html#?"; //Adding_tetrahedrons + myHelpFileName = "adding_quadratic_elements.html#?"; //Adding_tetrahedrons break; case SMDSEntity_Quad_Pyramid: aNumRows = 8; myNbCorners = 5; - myHelpFileName = "adding_quadratic_elements_page.html#?"; //Adding_pyramids + myHelpFileName = "adding_quadratic_elements.html#?"; //Adding_pyramids break; case SMDSEntity_Quad_Penta: aNumRows = 9; myNbCorners = 6; - myHelpFileName = "adding_quadratic_elements_page.html#?"; //Adding_pentahedrons + myHelpFileName = "adding_quadratic_elements.html#?"; //Adding_pentahedrons break; case SMDSEntity_BiQuad_Penta: aNumRows = 9; myNbCorners = 6; myNbMidFaceNodes = 3; - myHelpFileName = "adding_quadratic_elements_page.html#?"; //Adding_pentahedrons + myHelpFileName = "adding_quadratic_elements.html#?"; //Adding_pentahedrons break; case SMDSEntity_Quad_Hexa: aNumRows = 12; myNbCorners = 8; - myHelpFileName = "adding_quadratic_elements_page.html#?"; //Adding_hexahedrons + myHelpFileName = "adding_quadratic_elements.html#?"; //Adding_hexahedrons break; case SMDSEntity_TriQuad_Hexa: aNumRows = 12; myNbCorners = 8; myNbMidFaceNodes = 6; myNbCenterNodes = 1; - myHelpFileName = "adding_quadratic_elements_page.html#?"; //Adding_hexahedrons + myHelpFileName = "adding_quadratic_elements.html#?"; //Adding_hexahedrons break; default:; } @@ -695,7 +695,7 @@ bool SMESHGUI_AddQuadraticElementDlg::ClickOnApply() if( !isValid() ) return false; - if ( mySMESHGUI->isActiveStudyLocked() || myBusy || !IsValid() ) + if ( SMESHGUI::isStudyLocked() || myBusy || !IsValid() ) return false; BusyLocker lock( myBusy );