From 3e98d95f4140fee28550e14ff36bc55f000ed4b9 Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 18 Aug 2009 05:41:44 +0000 Subject: [PATCH] Issue 20099: Hide children Add Show/Hide chidren menu command for GEOM module objects --- doc/salome/gui/GEOM/images/ob_popup_menu.png | Bin 0 -> 13720 bytes .../gui/GEOM/input/viewing_geom_obj.doc | 51 +++++++++---- src/GEOMGUI/GEOMGUI_Selection.cxx | 68 ++++++++++++++++++ src/GEOMGUI/GEOMGUI_Selection.h | 6 ++ src/GEOMGUI/GEOM_msg_en.ts | 24 +++++++ src/GEOMGUI/GeometryGUI.cxx | 8 +++ src/GEOMToolsGUI/GEOMToolsGUI.cxx | 6 ++ src/GEOMToolsGUI/GEOMToolsGUI.h | 3 +- src/GEOMToolsGUI/GEOMToolsGUI_1.cxx | 39 ++++++++++ 9 files changed, 189 insertions(+), 16 deletions(-) create mode 100644 doc/salome/gui/GEOM/images/ob_popup_menu.png diff --git a/doc/salome/gui/GEOM/images/ob_popup_menu.png b/doc/salome/gui/GEOM/images/ob_popup_menu.png new file mode 100644 index 0000000000000000000000000000000000000000..1adb3bebb466d779ba76026474801b47d533b439 GIT binary patch literal 13720 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 GA^!uHzL5$5 literal 0 HcmV?d00001 diff --git a/doc/salome/gui/GEOM/input/viewing_geom_obj.doc b/doc/salome/gui/GEOM/input/viewing_geom_obj.doc index ce710f35e..3787aed92 100644 --- a/doc/salome/gui/GEOM/input/viewing_geom_obj.doc +++ b/doc/salome/gui/GEOM/input/viewing_geom_obj.doc @@ -2,12 +2,13 @@ \page view_geom_obj_page Viewing geometrical objects -\n Newly created geometrical objects are automatically displayed in +Newly created geometrical objects are automatically displayed in the OCC 3D Viewer. -\n OCC 3D Viewer is described in the documentation on GUI +OCC 3D Viewer is described in the documentation on GUI module. -\n After the object has appeared in the Viewer, you can select it with + +After the object has appeared in the Viewer, you can select it with left mouse click to change its presentation parameters and access to other useful options by right-clicking on the selected object. @@ -32,27 +33,47 @@ sub-shapes of the selected geometrical object are automatically coloured by the unique colors. TUI Commands : go.SetAutoColor(enable), enabled = go.GetAutoColor()
  • Hide - allows to hide the selected geometrical object from the -viewer. TUI Command : sg.EraseOnly(ID) -\n \image html image18.png -
    • +viewer. TUI Command : sg.EraseOnly(ID) + +\image html image18.png +
  • Hide all - allows to hide all objects from the viewer. TUI -Command: sg.EraseAll() -\n \image html image26.png -
    • +Command: sg.EraseAll() + +\image html image26.png +
  • Show Only - allows to display only the selected -geometrical object. TUI Command: sg.DisplayOnly(ID) -\n \image html image33.png -
    • +geometrical object. TUI Command: sg.DisplayOnly(ID) + +\image html image33.png +
  • Dump view - exports an object from the viewer in bmp, png, jpg or jpeg image format.
  • Change background - allows to redefine the background -color. By default it is black. -\n\n Some of these functionalities are available through right-clicking +color. By default it is black.
    • + + +Some of these functionalities are available through right-clicking on the viewer background: -\image html image22.png
    +\image html image22.png
    +
    • Select Only provides a filter for exclusive selection of objects of a certain type.
    +The Object browser's popup menu can include some other commands: + +\image html ob_popup_menu.png
    + +
      +
    • \subpage work_with_groups_page "Create Group" - invokes dialog box +that allows creating groups of geometrical objects.
      • +
    • Hide Children / Show Children - hide / show child +sub-objects in the Object Browser. These commands are available only +if the selected geometry object has any children. Note: when some +children are hidden, the object name is hilghlighted with the bold +font.
      • +
    + */ diff --git a/src/GEOMGUI/GEOMGUI_Selection.cxx b/src/GEOMGUI/GEOMGUI_Selection.cxx index 1cff7b460..593d80550 100644 --- a/src/GEOMGUI/GEOMGUI_Selection.cxx +++ b/src/GEOMGUI/GEOMGUI_Selection.cxx @@ -89,6 +89,10 @@ QVariant GEOMGUI_Selection::parameter( const int ind, const QString& p ) const return QVariant( isAutoColor( ind ) ); else if ( p == "isVectorsMode" ) return QVariant( isVectorsMode( ind ) ); + else if ( p == "hasHiddenChildren" ) + return QVariant( hasHiddenChildren( ind ) ); + else if ( p == "hasShownChildren" ) + return QVariant( hasShownChildren( ind ) ); else return LightApp_Selection::parameter( ind, p ); } @@ -219,6 +223,70 @@ bool GEOMGUI_Selection::isVectorsMode( const int index ) const return ret; } +bool GEOMGUI_Selection::hasChildren( const _PTR(SObject)& obj ) +{ + bool ok = false; + if ( obj ) { + _PTR(ChildIterator) it ( obj->GetStudy()->NewChildIterator( obj ) ); + for ( ; it->More() && !ok; it->Next() ) { + _PTR(SObject) child = it->Value(); + if ( child ) { + _PTR(SObject) refObj; + if ( child->ReferencedObject( refObj ) ) continue; // omit references + if ( child->GetName() != "" ) ok = true; + } + } + } + return ok; +} + +bool GEOMGUI_Selection::expandable( const _PTR(SObject)& obj ) +{ + bool exp = true; + _PTR(GenericAttribute) anAttr; + if ( obj && obj->FindAttribute( anAttr, "AttributeExpandable" ) ) { + _PTR(AttributeExpandable) aAttrExp = anAttr; + exp = aAttrExp->IsExpandable(); + } + return exp; +} + +bool GEOMGUI_Selection::hasHiddenChildren( const int index ) const +{ + bool OK = false; + SalomeApp_Study* appStudy = dynamic_cast + (SUIT_Session::session()->activeApplication()->activeStudy()); + + if ( appStudy && index >= 0 && index < count() ) { + _PTR(Study) study = appStudy->studyDS(); + QString anEntry = entry( index ); + + if ( study && !anEntry.isEmpty() ) { + _PTR(SObject) aSO( study->FindObjectID( anEntry.toStdString() ) ); + OK = !expandable( aSO ) && hasChildren( aSO ); + } + } + return OK; +} + +bool GEOMGUI_Selection::hasShownChildren( const int index ) const +{ + bool OK = false; + SalomeApp_Study* appStudy = dynamic_cast + (SUIT_Session::session()->activeApplication()->activeStudy()); + + if ( appStudy && index >= 0 && index < count() ) { + _PTR(Study) study = appStudy->studyDS(); + QString anEntry = entry( index ); + + if ( study && !anEntry.isEmpty() ) { + _PTR(SObject) aSO( study->FindObjectID( anEntry.toStdString() ) ); + OK = expandable( aSO ) && hasChildren( aSO ); + } + } + return OK; +} + bool GEOMGUI_Selection::isComponent( const int index ) const { SalomeApp_Study* appStudy = dynamic_cast diff --git a/src/GEOMGUI/GEOMGUI_Selection.h b/src/GEOMGUI/GEOMGUI_Selection.h index d03570ec0..d6b4dabf0 100644 --- a/src/GEOMGUI/GEOMGUI_Selection.h +++ b/src/GEOMGUI/GEOMGUI_Selection.h @@ -28,6 +28,7 @@ #include "GEOM_GEOMGUI.hxx" #include +#include #include #include CORBA_SERVER_HEADER(GEOM_Gen) @@ -50,6 +51,11 @@ private: QString displayMode( const int ) const; QString selectionMode() const; bool isVectorsMode( const int ) const; + bool hasHiddenChildren( const int ) const; + bool hasShownChildren( const int ) const; + + static bool hasChildren( const _PTR(SObject)& ); + static bool expandable( const _PTR(SObject)& ); bool isComponent( const int ) const; GEOM::GEOM_Object_ptr getObject( const int ) const; diff --git a/src/GEOMGUI/GEOM_msg_en.ts b/src/GEOMGUI/GEOM_msg_en.ts index c30b27932..9abfa6421 100644 --- a/src/GEOMGUI/GEOM_msg_en.ts +++ b/src/GEOMGUI/GEOM_msg_en.ts @@ -2323,6 +2323,14 @@ Please, select face, shell or solid and try again MEN_POP_CREATE_GROUP Create Group + + MEN_POP_SHOW_CHILDREN + Show Children + + + MEN_POP_HIDE_CHILDREN + Hide Children + MEN_POP_ISOS Isos @@ -2863,6 +2871,14 @@ Please, select face, shell or solid and try again STB_POP_CREATE_GROUP Create Group + + STB_POP_SHOW_CHILDREN + Show child objects + + + STB_POP_HIDE_CHILDREN + Hide child objects + STB_POP_ISOS Isolines @@ -3335,6 +3351,14 @@ Please, select face, shell or solid and try again TOP_POP_CREATE_GROUP Create Group + + TOP_POP_SHOW_CHILDREN + Show Children + + + TOP_POP_HIDE_CHILDREN + Hide Children + TOP_POP_ISOS Isolines diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx index 7706ad9d6..86ef36d17 100644 --- a/src/GEOMGUI/GeometryGUI.cxx +++ b/src/GEOMGUI/GeometryGUI.cxx @@ -386,6 +386,8 @@ void GeometryGUI::OnGUIEvent( int id ) id == 8034 || // POPUP VIEWER - ISOS id == 8035 || // POPUP VIEWER - AUTO COLOR id == 8036 || // POPUP VIEWER - DISABLE AUTO COLOR + id == 8037 || // POPUP VIEWER - SHOW CHILDREN + id == 8038 || // POPUP VIEWER - HIDE CHILDREN id == 804 || // POPUP VIEWER - ADD IN STUDY id == 901 || // OBJECT BROWSER - RENAME id == 9024 ) { // OBJECT BROWSER - OPEN @@ -904,6 +906,8 @@ void GeometryGUI::initialize( CAM_Application* app ) createGeomAction( 8035, "POP_AUTO_COLOR" ); createGeomAction( 8036, "POP_DISABLE_AUTO_COLOR" ); createGeomAction( 8001, "POP_CREATE_GROUP" ); + createGeomAction( 8037, "POP_SHOW_CHILDREN" ); + createGeomAction( 8038, "POP_HIDE_CHILDREN" ); // make wireframe-shading items to be exclusive (only one at a time is selected) //QActionGroup* dispModeGr = new QActionGroup( this, "", true ); @@ -1145,6 +1149,10 @@ void GeometryGUI::initialize( CAM_Application* app ) mgr->setRule( action( 33 ), QString("$type in {'Shape' 'Group'} and selcount>0"), QtxPopupMgr::VisibleRule ); mgr->insert( action( 8001 ), -1, -1 ); // create group mgr->setRule( action( 8001 ), QString("client='ObjectBrowser' and type='Shape' and selcount=1 and isOCC=true"), QtxPopupMgr::VisibleRule ); + mgr->insert( action( 8037 ), -1, -1 ); // show children + mgr->setRule( action( 8037 ), QString("client='ObjectBrowser' and type='Shape' and selcount=1 and hasHiddenChildren=true"), QtxPopupMgr::VisibleRule ); + mgr->insert( action( 8038 ), -1, -1 ); // hide children + mgr->setRule( action( 8038 ), QString("client='ObjectBrowser' and type='Shape' and selcount=1 and hasShownChildren=true"), QtxPopupMgr::VisibleRule ); mgr->insert( action( 801 ), -1, -1 ); // edit group mgr->setRule( action( 801 ), QString("client='ObjectBrowser' and type='Group' and selcount=1 and isOCC=true"), QtxPopupMgr::VisibleRule ); mgr->insert( separator(), -1, -1 ); // ----------- diff --git a/src/GEOMToolsGUI/GEOMToolsGUI.cxx b/src/GEOMToolsGUI/GEOMToolsGUI.cxx index 34dd0d2cc..a076bccf5 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI.cxx @@ -401,6 +401,12 @@ bool GEOMToolsGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent) OnDisableAutoColor(); break; } + case 8037: // SHOW CHILDREN - POPUP VIEWER + case 8038: // HIDE CHILDREN - POPUP VIEWER + { + OnShowHideChildren( theCommandID == 8037 ); + break; + } case 9024 : // OPEN - OBJBROSER POPUP { OnOpen(); diff --git a/src/GEOMToolsGUI/GEOMToolsGUI.h b/src/GEOMToolsGUI/GEOMToolsGUI.h index 3ae7e7808..91d8db559 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI.h +++ b/src/GEOMToolsGUI/GEOMToolsGUI.h @@ -71,7 +71,8 @@ private: void OnNbIsos(); void OnOpen(); void OnSelectOnly(int mode); - + void OnShowHideChildren( bool ); + // Recursive deletion of object with children void removeObjectWithChildren( _PTR(SObject), _PTR(Study), diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx index a996e25ef..bc7e8fd23 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx @@ -606,3 +606,42 @@ void GEOMToolsGUI::OnSelectOnly(int mode) getGeometryGUI()->setLocalSelectionMode(mode); } } + +void GEOMToolsGUI::OnShowHideChildren( bool show ) +{ + SALOME_ListIO selected; + SalomeApp_Application* app = + dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() ); + if ( app ) { + LightApp_SelectionMgr* aSelMgr = app->selectionMgr(); + SalomeApp_Study* appStudy = dynamic_cast( app->activeStudy() ); + if ( aSelMgr && appStudy ) { + aSelMgr->selectedObjects( selected ); + if ( !selected.IsEmpty() ) { + _PTR(Study) aStudy = appStudy->studyDS(); + _PTR(StudyBuilder) B = aStudy->NewBuilder(); + + bool aLocked = ( _PTR(AttributeStudyProperties)( aStudy->GetProperties() ) )->IsLocked(); + if ( aLocked ) { + SUIT_MessageBox::warning( app->desktop(), + QObject::tr( "WRN_WARNING" ), + QObject::tr( "WRN_STUDY_LOCKED" ) ); + return; + } + + for ( SALOME_ListIteratorOfListIO It( selected ); It.More(); It.Next() ) { + Handle(SALOME_InteractiveObject) IObject = It.Value(); + + _PTR(SObject) obj ( aStudy->FindObjectID( IObject->getEntry() ) ); + _PTR(GenericAttribute) anAttr; + if ( obj ) { + _PTR(AttributeExpandable) aExp = B->FindOrCreateAttribute( obj, "AttributeExpandable" ); + aExp->SetExpandable( show ); + } // if ( obj ) + } // iterator + } + } + app->updateObjectBrowser( false ); + app->updateActions(); + } +} -- 2.39.2