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 creating group

Browse Source
This commit is contained in:
mpa 2014-01-17 09:46:36 +00:00
parent c19429532e
commit 96ecf49b16
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/GroupGUI/GroupGUI_GroupDlg.cxx
View File

@ -922,7 +922,7 @@ void GroupGUI_GroupDlg::activateSelection()
myIsShapeType) // check if shape type is already choosen by user myIsShapeType) // check if shape type is already choosen by user
{ {
GEOM_Displayer* aDisplayer = getDisplayer(); GEOM_Displayer* aDisplayer = getDisplayer();
//display mode for main shape //display mode for main shape
if ( myDmMode == -1 ) { if ( myDmMode == -1 ) {
SALOME_View* view = GEOM_Displayer::GetActiveView(); SALOME_View* view = GEOM_Displayer::GetActiveView();
@ -935,11 +935,6 @@ void GroupGUI_GroupDlg::activateSelection()
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(getShapeType() != TopAbs_VERTEX) {
aDisplayer->Erase(myMainObj, false, false);
myIsHiddenMain = true;
}
} }
else else
myDmMode = SUIT_Session::session()->resourceMgr()->integerValue( "Geometry", "display_mode" ); myDmMode = SUIT_Session::session()->resourceMgr()->integerValue( "Geometry", "display_mode" );
@ -948,10 +943,13 @@ void GroupGUI_GroupDlg::activateSelection()
aDisplayer->SetDisplayMode(myDmMode); aDisplayer->SetDisplayMode(myDmMode);
// 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 (getShapeType() == TopAbs_VERTEX) { if(getShapeType() != TopAbs_VERTEX) {
if (myIsHiddenMain) aDisplayer->Erase(myMainObj, false, false);
aDisplayer->Display(myMainObj); myIsHiddenMain = true;
} }
else
aDisplayer->Display(myMainObj);
aDisplayer->Erase(myGroup, false, false); aDisplayer->Erase(myGroup, false, false);
QColor aColor = SUIT_Session::session()->resourceMgr()->colorValue( "Geometry", "editgroup_color" ); QColor aColor = SUIT_Session::session()->resourceMgr()->colorValue( "Geometry", "editgroup_color" );