Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into gni/adaptation
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_NodesDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_NodesDlg.cxx
b/src/SMESHGUI/SMESHGUI_NodesDlg.cxx
index e163699d4fc9921378360e394f3f1a8ad23c6dc0..1bd22a3e6b8816c0e6d9a9517e415dc939451db4 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_NodesDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_NodesDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
15
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
20
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
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-100,11
+100,9
@@
namespace SMESH
try {
_PTR(SObject) aSobj = SMESH::FindSObject( theMesh );
SMESH::SMESH_MeshEditor_var aMeshEditor = theMesh->GetMeshEditor();
try {
_PTR(SObject) aSobj = SMESH::FindSObject( theMesh );
SMESH::SMESH_MeshEditor_var aMeshEditor = theMesh->GetMeshEditor();
- theMesh->SetParameters( theParameters.join(":").to
Latin1
().constData() );
+ theMesh->SetParameters( theParameters.join(":").to
Utf8
().constData() );
aNodeId = aMeshEditor->AddNode( x, y, z );
aNodeId = aMeshEditor->AddNode( x, y, z );
- _PTR(Study) aStudy = GetActiveStudyDocument();
- CORBA::Long anId = aStudy->StudyId();
- if (TVisualObjPtr aVisualObj = SMESH::GetVisualObj( anId, aSobj->GetID().c_str() ) ) {
+ if (TVisualObjPtr aVisualObj = SMESH::GetVisualObj( aSobj->GetID().c_str() ) ) {
aVisualObj->Update( true );
}
}
aVisualObj->Update( true );
}
}
@@
-230,8
+228,8
@@
namespace SMESH
//=================================================================================
SMESHGUI_NodesDlg::SMESHGUI_NodesDlg( SMESHGUI* theModule ):
QDialog( SMESH::GetDesktop( theModule ) ),
//=================================================================================
SMESHGUI_NodesDlg::SMESHGUI_NodesDlg( SMESHGUI* theModule ):
QDialog( SMESH::GetDesktop( theModule ) ),
- mySelector( SMESH::GetViewWindow( theModule )->GetSelector() ),
mySelectionMgr( SMESH::GetSelectionMgr( theModule ) ),
mySelectionMgr( SMESH::GetSelectionMgr( theModule ) ),
+ mySelector( SMESH::GetViewWindow( theModule )->GetSelector() ),
mySMESHGUI( theModule )
{
setModal( false );
mySMESHGUI( theModule )
{
setModal( false );
@@
-331,7
+329,7
@@
SMESHGUI_NodesDlg::SMESHGUI_NodesDlg( SMESHGUI* theModule ):
SMESHGUI_NodesDlgLayout->addWidget( GroupGroups );
SMESHGUI_NodesDlgLayout->addWidget( GroupButtons );
SMESHGUI_NodesDlgLayout->addWidget( GroupGroups );
SMESHGUI_NodesDlgLayout->addWidget( GroupButtons );
- myHelpFileName = "adding_nodes_and_elements
_page.html#adding_nodes_
anchor";
+ myHelpFileName = "adding_nodes_and_elements
.html#adding-nodes-
anchor";
/* Initialisation and display */
Init();
/* Initialisation and display */
Init();
@@
-423,7
+421,7
@@
void SMESHGUI_NodesDlg::ClickOnOk()
//=================================================================================
bool SMESHGUI_NodesDlg::ClickOnApply()
{
//=================================================================================
bool SMESHGUI_NodesDlg::ClickOnApply()
{
- if (
mySMESHGUI->isActive
StudyLocked() )
+ if (
SMESHGUI::is
StudyLocked() )
return false;
if ( myMesh->_is_nil() ) {
return false;
if ( myMesh->_is_nil() ) {