Fix merge errors.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 12e36c5a5dd44d55ac092a8b8b50734b398b22e5..176582e01350b1386aff0cd0baa69c2da2b10573 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -138,21 +138,21 @@ FIND_PACKAGE(SalomeSIP REQUIRED)  # should come after Python and before PyQt4
 # Qt
 IF(NOT SALOME_GUI_BUILD_WITH_QT5)
   FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui QtXml QtWebKit QtOpenGL QtNetwork QtTest)
-  SET(QT_ROOT_DIR "${QTDIR}")
+  SET(QT_ROOT_DIR "${QT4_ROOT_DIR}")
   SALOME_CONFIGURE_PREPARE(HYDROData HYDROGUI HYDROPy Qt4 PyQt4)
 ELSE()
   FIND_PACKAGE(SalomeQt5 REQUIRED)
-  SET(QT_ROOT_DIR "${QTDIR}")
+  SET(QT_ROOT_DIR "${QT5_ROOT_DIR}")
   SALOME_CONFIGURE_PREPARE(HYDROData HYDROGUI HYDROPy Qt5 PyQt5)
 ENDIF()
 
 # PyQt
 IF(NOT SALOME_GUI_BUILD_WITH_QT5)
   FIND_PACKAGE(SalomePyQt4 REQUIRED)
-  SET(PYQT_ROOT_DIR "${PYQT_ROOT_DIR}")
+  SET(PYQT_ROOT_DIR "${PYQT4_ROOT_DIR}")
 ELSE()
   FIND_PACKAGE(SalomePyQt5 REQUIRED)
-  SET(PYQT_ROOT_DIR "${PYQT_ROOT_DIR}")
+  SET(PYQT_ROOT_DIR "${PYQT5_ROOT_DIR}")
 ENDIF()
 
 # Detection summary:

diff --git a/doc/salome/CMakeLists.txt b/doc/salome/CMakeLists.txt
index a466cf9ec0aee6134d998d0c370ef71620a88a2e..2a1bc39ab9ef093a77ece6145dbbc6114b99db90 100644 (file)
--- a/doc/salome/CMakeLists.txt
+++ b/doc/salome/CMakeLists.txt
@@ -20,7 +20,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-#ADD_SUBDIRECTORY(gui)
+ADD_SUBDIRECTORY(gui)
 ADD_SUBDIRECTORY(examples)
-#ADD_SUBDIRECTORY(tutorial)
-#ADD_SUBDIRECTORY(tui)
+ADD_SUBDIRECTORY(tutorial)
+ADD_SUBDIRECTORY(tui)

diff --git a/src/HYDROData/HYDROData_DTM.cxx b/src/HYDROData/HYDROData_DTM.cxx
index 76962d9bd570d56347ecbf77618f2f8eb20c49ad..f04cff9751161bf2198d7c3749e9d64b722918a3 100644 (file)
--- a/src/HYDROData/HYDROData_DTM.cxx
+++ b/src/HYDROData/HYDROData_DTM.cxx
@@ -53,8 +53,7 @@
 #include <TopTools_IndexedDataMapOfShapeShape.hxx>
 #include <TopTools_ListIteratorOfListOfShape.hxx>
 
-//@MZN zzz IMPLEMENT_STANDARD_HANDLE( HYDROData_DTM, HYDROData_Bathymetry )
-//@MZN zzz IMPLEMENT_STANDARD_RTTIEXT( HYDROData_DTM, HYDROData_Bathymetry )
+IMPLEMENT_STANDARD_RTTIEXT( HYDROData_DTM, HYDROData_Bathymetry )
 
 HYDROData_DTM::CurveUZ::CurveUZ( double theXCurv, const gp_Vec2d& theProfileDir, double theDeltaZ )
   : myXcurv( theXCurv ), myProfileDir( theProfileDir ), myDeltaZ( theDeltaZ )

