X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESH_I%2FSMESH_Gen_i_1.cxx;h=76c2f35d64af727c971b07e3eb76a08226fced5d;hb=8301b1e71a0a9833c5bcf7951b426949f647ae9f;hp=4ac7ad8d3e6fe9d878dd5b06091924abf34d47a0;hpb=bd8f1aee7c78f7d2eb82bd4fec5e08c9e3d280ce;p=modules%2Fsmesh.git diff --git a/src/SMESH_I/SMESH_Gen_i_1.cxx b/src/SMESH_I/SMESH_Gen_i_1.cxx index 4ac7ad8d3..76c2f35d6 100644 --- a/src/SMESH_I/SMESH_Gen_i_1.cxx +++ b/src/SMESH_I/SMESH_Gen_i_1.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2015 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 @@ -6,7 +6,7 @@ // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either -// version 2.1 of the License. +// version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -43,6 +43,8 @@ #include #include +#include + #ifdef _DEBUG_ static int MYDEBUG = 0; //static int VARIABLE_DEBUG = 0; @@ -160,7 +162,7 @@ long SMESH_Gen_i::GetBallElementsGroupsTag() bool SMESH_Gen_i::CanPublishInStudy(CORBA::Object_ptr theIOR) { if(MYDEBUG) MESSAGE("CanPublishInStudy - "<NewBuilder(); - if ( SO->_is_nil() ) { - if ( theTag == 0 ) + SALOMEDS::StudyBuilder_var aStudyBuilder = theStudy->NewBuilder(); + SALOMEDS::UseCaseBuilder_wrap useCaseBuilder = theStudy->GetUseCaseBuilder(); + SALOMEDS::SObject_wrap objAfter; + bool isNewSO = false; + if ( SO->_is_nil() ) + { + if ( theTag == 0 ) { SO = aStudyBuilder->NewObject( theFatherObject ); + isNewSO = true; + } else if ( !theFatherObject->FindSubObject( theTag, SO.inout() )) + { SO = aStudyBuilder->NewObjectToTag( theFatherObject, theTag ); + isNewSO = true; + + // define the next tag after given one in the data tree to insert SObject + SALOMEDS::SObject_wrap curObj; + if ( theFatherObject->GetLastChildTag() > theTag ) + { + SALOMEDS::UseCaseIterator_wrap anUseCaseIter = useCaseBuilder->GetUseCaseIterator(theFatherObject); + for ( ; anUseCaseIter->More(); anUseCaseIter->Next() ) { + curObj = anUseCaseIter->Value(); + if ( curObj->Tag() > theTag ) { + objAfter = curObj; + break; + } + } + } + } } SALOMEDS::GenericAttribute_wrap anAttr; @@ -274,6 +299,10 @@ static SALOMEDS::SObject_ptr publish(SALOMEDS::Study_ptr theStudy, CORBA::String_var objStr = SMESH_Gen_i::GetORB()->object_to_string( theIOR ); SALOMEDS::AttributeIOR_wrap iorAttr = anAttr; iorAttr->SetValue( objStr.in() ); + // UnRegister() !!! + SALOME::GenericObj_var genObj = SALOME::GenericObj::_narrow( theIOR ); + if ( !genObj->_is_nil() ) + genObj->UnRegister(); } if ( thePixMap ) { anAttr = aStudyBuilder->FindOrCreateAttribute( SO, "AttributePixMap" ); @@ -286,12 +315,21 @@ static SALOMEDS::SObject_ptr publish(SALOMEDS::Study_ptr theStudy, selAttr->SetSelectable( false ); } + // add object to the use case tree + // (to support tree representation customization and drag-n-drop) + if ( isNewSO ) + { + if ( !CORBA::is_nil( objAfter ) ) + useCaseBuilder->InsertBefore( SO, objAfter ); // insert at given tag + else if ( !useCaseBuilder->IsUseCaseNode( SO ) ) + useCaseBuilder->AppendTo( theFatherObject, SO ); // append to the end of list + } return SO._retn(); } //======================================================================= //function : setName -//purpose : +//purpose : //======================================================================= void SMESH_Gen_i::SetName(SALOMEDS::SObject_ptr theSObject, @@ -304,9 +342,15 @@ void SMESH_Gen_i::SetName(SALOMEDS::SObject_ptr theSObject, SALOMEDS::GenericAttribute_wrap anAttr = aStudyBuilder->FindOrCreateAttribute( theSObject, "AttributeName" ); SALOMEDS::AttributeName_wrap aNameAttr = anAttr; - if ( theName && strlen( theName ) != 0 ) - aNameAttr->SetValue( theName ); - else { + if ( theName && theName[0] ) { + std::string name( theName ); // trim trailing white spaces + for ( size_t i = name.size()-1; i > 0; --i ) + if ( isspace( name[i] )) name[i] = '\0'; + else break; + aNameAttr->SetValue( name.c_str() ); + } + else + { CORBA::String_var curName = aNameAttr->Value(); if ( strlen( curName.in() ) == 0 ) { SMESH_Comment aName(theDefaultName); @@ -318,7 +362,7 @@ void SMESH_Gen_i::SetName(SALOMEDS::SObject_ptr theSObject, //======================================================================= //function : SetPixMap -//purpose : +//purpose : //======================================================================= void SMESH_Gen_i::SetPixMap(SALOMEDS::SObject_ptr theSObject, @@ -376,7 +420,20 @@ static void addReference (SALOMEDS::Study_ptr theStudy, } if ( !theSObject->FindSubObject( theTag, aReferenceSO.inout() )) aReferenceSO = aStudyBuilder->NewObjectToTag( theSObject, theTag ); + aStudyBuilder->Addreference( aReferenceSO, aToObjSO ); + + // add reference to the use case tree + // (to support tree representation customization and drag-n-drop) + SALOMEDS::UseCaseBuilder_wrap useCaseBuilder = theStudy->GetUseCaseBuilder(); + SALOMEDS::UseCaseIterator_wrap useCaseIter = useCaseBuilder->GetUseCaseIterator(theSObject); + for ( ; useCaseIter->More(); useCaseIter->Next() ) + { + SALOMEDS::SObject_wrap curSO = useCaseIter->Value(); + if ( curSO->Tag() == theTag ) + return; + } + useCaseBuilder->AppendTo( theSObject, aReferenceSO ); } } @@ -441,10 +498,19 @@ SALOMEDS::SComponent_ptr SMESH_Gen_i::PublishComponent(SALOMEDS::Study_ptr theSt return SALOMEDS::SComponent::_nil(); if(MYDEBUG) MESSAGE("PublishComponent"); + SALOMEDS::StudyBuilder_var aStudyBuilder = theStudy->NewBuilder(); + SALOMEDS::UseCaseBuilder_wrap useCaseBuilder = theStudy->GetUseCaseBuilder(); + CORBA::String_var compDataType = ComponentDataType(); SALOMEDS::SComponent_wrap father = theStudy->FindComponent( compDataType.in() ); - if ( !CORBA::is_nil( father ) ) + if ( !CORBA::is_nil( father ) ) { + // check that the component is added to the use case browser + if ( !useCaseBuilder->IsUseCaseNode( father ) ) { + useCaseBuilder->SetRootCurrent(); + useCaseBuilder->Append( father ); // component object is added as the top level item + } return father._retn(); + } SALOME_ModuleCatalog::ModuleCatalog_var aCat = SALOME_ModuleCatalog::ModuleCatalog::_narrow( GetNS()->Resolve("/Kernel/ModulCatalog") ); @@ -455,7 +521,6 @@ SALOMEDS::SComponent_ptr SMESH_Gen_i::PublishComponent(SALOMEDS::Study_ptr theSt if ( CORBA::is_nil( aComp ) ) return father._retn(); - SALOMEDS::StudyBuilder_var aStudyBuilder = theStudy->NewBuilder(); SALOMEDS::GenericAttribute_wrap anAttr; SALOMEDS::AttributePixMap_wrap aPixmap; @@ -466,37 +531,15 @@ SALOMEDS::SComponent_ptr SMESH_Gen_i::PublishComponent(SALOMEDS::Study_ptr theSt aPixmap->SetPixMap( "ICON_OBJBROWSER_SMESH" ); CORBA::String_var userName = aComp->componentusername(); SetName( father, userName.in(), "MESH" ); + // add component to the use case tree + // (to support tree representation customization and drag-n-drop) + useCaseBuilder->SetRootCurrent(); + useCaseBuilder->Append( father ); // component object is added as the top level item if(MYDEBUG) MESSAGE("PublishComponent--END"); return father._retn(); } -//============================================================================= -/*! - * findMaxChildTag [ static internal ] - * - * Finds maximum child tag for the given object - */ -//============================================================================= - -static long findMaxChildTag( SALOMEDS::SObject_ptr theSObject ) -{ - long aTag = 0; - if ( !theSObject->_is_nil() ) { - SALOMEDS::Study_var aStudy = theSObject->GetStudy(); - if ( !aStudy->_is_nil() ) { - SALOMEDS::ChildIterator_wrap anIter = aStudy->NewChildIterator( theSObject ); - for ( ; anIter->More(); anIter->Next() ) { - SALOMEDS::SObject_wrap anSO = anIter->Value(); - long nTag = anSO->Tag(); - if ( nTag > aTag ) - aTag = nTag; - } - } - } - return aTag; -} - //======================================================================= //function : PublishMesh //purpose : @@ -521,7 +564,7 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::PublishMesh (SALOMEDS::Study_ptr theStudy, return aMeshSO._retn(); // Find correct free tag - long aTag = findMaxChildTag( father.in() ); + long aTag = father->GetLastChildTag(); if ( aTag <= GetAlgorithmsRootTag() ) aTag = GetAlgorithmsRootTag() + 1; else @@ -728,9 +771,14 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::PublishGroup (SALOMEDS::Study_ptr theStudy } else if ( SMESH::DownCast< SMESH_Group_i* > ( theGroup )) { - SMESH::array_of_ElementType_var allElemTypes = theMesh->GetTypes(); - for ( size_t i =0; i < allElemTypes->length() && isEmpty; ++i ) - isEmpty = ( allElemTypes[i] != theGroup->GetType() ); + if ( theGroup->GetType() == SMESH::NODE ) + isEmpty = ( theMesh->NbNodes() == 0 ); + else + { + SMESH::array_of_ElementType_var allElemTypes = theMesh->GetTypes(); + for ( size_t i =0; i < allElemTypes->length() && isEmpty; ++i ) + isEmpty = ( allElemTypes[i] != theGroup->GetType() ); + } } aGroupSO = publish (theStudy, theGroup, aRootSO, 0, pm[isEmpty].c_str() ); } @@ -908,7 +956,7 @@ bool SMESH_Gen_i::RemoveHypothesisFromShape(SALOMEDS::Study_ptr theStudy CORBA::String_var hypEntry = aHypSO->GetID(); - // Find a mesh or submesh refering to theShape + // Find a mesh or sub-mesh referring to theShape SALOMEDS::SObject_wrap aMeshOrSubMesh = GetMeshOrSubmeshByShape( theStudy, theMesh, theShape ); if ( aMeshOrSubMesh->_is_nil() ) @@ -1166,7 +1214,7 @@ char* SMESH_Gen_i::GetParameters(CORBA::Object_ptr theObject) { CORBA::String_var aResult(""); - SALOMEDS::SObject_wrap aSObj = ObjectToSObject( myCurrentStudy,theObject); + SALOMEDS::SObject_wrap aSObj = ObjectToSObject( myCurrentStudy, theObject ); if ( !aSObj->_is_nil() ) { SALOMEDS::GenericAttribute_wrap attr; @@ -1176,6 +1224,5 @@ char* SMESH_Gen_i::GetParameters(CORBA::Object_ptr theObject) aResult = strAttr->Value(); } } - - return CORBA::string_dup( aResult.in() ); + return aResult._retn(); }