[us-commits] r2754 - trunk/programs/us_fit_meniscus

svn at svn.aucsolutions.com svn at svn.aucsolutions.com
Thu May 2 14:59:20 MDT 2019


Author: gegorbet
Date: 2019-05-02 20:59:20 +0000 (Thu, 02 May 2019)
New Revision: 2754

Modified:
   trunk/programs/us_fit_meniscus/us_fit_meniscus.cpp
Log:
fix remove-models in fit_meniscus for MWL case

Modified: trunk/programs/us_fit_meniscus/us_fit_meniscus.cpp
===================================================================
--- trunk/programs/us_fit_meniscus/us_fit_meniscus.cpp	2019-05-02 18:46:22 UTC (rev 2753)
+++ trunk/programs/us_fit_meniscus/us_fit_meniscus.cpp	2019-05-02 20:59:20 UTC (rev 2754)
@@ -1049,6 +1049,7 @@
    else
    {  // Apply to all wavelengths in a cell/channel
       QString dmsg   = "";
+      int idEdsv   = idEdit;
 DbgLv(1) << " eupd: AppWvl: nedtfs" << nedtfs;
       QApplication::setOverrideCursor( QCursor( Qt::WaitCursor ) );
 
@@ -1150,10 +1151,16 @@
          {
 DbgLv(1) << " eupd:       call upd_db_ed";
             update_db_edit( edtext, fn, dmsg );
-DbgLv(1) << " eupd:       ret fr upd_db_ed";
+DbgLv(1) << " eupd:       ret fr upd_db_ed  idEdit" << idEdit;
+
+            if ( edtfiles[ jj ] == fname_edit )
+               idEdsv       = idEdit;
          }
 
       }  // END: wavelengths loop
+DbgLv(1) << " eupd:       idEdit idEdsv" << idEdit << idEdsv;
+      idEdit       = idEdsv;
+DbgLv(1) << " eupd:       idEdit" << idEdit;
 
       QApplication::restoreOverrideCursor();
       QApplication::restoreOverrideCursor();
@@ -2152,6 +2159,9 @@
       int             ntmods = ( ndmods > 0 ) ? ndmods : nlmods;
       int             ikModx = ( ndmods > 0 ) ? dkModx : lkModx;
 DbgLv(1) << "  ntmods ikModx" << ntmods << ikModx;
+//*DEBUG*
+//if ( ndmods > 0  ||  nlmods > 0 ) return;
+//*DEBUG*
 
       QString modDesc    = "";
 



More information about the us-commits mailing list