X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_ModuleConnector.cpp;h=b832fbb3071833f34b1eb610a7dcef366587b1c3;hb=1e63ae393cf1ce1923329c90aa66fa33f957f268;hp=e6b6cf73fe249565817b83988643a47659e149df;hpb=1de75803e9baf3de59fa755f9eccb6ef60bb64e4;p=modules%2Fshaper.git diff --git a/src/XGUI/XGUI_ModuleConnector.cpp b/src/XGUI/XGUI_ModuleConnector.cpp index e6b6cf73f..b832fbb30 100644 --- a/src/XGUI/XGUI_ModuleConnector.cpp +++ b/src/XGUI/XGUI_ModuleConnector.cpp @@ -1,8 +1,22 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D --> - -// 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" @@ -121,9 +135,8 @@ void XGUI_ModuleConnector::setSelected(const QList& the XGUI_Displayer* aDisp = myWorkshop->displayer(); if (theValues.isEmpty()) { myWorkshop->selector()->clearSelection(); - } else { + } else aDisp->setSelected(theValues); - } } void XGUI_ModuleConnector::setStatusBarMessage(const QString& theMessage) @@ -131,9 +144,9 @@ void XGUI_ModuleConnector::setStatusBarMessage(const QString& theMessage) myWorkshop->setStatusBarMessage(theMessage); } -bool XGUI_ModuleConnector::canStartOperation(QString theId) +bool XGUI_ModuleConnector::canStartOperation(QString theId, bool& isCommitted) { - return myWorkshop->operationMgr()->canStartOperation(theId); + return myWorkshop->operationMgr()->canStartOperation(theId, isCommitted); } void XGUI_ModuleConnector::processLaunchOperation(ModuleBase_Operation* theOperation) @@ -164,9 +177,10 @@ bool XGUI_ModuleConnector::canStopOperation(ModuleBase_Operation* theOperation) return myWorkshop->operationMgr()->canStopOperation(theOperation); } -void XGUI_ModuleConnector::stopOperation(ModuleBase_Operation* theOperation) +void XGUI_ModuleConnector::stopOperation(ModuleBase_Operation* theOperation, + bool& isCommitted) { - myWorkshop->operationMgr()->stopOperation(theOperation); + myWorkshop->operationMgr()->stopOperation(theOperation, isCommitted); } void XGUI_ModuleConnector::updateCommandStatus() @@ -179,6 +193,10 @@ 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 {