Fixes #2204

Author: dcwhite

src/Core/IEPlugin/MatlabFiles_Plugin.cc

@@ -225,7 +225,7 @@ SCIRun::MatlabField_reader(LoggerHandle pr, const char *filename)
       // Get the header of the object
       matlabarray ma = mf.getmatlabarrayinfo(p);
       // Is this object compatible?
-      if (mc.sciFieldCompatible(ma,dummytext))
+      if (mc.sciFieldCompatible(ma, dummytext, false))
       {
         // If so get the full object
         ma = mf.getmatlabarray(p);

src/Core/Matlab/matlabconverter.cc

@@ -1531,11 +1531,11 @@ void matlabconverter::sciNrrdDataTOmlArray(NrrdDataHandle scinrrd, matlabarray &
 //   LatVolMesh
 //   any suggestions for other types that need support ??
 
-int matlabconverter::sciFieldCompatible(const matlabarray& mlarray,std::string &infostring, bool postremark)
+int matlabconverter::sciFieldCompatible(const matlabarray& mlarray, std::string& infostring, bool postremark)
 {
   MatlabToFieldAlgo algo;
   algo.setreporter(pr_);
-  return(algo.analyze_iscompatible(mlarray,infostring,postremark));
+  return (algo.analyze_iscompatible(mlarray, infostring, postremark));
 }
 
 void matlabconverter::mlArrayTOsciField(const matlabarray& mlarray, FieldHandle &scifield)
@@ -1708,18 +1708,18 @@ int matlabconverter::sciBundleCompatible(matlabarray &mlarray, std::string &info
   for (int p = 0; p < nfields; p++)
   {
     subarray = mlarray.getfield(0,p);
-    if (sciStringCompatible(subarray,dummyinfo,false)) { numstrings++; continue; }
+    if (sciStringCompatible(subarray, dummyinfo, false)) { numstrings++; continue; }
     if (prefer_bundles)  {if (sciBundleCompatible(subarray,dummyinfo,false)) { numbundles++; continue; } }
-    int score = sciFieldCompatible(subarray,dummyinfo,false);
+    int score = sciFieldCompatible(subarray, dummyinfo, false);
     if (prefer_fields)
       if (score > 0)  { numfields++; continue; }
     else
       if (score > 1)  { numfields++; continue; }
-    if (prefer_nrrds) { if (sciNrrdDataCompatible(subarray,dummyinfo,false))   { numnrrds++; continue; } }
+    if (prefer_nrrds) { if (sciNrrdDataCompatible(subarray, dummyinfo, false))   { numnrrds++; continue; } }
     if (sciMatrixCompatible(subarray,dummyinfo,false)) { nummatrices++; continue; }
-    if (!prefer_nrrds) { if (sciNrrdDataCompatible(subarray,dummyinfo,false))   { numnrrds++; continue; } }
+    if (!prefer_nrrds) { if (sciNrrdDataCompatible(subarray, dummyinfo, false))   { numnrrds++; continue; } }
     if (score) { numfields++; continue; }
-    if (sciBundleCompatible(subarray,dummyinfo,false)) { numbundles++; continue; }
+    if (sciBundleCompatible(subarray, dummyinfo, false)) { numbundles++; continue; }
   }
 
   if (numfields+nummatrices+numnrrds+numbundles+numstrings == 0)
@@ -1795,7 +1795,7 @@ void matlabconverter::mlArrayTOsciBundle(matlabarray &mlarray,BundleHandle &scib
       }
     }
 
-    int score = sciFieldCompatible(subarray,dummyinfo,false);
+    int score = sciFieldCompatible(subarray, dummyinfo, false);
     if (score > 1)
     {
       FieldHandle field;

src/Core/Matlab/matlabtofield.cc

@@ -38,6 +38,7 @@
 #include <Core/Datatypes/Legacy/Field/VMesh.h>
 #include <Core/Datatypes/Legacy/Field/FieldInformation.h>
 #include <Core/Logging/LoggerInterface.h>
+#include <Core/Logging/Log.h>
 #include <Core/Matlab/matlabconverter.h>
 
 using namespace SCIRun;
@@ -391,7 +392,8 @@ int MatlabToFieldAlgo::analyze_iscompatible(const matlabarray& mlarray, std::str
   }
   catch (matlabconverter::error_type& e)
   {
-    std::cerr << "analyze_fieldtype error: " << e.what() << std::endl;
+    if (postremark || Core::Logging::LogSettings::Instance().verbose())
+      SCIRun::logError("analyze_fieldtype error: {}", e.what());
     return 0;
   }
 
@@ -442,7 +444,8 @@ int MatlabToFieldAlgo::analyze_fieldtype(const matlabarray& mlarray, std::string
   }
   catch (matlabconverter::error_type& e)
   {
-    std::cerr << "analyze_fieldtype error: " << e.what() << std::endl;
+    if (Core::Logging::LogSettings::Instance().verbose())
+      logError("analyze_fieldtype error: {}", e.what());
     return 0;
   }
 

src/Modules/Legacy/Matlab/DataIO/ImportFieldsFromMatlab.cc

@@ -97,7 +97,7 @@ DatatypeHandle ImportFieldsFromMatlab::processMatlabData(const matlabarray& ma)
 
 int ImportFieldsFromMatlab::indexMatlabFile(matlabconverter& converter, const matlabarray& mlarray, std::string& infostring) const
 {
-  return converter.sciFieldCompatible(mlarray, infostring);
+  return converter.sciFieldCompatible(mlarray, infostring, Core::Logging::LogSettings::Instance().verbose());
 }
 
 void MatlabFileIndexModule::executeImpl(const StringPortName<0>& filenameIn, const StringPortName<6>& filenameOut)