r2769 - in trunk/programs: us_com_project us_experiment
Author: alexey Date: 2019-05-18 20:56:17 +0000 (Sat, 18 May 2019) New Revision: 2769 Modified: trunk/programs/us_com_project/us_com_project_gui.cpp trunk/programs/us_experiment/us_experiment_gui_optima.cpp trunk/programs/us_experiment/us_experiment_gui_optima.h Log: Autoflow: bug fixed for proper job reatt./submission another run listing availale instruments correctly... Modified: trunk/programs/us_com_project/us_com_project_gui.cpp =================================================================== --- trunk/programs/us_com_project/us_com_project_gui.cpp 2019-05-18 04:00:52 UTC (rev 2768) +++ trunk/programs/us_com_project/us_com_project_gui.cpp 2019-05-18 20:56:17 UTC (rev 2769) @@ -464,6 +464,14 @@ { //ALEXEY: define what to do if some Optima(s) are occupied // should emit signal sending list of optima's in use to us_experiment. + + QString list_instruments_in_use = occupied_instruments.join(", "); + QMessageBox::warning( this, tr( "Occupied Instruments" ), + tr( "The following Optima instrument(s) \n" + "are currently in use: \n\n" + "%1 \n\n" + "You will not be able to submit another run \n" + "to these instruments at the moment.").arg( list_instruments_in_use ) ); define_new_experiment( occupied_instruments ); return; @@ -710,6 +718,8 @@ { tabWidget->setCurrentIndex( 0 ); // Maybe lock this panel from now on? i.e. tabWidget->tabBar()-setEnabled(false) ?? + qDebug() << "In define_new_experiment( QStringList & occupied_instruments )"; + emit pass_used_instruments( occupied_instruments ); } @@ -947,6 +957,7 @@ void US_ExperGui::pass_used_instruments( QStringList & occupied_instruments ) { + qDebug() << "In US_ExperGui::pass_used_instruments( QStringList & occupied_instruments )"; emit define_used_instruments( occupied_instruments ); } Modified: trunk/programs/us_experiment/us_experiment_gui_optima.cpp =================================================================== --- trunk/programs/us_experiment/us_experiment_gui_optima.cpp 2019-05-18 04:00:52 UTC (rev 2768) +++ trunk/programs/us_experiment/us_experiment_gui_optima.cpp 2019-05-18 20:56:17 UTC (rev 2769) @@ -184,7 +184,7 @@ } -void US_ExperimentMain::exclude_used_instrument( QStringList & occupied_instruments ) +void US_ExperimentMain::exclude_used_instruments( QStringList & occupied_instruments ) { instruments_in_use.clear(); qDebug() << "OCCUPIED IINSTRUMENTS: " << occupied_instruments; Modified: trunk/programs/us_experiment/us_experiment_gui_optima.h =================================================================== --- trunk/programs/us_experiment/us_experiment_gui_optima.h 2019-05-18 04:00:52 UTC (rev 2768) +++ trunk/programs/us_experiment/us_experiment_gui_optima.h 2019-05-18 20:56:17 UTC (rev 2769) @@ -914,7 +914,6 @@ void auto_mode_passed( void ); void us_mode_passed( void ); - void exclude_used_instrument( QStringList &); QStringList instruments_in_use; int tabHeight; @@ -957,7 +956,7 @@ void us_exp_clear( QString &protocolName ); //void auto_mode_passed( void ); void reset ( void ); - + void exclude_used_instruments( QStringList &); signals: void us_exp_is_closed( void ); void to_live_update( QMap < QString, QString > &protocol_details );
participants (1)
-
svn@svn.aucsolutions.com