ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-03-26 09:07:55 +05:00
Code Issues Packages Projects Releases Wiki Activity

PAL11188: PAL_NO_ERROR on Explode, if the main shape is not displayed, but some of its sub-shapes are.

Browse Source
This commit is contained in:
jfa 2006-01-23 09:18:05 +00:00
parent f2ef0d1b0d
commit b177250180
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/GEOMBase/GEOMBase_Helper.cxx
View File

@ -98,7 +98,8 @@ GEOMBase_Helper::~GEOMBase_Helper()
globalSelection( GEOM_ALLOBJECTS, true ); globalSelection( GEOM_ALLOBJECTS, true );
delete myDisplayer; if (myDisplayer)
delete myDisplayer;
} }
//================================================================ //================================================================
@ -382,7 +383,7 @@ void GEOMBase_Helper::activate( const int theType )
} }
} }
myDisplayer->LocalSelection( aList, 0 ); getDisplayer()->LocalSelection( aList, 0 );
} }
//================================================================ //================================================================
@ -406,7 +407,7 @@ void GEOMBase_Helper::localSelection( const ObjectList& theObjs, const int theMo
aEntry.c_str(), "GEOM", strdup( GEOMBase::GetName( anObj ) ) ) ); aEntry.c_str(), "GEOM", strdup( GEOMBase::GetName( anObj ) ) ) );
} }
myDisplayer->LocalSelection( aListOfIO, theMode ); getDisplayer()->LocalSelection( aListOfIO, theMode );
} }
//================================================================ //================================================================
@ -418,7 +419,7 @@ void GEOMBase_Helper::localSelection( GEOM::GEOM_Object_ptr obj, const int mode
{ {
// If object is null local selection for all objects is activated // If object is null local selection for all objects is activated
if ( obj->_is_nil() ) { if ( obj->_is_nil() ) {
myDisplayer->LocalSelection( Handle(SALOME_InteractiveObject)(), mode ); getDisplayer()->LocalSelection( Handle(SALOME_InteractiveObject)(), mode );
return; return;
} }
@ -435,7 +436,7 @@ void GEOMBase_Helper::localSelection( GEOM::GEOM_Object_ptr obj, const int mode
//================================================================ //================================================================
void GEOMBase_Helper::globalSelection( const int theMode, const bool update ) void GEOMBase_Helper::globalSelection( const int theMode, const bool update )
{ {
myDisplayer->GlobalSelection( theMode, update ); getDisplayer()->GlobalSelection( theMode, update );
} }
//================================================================ //================================================================
@ -446,7 +447,7 @@ void GEOMBase_Helper::globalSelection( const int theMode, const bool update )
void GEOMBase_Helper::globalSelection( const TColStd_MapOfInteger& theModes, void GEOMBase_Helper::globalSelection( const TColStd_MapOfInteger& theModes,
const bool update ) const bool update )
{ {
myDisplayer->GlobalSelection( theModes, update ); getDisplayer()->GlobalSelection( theModes, update );
} }
//================================================================ //================================================================

2
src/GEOMGUI/GEOM_Displayer.cxx
View File

@ -840,6 +840,8 @@ void GEOM_Displayer::LocalSelection( const Handle(SALOME_InteractiveObject)& the
QAD_ViewFrame* vf = GetActiveView(); QAD_ViewFrame* vf = GetActiveView();
if ( vf ) if ( vf )
{ {
if (!theIO.IsNull() && !vf->isVisible(theIO))
Display(theIO);
SALOME_Prs* prs = vf->CreatePrs( theIO.IsNull() ? 0 : theIO->getEntry() ); SALOME_Prs* prs = vf->CreatePrs( theIO.IsNull() ? 0 : theIO->getEntry() );
((SALOME_View*)vf)->LocalSelection( prs, theMode ); ((SALOME_View*)vf)->LocalSelection( prs, theMode );
delete prs; // delete presentation because displayer is its owner delete prs; // delete presentation because displayer is its owner