[us-commits] r2802 - in trunk: gui programs/us_experiment

[svn at svn.aucsolutions.com]

Author: alexey
Date: 2019-08-06 23:37:59 +0000 (Tue, 06 Aug 2019)
New Revision: 2802

Modified:
   trunk/gui/us_select_item.cpp
   trunk/programs/us_experiment/us_exp_utils.cpp
   trunk/programs/us_experiment/us_experiment_gui_optima.cpp
Log:
1501 scans per wvl per cell issue... plus some other minor corrections... 



Modified: trunk/gui/us_select_item.cpp
===================================================================
--- trunk/gui/us_select_item.cpp	2019-08-06 14:51:11 UTC (rev 2801)
+++ trunk/gui/us_select_item.cpp	2019-08-06 23:37:59 UTC (rev 2802)
@@ -119,7 +119,7 @@
        le_info = us_textedit();
        QFontMetrics m (le_info -> font()) ;
        int RowHeight = m.lineSpacing() ;
-       le_info -> setFixedHeight  (10 * RowHeight) ;
+       le_info -> setFixedHeight  (11 * RowHeight) ;
 
        QPalette p = le_info->palette(); 
        p.setColor(QPalette::Base, Qt::lightGray);

Modified: trunk/programs/us_experiment/us_exp_utils.cpp
===================================================================
--- trunk/programs/us_experiment/us_exp_utils.cpp	2019-08-06 14:51:11 UTC (rev 2801)
+++ trunk/programs/us_experiment/us_exp_utils.cpp	2019-08-06 23:37:59 UTC (rev 2802)
@@ -2618,9 +2618,14 @@
    // subm_enab         = ( have_run    &&  have_proj  &&  proto_ena  &&
    //                       connected );                                     
 
-   subm_enab         = ( have_run    &&  have_proj  &&  proto_ena  &&
-			 mainw->connection_status &&                // ALEXEY: use top-level connection boolean!
-			 !currProto->exp_label.isEmpty() );         // ALEXEY: and label is present        
+   if ( mainw->automode ) 
+     subm_enab         = ( have_run    &&  have_proj  &&  proto_ena  &&
+			   mainw->connection_status &&                // ALEXEY: use top-level connection boolean!
+			   !currProto->exp_label.isEmpty() );         // ALEXEY: and label is present
+   else
+     subm_enab         = ( have_run    &&  have_proj  &&  proto_ena  &&
+			   mainw->connection_status );               // ALEXEY: use top-level connection boolean!
+			  
 
    ck_run     ->setChecked( have_run   );
    ck_project ->setChecked( have_proj  );

Modified: trunk/programs/us_experiment/us_experiment_gui_optima.cpp
===================================================================
--- trunk/programs/us_experiment/us_experiment_gui_optima.cpp	2019-08-06 14:51:11 UTC (rev 2801)
+++ trunk/programs/us_experiment/us_experiment_gui_optima.cpp	2019-08-06 23:37:59 UTC (rev 2802)
@@ -4799,6 +4799,19 @@
 
             if ( has_absorbance )
             {
+
+	      //Stop if ScanCount > 1501
+	      if ( ScanCount > 1501 )
+		{
+		  QMessageBox::critical( this,
+					 tr( "*ERROR* in Submitting Protocol" ),
+					 tr( "Protocol cannot be submitted: \n"
+					     "Number of scans per cell per wavelengths is %1. \n" 
+					     "It must be less than 1501. \n\n"
+					     "Please revise experiment parameters accordingly." ).arg( ScanCount ) );
+		  return;
+		}
+	      
                for ( int ii = 0; ii < rpRange->nranges; ii++ )
                {
                   channel  = rpRange->chrngs[ ii ].channel;
@@ -5020,6 +5033,19 @@
             }
             if ( has_interference )
             {
+	      //ALEXEY: For interference as well ?
+	      if ( ScanCount > 1501 )
+		{
+		  QMessageBox::critical( this,
+					 tr( "*ERROR* in Submitting Protocol" ),
+					 tr( "Protocol cannot be submitted: \n"
+					     "Number of scans per cell per wavelengths is %1. \n" 
+					     "It must be less than 1501. \n\n"
+					     "Please revise experiment parameters accordingly." ).arg( ScanCount ) );
+
+		  return;
+		}
+	      
                QString scan_count        = QString::number( ScanCount );               // <-- ScanInterval
                QString scan_interval     = QString::number( int(ScanInt) );            // <-- ScanCount