[us-commits] r2771 - trunk/programs/us_mwl_species_fit

[svn at svn.aucsolutions.com]

Author: demeler
Date: 2019-05-19 19:16:17 +0000 (Sun, 19 May 2019)
New Revision: 2771

Modified:
   trunk/programs/us_mwl_species_fit/us_mwl_species_fit.cpp
Log:
Fixed inability to load comma separated spectral species file, plus added error handler for invalid file format


Modified: trunk/programs/us_mwl_species_fit/us_mwl_species_fit.cpp
===================================================================
--- trunk/programs/us_mwl_species_fit/us_mwl_species_fit.cpp	2019-05-19 18:17:41 UTC (rev 2770)
+++ trunk/programs/us_mwl_species_fit/us_mwl_species_fit.cpp	2019-05-19 19:16:17 UTC (rev 2771)
@@ -715,6 +715,16 @@
       {  // Parse wavelength, concentration from each file line
          fline           = tsi.readLine().simplified();
          int lnf1        = fline.indexOf( " " );
+DbgLv(1) << "lnf1:" << lnf1;
+			if (lnf1 == -1) lnf1 = fline.indexOf( "," ); // if there was no space found, try comma
+			if (lnf1 == -1) lnf1 = fline.indexOf( "\t" ); // if still -1, try tab
+			if (lnf1 == -1) 
+			{
+				QMessageBox::warning( this, tr("IO Error"),
+				tr("The file:\n") + fname + tr("\nis not in the correct format.\n") +  
+				tr("The file should have 2 columns that are comma or space separated."));
+				return;
+			}
          int iwavl       = QString( fline ).left( lnf1 ).toInt();
          double conc     = QString( fline ).mid( lnf1 + 1 ).toDouble();
 
@@ -813,6 +823,8 @@
       {  // Get wavelength,concentration vectors for this species
          cswavls << spwavls[ kw ];
          csconcs << spconcs[ kw ];
+DbgLv(1) << "sfd: Get wavelength,concentration vectors for species " << ii << ":" << spwavls[ kw ] << spconcs[ kw ];
+
       }
 DbgLv(1) << "sfd:  sp" << ii << "nwavl" << nwavl;
 
@@ -832,6 +844,7 @@
                    iwavl > cswavls[ nwavl - 1 ] )
          {  // Data wavelength beyond species range:  use zero concentration
             cval          = 0.0;
+DbgLv(1) << "Data wavelength beyond species range: " << iwavl;
          }
 
          else