X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_Shape.cxx;h=4d015a5c52035044665c62b4f321b1088ce480fe;hb=eeffb740f746146cb11bb55d6cb00146ac0832e9;hp=60962d74b4c78ad4418c94c0adfa31cfce3f8b1c;hpb=6268f378eaa5e3763ea8d4536eb012d259c1dbcb;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_Shape.cxx b/src/HYDROGUI/HYDROGUI_Shape.cxx
index 60962d74..4d015a5c 100644
--- a/src/HYDROGUI/HYDROGUI_Shape.cxx
+++ b/src/HYDROGUI/HYDROGUI_Shape.cxx
@@ -18,6 +18,8 @@
 
 #include <HYDROGUI_Shape.h>
 #include <HYDROGUI_Tool.h>
+#include <HYDROGUI_Polyline.h>
+
 #include <HYDROData_Channel.h>
 #include <HYDROData_Document.h>
 #include <HYDROData_DummyObject3D.h>
@@ -29,7 +31,7 @@
 #include <HYDROData_ShapesGroup.h>
 #include <HYDROData_Stream.h>
 #include <HYDROData_Zone.h>
-#include <HYDROGUI_Polyline.h>
+#include <HYDROData_LandCover.h>
 
 #include <AIS_Shape.hxx>
 #include <BRep_Builder.hxx>
@@ -298,6 +300,22 @@ void HYDROGUI_Shape::update( bool isUpdateViewer,
 
       setShape( aCompound, false, false );  
     }
+    else if ( myObject->IsKind( STANDARD_TYPE(HYDROData_LandCover) ) )
+    {
+      Handle(HYDROData_LandCover) aLandCoverObj =
+        Handle(HYDROData_LandCover)::DownCast( myObject );
+
+      TopoDS_Shape aLandCoverShape = aLandCoverObj->GetShape();
+      if ( !aLandCoverShape.IsNull() ) {
+        setShape( aLandCoverShape, false, false );
+      }
+
+      QColor aFillingColor = aLandCoverObj->GetFillingColor();
+      QColor aBorderColor = aLandCoverObj->GetBorderColor();
+
+      setFillingColor( aFillingColor, false, false );
+      setBorderColor( aBorderColor, false, false );
+    }
   }
  
   if ( myShape.IsNull() || !isVisible() )
@@ -481,7 +499,17 @@ Handle_AIS_InteractiveObject HYDROGUI_Shape::createShape() const
   }
 
   TopAbs_ShapeEnum aShapeType = myTopoShape.ShapeType();
-  if ( aShapeType==TopAbs_EDGE || aShapeType==TopAbs_WIRE ) {
+  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 AIS_Shape( myTopoShape );