Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix for registering parameters in command line mode
[modules/shaper.git]
/
src
/
ModuleBase
/
ModuleBase_ResultPrs.cpp
diff --git
a/src/ModuleBase/ModuleBase_ResultPrs.cpp
b/src/ModuleBase/ModuleBase_ResultPrs.cpp
index 19ceb3e9b7374306d4f57c0cb6f898772d671836..d08ccb44dfa7f6d09443c529ce2bb28014ef1569 100755
(executable)
--- a/
src/ModuleBase/ModuleBase_ResultPrs.cpp
+++ b/
src/ModuleBase/ModuleBase_ResultPrs.cpp
@@
-25,7
+25,7
@@
#include <SelectMgr_SequenceOfOwner.hxx>
#include <SelectMgr_EntityOwner.hxx>
#include <SelectMgr_SelectionManager.hxx>
#include <SelectMgr_SequenceOfOwner.hxx>
#include <SelectMgr_EntityOwner.hxx>
#include <SelectMgr_SelectionManager.hxx>
-#include <StdPrs_WF
Deflection
Shape.hxx>
+#include <StdPrs_WFShape.hxx>
#include <StdSelect_BRepSelectionTool.hxx>
#include <AIS_InteractiveContext.hxx>
#include <AIS_Selection.hxx>
#include <StdSelect_BRepSelectionTool.hxx>
#include <AIS_InteractiveContext.hxx>
#include <AIS_Selection.hxx>
@@
-33,18
+33,14
@@
#include <Graphic3d_AspectMarker3d.hxx>
#include <TopExp_Explorer.hxx>
#include <Graphic3d_AspectMarker3d.hxx>
#include <TopExp_Explorer.hxx>
-IMPLEMENT_STANDARD_HANDLE(ModuleBase_BRepOwner, StdSelect_BRepOwner);
IMPLEMENT_STANDARD_RTTIEXT(ModuleBase_BRepOwner, StdSelect_BRepOwner);
//*******************************************************************************************
IMPLEMENT_STANDARD_RTTIEXT(ModuleBase_BRepOwner, StdSelect_BRepOwner);
//*******************************************************************************************
-IMPLEMENT_STANDARD_HANDLE(ModuleBase_ResultPrs, ViewerData_AISShape);
IMPLEMENT_STANDARD_RTTIEXT(ModuleBase_ResultPrs, ViewerData_AISShape);
IMPLEMENT_STANDARD_RTTIEXT(ModuleBase_ResultPrs, ViewerData_AISShape);
-
-
ModuleBase_ResultPrs::ModuleBase_ResultPrs(ResultPtr theResult)
: ViewerData_AISShape(TopoDS_Shape()), myResult(theResult), myAdditionalSelectionPriority(0)
{
ModuleBase_ResultPrs::ModuleBase_ResultPrs(ResultPtr theResult)
: ViewerData_AISShape(TopoDS_Shape()), myResult(theResult), myAdditionalSelectionPriority(0)
{
@@
-182,25
+178,26
@@
void ModuleBase_ResultPrs::HilightSelected(const Handle(PrsMgr_PresentationManag
for (int i = 1; i <= theOwners.Length(); i++) {
anOwner = theOwners.Value(i);
aCompOwner = Handle(ModuleBase_BRepOwner)::DownCast(anOwner);
for (int i = 1; i <= theOwners.Length(); i++) {
anOwner = theOwners.Value(i);
aCompOwner = Handle(ModuleBase_BRepOwner)::DownCast(anOwner);
- if (aCompOwner.IsNull())
- anOwner->Hilight(thePM);
+ if (aCompOwner.IsNull()) {
+ thePM->Color(anOwner->Selectable(), GetContext()->SelectionStyle());
+ }
else {
TopoDS_Shape aShape = aCompOwner->Shape();
Handle( Prs3d_Presentation ) aSelectionPrs = GetSelectPresentation( thePM );
aSelectionPrs->Clear();
else {
TopoDS_Shape aShape = aCompOwner->Shape();
Handle( Prs3d_Presentation ) aSelectionPrs = GetSelectPresentation( thePM );
aSelectionPrs->Clear();
- StdPrs_WF
Deflection
Shape::Add(aSelectionPrs, aShape, myDrawer);
+ StdPrs_WFShape::Add(aSelectionPrs, aShape, myDrawer);
aSelectionPrs->SetDisplayPriority(9);
aSelectionPrs->SetDisplayPriority(9);
- aSelectionPrs->Highlight(
Aspect_TOHM_COLOR, aSelectionPrs->HighlightColor
());
+ aSelectionPrs->Highlight(
GetContext()->SelectionStyle
());
aSelectionPrs->Display();
aSelectionPrs->Display();
- thePM->
Highlight(this
);
+ thePM->
Color(this, GetContext()->SelectionStyle()
);
}
}
}
void ModuleBase_ResultPrs::HilightOwnerWithColor(const Handle(PrsMgr_PresentationManager3d)& thePM,
}
}
}
void ModuleBase_ResultPrs::HilightOwnerWithColor(const Handle(PrsMgr_PresentationManager3d)& thePM,
- const
Quantity_NameOfColor theColor
,
+ const
Handle(Graphic3d_HighlightStyle)& theStyle
,
const Handle(SelectMgr_EntityOwner)& theOwner)
{
Handle(StdSelect_BRepOwner) aOwner = Handle(StdSelect_BRepOwner)::DownCast(theOwner);
const Handle(SelectMgr_EntityOwner)& theOwner)
{
Handle(StdSelect_BRepOwner) aOwner = Handle(StdSelect_BRepOwner)::DownCast(theOwner);
@@
-209,13
+206,13
@@
void ModuleBase_ResultPrs::HilightOwnerWithColor(const Handle(PrsMgr_Presentatio
TopoDS_Shape aShape = aOwner->Shape();
if (!aShape.IsNull()) {
TopoDS_Shape aShape = aOwner->Shape();
if (!aShape.IsNull()) {
- thePM->Color(this, the
Color
);
+ thePM->Color(this, the
Style
);
Handle( Prs3d_Presentation ) aHilightPrs = GetHilightPresentation( thePM );
aHilightPrs->Clear();
Handle( Prs3d_Presentation ) aHilightPrs = GetHilightPresentation( thePM );
aHilightPrs->Clear();
- StdPrs_WF
Deflection
Shape::Add(aHilightPrs, aShape, myDrawer);
- aHilightPrs->Highlight(
Aspect_TOHM_COLOR, theColor
);
+ StdPrs_WFShape::Add(aHilightPrs, aShape, myDrawer);
+ aHilightPrs->Highlight(
theStyle
);
if (thePM->IsImmediateModeOn())
thePM->AddToImmediateList(aHilightPrs);
if (thePM->IsImmediateModeOn())
thePM->AddToImmediateList(aHilightPrs);