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
#17845 [EDF] Modifications of Automatic meshing
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_Selection.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_Selection.cxx
b/src/SMESHGUI/SMESHGUI_Selection.cxx
index a8704b8b977b460cc353abfa742720cccf13130d..d0cd5c4dcc54cb765f55e29623e09432d8606095 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_Selection.cxx
+++ b/
src/SMESHGUI/SMESHGUI_Selection.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
6
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
9
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
@@
-198,7
+198,7
@@
QList<QVariant> SMESHGUI_Selection::elemTypes( int ind, bool fromObj ) const
{
if ( ind >= 0 && ind < myTypes.count() && myTypes[ind] != "Unknown" )
{
{
if ( ind >= 0 && ind < myTypes.count() && myTypes[ind] != "Unknown" )
{
- _PTR(SObject) sobj = SMESH::getStudy()->FindObjectID( entry( ind ).to
Latin1
().data() );
+ _PTR(SObject) sobj = SMESH::getStudy()->FindObjectID( entry( ind ).to
Utf8
().data() );
CORBA::Object_var obj = SMESH::SObjectToObject( sobj );
SMESH::SMESH_IDSource_var idSrc = SMESH::SMESH_IDSource::_narrow( obj );
if ( !CORBA::is_nil( idSrc ) )
CORBA::Object_var obj = SMESH::SObjectToObject( sobj );
SMESH::SMESH_IDSource_var idSrc = SMESH::SMESH_IDSource::_narrow( obj );
if ( !CORBA::is_nil( idSrc ) )
@@
-263,7
+263,7
@@
QString SMESHGUI_Selection::displayMode( int ind ) const
bool SMESHGUI_Selection::isQuadratic( int ind ) const
{
bool SMESHGUI_Selection::isQuadratic( int ind ) const
{
- _PTR(SObject) so = SMESH::getStudy()->FindObjectID( entry( ind ).to
Latin1
().data() );
+ _PTR(SObject) so = SMESH::getStudy()->FindObjectID( entry( ind ).to
Utf8
().data() );
if ( !so )
return false;
SMESH::SMESH_IDSource_var idSource = SMESH::SObjectToInterface<SMESH::SMESH_IDSource>( so );
if ( !so )
return false;
SMESH::SMESH_IDSource_var idSource = SMESH::SObjectToInterface<SMESH::SMESH_IDSource>( so );
@@
-384,6
+384,7
@@
QString SMESHGUI_Selection::controlMode( int ind ) const
case SMESH_Actor::eCoincidentElems1D: mode = "eCoincidentElems1D"; break;
case SMESH_Actor::eCoincidentElems2D: mode = "eCoincidentElems2D"; break;
case SMESH_Actor::eCoincidentElems3D: mode = "eCoincidentElems3D"; break;
case SMESH_Actor::eCoincidentElems1D: mode = "eCoincidentElems1D"; break;
case SMESH_Actor::eCoincidentElems2D: mode = "eCoincidentElems2D"; break;
case SMESH_Actor::eCoincidentElems3D: mode = "eCoincidentElems3D"; break;
+ case SMESH_Actor::eCustomControl: mode = "eCustomControl"; break;
default:break;
}
}
default:break;
}
}
@@
-465,7
+466,7
@@
bool SMESHGUI_Selection::isAutoColor( int ind ) const
{
if ( ind >= 0 && ind < myTypes.count() && myTypes[ind] != "Unknown" )
{
{
if ( ind >= 0 && ind < myTypes.count() && myTypes[ind] != "Unknown" )
{
- _PTR(SObject) sobj = SMESH::getStudy()->FindObjectID( entry( ind ).to
Latin1
().data() );
+ _PTR(SObject) sobj = SMESH::getStudy()->FindObjectID( entry( ind ).to
Utf8
().data() );
CORBA::Object_var obj = SMESH::SObjectToObject( sobj );
if ( !CORBA::is_nil( obj ) ) {
CORBA::Object_var obj = SMESH::SObjectToObject( sobj );
if ( !CORBA::is_nil( obj ) ) {
@@
-486,7
+487,7
@@
int SMESHGUI_Selection::numberOfNodes( int ind ) const
{
if ( ind >= 0 && ind < myTypes.count() && myTypes[ind] != "Unknown" )
{
{
if ( ind >= 0 && ind < myTypes.count() && myTypes[ind] != "Unknown" )
{
- _PTR(SObject) sobj = SMESH::getStudy()->FindObjectID( entry( ind ).to
Latin1
().data() );
+ _PTR(SObject) sobj = SMESH::getStudy()->FindObjectID( entry( ind ).to
Utf8
().data() );
CORBA::Object_var obj = SMESH::SObjectToObject( sobj );
if ( !CORBA::is_nil( obj ) ) {
CORBA::Object_var obj = SMESH::SObjectToObject( sobj );
if ( !CORBA::is_nil( obj ) ) {
@@
-517,7
+518,7
@@
int SMESHGUI_Selection::dim( int ind ) const
int dim = -1;
if ( ind >= 0 && ind < myTypes.count() && myTypes[ind] != "Unknown" )
{
int dim = -1;
if ( ind >= 0 && ind < myTypes.count() && myTypes[ind] != "Unknown" )
{
- _PTR(SObject) sobj = SMESH::getStudy()->FindObjectID( entry( ind ).to
Latin1
().data() );
+ _PTR(SObject) sobj = SMESH::getStudy()->FindObjectID( entry( ind ).to
Utf8
().data() );
CORBA::Object_var obj = SMESH::SObjectToObject( sobj );
if ( !CORBA::is_nil( obj ) ) {
CORBA::Object_var obj = SMESH::SObjectToObject( sobj );
if ( !CORBA::is_nil( obj ) ) {
@@
-552,7
+553,7
@@
bool SMESHGUI_Selection::isComputable( int ind ) const
myTypes[ind].startsWith("Mesh " )))
{
QMap<int,int> modeMap;
myTypes[ind].startsWith("Mesh " )))
{
QMap<int,int> modeMap;
- _PTR(SObject) meshSO = SMESH::getStudy()->FindObjectID( entry( ind ).to
Latin1
().data() );
+ _PTR(SObject) meshSO = SMESH::getStudy()->FindObjectID( entry( ind ).to
Utf8
().data() );
_PTR(SComponent) component = meshSO->GetFatherComponent();
if ( meshSO->Depth() - component->Depth() > 1 ) // sub-mesh, get a mesh
_PTR(SComponent) component = meshSO->GetFatherComponent();
if ( meshSO->Depth() - component->Depth() > 1 ) // sub-mesh, get a mesh
@@
-578,7
+579,7
@@
bool SMESHGUI_Selection::isPreComputable( int ind ) const
if ( maxDim < 2 ) // we can preview 1D or 2D
{
QMap<int,int> modeMap;
if ( maxDim < 2 ) // we can preview 1D or 2D
{
QMap<int,int> modeMap;
- _PTR(SObject) pMesh = SMESH::getStudy()->FindObjectID( entry( ind ).to
Latin1
().data() );
+ _PTR(SObject) pMesh = SMESH::getStudy()->FindObjectID( entry( ind ).to
Utf8
().data() );
SMESHGUI_PrecomputeOp::getAssignedAlgos( pMesh, modeMap );
if ( modeMap.size() > 1 )
return (( modeMap.contains( SMESH::DIM_3D )) ||
SMESHGUI_PrecomputeOp::getAssignedAlgos( pMesh, modeMap );
if ( modeMap.size() > 1 )
return (( modeMap.contains( SMESH::DIM_3D )) ||
@@
-597,7
+598,7
@@
bool SMESHGUI_Selection::hasGeomReference( int ind ) const
{
if ( ind >= 0 && ind < myTypes.count() && myTypes[ind] != "Unknown" )
{
{
if ( ind >= 0 && ind < myTypes.count() && myTypes[ind] != "Unknown" )
{
- _PTR(SObject) so = SMESH::getStudy()->FindObjectID( entry( ind ).to
Latin1
().data() );
+ _PTR(SObject) so = SMESH::getStudy()->FindObjectID( entry( ind ).to
Utf8
().data() );
GEOM::GEOM_Object_var shape = SMESH::GetShapeOnMeshOrSubMesh( so );
return !shape->_is_nil();
}
GEOM::GEOM_Object_var shape = SMESH::GetShapeOnMeshOrSubMesh( so );
return !shape->_is_nil();
}
@@
-614,7
+615,7
@@
bool SMESHGUI_Selection::isEditableHyp( int ind ) const
bool isEditable = true;
if ( ind >= 0 && ind < myTypes.count() && myTypes[ind] == "Hypothesis" )
{
bool isEditable = true;
if ( ind >= 0 && ind < myTypes.count() && myTypes[ind] == "Hypothesis" )
{
- _PTR(SObject) so = SMESH::getStudy()->FindObjectID( entry( ind ).to
Latin1
().data() );
+ _PTR(SObject) so = SMESH::getStudy()->FindObjectID( entry( ind ).to
Utf8
().data() );
SMESH::SMESH_Hypothesis_var hyp = SMESH::SObjectToInterface<SMESH::SMESH_Hypothesis>( so );
if ( !hyp->_is_nil() )
{
SMESH::SMESH_Hypothesis_var hyp = SMESH::SObjectToInterface<SMESH::SMESH_Hypothesis>( so );
if ( !hyp->_is_nil() )
{
@@
-633,7
+634,7
@@
bool SMESHGUI_Selection::isVisible( int ind ) const
{
if ( ind >= 0 && ind < myTypes.count() && myTypes[ind] != "Unknown" )
{
{
if ( ind >= 0 && ind < myTypes.count() && myTypes[ind] != "Unknown" )
{
- SMESH_Actor* actor = SMESH::FindActorByEntry( entry( ind ).to
Latin1
().data() );
+ SMESH_Actor* actor = SMESH::FindActorByEntry( entry( ind ).to
Utf8
().data() );
if ( actor && actor->hasIO() ) {
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetCurrentVtkView() )
return aViewWindow->isVisible( actor->getIO() );
if ( actor && actor->hasIO() ) {
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetCurrentVtkView() )
return aViewWindow->isVisible( actor->getIO() );
@@
-651,7
+652,7
@@
bool SMESHGUI_Selection::hasChildren( int ind ) const
{
if ( ind >= 0 )
{
{
if ( ind >= 0 )
{
- _PTR(SObject) sobj = SMESH::getStudy()->FindObjectID( entry( ind ).to
Latin1
().data() );
+ _PTR(SObject) sobj = SMESH::getStudy()->FindObjectID( entry( ind ).to
Utf8
().data() );
if ( sobj )
return SMESH::getStudy()->GetUseCaseBuilder()->HasChildren( sobj );
}
if ( sobj )
return SMESH::getStudy()->GetUseCaseBuilder()->HasChildren( sobj );
}
@@
-669,7
+670,7
@@
int SMESHGUI_Selection::nbChildren( int ind ) const
if ( ind >= 0 )
{
_PTR(Study) study = SMESH::getStudy();
if ( ind >= 0 )
{
_PTR(Study) study = SMESH::getStudy();
- _PTR(SObject) sobj = study->FindObjectID( entry( ind ).to
Latin1
().data() );
+ _PTR(SObject) sobj = study->FindObjectID( entry( ind ).to
Utf8
().data() );
if ( sobj && study->GetUseCaseBuilder()->IsUseCaseNode( sobj ) ) {
_PTR(UseCaseIterator) it = study->GetUseCaseBuilder()->GetUseCaseIterator( sobj );
for ( it->Init( false ); it->More(); it->Next() ) nb++;
if ( sobj && study->GetUseCaseBuilder()->IsUseCaseNode( sobj ) ) {
_PTR(UseCaseIterator) it = study->GetUseCaseBuilder()->GetUseCaseIterator( sobj );
for ( it->Init( false ); it->More(); it->Next() ) nb++;
@@
-696,7
+697,7
@@
bool SMESHGUI_Selection::isContainer( int ind ) const
int SMESHGUI_Selection::type( const QString& entry )
{
int res = -1;
int SMESHGUI_Selection::type( const QString& entry )
{
int res = -1;
- _PTR(SObject) obj = SalomeApp_Application::getStudy()->FindObjectID( entry.to
Latin1
().data() );
+ _PTR(SObject) obj = SalomeApp_Application::getStudy()->FindObjectID( entry.to
Utf8
().data() );
if ( obj ) {
_PTR(SObject) ref;
if ( obj->ReferencedObject( ref ) )
if ( obj ) {
_PTR(SObject) ref;
if ( obj->ReferencedObject( ref ) )
@@
-792,7
+793,7
@@
QString SMESHGUI_Selection::typeName( const int t )
bool SMESHGUI_Selection::isImported( const int ind ) const
{
bool res = false;
bool SMESHGUI_Selection::isImported( const int ind ) const
{
bool res = false;
- _PTR(SObject) sobj = SMESH::getStudy()->FindObjectID( entry( ind ).to
Latin1
().constData() );
+ _PTR(SObject) sobj = SMESH::getStudy()->FindObjectID( entry( ind ).to
Utf8
().constData() );
if ( sobj )
{
SMESH::SMESH_Mesh_var aMesh = SMESH::SMESH_Mesh::_narrow( SMESH::SObjectToObject( sobj ) );
if ( sobj )
{
SMESH::SMESH_Mesh_var aMesh = SMESH::SMESH_Mesh::_narrow( SMESH::SObjectToObject( sobj ) );
@@
-822,7
+823,7
@@
int SMESHGUI_Selection::guiState()
QString SMESHGUI_Selection::groupType( int ind ) const
{
QString SMESHGUI_Selection::groupType( int ind ) const
{
- _PTR(SObject) sobj = SMESH::getStudy()->FindObjectID( entry( ind ).to
Latin1
().constData() );
+ _PTR(SObject) sobj = SMESH::getStudy()->FindObjectID( entry( ind ).to
Utf8
().constData() );
if ( sobj )
{
SMESH::SMESH_Group_var g = SMESH::SObjectToInterface<SMESH::SMESH_Group>( sobj );
if ( sobj )
{
SMESH::SMESH_Group_var g = SMESH::SObjectToInterface<SMESH::SMESH_Group>( sobj );