-// Copyright (C) 2014-2017 CEA/DEN, EDF R&D
+// Copyright (C) 2014-2020 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_Selection.h"
#include "XGUI_ViewerProxy.h"
#include "XGUI_ObjectsBrowser.h"
+#ifndef HAVE_SALOME
+#include <AIS_ViewCube.hxx>
+#endif
+
#include "ModuleBase_BRepOwner.h"
#include "ModuleBase_ResultPrs.h"
#include "ModuleBase_ViewerPrs.h"
QList<ModuleBase_ViewerPrsPtr> XGUI_Selection::getSelected(const SelectionPlace& thePlace) const
{
QList<ModuleBase_ViewerPrsPtr> aPresentations;
+ QList<ModuleBase_ViewerPrsPtr> aToRemove;
switch (thePlace) {
case Browser:
getSelectedInViewer(aPresentations);
break;
case AllControls:
- getSelectedInViewer(aPresentations);
- getSelectedInBrowser(aPresentations);
+ // Get selection from object browser
+ getSelectedInBrowser(aPresentations);
+
+ // Filter out all objects except feature if there is no selected results in object browser
+ // Filter out all features if in object browser there are selected features and their results
+ bool aHasFeature = false;
+ bool aHasResult = false;
+ foreach(ModuleBase_ViewerPrsPtr aVal, aPresentations) {
+ if (aVal->object().get()) {
+ FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(aVal->object());
+ if (aFeature.get()) {
+ aHasFeature = true;
+ std::list<ResultPtr> aResList = aFeature->results();
+ std::list<ResultPtr>::const_iterator aIt;
+ for (aIt = aResList.cbegin(); aIt != aResList.cend(); aIt++) {
+ foreach(ModuleBase_ViewerPrsPtr aSel, aPresentations) {
+ if (aSel->object() == (*aIt)) {
+ aHasResult = true;
+ break;
+ }
+ }
+ if (aHasResult)
+ break;
+ }
+ }
+ }
+ if (aHasFeature && aHasResult)
+ break;
+ }
+ //Get selection from a viewer
+ getSelectedInViewer(aPresentations);
+
+ // Filter out extra objects
+ if (aHasFeature && aHasResult) {
+ foreach(ModuleBase_ViewerPrsPtr aVal, aPresentations) {
+ if (aVal->object().get()) {
+ FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(aVal->object());
+ if (aFeature.get()) {
+ aToRemove.append(aVal);
+ }
+ }
+ }
+ }
+ else if (aHasFeature && (!aHasResult)) {
+ foreach(ModuleBase_ViewerPrsPtr aVal, aPresentations) {
+ if (aVal->object().get()) {
+ FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(aVal->object());
+ if (!aFeature.get()) {
+ aToRemove.append(aVal);
+ }
+ }
+ }
+ }
+ foreach(ModuleBase_ViewerPrsPtr aVal, aToRemove) {
+ aPresentations.removeAll(aVal);
+ }
break;
}
return aPresentations;
{
Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext();
if (!aContext.IsNull()) {
- QList<long> aSelectedIds; // Remember of selected address in order to avoid duplicates
+ QList<size_t> aSelectedIds; // Remember of selected address in order to avoid duplicates
for (aContext->InitSelected(); aContext->MoreSelected(); aContext->NextSelected()) {
ModuleBase_ViewerPrsPtr aPrs(new ModuleBase_ViewerPrs());
Handle(SelectMgr_EntityOwner) anOwner = aContext->SelectedOwner();
- if (aSelectedIds.contains((long)anOwner.get()))
+ if (aSelectedIds.contains((size_t)anOwner.get()))
continue;
- aSelectedIds.append((long)anOwner.get());
+ aSelectedIds.append((size_t)anOwner.get());
fillPresentation(aPrs, anOwner);
void XGUI_Selection::fillPresentation(ModuleBase_ViewerPrsPtr& thePrs,
const Handle(SelectMgr_EntityOwner)& theOwner) const
{
- thePrs->setOwner(theOwner);
Handle(AIS_InteractiveObject) anIO =
Handle(AIS_InteractiveObject)::DownCast(theOwner->Selectable());
+#ifndef HAVE_SALOME
+ Handle(AIS_ViewCube) aCube = Handle(AIS_ViewCube)::DownCast(anIO);
+ if (!aCube.IsNull())
+ return;
+#endif
+
+ thePrs->setOwner(theOwner);
thePrs->setInteractive(anIO);
// we should not check the appearance of this feature because there can be some selected shapes
// for one feature
Handle(StdSelect_BRepOwner) aBRO = Handle(StdSelect_BRepOwner)::DownCast(theOwner);
if( !aBRO.IsNull() && aBRO->HasShape() ) {
+ TopoDS_Shape aShape = aBRO->Shape();
+ Handle(ModuleBase_ResultPrs) aPrsObj =
+ Handle(ModuleBase_ResultPrs)::DownCast(aBRO->Selectable());
+ if (!aPrsObj.IsNull()) {
+ if (aPrsObj->isSubstituted()) {
+ if (aPrsObj->Shape().IsSame(aShape))
+ aShape = aPrsObj->originalShape();
+ }
+ }
// the located method is called in the context to obtain the shape by the SelectedShape()
// method, so the shape is located by the same rules
- TopoDS_Shape aShape = aBRO->Shape().Located (aBRO->Location() * aBRO->Shape().Location());
+ aShape = aShape.Located(aBRO->Location() * aShape.Location());
#ifdef BEFORE_TRIHEDRON_PATCH
#ifndef DEBUG_DELIVERY
if (aShape.IsNull())
Handle(AIS_TrihedronOwner) aTrihedronOwner = Handle(AIS_TrihedronOwner)::DownCast(theOwner);
if (!aTrihedronOwner.IsNull()) {
const Prs3d_DatumParts& aPart = aTrihedronOwner->DatumPart();
- std::string aName;
+ std::wstring aName;
switch (aPart) {
- case Prs3d_DP_Origin: aName = "Origin"; break;
- case Prs3d_DP_XAxis: aName = "OX"; break;
- case Prs3d_DP_YAxis: aName = "OY"; break;
- case Prs3d_DP_ZAxis: aName = "OZ"; break;
+ case Prs3d_DP_Origin: aName = L"Origin"; break;
+ case Prs3d_DP_XAxis: aName = L"OX"; break;
+ case Prs3d_DP_YAxis: aName = L"OY"; break;
+ case Prs3d_DP_ZAxis: aName = L"OZ"; break;
default: break;
}
if (aName.length() > 0) {
if (aContext.IsNull())
return aPresentations;
- QList<long> aSelectedIds; // Remember of selected address in order to avoid duplicates
- XGUI_Displayer* aDisplayer = myWorkshop->displayer();
+ QList<size_t> aSelectedIds; // Remember of selected address in order to avoid duplicates
for (aContext->InitDetected(); aContext->MoreDetected(); aContext->NextDetected()) {
Handle(SelectMgr_EntityOwner) anOwner = aContext->DetectedOwner();
if (!anOwner.IsNull()) {
- if (aSelectedIds.contains((long)anOwner.get()))
+ if (aSelectedIds.contains((size_t)anOwner.get()))
continue;
- aSelectedIds.append((long)anOwner.get());
+ aSelectedIds.append((size_t)anOwner.get());
ModuleBase_ViewerPrsPtr aPrs(new ModuleBase_ViewerPrs());
fillPresentation(aPrs, anOwner);
continue;
Handle(SelectMgr_Selection) aSelection = theObject->Selection(aMode);
- for (aSelection->Init(); aSelection->More(); aSelection->Next()) {
- Handle(SelectMgr_SensitiveEntity) anEntity = aSelection->Sensitive();
+ NCollection_Vector<Handle(SelectMgr_SensitiveEntity)> anEntities = aSelection->Entities();
+ for (NCollection_Vector<Handle(SelectMgr_SensitiveEntity)>::Iterator anEntIt(anEntities);
+ anEntIt.More(); anEntIt.Next()) {
+ Handle(SelectMgr_SensitiveEntity) anEntity = anEntIt.Value();
if (anEntity.IsNull())
continue;
- Handle(SelectMgr_EntityOwner) anOwner =
- Handle(SelectMgr_EntityOwner)::DownCast(anEntity->BaseSensitive()->OwnerId());
+ Handle(SelectMgr_EntityOwner) anOwner = anEntity->BaseSensitive()->OwnerId();
if (!anOwner.IsNull())
theOwners.Add(anOwner);
}
