X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_Utils.cxx;h=893fa86d358fea6aad8077bb3b26332660bca67d;hp=c8f22670819b90e199e4016b5fa38993dc5ac72c;hb=e85e13ee2a8e2484050471ff8e4dea298abe481a;hpb=7a65c9fad427b1ccba6b9ccae612296e5092a324 diff --git a/src/SMESHGUI/SMESHGUI_Utils.cxx b/src/SMESHGUI/SMESHGUI_Utils.cxx index c8f226708..893fa86d3 100644 --- a/src/SMESHGUI/SMESHGUI_Utils.cxx +++ b/src/SMESHGUI/SMESHGUI_Utils.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2020 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 @@ -76,12 +76,6 @@ namespace SMESH return SUIT_Session::session()->resourceMgr(); } - _PTR(Study) - GetCStudy(const SalomeApp_Study* theStudy) - { - return theStudy->studyDS(); - } - CORBA::Object_var DataOwnerToObject(const LightApp_DataOwnerPtr& theOwner) { @@ -90,9 +84,8 @@ namespace SMESH const Handle(SALOME_InteractiveObject)& anIO = theOwner->IO(); if(!anIO.IsNull()){ if(anIO->hasEntry()){ - _PTR(Study) aStudy = GetActiveStudyDocument(); - _PTR(SObject) aSObj = aStudy->FindObjectID(anIO->getEntry()); - anObj = SObjectToObject(aSObj,aStudy); + _PTR(SObject) aSObj = getStudy()->FindObjectID(anIO->getEntry()); + anObj = SObjectToObject(aSObj); } } } @@ -118,13 +111,12 @@ namespace SMESH return NULL; } - _PTR(Study) GetActiveStudyDocument() + _PTR(Study) getStudy() { - SalomeApp_Study* aStudy = dynamic_cast(GetActiveStudy()); - if (aStudy) - return aStudy->studyDS(); - else - return _PTR(Study)(); + static _PTR(Study) _study; + if(!_study) + _study = SalomeApp_Application::getStudy(); + return _study; } _PTR(SObject) FindSObject (CORBA::Object_ptr theObject) @@ -132,26 +124,23 @@ namespace SMESH SalomeApp_Application* app = dynamic_cast (SUIT_Session::session()->activeApplication()); if (app && !CORBA::is_nil(theObject)) { - if(_PTR(Study) aStudy = GetActiveStudyDocument()){ - CORBA::String_var anIOR = app->orb()->object_to_string(theObject); - if (strcmp(anIOR.in(), "") != 0) - return aStudy->FindObjectIOR(anIOR.in()); - } + CORBA::String_var anIOR = app->orb()->object_to_string(theObject); + if (strcmp(anIOR.in(), "") != 0) + return getStudy()->FindObjectIOR(anIOR.in()); } return _PTR(SObject)(); } void SetName (_PTR(SObject) theSObject, const QString& theName) { - _PTR(Study) aStudy = GetActiveStudyDocument(); - if (aStudy->GetProperties()->IsLocked()) + if (getStudy()->GetProperties()->IsLocked()) return; - SMESHGUI::GetSMESHGen()->SetName(theSObject->GetIOR().c_str(), theName.toLatin1().data()); + SMESHGUI::GetSMESHGen()->SetName(theSObject->GetIOR().c_str(), theName.toUtf8().data()); } void SetValue (_PTR(SObject) theSObject, const QString& theValue) { - _PTR(Study) aStudy = GetActiveStudyDocument(); + _PTR(Study) aStudy = getStudy(); if (aStudy->GetProperties()->IsLocked()) return; _PTR(StudyBuilder) aBuilder = aStudy->NewBuilder(); @@ -159,12 +148,12 @@ namespace SMESH aBuilder->FindOrCreateAttribute(theSObject, "AttributeComment"); _PTR(AttributeComment) aComment = anAttr; if (aComment) - aComment->SetValue(theValue.toLatin1().data()); + aComment->SetValue(theValue.toUtf8().data()); } void setFileName (_PTR(SObject) theSObject, const QString& theValue) { - _PTR(Study) aStudy = GetActiveStudyDocument(); + _PTR(Study) aStudy = getStudy(); if (aStudy->GetProperties()->IsLocked()) return; _PTR(StudyBuilder) aBuilder = aStudy->NewBuilder(); @@ -172,12 +161,12 @@ namespace SMESH aBuilder->FindOrCreateAttribute(theSObject, "AttributeExternalFileDef"); _PTR(AttributeExternalFileDef) aFileName = anAttr; if (aFileName) - aFileName->SetValue(theValue.toLatin1().data()); + aFileName->SetValue(theValue.toUtf8().data()); } void setFileType (_PTR(SObject) theSObject, const QString& theValue) { - _PTR(Study) aStudy = GetActiveStudyDocument(); + _PTR(Study) aStudy = getStudy(); if (aStudy->GetProperties()->IsLocked()) return; _PTR(StudyBuilder) aBuilder = aStudy->NewBuilder(); @@ -185,11 +174,10 @@ namespace SMESH aBuilder->FindOrCreateAttribute(theSObject, "AttributeFileType"); _PTR(AttributeFileType) aFileType = anAttr; if (aFileType) - aFileType->SetValue(theValue.toLatin1().data()); + aFileType->SetValue(theValue.toUtf8().data()); } - CORBA::Object_var SObjectToObject (_PTR(SObject) theSObject, - _PTR(Study) /*theStudy*/) + CORBA::Object_var SObjectToObject (_PTR(SObject) theSObject ) { SalomeApp_Application* app = dynamic_cast (SUIT_Session::session()->activeApplication()); @@ -207,12 +195,6 @@ namespace SMESH return CORBA::Object::_nil(); } - CORBA::Object_var SObjectToObject (_PTR(SObject) theSObject) - { - _PTR(Study) aStudy;// = GetActiveStudyDocument(); -- aStudy is not used - return SObjectToObject(theSObject,aStudy); - } - _PTR(SObject) ObjectToSObject( CORBA::Object_ptr theObject ) { _PTR(SObject) res; @@ -220,9 +202,8 @@ namespace SMESH (SUIT_Session::session()->activeApplication()); if ( app ) { CORBA::String_var ior = app->orb()->object_to_string( theObject ); - SalomeApp_Study* study = dynamic_cast( app->activeStudy() ); - if ( study && strlen( ior ) > 0 ) - res = study->studyDS()->FindObjectIOR( ior.in() ); + if ( strlen( ior ) > 0 ) + res = getStudy()->FindObjectIOR( ior.in() ); } return res; } @@ -231,9 +212,8 @@ namespace SMESH { if (!theIO.IsNull()) { if (theIO->hasEntry()) { - _PTR(Study) aStudy = GetActiveStudyDocument(); - _PTR(SObject) anObj = aStudy->FindObjectID(theIO->getEntry()); - return SObjectToObject(anObj,aStudy); + _PTR(SObject) anObj = getStudy()->FindObjectID(theIO->getEntry()); + return SObjectToObject(anObj); } } return CORBA::Object::_nil(); @@ -246,6 +226,12 @@ namespace SMESH return app->orb()->string_to_object(theIOR.toLatin1().data()); } + CORBA::Object_var EntryToObject( const QString& theEntry ) + { + _PTR(SObject) anObj = getStudy()->FindObjectID( theEntry.toLatin1().data() ); + return SObjectToObject(anObj); + } + int GetNameOfSelectedIObjects(LightApp_SelectionMgr* theMgr, QString& theName) { if (!theMgr) @@ -256,13 +242,30 @@ namespace SMESH int aNbSel = selected.Extent(); if (aNbSel == 1) { Handle(SALOME_InteractiveObject) anIObject = selected.First(); - theName = QString( anIObject->getName() ).trimmed(); + theName = GetName( anIObject ); } else { theName = QObject::tr("SMESH_OBJECTS_SELECTED").arg(aNbSel); } return aNbSel; } + QString GetName( const Handle(SALOME_InteractiveObject)& theIO ) + { + QString name; + if ( !theIO.IsNull() ) + { + name = QString( theIO->getName() ).trimmed(); + + if ( name.isEmpty() && theIO->hasEntry() ) + { + _PTR(SObject) sObj = getStudy()->FindObjectID( theIO->getEntry() ); + if ( sObj ) + name = sObj->GetName().c_str(); + } + } + return name.trimmed(); + } + _PTR(SObject) GetMeshOrSubmesh (_PTR(SObject) theSObject) { GEOM::GEOM_Object_var aShape = SObjectToInterface(theSObject); @@ -277,83 +280,6 @@ namespace SMESH return theSObject->GetFather(); } - void ModifiedMesh (_PTR(SObject) theSObject, bool theIsNotModif, bool isEmptyMesh) - { - _PTR(Study) aStudy = GetActiveStudyDocument(); - if (aStudy->GetProperties()->IsLocked()) - return; - - _PTR(StudyBuilder) aBuilder = aStudy->NewBuilder(); - _PTR(GenericAttribute) anAttr = - aBuilder->FindOrCreateAttribute(theSObject,"AttributePixMap"); - _PTR(AttributePixMap) aPixmap = anAttr; - - std::string pmName; - if (theIsNotModif) - pmName = "ICON_SMESH_TREE_MESH"; - else if ( isEmptyMesh ) - pmName = "ICON_SMESH_TREE_MESH_WARN"; - else - pmName = "ICON_SMESH_TREE_MESH_PARTIAL"; - aPixmap->SetPixMap( pmName ); - - _PTR(ChildIterator) anIter = aStudy->NewChildIterator(theSObject); - for ( ; anIter->More(); anIter->Next() ) { - _PTR(SObject) aSObj = anIter->Value(); - if ( aSObj->Tag() >= SMESH::Tag_FirstSubMesh ) - { - _PTR(ChildIterator) anIter1 = aStudy->NewChildIterator(aSObj); - for ( ; anIter1->More(); anIter1->Next()) - { - _PTR(SObject) aSObj1 = anIter1->Value(); - _PTR(SObject) aSObjectRef; - if (aSObj1->ReferencedObject(aSObjectRef)) - continue; // reference to an object - - anAttr = aBuilder->FindOrCreateAttribute(aSObj1, "AttributePixMap"); - aPixmap = anAttr; - - std::string entry = aSObj1->GetID(); - int objType = SMESHGUI_Selection::type( entry.c_str(), aStudy ); - if ( objType == SMESH::HYPOTHESIS || objType == SMESH::ALGORITHM ) - continue; - - SMESH::SMESH_IDSource_var idSrc = SObjectToInterface( aSObj1 ); - if ( !idSrc->_is_nil() ) - { - SMESH::SMESH_GroupOnFilter_var gof = - SObjectToInterface( aSObj1 ); - const bool isGroupOnFilter = !gof->_is_nil(); - - bool isEmpty = false; - if ( !isGroupOnFilter ) // GetTypes() can be very long on GroupOnFilter! - { - SMESH::array_of_ElementType_var elemTypes = idSrc->GetTypes(); - isEmpty = ( elemTypes->length() == 0 ); - } - if ( isEmpty ) - aPixmap->SetPixMap("ICON_SMESH_TREE_MESH_WARN"); - else if ( objType != GROUP ) - aPixmap->SetPixMap( "ICON_SMESH_TREE_MESH" ); - else if ( isGroupOnFilter ) - aPixmap->SetPixMap( "ICON_SMESH_TREE_GROUP_ON_FILTER" ); - else - aPixmap->SetPixMap( "ICON_SMESH_TREE_GROUP" ); - } - else // is it necessary? - { - if ( !theIsNotModif ) - aPixmap->SetPixMap( pmName ); - else if ( objType == GROUP ) - aPixmap->SetPixMap( "ICON_SMESH_TREE_GROUP" ); - else - aPixmap->SetPixMap( "ICON_SMESH_TREE_MESH" ); - } - } - } - } - } - void ShowHelpFile (const QString& theHelpFileName) { LightApp_Application* app = (LightApp_Application*)(SUIT_Session::session()->activeApplication());