#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 <Graphic3d_AspectFillArea3d.hxx>
#include <Graphic3d_MaterialAspect.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_PolylineXY.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>
-#include <HYDROData_Obstacle.h>
#include <TopoDS.hxx>
#include <TopoDS_Wire.hxx>
HYDROGUI_Shape::~HYDROGUI_Shape()
{
- erase();
+ erase( false );
if ( !myShape.IsNull() )
myShape.Nullify();
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) ) )
+ {
+ Handle(HYDROData_Polyline3D) aPolyline =
+ Handle(HYDROData_Polyline3D)::DownCast( myObject );
+
+ TopoDS_Shape aPolylineShape = aPolyline->GetShape3D();
+
+ if ( !aPolylineShape.IsNull() ) {
+ if ( aPolylineShape.ShapeType() == TopAbs_WIRE ) {
+ TopoDS_Wire aPolylineWire = TopoDS::Wire( aPolylineShape );
+ setWire( aPolylineWire, false, false );
+ } else {
+ myTopoShape = aPolylineShape;
+ myDisplayMode = AIS_WireFrame;
+
+ buildShape();
+ updateShape( false, false );
+ }
+ }
+
+ QColor aWireColor = aPolyline->GetBorderColor();
+ setBorderColor( aWireColor, false, false );
}
else if ( myObject->IsKind( STANDARD_TYPE(HYDROData_Zone) ) )
{
TopoDS_Face aZoneFace = TopoDS::Face( aZone->GetShape() );
- // Generate the filling color for zone
- QStringList aGeomObjectsNames;
-
- HYDROData_SequenceOfObjects aRefObjects = aZone->GetGeometryObjects();
- HYDROData_SequenceOfObjects::Iterator anIter( aRefObjects );
- for ( ; anIter.More(); anIter.Next() )
- {
- Handle(HYDROData_Object) aRefbject =
- Handle(HYDROData_Object)::DownCast( anIter.Value() );
- if ( aRefbject.IsNull() )
- continue;
-
- QString aRefObjectName = aRefbject->GetName();
- if ( aRefObjectName.isEmpty() )
- continue;
-
- aGeomObjectsNames.append( aRefObjectName );
- }
-
setFace( aZoneFace, false, false );
if (aZone->IsMergingNeed() && aZone->GetMergeType() == HYDROData_Zone::Merge_UNKNOWN )
{
}
else
{
+ // Generate the filling color for zone
+ QStringList aGeomObjectsNames;
+
+ HYDROData_SequenceOfObjects aRefObjects = aZone->GetGeometryObjects();
+ HYDROData_SequenceOfObjects::Iterator anIter( aRefObjects );
+ for ( ; anIter.More(); anIter.Next() )
+ {
+ Handle(HYDROData_Object) aRefbject =
+ Handle(HYDROData_Object)::DownCast( anIter.Value() );
+ if ( aRefbject.IsNull() )
+ continue;
+
+ QString aRefObjectName = aRefbject->GetName();
+ if ( aRefObjectName.isEmpty() )
+ continue;
+
+ aGeomObjectsNames.append( aRefObjectName );
+ }
+
setFillingColor( HYDROGUI_Tool::GenerateFillingColor( aDocument, aGeomObjectsNames ) );
}
}
setTextureFileName( aTextureFileName, false, false );
setFace( aWire, false, false );
+ isDeactivateSelection = true;
+ }
+ else if ( myObject->IsKind( STANDARD_TYPE(HYDROData_Profile) ) )
+ {
+ Handle(HYDROData_Profile) aProfile =
+ Handle(HYDROData_Profile)::DownCast( myObject );
+
+ TopoDS_Wire aProfileWire;
+
+ if ( aProfile->IsValid() ) {
+ TopoDS_Shape aProfileShape = aProfile->GetShape3D();
+
+ if ( !aProfileShape.IsNull() &&
+ aProfileShape.ShapeType() == TopAbs_WIRE ) {
+ aProfileWire = TopoDS::Wire( aProfileShape );
+ }
+ }
+
+ setWire( aProfileWire, false, false );
+
+ QColor aWireColor = aProfile->GetBorderColor();
+ setBorderColor( aWireColor, false, false );
}
- else if ( myObject->IsKind( STANDARD_TYPE(HYDROData_Obstacle) ) )
+ else if ( myObject->IsKind( STANDARD_TYPE(HYDROData_Stream) ) ||
+ myObject->IsKind( STANDARD_TYPE(HYDROData_Channel) ) ||
+ myObject->IsKind( STANDARD_TYPE(HYDROData_Obstacle) ) )
{
- Handle(HYDROData_Obstacle) anObstacle =
- Handle(HYDROData_Obstacle)::DownCast( myObject );
+ Handle(HYDROData_Object) aGeomObject =
+ Handle(HYDROData_Object)::DownCast( myObject );
+
+ TopoDS_Shape anObjShape = aGeomObject->GetTopShape();
- //TODO BEGIN of the block of code to be reimplemented
- //TODO GetTopShape() to be used in future
- myTopoShape = anObstacle->GetShape3D();
- myDisplayMode = AIS_Shaded;
+ setShape( anObjShape, false, false );
- QColor aFillingColor = anObstacle->GetFillingColor();
- QColor aBorderColor = anObstacle->GetBorderColor();
+ QColor aFillingColor = aGeomObject->GetFillingColor();
+ QColor aBorderColor = aGeomObject->GetBorderColor();
setFillingColor( aFillingColor, false, false );
setBorderColor( aBorderColor, false, false );
+ }
+ else if ( myObject->IsKind( STANDARD_TYPE(HYDROData_DummyObject3D) ) )
+ {
+ Handle(HYDROData_DummyObject3D) anObject3D =
+ Handle(HYDROData_DummyObject3D)::DownCast( myObject );
+ TopoDS_Shape aShape3D = anObject3D->GetShape();
+
+ setShape( aShape3D, false, false );
+
+ 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 );
+
+ TopoDS_Compound aCompound;
+ BRep_Builder aCompoundBuilder;
+ aCompoundBuilder.MakeCompound( aCompound );
+
+ for ( int i = 1, n = aShapes.Length(); i <= n; ++i )
+ {
+ const TopoDS_Shape& aShape = aShapes.Value( i );
+ aCompoundBuilder.Add( aCompound, aShape );
+ }
- buildShape();
- updateShape( false, false );
- //TODO END of the block of code to be reimplemented
+ setShape( aCompound, false, false );
}
}
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
// Erase previously created shape
erase();
- if ( myTopoShape.IsNull() )
+ if ( myTopoShape.IsNull() ) {
+ myShape.Nullify();
return;
+ }
QString aTextureFileName = getTextureFileName();
bool anIsTexture = !aTextureFileName.isEmpty();
myShape = new AIS_Shape( myTopoShape );
}
+ myShape->SetHLRAngleAndDeviation( 0.001 );
+
if ( !myObject.IsNull() )
myShape->SetOwner( myObject );
const Handle(AIS_Drawer)& anAttributes = myShape->Attributes();
if ( !anAttributes.IsNull() )
{
- if ( myDisplayMode == AIS_Shaded )
- {
- Handle(Prs3d_IsoAspect) anIsoAspect = anAttributes->UIsoAspect();
- if ( !anIsoAspect.IsNull() )
- anIsoAspect->SetNumber( 0 );
+ Handle(Prs3d_IsoAspect) anIsoAspect = anAttributes->UIsoAspect();
+ if ( !anIsoAspect.IsNull() ) {
+ anIsoAspect->SetNumber( 0 );
+ anAttributes->SetUIsoAspect( anIsoAspect );
+ }
- anIsoAspect = anAttributes->VIsoAspect();
- if ( !anIsoAspect.IsNull() )
- anIsoAspect->SetNumber( 0 );
+ anIsoAspect = anAttributes->VIsoAspect();
+ if ( !anIsoAspect.IsNull() ) {
+ anIsoAspect->SetNumber( 0 );
+ anAttributes->SetVIsoAspect( anIsoAspect );
+ }
+ if ( myDisplayMode == AIS_Shaded )
+ {
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 )
