-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
-
-// File: XGUI_Displayer.cpp
-// Created: 20 Apr 2014
-// Author: Natalia ERMOLAEVA
+// 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<mailto:webmaster.salome@opencascade.com>
+//
#include "XGUI_Displayer.h"
#include "XGUI_Workshop.h"
#include <SUIT_ResourceMgr.h>
#include <AIS_InteractiveContext.hxx>
-#include <AIS_LocalContext.hxx>
#include <AIS_ListOfInteractive.hxx>
#include <AIS_ListIteratorOfListOfInteractive.hxx>
#include <AIS_DimensionSelectionMode.hxx>
#include <AIS_Shape.hxx>
#include <AIS_Dimension.hxx>
#include <AIS_Trihedron.hxx>
+#ifdef BEFORE_TRIHEDRON_PATCH
#include <AIS_Axis.hxx>
#include <AIS_Plane.hxx>
#include <AIS_Point.hxx>
+#endif
#include <AIS_Selection.hxx>
#include <TColStd_ListIteratorOfListOfInteger.hxx>
#include <SelectMgr_ListOfFilter.hxx>
#include <TColStd_MapOfTransient.hxx>
#include <TColStd_MapIteratorOfMapOfTransient.hxx>
-#ifdef VINSPECTOR
-#include <VInspectorAPI_CallBack.h>
+#ifdef TINSPECTOR
+#include <VInspectorAPI_CallBack.hxx>
#endif
#include <Events_Loop.h>
//#define DEBUG_SELECTION_FILTERS
//#define DEBUG_COMPOSILID_DISPLAY
-// Workaround for bug #25637
//#define DEBUG_OCCT_SHAPE_SELECTION
-//#define WORKAROUND_UNTIL_27523_IS_FIXED
+#define CLEAR_OUTDATED_SELECTION_BEFORE_REDISPLAY
void displayedObjects(const Handle(AIS_InteractiveContext)& theAIS, AIS_ListOfInteractive& theList)
{
// Get from null point
theAIS->DisplayedObjects(theList, true);
- if (theAIS->HasOpenedContext()) {
- // get from local context
- const Handle(AIS_LocalContext)& aLC = theAIS->LocalContext();
- TColStd_MapOfTransient aMap;
- int NbDisp = aLC->DisplayedObjects(aMap);
- TColStd_MapIteratorOfMapOfTransient aIt(aMap);
-
- Handle(AIS_InteractiveObject) curIO;
- Handle(Standard_Transient) Tr;
- for(; aIt.More(); aIt.Next()){
- Tr = aIt.Key();
- curIO = *((Handle(AIS_InteractiveObject)*) &Tr);
- theList.Append(curIO);
- }
- }
}
QString qIntListInfo(const QIntList& theValues, const QString& theSeparator = QString(", "))
return anInfo.join(theSeparator);
}
+void deselectPresentation(const Handle(AIS_InteractiveObject) theObject,
+ const Handle(AIS_InteractiveContext)& theContext)
+{
+ NCollection_List<Handle(SelectBasics_EntityOwner)> aResultOwners;
+
+ for (theContext->InitSelected(); theContext->MoreSelected(); theContext->NextSelected()) {
+ Handle(SelectMgr_EntityOwner) anOwner = theContext->SelectedOwner();
+ if (anOwner.IsNull()) // TODO: check why it is possible
+ continue;
+ if (anOwner->Selectable() == theObject && anOwner->IsSelected())
+ aResultOwners.Append(anOwner);
+ }
+ NCollection_List<Handle(SelectBasics_EntityOwner)>::Iterator anOwnersIt (aResultOwners);
+ Handle(SelectMgr_EntityOwner) anOwner;
+ for (; anOwnersIt.More(); anOwnersIt.Next()) {
+ anOwner = Handle(SelectMgr_EntityOwner)::DownCast(anOwnersIt.Value());
+ if (!anOwner.IsNull())
+ theContext->AddOrRemoveSelected(anOwner, false);
+ }
+}
+
XGUI_Displayer::XGUI_Displayer(XGUI_Workshop* theWorkshop)
: myWorkshop(theWorkshop), myNeedUpdate(false),
- myIsTrihedronActive(true), myViewerBlockedRecursiveCount(0)
+ myIsTrihedronActive(true), myViewerBlockedRecursiveCount(0),
+ myIsFirstAISContextUse(true)
{
- #ifdef VINSPECTOR
- myContextCallBack = 0;
- #endif
myCustomPrs = std::shared_ptr<GeomAPI_ICustomPrs>(new XGUI_CustomPrs(theWorkshop));
}
else {
Handle(AIS_Shape) aShapePrs = Handle(AIS_Shape)::DownCast(anAISPrs);
if (!aShapePrs.IsNull())
- ModuleBase_Tools::setPointBallHighlighting((AIS_Shape*) aShapePrs.Access());
+ ModuleBase_Tools::setPointBallHighlighting((AIS_Shape*) aShapePrs.get());
}
anAIS->setImpl(new Handle(AIS_InteractiveObject)(anAISPrs));
//anAIS->createShape(aShapePtr);
anAISIO->Attributes()->SetFaceBoundaryDraw( Standard_True );
anAISIO->SetDisplayMode(aDispMode);
aContext->Display(anAISIO, aDispMode, 0, false, true, AIS_DS_Displayed);
- #ifdef VINSPECTOR
- if (myContextCallBack) myContextCallBack->Display(anAISIO);
+ #ifdef TINSPECTOR
+ if (getCallBack()) getCallBack()->Display(anAISIO);
#endif
aDisplayed = true;
if (!anAIS.IsNull()) {
emit beforeObjectErase(theObject, anObject);
aContext->Remove(anAIS, false/*update viewer*/);
- #ifdef VINSPECTOR
- if (myContextCallBack) myContextCallBack->Remove(anAIS);
+ #ifdef TINSPECTOR
+ if (getCallBack()) getCallBack()->Remove(anAIS);
#endif
aErased = true;
}
if (aNeedToRestoreSelection)
myWorkshop->module()->storeSelection();
-#ifdef WORKAROUND_UNTIL_27523_IS_FIXED
- if (!myActiveSelectionModes.contains(0))
- aContext->Activate(aAISIO, 0);
+#ifdef CLEAR_OUTDATED_SELECTION_BEFORE_REDISPLAY
+ deselectPresentation(aAISIO, aContext);
#endif
-
aContext->Redisplay(aAISIO, false);
-#ifdef WORKAROUND_UNTIL_27523_IS_FIXED
- if (!myActiveSelectionModes.contains(0))
- aContext->Deactivate(aAISIO, 0);
-#endif
-
- #ifdef VINSPECTOR
- if (myContextCallBack) myContextCallBack->Redisplay(aAISIO);
+ #ifdef TINSPECTOR
+ if (getCallBack()) getCallBack()->Redisplay(aAISIO);
#endif
if (aNeedToRestoreSelection)
deactivateAIS(anAIS);
// the selection from the previous activation modes should be cleared manually (#26172)
- aContext->LocalContext()->ClearOutdatedSelection(anAIS, true);
- #ifdef VINSPECTOR
- if (myContextCallBack) myContextCallBack->ClearOutdatedSelection(anAIS);
- #endif
+#ifndef CLEAR_OUTDATED_SELECTION_BEFORE_REDISPLAY
+ deselectPresentation(anAIS, aContext);
+#endif
if (theUpdateViewer)
updateViewer();
}
myActiveSelectionModes = aNewModes;
Handle(AIS_InteractiveContext) aContext = AISContext();
// Open local context if there is no one
- if (aContext.IsNull() || !aContext->HasOpenedContext())
+ if (aContext.IsNull())
return;
//aContext->UseDisplayedObjects();
TColStd_ListOfInteger aModes;
aContext->ActivatedModes(anAIS, aModes);
- #ifdef VINSPECTOR
- if (myContextCallBack) myContextCallBack->ActivatedModes(anAIS, aModes);
+ #ifdef TINSPECTOR
+ if (getCallBack()) getCallBack()->ActivatedModes(anAIS, aModes);
#endif
return aModes.Extent() > 0;
Handle(AIS_InteractiveContext) aContext = AISContext();
if (aContext.IsNull())
return;
- if (aContext->HasOpenedContext()) {
- aContext->UnhilightSelected(false);
- aContext->ClearSelected(false);
- #ifdef VINSPECTOR
- if (myContextCallBack) myContextCallBack->ClearSelected();
- #endif
- NCollection_DataMap<TopoDS_Shape, NCollection_Map<Handle(AIS_InteractiveObject)>>
- aShapesToBeSelected;
+ aContext->UnhilightSelected(false);
+ aContext->ClearSelected(false);
+ #ifdef TINSPECTOR
+ if (getCallBack()) getCallBack()->ClearSelected();
+ #endif
+ NCollection_DataMap<TopoDS_Shape, NCollection_Map<Handle(AIS_InteractiveObject)>>
+ aShapesToBeSelected;
- foreach (ModuleBase_ViewerPrsPtr aPrs, theValues) {
- const GeomShapePtr& aGeomShape = aPrs->shape();
- if (aGeomShape.get() && !aGeomShape->isNull()) {
- const TopoDS_Shape& aShape = aGeomShape->impl<TopoDS_Shape>();
+ foreach (ModuleBase_ViewerPrsPtr aPrs, theValues) {
+ const GeomShapePtr& aGeomShape = aPrs->shape();
+ if (aGeomShape.get() && !aGeomShape->isNull()) {
+ const TopoDS_Shape& aShape = aGeomShape->impl<TopoDS_Shape>();
#ifdef DEBUG_OCCT_SHAPE_SELECTION
- // problem 1: performance
- // problem 2: IO is not specified, so the first found owner is selected, as a result
- // it might belong to another result
- aContext->AddOrRemoveSelected(aShape, false);
- #ifdef VINSPECTOR
- if (myContextCallBack) myContextCallBack->AddOrRemoveSelected(aShape);
- #endif
+ // problem 1: performance
+ // problem 2: IO is not specified, so the first found owner is selected, as a result
+ // it might belong to another result
+ aContext->AddOrRemoveSelected(aShape, false);
+ #ifdef TINSPECTOR
+ if (getCallBack()) getCallBack()->AddOrRemoveSelected(aShape);
+ #endif
#else
- NCollection_Map<Handle(AIS_InteractiveObject)> aPresentations;
- if (aShapesToBeSelected.IsBound(aShape))
- aPresentations = aShapesToBeSelected.Find(aShape);
- ObjectPtr anObject = aPrs->object();
- getPresentations(anObject, aPresentations);
+ NCollection_Map<Handle(AIS_InteractiveObject)> aPresentations;
+ if (aShapesToBeSelected.IsBound(aShape))
+ aPresentations = aShapesToBeSelected.Find(aShape);
+ ObjectPtr anObject = aPrs->object();
+ getPresentations(anObject, aPresentations);
- aShapesToBeSelected.Bind(aShape, aPresentations);
+ aShapesToBeSelected.Bind(aShape, aPresentations);
#endif
- } else {
- ObjectPtr anObject = aPrs->object();
- ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(anObject);
- if (aResult.get() && isVisible(aResult)) {
- AISObjectPtr anObj = myResult2AISObjectMap[aResult];
- Handle(AIS_InteractiveObject) anAIS = anObj->impl<Handle(AIS_InteractiveObject)>();
- if (!anAIS.IsNull()) {
- // The methods are replaced in order to provide multi-selection, e.g. restore selection
- // by activating multi selector widget. It also gives an advantage that the multi
- // selection in OB gives multi-selection in the viewer
- //aContext->SetSelected(anAIS, false);
- // The selection in the context was cleared, so the method sets the objects are selected
- aContext->AddOrRemoveSelected(anAIS, false);
- #ifdef VINSPECTOR
- if (myContextCallBack) myContextCallBack->AddOrRemoveSelected(anAIS);
- #endif
- }
- }
- }
- }
- if (!aShapesToBeSelected.IsEmpty())
- XGUI_Displayer::AddOrRemoveSelectedShapes(aContext, aShapesToBeSelected);
- } else { // it seems the next code is obsolete as the context is always opened in SHAPER
- aContext->UnhilightCurrents(false);
- aContext->ClearCurrents(false);
- foreach (ModuleBase_ViewerPrsPtr aPrs, theValues) {
+ } else {
ObjectPtr anObject = aPrs->object();
ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(anObject);
if (aResult.get() && isVisible(aResult)) {
AISObjectPtr anObj = myResult2AISObjectMap[aResult];
Handle(AIS_InteractiveObject) anAIS = anObj->impl<Handle(AIS_InteractiveObject)>();
- if (!anAIS.IsNull())
- aContext->SetCurrentObject(anAIS, false);
+ if (!anAIS.IsNull()) {
+ // The methods are replaced in order to provide multi-selection, e.g. restore selection
+ // by activating multi selector widget. It also gives an advantage that the multi
+ // selection in OB gives multi-selection in the viewer
+ //aContext->SetSelected(anAIS, false);
+ // The selection in the context was cleared, so the method sets the objects are selected
+ aContext->AddOrRemoveSelected(anAIS, false);
+ #ifdef TINSPECTOR
+ if (getCallBack()) getCallBack()->AddOrRemoveSelected(anAIS);
+ #endif
+ }
}
}
}
+ if (!aShapesToBeSelected.IsEmpty())
+ XGUI_Displayer::AddOrRemoveSelectedShapes(aContext, aShapesToBeSelected);
+
if (theUpdateViewer)
updateViewer();
}
{
Handle(AIS_InteractiveContext) aContext = AISContext();
if (!aContext.IsNull()) {
- aContext->UnhilightCurrents(false);
+ aContext->UnhilightSelected(false);//UnhilightCurrents(false);
aContext->ClearSelected(theUpdateViewer);
- #ifdef VINSPECTOR
- if (myContextCallBack) myContextCallBack->ClearSelected();
+ #ifdef TINSPECTOR
+ if (getCallBack()) getCallBack()->ClearSelected();
#endif
}
}
if (!anIO.IsNull()) {
emit beforeObjectErase(aObj, aAISObj);
aContext->Remove(anIO, false/*update viewer*/);
- #ifdef VINSPECTOR
- if (myContextCallBack) myContextCallBack->Remove(anIO);
+ #ifdef TINSPECTOR
+ if (getCallBack()) getCallBack()->Remove(anIO);
#endif
aErased = true;
}
}
void deactivateObject(Handle(AIS_InteractiveContext) theContext,
- Handle(AIS_InteractiveObject) theObject,
-#ifdef VINSPECTOR
- VInspectorAPI_CallBack* theCallBack,
+ Handle(AIS_InteractiveObject) theObject
+#ifdef TINSPECTOR
+ , Handle(VInspectorAPI_CallBack) theCallBack
#endif
- const bool theClear = true)
+ )
{
if (!theObject.IsNull()) {
theContext->Deactivate(theObject);
- #ifdef VINSPECTOR
+ #ifdef TINSPECTOR
if (theCallBack) theCallBack->Deactivate(theObject);
#endif
- //if (theClear) {
- //theObject->ClearSelected();
- // theContext->LocalContext()->ClearOutdatedSelection(theObject, true);
- //}
}
}
if (!aTrihedron.IsNull() && aContext->IsDisplayed(aTrihedron)) {
Handle(AIS_Trihedron) aTrie = Handle(AIS_Trihedron)::DownCast(aTrihedron);
deactivateObject(aContext, aTrie
- #ifdef VINSPECTOR
- , myContextCallBack
+ #ifdef TINSPECTOR
+ , getCallBack()
#endif
);
/// #1136 hidden axis are selected in sketch
- /// workaround for Cascade: there is a crash in AIS_LocalContext::ClearOutdatedSelection
- /// for Position AIS object in SelectionModes.
+#ifdef BEFORE_TRIHEDRON_PATCH
deactivateObject(aContext, aTrie->XAxis()
- #ifdef VINSPECTOR
- , myContextCallBack
+ #ifdef TINSPECTOR
+ , getCallBack()
#endif
);
deactivateObject(aContext, aTrie->YAxis()
- #ifdef VINSPECTOR
- , myContextCallBack
+ #ifdef TINSPECTOR
+ , getCallBack()
#endif
);
deactivateObject(aContext, aTrie->Axis()
- #ifdef VINSPECTOR
- , myContextCallBack
+ #ifdef TINSPECTOR
+ , getCallBack()
#endif
);
deactivateObject(aContext, aTrie->Position()
- #ifdef VINSPECTOR
- , myContextCallBack
+ #ifdef TINSPECTOR
+ , getCallBack()
#endif
);
deactivateObject(aContext, aTrie->XYPlane()
- #ifdef VINSPECTOR
- , myContextCallBack
+ #ifdef TINSPECTOR
+ , getCallBack()
#endif
);
deactivateObject(aContext, aTrie->XZPlane()
- #ifdef VINSPECTOR
- , myContextCallBack
+ #ifdef TINSPECTOR
+ , getCallBack()
#endif
);
deactivateObject(aContext, aTrie->YZPlane()
- #ifdef VINSPECTOR
- , myContextCallBack
+ #ifdef TINSPECTOR
+ , getCallBack()
#endif
);
-
+#endif
if (theUpdateViewer)
updateViewer();
}
return myWorkshop->viewer()->trihedron();
}
-void XGUI_Displayer::openLocalContext()
+/*void XGUI_Displayer::openLocalContext()
{
Handle(AIS_InteractiveContext) aContext = AISContext();
// Open local context if there is no one
// aContext->SetSelected(aIt2.Value(), false);
//}
}
-}
+}*/
-void XGUI_Displayer::closeLocalContexts(const bool theUpdateViewer)
+/*void XGUI_Displayer::closeLocalContexts(const bool theUpdateViewer)
{
Handle(AIS_InteractiveContext) aContext = AISContext();
if (!aContext.IsNull() && aContext->HasOpenedContext()) {
aContext->Display(aAISIO, false);
aContext->SetDisplayMode(aAISIO, Shading, false);
}
- }*/
+ }*+/
// Append the filters from the local selection in the global selection context
SelectMgr_ListIteratorOfListOfFilter aIt(aFilters);
// aContext->SetCurrentObject(aIt2.Value(), false);
//}
}
-}
+}*/
AISObjectPtr XGUI_Displayer::getAISObject(ObjectPtr theObject) const
{
{
Handle(AIS_InteractiveContext) aContext = AISContext();
if (!aContext.IsNull() && isUpdateEnabled()) {
- myWorkshop->viewer()->Zfitall();
+ //myWorkshop->viewer()->Zfitall();
aContext->UpdateCurrentViewer();
} else {
myNeedUpdate = true;
aContext->Activate(theIO, theMode, false);
} else
aContext->Activate(theIO, theMode, false);
- #ifdef VINSPECTOR
- if (myContextCallBack) myContextCallBack->Activate(theIO, theMode);
+ #ifdef TINSPECTOR
+ if (getCallBack()) getCallBack()->Activate(theIO, theMode);
#endif
// the fix from VPA for more suitable selection of sketcher lines
if (!aContext.IsNull()) {
if (theMode == -1) {
aContext->Deactivate(theIO);
- #ifdef VINSPECTOR
- if (myContextCallBack) myContextCallBack->Deactivate(theIO);
+ #ifdef TINSPECTOR
+ if (getCallBack()) getCallBack()->Deactivate(theIO);
#endif
}
else {
aContext->Deactivate(theIO, theMode);
- #ifdef VINSPECTOR
- if (myContextCallBack) myContextCallBack->Deactivate(theIO, theMode);
+ #ifdef TINSPECTOR
+ if (getCallBack()) getCallBack()->Deactivate(theIO, theMode);
#endif
}
Handle(AIS_InteractiveContext) XGUI_Displayer::AISContext() const
{
Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext();
- if (!aContext.IsNull() && !aContext->HasOpenedContext()) {
- aContext->OpenLocalContext();
+ if (!aContext.IsNull() && myIsFirstAISContextUse/*&& !aContext->HasOpenedContext()*/) {
+ XGUI_Displayer* aDisplayer = (XGUI_Displayer*)this;
+ aDisplayer->myIsFirstAISContextUse = false;
+ //aContext->OpenLocalContext();
if (!isTrihedronActive())
deactivateTrihedron(true);
aContext->DefaultDrawer()->VIsoAspect()->SetNumber(0);
}
bool XGUI_Displayer::displayAIS(AISObjectPtr theAIS, const bool toActivateInSelectionModes,
- bool theUpdateViewer)
+ const Standard_Integer theDisplayMode, bool theUpdateViewer)
{
bool aDisplayed = false;
Handle(AIS_InteractiveContext) aContext = AISContext();
Handle(AIS_InteractiveObject) anAISIO = theAIS->impl<Handle(AIS_InteractiveObject)>();
if (!aContext.IsNull() && !anAISIO.IsNull()) {
- aContext->Display(anAISIO, 0/*wireframe*/, 0, false/*update viewer*/, true, AIS_DS_Displayed);
- #ifdef VINSPECTOR
- if (myContextCallBack) myContextCallBack->Display(anAISIO);
+ aContext->Display(anAISIO, theDisplayMode, 0, false/*update viewer*/, true, AIS_DS_Displayed);
+ #ifdef TINSPECTOR
+ if (getCallBack()) getCallBack()->Display(anAISIO);
#endif
aDisplayed = true;
aContext->Deactivate(anAISIO);
- #ifdef VINSPECTOR
- if (myContextCallBack) myContextCallBack->Deactivate(anAISIO);
+ #ifdef TINSPECTOR
+ if (getCallBack()) getCallBack()->Deactivate(anAISIO);
#endif
aContext->Load(anAISIO);
- #ifdef VINSPECTOR
- if (myContextCallBack) myContextCallBack->Load(anAISIO);
+ #ifdef TINSPECTOR
+ if (getCallBack()) getCallBack()->Load(anAISIO);
#endif
if (toActivateInSelectionModes) {
- if (aContext->HasOpenedContext()) {
- if (myActiveSelectionModes.size() == 0)
- activateAIS(anAISIO, 0, theUpdateViewer);
- else {
- foreach(int aMode, myActiveSelectionModes) {
- activateAIS(anAISIO, aMode, theUpdateViewer);
- }
+ if (myActiveSelectionModes.size() == 0)
+ activateAIS(anAISIO, 0, theUpdateViewer);
+ else {
+ foreach(int aMode, myActiveSelectionModes) {
+ activateAIS(anAISIO, aMode, theUpdateViewer);
}
}
}
Handle(AIS_InteractiveObject) anAISIO = theAIS->impl<Handle(AIS_InteractiveObject)>();
if (!anAISIO.IsNull() && aContext->IsDisplayed(anAISIO)) {
aContext->Remove(anAISIO, false/*update viewer*/);
- #ifdef VINSPECTOR
- if (myContextCallBack) myContextCallBack->Remove(anAISIO);
+ #ifdef TINSPECTOR
+ if (getCallBack()) getCallBack()->Remove(anAISIO);
#endif
aErased = true;
}
const SelectMgr_ListOfFilter& aFilters = aContext->Filters();
SelectMgr_ListIteratorOfListOfFilter aIt(aFilters);
for (; aIt.More() && !aFilterFound; aIt.Next()) {
- if (theFilter.Access() == aIt.Value().Access())
+ if (theFilter.get() == aIt.Value().get())
aFilterFound = true;
}
Handle(SelectMgr_CompositionFilter) aCompositeFilter = GetFilter();
if (!aCompositeFilter.IsNull()) {
const SelectMgr_ListOfFilter& aStoredFilters = aCompositeFilter->StoredFilters();
for (aIt.Initialize(aStoredFilters); aIt.More() && !aFilterFound; aIt.Next()) {
- if (theFilter.Access() == aIt.Value().Access())
+ if (theFilter.get() == aIt.Value().get())
aFilterFound = true;
}
}
// The result is the selection of the first IO is lost.
TColStd_ListOfInteger aTColModes;
aContext->ActivatedModes(theIO, aTColModes);
- #ifdef VINSPECTOR
- if (myContextCallBack) myContextCallBack->ActivatedModes(theIO, aTColModes);
+ #ifdef TINSPECTOR
+ if (getCallBack()) getCallBack()->ActivatedModes(theIO, aTColModes);
#endif
TColStd_ListIteratorOfListOfInteger itr( aTColModes );
QIntList aModesActivatedForIO;
bool isDeactivated = false;
+ bool aHasValidMode = false;
for (; itr.More(); itr.Next() ) {
Standard_Integer aMode = itr.Value();
+ aHasValidMode = aHasValidMode || aMode != -1;
int aShapeMode = (aMode > 8)? aMode : AIS_Shape::SelectionType(aMode);
if (!theModes.contains(aMode)) {
deactivateAIS(theIO, aMode);
}
if (isDeactivated) {
// the selection from the previous activation modes should be cleared manually (#26172)
- theIO->ClearSelected();
- #ifdef VINSPECTOR
- if (myContextCallBack) myContextCallBack->ClearSelected(theIO);
- #endif
- aContext->LocalContext()->ClearOutdatedSelection(theIO, true);
- #ifdef VINSPECTOR
- if (myContextCallBack) myContextCallBack->ClearOutdatedSelection(theIO);
- #endif
+ //theIO->ClearSelected();
+ //#ifdef TINSPECTOR
+ //if (getCallBack()) getCallBack()->ClearSelected(theIO);
+ //#endif
+#ifndef CLEAR_OUTDATED_SELECTION_BEFORE_REDISPLAY
+ deselectPresentation(theIO, aContext);
+#endif
// For performance issues
//if (theUpdateViewer)
// updateViewer();
}
// loading the interactive object allowing the decomposition
- if (aTColModes.IsEmpty()) {
+ if (aTColModes.IsEmpty() || !aHasValidMode) {
aContext->Load(theIO, -1, true);
- #ifdef VINSPECTOR
- if (myContextCallBack) myContextCallBack->Load(theIO);
+ Handle(AIS_Trihedron) aTrihedron = Handle(AIS_Trihedron)::DownCast(theIO);
+ if (!aTrihedron.IsNull()) {
+ // Workaround for Trihedron. It should be loaded using the next Load method to
+ // add this object to myGlobal map of selection manager
+ // it is important to activate trihedron in two selection modes: edges and vertices
+ aContext->SelectionManager()->Load(theIO);
+ }
+
+ #ifdef TINSPECTOR
+ if (getCallBack()) getCallBack()->Load(theIO);
#endif
}
}
bool isCustomized = aCustomPrs.get() &&
aCustomPrs->customisePresentation(aResult, anAISObj, myCustomPrs);
+ isCustomized = myWorkshop->module()->afterCustomisePresentation(aResult, anAISObj, myCustomPrs)
+ || isCustomized;
return isCustomized;
}
#endif
}
+#ifdef _DEBUG
std::string XGUI_Displayer::getResult2AISObjectMapInfo() const
{
QStringList aContent;
return QString("myResult2AISObjectMap: size = %1\n%2\n").arg(myResult2AISObjectMap.size()).
arg(aContent.join("\n")).toStdString().c_str();
}
+#endif
void XGUI_Displayer::getPresentations(const ObjectPtr& theObject,
NCollection_Map<Handle(AIS_InteractiveObject)>& thePresentations)
ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(theObject);
if (aResult.get()) {
AISObjectPtr aAISObj = getAISObject(aResult);
+ if (aAISObj.get() == NULL) {
+ // if result is a result of a composite feature, it is visualized by visualization of
+ // composite children, so we should get one of this presentations
+ ResultCompSolidPtr aCompSolid = std::dynamic_pointer_cast<ModelAPI_ResultCompSolid>(aResult);
+ if (aCompSolid.get() && aCompSolid->numberOfSubs() > 0) {
+ aAISObj = getAISObject(aCompSolid->subResult(0));
+ }
+ }
if (aAISObj.get() != NULL) {
Handle(AIS_InteractiveObject) anAIS = aAISObj->impl<Handle(AIS_InteractiveObject)>();
if (!anAIS.IsNull() && !thePresentations.Contains(anAIS))
Standard_True /* update viewer*/,
Standard_False /* allow decomposition */,
AIS_DS_Displayed /* xdisplay status */);
- #ifdef VINSPECTOR
- if (myContextCallBack) myContextCallBack->Display(aTrihedron);
+ #ifdef TINSPECTOR
+ if (getCallBack()) getCallBack()->Display(aTrihedron);
#endif
if (!isTrihedronActive())
activate(aTrihedron, myActiveSelectionModes, false);
} else {
deactivateTrihedron(false);
- //aContext->LocalContext()->ClearOutdatedSelection(aTrihedron, true);
- // the selection from the previous activation modes should be cleared manually (#26172)
- aContext->Erase(aTrihedron);
- #ifdef VINSPECTOR
- if (myContextCallBack) myContextCallBack->Remove(aTrihedron);
+ aContext->Erase(aTrihedron, Standard_True);
+ #ifdef TINSPECTOR
+ if (getCallBack()) getCallBack()->Remove(aTrihedron);
#endif
}
return aModes;
}
-#ifdef VINSPECTOR
-void XGUI_Displayer::setCallBack(VInspectorAPI_CallBack* theCallBack)
-{
- myContextCallBack = theCallBack;
-}
-
-VInspectorAPI_CallBack* XGUI_Displayer::getCallBack() const
-{
- return myContextCallBack;
-}
-#endif
-
void XGUI_Displayer::AddOrRemoveSelectedShapes(Handle(AIS_InteractiveContext) theContext,
const NCollection_DataMap<TopoDS_Shape,
NCollection_Map<Handle(AIS_InteractiveObject)>>& theShapesToBeSelected)
{
- Handle(AIS_LocalContext) aLContext = theContext->LocalContext();
- TCollection_AsciiString aSelectionName = aLContext->SelectionName();
- aLContext->UnhilightPicked(Standard_False);
+ NCollection_Map<Handle(AIS_InteractiveObject)> aCompsolidPresentations;
+ NCollection_Map<Handle(AIS_InteractiveObject)> aSelectedPresentations;
NCollection_List<Handle(SelectBasics_EntityOwner)> anActiveOwners;
- aLContext->MainSelector()->ActiveOwners(anActiveOwners);
+ theContext->MainSelector()->ActiveOwners(anActiveOwners);
NCollection_List<Handle(SelectBasics_EntityOwner)>::Iterator anOwnersIt (anActiveOwners);
Handle(SelectMgr_EntityOwner) anOwner;
QList<long> aSelectedIds; // Remember of selected address in order to avoid duplicates
for (; anOwnersIt.More(); anOwnersIt.Next()) {
anOwner = Handle(SelectMgr_EntityOwner)::DownCast (anOwnersIt.Value());
- if (aSelectedIds.contains((long)anOwner.Access()))
+ if (aSelectedIds.contains((long)anOwner.get()))
continue;
- aSelectedIds.append((long)anOwner.Access());
+ aSelectedIds.append((long)anOwner.get());
Handle(StdSelect_BRepOwner) BROwnr = Handle(StdSelect_BRepOwner)::DownCast(anOwner);
if (!BROwnr.IsNull() && BROwnr->HasShape()) {
const TopoDS_Shape& aShape = BROwnr->Shape();
- if (!aShape.IsNull() && theShapesToBeSelected.IsBound(aShape)) {
- Handle(AIS_InteractiveObject) anOwnerPresentation =
- Handle(AIS_InteractiveObject)::DownCast(anOwner->Selectable());
- NCollection_Map<Handle(AIS_InteractiveObject)> aPresentations =
- theShapesToBeSelected.Find(aShape);
- if (aPresentations.Contains(anOwnerPresentation)) {
- AIS_Selection::Selection(aSelectionName.ToCString())->Select(anOwner);
- anOwner->SetSelected (Standard_True);
+ if (aShape.IsNull())
+ continue;
+
+ Handle(ModuleBase_BRepOwner) aCustomOwner = Handle(ModuleBase_BRepOwner)::DownCast(anOwner);
+
+ NCollection_DataMap<TopoDS_Shape, NCollection_Map<Handle(AIS_InteractiveObject)> >
+ ::Iterator aShapeIt(theShapesToBeSelected);
+ for (; aShapeIt.More(); aShapeIt.Next()) {
+ const TopoDS_Shape& aParameterShape = aShapeIt.Key();
+ // isSame should be used here as it does not check orientation of shapes
+ // despite on isEqual of shapes or IsBound for shape in QMap. Orientation is
+ // different for Edges shapes in model shape and owner even if this is the same shape
+ if (aParameterShape.IsSame(aShape)) {
+ Handle(AIS_InteractiveObject) anOwnerPresentation =
+ Handle(AIS_InteractiveObject)::DownCast(anOwner->Selectable());
+ NCollection_Map<Handle(AIS_InteractiveObject)> aPresentations =
+ theShapesToBeSelected.Find(aParameterShape);
+ if (aPresentations.Contains(anOwnerPresentation)) {
+ theContext->AddOrRemoveSelected(anOwner, Standard_False);
+ anOwner->SetSelected (Standard_True);
+ // collect selected presentations to do not select them if compsolid is selected
+ if (!aSelectedPresentations.Contains(anOwnerPresentation))
+ aSelectedPresentations.Add(anOwnerPresentation);
+ }
+ }
+ else if (!aCustomOwner.IsNull()) { // CompSolid processing #2219
+ // shape of owner is compound, but shape to be selected is compsolid, so
+ // we need to compare shape to AIS presentation of owner(rule of the owner creation)
+ Handle(AIS_Shape) anOwnerPresentation =
+ Handle(AIS_Shape)::DownCast(anOwner->Selectable());
+ const TopoDS_Shape& aPresentationShape = anOwnerPresentation->Shape();
+ if (aParameterShape.IsSame(anOwnerPresentation->Shape()) &&
+ !aCompsolidPresentations.Contains(anOwnerPresentation))
+ aCompsolidPresentations.Add(anOwnerPresentation);
}
}
}
}
- aLContext->HilightPicked(Standard_False);
+ // select CompSolid presentations if their owners was not selected yet
+ NCollection_Map<Handle(AIS_InteractiveObject)>::Iterator anIt (aCompsolidPresentations);
+ for (; anIt.More(); anIt.Next()) {
+ if (aSelectedPresentations.Contains(anIt.Value()))
+ continue;
+ theContext->AddOrRemoveSelected(anIt.Value(), Standard_False);
+ }
}
