Author: alexey Date: 2019-08-08 01:00:11 +0000 (Thu, 08 Aug 2019) New Revision: 2804 Modified: trunk/programs/us_experiment/us_exp_utils.cpp trunk/programs/us_experiment/us_experiment_gui_optima.cpp trunk/programs/us_experiment/us_experiment_gui_optima.h trunk/programs/us_experiment/us_proto_ranges.cpp Log: Preclude saving exp. protocol if #scans exceeds 1501.. Modified: trunk/programs/us_experiment/us_exp_utils.cpp =================================================================== --- trunk/programs/us_experiment/us_exp_utils.cpp 2019-08-07 20:01:20 UTC (rev 2803) +++ trunk/programs/us_experiment/us_exp_utils.cpp 2019-08-08 01:00:11 UTC (rev 2804) @@ -2396,6 +2396,9 @@ else scancount = int( duration_sec / ( scanint_sec_min * Total_wvl[i] ) ); } + + mainw->ScanCount_global = scancount; + DbgLv(1) << "EGRn:inP: speed" << i << "scancount" << scancount; QString scancount_stage = tr( "Stage %1. Number of Scans per Wavelength: %2 " ).arg(i+1).arg(scancount); cb_scancount->addItem( scancount_stage ); Modified: trunk/programs/us_experiment/us_experiment_gui_optima.cpp =================================================================== --- trunk/programs/us_experiment/us_experiment_gui_optima.cpp 2019-08-07 20:01:20 UTC (rev 2803) +++ trunk/programs/us_experiment/us_experiment_gui_optima.cpp 2019-08-08 01:00:11 UTC (rev 2804) @@ -46,6 +46,7 @@ usmode = false; global_reset = false; instruments_in_use.clear(); + ScanCount_global = 0; // Create tab and panel widgets tabWidget = us_tabwidget(); @@ -4393,6 +4394,18 @@ // Slot to save the current Run Protocol void US_ExperGuiUpload::saveRunProtocol() { + + if ( mainw->ScanCount_global > 1501 ) + { + QMessageBox::critical( this, + tr( "*ERROR* in Saving Protocol" ), + tr( "Protocol cannot be saved: \n" + "Number of scans per cell per wavelengths is %1. \n" + "It must not exceed 1501. \n\n" + "Please revise experiment parameters accordingly." ).arg( mainw->ScanCount_global ) ); + return; + } + DbgLv(1) << "EGUp:svRP: IN"; // Test that the current protocol name is new QStringList prnames; @@ -4807,7 +4820,7 @@ 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" + "It must not exceed 1501. \n\n" "Please revise experiment parameters accordingly." ).arg( ScanCount ) ); return; } @@ -5040,7 +5053,7 @@ 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" + "It must not exceed 1501. \n\n" "Please revise experiment parameters accordingly." ).arg( ScanCount ) ); return; Modified: trunk/programs/us_experiment/us_experiment_gui_optima.h =================================================================== --- trunk/programs/us_experiment/us_experiment_gui_optima.h 2019-08-07 20:01:20 UTC (rev 2803) +++ trunk/programs/us_experiment/us_experiment_gui_optima.h 2019-08-08 01:00:11 UTC (rev 2804) @@ -910,6 +910,8 @@ bool solutions_change; + int ScanCount_global; + bool connection_status; QString xpnhost; int xpnport; Modified: trunk/programs/us_experiment/us_proto_ranges.cpp =================================================================== --- trunk/programs/us_experiment/us_proto_ranges.cpp 2019-08-07 20:01:20 UTC (rev 2803) +++ trunk/programs/us_experiment/us_proto_ranges.cpp 2019-08-08 01:00:11 UTC (rev 2804) @@ -637,7 +637,8 @@ scancount = int( duration_sec / scanint_sec ); else scancount = int( duration_sec / (scanint_sec_min * tot_wvl) ); - + + mainw->ScanCount_global = scancount; QString scancount_stage = tr( "Stage %1. Number of Scans per Wavelength: %2 " ).arg(i+1).arg(scancount); cb_scancount->addItem( scancount_stage ); } @@ -777,6 +778,8 @@ scancount = int( duration_sec / scanint_sec ); else scancount = int( duration_sec / (scanint_sec_min * tot_wvl) ); + + mainw->ScanCount_global = scancount; QString scancount_stage = tr( "Stage %1. Number of Scans per Wavelength: %2 " ).arg(i+1).arg(scancount); cb_scancount->addItem( scancount_stage );
participants (1)
-
svn@svn.aucsolutions.com