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
[bos #40650][CEA 33012] Beta Law distribution: added a new type of distribution for...
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_NodesDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_NodesDlg.cxx
b/src/SMESHGUI/SMESHGUI_NodesDlg.cxx
index 9eec99fbf5ab7d3231aec01b0c42017aeb013a37..01f86709c4b7328e80c54e884bcf1798504455b8 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_NodesDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_NodesDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2007-20
24 CEA, EDF
, 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
@@
-55,7
+55,7
@@
#include <SVTK_ViewWindow.h>
#include <VTKViewer_Algorithm.h>
#include <SVTK_ViewWindow.h>
#include <VTKViewer_Algorithm.h>
-#include <VTKViewer_CellLocationsArray.h>
+
//
#include <VTKViewer_CellLocationsArray.h>
// SALOME KERNEL includes
#include <SALOMEDS_Study.hxx>
// SALOME KERNEL includes
#include <SALOMEDS_Study.hxx>
@@
-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 );
}
}
@@
-154,7
+152,7
@@
namespace SMESH
aCells->InsertNextCell( anIdList );
aCellTypesArray->InsertNextValue( VTK_VERTEX );
aCells->InsertNextCell( anIdList );
aCellTypesArray->InsertNextValue( VTK_VERTEX );
-
VTKViewer_CellLocationsArray* aCellLocationsArray = VTKViewer_CellLocations
Array::New();
+
vtkIdTypeArray* aCellLocationsArray = vtkIdType
Array::New();
aCellLocationsArray->SetNumberOfComponents( 1 );
aCellLocationsArray->SetNumberOfTuples( 1 );
aCellLocationsArray->SetNumberOfComponents( 1 );
aCellLocationsArray->SetNumberOfTuples( 1 );
@@
-397,7
+395,7
@@
void SMESHGUI_NodesDlg::Init()
// function : ValueChangedInSpinBox()
// purpose :
//=================================================================================
// function : ValueChangedInSpinBox()
// purpose :
//=================================================================================
-void SMESHGUI_NodesDlg::ValueChangedInSpinBox( double
newValue
)
+void SMESHGUI_NodesDlg::ValueChangedInSpinBox( double
/*newValue*/
)
{
if ( !myMesh->_is_nil() ) {
double vx = SpinBox_X->GetValue();
{
if ( !myMesh->_is_nil() ) {
double vx = SpinBox_X->GetValue();
@@
-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() ) {
@@
-499,7
+497,7
@@
bool SMESHGUI_NodesDlg::ClickOnApply()
}
if ( !aGroupUsed->_is_nil() ) {
}
if ( !aGroupUsed->_is_nil() ) {
- SMESH::
long_array_var anIdList = new SMESH::long
_array;
+ SMESH::
smIdType_array_var anIdList = new SMESH::smIdType
_array;
anIdList->length( 1 );
anIdList[0] = aNodeId;
aGroupUsed->Add( anIdList.inout() );
anIdList->length( 1 );
anIdList[0] = aNodeId;
aGroupUsed->Add( anIdList.inout() );