#include <TColStd_MapOfTransient.hxx>
#include <TColStd_MapIteratorOfMapOfTransient.hxx>
+#ifdef VINSPECTOR
+#include <VInspectorAPI_CallBack.h>
+#endif
+
#include <Events_Loop.h>
#include <ModelAPI_Events.h>
#include <set>
-const int MOUSE_SENSITIVITY_IN_PIXEL = 10; ///< defines the local context mouse selection sensitivity
+/// defines the local context mouse selection sensitivity
+const int MOUSE_SENSITIVITY_IN_PIXEL = 10;
//#define DEBUG_ACTIVATE_OBJECTS
//#define DEBUG_DEACTIVATE
//#define DEBUG_OCCT_SHAPE_SELECTION
-#define WORKAROUND_UNTIL_27523_IS_FIXED
+//#define WORKAROUND_UNTIL_27523_IS_FIXED
void displayedObjects(const Handle(AIS_InteractiveContext)& theAIS, AIS_ListOfInteractive& theList)
{
: myWorkshop(theWorkshop), myNeedUpdate(false),
myIsTrihedronActive(true), myViewerBlockedRecursiveCount(0)
{
+ #ifdef VINSPECTOR
+ myContextCallBack = 0;
+ #endif
myCustomPrs = std::shared_ptr<GeomAPI_ICustomPrs>(new XGUI_CustomPrs(theWorkshop));
}
bool aDisplayed = false;
if (isVisible(theObject)) {
#ifdef DEBUG_COMPOSILID_DISPLAY
- ResultCompSolidPtr aCompsolidResult = std::dynamic_pointer_cast<ModelAPI_ResultCompSolid>(theObject);
+ ResultCompSolidPtr aCompsolidResult =
+ std::dynamic_pointer_cast<ModelAPI_ResultCompSolid>(theObject);
if (aCompsolidResult.get()) {
for(int i = 0; i < aCompsolidResult->numberOfSubs(); i++) {
ResultPtr aSubResult = aCompsolidResult->subResult(i);
if (aPrs.get() != NULL) {
anAIS = aPrs->getAISObject(anAIS);
if (anAIS.get()) {
- // correct deviation coefficient for
- Handle(AIS_InteractiveObject) anAISPrs = anAIS->impl<Handle(AIS_InteractiveObject)>();
+ // correct deviation coefficient for
+ /*Handle(AIS_InteractiveObject) anAISPrs = anAIS->impl<Handle(AIS_InteractiveObject)>();
if (!anAISPrs.IsNull()) {
Handle(AIS_Shape) aShapePrs = Handle(AIS_Shape)::DownCast(anAISPrs);
if (!aShapePrs.IsNull()) {
TopoDS_Shape aShape = aShapePrs->Shape();
if (!aShape.IsNull())
- ModuleBase_Tools::setDefaultDeviationCoefficient(aShape, anAISPrs->Attributes());
+ //ModuleBase_Tools::setDefaultDeviationCoefficient(aShape, anAISPrs->Attributes());
}
- }
+ }*/
}
} else {
ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(theObject);
if (aResult.get() != NULL) {
#ifdef DEBUG_COMPOSILID_DISPLAY
- ResultCompSolidPtr aCompsolidResult = std::dynamic_pointer_cast<ModelAPI_ResultCompSolid>(theObject);
+ ResultCompSolidPtr aCompsolidResult =
+ std::dynamic_pointer_cast<ModelAPI_ResultCompSolid>(theObject);
if (aCompsolidResult.get()) {
for(int i = 0; i < aCompsolidResult->numberOfSubs(); i++) {
ResultPtr aSubResult = aCompsolidResult->subResult(i);
std::shared_ptr<GeomAPI_Shape> aShapePtr = ModelAPI_Tools::shape(aResult);
if (aShapePtr.get() != NULL) {
anAIS = AISObjectPtr(new GeomAPI_AISObject());
- Handle(AIS_InteractiveObject) anAISPrs = myWorkshop->module()->createPresentation(aResult);
+ Handle(AIS_InteractiveObject) anAISPrs =
+ myWorkshop->module()->createPresentation(aResult);
if (anAISPrs.IsNull())
anAISPrs = new ModuleBase_ResultPrs(aResult);
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);
return false;
}
-bool XGUI_Displayer::display(ObjectPtr theObject, AISObjectPtr theAIS,
+bool XGUI_Displayer::display(ObjectPtr theObject, AISObjectPtr theAIS,
bool isShading, bool theUpdateViewer)
{
bool aDisplayed = false;
if (isShading)
anAISIO->Attributes()->SetFaceBoundaryDraw( Standard_True );
anAISIO->SetDisplayMode(aDispMode);
- aContext->Display(anAISIO, aDispMode, 0, false, true, AIS_DS_Displayed);
+ aContext->Display(anAISIO, aDispMode, 0, false, true, AIS_DS_Displayed);
+ #ifdef VINSPECTOR
+ if (myContextCallBack) myContextCallBack->Display(anAISIO);
+ #endif
aDisplayed = true;
emit objectDisplayed(theObject, theAIS);
activate(anAISIO, myActiveSelectionModes, theUpdateViewer);
- }
+ }
if (theUpdateViewer)
updateViewer();
if (!anAIS.IsNull()) {
emit beforeObjectErase(theObject, anObject);
aContext->Remove(anAIS, false/*update viewer*/);
- ModuleBase_Tools::selectionInfo(aContext, "XGUI_Displayer::erase -- Remove");
+ #ifdef VINSPECTOR
+ if (myContextCallBack) myContextCallBack->Remove(anAIS);
+ #endif
aErased = true;
}
}
Handle(AIS_InteractiveContext) aContext = AISContext();
if (!aContext.IsNull() && !aAISIO.IsNull()) {
// Check that the visualized shape is the same and the redisplay is not necessary
- // Redisplay of AIS object leads to this object selection compute and the selection
+ // Redisplay of AIS object leads to this object selection compute and the selection
// in the browser is lost
// this check is not necessary anymore because the selection store/restore is realized
// before and after the values modification.
bool isCustomized = customizeObject(theObject);
#ifdef DEBUG_FEATURE_REDISPLAY
qDebug(QString("Redisplay: %1, isEqualShapes=%2, isCustomized=%3").
- arg(!isEqualShapes || isCustomized).arg(isEqualShapes).arg(isCustomized).toStdString().c_str());
+ arg(!isEqualShapes || isCustomized).arg(isEqualShapes)
+ .arg(isCustomized).toStdString().c_str());
#endif
if (!isEqualShapes || isCustomized) {
/// if shapes are equal and presentation are customized, selection should be restored
aContext->Deactivate(aAISIO, 0);
#endif
- ModuleBase_Tools::selectionInfo(aContext, "XGUI_Displayer::redisplay -- Redisplay");
+ #ifdef VINSPECTOR
+ if (myContextCallBack) myContextCallBack->Redisplay(aAISIO);
+ #endif
if (aNeedToRestoreSelection)
myWorkshop->module()->restoreSelection();
deactivateAIS(anAIS);
// the selection from the previous activation modes should be cleared manually (#26172)
aContext->LocalContext()->ClearOutdatedSelection(anAIS, true);
- ModuleBase_Tools::selectionInfo(aContext, "XGUI_Displayer::deactivate -- ClearOutdatedSelection");
+ #ifdef VINSPECTOR
+ if (myContextCallBack) myContextCallBack->ClearOutdatedSelection(anAIS);
+ #endif
if (theUpdateViewer)
updateViewer();
}
int XGUI_Displayer::getSelectionMode(int theShapeType)
{
- return (theShapeType >= TopAbs_SHAPE)? theShapeType :
- AIS_Shape::SelectionMode((TopAbs_ShapeEnum)theShapeType);
+ return (theShapeType > TopAbs_SHAPE) ? theShapeType :
+ AIS_Shape::SelectionMode((TopAbs_ShapeEnum)theShapeType);
}
bool XGUI_Displayer::isVisible(XGUI_Displayer* theDisplayer, const ObjectPtr& theObject)
ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(theObject);
if (aPrs.get() || aResult.get()) {
aVisible = theDisplayer->isVisible(theObject);
- // compsolid is not visualized in the viewer, but should have presentation when all sub solids are
+ // compsolid is not visualized in the viewer,
+ // but should have presentation when all sub solids are
// visible. It is useful for highlight presentation where compsolid shape is selectable
if (!aVisible && aResult.get() && aResult->groupName() == ModelAPI_ResultCompSolid::group()) {
- ResultCompSolidPtr aCompsolidResult = std::dynamic_pointer_cast<ModelAPI_ResultCompSolid>(aResult);
+ ResultCompSolidPtr aCompsolidResult =
+ std::dynamic_pointer_cast<ModelAPI_ResultCompSolid>(aResult);
if (aCompsolidResult.get() != NULL) { // change colors for all sub-solids
bool anAllSubsVisible = aCompsolidResult->numberOfSubs() > 0;
for(int i = 0; i < aCompsolidResult->numberOfSubs() && anAllSubsVisible; i++) {
if (!aVisible) {
// check if all results of the feature are visible
FeaturePtr aFeature = ModelAPI_Feature::feature(theObject);
- std::list<ResultPtr> aResults = aFeature->results();
+ std::list<ResultPtr> aResults;
+ ModelAPI_Tools::allResults(aFeature, aResults);
std::list<ResultPtr>::const_iterator aIt;
aVisible = !aResults.empty();
for (aIt = aResults.begin(); aIt != aResults.end(); ++aIt) {
myActiveSelectionModes = aNewModes;
Handle(AIS_InteractiveContext) aContext = AISContext();
// Open local context if there is no one
- if (aContext.IsNull() || !aContext->HasOpenedContext())
+ if (aContext.IsNull() || !aContext->HasOpenedContext())
return;
//aContext->UseDisplayedObjects();
Handle(AIS_InteractiveContext) aContext = AISContext();
if (aContext.IsNull() || !isVisible(theObject))
return false;
-
+
AISObjectPtr anObj = myResult2AISObjectMap[theObject];
Handle(AIS_InteractiveObject) anAIS = anObj->impl<Handle(AIS_InteractiveObject)>();
TColStd_ListOfInteger aModes;
aContext->ActivatedModes(anAIS, aModes);
+ #ifdef VINSPECTOR
+ if (myContextCallBack) myContextCallBack->ActivatedModes(anAIS, aModes);
+ #endif
+
return aModes.Extent() > 0;
}
-void XGUI_Displayer::setSelected(const QList<ModuleBase_ViewerPrsPtr>& theValues, bool theUpdateViewer)
+
+
+void XGUI_Displayer::setSelected(const QList<ModuleBase_ViewerPrsPtr>& theValues,
+ bool theUpdateViewer)
{
Handle(AIS_InteractiveContext) aContext = AISContext();
if (aContext.IsNull())
if (aContext->HasOpenedContext()) {
aContext->UnhilightSelected(false);
aContext->ClearSelected(false);
- NCollection_Map<TopoDS_Shape> aShapesToBeSelected;
+ #ifdef VINSPECTOR
+ if (myContextCallBack) myContextCallBack->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>();
#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
#else
- aShapesToBeSelected.Add(aShape);
+ 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);
#endif
} else {
ObjectPtr anObject = aPrs->object();
//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
}
}
}
}
}
}
- ModuleBase_Tools::selectionInfo(aContext, "XGUI_Displayer::setSelected -- AddOrRemoveSelected/UnhilightCurrents(no local context)");
if (theUpdateViewer)
updateViewer();
}
-void XGUI_Displayer::clearSelected()
+void XGUI_Displayer::clearSelected(const bool theUpdateViewer)
{
Handle(AIS_InteractiveContext) aContext = AISContext();
if (!aContext.IsNull()) {
aContext->UnhilightCurrents(false);
- aContext->ClearSelected();
+ aContext->ClearSelected(theUpdateViewer);
+ #ifdef VINSPECTOR
+ if (myContextCallBack) myContextCallBack->ClearSelected();
+ #endif
}
}
if (!anIO.IsNull()) {
emit beforeObjectErase(aObj, aAISObj);
aContext->Remove(anIO, false/*update viewer*/);
+ #ifdef VINSPECTOR
+ if (myContextCallBack) myContextCallBack->Remove(anIO);
+ #endif
aErased = true;
}
}
if (theUpdateViewer)
updateViewer();
}
- ModuleBase_Tools::selectionInfo(aContext, "XGUI_Displayer::eraseAll -- Remove");
myResult2AISObjectMap.clear();
#ifdef DEBUG_DISPLAY
qDebug("eraseAll");
void deactivateObject(Handle(AIS_InteractiveContext) theContext,
Handle(AIS_InteractiveObject) theObject,
+#ifdef VINSPECTOR
+ VInspectorAPI_CallBack* theCallBack,
+#endif
const bool theClear = true)
{
if (!theObject.IsNull()) {
theContext->Deactivate(theObject);
- ModuleBase_Tools::selectionInfo(theContext, "XGUI_Displayer::deactivateObject -- Deactivate");
+ #ifdef VINSPECTOR
+ if (theCallBack) theCallBack->Deactivate(theObject);
+ #endif
//if (theClear) {
//theObject->ClearSelected();
// theContext->LocalContext()->ClearOutdatedSelection(theObject, true);
Handle(AIS_InteractiveContext) aContext = AISContext();
if (!aTrihedron.IsNull() && aContext->IsDisplayed(aTrihedron)) {
Handle(AIS_Trihedron) aTrie = Handle(AIS_Trihedron)::DownCast(aTrihedron);
- deactivateObject(aContext, aTrie);
+ deactivateObject(aContext, aTrie
+ #ifdef VINSPECTOR
+ , myContextCallBack
+ #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.
- deactivateObject(aContext, aTrie->XAxis());
- deactivateObject(aContext, aTrie->YAxis());
- deactivateObject(aContext, aTrie->Axis());
- deactivateObject(aContext, aTrie->Position());
+ deactivateObject(aContext, aTrie->XAxis()
+ #ifdef VINSPECTOR
+ , myContextCallBack
+ #endif
+ );
+ deactivateObject(aContext, aTrie->YAxis()
+ #ifdef VINSPECTOR
+ , myContextCallBack
+ #endif
+ );
+ deactivateObject(aContext, aTrie->Axis()
+ #ifdef VINSPECTOR
+ , myContextCallBack
+ #endif
+ );
+ deactivateObject(aContext, aTrie->Position()
+ #ifdef VINSPECTOR
+ , myContextCallBack
+ #endif
+ );
- deactivateObject(aContext, aTrie->XYPlane());
- deactivateObject(aContext, aTrie->XZPlane());
- deactivateObject(aContext, aTrie->YZPlane());
+ deactivateObject(aContext, aTrie->XYPlane()
+ #ifdef VINSPECTOR
+ , myContextCallBack
+ #endif
+ );
+ deactivateObject(aContext, aTrie->XZPlane()
+ #ifdef VINSPECTOR
+ , myContextCallBack
+ #endif
+ );
+ deactivateObject(aContext, aTrie->YZPlane()
+ #ifdef VINSPECTOR
+ , myContextCallBack
+ #endif
+ );
if (theUpdateViewer)
updateViewer();
const int theMode, const bool theUpdateViewer) const
{
Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext();
+ if (!theIO.IsNull() && theIO == getTrihedron()) {
+ if (theMode != AIS_Shape::SelectionType(TopAbs_EDGE) &&
+ theMode != AIS_Shape::SelectionType(TopAbs_VERTEX))
+ return;
+ }
if (!aContext.IsNull()) {
if (myWorkshop->module()) {
int aMode = (theMode > 8)? theMode : AIS_Shape::SelectionType(theMode);
aContext->Activate(theIO, theMode, false);
} else
aContext->Activate(theIO, theMode, false);
+ #ifdef VINSPECTOR
+ if (myContextCallBack) myContextCallBack->Activate(theIO, theMode);
+ #endif
// the fix from VPA for more suitable selection of sketcher lines
- double aPrecision = theIO->Width() + 2;
- if (theMode == getSelectionMode(TopAbs_VERTEX))
- aPrecision = ModuleBase_Preferences::resourceMgr()->doubleValue("Viewer", "point-selection-sensitivity", 20);
- else if ((theMode == getSelectionMode(TopAbs_EDGE)) || (theMode == getSelectionMode(TopAbs_WIRE)))
- aPrecision = theIO->Width() +
- ModuleBase_Preferences::resourceMgr()->doubleValue("Viewer", "edge-selection-sensitivity", 2);
- aContext->SetSelectionSensitivity(theIO, theMode, aPrecision);
-
- ModuleBase_Tools::selectionInfo(aContext, "XGUI_Displayer::activateAIS -- Activate");
+ if (theIO->Width() > 1) {
+ double aPrecision = theIO->Width() + 2;
+ if (theMode == getSelectionMode(TopAbs_VERTEX))
+ aPrecision = ModuleBase_Preferences::resourceMgr()->doubleValue("Viewer",
+ "point-selection-sensitivity",
+ 12);
+ else if ((theMode == getSelectionMode(TopAbs_EDGE)) ||
+ (theMode == getSelectionMode(TopAbs_WIRE)))
+ aPrecision = theIO->Width() +
+ ModuleBase_Preferences::resourceMgr()->doubleValue("Viewer",
+ "edge-selection-sensitivity", 2);
+ aContext->SetSelectionSensitivity(theIO, theMode, aPrecision);
+ }
#ifdef DEBUG_ACTIVATE_AIS
ObjectPtr anObject = getObject(theIO);
anInfo.append(ModuleBase_Tools::objectInfo((*anIt)));
- qDebug(QString("activateAIS: theMode = %1, object = %2").arg(theMode).arg(anInfo).toStdString().c_str());
+ qDebug(QString("activateAIS: theMode = %1, object = %2").arg(theMode)
+ .arg(anInfo).toStdString().c_str());
#endif
if (theUpdateViewer)
updateViewer();
}
}
-void XGUI_Displayer::deactivateAIS(const Handle(AIS_InteractiveObject)& theIO, const int theMode) const
+void XGUI_Displayer::deactivateAIS(const Handle(AIS_InteractiveObject)& theIO,
+ const int theMode) const
{
Handle(AIS_InteractiveContext) aContext = AISContext();
if (!aContext.IsNull()) {
- if (theMode == -1)
+ if (theMode == -1) {
aContext->Deactivate(theIO);
- else
+ #ifdef VINSPECTOR
+ if (myContextCallBack) myContextCallBack->Deactivate(theIO);
+ #endif
+ }
+ else {
aContext->Deactivate(theIO, theMode);
- ModuleBase_Tools::selectionInfo(aContext, "XGUI_Displayer::deactivateAIS -- Deactivate");
-
+ #ifdef VINSPECTOR
+ if (myContextCallBack) myContextCallBack->Deactivate(theIO, theMode);
+ #endif
+ }
+
#ifdef DEBUG_DEACTIVATE_AIS
ObjectPtr anObject = getObject(theIO);
anInfo.append(ModuleBase_Tools::objectInfo((*anIt)));
- qDebug(QString("deactivateAIS: theMode = %1, object = %2").arg(theMode).arg(anInfo).toStdString().c_str());
+ qDebug(QString("deactivateAIS: theMode = %1, object = %2").arg(theMode)
+ .arg(anInfo).toStdString().c_str());
#endif
}
}
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);
+ #endif
aDisplayed = true;
aContext->Deactivate(anAISIO);
+ #ifdef VINSPECTOR
+ if (myContextCallBack) myContextCallBack->Deactivate(anAISIO);
+ #endif
aContext->Load(anAISIO);
+ #ifdef VINSPECTOR
+ if (myContextCallBack) myContextCallBack->Load(anAISIO);
+ #endif
if (toActivateInSelectionModes) {
if (aContext->HasOpenedContext()) {
if (myActiveSelectionModes.size() == 0)
Handle(AIS_InteractiveObject) anAISIO = theAIS->impl<Handle(AIS_InteractiveObject)>();
if (!anAISIO.IsNull() && aContext->IsDisplayed(anAISIO)) {
aContext->Remove(anAISIO, false/*update viewer*/);
- ModuleBase_Tools::selectionInfo(aContext, "XGUI_Displayer::eraseAIS -- Remove");
+ #ifdef VINSPECTOR
+ if (myContextCallBack) myContextCallBack->Remove(anAISIO);
+ #endif
aErased = true;
}
}
aCompositeFilter->Remove(theFilter);
#ifdef DEBUG_SELECTION_FILTERS
int aCount = aCompositeFilter->StoredFilters().Extent();
- qDebug(QString("removeSelectionFilter: filters.count() = %1").arg(aCount).toStdString().c_str());
+ qDebug(QString("removeSelectionFilter: filters.count() = %1")
+ .arg(aCount).toStdString().c_str());
#endif
}
}
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;
}
}
}
bool XGUI_Displayer::canBeShaded(ObjectPtr theObject) const
-{
+{
if (!isVisible(theObject))
return false;
Handle(AIS_InteractiveContext) aContext = AISContext();
if (aContext.IsNull() || theIO.IsNull())
return false;
-
+
bool isActivationChanged = false;
// deactivate object in all modes, which are not in the list of activation
// It seems that after the IO deactivation the selected state of the IO's owners
// If the selection problem happens again, it is possible to write a test scenario and create
// a bug. The bug steps are the following:
// Create two IO, activate them in 5 modes, select the first IO, deactivate 3 modes for both,
- // with clicked SHIFT select the second object. The result is the selection of the first IO is lost.
+ // with clicked SHIFT select the second object.
+ // 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);
+ #endif
TColStd_ListIteratorOfListOfInteger itr( aTColModes );
QIntList aModesActivatedForIO;
bool isDeactivated = false;
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);
- ModuleBase_Tools::selectionInfo(aContext, "XGUI_Displayer::activate -- ClearSelected/ClearOutdatedSelection");
+ #ifdef VINSPECTOR
+ if (myContextCallBack) myContextCallBack->ClearOutdatedSelection(theIO);
+ #endif
// For performance issues
//if (theUpdateViewer)
// updateViewer();
// loading the interactive object allowing the decomposition
if (aTColModes.IsEmpty()) {
aContext->Load(theIO, -1, true);
+ #ifdef VINSPECTOR
+ if (myContextCallBack) myContextCallBack->Load(theIO);
+ #endif
}
// trihedron AIS check should be after the AIS loading.
}
-QColor XGUI_Displayer::setObjectColor(ObjectPtr theObject, const QColor& theColor, bool theUpdateViewer)
+QColor XGUI_Displayer::setObjectColor(ObjectPtr theObject,
+ const QColor& theColor,
+ bool theUpdateViewer)
{
if (!isVisible(theObject))
return Qt::black;
#endif
}
+#ifdef _DEBUG
std::string XGUI_Displayer::getResult2AISObjectMapInfo() const
{
QStringList aContent;
aPtrStr << "aObj = " << aObj.get() << ":";
aPtrStr << "anAIS = " << aAISObj.get() << ":";
aPtrStr << "[" << ModuleBase_Tools::objectInfo(aObj).toStdString().c_str() << "]";
-
+
aContent.append(aPtrStr.str().c_str());
}
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) {
+ Handle(AIS_InteractiveObject) anAIS = aAISObj->impl<Handle(AIS_InteractiveObject)>();
+ if (!anAIS.IsNull() && !thePresentations.Contains(anAIS))
+ thePresentations.Add(anAIS);
+ }
+ }
+ else {
+ FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(theObject);
+ // find presentation of the feature
+ AISObjectPtr aAISObj = getAISObject(aFeature);
+ if (aAISObj.get() != NULL) {
+ Handle(AIS_InteractiveObject) anAIS = aAISObj->impl<Handle(AIS_InteractiveObject)>();
+ if (!anAIS.IsNull() && !thePresentations.Contains(anAIS))
+ thePresentations.Add(anAIS);
+ }
+ // find presentations of the feature results
+ std::list<ResultPtr> aResults;
+ ModelAPI_Tools::allResults(aFeature, aResults);
+ std::list<ResultPtr>::const_iterator anIt = aResults.begin(), aLast = aResults.end();
+ for (; anIt != aLast; ++anIt) {
+ AISObjectPtr aAISObj = getAISObject(*anIt);
+ if (aAISObj.get() != NULL) {
+ Handle(AIS_InteractiveObject) anAIS = aAISObj->impl<Handle(AIS_InteractiveObject)>();
+ if (!anAIS.IsNull() && !thePresentations.Contains(anAIS))
+ thePresentations.Add(anAIS);
+ }
+ }
+ }
+}
-void XGUI_Displayer::activateTrihedron(bool theIsActive)
-{
- myIsTrihedronActive = theIsActive;
+void XGUI_Displayer::activateTrihedron(bool theIsActive)
+{
+ myIsTrihedronActive = theIsActive;
if (!myIsTrihedronActive) {
deactivateTrihedron(true);
}
Standard_True /* update viewer*/,
Standard_False /* allow decomposition */,
AIS_DS_Displayed /* xdisplay status */);
+ #ifdef VINSPECTOR
+ if (myContextCallBack) myContextCallBack->Display(aTrihedron);
+ #endif
if (!isTrihedronActive())
deactivateTrihedron(false);
// the selection from the previous activation modes should be cleared manually (#26172)
aContext->Erase(aTrihedron);
+ #ifdef VINSPECTOR
+ if (myContextCallBack) myContextCallBack->Remove(aTrihedron);
+ #endif
}
updateViewer();
}
-QIntList XGUI_Displayer::activeSelectionModes() const
-{
+QIntList XGUI_Displayer::activeSelectionModes() const
+{
QIntList aModes;
foreach (int aMode, myActiveSelectionModes) {
// aMode < 9 is a Shape Enum values
aModes << ((aMode < 9)? AIS_Shape::SelectionType(aMode) : aMode);
}
- return aModes;
+ 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_Map<TopoDS_Shape>& theShapesToBeSelected)
+ const NCollection_DataMap<TopoDS_Shape,
+ NCollection_Map<Handle(AIS_InteractiveObject)>>& theShapesToBeSelected)
{
+ /*
+ // PORTING_TO_SALOME_8
Handle(AIS_LocalContext) aLContext = theContext->LocalContext();
TCollection_AsciiString aSelectionName = aLContext->SelectionName();
aLContext->UnhilightPicked(Standard_False);
- NCollection_Map<TopoDS_Shape> aShapesSelected;
-
NCollection_List<Handle(SelectBasics_EntityOwner)> anActiveOwners;
aLContext->MainSelector()->ActiveOwners(anActiveOwners);
NCollection_List<Handle(SelectBasics_EntityOwner)>::Iterator anOwnersIt (anActiveOwners);
Handle(SelectMgr_EntityOwner) anOwner;
+
+ /// It is very important to check that the owner is processed only once and has a map of
+ /// processed owners because SetSelected works as a switch.
+ /// If count of calls setSelectec is even, the object stays in the previous state
+ /// (selected, deselected)
+ /// OCCT: to write about the problem that active owners method returns one owner several times
+ 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.get()))
+ continue;
+ aSelectedIds.append((long)anOwner.get());
+
Handle(StdSelect_BRepOwner) BROwnr = Handle(StdSelect_BRepOwner)::DownCast(anOwner);
- if (!BROwnr.IsNull() && BROwnr->HasShape() && theShapesToBeSelected.Contains(BROwnr->Shape())) {
- if (aShapesSelected.Contains(BROwnr->Shape()))
- continue;
- AIS_Selection::Selection(aSelectionName.ToCString())->Select(anOwner);
- anOwner->SetSelected (Standard_True);
- aShapesSelected.Add(BROwnr->Shape());
+ 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);
+ }
+ }
}
}
aLContext->HilightPicked(Standard_False);
+*/
}
