X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_ModuleConnector.cpp;h=b832fbb3071833f34b1eb610a7dcef366587b1c3;hb=4c763543675ec80cad142d3a2f8b4766ca64ac0f;hp=45f2d0ed7e9690fce5c5fc64232b01567c0a8149;hpb=ebf12116cc92186497036ef6a374e194fcd17b90;p=modules%2Fshaper.git diff --git a/src/XGUI/XGUI_ModuleConnector.cpp b/src/XGUI/XGUI_ModuleConnector.cpp index 45f2d0ed7..b832fbb30 100644 --- a/src/XGUI/XGUI_ModuleConnector.cpp +++ b/src/XGUI/XGUI_ModuleConnector.cpp @@ -1,6 +1,22 @@ -// File: XGUI_ModuleConnector.cpp -// Created: 3 June 2014 -// Author: Vitaly Smetannikov +// Copyright (C) 2014-2017 CEA/DEN, EDF R&D +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or +// email : webmaster.salome@opencascade.com +// #include "XGUI_ModuleConnector.h" #include "XGUI_Workshop.h" @@ -9,9 +25,21 @@ #include "XGUI_Selection.h" #include "XGUI_OperationMgr.h" #include "XGUI_Displayer.h" +#include "XGUI_PropertyPanel.h" +#include "XGUI_ActionsMgr.h" +#include "XGUI_ErrorMgr.h" + +#include +#include +#include #include +#ifndef HAVE_SALOME +#include "AppElements_Command.h" +#else +#include "XGUI_SalomeConnector.h" +#endif XGUI_ModuleConnector::XGUI_ModuleConnector(XGUI_Workshop* theWorkshop) : ModuleBase_IWorkshop(theWorkshop), @@ -19,20 +47,10 @@ XGUI_ModuleConnector::XGUI_ModuleConnector(XGUI_Workshop* theWorkshop) { XGUI_SelectionMgr* aSelector = myWorkshop->selector(); connect(aSelector, SIGNAL(selectionChanged()), this, SIGNAL(selectionChanged())); - - XGUI_OperationMgr* anOperationMgr = myWorkshop->operationMgr(); - - connect(anOperationMgr, SIGNAL(operationStarted(ModuleBase_Operation*)), - this, SIGNAL(operationStarted(ModuleBase_Operation*))); - connect(anOperationMgr, SIGNAL(operationStopped(ModuleBase_Operation*)), - this, SIGNAL(operationStopped(ModuleBase_Operation*))); - - myDocumentShapeFilter = new ModuleBase_ShapeDocumentFilter(this); } XGUI_ModuleConnector::~XGUI_ModuleConnector() { - myDocumentShapeFilter.Nullify(); } ModuleBase_ISelection* XGUI_ModuleConnector::selection() const @@ -50,34 +68,53 @@ ModuleBase_IViewer* XGUI_ModuleConnector::viewer() const return myWorkshop->viewer(); } +ModuleBase_IPropertyPanel* XGUI_ModuleConnector::propertyPanel() const +{ + return myWorkshop->propertyPanel(); +} + +ModuleBase_IErrorMgr* XGUI_ModuleConnector::errorMgr() const +{ + return myWorkshop->errorMgr(); +} + ModuleBase_Operation* XGUI_ModuleConnector::currentOperation() const { return myWorkshop->operationMgr()->currentOperation(); } +QObjectPtrList XGUI_ModuleConnector::activeObjects(const QObjectPtrList& theObjList) const +{ + QObjectPtrList aActiveOPbjects; + ModuleBase_IModule* aModule = myWorkshop->module(); + // Activate objects only which can be activated + foreach (ObjectPtr aObj, theObjList) { + if (aModule->canActivateSelection(aObj)) + aActiveOPbjects.append(aObj); + } + return aActiveOPbjects; +} + void XGUI_ModuleConnector::activateSubShapesSelection(const QIntList& theTypes) { + QIntList aTypes = theTypes; + XGUI_Displayer* aDisp = myWorkshop->displayer(); - // Close context if it was opened in order to clear stsndard selection modes - aDisp->closeLocalContexts(false); - aDisp->openLocalContext(); - // Convert shape types to selection types - QIntList aModes; - foreach(int aType, theTypes) { - aModes.append(AIS_Shape::SelectionMode((TopAbs_ShapeEnum)aType)); - } - aDisp->activateObjectsOutOfContext(aModes); - //TODO: We have to open Local context because at neutral point filters don't work (bug 25340) - aDisp->addSelectionFilter(myDocumentShapeFilter); + myWorkshop->module()->customSubShapesSelectionModes(aTypes); + aDisp->activateObjects(aTypes, activeObjects(aDisp->displayedObjects())); } void XGUI_ModuleConnector::deactivateSubShapesSelection() +{ + // Clear selection modes + activateModuleSelectionModes(); +} + +void XGUI_ModuleConnector::activateModuleSelectionModes() { XGUI_Displayer* aDisp = myWorkshop->displayer(); - // The document limitation selection has to be only during operation - aDisp->removeSelectionFilter(myDocumentShapeFilter); - aDisp->closeLocalContexts(false); + myWorkshop->activateObjectsSelection(activeObjects(aDisp->displayedObjects())); } AISObjectPtr XGUI_ModuleConnector::findPresentation(const ObjectPtr& theObject) const @@ -89,11 +126,87 @@ AISObjectPtr XGUI_ModuleConnector::findPresentation(const ObjectPtr& theObject) ObjectPtr XGUI_ModuleConnector::findPresentedObject(const AISObjectPtr& theAIS) const { XGUI_Displayer* aDisp = myWorkshop->displayer(); - return aDisp->getObject(theAIS); + ObjectPtr anObject = aDisp->getObject(theAIS); + return anObject; } -void XGUI_ModuleConnector::setSelected(const QList& theFeatures) +void XGUI_ModuleConnector::setSelected(const QList& theValues) { XGUI_Displayer* aDisp = myWorkshop->displayer(); - aDisp->setSelected(theFeatures); -} \ No newline at end of file + if (theValues.isEmpty()) { + myWorkshop->selector()->clearSelection(); + } else + aDisp->setSelected(theValues); +} + +void XGUI_ModuleConnector::setStatusBarMessage(const QString& theMessage) +{ + myWorkshop->setStatusBarMessage(theMessage); +} + +bool XGUI_ModuleConnector::canStartOperation(QString theId, bool& isCommitted) +{ + return myWorkshop->operationMgr()->canStartOperation(theId, isCommitted); +} + +void XGUI_ModuleConnector::processLaunchOperation(ModuleBase_Operation* theOperation) +{ + XGUI_OperationMgr* anOperationMgr = workshop()->operationMgr(); + + if (anOperationMgr->startOperation(theOperation)) { + ModuleBase_OperationFeature* aFOperation = + dynamic_cast(theOperation); + if (aFOperation) { + workshop()->propertyPanel()->updateContentWidget(aFOperation->feature()); + workshop()->propertyPanel()->createContentPanel(aFOperation->feature()); + } + if (!theOperation->getDescription()->hasXmlRepresentation()) { + if (theOperation->commit()) + workshop()->updateCommandStatus(); + } + } +} + +ModuleBase_Operation* XGUI_ModuleConnector::findStartedOperation(const QString& theId) +{ + return myWorkshop->operationMgr()->findOperation(theId); +} + +bool XGUI_ModuleConnector::canStopOperation(ModuleBase_Operation* theOperation) +{ + return myWorkshop->operationMgr()->canStopOperation(theOperation); +} + +void XGUI_ModuleConnector::stopOperation(ModuleBase_Operation* theOperation, + bool& isCommitted) +{ + myWorkshop->operationMgr()->stopOperation(theOperation, isCommitted); +} + +void XGUI_ModuleConnector::updateCommandStatus() +{ + myWorkshop->updateCommandStatus(); +} + +QMainWindow* XGUI_ModuleConnector::desktop() const +{ + return myWorkshop->desktop(); +} + +bool XGUI_ModuleConnector::hasSHIFTPressed() const +{ + return myWorkshop->operationMgr()->hasSHIFTPressed(); +} + +std::shared_ptr XGUI_ModuleConnector::featureInfo(const QString& theId) const +{ +#ifdef HAVE_SALOME + return myWorkshop->salomeConnector()->featureInfo(theId); +#else + AppElements_Command* aAction = + dynamic_cast(myWorkshop->actionsMgr()->action(theId)); + if (aAction) + return aAction->featureMessage(); + return std::shared_ptr(); +#endif +}