}
if (!mgrSelector->IsActivated (theIObj, theSelectionMode))
{
- if (!aStatus->IsSModeIn (theSelectionMode))
- aStatus->AddSelectionMode (theSelectionMode);
+ aStatus->AddSelectionMode (theSelectionMode);
mgrSelector->Activate (theIObj, theSelectionMode);
}
}
mgrSelector->UpdateSelection (theObject);
- const Standard_Integer aLayerId = myObjects.Find (theObject)->GetLayerIndex();
+ const Graphic3d_ZLayerId aLayerId = theObject->ZLayer();
const Handle(V3d_Viewer)& aCurViewer = CurrentViewer();
for (V3d_ListOfViewIterator anActiveViewIter (aCurViewer->ActiveViewIterator()); anActiveViewIter.More(); anActiveViewIter.Next())
{
theIObj->SetDisplayStatus (theStatus);
if (theStatus != PrsMgr_DisplayStatus_None)
{
- Handle(AIS_GlobalStatus) aStatus = new AIS_GlobalStatus (theDispMode, theSelectionMode);
+ Handle(AIS_GlobalStatus) aStatus = new AIS_GlobalStatus();
+ aStatus->SetDisplayMode (theDispMode);
+ if (theSelectionMode != -1)
+ {
+ aStatus->AddSelectionMode (theSelectionMode);
+ }
myObjects.Bind (theIObj, aStatus);
}
else
continue;
}
- aStatus->SubIntensityOn();
+ aStatus->SetSubIntensity (true);
myMainPM->Color (anObjsIter.Key(), aSubStyle, theDispMode != -1 ? theDispMode : aStatus->DisplayMode());
}
}
return;
}
- aStatus->SubIntensityOn();
+ aStatus->SetSubIntensity (true);
myMainPM->Color (theObject, aSubStyle, theDispMode != -1 ? theDispMode : aStatus->DisplayMode());
}
}
return;
}
- (*aStatus)->SubIntensityOff();
+ (*aStatus)->SetSubIntensity (false);
Standard_Boolean toUpdateMain = Standard_False;
if (theObj->DisplayStatus() == PrsMgr_DisplayStatus_Displayed)
{