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 'OCCT780'
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_TranslationDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_TranslationDlg.cxx
b/src/SMESHGUI/SMESHGUI_TranslationDlg.cxx
index be53d01e411b6af819f752acae39abb5693a8b4d..0838ae88b85adba6cc3fa2a7e7da27c0e06e98c4 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_TranslationDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_TranslationDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
15 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
@@
-295,7
+295,7
@@
SMESHGUI_TranslationDlg::SMESHGUI_TranslationDlg( SMESHGUI* theModule ) :
myMeshOrSubMeshOrGroupFilter =
new SMESH_LogicalFilter(aListOfFilters, SMESH_LogicalFilter::LO_OR);
myMeshOrSubMeshOrGroupFilter =
new SMESH_LogicalFilter(aListOfFilters, SMESH_LogicalFilter::LO_OR);
- myHelpFileName = "translation
_page
.html";
+ myHelpFileName = "translation.html";
Init();
Init();
@@
-475,7
+475,7
@@
void SMESHGUI_TranslationDlg::ConstructorsClicked (int constructorId)
//=================================================================================
bool SMESHGUI_TranslationDlg::ClickOnApply()
{
//=================================================================================
bool SMESHGUI_TranslationDlg::ClickOnApply()
{
- if (
mySMESHGUI->isActive
StudyLocked())
+ if (
SMESHGUI::is
StudyLocked())
return false;
if( !isValid() )
return false;
if( !isValid() )
@@
-484,7
+484,7
@@
bool SMESHGUI_TranslationDlg::ClickOnApply()
if (myNbOkElements) {
QStringList aListElementsId = myElementsId.split(" ", QString::SkipEmptyParts);
if (myNbOkElements) {
QStringList aListElementsId = myElementsId.split(" ", QString::SkipEmptyParts);
- SMESH::
long_array_var anElementsId = new SMESH::long
_array;
+ SMESH::
smIdType_array_var anElementsId = 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++)
@@
-520,12
+520,12
@@
bool SMESHGUI_TranslationDlg::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->TranslateObject(myObjects[i], aVector, false);
}
else {
SMESH::SMESH_MeshEditor_var aMeshEditor = myMeshes[0]->GetMeshEditor();
aMeshEditor->TranslateObject(myObjects[i], aVector, 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->Translate(anElementsId, aVector, false);
}
break;
aMeshEditor->Translate(anElementsId, aVector, false);
}
break;
@@
-535,13
+535,13
@@
bool SMESHGUI_TranslationDlg::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->TranslateObjectMakeGroups(myObjects[i],aVector);
}
}
else {
SMESH::SMESH_MeshEditor_var aMeshEditor = myMeshes[0]->GetMeshEditor();
groups = aMeshEditor->TranslateObjectMakeGroups(myObjects[i],aVector);
}
}
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->TranslateMakeGroups(anElementsId, aVector);
}
}
groups = aMeshEditor->TranslateMakeGroups(anElementsId, aVector);
}
}
@@
-549,13
+549,13
@@
bool SMESHGUI_TranslationDlg::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->TranslateObject(myObjects[i], aVector, true);
}
}
else {
SMESH::SMESH_MeshEditor_var aMeshEditor = myMeshes[0]->GetMeshEditor();
aMeshEditor->TranslateObject(myObjects[i], aVector, 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->Translate(anElementsId, aVector, true);
}
}
aMeshEditor->Translate(anElementsId, aVector, true);
}
}
@@
-566,18
+566,18
@@
bool SMESHGUI_TranslationDlg::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->TranslateObjectMakeMesh(myObjects[i], aVector, makeGroups,
mesh = aMeshEditor->TranslateObjectMakeMesh(myObjects[i], aVector, 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->TranslateMakeMesh(anElementsId, aVector, makeGroups,
mesh = aMeshEditor->TranslateMakeMesh(anElementsId, aVector, 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() );
}
@@
-705,7
+705,7
@@
void SMESHGUI_TranslationDlg::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();
@@
-713,7
+713,7
@@
void SMESHGUI_TranslationDlg::onTextChange (const QString& theNewText)
if (aMesh) {
Handle(SALOME_InteractiveObject) anIO = myActor->getIO();
if (aMesh) {
Handle(SALOME_InteractiveObject) anIO = myActor->getIO();
-
TColStd_MapOfInteger
newIndices;
+
SVTK_TVtkIDsMap
newIndices;
QStringList aListId = theNewText.split(" ", QString::SkipEmptyParts);
QStringList aListId = theNewText.split(" ", QString::SkipEmptyParts);
@@
-1182,7
+1182,7
@@
void SMESHGUI_TranslationDlg::onDisplaySimulation( bool toDisplayPreview )
{
QStringList aListElementsId = myElementsId.split(" ", QString::SkipEmptyParts);
{
QStringList aListElementsId = myElementsId.split(" ", QString::SkipEmptyParts);
- SMESH::
long_array_var anElementsId = new SMESH::long
_array;
+ SMESH::
smIdType_array_var anElementsId = 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++)