-// Copyright (C) 2014-2017 CEA/DEN, EDF R&D
+// Copyright (C) 2014-2019 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
//
// 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
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// See http://www.salome-platform.org/ or
-// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#include "XGUI_SelectionMgr.h"
#include <ModelAPI_Object.h>
#include <ModelAPI_ResultBody.h>
#include <ModelAPI_Tools.h>
+#include <ModelAPI_ResultField.h>
#include <GeomAPI_Shape.h>
//**************************************************************
void XGUI_SelectionMgr::onObjectBrowserSelection()
{
+ myLastSelectionPlace = ModuleBase_ISelection::Browser;
QList<ModuleBase_ViewerPrsPtr> aSelectedPrs =
myWorkshop->selector()->selection()->getSelected(ModuleBase_ISelection::Browser);
XGUI_Displayer* aDisplayer = myWorkshop->displayer();
if (!myWorkshop->operationMgr()->hasOperation()) {
- QList<ModuleBase_ViewerPrsPtr> aTmpList = aSelectedPrs;
ObjectPtr aObject;
FeaturePtr aFeature;
// Select all results of a selected feature in viewer
if (aObject.get()) {
aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(aObject);
if (aFeature.get()) {
- std::list<ResultPtr> allRes;
- ModelAPI_Tools::allResults(aFeature, allRes);
- for(std::list<ResultPtr>::iterator aRes = allRes.begin(); aRes != allRes.end(); aRes++) {
- aSelectedPrs.append(std::shared_ptr<ModuleBase_ViewerPrs>(
- new ModuleBase_ViewerPrs(*aRes, GeomShapePtr(), NULL)));
+ std::list<ResultPtr> allRes;
+ ModelAPI_Tools::allResults(aFeature, allRes);
+ std::list<ResultPtr>::iterator aRes;
+ for(aRes = allRes.begin(); aRes != allRes.end(); aRes++) {
+ aSelectedPrs.append(std::shared_ptr<ModuleBase_ViewerPrs>(
+ new ModuleBase_ViewerPrs(*aRes, GeomShapePtr(), NULL)));
}
}
}
}
- aDisplayer->setSelected(aTmpList);
- } else {
- aDisplayer->setSelected(aSelectedPrs);
}
+ aDisplayer->setSelected(aSelectedPrs);
+ myWorkshop->updateColorScaleVisibility();
emit selectionChanged();
}
//**************************************************************
void XGUI_SelectionMgr::onViewerSelection()
{
+ myLastSelectionPlace = ModuleBase_ISelection::Viewer;
QList<ModuleBase_ViewerPrsPtr> aValues;
Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext();
- if (!aContext.IsNull())
+ if (!aContext.IsNull()) {
aValues = selection()->getSelected(ModuleBase_ISelection::Viewer);
-
+ // Update is necessary for OCCT 7.4.0: when it is clears selection it doesn't updates viewer
+#if OCC_VERSION_HEX == 0x070400
+ if (aValues.isEmpty())
+ aContext->UpdateCurrentViewer();
+#endif
+ }
QObjectPtrList anObjects;
convertToObjectBrowserSelection(aValues, anObjects);
myWorkshop->objectBrowser()->setObjectsSelected(anObjects);