X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_Selection.cxx;h=fbc43c922d46b397ad32b2e0236898043b67c281;hp=0b113839d81732f0b25f608b9254c31b4657d99c;hb=8d297d6698f361d4f2dde723050bcfbaea050920;hpb=bd7477efc255f965c479d88d1be1ee3dbf4aa760 diff --git a/src/SMESHGUI/SMESHGUI_Selection.cxx b/src/SMESHGUI/SMESHGUI_Selection.cxx index 0b113839d..fbc43c922 100644 --- a/src/SMESHGUI/SMESHGUI_Selection.cxx +++ b/src/SMESHGUI/SMESHGUI_Selection.cxx @@ -198,7 +198,7 @@ QList SMESHGUI_Selection::elemTypes( int ind, bool fromObj ) const { if ( ind >= 0 && ind < myTypes.count() && myTypes[ind] != "Unknown" ) { - _PTR(SObject) sobj = SMESH::getStudy()->FindObjectID( entry( ind ).toLatin1().data() ); + _PTR(SObject) sobj = SMESH::getStudy()->FindObjectID( entry( ind ).toUtf8().data() ); 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 { - _PTR(SObject) so = SMESH::getStudy()->FindObjectID( entry( ind ).toLatin1().data() ); + _PTR(SObject) so = SMESH::getStudy()->FindObjectID( entry( ind ).toUtf8().data() ); if ( !so ) return false; SMESH::SMESH_IDSource_var idSource = SMESH::SObjectToInterface( so ); @@ -359,6 +359,7 @@ QString SMESHGUI_Selection::controlMode( int ind ) const switch( actor->GetControlMode() ) { case SMESH_Actor::eLength: mode = "eLength"; break; case SMESH_Actor::eLength2D: mode = "eLength2D"; break; + case SMESH_Actor::eDeflection2D: mode = "eDeflection2D"; break; case SMESH_Actor::eFreeEdges: mode = "eFreeEdges"; break; case SMESH_Actor::eFreeNodes: mode = "eFreeNodes"; break; case SMESH_Actor::eFreeBorders: mode = "eFreeBorders"; break; @@ -383,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::eCustomControl: mode = "eCustomControl"; break; default:break; } } @@ -406,6 +408,11 @@ QString SMESHGUI_Selection::controlMode() const return "eNone"; } +//======================================================================= +//function : isNumFunctor +//purpose : return true if a given actor is shown using a numeric functor +//======================================================================= + bool SMESHGUI_Selection::isNumFunctor( int ind ) const { bool result = false; @@ -414,6 +421,7 @@ bool SMESHGUI_Selection::isNumFunctor( int ind ) const switch( actor->GetControlMode() ) { case SMESH_Actor::eLength: case SMESH_Actor::eLength2D: + case SMESH_Actor::eDeflection2D: case SMESH_Actor::eMultiConnection: case SMESH_Actor::eMultiConnection2D: case SMESH_Actor::eArea: @@ -437,7 +445,7 @@ bool SMESHGUI_Selection::isNumFunctor( int ind ) const //======================================================================= //function : facesOrientationMode -//purpose : +//purpose : //======================================================================= QString SMESHGUI_Selection::facesOrientationMode( int ind ) const @@ -458,7 +466,7 @@ bool SMESHGUI_Selection::isAutoColor( int ind ) const { if ( ind >= 0 && ind < myTypes.count() && myTypes[ind] != "Unknown" ) { - _PTR(SObject) sobj = SMESH::getStudy()->FindObjectID( entry( ind ).toLatin1().data() ); + _PTR(SObject) sobj = SMESH::getStudy()->FindObjectID( entry( ind ).toUtf8().data() ); CORBA::Object_var obj = SMESH::SObjectToObject( sobj ); if ( !CORBA::is_nil( obj ) ) { @@ -479,7 +487,7 @@ int SMESHGUI_Selection::numberOfNodes( int ind ) const { if ( ind >= 0 && ind < myTypes.count() && myTypes[ind] != "Unknown" ) { - _PTR(SObject) sobj = SMESH::getStudy()->FindObjectID( entry( ind ).toLatin1().data() ); + _PTR(SObject) sobj = SMESH::getStudy()->FindObjectID( entry( ind ).toUtf8().data() ); CORBA::Object_var obj = SMESH::SObjectToObject( sobj ); if ( !CORBA::is_nil( obj ) ) { @@ -510,7 +518,7 @@ int SMESHGUI_Selection::dim( int ind ) const int dim = -1; if ( ind >= 0 && ind < myTypes.count() && myTypes[ind] != "Unknown" ) { - _PTR(SObject) sobj = SMESH::getStudy()->FindObjectID( entry( ind ).toLatin1().data() ); + _PTR(SObject) sobj = SMESH::getStudy()->FindObjectID( entry( ind ).toUtf8().data() ); CORBA::Object_var obj = SMESH::SObjectToObject( sobj ); if ( !CORBA::is_nil( obj ) ) { @@ -545,7 +553,7 @@ bool SMESHGUI_Selection::isComputable( int ind ) const myTypes[ind].startsWith("Mesh " ))) { QMap modeMap; - _PTR(SObject) meshSO = SMESH::getStudy()->FindObjectID( entry( ind ).toLatin1().data() ); + _PTR(SObject) meshSO = SMESH::getStudy()->FindObjectID( entry( ind ).toUtf8().data() ); _PTR(SComponent) component = meshSO->GetFatherComponent(); if ( meshSO->Depth() - component->Depth() > 1 ) // sub-mesh, get a mesh @@ -571,7 +579,7 @@ bool SMESHGUI_Selection::isPreComputable( int ind ) const if ( maxDim < 2 ) // we can preview 1D or 2D { QMap modeMap; - _PTR(SObject) pMesh = SMESH::getStudy()->FindObjectID( entry( ind ).toLatin1().data() ); + _PTR(SObject) pMesh = SMESH::getStudy()->FindObjectID( entry( ind ).toUtf8().data() ); SMESHGUI_PrecomputeOp::getAssignedAlgos( pMesh, modeMap ); if ( modeMap.size() > 1 ) return (( modeMap.contains( SMESH::DIM_3D )) || @@ -590,7 +598,7 @@ bool SMESHGUI_Selection::hasGeomReference( int ind ) const { if ( ind >= 0 && ind < myTypes.count() && myTypes[ind] != "Unknown" ) { - _PTR(SObject) so = SMESH::getStudy()->FindObjectID( entry( ind ).toLatin1().data() ); + _PTR(SObject) so = SMESH::getStudy()->FindObjectID( entry( ind ).toUtf8().data() ); GEOM::GEOM_Object_var shape = SMESH::GetShapeOnMeshOrSubMesh( so ); return !shape->_is_nil(); } @@ -607,7 +615,7 @@ bool SMESHGUI_Selection::isEditableHyp( int ind ) const bool isEditable = true; if ( ind >= 0 && ind < myTypes.count() && myTypes[ind] == "Hypothesis" ) { - _PTR(SObject) so = SMESH::getStudy()->FindObjectID( entry( ind ).toLatin1().data() ); + _PTR(SObject) so = SMESH::getStudy()->FindObjectID( entry( ind ).toUtf8().data() ); SMESH::SMESH_Hypothesis_var hyp = SMESH::SObjectToInterface( so ); if ( !hyp->_is_nil() ) { @@ -626,7 +634,7 @@ bool SMESHGUI_Selection::isVisible( int ind ) const { if ( ind >= 0 && ind < myTypes.count() && myTypes[ind] != "Unknown" ) { - SMESH_Actor* actor = SMESH::FindActorByEntry( entry( ind ).toLatin1().data() ); + SMESH_Actor* actor = SMESH::FindActorByEntry( entry( ind ).toUtf8().data() ); if ( actor && actor->hasIO() ) { if ( SVTK_ViewWindow* aViewWindow = SMESH::GetCurrentVtkView() ) return aViewWindow->isVisible( actor->getIO() ); @@ -644,7 +652,7 @@ bool SMESHGUI_Selection::hasChildren( int ind ) const { if ( ind >= 0 ) { - _PTR(SObject) sobj = SMESH::getStudy()->FindObjectID( entry( ind ).toLatin1().data() ); + _PTR(SObject) sobj = SMESH::getStudy()->FindObjectID( entry( ind ).toUtf8().data() ); if ( sobj ) return SMESH::getStudy()->GetUseCaseBuilder()->HasChildren( sobj ); } @@ -662,7 +670,7 @@ int SMESHGUI_Selection::nbChildren( int ind ) const if ( ind >= 0 ) { _PTR(Study) study = SMESH::getStudy(); - _PTR(SObject) sobj = study->FindObjectID( entry( ind ).toLatin1().data() ); + _PTR(SObject) sobj = study->FindObjectID( entry( ind ).toUtf8().data() ); if ( sobj && study->GetUseCaseBuilder()->IsUseCaseNode( sobj ) ) { _PTR(UseCaseIterator) it = study->GetUseCaseBuilder()->GetUseCaseIterator( sobj ); for ( it->Init( false ); it->More(); it->Next() ) nb++; @@ -689,7 +697,7 @@ bool SMESHGUI_Selection::isContainer( int ind ) const int SMESHGUI_Selection::type( const QString& entry ) { int res = -1; - _PTR(SObject) obj = SalomeApp_Application::getStudy()->FindObjectID( entry.toLatin1().data() ); + _PTR(SObject) obj = SalomeApp_Application::getStudy()->FindObjectID( entry.toUtf8().data() ); if ( obj ) { _PTR(SObject) ref; if ( obj->ReferencedObject( ref ) ) @@ -785,7 +793,7 @@ QString SMESHGUI_Selection::typeName( const int t ) bool SMESHGUI_Selection::isImported( const int ind ) const { bool res = false; - _PTR(SObject) sobj = SMESH::getStudy()->FindObjectID( entry( ind ).toLatin1().constData() ); + _PTR(SObject) sobj = SMESH::getStudy()->FindObjectID( entry( ind ).toUtf8().constData() ); if ( sobj ) { SMESH::SMESH_Mesh_var aMesh = SMESH::SMESH_Mesh::_narrow( SMESH::SObjectToObject( sobj ) ); @@ -815,7 +823,7 @@ int SMESHGUI_Selection::guiState() QString SMESHGUI_Selection::groupType( int ind ) const { - _PTR(SObject) sobj = SMESH::getStudy()->FindObjectID( entry( ind ).toLatin1().constData() ); + _PTR(SObject) sobj = SMESH::getStudy()->FindObjectID( entry( ind ).toUtf8().constData() ); if ( sobj ) { SMESH::SMESH_Group_var g = SMESH::SObjectToInterface( sobj );