patch for install error on Linux

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_Shape.cxx

diff --git a/src/HYDROGUI/HYDROGUI_Shape.cxx b/src/HYDROGUI/HYDROGUI_Shape.cxx
index 4c3986651b2b24406a64e0d7303cde6eefcd471c..ac85dfbf182df46ad22e4ca92d738c422f46c9d7 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_Shape.cxx
+++ b/src/HYDROGUI/HYDROGUI_Shape.cxx
@@ -19,6 +19,7 @@
 #include <HYDROGUI_Shape.h>
 #include <HYDROGUI_Tool.h>
 #include <HYDROGUI_Polyline.h>
+#include <HYDROGUI_AISShape.h>
 
 #include <HYDROData_Channel.h>
 #include <HYDROData_Document.h>
@@ -33,12 +34,9 @@
 #include <HYDROData_Zone.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>
@@ -167,11 +165,15 @@ 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 ).
@@ -218,7 +220,7 @@ void HYDROGUI_Shape::update( bool isUpdateViewer,
       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 );
@@ -422,10 +424,11 @@ void HYDROGUI_Shape::setFace( const TopoDS_Face& theFace,
 
 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 );
@@ -497,14 +500,14 @@ Handle_AIS_InteractiveObject HYDROGUI_Shape::createShape() const
   if ( aShapeType==TopAbs_EDGE || aShapeType==TopAbs_WIRE || IsWireEdgeCompound) {
     return new HYDROGUI_Polyline( myTopoShape );
   } else {
-    return new AIS_Shape( myTopoShape );
+    return new HYDROGUI_AISShape( myTopoShape );
   }
 }
 
 void HYDROGUI_Shape::buildShape()
 {
   // Erase previously created shape
-  erase();
+  erase(false);
 
   myShape = createShape();
   if( myShape.IsNull() )
@@ -533,23 +536,15 @@ void HYDROGUI_Shape::buildShape()
     }
       
     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 )
     {
@@ -567,27 +562,22 @@ void HYDROGUI_Shape::updateShape( const bool theToDisplay,
   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() )
@@ -668,27 +658,9 @@ void HYDROGUI_Shape::colorShapeBorder( const QColor& theColor )
     }
     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 )
     {