#include <AIS_Drawer.hxx>
#include <AIS_TexturedShape.hxx>
+#include <V3d_Viewer.hxx>
+
#include <BRepBuilderAPI_MakeEdge.hxx>
#include <BRepBuilderAPI_MakeWire.hxx>
#include <BRepBuilderAPI_MakeFace.hxx>
#include <HYDROData_Channel.h>
#include <HYDROData_Document.h>
+#include <HYDROData_DummyObject3D.h>
#include <HYDROData_Image.h>
#include <HYDROData_ImmersibleZone.h>
#include <HYDROData_Obstacle.h>
#include <HYDROData_Polyline3D.h>
#include <HYDROData_Profile.h>
#include <HYDROData_Region.h>
+#include <HYDROData_ShapesGroup.h>
#include <HYDROData_Stream.h>
#include <HYDROData_Zone.h>
myContext->Erase( myShape, theIsUpdateViewer );
}
-void HYDROGUI_Shape::update( const bool theIsUpdateViewer )
+void HYDROGUI_Shape::update( const bool theIsUpdateViewer,
+ const bool theIsDisplayOnTop )
{
setIsToUpdate( false );
if ( myContext.IsNull() )
return;
+ bool isDeactivateSelection = false;
// Try to retrieve information from object
if ( !myObject.IsNull() )
{
updateShape( false, false );
}
}
+
+ QColor aWireColor = aPolyline->GetWireColor();
+ setBorderColor( aWireColor, false, false );
}
else if ( myObject->IsKind( STANDARD_TYPE(HYDROData_Polyline3D) ) )
{
updateShape( false, false );
}
}
+
+ QColor aWireColor = aPolyline->GetBorderColor();
+ setBorderColor( aWireColor, false, false );
}
else if ( myObject->IsKind( STANDARD_TYPE(HYDROData_Zone) ) )
{
setTextureFileName( aTextureFileName, false, false );
setFace( aWire, false, false );
- }
- else if ( myObject->IsKind( STANDARD_TYPE(HYDROData_Obstacle) ) )
- {
- Handle(HYDROData_Obstacle) anObstacle =
- Handle(HYDROData_Obstacle)::DownCast( myObject );
-
- //TODO BEGIN of the block of code to be reimplemented
- //TODO GetTopShape() to be used in future
- myTopoShape = anObstacle->GetShape3D();
- myDisplayMode = AIS_Shaded;
-
- QColor aFillingColor = anObstacle->GetFillingColor();
- QColor aBorderColor = anObstacle->GetBorderColor();
-
- setFillingColor( aFillingColor, false, false );
- setBorderColor( aBorderColor, false, false );
-
- buildShape();
- updateShape( false, false );
- //TODO END of the block of code to be reimplemented
+ isDeactivateSelection = true;
}
else if ( myObject->IsKind( STANDARD_TYPE(HYDROData_Profile) ) )
{
}
setWire( aProfileWire, false, false );
+
+ QColor aWireColor = aProfile->GetBorderColor();
+ setBorderColor( aWireColor, false, false );
}
- else if ( myObject->IsKind( STANDARD_TYPE(HYDROData_Stream) ) )
+ else if ( myObject->IsKind( STANDARD_TYPE(HYDROData_Stream) ) ||
+ myObject->IsKind( STANDARD_TYPE(HYDROData_Channel) ) ||
+ myObject->IsKind( STANDARD_TYPE(HYDROData_Obstacle) ) )
{
- Handle(HYDROData_Stream) aStream =
- Handle(HYDROData_Stream)::DownCast( myObject );
+ Handle(HYDROData_Object) aGeomObject =
+ Handle(HYDROData_Object)::DownCast( myObject );
- TopoDS_Shell aStreamShape = TopoDS::Shell( aStream->GetTopShape() );
+ TopoDS_Shape anObjShape = aGeomObject->GetTopShape();
- setShape( aStreamShape, false, false );
+ setShape( anObjShape, false, false );
- QColor aFillingColor = aStream->GetFillingColor();
- QColor aBorderColor = aStream->GetBorderColor();
+ QColor aFillingColor = aGeomObject->GetFillingColor();
+ QColor aBorderColor = aGeomObject->GetBorderColor();
setFillingColor( aFillingColor, false, false );
setBorderColor( aBorderColor, false, false );
}
- else if ( myObject->IsKind( STANDARD_TYPE(HYDROData_Channel) ) )
+ else if ( myObject->IsKind( STANDARD_TYPE(HYDROData_DummyObject3D) ) )
{
- Handle(HYDROData_Channel) aChannel =
- Handle(HYDROData_Channel)::DownCast( myObject );
-
- TopoDS_Face aChannelShape = TopoDS::Face( aChannel->GetTopShape() );
+ Handle(HYDROData_DummyObject3D) anObject3D =
+ Handle(HYDROData_DummyObject3D)::DownCast( myObject );
+ TopoDS_Shape aShape3D = anObject3D->GetShape();
- setShape( aChannelShape, false, false );
+ setShape( aShape3D, false, false );
- QColor aFillingColor = aChannel->GetFillingColor();
- QColor aBorderColor = aChannel->GetBorderColor();
+ QColor aFillingColor = anObject3D->GetFillingColor();
+ QColor aBorderColor = anObject3D->GetBorderColor();
setFillingColor( aFillingColor, false, false );
setBorderColor( aBorderColor, false, false );
}
+ else if ( myObject->IsKind( STANDARD_TYPE(HYDROData_ShapesGroup) ) )
+ {
+ Handle(HYDROData_ShapesGroup) aShapesGroup =
+ Handle(HYDROData_ShapesGroup)::DownCast( myObject );
+
+ TopTools_SequenceOfShape aShapes;
+ aShapesGroup->GetShapes( aShapes );
+
+ BRepBuilderAPI_MakeWire aMakeWire;
+
+ for ( int i = 1, n = aShapes.Length(); i <= n; ++i )
+ {
+ TopoDS_Edge anEdge = TopoDS::Edge( aShapes.Value( i ) );
+ aMakeWire.Add( anEdge );
+ }
+
+ aMakeWire.Build();
+ TopoDS_Wire aResWire = aMakeWire.Wire();
+
+ setWire( aResWire, false, false );
+ setBorderColor( Qt::red, false, false );
+ }
}
if ( myShape.IsNull() || !isVisible() )
return;
myContext->Display( myShape, theIsUpdateViewer );
+
+ if ( theIsDisplayOnTop ) {
+ // Display the shape on the top Z layer
+ Standard_Integer aNewLayerId = -1;
+ if ( myContext->CurrentViewer() &&
+ myContext->CurrentViewer()->AddZLayer( aNewLayerId ) &&
+ aNewLayerId > 0 ) {
+ myContext->SetZLayer( myShape, aNewLayerId );
+ }
+ }
+
+ if (isDeactivateSelection)
+ myContext->Deactivate(myShape);
}
void HYDROGUI_Shape::setVisible( const bool theState,
myContext->Erase( myShape, theIsUpdateViewer );
}
-void HYDROGUI_Shape::highlight( bool theIsHighlight )
+void HYDROGUI_Shape::highlight( bool theIsHighlight, bool isUpdateViewer )
{
if ( myIsHighlight == theIsHighlight )
return;
return;
colorShapeBorder( getActiveColor() );
- myContext->Display( myShape );
+ myContext->Display( myShape, isUpdateViewer );
}
bool HYDROGUI_Shape::isHighlighted() const
Handle(Prs3d_ShadingAspect) aShadingAspect = anAttributes->ShadingAspect();
if ( !aShadingAspect.IsNull() )
{
- Graphic3d_MaterialAspect aMatAspect;
- aMatAspect.SetAmbient( 1 );
- aMatAspect.SetDiffuse( 0 );
+ Graphic3d_MaterialAspect aMatAspect( Graphic3d_NOM_PLASTIC );
+ //aMatAspect.SetAmbient( 1 );
+ //aMatAspect.SetDiffuse( 0 );
aShadingAspect->Aspect()->SetFrontMaterial( aMatAspect );
aShadingAspect->Aspect()->SetBackMaterial( aMatAspect );
Handle(Prs3d_LineAspect) aBoundaryAspect = anAttributes->FaceBoundaryAspect();
if ( !aBoundaryAspect.IsNull() )
+ {
aBoundaryAspect->SetColor( aBorderColor );
+ anAttributes->SetFaceBoundaryAspect( aBoundaryAspect );
+ }
}
}
else if ( myDisplayMode == AIS_WireFrame )