Merge remote-tracking branch 'origin/BR_quadtree' into V7_dev

diff --git a/src/HYDROPy/CMakeLists.txt b/src/HYDROPy/CMakeLists.txt
index 4d00303eee09d31563601c2771343d21fa303faf..c15ed61c1ec8d59534416235a69205981f2be9ad 100644 (file)
--- a/src/HYDROPy/CMakeLists.txt
+++ b/src/HYDROPy/CMakeLists.txt
@@ -1,5 +1,5 @@
 include(../../CMake/Common.cmake)
-include(../../CMake/UsePyQt4EXT.cmake)
+include(UsePyQt4)
 
 # --- options ---
 
@@ -30,78 +30,67 @@ SET(_link_LIBRARIES
 # --- resources ---
 
 # sip files / to be processed by sip
-
-# TODO: fix the PYQT4_WRAP_SIP and uncomment
-# SET(_sip_files
-#   HYDROData.sip
-#   HYDROData_Entity.sip
-#   HYDROData_Object.sip
-#   HYDROData_ArtificialObject.sip
-#   HYDROData_NaturalObject.sip
-#   HYDROData_Image.sip
-#   HYDROData_Polyline.sip
-#   HYDROData_Bathymetry.sip
-#   HYDROData_ImmersibleZone.sip
-#   HYDROData_Zone.sip
-#   HYDROData_Region.sip
-#   HYDROData_StricklerTable.sip
-#   HYDROData_CalculationCase.sip
-#   HYDROData_Document.sip
-# )
-
-# workaround while PYQT4_WRAP_SIP is not corrected
 SET(_sip_files
   HYDROData.sip
-)
-
-SET(_sip_files2
-  CAS/gp_XY.sip
-  CAS/gp_XYZ.sip
-  CAS/NCollection_Sequence.sip
-  CAS/TCollection_AsciiString.sip
-  HYDROData_SequenceOfObjects.sip
-  HYDROData_IInterpolator.sip
-  HYDROData_Entity.sip
-  HYDROData_ShapesGroup.sip
-  HYDROData_SplitShapesGroup.sip
-  HYDROData_IPolyline.sip
-  HYDROData_IAltitudeObject.sip
   HYDROData_AltitudeObject.sip
-  HYDROData_ObstacleAltitude.sip
-  HYDROData_StreamAltitude.sip
-  HYDROData_Object.sip
-  HYDROData_Profile.sip
-  HYDROData_Polyline3D.sip
-  HYDROData_ProfileUZ.sip
-  HYDROData_PolylineXY.sip
+  HYDROData_Application.sip
   HYDROData_ArtificialObject.sip
-  HYDROData_Obstacle.sip
+  HYDROData_Bathymetry.sip
+  HYDROData_CalculationCase.sip
   HYDROData_Channel.sip
+  HYDROData_Confluence.sip
   HYDROData_Digue.sip
+  HYDROData_Document.sip
+  HYDROData_Entity.sip
+  HYDROData_IAltitudeObject.sip
+  HYDROData_IInterpolator.sip
+  HYDROData_Image.sip
+  HYDROData_ImmersibleZone.sip
+  HYDROData_IPolyline.sip
+  HYDROData_IProfilesInterpolator.sip
+  HYDROData_LandCoverMap.sip
   HYDROData_NaturalObject.sip
-  HYDROData_Confluence.sip
+  HYDROData_Object.sip
+  HYDROData_ObstacleAltitude.sip
+  HYDROData_Obstacle.sip
+  HYDROData_Polyline3D.sip
+  HYDROData_PolylineXY.sip
+  HYDROData_Profile.sip
+  HYDROData_ProfileUZ.sip
+  HYDROData_Region.sip
   HYDROData_River.sip
+  HYDROData_SequenceOfObjects.sip
+  HYDROData_ShapesGroup.sip
+  HYDROData_SplitShapesGroup.sip
+  HYDROData_StreamAltitude.sip
   HYDROData_Stream.sip
   HYDROData_StricklerTable.sip
-  HYDROData_Image.sip
-  HYDROData_Bathymetry.sip
-  HYDROData_ImmersibleZone.sip
   HYDROData_Zone.sip
-  HYDROData_Region.sip
-  HYDROData_CalculationCase.sip
-  HYDROData_Document.sip
-  HYDROData_Application.sip
-  HYDROData_IProfilesInterpolator.sip
-  HYDROData_LandCoverMap.sip
+  CAS/gp_XY.sip
+  CAS/gp_XYZ.sip
+  CAS/NCollection_Sequence.sip
+  CAS/TCollection_AsciiString.sip
+)
+
+SET(_add_SOURCES
+  sipHYDROPyNCollection_Sequence0100HYDROData_IPolylineSectionType.cc
+  sipHYDROPyNCollection_Sequence0100Handle_HYDROData_Entity.cc
+  sipHYDROPyNCollection_Sequence0100TCollection_AsciiString.cc
+  sipHYDROPyNCollection_Sequence0100gp_XY.cc
+  sipHYDROPyNCollection_Sequence0100gp_XYZ.cc
+  sipHYDROPyNCollection_Sequence1800.cc
+  sipHYDROPyNCollection_Sequence2400.cc
+  sipHYDROPyNCollection_Sequence2600.cc
+  sipHYDROPyTCollection_AsciiString.cc
 )
 
 # --- sources ---
 
 # sources / sip wrappings
-PYQT4_WRAP_SIP_EXT(_sip_SOURCES ${_sip_files})
+PYQT4_WRAP_SIP(_sip_SOURCES ${_sip_files} SOURCES ${_add_SOURCES})
 
 # sources / to compile
-SET(HYDROPy_SOURCES ${_sip_SOURCES} ${_sip_files2})
+SET(HYDROPy_SOURCES ${_sip_SOURCES})
 
 # --- rules ---
 

diff --git a/src/HYDROPy/HYDROData.sip b/src/HYDROPy/HYDROData.sip
index 3b52af7bbcdcdcc6f86f2a48be4694a8bf3ec4c1..0039c21afbaa0b56892a05b258d174e6df0c5afb 100644 (file)
--- a/src/HYDROPy/HYDROData.sip
+++ b/src/HYDROPy/HYDROData.sip
@@ -41,7 +41,7 @@
  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 %End
 
-%Import QtGuimod.sip
+%Import QtGui/QtGuimod.sip
 
 %Include CAS/gp_XY.sip
 %Include CAS/gp_XYZ.sip