ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-12-25 17:00:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a regression: wrong display of shape by choosing different shape type when exploding a shape

Browse Source
This commit is contained in:
mpa 2014-01-17 10:06:21 +00:00
parent 96ecf49b16
commit ac4bdd2286
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/EntityGUI/EntityGUI_SubShapeDlg.cxx
View File

@ -739,24 +739,21 @@ void EntityGUI_SubShapeDlg::activateSelection()
new SALOME_InteractiveObject (aMainEntry.in(), "GEOM", "TEMP_IO"); new SALOME_InteractiveObject (aMainEntry.in(), "GEOM", "TEMP_IO");
if ( view->isVisible( io ) ) { if ( view->isVisible( io ) ) {
Handle(GEOM_AISShape) aSh = GEOMBase::ConvertIOinGEOMAISShape( io, true ); Handle(GEOM_AISShape) aSh = GEOMBase::ConvertIOinGEOMAISShape( io, true );
if(!aSh.IsNull()) { if(!aSh.IsNull())
myDmMode = aSh->isTopLevel() ? aSh->prevDisplayMode() : aSh->DisplayMode(); myDmMode = aSh->isTopLevel() ? aSh->prevDisplayMode() : aSh->DisplayMode();
} }
// Hide main shape, if explode on VERTEX
if (shapeType() != TopAbs_VERTEX) {
aDisplayer->Erase(myObject, false, false);
myIsHiddenMain = true;
}
}
else else
myDmMode = SUIT_Session::session()->resourceMgr()->integerValue( "Geometry", "display_mode" ); myDmMode = SUIT_Session::session()->resourceMgr()->integerValue( "Geometry", "display_mode" );
} }
} }
// Mantis issue 0021421: do not hide main shape, if explode on VERTEX // Mantis issue 0021421: do not hide main shape, if explode on VERTEX
if (shapeType() == TopAbs_VERTEX) { if (shapeType() != TopAbs_VERTEX) {
if (myIsHiddenMain) aDisplayer->Erase(myObject, false, false);
aDisplayer->Display(myObject); myIsHiddenMain = true;
} }
else
aDisplayer->Display(myObject);
aDisplayer->SetDisplayMode(myDmMode); aDisplayer->SetDisplayMode(myDmMode);
if(!isApply) { if(!isApply) {