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
Copyright update 2022
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_SelectionOp.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_SelectionOp.cxx
b/src/SMESHGUI/SMESHGUI_SelectionOp.cxx
index ed560b87ee5400108f0be8733d2db59ea87be068..7bbbd031ba770b519981ea49b0e74f4964169f5c 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_SelectionOp.cxx
+++ b/
src/SMESHGUI/SMESHGUI_SelectionOp.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
22
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
@@
-195,7
+195,7
@@
void SMESHGUI_SelectionOp::onActivateObject( int id )
// name : onDeactivateObject
// purpose :
//=================================================================================
// name : onDeactivateObject
// purpose :
//=================================================================================
-void SMESHGUI_SelectionOp::onDeactivateObject( int
id
)
+void SMESHGUI_SelectionOp::onDeactivateObject( int
/*id*/
)
{
removeCustomFilters();
}
{
removeCustomFilters();
}
@@
-250,11
+250,11
@@
void SMESHGUI_SelectionOp::setSelectionMode( const Selection_Mode mode )
// Purpose : Highlight object in 3d viewer
//=======================================================================
void SMESHGUI_SelectionOp::highlight( const Handle( SALOME_InteractiveObject )& obj,
// Purpose : Highlight object in 3d viewer
//=======================================================================
void SMESHGUI_SelectionOp::highlight( const Handle( SALOME_InteractiveObject )& obj,
- const bool hilight, const bool immediately )
+ const bool hi
gh
light, const bool immediately )
{
SVTK_ViewWindow* wnd = viewWindow();
if( wnd )
{
SVTK_ViewWindow* wnd = viewWindow();
if( wnd )
- wnd->highlight( obj, hilight, immediately );
+ wnd->highlight( obj, hi
gh
light, immediately );
}
//=======================================================================
}
//=======================================================================
@@
-262,7
+262,7
@@
void SMESHGUI_SelectionOp::highlight( const Handle( SALOME_InteractiveObject )&
// Purpose : Select/deselect cells of mesh
//=======================================================================
void SMESHGUI_SelectionOp::addOrRemoveIndex( const Handle( SALOME_InteractiveObject )& obj,
// Purpose : Select/deselect cells of mesh
//=======================================================================
void SMESHGUI_SelectionOp::addOrRemoveIndex( const Handle( SALOME_InteractiveObject )& obj,
- const
TColStd_MapOfInteger
& indices,
+ const
SVTK_TVtkIDsMap
& indices,
const bool isModeShift )
{
SVTK_Selector* sel = selector();
const bool isModeShift )
{
SVTK_Selector* sel = selector();
@@
-304,7
+304,7
@@
int SMESHGUI_SelectionOp::typeById( const QString& str, const EntityType objtype
if( t<0 )
{
//try to get GEOM type
if( t<0 )
{
//try to get GEOM type
- _PTR( SObject ) sobj = aStudy->FindObjectID( str.to
Latin1
().data() );
+ _PTR( SObject ) sobj = aStudy->FindObjectID( str.to
Utf8
().data() );
if( sobj )
{
GEOM::GEOM_Object_var obj = GEOM::GEOM_Object::_narrow(
if( sobj )
{
GEOM::GEOM_Object_var obj = GEOM::GEOM_Object::_narrow(
@@
-327,7
+327,7
@@
int SMESHGUI_SelectionOp::typeById( const QString& str, const EntityType objtype
int id = _id.toInt( &ok );
if( ok )
{
int id = _id.toInt( &ok );
if( ok )
{
- _PTR( SObject ) sobj = aStudy->FindObjectID( entry.to
Latin1
().data() );
+ _PTR( SObject ) sobj = aStudy->FindObjectID( entry.to
Utf8
().data() );
SMESH::SMESH_Mesh_var mesh = SMESH::SMESH_Mesh::_narrow(
dynamic_cast<SALOMEDS_SObject*>( sobj.get() )->GetObject() );
SMESH::SMESH_subMesh_var submesh = SMESH::SMESH_subMesh::_narrow(
SMESH::SMESH_Mesh_var mesh = SMESH::SMESH_Mesh::_narrow(
dynamic_cast<SALOMEDS_SObject*>( sobj.get() )->GetObject() );
SMESH::SMESH_subMesh_var submesh = SMESH::SMESH_subMesh::_narrow(
@@
-468,7
+468,7
@@
void SMESHGUI_SelectionOp::onTextChanged( int, const QStringList& list )
if( !dlg() )
return;
if( !dlg() )
return;
-
TColStd_MapOfInteger
newIndices;
+
SVTK_TVtkIDsMap
newIndices;
SALOME_ListIO sel; selectionMgr()->selectedObjects( sel );
SMESH_Actor* anActor = actor();
SALOME_ListIO sel; selectionMgr()->selectedObjects( sel );
SMESH_Actor* anActor = actor();