-// 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 "XGUI_Displayer.h"
#include "XGUI_Selection.h"
#include "XGUI_OperationMgr.h"
+#include "XGUI_SelectionActivate.h"
#ifndef HAVE_SALOME
#include <AppElements_MainWindow.h>
#include <ModelAPI_Object.h>
#include <ModelAPI_ResultBody.h>
#include <ModelAPI_Tools.h>
+#include <ModelAPI_ResultField.h>
+
+#include <GeomAPI_Shape.h>
#include <ModuleBase_ViewerPrs.h>
#include <ModuleBase_Tools.h>
#include <SelectMgr_ListIteratorOfListOfFilter.hxx>
+#include <TopExp_Explorer.hxx>
+#include <TopoDS_Shape.hxx>
+#include <TopTools_MapOfShape.hxx>
#ifdef TINSPECTOR
#include <inspector/VInspectorAPI_CallBack.hxx>
#endif
+#define OPTIMIZATION_LEVEL 50
+
+
XGUI_SelectionMgr::XGUI_SelectionMgr(XGUI_Workshop* theParent)
: QObject(theParent),
myWorkshop(theParent)
//**************************************************************
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);
-
- bool aBlocked = myWorkshop->objectBrowser()->blockSignals(true);
myWorkshop->objectBrowser()->setObjectsSelected(anObjects);
- myWorkshop->objectBrowser()->blockSignals(aBlocked);
emit selectionChanged();
}
void XGUI_SelectionMgr::clearSelection()
{
QObjectPtrList aFeatures;
- bool aBlocked = myWorkshop->objectBrowser()->blockSignals(true);
myWorkshop->objectBrowser()->setObjectsSelected(aFeatures);
- myWorkshop->objectBrowser()->blockSignals(aBlocked);
QList<ModuleBase_ViewerPrsPtr> aSelectedPrs =
myWorkshop->selector()->selection()->getSelected(ModuleBase_ISelection::Browser);
aDisplayer->setSelected(theValues);
// update selection in Object Browser
- bool aBlocked = myWorkshop->objectBrowser()->blockSignals(true);
QObjectPtrList anObjects;
convertToObjectBrowserSelection(theValues, anObjects);
-
myWorkshop->objectBrowser()->setObjectsSelected(anObjects);
- myWorkshop->objectBrowser()->blockSignals(aBlocked);
}
+
//**************************************************************
void XGUI_SelectionMgr::convertToObjectBrowserSelection(
const QList<ModuleBase_ViewerPrsPtr>& theValues,
SessionPtr aMgr = ModelAPI_Session::get();
DocumentPtr anActiveDocument = aMgr->activeDocument();
+ TopTools_MapOfShape aShapeMap;
+ bool aToOptimize = (theValues.size() > OPTIMIZATION_LEVEL);
+
+ GeomShapePtr aShape;
+ TopoDS_Shape aTShape;
foreach(ModuleBase_ViewerPrsPtr aPrs, theValues) {
if (aPrs->object().get()) {
if (!theObjects.contains(aPrs->object()))
if (aPrs->shape().get() && (!aHasOperation)) {
aResult = std::dynamic_pointer_cast<ModelAPI_Result>(aPrs->object());
if (aResult.get()) {
- aFeature = anActiveDocument->producedByFeature(aResult, aPrs->shape());
+ aShape = aPrs->shape();
+ aTShape = aShape->impl<TopoDS_Shape>();
+ if (aToOptimize) {
+ if (!aShapeMap.Contains(aTShape)) {
+ aFeature = anActiveDocument->producedByFeature(aResult, aShape);
+ if (aFeature.get()) {
+ QList<TopoDS_Shape> aResList = findAllShapes(aResult);
+ foreach(TopoDS_Shape aShape, aResList) {
+ if (!aShapeMap.Contains(aShape))
+ aShapeMap.Add(aShape);
+ }
+ }
+ }
+ }
+ else {
+ aFeature = anActiveDocument->producedByFeature(aResult, aShape);
+ }
if (aFeature.get() && (!theObjects.contains(aFeature)))
theObjects.append(aFeature);
}
}
}
return aFeatures;
+}
+
+QList<TopoDS_Shape> XGUI_SelectionMgr::findAllShapes(const ResultPtr& theResult) const
+{
+ QIntList aModes = myWorkshop->selectionActivate()->activeSelectionModes();
+ GeomShapePtr aResShape = theResult->shape();
+ TopoDS_Shape aShape = aResShape->impl<TopoDS_Shape>();
+ QList<TopoDS_Shape> aResult;
+ foreach(int aShapeType, aModes) {
+ if (aShapeType < TopAbs_SHAPE) {
+ TopExp_Explorer aExp(aShape, (TopAbs_ShapeEnum)aShapeType);
+ for (; aExp.More(); aExp.Next()) {
+ aResult.append(aExp.Current());
+ }
+ }
+ }
+ return aResult;
}
\ No newline at end of file
