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
mise à jour
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_SymmetryDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_SymmetryDlg.cxx
b/src/SMESHGUI/SMESHGUI_SymmetryDlg.cxx
index e6886021ad769e40218d413116f1c0ffd04f4254..2b9f39c9b458bc27b144cde10b9081e20e70d655 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_SymmetryDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_SymmetryDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16
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
@@
-289,7
+289,7
@@
SMESHGUI_SymmetryDlg::SMESHGUI_SymmetryDlg( SMESHGUI* theModule )
myMeshOrSubMeshOrGroupFilter =
new SMESH_LogicalFilter (aListOfFilters, SMESH_LogicalFilter::LO_OR);
myMeshOrSubMeshOrGroupFilter =
new SMESH_LogicalFilter (aListOfFilters, SMESH_LogicalFilter::LO_OR);
- myHelpFileName = "symmetry
_page
.html";
+ myHelpFileName = "symmetry.html";
Init();
Init();
@@
-474,7
+474,7
@@
void SMESHGUI_SymmetryDlg::ConstructorsClicked (int constructorId)
//=================================================================================
bool SMESHGUI_SymmetryDlg::ClickOnApply()
{
//=================================================================================
bool SMESHGUI_SymmetryDlg::ClickOnApply()
{
- if (
mySMESHGUI->isActive
StudyLocked())
+ if (
SMESHGUI::is
StudyLocked())
return false;
if( !isValid() )
return false;
if( !isValid() )
@@
-512,12
+512,12
@@
bool SMESHGUI_SymmetryDlg::ClickOnApply()
if(CheckBoxMesh->isChecked())
for ( int i = 0; i < myObjects.count(); i++ ) {
SMESH::SMESH_MeshEditor_var aMeshEditor = myMeshes[i]->GetMeshEditor();
if(CheckBoxMesh->isChecked())
for ( int i = 0; i < myObjects.count(); i++ ) {
SMESH::SMESH_MeshEditor_var aMeshEditor = myMeshes[i]->GetMeshEditor();
- myMeshes[i]->SetParameters(aParameters.join( ":" ).to
Latin1
().constData());
+ myMeshes[i]->SetParameters(aParameters.join( ":" ).to
Utf8
().constData());
aMeshEditor->MirrorObject(myObjects[i], aMirror, aMirrorType, false );
}
else {
SMESH::SMESH_MeshEditor_var aMeshEditor = myMeshes[0]->GetMeshEditor();
aMeshEditor->MirrorObject(myObjects[i], aMirror, aMirrorType, false );
}
else {
SMESH::SMESH_MeshEditor_var aMeshEditor = myMeshes[0]->GetMeshEditor();
- myMeshes[0]->SetParameters(aParameters.join( ":" ).to
Latin1
().constData());
+ myMeshes[0]->SetParameters(aParameters.join( ":" ).to
Utf8
().constData());
aMeshEditor->Mirror(anElementsId, aMirror, aMirrorType, false );
}
break;
aMeshEditor->Mirror(anElementsId, aMirror, aMirrorType, false );
}
break;
@@
-528,12
+528,12
@@
bool SMESHGUI_SymmetryDlg::ClickOnApply()
if(CheckBoxMesh->isChecked())
for ( int i = 0; i < myObjects.count(); i++ ) {
SMESH::SMESH_MeshEditor_var aMeshEditor = myMeshes[i]->GetMeshEditor();
if(CheckBoxMesh->isChecked())
for ( int i = 0; i < myObjects.count(); i++ ) {
SMESH::SMESH_MeshEditor_var aMeshEditor = myMeshes[i]->GetMeshEditor();
- myMeshes[i]->SetParameters(aParameters.join( ":" ).to
Latin1
().constData());
+ myMeshes[i]->SetParameters(aParameters.join( ":" ).to
Utf8
().constData());
groups = aMeshEditor->MirrorObjectMakeGroups(myObjects[i], aMirror, aMirrorType);
}
else {
SMESH::SMESH_MeshEditor_var aMeshEditor = myMeshes[0]->GetMeshEditor();
groups = aMeshEditor->MirrorObjectMakeGroups(myObjects[i], aMirror, aMirrorType);
}
else {
SMESH::SMESH_MeshEditor_var aMeshEditor = myMeshes[0]->GetMeshEditor();
- myMeshes[0]->SetParameters(aParameters.join( ":" ).to
Latin1
().constData());
+ myMeshes[0]->SetParameters(aParameters.join( ":" ).to
Utf8
().constData());
groups = aMeshEditor->MirrorMakeGroups(anElementsId, aMirror, aMirrorType);
}
}
groups = aMeshEditor->MirrorMakeGroups(anElementsId, aMirror, aMirrorType);
}
}
@@
-541,12
+541,12
@@
bool SMESHGUI_SymmetryDlg::ClickOnApply()
if(CheckBoxMesh->isChecked())
for ( int i = 0; i < myObjects.count(); i++ ) {
SMESH::SMESH_MeshEditor_var aMeshEditor = myMeshes[i]->GetMeshEditor();
if(CheckBoxMesh->isChecked())
for ( int i = 0; i < myObjects.count(); i++ ) {
SMESH::SMESH_MeshEditor_var aMeshEditor = myMeshes[i]->GetMeshEditor();
- myMeshes[i]->SetParameters(aParameters.join( ":" ).to
Latin1
().constData());
+ myMeshes[i]->SetParameters(aParameters.join( ":" ).to
Utf8
().constData());
aMeshEditor->MirrorObject(myObjects[i], aMirror, aMirrorType, true);
}
else {
SMESH::SMESH_MeshEditor_var aMeshEditor = myMeshes[0]->GetMeshEditor();
aMeshEditor->MirrorObject(myObjects[i], aMirror, aMirrorType, true);
}
else {
SMESH::SMESH_MeshEditor_var aMeshEditor = myMeshes[0]->GetMeshEditor();
- myMeshes[0]->SetParameters(aParameters.join( ":" ).to
Latin1
().constData());
+ myMeshes[0]->SetParameters(aParameters.join( ":" ).to
Utf8
().constData());
aMeshEditor->Mirror(anElementsId, aMirror, aMirrorType, true);
}
}
aMeshEditor->Mirror(anElementsId, aMirror, aMirrorType, true);
}
}
@@
-558,17
+558,17
@@
bool SMESHGUI_SymmetryDlg::ClickOnApply()
for ( int i = 0; i < myObjects.count(); i++ ) {
QString aName = SMESH::UniqueMeshName( LineEditNewMesh->text().replace( "*", myObjectsNames[i] ) );
SMESH::SMESH_MeshEditor_var aMeshEditor = myMeshes[i]->GetMeshEditor();
for ( int i = 0; i < myObjects.count(); i++ ) {
QString aName = SMESH::UniqueMeshName( LineEditNewMesh->text().replace( "*", myObjectsNames[i] ) );
SMESH::SMESH_MeshEditor_var aMeshEditor = myMeshes[i]->GetMeshEditor();
- myMeshes[i]->SetParameters(aParameters.join( ":" ).to
Latin1
().constData());
+ myMeshes[i]->SetParameters(aParameters.join( ":" ).to
Utf8
().constData());
mesh = aMeshEditor->MirrorObjectMakeMesh(myObjects[i], aMirror, aMirrorType, makeGroups,
mesh = aMeshEditor->MirrorObjectMakeMesh(myObjects[i], aMirror, aMirrorType, makeGroups,
- aName.to
Latin1
().data());
+ aName.to
Utf8
().data());
if( _PTR(SObject) aSObject = SMESH::ObjectToSObject( mesh ) )
anEntryList.append( aSObject->GetID().c_str() );
}
else {
SMESH::SMESH_MeshEditor_var aMeshEditor = myMeshes[0]->GetMeshEditor();
if( _PTR(SObject) aSObject = SMESH::ObjectToSObject( mesh ) )
anEntryList.append( aSObject->GetID().c_str() );
}
else {
SMESH::SMESH_MeshEditor_var aMeshEditor = myMeshes[0]->GetMeshEditor();
- myMeshes[0]->SetParameters(aParameters.join( ":" ).to
Latin1
().constData());
+ myMeshes[0]->SetParameters(aParameters.join( ":" ).to
Utf8
().constData());
mesh = aMeshEditor->MirrorMakeMesh(anElementsId, aMirror, aMirrorType, makeGroups,
mesh = aMeshEditor->MirrorMakeMesh(anElementsId, aMirror, aMirrorType, makeGroups,
- LineEditNewMesh->text().to
Latin1
().data());
+ LineEditNewMesh->text().to
Utf8
().data());
if( _PTR(SObject) aSObject = SMESH::ObjectToSObject( mesh ) )
anEntryList.append( aSObject->GetID().c_str() );
}
if( _PTR(SObject) aSObject = SMESH::ObjectToSObject( mesh ) )
anEntryList.append( aSObject->GetID().c_str() );
}
@@
-693,7
+693,7
@@
void SMESHGUI_SymmetryDlg::onTextChange (const QString& theNewText)
buttonOk->setEnabled(false);
buttonApply->setEnabled(false);
buttonOk->setEnabled(false);
buttonApply->setEnabled(false);
- // hilight entered elements
+ // hi
gh
light entered elements
SMDS_Mesh* aMesh = 0;
if (myActor)
aMesh = myActor->GetObject()->GetMesh();
SMDS_Mesh* aMesh = 0;
if (myActor)
aMesh = myActor->GetObject()->GetMesh();