add info about write capabilities in mdalinfo

lutraconsulting · Dec 3, 2019 · 30ca31f · 30ca31f
1 parent cb9350c
commit 30ca31f
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 2 deletions.
diff --git a/mdal/frmts/mdal_netcdf.cpp b/mdal/frmts/mdal_netcdf.cpp
@@ -144,7 +144,7 @@ std::vector<double> NetCDFFile::readDoubleArr( int arr_id,
   else if ( typep == NC_BYTE )
   {
     std::vector<unsigned char> arr_val_b( count_dim1 * count_dim2 );
-    if ( nc_get_vars_ubyte( mNcid, arr_id, startp.data(), countp.data(), stridep.data(), arr_val_b.data() ) != NC_NOERR ) throw MDAL_Status::Err_UnknownFormat;
+    if ( nc_get_vars_uchar( mNcid, arr_id, startp.data(), countp.data(), stridep.data(), arr_val_b.data() ) != NC_NOERR ) throw MDAL_Status::Err_UnknownFormat;
     for ( size_t i = 0; i < count_dim1 * count_dim2; ++i )
     {
       const unsigned char val = arr_val_b[i];

diff --git a/tools/mdalinfo.cpp b/tools/mdalinfo.cpp
@@ -21,8 +21,23 @@ void printDriverInfo( int index )
   std::string longName = MDAL_DR_longName( driver );
   std::string filters = MDAL_DR_filters( driver );
 
+  bool saveMeshCapability = MDAL_DR_saveMeshCapability( driver );
+  bool writeFaceDatasetsCapability = MDAL_DR_writeDatasetsCapability( driver, MDAL_DataLocation::DataOnFaces2D );
+  bool writeVerticesDatasetsCapability = MDAL_DR_writeDatasetsCapability( driver, MDAL_DataLocation::DataOnVertices2D );
+  bool writeVolumesDatasetsCapability = MDAL_DR_writeDatasetsCapability( driver, MDAL_DataLocation::DataOnVolumes3D );
+  std::string writeFlag;
+  if ( saveMeshCapability )
+    writeFlag += " -Wmesh-";
+  if ( writeFaceDatasetsCapability )
+    writeFlag += " -Wface-";
+  if ( writeVerticesDatasetsCapability )
+    writeFlag += " -Wvertex-";
+  if ( writeVolumesDatasetsCapability )
+    writeFlag += " -Wvolume-";
+
   std::cout << name << " "
-            << meshFlag << " (r): "
+            << meshFlag << ""
+            << writeFlag << ": "
             << longName << " "
             << "(" << filters << ")"
             << std::endl;
@@ -31,6 +46,16 @@ void printDriverInfo( int index )
 void printFormats()
 {
   int driverCount = MDAL_driverCount();
+
+  std::cout << std::endl;
+  std::cout << "-mesh-" << " can read mesh frame and datasets " << std::endl
+            << "-data-" << " can read only datasets " << std::endl
+            << "-Wmesh-" << " can write mesh frame" << std::endl
+            << "-Wface-" << " can write datasets defined on faces " << std::endl
+            << "-Wvertex-" << " can write datasets defined on vertices " << std::endl
+            << "-Wvolume-" << " can write datasets defined on volumes " << std::endl
+            << std::endl;
+
   for ( int i = 0; i < driverCount; ++i )
   {
     printDriverInfo( i );