From: vsv Date: Thu, 9 Apr 2020 16:09:22 +0000 (+0300) Subject: Issue #18834 (Tuleap): Show/hide Faces and Property panels on activate/deactivate... X-Git-Tag: V9_5_0b1~54 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=dec56fdaab3172fd588b9bb372b501a1fcf73a7b;p=modules%2Fshaper.git Issue #18834 (Tuleap): Show/hide Faces and Property panels on activate/deactivate SHAPER module --- diff --git a/src/SHAPERGUI/SHAPERGUI.cpp b/src/SHAPERGUI/SHAPERGUI.cpp index 084f623d1..941258cf1 100644 --- a/src/SHAPERGUI/SHAPERGUI.cpp +++ b/src/SHAPERGUI/SHAPERGUI.cpp @@ -136,7 +136,7 @@ private: SHAPERGUI::SHAPERGUI() : LightApp_Module("SHAPER"), mySelector(0), myIsOpened(0), myPopupMgr(0), myIsInspectionVisible(false), - myInspectionPanel(0), myIsToolbarsModified(false) + myInspectionPanel(0), myIsFacesPanelVisible(false), myIsToolbarsModified(false) { myWorkshop = new XGUI_Workshop(this); connect(myWorkshop, SIGNAL(commandStatusUpdated()), @@ -282,6 +282,11 @@ bool SHAPERGUI::activateModule(SUIT_Study* theStudy) } myInspectionPanel->toggleViewAction()->setVisible(true); + myWorkshop->facesPanel()->toggleViewAction()->setVisible(true); + if (myIsFacesPanelVisible) + myWorkshop->facesPanel()->show(); + myWorkshop->propertyPanel()->toggleViewAction()->setVisible(true); + if (!mySelector) { ViewManagerList OCCViewManagers; application()->viewManagers(OCCViewer_Viewer::Type(), OCCViewManagers); @@ -395,6 +400,13 @@ bool SHAPERGUI::deactivateModule(SUIT_Study* theStudy) myInspectionPanel->hide(); myInspectionPanel->toggleViewAction()->setVisible(false); + myIsFacesPanelVisible = myWorkshop->facesPanel()->isVisible(); + myWorkshop->facesPanel()->hide(); + myWorkshop->facesPanel()->toggleViewAction()->setVisible(false); + + myWorkshop->propertyPanel()->hide(); + myWorkshop->propertyPanel()->toggleViewAction()->setVisible(false); + // the active operation should be stopped for the next activation. // There should not be active operation and visualized preview. // Abort operation should be performed before the selection's remove diff --git a/src/SHAPERGUI/SHAPERGUI.h b/src/SHAPERGUI/SHAPERGUI.h index 348923c1b..61cbc0339 100644 --- a/src/SHAPERGUI/SHAPERGUI.h +++ b/src/SHAPERGUI/SHAPERGUI.h @@ -274,6 +274,7 @@ private slots: bool myIsInspectionVisible; QDockWidget* myInspectionPanel; + bool myIsFacesPanelVisible; /// List of registered actions QIntList myActionsList;