r2839 - in trunk/programs: us_experiment us_xpn_viewer
Author: alexey Date: 2019-10-28 22:38:53 +0000 (Mon, 28 Oct 2019) New Revision: 2839 Modified: trunk/programs/us_experiment/us_exp_utils.cpp trunk/programs/us_experiment/us_experiment_gui_optima.cpp trunk/programs/us_xpn_viewer/us_xpn_viewer_gui.cpp Log: do not (re)save the protocol under new name if it was not changed... Modified: trunk/programs/us_experiment/us_exp_utils.cpp =================================================================== --- trunk/programs/us_experiment/us_exp_utils.cpp 2019-10-21 21:42:28 UTC (rev 2838) +++ trunk/programs/us_experiment/us_exp_utils.cpp 2019-10-28 22:38:53 UTC (rev 2839) @@ -2646,7 +2646,7 @@ ck_rp_diff ->setChecked( rps_differ ); pb_submit ->setEnabled( subm_enab ); // <-- Temporary enabled for testing - pb_saverp ->setEnabled( have_cells && have_solus && have_range ); // ALEXEY: add check here is rps_differ == true (protocols differ) + pb_saverp ->setEnabled( have_cells && have_solus && have_range && rps_differ ); // ALEXEY: add check here is rps_differ == true (protocols differ) // Show/hide Submit and Save buttons based on RunId given if ( US_Settings::us_inv_level() > 2 ) Modified: trunk/programs/us_experiment/us_experiment_gui_optima.cpp =================================================================== --- trunk/programs/us_experiment/us_experiment_gui_optima.cpp 2019-10-21 21:42:28 UTC (rev 2838) +++ trunk/programs/us_experiment/us_experiment_gui_optima.cpp 2019-10-28 22:38:53 UTC (rev 2839) @@ -4550,14 +4550,17 @@ QString dbhost = mainw->currentInstrument[ "optimaHost" ]; QString dbport = mainw->currentInstrument[ "optimaPort" ]; - if ( mainw->automode ) + if ( mainw->automode && rps_differ ) saveRunProtocol(); - else if ( !mainw->automode && have_run ) + else if ( !mainw->automode && have_run && rps_differ ) saveRunProtocol(); QMessageBox msgBox; - QString message_protocol = tr( "Protocol has been successfully saved to US-LIMS DB. \n\n"); + QString message_protocol = tr( ""); + if ( rps_differ ) + message_protocol += tr( "A new protocol has been successfully saved to US-LIMS DB. \n\n"); + QString message_submission = message_protocol + tr("Experiment will be submitted to the following Optima machine:"); //msgBox.setText(tr("Experiment will be submitted to the following Optima machine:")); Modified: trunk/programs/us_xpn_viewer/us_xpn_viewer_gui.cpp =================================================================== --- trunk/programs/us_xpn_viewer/us_xpn_viewer_gui.cpp 2019-10-21 21:42:28 UTC (rev 2838) +++ trunk/programs/us_xpn_viewer/us_xpn_viewer_gui.cpp 2019-10-28 22:38:53 UTC (rev 2839) @@ -2646,6 +2646,7 @@ qDebug() << "CellChNumber, cellchans.count() " << CellChNumber.toInt() << ", " << cellchans.count(); qDebug() << "TripleNumber, ntriple " << TripleNumber.toInt() << ", " << ntriple; + qDebug() << "finishing_live_update " << finishing_live_update; //ALEXEY: Add Exp. Abortion Exception HERE... if ( CheckExpComplete_auto( RunID_to_retrieve ) == 0 ) //ALEXEY should be == 3 as per documentation @@ -2694,6 +2695,9 @@ if ( !finishing_live_update ) { + qDebug() << "Switch to update!"; + + //update hereafter connect(timer_data_reload, SIGNAL(timeout()), this, SLOT( reloadData_auto( ) )); timer_data_reload->start(10000); // 5 sec }
participants (1)
-
svn@svn.aucsolutions.com