From 9d91b0eac6b735bc098e0d4fa50b8833534bd38c Mon Sep 17 00:00:00 2001 From: mzn Date: Tue, 6 Dec 2016 15:32:59 +0300 Subject: [PATCH] Fix merge errors. --- CMakeLists.txt | 8 ++++---- doc/salome/CMakeLists.txt | 6 +++--- src/HYDROData/HYDROData_DTM.cxx | 3 +-- src/HYDROData/HYDROData_Region.cxx | 2 +- src/HYDROGUI/HYDROGUI_LandCoverMapPrs.cxx | 3 +-- src/HYDROGUI/HYDROGUI_StreamOp.cxx | 2 +- src/HYDROPy/HYDROData_CalculationCase.sip | 4 ++-- src/HYDRO_tests/test_HYDROData_DTM.cxx | 12 ++++++------ 8 files changed, 19 insertions(+), 21 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 12e36c5a..176582e0 100644 --- 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 a466cf9e..2a1bc39a 100644 --- 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 76962d9b..f04cff97 100644 --- a/src/HYDROData/HYDROData_DTM.cxx +++ b/src/HYDROData/HYDROData_DTM.cxx @@ -53,8 +53,7 @@ #include #include -//@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 0f47ed2a..daf99893 100644 --- 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 73e755e7..aa29e8a4 100644 --- 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 2a178d83..d39868cc 100755 --- 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 aRefProfiles; + //std::vector 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 74bc249a..a70e7f9b 100644 --- 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& )]; %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& )]; %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 0436c8fb..7cc7b682 100644 --- 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 curves1 = HYDROData_DTM::ProfileToParametric( aProfile1, aUMin1, aUMax1, aProfileDir ); - std::vector curves2 = HYDROData_DTM::ProfileToParametric( aProfile2, aUMin2, aUMax2, aProfileDir ); + std::vector curves1 = HYDROData_DTM::ProfileToParametric( aProfile1, aUMin1, aUMax1, aProfileDir ); + std::vector 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 ); -- 2.39.2