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 #40653][CEA] New mesh import export formats with meshio.
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_SmoothingDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_SmoothingDlg.cxx
b/src/SMESHGUI/SMESHGUI_SmoothingDlg.cxx
index caa4c51194fd1f1de33e69da4e28144d19cace2c..6c2c420b4da4a28f94117f8e9e1e1a3f046401cd 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_SmoothingDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_SmoothingDlg.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
@@
-268,7
+268,7
@@
SMESHGUI_SmoothingDlg::SMESHGUI_SmoothingDlg( SMESHGUI* theModule )
myMeshOrSubMeshOrGroupFilter =
new SMESH_LogicalFilter (aListOfFilters, SMESH_LogicalFilter::LO_OR);
myMeshOrSubMeshOrGroupFilter =
new SMESH_LogicalFilter (aListOfFilters, SMESH_LogicalFilter::LO_OR);
- myHelpFileName = "smoothing
_page
.html";
+ myHelpFileName = "smoothing.html";
Init();
Init();
@@
-341,7
+341,7
@@
void SMESHGUI_SmoothingDlg::Init()
//=================================================================================
bool SMESHGUI_SmoothingDlg::ClickOnApply()
{
//=================================================================================
bool SMESHGUI_SmoothingDlg::ClickOnApply()
{
- if (
mySMESHGUI->isActive
StudyLocked())
+ if (
SMESHGUI::is
StudyLocked())
return false;
if (!isValid())
return false;
if (!isValid())
@@
-351,8
+351,8
@@
bool SMESHGUI_SmoothingDlg::ClickOnApply()
QStringList aListElementsId = LineEditElements->text().split(" ", QString::SkipEmptyParts);
QStringList aListNodesId = LineEditNodes->text().split(" ", QString::SkipEmptyParts);
QStringList aListElementsId = LineEditElements->text().split(" ", QString::SkipEmptyParts);
QStringList aListNodesId = LineEditNodes->text().split(" ", QString::SkipEmptyParts);
- SMESH::
long_array_var anElementsId = new SMESH::long
_array;
- SMESH::
long_array_var aNodesId = new SMESH::long
_array;
+ SMESH::
smIdType_array_var anElementsId = new SMESH::smIdType
_array;
+ SMESH::
smIdType_array_var aNodesId = new SMESH::smIdType
_array;
anElementsId->length(aListElementsId.count());
for (int i = 0; i < aListElementsId.count(); i++)
anElementsId->length(aListElementsId.count());
for (int i = 0; i < aListElementsId.count(); i++)
@@
-382,7
+382,7
@@
bool SMESHGUI_SmoothingDlg::ClickOnApply()
SUIT_OverrideCursor aWaitCursor;
SMESH::SMESH_MeshEditor_var aMeshEditor = myMesh->GetMeshEditor();
SUIT_OverrideCursor aWaitCursor;
SMESH::SMESH_MeshEditor_var aMeshEditor = myMesh->GetMeshEditor();
- myMesh->SetParameters( aParameters.join(":").to
Latin1
().constData() );
+ myMesh->SetParameters( aParameters.join(":").to
Utf8
().constData() );
if ( CheckBoxParametric->isChecked() ) {
if(CheckBoxMesh->isChecked())
if ( CheckBoxParametric->isChecked() ) {
if(CheckBoxMesh->isChecked())
@@
-518,12
+518,12
@@
void SMESHGUI_SmoothingDlg::onTextChange (const QString& theNewText)
buttonOk->setEnabled(false);
buttonApply->setEnabled(false);
buttonOk->setEnabled(false);
buttonApply->setEnabled(false);
- // hilight entered elements/nodes
+ // hi
gh
light entered elements/nodes
SMDS_Mesh* aMesh = myActor ? myActor->GetObject()->GetMesh() : 0;
QStringList aListId = theNewText.split(" ", QString::SkipEmptyParts);
if (send == LineEditElements) {
SMDS_Mesh* aMesh = myActor ? myActor->GetObject()->GetMesh() : 0;
QStringList aListId = theNewText.split(" ", QString::SkipEmptyParts);
if (send == LineEditElements) {
-
TColStd_MapOfInteger
newIndices;
+
SVTK_TVtkIDsMap
newIndices;
for (int i = 0; i < aListId.count(); i++) {
int id = aListId[ i ].toInt();
if ( id > 0 ) {
for (int i = 0; i < aListId.count(); i++) {
int id = aListId[ i ].toInt();
if ( id > 0 ) {
@@
-538,7
+538,7
@@
void SMESHGUI_SmoothingDlg::onTextChange (const QString& theNewText)
}
}
else if (send == LineEditNodes) {
}
}
else if (send == LineEditNodes) {
-
TColStd_MapOfInteger
newIndices;
+
SVTK_TVtkIDsMap
newIndices;
for (int i = 0; i < aListId.count(); i++) {
int id = aListId[ i ].toInt();
if ( id > 0 ) {
for (int i = 0; i < aListId.count(); i++) {
int id = aListId[ i ].toInt();
if ( id > 0 ) {
@@
-619,7
+619,7
@@
void SMESHGUI_SmoothingDlg::SelectionIntoArgument()
myNbOkElements = true;
} else {
// get indices of selected elements
myNbOkElements = true;
} else {
// get indices of selected elements
-
TColStd_IndexedMapOfInteger
aMapIndex;
+
SVTK_TIndexedMapOfVtkId
aMapIndex;
mySelector->GetIndex(IO,aMapIndex);
myNbOkElements = aMapIndex.Extent();
mySelector->GetIndex(IO,aMapIndex);
myNbOkElements = aMapIndex.Extent();