X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_Shape.cxx;h=fcbd28bb89f1fafa5ece9fa6c46b8002fdf28cd6;hb=c7917bada8643db80254fe2a3b3a91d25548b484;hp=9cfb65e11cc9093559f82bf6fab8362af137b468;hpb=ff20e1dd36e9bd6e9c6a394d18b740cd5ea63393;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_Shape.cxx b/src/HYDROGUI/HYDROGUI_Shape.cxx index 9cfb65e1..fcbd28bb 100644 --- a/src/HYDROGUI/HYDROGUI_Shape.cxx +++ b/src/HYDROGUI/HYDROGUI_Shape.cxx @@ -20,58 +20,31 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -#include "HYDROGUI_Shape.h" - -#include "HYDROGUI_DataObject.h" -#include "HYDROGUI_Tool.h" - -#include -#include - -#include - -#include -#include -#include - -#include - -#include -#include - +#include +#include #include #include #include -#include #include #include #include #include #include -#include #include #include #include +#include +#include +#include +#include +#include +#include #include -#include #include - +#include #include -#include - -#include - -#include -#include -#include - -#include - -#include -#include - HYDROGUI_Shape::HYDROGUI_Shape( const Handle(AIS_InteractiveContext)& theContext, const Handle(HYDROData_Entity)& theObject, const int theZLayer ) @@ -94,8 +67,41 @@ HYDROGUI_Shape::~HYDROGUI_Shape() if ( !myShape.IsNull() ) myShape.Nullify(); +} + +Handle(AIS_InteractiveContext) HYDROGUI_Shape::getContext() const +{ + return myContext; +} + +Handle(HYDROData_Entity) HYDROGUI_Shape::getObject() const +{ + return myObject; +} + +TopoDS_Shape HYDROGUI_Shape::getTopoShape() const +{ + return myTopoShape; +} - removeTextureFile(); +bool HYDROGUI_Shape::getIsToUpdate() const +{ + return myIsToUpdate; +} + +void HYDROGUI_Shape::setIsToUpdate( bool theState ) +{ + myIsToUpdate = theState; +} + +bool HYDROGUI_Shape::isVisible() const +{ + return myIsVisible; +} + +Handle(AIS_InteractiveObject) HYDROGUI_Shape::getAISObject() const +{ + return myShape; } void HYDROGUI_Shape::display( const bool theIsUpdateViewer ) @@ -114,15 +120,15 @@ void HYDROGUI_Shape::erase( const bool theIsUpdateViewer ) myContext->Erase( myShape, theIsUpdateViewer ); } -void HYDROGUI_Shape::update( const bool theIsUpdateViewer, - const bool theIsDisplayOnTop ) +void HYDROGUI_Shape::update( bool isUpdateViewer, + bool isDeactivateSelection ) + { setIsToUpdate( false ); if ( myContext.IsNull() ) return; - bool isDeactivateSelection = false; // Try to retrieve information from object if ( !myObject.IsNull() ) { @@ -137,10 +143,11 @@ void HYDROGUI_Shape::update( const bool theIsUpdateViewer, if ( !aZoneShape.IsNull() ) { if ( aZoneShape.ShapeType() == TopAbs_FACE ) { TopoDS_Face aZoneFace = TopoDS::Face( aZoneShape ); - setFace( aZoneFace, false, false ); + setFace( aZoneFace, false, false, "" ); } else { myTopoShape = aZoneShape; - myDisplayMode = myTextureFileName.isEmpty() ? AIS_Shaded : AIS_Shaded+2; + //TODO: myDisplayMode = myTextureFileName.isEmpty() ? AIS_Shaded : AIS_Shaded+2; + myDisplayMode = AIS_Shaded; buildShape(); updateShape( false, false ); @@ -166,7 +173,9 @@ void HYDROGUI_Shape::update( const bool theIsUpdateViewer, setWire( aPolylineWire, false, false ); } else { myTopoShape = aPolylineShape; - myDisplayMode = AIS_WireFrame; + // 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 ). + myDisplayMode = AIS_Shaded; buildShape(); updateShape( false, false ); @@ -189,7 +198,9 @@ void HYDROGUI_Shape::update( const bool theIsUpdateViewer, setWire( aPolylineWire, false, false ); } else { myTopoShape = aPolylineShape; - myDisplayMode = AIS_WireFrame; + // 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 ). + myDisplayMode = AIS_Shaded; buildShape(); updateShape( false, false ); @@ -206,7 +217,7 @@ void HYDROGUI_Shape::update( const bool theIsUpdateViewer, TopoDS_Face aZoneFace = TopoDS::Face( aZone->GetShape() ); - setFace( aZoneFace, false, false ); + setFace( aZoneFace, false, false, "" ); if (aZone->IsMergingNeed() && aZone->GetMergeType() == HYDROData_Zone::Merge_UNKNOWN ) { // Red color for a zone with bathymetry conflict @@ -236,84 +247,6 @@ void HYDROGUI_Shape::update( const bool theIsUpdateViewer, setFillingColor( HYDROGUI_Tool::GenerateFillingColor( aDocument, aGeomObjectsNames ) ); } } - else if ( myObject->IsKind( STANDARD_TYPE(HYDROData_Image) ) ) - { - Handle(HYDROData_Image) anImageObj = - Handle(HYDROData_Image)::DownCast( myObject ); - - removeTextureFile(); - - QString aTextureFileName = generateTextureFileName( anImageObj ); - - QImage anImage = anImageObj->Image(); - QString aFilePath = anImageObj->GetFilePath(); - QTransform aTrsf = anImageObj->Trsf(); - - int aWidth = anImage.width(); - int aHeight = anImage.height(); - - QString anImageError = ""; - - QTransform anInversion = QTransform::fromScale( -1, -1 ); - anImage = anImage.transformed( anInversion * aTrsf, Qt::SmoothTransformation ); - - if ( anImage.isNull() ) - anImageError = QObject::tr( "IMAGE_TRANSFORMATION_CAN_NOT_BE_APPLYED" ); - else - { - // Workaround: Scale the texture image to the nearest width multiple 4 due to the CASCADE bug 23813 - int aTrsfWidth = anImage.width(); - int aDelta = aTrsfWidth % 4; - if ( aDelta > 0 ) - { - aTrsfWidth += ( 4 - aDelta ); - } - anImage = anImage.scaledToWidth( aTrsfWidth ); - - // temporary optimization, to reduce the saved image size (and the texture quality) - QImage anImageToSave = anImage; //RKV:reduceTexture( anImage, 500 ); - - bool isSaved = anImageToSave.save( aTextureFileName ); - if ( !isSaved ) - anImageError = QObject::tr( "FILE_CAN_NOT_BE_CREATED" ).arg( aTextureFileName ); - } - - if ( !anImageError.isEmpty() ) - { - SUIT_MessageBox::warning( 0, QObject::tr( "SHAPE_IMAGE_ERROR" ), - QObject::tr( "IMAGE_CAN_NOT_BE_CREATED" ) + anImageError ); - } - - QPointF aPoint1( 0, 0 ); // 1: top left - QPointF aPoint2( aWidth, 0 ); // 2: top right - QPointF aPoint3( aWidth, aHeight ); // 3: bottom right - QPointF aPoint4( 0, aHeight ); // 4: bottom left - - aPoint1 = aTrsf.map( aPoint1 ); - aPoint2 = aTrsf.map( aPoint2 ); - aPoint3 = aTrsf.map( aPoint3 ); - aPoint4 = aTrsf.map( aPoint4 ); - - QPolygonF aPolygon = QPolygonF() << aPoint1 << aPoint2 << aPoint3 << aPoint4; - QRectF aRect = aPolygon.boundingRect(); - - gp_Pnt aPnt1( aRect.topLeft().x(), aRect.topLeft().y(), 0 ); - gp_Pnt aPnt2( aRect.topRight().x(), aRect.topRight().y(), 0 ); - gp_Pnt aPnt3( aRect.bottomRight().x(), aRect.bottomRight().y(), 0 ); - gp_Pnt aPnt4( aRect.bottomLeft().x(), aRect.bottomLeft().y(), 0 ); - - TopoDS_Edge anEdge1 = BRepBuilderAPI_MakeEdge( aPnt1, aPnt2 ).Edge(); - TopoDS_Edge anEdge2 = BRepBuilderAPI_MakeEdge( aPnt2, aPnt3 ).Edge(); - TopoDS_Edge anEdge3 = BRepBuilderAPI_MakeEdge( aPnt3, aPnt4 ).Edge(); - TopoDS_Edge anEdge4 = BRepBuilderAPI_MakeEdge( aPnt4, aPnt1 ).Edge(); - - TopoDS_Wire aWire = BRepBuilderAPI_MakeWire( anEdge1, anEdge2, anEdge3, anEdge4 ).Wire(); - aWire.Closed( true ); - - setTextureFileName( aTextureFileName, false, false ); - setFace( aWire, false, false ); - isDeactivateSelection = true; - } else if ( myObject->IsKind( STANDARD_TYPE(HYDROData_Profile) ) ) { Handle(HYDROData_Profile) aProfile = @@ -391,18 +324,7 @@ void HYDROGUI_Shape::update( const bool theIsUpdateViewer, if ( myShape.IsNull() || !isVisible() ) return; - displayShape( theIsUpdateViewer ); - // the following code is not necessary if the Z layer is set for the shape - if ( myZLayer && 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 ); - } - } + displayShape( isUpdateViewer ); if (isDeactivateSelection) myContext->Deactivate(myShape); @@ -451,7 +373,9 @@ void HYDROGUI_Shape::setWire( const TopoDS_Wire& theWire, const bool theIsUpdateViewer ) { myTopoShape = theWire; - myDisplayMode = AIS_WireFrame; + // 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 ). + myDisplayMode = AIS_Shaded; buildShape(); updateShape( theToDisplay, theIsUpdateViewer ); @@ -488,23 +412,25 @@ void HYDROGUI_Shape::setFaces( const TopoDS_Compound& theWires, void HYDROGUI_Shape::setFace( const TopoDS_Wire& theWire, const bool theToDisplay, - const bool theIsUpdateViewer ) + const bool theIsUpdateViewer, + const QString& theTextureFileName ) { BRepBuilderAPI_MakeFace aFaceBuilder( theWire, Standard_True ); aFaceBuilder.Build(); if( aFaceBuilder.IsDone() ) { TopoDS_Face aFace = aFaceBuilder.Face(); - setFace( aFace, theToDisplay, theIsUpdateViewer ); + setFace( aFace, theToDisplay, theIsUpdateViewer, theTextureFileName ); } } void HYDROGUI_Shape::setFace( const TopoDS_Face& theFace, const bool theToDisplay, - const bool theIsUpdateViewer ) + const bool theIsUpdateViewer, + const QString& theTextureFileName ) { myTopoShape = theFace; - myDisplayMode = myTextureFileName.isEmpty() ? AIS_Shaded : AIS_Shaded+2; + myDisplayMode = theTextureFileName.isEmpty() ? AIS_Shaded : AIS_Shaded+2; //Note: AIS_Shaded+2 is the same as AIS_ExactHLR //TODO: it would be more suitable to use TexturedShape mode from GEOM_AISShape @@ -559,19 +485,6 @@ QColor HYDROGUI_Shape::getHighlightColor() const return myHighlightColor; } -void HYDROGUI_Shape::setTextureFileName( const QString& theFileName, - const bool theToDisplay, - const bool theIsUpdateViewer ) -{ - myTextureFileName = theFileName; - updateShape( theToDisplay, theIsUpdateViewer ); -} - -QString HYDROGUI_Shape::getTextureFileName() const -{ - return myTextureFileName; -} - void HYDROGUI_Shape::setZLayer( const int theZLayer ) { if ( myZLayer == theZLayer ) @@ -582,29 +495,26 @@ void HYDROGUI_Shape::setZLayer( const int theZLayer ) myContext->SetZLayer( myShape, myZLayer ); } +Handle_AIS_InteractiveObject HYDROGUI_Shape::createShape() const +{ + if( myTopoShape.IsNull() ) + return Handle_AIS_InteractiveObject(); + else + return new AIS_Shape( myTopoShape ); +} + void HYDROGUI_Shape::buildShape() { // Erase previously created shape erase(); - if ( myTopoShape.IsNull() ) { - myShape.Nullify(); + myShape = createShape(); + if( myShape.IsNull() ) return; - } - QString aTextureFileName = getTextureFileName(); - bool anIsTexture = !aTextureFileName.isEmpty(); - - if ( anIsTexture ) - { - myShape = new AIS_TexturedShape( myTopoShape ); - } - else - { - myShape = new AIS_Shape( myTopoShape ); - } - - myShape->SetHLRAngleAndDeviation( 0.001 ); + Handle_AIS_Shape anAISShape = Handle_AIS_Shape::DownCast( myShape ); + if( !anAISShape.IsNull() ) + anAISShape ->SetHLRAngleAndDeviation( 0.001 ); if ( !myObject.IsNull() ) myShape->SetOwner( myObject ); @@ -612,18 +522,6 @@ void HYDROGUI_Shape::buildShape() myShape->SetTransparency( 0 ); myShape->SetDisplayMode( (AIS_DisplayMode)myDisplayMode ); - if( anIsTexture ) - { - Handle(AIS_TexturedShape) aTexturedShape = - Handle(AIS_TexturedShape)::DownCast( myShape ); - - aTexturedShape->SetTextureFileName( HYDROGUI_Tool::ToAsciiString( aTextureFileName ) ); - aTexturedShape->SetTextureMapOn(); - // Just use the texture image as is - aTexturedShape->DisableTextureModulate(); - aTexturedShape->SetTextureRepeat( false ); // don't repeat the texture image on the face - } - // Init default params for shape const Handle(AIS_Drawer)& anAttributes = myShape->Attributes(); if ( !anAttributes.IsNull() ) @@ -731,74 +629,40 @@ void HYDROGUI_Shape::colorShapeBorder( const QColor& theColor ) getQuantityColorVal( theColor.green() ), getQuantityColorVal( theColor.blue() ), Quantity_TOC_RGB ); - if ( myDisplayMode == AIS_Shaded ) + + if( !myTopoShape.IsNull() ) { - if ( theColor.alpha() == 0 ) + if ( myTopoShape.ShapeType() == TopAbs_WIRE ) // Note that we display polylines in shaded mode { - anAttributes->SetFaceBoundaryDraw( false ); + myShape->SetColor( aBorderColor ); } - else + else if ( myDisplayMode == AIS_Shaded ) { - anAttributes->SetFaceBoundaryDraw( true ); - - Handle(Prs3d_LineAspect) aBoundaryAspect = anAttributes->FaceBoundaryAspect(); - if ( !aBoundaryAspect.IsNull() ) + if ( theColor.alpha() == 0 ) { - aBoundaryAspect->SetColor( aBorderColor ); - anAttributes->SetFaceBoundaryAspect( aBoundaryAspect ); + 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 ); + } } } - } - else if ( myDisplayMode == AIS_WireFrame ) - { - myShape->SetColor( aBorderColor ); - } -} - -QString HYDROGUI_Shape::generateTextureFileName( const Handle(HYDROData_Entity)& theImageObj ) -{ - QString aResult; - if( !theImageObj.IsNull() ) - { - QString aTempDir = HYDROGUI_Tool::GetTempDir( true ); - - int aStudyId = HYDROGUI_Tool::GetActiveStudyId(); - QString aPrefix = QString( "image_%1" ).arg( aStudyId ); - - QString anEntry = HYDROGUI_DataObject::dataObjectEntry( theImageObj, false ); - anEntry.replace( ':', '_' ); - - QString anExtension = "bmp"; - - aResult = QString( "%1/%2_%3.%4" ).arg( aTempDir, aPrefix, anEntry, anExtension ); - } - return aResult; -} - -void HYDROGUI_Shape::removeTextureFile() const -{ - QFile aFile( getTextureFileName() ); - if( aFile.exists() ) - aFile.remove(); -} - -QImage HYDROGUI_Shape::reduceTexture( const QImage& theImage, const int theSizeLimit ) -{ - double aSizeLimit = (double)theSizeLimit; - double aWidth = (double)theImage.width(); - double aHeight = (double)theImage.height(); - if( aWidth > aSizeLimit || aHeight > aSizeLimit ) - { - if( aWidth > aHeight ) - { - aHeight /= ( aWidth / aSizeLimit ); - aWidth = aSizeLimit; - } - else + else if ( myDisplayMode == AIS_WireFrame ) { - aWidth /= ( aHeight / aSizeLimit ); - aHeight = aSizeLimit; + myShape->SetColor( aBorderColor ); } } - return theImage.scaled( aWidth, aHeight, Qt::KeepAspectRatio, Qt::SmoothTransformation ); }