From: isn Date: Tue, 19 May 2015 12:13:35 +0000 (+0300) Subject: Merge branch 'BR_IMPROVEMENTS' of ssh://git.salome-platform.org/modules/hydro into... X-Git-Tag: v1.4.1~21^2~3 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=fcd41a745faf1509dda0fd8dc47c2b6a658f87dc;p=modules%2Fhydro.git Merge branch 'BR_IMPROVEMENTS' of ssh://git.salome-platform.org/modules/hydro into BR_IMPROVEMENTS --- fcd41a745faf1509dda0fd8dc47c2b6a658f87dc diff --cc src/HYDROGUI/HYDROGUI_Shape.cxx index 182c586b,08900fbe..c8cefc3d --- a/src/HYDROGUI/HYDROGUI_Shape.cxx +++ b/src/HYDROGUI/HYDROGUI_Shape.cxx @@@ -33,7 -33,6 +33,7 @@@ #include #include #include - #include ++#include #include #include @@@ -483,12 -482,7 +483,12 @@@ Handle_AIS_InteractiveObject HYDROGUI_S if( myTopoShape.IsNull() ) return Handle_AIS_InteractiveObject(); else - return new AIS_Shape( myTopoShape ); + if ( myObject->IsKind( STANDARD_TYPE(HYDROData_PolylineXY) ) || + myObject->IsKind( STANDARD_TYPE(HYDROData_Polyline3D)) || + myObject->IsKind( STANDARD_TYPE(HYDROData_Profile) )) - return new HYDROGUI_PrsShape(myTopoShape); ++ return new HYDROGUI_Polyline(myTopoShape); + else + return new AIS_Shape( myTopoShape ); } void HYDROGUI_Shape::buildShape()