patch for correct compilation after merge

diff --git a/CMake/UsePyQt4EXT.cmake b/CMake/UsePyQt4EXT.cmake
index 67d1e84db71c48668f483d3affe7b6b7c3e90a82..c85230fe4557c1e72b63f11097b22d67c4d3cb6b 100644 (file)
--- a/CMake/UsePyQt4EXT.cmake
+++ b/CMake/UsePyQt4EXT.cmake
@@ -174,6 +174,9 @@ MACRO(PYQT4_WRAP_SIP_EXT outfiles)
 
     LIST(APPEND _output ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyNCollection_Sequence0100TCollection_AsciiString.cc)
     SET(${outfiles} ${${outfiles}} ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyNCollection_Sequence0100TCollection_AsciiString.cc)
+
+    LIST(APPEND _output ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_StricklerTable.cc)
+    SET(${outfiles} ${${outfiles}} ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_StricklerTable.cc)
     
     ADD_CUSTOM_COMMAND(
       OUTPUT ${_output}

diff --git a/src/HYDROData/HYDROData_StricklerTable.cxx b/src/HYDROData/HYDROData_StricklerTable.cxx
index 564b65f17663ff834c03a37aef50e267ad0775a9..d3ef0b86fbf945bc4820547a44db1bb9e05422e3 100644 (file)
--- a/src/HYDROData/HYDROData_StricklerTable.cxx
+++ b/src/HYDROData/HYDROData_StricklerTable.cxx
@@ -161,11 +161,12 @@ QStringList HYDROData_StricklerTable::GetTypes() const
     return aSeq;
 }
 
-bool HYDROData_StricklerTable::HasType( const TCollection_ExtendedString& theType ) const
+bool HYDROData_StricklerTable::HasType( const QString& theType ) const
 {
   Handle(TDataStd_NamedData) aMap = Map();
   
-  return !aMap.IsNull() && aMap->HasReal( theType );
+  TCollection_ExtendedString aType = toExtString( theType );
+  return !aMap.IsNull() && aMap->HasReal( aType );
 }
 
 void HYDROData_StricklerTable::Clear()

diff --git a/src/HYDROData/HYDROData_StricklerTable.h b/src/HYDROData/HYDROData_StricklerTable.h
index 080422edb9b5d4b4d2fe4bca454d04f297f5d834..76a7241e7c45de5f50bc153a85ac41d340c3ff34 100644 (file)
--- a/src/HYDROData/HYDROData_StricklerTable.h
+++ b/src/HYDROData/HYDROData_StricklerTable.h
@@ -54,8 +54,7 @@ public:
   HYDRODATA_EXPORT QStringList GetTypes() const;
   HYDRODATA_EXPORT void GetCoefficientRange( double& theMin, double& theMax ) const;
 
-
-  HYDRODATA_EXPORT bool HasType( const TCollection_ExtendedString& theType ) const;
+  HYDRODATA_EXPORT bool HasType( const QString& theType ) const;
 
   HYDRODATA_EXPORT void Clear();
 

diff --git a/src/HYDROGUI/HYDROGUI_Module.cxx b/src/HYDROGUI/HYDROGUI_Module.cxx
index 2871e99214fc3687dca8eb6d66ab6d36a8b1830b..0de17dd44bae6ae28c799c1f9de0416b57e382ed 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_Module.cxx
+++ b/src/HYDROGUI/HYDROGUI_Module.cxx
@@ -680,7 +680,7 @@ void HYDROGUI_Module::contextMenuPopup( const QString& theClient,
 
       if ( anIsStream || anIsChannel || anIsDigue || anIsObstacle )
       {
-        theMenu->addAction( action( PolylineExtraction ) );
+        theMenu->addAction( action( PolylineExtractionId ) );
         theMenu->addSeparator();
       }
 

diff --git a/src/HYDROGUI/HYDROGUI_OCCDisplayer.cxx b/src/HYDROGUI/HYDROGUI_OCCDisplayer.cxx
index 433ce8a615bedbf11ccd6fb5e2166797bd46aa82..ccec796fca83cda5220761d0d301e838cded7442 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_OCCDisplayer.cxx
+++ b/src/HYDROGUI/HYDROGUI_OCCDisplayer.cxx
@@ -435,7 +435,7 @@ void HYDROGUI_OCCDisplayer::UpdateColorScale( const OCCViewer_Viewer* theViewer
 
   // Get range
   Handle(HYDROData_StricklerTable) aTable;
-  TColStd_SequenceOfExtendedString aTableTypes;
+  QStringList aTableTypes;
   if ( isLandCoverColoringOn ) {
     aTable = module()->getLandCoverColoringTable( aViewerId );
     if ( !aTable.IsNull() ) {
@@ -519,7 +519,7 @@ void HYDROGUI_OCCDisplayer::UpdateColorScale( const OCCViewer_Viewer* theViewer
     QColor aColor = isLandCoverColoringOn ? aUndefinedColor : aLandCover->GetFillingColor();
     
     if ( isLandCoverColoringOn && !aTable.IsNull() ) {
-      TCollection_ExtendedString aStricklerType = 
+      QString aStricklerType = 
         aLandCover->GetStricklerType().toLatin1().constData();
      
       if ( aTable->HasType( aStricklerType ) ) {

diff --git a/src/HYDROPy/CMakeLists.txt b/src/HYDROPy/CMakeLists.txt
index ffe3b6250f710dd6250b52d2cb9866b19931ab45..0a74efeed2539f9afab0b177490ad56402194785 100644 (file)
--- a/src/HYDROPy/CMakeLists.txt
+++ b/src/HYDROPy/CMakeLists.txt
@@ -82,12 +82,12 @@ SET(_sip_files2
   HYDROData_Confluence.sip
   HYDROData_River.sip
   HYDROData_Stream.sip
+  HYDROData_StricklerTable.sip
   HYDROData_Image.sip
   HYDROData_Bathymetry.sip
   HYDROData_ImmersibleZone.sip
   HYDROData_Zone.sip
   HYDROData_Region.sip
-  HYDROData_StricklerTable.sip
   HYDROData_CalculationCase.sip
   HYDROData_Document.sip
   HYDROData_Application.sip