From: eap Date: Mon, 5 Mar 2007 07:31:47 +0000 (+0000) Subject: PAL13460 (PAL EDF 301 force the mesh to go through a point) X-Git-Tag: V3_2_6a1~10 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=170a5c71653cae5fb75f0baadfdf559c139081fc;p=modules%2Fsmesh.git PAL13460 (PAL EDF 301 force the mesh to go through a point) notify on invalid parameters --- diff --git a/src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.cxx b/src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.cxx index 73beea2ec..796a0f6b7 100644 --- a/src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.cxx @@ -55,6 +55,7 @@ #include "SalomeApp_Tools.h" #include "SUIT_ResourceMgr.h" #include "SUIT_OverrideCursor.h" +#include "SUIT_MessageBox.h" // OCCT Includes #include @@ -141,9 +142,9 @@ QFrame* SMESHGUI_MakeNodeAtPointDlg::createMainFrame (QWidget* theParent) aZLabel->setAlignment( Qt::AlignRight | Qt::AlignVCenter | Qt::ExpandTabs ); myZ = new SMESHGUI_SpinBox(aCoordGrp); - myX->RangeStepAndValidator(COORD_MIN, COORD_MAX, 25.0, 3); - myY->RangeStepAndValidator(COORD_MIN, COORD_MAX, 25.0, 3); - myZ->RangeStepAndValidator(COORD_MIN, COORD_MAX, 25.0, 3); + myX->RangeStepAndValidator(COORD_MIN, COORD_MAX, 10.0, 3); + myY->RangeStepAndValidator(COORD_MIN, COORD_MAX, 10.0, 3); + myZ->RangeStepAndValidator(COORD_MIN, COORD_MAX, 10.0, 3); // Method selection @@ -320,6 +321,7 @@ void SMESHGUI_MakeNodeAtPointOp::stopOperation() // myMeshActor->SetRepresentation( myMeshOldDisplayMode ); myMeshActor->SetPointRepresentation(false); SMESH::RepaintCurrentView(); + myMeshActor = 0; } SMESHGUI_SelectionOp::stopOperation(); } @@ -332,9 +334,20 @@ void SMESHGUI_MakeNodeAtPointOp::stopOperation() bool SMESHGUI_MakeNodeAtPointOp::onApply() { - if ( !isValid() ) return false; // node id is invalid + if ( !myMeshActor ) { + SUIT_MessageBox::warn1( dlg(), tr( "SMESH_WRN_WARNING" ), + tr("INVALID_MESH"), tr( "SMESH_BUT_OK" ) ); + dlg()->show(); + return false; + } + + if ( !isValid() ) { // node id is invalid + SUIT_MessageBox::warn1( dlg(), tr( "SMESH_WRN_WARNING" ), + tr("INVALID_ID"), tr( "SMESH_BUT_OK" ) ); + dlg()->show(); + return false; + } - if ( !myMeshActor ) return true; try { SMESH::SMESH_Mesh_var aMesh = SMESH::GetMeshByIO(myMeshActor->getIO()); @@ -383,7 +396,7 @@ bool SMESHGUI_MakeNodeAtPointOp::onApply() //================================================================================ /*! - * \brief Check data validity + * \brief Check selected node id validity */ //================================================================================ diff --git a/src/SMESHGUI/SMESH_msg_en.po b/src/SMESHGUI/SMESH_msg_en.po index 85c21dd16..77ab43c9c 100644 --- a/src/SMESHGUI/SMESH_msg_en.po +++ b/src/SMESHGUI/SMESH_msg_en.po @@ -1551,6 +1551,12 @@ msgstr "ID" msgid "SMESHGUI_MakeNodeAtPointDlg::AUTO_SEARCH" msgstr "Automatic search" +msgid "SMESHGUI_MakeNodeAtPointOp::INVALID_ID" +msgstr "Node ID is invalid" + +msgid "SMESHGUI_MakeNodeAtPointOp::INVALID_MESH" +msgstr "Mesh to modify not selected" + #---------------------------------------------------- msgid "SMESHGUI_DeleteGroupDlg::CAPTION"