X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_Shape.cxx;h=37eaf35001c6050e1f74bab38968ac0aaa59cef9;hb=a1431f03eac1d1aed4203d0568d987c41ce939b3;hp=4ddd3b2dde6b17d497a192e5c6419cb0a788c40a;hpb=06a6e19d03f1d202e3a58042fdf1abc1000b7c2c;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_Shape.cxx b/src/HYDROGUI/HYDROGUI_Shape.cxx
index 4ddd3b2d..37eaf350 100644
--- a/src/HYDROGUI/HYDROGUI_Shape.cxx
+++ b/src/HYDROGUI/HYDROGUI_Shape.cxx
@@ -39,12 +39,15 @@
 
 #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>
 
@@ -83,7 +86,7 @@ HYDROGUI_Shape::HYDROGUI_Shape( const Handle(AIS_InteractiveContext)& theContext
 
 HYDROGUI_Shape::~HYDROGUI_Shape()
 {
-  erase();
+  erase( false );
 
   if ( !myShape.IsNull() )
     myShape.Nullify();
@@ -114,6 +117,7 @@ void HYDROGUI_Shape::update( const bool theIsUpdateViewer )
   if ( myContext.IsNull() )
     return;
 
+  bool isDeactivateSelection = false;
   // Try to retrieve information from object
   if ( !myObject.IsNull() )
   {
@@ -163,6 +167,32 @@ void HYDROGUI_Shape::update( const bool theIsUpdateViewer )
           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) ) )
     {
@@ -267,26 +297,7 @@ void HYDROGUI_Shape::update( const bool theIsUpdateViewer )
 
       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) ) )
     {
@@ -305,43 +316,71 @@ void HYDROGUI_Shape::update( const bool theIsUpdateViewer )
       }
 
       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 );
+      Handle(HYDROData_DummyObject3D) anObject3D =
+        Handle(HYDROData_DummyObject3D)::DownCast( myObject );
+      TopoDS_Shape aShape3D = anObject3D->GetShape();
 
-      TopoDS_Face aChannelShape = TopoDS::Face( aChannel->GetTopShape() );
+      setShape( aShape3D, false, false );
 
-      setShape( aChannelShape, 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 (isDeactivateSelection)
+    myContext->Deactivate(myShape);
 }
 
 void HYDROGUI_Shape::setVisible( const bool theState,
@@ -361,7 +400,7 @@ 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;
@@ -372,7 +411,7 @@ void HYDROGUI_Shape::highlight( bool theIsHighlight )
     return;
 
   colorShapeBorder( getActiveColor() );
-  myContext->Display( myShape );
+  myContext->Display( myShape, isUpdateViewer );
 }
 
 bool HYDROGUI_Shape::isHighlighted() const
@@ -655,7 +694,10 @@ void HYDROGUI_Shape::colorShapeBorder( const QColor& theColor )
 
       Handle(Prs3d_LineAspect) aBoundaryAspect = anAttributes->FaceBoundaryAspect();
       if ( !aBoundaryAspect.IsNull() )
+      {
         aBoundaryAspect->SetColor( aBorderColor );
+        anAttributes->SetFaceBoundaryAspect( aBoundaryAspect );
+      }
     }
   }
   else if ( myDisplayMode == AIS_WireFrame )