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 #24228 [CEA 24217][Windows] cannot compile SMESH: additional fix.
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_RotationDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_RotationDlg.cxx
b/src/SMESHGUI/SMESHGUI_RotationDlg.cxx
index a55c56f97601c19721d0a0ece87fb458bd05ffeb..85c7872d3ee9efaadb6f7b3ec44f0a9c6d093963 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_RotationDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_RotationDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
21
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
@@
-400,7
+400,7
@@
void SMESHGUI_RotationDlg::Init (bool ResetControls)
//=================================================================================
bool SMESHGUI_RotationDlg::ClickOnApply()
{
//=================================================================================
bool SMESHGUI_RotationDlg::ClickOnApply()
{
- if (
mySMESHGUI->isActive
StudyLocked())
+ if (
SMESHGUI::is
StudyLocked())
return false;
if( !isValid() )
return false;
if( !isValid() )
@@
-409,7
+409,7
@@
bool SMESHGUI_RotationDlg::ClickOnApply()
if (myNbOkElements && IsAxisOk()) {
QStringList aListElementsId = myElementsId.split(" ", QString::SkipEmptyParts);
if (myNbOkElements && IsAxisOk()) {
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++)
@@
-446,13
+446,13
@@
bool SMESHGUI_RotationDlg::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->RotateObject(myObjects[i], anAxis, anAngle, false);
}
}
else {
SMESH::SMESH_MeshEditor_var aMeshEditor = myMeshes[0]->GetMeshEditor();
aMeshEditor->RotateObject(myObjects[i], anAxis, anAngle, 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->Rotate(anElementsId, anAxis, anAngle, false);
}
break;
aMeshEditor->Rotate(anElementsId, anAxis, anAngle, false);
}
break;
@@
-462,13
+462,13
@@
bool SMESHGUI_RotationDlg::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->RotateObjectMakeGroups(myObjects[i], anAxis, anAngle);
}
}
else {
SMESH::SMESH_MeshEditor_var aMeshEditor = myMeshes[0]->GetMeshEditor();
groups = aMeshEditor->RotateObjectMakeGroups(myObjects[i], anAxis, anAngle);
}
}
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->RotateMakeGroups(anElementsId, anAxis, anAngle);
}
}
groups = aMeshEditor->RotateMakeGroups(anElementsId, anAxis, anAngle);
}
}
@@
-476,13
+476,13
@@
bool SMESHGUI_RotationDlg::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->RotateObject(myObjects[i], anAxis, anAngle, true);
}
}
else {
SMESH::SMESH_MeshEditor_var aMeshEditor = myMeshes[0]->GetMeshEditor();
aMeshEditor->RotateObject(myObjects[i], anAxis, anAngle, 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->Rotate(anElementsId, anAxis, anAngle, true);
}
}
aMeshEditor->Rotate(anElementsId, anAxis, anAngle, true);
}
}
@@
-493,9
+493,9
@@
bool SMESHGUI_RotationDlg::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->RotateObjectMakeMesh(myObjects[i], anAxis, anAngle, makeGroups,
mesh = aMeshEditor->RotateObjectMakeMesh(myObjects[i], anAxis, anAngle, makeGroups,
- aName.to
Latin1
().data());
+ aName.to
Utf8
().data());
if (!mesh->_is_nil()) {
if( _PTR(SObject) aSObject = SMESH::ObjectToSObject( mesh ) )
anEntryList.append( aSObject->GetID().c_str() );
if (!mesh->_is_nil()) {
if( _PTR(SObject) aSObject = SMESH::ObjectToSObject( mesh ) )
anEntryList.append( aSObject->GetID().c_str() );
@@
-504,9
+504,9
@@
bool SMESHGUI_RotationDlg::ClickOnApply()
}
else {
SMESH::SMESH_MeshEditor_var aMeshEditor = myMeshes[0]->GetMeshEditor();
}
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->RotateMakeMesh(anElementsId, anAxis, anAngle, makeGroups,
mesh = aMeshEditor->RotateMakeMesh(anElementsId, anAxis, anAngle, makeGroups,
- LineEditNewMesh->text().to
Latin1
().data());
+ LineEditNewMesh->text().to
Utf8
().data());
if (!mesh->_is_nil()) {
if( _PTR(SObject) aSObject = SMESH::ObjectToSObject( mesh ) )
anEntryList.append( aSObject->GetID().c_str() );
if (!mesh->_is_nil()) {
if( _PTR(SObject) aSObject = SMESH::ObjectToSObject( mesh ) )
anEntryList.append( aSObject->GetID().c_str() );
@@
-644,7
+644,7
@@
void SMESHGUI_RotationDlg::onTextChange (const QString& theNewText)
if (send == LineEditElements) {
Handle(SALOME_InteractiveObject) anIO = myActor->getIO();
if (send == LineEditElements) {
Handle(SALOME_InteractiveObject) anIO = myActor->getIO();
-
TColStd_MapOfInteger
newIndices;
+
SVTK_TVtkIDsMap
newIndices;
QStringList aListId = theNewText.split(" ", QString::SkipEmptyParts);
for (int i = 0; i < aListId.count(); i++) {
QStringList aListId = theNewText.split(" ", QString::SkipEmptyParts);
for (int i = 0; i < aListId.count(); i++) {
@@
-1135,7
+1135,7
@@
void SMESHGUI_RotationDlg::onDisplaySimulation( bool toDisplayPreview ) {
if (myPreviewCheckBox->isChecked() && toDisplayPreview) {
if(myNbOkElements && isValid() && IsAxisOk()) {
QStringList aListElementsId = myElementsId.split(" ", QString::SkipEmptyParts);
if (myPreviewCheckBox->isChecked() && toDisplayPreview) {
if(myNbOkElements && isValid() && IsAxisOk()) {
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++)