diff --git a/src/HYDROData/HYDROData_Region.cxx b/src/HYDROData/HYDROData_Region.cxx
index 0f47ed2a50be6d5535d179b5b4b8d11344d0b180..daf99893d885d9e31823c5e87dd40863646deb3a 100644 (file)
--- a/src/HYDROData/HYDROData_Region.cxx
+++ b/src/HYDROData/HYDROData_Region.cxx
@@ -372,7 +372,7 @@ TopoDS_Shape HYDROData_Region::GetShape( HYDROData_ShapesGroup::SeqOfGroupsDefs*
       //USD algo will skip such edges and will not perform unifying through them 
       //(more than 2 faces are connected to one edge + non same domain surfaces)
       TopoDS_Wire DW;
-      Handle_Geom_Plane DPl = new Geom_Plane(gp_Pln (gp_Pnt(0,0,0), gp_Dir(0,1,0))); //non same domain with the main surf
+      Handle(Geom_Plane) DPl = new Geom_Plane(gp_Pln (gp_Pnt(0,0,0), gp_Dir(0,1,0))); //non same domain with the main surf
       BB.MakeFace(DF, DPl, Precision::Confusion());
       BB.MakeWire(DW);
       for (int i = 1; i <= IE.Extent(); i++)

diff --git a/src/HYDROGUI/HYDROGUI_LandCoverMapPrs.cxx b/src/HYDROGUI/HYDROGUI_LandCoverMapPrs.cxx
index 73e755e7d2c9abe625b560f48bbab8ad7352cefd..aa29e8a4f91c235f653541d9adf00ec116f9dd4c 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_LandCoverMapPrs.cxx
+++ b/src/HYDROGUI/HYDROGUI_LandCoverMapPrs.cxx
@@ -31,8 +31,7 @@
 const Quantity_Color EDGES_COLOR = Quantity_NOC_SLATEGRAY;
 const int HILIGHT_ISO_NB = 10;
 
-//@MZN zzz IMPLEMENT_STANDARD_HANDLE( HYDROGUI_LandCoverMapPrs, AIS_ColoredShape )
-//@MZN zzz IMPLEMENT_STANDARD_RTTIEXT( HYDROGUI_LandCoverMapPrs, AIS_ColoredShape )
+IMPLEMENT_STANDARD_RTTIEXT( HYDROGUI_LandCoverMapPrs, AIS_ColoredShape )
 
 HYDROGUI_LandCoverMapPrs::HYDROGUI_LandCoverMapPrs( const Handle(HYDROData_LandCoverMap)& theMap )
   : AIS_ColoredShape( theMap->GetShape() )

diff --git a/src/HYDROGUI/HYDROGUI_StreamOp.cxx b/src/HYDROGUI/HYDROGUI_StreamOp.cxx
index 2a178d83f96d97b3fb4936f6331e8c98c96f3b48..d39868ccf3d9f68f94b76db38acffbaea9f32431 100755 (executable)
--- a/src/HYDROGUI/HYDROGUI_StreamOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_StreamOp.cxx
@@ -385,7 +385,7 @@ void HYDROGUI_StreamOp::createPreview()
     HYDROGUI_Tool::FindObjectByName( module(), myHydAxis, KIND_POLYLINEXY ) );
 
   HYDROData_SequenceOfObjects aRefProfiles;
-  //std::vector<Handle_HYDROData_Profile> aRefProfiles;
+  //std::vector<Handle(HYDROData_Profile)> aRefProfiles;
   int plen = myProfiles.length();
   for ( int i = 0; i < plen; ++i )
   {

diff --git a/src/HYDROPy/HYDROData_CalculationCase.sip b/src/HYDROPy/HYDROData_CalculationCase.sip
index 74bc249a1cb2df88ad2c7f8222c55a248c5a257c..a70e7f9bd7d824a2b870c82b94d12e69d3222a53 100644 (file)
--- a/src/HYDROPy/HYDROData_CalculationCase.sip
+++ b/src/HYDROPy/HYDROData_CalculationCase.sip
@@ -216,7 +216,7 @@ public:
    */
   void RemoveBoundaryPolyline();
   
-  void SetLandCoverMap( HYDROData_LandCoverMap theLandCoverMap ) [void ( const Handle_HYDROData_LandCoverMap& )];
+  void SetLandCoverMap( HYDROData_LandCoverMap theLandCoverMap ) [void ( const opencascade::handle<HYDROData_LandCoverMap>& )];
   %MethodCode
     Handle(HYDROData_LandCoverMap) aRef =
       Handle(HYDROData_LandCoverMap)::DownCast( createHandle( a0 ) );
@@ -232,7 +232,7 @@ public:
     }
   %End
 
