-// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// Copyright (C) 2014-2015 EDF-R&D
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
#include <HYDROGUI_Shape.h>
#include <HYDROGUI_Tool.h>
+#include <HYDROGUI_Polyline.h>
+#include <HYDROGUI_AISShape.h>
+
#include <HYDROData_Channel.h>
#include <HYDROData_Document.h>
#include <HYDROData_DummyObject3D.h>
#include <HYDROData_ShapesGroup.h>
#include <HYDROData_Stream.h>
#include <HYDROData_Zone.h>
-#include <HYDROGUI_PrsShape.h>
+#include <HYDROData_LandCoverMap.h>
-#include <AIS_Shape.hxx>
#include <BRep_Builder.hxx>
#include <BRepBuilderAPI_MakeFace.hxx>
-#include <Graphic3d_AspectFillArea3d.hxx>
#include <Prs3d_IsoAspect.hxx>
-#include <Prs3d_ShadingAspect.hxx>
#include <TopoDS.hxx>
#include <TopoDS_Face.hxx>
#include <TopoDS_Wire.hxx>
myHighlightColor( Qt::white ),
myIsToUpdate( false ),
myIsVisible( true ),
- myDisplayMode( AIS_Shaded )
+ myDisplayMode( AIS_Shaded ),
+ mySelectionMode( AIS_Shape::SelectionMode( TopAbs_SHAPE ) )
{
}
if ( myContext.IsNull() || myShape.IsNull() )
return;
- myContext->Erase( myShape, theIsUpdateViewer );
+ eraseShape( theIsUpdateViewer );
}
void HYDROGUI_Shape::update( bool isUpdateViewer,
TopoDS_Shape aPolylineShape = aPolyline->GetShape();
- if ( !aPolylineShape.IsNull() ) {
- if ( aPolylineShape.ShapeType() == TopAbs_WIRE ) {
+ if ( !aPolylineShape.IsNull() )
+ {
+ if ( aPolylineShape.ShapeType() == TopAbs_WIRE )
+ {
TopoDS_Wire aPolylineWire = TopoDS::Wire( aPolylineShape );
setWire( aPolylineWire, false, false );
- } else {
+ }
+ else
+ {
myTopoShape = aPolylineShape;
// Set shading mode to avoid that hilight presentation is equal to "normal" object presentation.
// Note that hilight presentation is always to be on top ( i.e. in the top Z layer ).
TopoDS_Face aZoneFace = TopoDS::Face( aZone->GetShape() );
setFace( aZoneFace, false, false, "" );
- if (aZone->IsMergingNeed() && aZone->GetMergeType() == HYDROData_Zone::Merge_UNKNOWN )
+ if( aZone->IsMergingNeed() && aZone->GetMergeType() == HYDROData_Zone::Merge_UNKNOWN )
{
// Red color for a zone with bathymetry conflict
setFillingColor( Qt::red );
}
else
{
- // Set the filling color for zone
- setFillingColor( aZone->GetColor(HYDROData_ImmersibleZone::DefaultFillingColor()) );
+ // Set the filling color for zone
+ setFillingColor( aZone->GetColor( Qt::darkBlue ) );
}
}
else if ( myObject->IsKind( STANDARD_TYPE(HYDROData_Profile) ) )
displayShape( theIsUpdateViewer );
}
else
- myContext->Erase( myShape, theIsUpdateViewer );
+ eraseShape( theIsUpdateViewer );
}
void HYDROGUI_Shape::highlight( bool theIsHighlight, bool isUpdateViewer )
void HYDROGUI_Shape::setShape( const TopoDS_Shape& theShape,
const bool theToDisplay,
- const bool theIsUpdateViewer )
+ const bool theIsUpdateViewer,
+ const int theDisplayMode )
{
myTopoShape = theShape;
- myDisplayMode = AIS_Shaded;
+ myDisplayMode = theDisplayMode;
buildShape();
updateShape( theToDisplay, theIsUpdateViewer );
void HYDROGUI_Shape::setBorderColor( const QColor& theColor,
const bool theToDisplay,
const bool theIsUpdateViewer )
-{
+{
myBorderColor = theColor;
updateShape( theToDisplay, theIsUpdateViewer );
}
Handle_AIS_InteractiveObject HYDROGUI_Shape::createShape() const
{
- if( myTopoShape.IsNull() )
+ if( myTopoShape.IsNull() ) {
return Handle_AIS_InteractiveObject();
- else
- if ( myObject->IsKind( STANDARD_TYPE(HYDROData_PolylineXY) ) ||
- myObject->IsKind( STANDARD_TYPE(HYDROData_Polyline3D)) ||
- myObject->IsKind( STANDARD_TYPE(HYDROData_Profile) ))
- return new HYDROGUI_PrsShape(myTopoShape);
- else
- return new AIS_Shape( myTopoShape );
+ }
+
+ TopAbs_ShapeEnum aShapeType = myTopoShape.ShapeType();
+ bool IsWireEdgeCompound = aShapeType==TopAbs_COMPOUND;
+ if (IsWireEdgeCompound) {
+ TopoDS_Iterator itr(myTopoShape);
+ while (itr.More() && IsWireEdgeCompound) {
+ if (itr.Value().ShapeType() != TopAbs_WIRE && itr.Value().ShapeType() != TopAbs_EDGE)
+ IsWireEdgeCompound = false;
+ itr.Next();
+ }
+ }
+
+ if ( aShapeType==TopAbs_EDGE || aShapeType==TopAbs_WIRE || IsWireEdgeCompound) {
+ return new HYDROGUI_Polyline( myTopoShape );
+ } else {
+ return new HYDROGUI_AISShape( myTopoShape );
+ }
}
void HYDROGUI_Shape::buildShape()
if ( !myObject.IsNull() )
myShape->SetOwner( myObject );
- myShape->SetTransparency( 0 );
+ if ( !myObject.IsNull() && !myObject->IsKind( STANDARD_TYPE(HYDROData_LandCoverMap) ) )
+ myShape->SetTransparency( 0 );
myShape->SetDisplayMode( (AIS_DisplayMode)myDisplayMode );
+ myShape->SetSelectionMode( (Standard_Integer)mySelectionMode );
// Init default params for shape
- const Handle(AIS_Drawer)& anAttributes = myShape->Attributes();
+ const Handle(Prs3d_Drawer)& anAttributes = myShape->Attributes();
if ( !anAttributes.IsNull() )
{
Handle(Prs3d_IsoAspect) anIsoAspect = anAttributes->UIsoAspect();
}
anIsoAspect = anAttributes->VIsoAspect();
- if ( !anIsoAspect.IsNull() ) {
+ 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( Graphic3d_NOM_PLASTIC );
- //aMatAspect.SetAmbient( 1 );
- //aMatAspect.SetDiffuse( 0 );
-
- aShadingAspect->Aspect()->SetFrontMaterial( aMatAspect );
- aShadingAspect->Aspect()->SetBackMaterial( aMatAspect );
- }
+ myShape->SetMaterial( Graphic3d_NOM_PLASTIC );
}
else if ( myDisplayMode == AIS_WireFrame )
{
if ( myShape.IsNull() )
return;
- const Handle(AIS_Drawer)& anAttributes = myShape->Attributes();
+ const Handle(Prs3d_Drawer)& anAttributes = myShape->Attributes();
if ( !anAttributes.IsNull() )
{
- if ( myDisplayMode == AIS_Shaded )
+ if ( myDisplayMode == AIS_Shaded && myFillingColor.isValid() )
{
- // Coloring face filling
- Handle(Prs3d_ShadingAspect) aShadingAspect = anAttributes->ShadingAspect();
- if ( !aShadingAspect.IsNull() )
- {
- Quantity_Color aFillingColor( getQuantityColorVal( myFillingColor.red() ),
- getQuantityColorVal( myFillingColor.green() ),
- getQuantityColorVal( myFillingColor.blue() ),
- Quantity_TOC_RGB );
+ Quantity_Color aFillingColor( getQuantityColorVal( myFillingColor.red() ),
+ getQuantityColorVal( myFillingColor.green() ),
+ getQuantityColorVal( myFillingColor.blue() ),
+ Quantity_TOC_RGB );
- aShadingAspect->SetColor( aFillingColor );
- aShadingAspect->SetTransparency( 1 - getQuantityColorVal( myFillingColor.alpha() ) );
- }
+ myShape->SetColor( aFillingColor );
+ myShape->SetTransparency( 1 - getQuantityColorVal( myFillingColor.alpha() ) );
}
else if ( myDisplayMode == AIS_WireFrame )
{
}
// Coloring borders
- colorShapeBorder( getActiveColor() );
+ colorShapeBorder( myBorderColor );
}
if ( !theToDisplay || !isVisible() || myContext.IsNull() )
void HYDROGUI_Shape::displayShape( const bool theIsUpdateViewer )
{
- myContext->Display( myShape, Standard_False );
+ if ( myContext->HasOpenedContext() && mySelectionMode > 0 )
+ myContext->CloseLocalContext();
+
+ if ( mySelectionMode > 0 )
+ // Display object in local context with selection
+ myContext->Display( myShape, myDisplayMode, mySelectionMode, Standard_False, Standard_False );
+ else
+ {
+ if ( !myContext->HasOpenedContext() )
+ // Ordinary display of object published in the Object Browser
+ myContext->Display( myShape, Standard_False );
+ else
+ // Display object in local context without selection
+ myContext->Display( myShape, myDisplayMode, -1, Standard_False, Standard_False );
+ }
+
+ if ( mySelectionMode > 0 )
+ {
+ myContext->OpenLocalContext();
+ myContext->Activate( myShape, mySelectionMode, Standard_True );
+ }
if ( myZLayer >= 0 )
myContext->SetZLayer( myShape, myZLayer );
- myContext->UpdateCurrentViewer();
+ if ( theIsUpdateViewer ) {
+ myContext->UpdateCurrentViewer();
+ }
+}
+
+void HYDROGUI_Shape::eraseShape( const bool theIsUpdateViewer )
+{
+ if ( myContext->HasOpenedContext() && mySelectionMode > 0 )
+ myContext->CloseLocalContext();
+
+ myContext->Erase( myShape, theIsUpdateViewer );
}
QColor HYDROGUI_Shape::getActiveColor() const
if ( myShape.IsNull() )
return;
- const Handle(AIS_Drawer)& anAttributes = myShape->Attributes();
+ const Handle(Prs3d_Drawer)& anAttributes = myShape->Attributes();
if ( anAttributes.IsNull() )
return;
}
else if ( myDisplayMode == AIS_Shaded )
{
- if ( theColor.alpha() == 0 )
- {
- anAttributes->SetFaceBoundaryDraw( false );
- }
- else
- {
- anAttributes->SetFaceBoundaryDraw( true );
-
- Handle(Prs3d_LineAspect) aBoundaryAspect = anAttributes->FaceBoundaryAspect();
- if ( !aBoundaryAspect.IsNull() )
- {
- aBoundaryAspect->SetColor( aBorderColor );
- anAttributes->SetFaceBoundaryAspect( aBoundaryAspect );
- }
- Handle(Prs3d_LineAspect) aWireAspect = anAttributes->WireAspect();
- if ( !aWireAspect.IsNull() )
- {
- aWireAspect->SetColor( aBorderColor );
- anAttributes->SetWireAspect( aWireAspect );
- }
- }
+ Handle(HYDROGUI_AISShape) aShape = Handle(HYDROGUI_AISShape)::DownCast( myShape );
+ if( !aShape.IsNull() )
+ aShape->SetBorderColor( aBorderColor );
}
else if ( myDisplayMode == AIS_WireFrame )
{
{
myDisplayMode = theDisplayMode;
}
+
+void HYDROGUI_Shape::setSelectionMode( int theSelectionMode )
+{
+ mySelectionMode = theSelectionMode;
+}
\ No newline at end of file
