Changeset 2839


Ignore:
Timestamp:
Oct 28, 2019 10:38:53 PM (7 weeks ago)
Author:
alexey
Message:

do not (re)save the protocol under new name if it was not changed...

Location:
trunk/programs
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/programs/us_experiment/us_exp_utils.cpp

    r2804 r2839  
    26472647
    26482648   pb_submit  ->setEnabled( subm_enab  );                                  // <-- Temporary enabled for testing
    2649    pb_saverp  ->setEnabled( have_cells && have_solus && have_range );      // ALEXEY: add check here is rps_differ == true (protocols differ)
     2649   pb_saverp  ->setEnabled( have_cells && have_solus && have_range && rps_differ );      // ALEXEY: add check here is rps_differ == true (protocols differ)
    26502650
    26512651   // Show/hide Submit and Save buttons based on RunId given
  • trunk/programs/us_experiment/us_experiment_gui_optima.cpp

    r2832 r2839  
    45514551   QString dbport      = mainw->currentInstrument[ "optimaPort" ];
    45524552
    4553    if ( mainw->automode )
     4553   if ( mainw->automode && rps_differ )
    45544554     saveRunProtocol();
    4555    else if ( !mainw->automode && have_run )
     4555   else if ( !mainw->automode && have_run && rps_differ )
    45564556     saveRunProtocol();
    45574557   
    45584558   
    45594559   QMessageBox msgBox;
    4560    QString message_protocol = tr( "Protocol has been successfully saved to US-LIMS DB. \n\n");
     4560   QString message_protocol = tr( "");
     4561   if ( rps_differ )
     4562      message_protocol += tr( "A new protocol has been successfully saved to US-LIMS DB. \n\n");
     4563   
    45614564   QString message_submission = message_protocol + tr("Experiment will be submitted to the following Optima machine:");
    45624565   
  • trunk/programs/us_xpn_viewer/us_xpn_viewer_gui.cpp

    r2836 r2839  
    26472647   qDebug() << "CellChNumber, cellchans.count() " << CellChNumber.toInt() << ", " << cellchans.count();
    26482648   qDebug() << "TripleNumber, ntriple " << TripleNumber.toInt() << ", " << ntriple;
     2649   qDebug() << "finishing_live_update " << finishing_live_update;
    26492650
    26502651   //ALEXEY: Add Exp. Abortion Exception HERE...
     
    26952696       if ( !finishing_live_update )
    26962697   {
     2698     qDebug() << "Switch to update!";
     2699
     2700     //update hereafter
    26972701     connect(timer_data_reload, SIGNAL(timeout()), this, SLOT( reloadData_auto( ) ));
    26982702     timer_data_reload->start(10000);     // 5 sec
Note: See TracChangeset for help on using the changeset viewer.