ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-11-14 09:38:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'origin/akl/22379'

Browse Source
This commit is contained in:
mpa 2014-06-24 13:03:03 +04:00
commit fa057fce70
4 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
idl/GEOM_Gen.idl
View File

@ -5101,7 +5101,7 @@ module GEOM
in string_array theListOfEntries); in string_array theListOfEntries);
/*! /*!
* \brief Fills 3 lists that is used to clean study of redundant objects: * \brief Fills 3 lists that is used to reduce study of redundant objects:
* - dependencies of the given objects from other ones; * - dependencies of the given objects from other ones;
* - children of the given objects; * - children of the given objects;
* - all other objects in study. * - all other objects in study.
@ -5112,11 +5112,11 @@ module GEOM
* \param theOtherEntries List of GEOM object entries which are in the study, but not in parents and children lists * \param theOtherEntries List of GEOM object entries which are in the study, but not in parents and children lists
* \note This method is supposed to be used by GUI only. * \note This method is supposed to be used by GUI only.
*/ */
void GetEntriesToCleanStudy(in SALOMEDS::Study theStudy, void GetEntriesToReduceStudy(in SALOMEDS::Study theStudy,
inout string_array theSelectedEntries, inout string_array theSelectedEntries,
inout string_array theParentEntries, inout string_array theParentEntries,
inout string_array theSubEntries, inout string_array theSubEntries,
inout string_array theOtherEntries); inout string_array theOtherEntries);
}; };
}; };

6
src/GEOMToolsGUI/GEOMToolsGUI_ReduceStudyDlg.cxx
View File

@ -164,7 +164,7 @@ void GEOMToolsGUI_ReduceStudyDlg::init( const std::set<std::string>& theObjectEn
GEOM::string_array_var subObjects = new GEOM::string_array(); GEOM::string_array_var subObjects = new GEOM::string_array();
GEOM::string_array_var otherObjects = new GEOM::string_array(); GEOM::string_array_var otherObjects = new GEOM::string_array();
GeometryGUI::GetGeomGen()->GetEntriesToCleanStudy( GeometryGUI::ClientStudyToStudy( myStudy ), GeometryGUI::GetGeomGen()->GetEntriesToReduceStudy( GeometryGUI::ClientStudyToStudy( myStudy ),
keptObjects, parentsObjects, keptObjects, parentsObjects,
subObjects, otherObjects ); subObjects, otherObjects );
@ -438,8 +438,10 @@ void GEOMToolsGUI_ReduceStudyDlg::removeObject( std::string& theStudyEntry )
_PTR(SObject) obj ( myStudy->FindObjectID( theStudyEntry.c_str() ) ); _PTR(SObject) obj ( myStudy->FindObjectID( theStudyEntry.c_str() ) );
if ( obj ) { if ( obj ) {
//Remove visual properties of the object // remove visual properties of the object
appStudy->removeObjectFromAll(obj->GetID().c_str()); appStudy->removeObjectFromAll(obj->GetID().c_str());
// remove references to this object
appStudy->deleteReferencesTo( obj );
// remove objects from study // remove objects from study
aStudyBuilder->RemoveObjectWithChildren( obj ); aStudyBuilder->RemoveObjectWithChildren( obj );
// remove object from use case tree // remove object from use case tree

4
src/GEOM_I/GEOM_Gen_i.cc
View File

@ -3198,10 +3198,10 @@ void GEOM_Gen_i::getDownwardDependency( GEOM::GEOM_BaseObject_ptr gbo,
} }
//============================================================================== //==============================================================================
// function : GetEntriesToCleanStudy // function : GetEntriesToReduceStudy
// purpose : Fills 3 lists that is used to clean study of redundant objects // purpose : Fills 3 lists that is used to clean study of redundant objects
//============================================================================== //==============================================================================
void GEOM_Gen_i::GetEntriesToCleanStudy(SALOMEDS::Study_ptr theStudy, void GEOM_Gen_i::GetEntriesToReduceStudy(SALOMEDS::Study_ptr theStudy,
GEOM::string_array& theSelectedEntries, GEOM::string_array& theSelectedEntries,
GEOM::string_array& theParentEntries, GEOM::string_array& theParentEntries,
GEOM::string_array& theSubEntries, GEOM::string_array& theSubEntries,

10
src/GEOM_I/GEOM_Gen_i.hh
View File

@ -327,11 +327,11 @@ class GEOM_I_EXPORT GEOM_Gen_i: virtual public POA_GEOM::GEOM_Gen, virtual publi
/*! \brief Fills 3 lists that is used to clean study of redundant objects. /*! \brief Fills 3 lists that is used to clean study of redundant objects.
* To be used from GUI. * To be used from GUI.
*/ */
void GetEntriesToCleanStudy(SALOMEDS::Study_ptr theStudy, void GetEntriesToReduceStudy(SALOMEDS::Study_ptr theStudy,
GEOM::string_array& theSelectedEntries, GEOM::string_array& theSelectedEntries,
GEOM::string_array& theParentEntries, GEOM::string_array& theParentEntries,
GEOM::string_array& theSubEntries, GEOM::string_array& theSubEntries,
GEOM::string_array& theOtherEntries); GEOM::string_array& theOtherEntries);
//-----------------------------------------------------------------------// //-----------------------------------------------------------------------//
// Internal methods // // Internal methods //