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
Increment version: 8.5.0
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_MultiEditDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx
b/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx
index d598d95e9231b99cd6f28c890ec2da58e09e32df..2899a0348586a9f7ccff37dddb1f7145164aa87e 100755
(executable)
--- a/
src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
@@
-435,7
+435,7
@@
void SMESHGUI_MultiEditDlg::onOk()
//=======================================================================
// name : SMESHGUI_MultiEditDlg::getIds
//=======================================================================
// name : SMESHGUI_MultiEditDlg::getIds
-// Purpose : Retrive identifiers from list box or the whole object
+// Purpose : Retri
e
ve identifiers from list box or the whole object
//=======================================================================
SMESH::long_array_var SMESHGUI_MultiEditDlg::getIds(SMESH::SMESH_IDSource_var& obj)
//=======================================================================
SMESH::long_array_var SMESHGUI_MultiEditDlg::getIds(SMESH::SMESH_IDSource_var& obj)
@@
-600,7
+600,7
@@
void SMESHGUI_MultiEditDlg::onSelectionDone()
//=======================================================================
// name : SMESHGUI_MultiEditDlg::onDeactivate
//=======================================================================
// name : SMESHGUI_MultiEditDlg::onDeactivate
-// Purpose : SLOT called when dialog must be deativated
+// Purpose : SLOT called when dialog must be dea
c
tivated
//=======================================================================
void SMESHGUI_MultiEditDlg::onDeactivate()
{
//=======================================================================
void SMESHGUI_MultiEditDlg::onDeactivate()
{
@@
-883,7
+883,7
@@
void SMESHGUI_MultiEditDlg::onListSelectionChanged()
if (myListBox->item(i)->isSelected())
{
int anId = myListBox->item(i)->text().toInt();
if (myListBox->item(i)->isSelected())
{
int anId = myListBox->item(i)->text().toInt();
- if (anObj->GetElemVTKId(anId) >= 0) // avoid exception in hilight
+ if (anObj->GetElemVTKId(anId) >= 0) // avoid exception in hi
gh
light
anIndexes.Add(anId);
}
}
anIndexes.Add(anId);
}
}
@@
-974,18
+974,18
@@
void SMESHGUI_MultiEditDlg::setSelectionMode()
}
if (entityType()) {
}
if (entityType()) {
- if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
- aViewWindow->SetSelectionMode(VolumeSelection);
SMESH::SetFilter(new SMESHGUI_VolumesFilter());
SMESH::SetFilter(new SMESHGUI_VolumesFilter());
- } else {
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
- aViewWindow->SetSelectionMode(FaceSelection);
+ aViewWindow->SetSelectionMode(VolumeSelection); // here myActor set to a filter
+ } else {
if (myFilterType == SMESH::TriaFilter)
SMESH::SetFilter(new SMESHGUI_TriangleFilter());
else if (myFilterType == SMESH::QuadFilter)
SMESH::SetFilter(new SMESHGUI_QuadrangleFilter());
else
SMESH::SetFilter(new SMESHGUI_FacesFilter());
if (myFilterType == SMESH::TriaFilter)
SMESH::SetFilter(new SMESHGUI_TriangleFilter());
else if (myFilterType == SMESH::QuadFilter)
SMESH::SetFilter(new SMESHGUI_QuadrangleFilter());
else
SMESH::SetFilter(new SMESHGUI_FacesFilter());
+ if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
+ aViewWindow->SetSelectionMode(FaceSelection); // here myActor set to a filter
}
}
}
}
@@
-1093,7
+1093,7
@@
SMESHGUI_ChangeOrientationDlg
SMESHGUI_MultiEditDlg(theModule, SMESH::FaceFilter, true)
{
setWindowTitle(tr("CAPTION"));
SMESHGUI_MultiEditDlg(theModule, SMESH::FaceFilter, true)
{
setWindowTitle(tr("CAPTION"));
- myHelpFileName = "changing_orientation_of_elements
_page
.html";
+ myHelpFileName = "changing_orientation_of_elements.html";
}
SMESHGUI_ChangeOrientationDlg::~SMESHGUI_ChangeOrientationDlg()
}
SMESHGUI_ChangeOrientationDlg::~SMESHGUI_ChangeOrientationDlg()
@@
-1161,7
+1161,7
@@
SMESHGUI_UnionOfTrianglesDlg
myPreviewCheckBox->setChecked(false);
onDisplaySimulation(false);
myPreviewCheckBox->setChecked(false);
onDisplaySimulation(false);
- myHelpFileName = "uniting_set_of_triangles
_page
.html";
+ myHelpFileName = "uniting_set_of_triangles.html";
}
SMESHGUI_UnionOfTrianglesDlg::~SMESHGUI_UnionOfTrianglesDlg()
}
SMESHGUI_UnionOfTrianglesDlg::~SMESHGUI_UnionOfTrianglesDlg()
@@
-1289,7
+1289,7
@@
SMESHGUI_CuttingOfQuadsDlg
connect(myComboBoxFunctor, SIGNAL(activated(int)), this, SLOT(onPreviewChk()));
connect(this, SIGNAL(ListContensChanged()), this, SLOT(onPreviewChk()));
connect(myComboBoxFunctor, SIGNAL(activated(int)), this, SLOT(onPreviewChk()));
connect(this, SIGNAL(ListContensChanged()), this, SLOT(onPreviewChk()));
- myHelpFileName = "cutting_quadrangles
_page
.html";
+ myHelpFileName = "cutting_quadrangles.html";
}
SMESHGUI_CuttingOfQuadsDlg::~SMESHGUI_CuttingOfQuadsDlg()
}
SMESHGUI_CuttingOfQuadsDlg::~SMESHGUI_CuttingOfQuadsDlg()
@@
-1551,7
+1551,7
@@
SMESHGUI_SplitVolumesDlg::SMESHGUI_SplitVolumesDlg(SMESHGUI* theModule)
: SMESHGUI_MultiEditDlg(theModule, SMESH::VolumeFilter, /*the3d2d=*/true, /*doInit=*/false)
{
setWindowTitle(tr("CAPTION"));
: SMESHGUI_MultiEditDlg(theModule, SMESH::VolumeFilter, /*the3d2d=*/true, /*doInit=*/false)
{
setWindowTitle(tr("CAPTION"));
- myHelpFileName = "split_to_tetra
_page
.html";
+ myHelpFileName = "split_to_tetra.html";
myEntityType = 1;
myCellSize = -1.;
myEntityType = 1;
myCellSize = -1.;
@@
-1628,7
+1628,7
@@
SMESHGUI_SplitVolumesDlg::SMESHGUI_SplitVolumesDlg(SMESHGUI* theModule)
gb->setTitle( tr("TARGET_ELEM_TYPE"));
}
gb->setTitle( tr("TARGET_ELEM_TYPE"));
}
- myToAllChk->setChecked( true ); //ap
l
ly to the whole mesh by default
+ myToAllChk->setChecked( true ); //ap
p
ly to the whole mesh by default
bool hasHexa = true;//myMesh->_is_nil() ? false : myMesh->NbHexas();
if ( hasHexa )
bool hasHexa = true;//myMesh->_is_nil() ? false : myMesh->NbHexas();
if ( hasHexa )
@@
-1852,7
+1852,7
@@
void SMESHGUI_SplitVolumesDlg::showFacetByElement( int elemID )
gp_XYZ bc( 0,0,0 );
Bnd_B3d bbox;
SMDS_NodeIteratorPtr nIt = elem->nodeIterator();
gp_XYZ bc( 0,0,0 );
Bnd_B3d bbox;
SMDS_NodeIteratorPtr nIt = elem->nodeIterator();
- vector< const SMDS_MeshNode* > nodes;
+
std::
vector< const SMDS_MeshNode* > nodes;
nodes.reserve( elem->NbNodes() );
while ( nIt->more() )
{
nodes.reserve( elem->NbNodes() );
while ( nIt->more() )
{