Merge remote-tracking branch 'origin/master' into BR_LAND_COVER_MAP

[modules/hydro.git] / src / HYDROData / HYDROData_ShapeFile.cxx

diff --git a/src/HYDROData/HYDROData_ShapeFile.cxx b/src/HYDROData/HYDROData_ShapeFile.cxx
index 1b0ee89af43e13b7b85254feb85b074c3350d353..15ef87394f1eb4423c036b465894a75ed2f2af45 100644 (file)
--- a/src/HYDROData/HYDROData_ShapeFile.cxx
+++ b/src/HYDROData/HYDROData_ShapeFile.cxx
@@ -491,7 +491,7 @@ void HYDROData_ShapeFile::ReadSHPPoly3D(Handle(HYDROData_Document) theDocument,
   aPolylineObj->SetPolylineXY (aPolylineXY, false);
   aPolylineObj->SetAltitudeObject(aBath);
 
-  aPolylineObj->SetBorderColor( HYDROData_Polyline3D::DefaultBorderColor() );
+  aPolylineObj->SetBorderColor( aPolylineObj->DefaultBorderColor() );
   aPolylineObj->SetName( aPoly3DName );
   
   aPolylineObj->Update();
@@ -584,31 +584,31 @@ QString HYDROData_ShapeFile::GetShapeTypeName(int theType)
     case 0:
       return "null shape";
     case 1:
-      return "point";
+      return "point (unsupported by HYDRO)";
     case 3:
-      return "arc";
+      return "arc/polyline (supported by HYDRO)";
     case 5:
-      return "polygon";
+      return "polygon (supported by HYDRO)";
     case 8:
-      return "multipoint";
+      return "multipoint (unsupported by HYDRO)";
     case 11:
-      return "pointZ";
+      return "pointZ (unsupported by HYDRO)";
     case 13:
-      return "arcZ";
+      return "arcZ/polyline (supported by HYDRO)";
     case 15:
-      return "polygonZ";
+      return "polygonZ (unsupported by HYDRO)";
     case 18:
-      return "multipointZ";
+      return "multipointZ (unsupported by HYDRO)";
     case 21:
-      return "pointM";
+      return "pointM (unsupported by HYDRO)";
     case 23:
-      return "ARCM";
+      return "arcM/polyline (supported by HYDRO)";
     case 25:
-      return "polygonM";
+      return "polygonM (unsupported by HYDRO)";
     case 28:
-      return "multipointM";
+      return "multipointM (unsupported by HYDRO)";
     case 31:
-      return "multipatch";
+      return "multipatch (unsupported by HYDRO)";
     default:
       return "unknown";
   }