-  void SetStricklerTable( HYDROData_StricklerTable theStricklerTable ) [void ( const Handle_HYDROData_StricklerTable& )];
+  void SetStricklerTable( HYDROData_StricklerTable theStricklerTable ) [void ( const opencascade::handle<HYDROData_StricklerTable>& )];
    %MethodCode
     Handle(HYDROData_StricklerTable) aRef =
       Handle(HYDROData_StricklerTable)::DownCast( createHandle( a0 ) );

diff --git a/src/HYDRO_tests/test_HYDROData_DTM.cxx b/src/HYDRO_tests/test_HYDROData_DTM.cxx
index 0436c8fb693e0e48607636206ef0a19932b8fbb3..7cc7b68212f07515bd6883a388ccb9f7502a09c2 100644 (file)
--- a/src/HYDRO_tests/test_HYDROData_DTM.cxx
+++ b/src/HYDRO_tests/test_HYDROData_DTM.cxx
@@ -200,7 +200,7 @@ void test_HYDROData_DTM::test_hydraulic_axis()
   profiles.push_back( aProfile2 );
   profiles.push_back( aProfile3 );
 
-  Handle_Geom2d_BSplineCurve HA = HYDROData_DTM::CreateHydraulicAxis( profiles, distances );
+  Handle(Geom2d_BSplineCurve) HA = HYDROData_DTM::CreateHydraulicAxis( profiles, distances );
   CPPUNIT_ASSERT_EQUAL( false, (bool)HA.IsNull() );
   CPPUNIT_ASSERT_EQUAL( 3, (int)distances.size() );
 
@@ -244,8 +244,8 @@ void test_HYDROData_DTM::test_profile_conversion_to_2d()
          aUMin2 = aUMin1,
          aUMax2 = aUMax1;
   gp_Vec2d aProfileDir;
-  std::vector<Handle_Geom2d_Curve> curves1 = HYDROData_DTM::ProfileToParametric( aProfile1, aUMin1, aUMax1, aProfileDir );
-  std::vector<Handle_Geom2d_Curve> curves2 = HYDROData_DTM::ProfileToParametric( aProfile2, aUMin2, aUMax2, aProfileDir );
+  std::vector<Handle(Geom2d_Curve)> curves1 = HYDROData_DTM::ProfileToParametric( aProfile1, aUMin1, aUMax1, aProfileDir );
+  std::vector<Handle(Geom2d_Curve)> curves2 = HYDROData_DTM::ProfileToParametric( aProfile2, aUMin2, aUMax2, aProfileDir );
 
   gp_Pnt2d aFirst, aLast;
   CPPUNIT_ASSERT_EQUAL( 3, (int)curves1.size() );
@@ -496,7 +496,7 @@ void test_HYDROData_DTM::test_curve_to_3d()
   profiles.push_back( aProfile1 );
   profiles.push_back( aProfile2 );
 
-  Handle_Geom2d_BSplineCurve HA = HYDROData_DTM::CreateHydraulicAxis( profiles, distances );
+  Handle(Geom2d_BSplineCurve) HA = HYDROData_DTM::CreateHydraulicAxis( profiles, distances );
   HYDROData_DTM::AltitudePoints points;
   HYDROData_DTM::CurveUZ mid( 5.0, gp_Vec2d(-10,10), 0 );
   mid.push_back( HYDROData_DTM::PointUZ( 0, 5 ) );
@@ -549,7 +549,7 @@ void test_HYDROData_DTM::test_presentation()
   
   CPPUNIT_ASSERT_EQUAL( 9177, (int)DTM->GetAltitudePoints().size() ); 
 
-  Handle_AIS_InteractiveContext aContext = TestViewer::context();
+  Handle(AIS_InteractiveContext) aContext = TestViewer::context();
   HYDROGUI_ShapeBathymetry* aBathPrs = new HYDROGUI_ShapeBathymetry( 0, aContext, DTM );
   aBathPrs->update( true, false );
 
@@ -602,7 +602,7 @@ void test_HYDROData_DTM::test_garonne()
   
   CPPUNIT_ASSERT_EQUAL( 282338, (int)DTM->GetAltitudePoints().size() ); 
   
-  Handle_AIS_InteractiveContext aContext = TestViewer::context();
+  Handle(AIS_InteractiveContext) aContext = TestViewer::context();
   HYDROGUI_ShapeBathymetry* aBathPrs = new HYDROGUI_ShapeBathymetry( 0, aContext, DTM );
   aBathPrs->update( true, false );