refs #327 - Polyline is not shown during creation

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

diff --git a/src/HYDROGUI/HYDROGUI_Shape.cxx b/src/HYDROGUI/HYDROGUI_Shape.cxx
index ca88fc01f75ba050ebd222463b41c5630578fd48..3fed9548be2099543ba4eae17dc31127256af861 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_Shape.cxx
+++ b/src/HYDROGUI/HYDROGUI_Shape.cxx
@@ -250,26 +250,36 @@ void HYDROGUI_Shape::update( const bool theIsUpdateViewer,
       int aWidth = anImage.width();
       int aHeight = anImage.height();
 
+      QString anImageError = "";
+
       QTransform anInversion = QTransform::fromScale( -1, -1 );
       anImage = anImage.transformed( anInversion * aTrsf, Qt::SmoothTransformation );
 
-      // 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 )
+      if ( anImage.isNull() )
+        anImageError = QObject::tr( "IMAGE_TRANSFORMATION_CAN_NOT_BE_APPLYED" );
+      else
       {
-        aTrsfWidth += ( 4 - aDelta );
-      }
-      anImage = anImage.scaledToWidth( aTrsfWidth );
+        // 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 );
 
-      // 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 );
+      }
 
-      bool isSaved = anImageToSave.save( aTextureFileName );
-      if ( !isSaved ) {
-        QString aTitle = QObject::tr( "FILE_ERROR" );
-        QString aMessage = QObject::tr( "FILE_CAN_NOT_BE_CREATED" ).arg( aTextureFileName );
-        SUIT_MessageBox::warning( 0, aTitle, aMessage );
+      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
@@ -362,19 +372,17 @@ void HYDROGUI_Shape::update( const bool theIsUpdateViewer,
       TopTools_SequenceOfShape aShapes;
       aShapesGroup->GetShapes( aShapes );
 
-      BRepBuilderAPI_MakeWire aMakeWire;
+      TopoDS_Compound aCompound;
+      BRep_Builder aCompoundBuilder;
+      aCompoundBuilder.MakeCompound( aCompound );
 
       for ( int i = 1, n = aShapes.Length(); i <= n; ++i )
       {
-        TopoDS_Edge anEdge = TopoDS::Edge( aShapes.Value( i ) );
-        aMakeWire.Add( anEdge );
+        const TopoDS_Shape& aShape = aShapes.Value( i );
+        aCompoundBuilder.Add( aCompound, aShape );
       }
 
-      aMakeWire.Build();
-      TopoDS_Wire aResWire = aMakeWire.Wire();
-
-      setWire( aResWire, false, false );  
-      setBorderColor( Qt::red, false, false );
+      setShape( aCompound, false, false );  
     }
   }
  
@@ -400,14 +408,15 @@ void HYDROGUI_Shape::update( const bool theIsUpdateViewer,
 void HYDROGUI_Shape::setVisible( const bool theState,
                                  const bool theIsUpdateViewer )
 {
-  if ( myIsVisible == theState )
-    return;
-
   myIsVisible = theState;
 
   if ( myShape.IsNull() )
     return;
 
+  if ( ( myIsVisible && myContext->IsDisplayed( myShape ) ) ||
+       ( !myIsVisible && !myContext->IsDisplayed( myShape ) ) )
+    return;
+
   if ( myIsVisible )
     myContext->Display( myShape, theIsUpdateViewer );
   else
@@ -581,6 +590,8 @@ void HYDROGUI_Shape::buildShape()
     myShape = new AIS_Shape( myTopoShape );
   }
 
+  myShape->SetHLRAngleAndDeviation( 0.001 );
+
   if ( !myObject.IsNull() )
     myShape->SetOwner( myObject );
 
@@ -620,9 +631,9 @@ void HYDROGUI_Shape::buildShape()
       Handle(Prs3d_ShadingAspect) aShadingAspect = anAttributes->ShadingAspect();
       if ( !aShadingAspect.IsNull() )
       {
-        Graphic3d_MaterialAspect aMatAspect;
-        aMatAspect.SetAmbient( 1 );
-        aMatAspect.SetDiffuse( 0 );
+        Graphic3d_MaterialAspect aMatAspect( Graphic3d_NOM_PLASTIC );
+        //aMatAspect.SetAmbient( 1 );
+        //aMatAspect.SetDiffuse( 0 );
 
         aShadingAspect->Aspect()->SetFrontMaterial( aMatAspect );
         aShadingAspect->Aspect()->SetBackMaterial( aMatAspect );