Changeset 2810


Ignore:
Timestamp:
Aug 13, 2019 10:54:23 PM (3 months ago)
Author:
alexey
Message:

Autoflow's live_update:

  • reset wavelengths && lambda range upon reattach.
  • make sure ExpID is coupled to RunID in autoflow record when reattaching (maybe different when same protoocl re-launched manually from Optima bypassing us_Comproject)
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/programs/us_xpn_viewer/us_xpn_viewer_gui.cpp

    r2809 r2810  
    11641164   //le_dbhost  ->setText( xpnhost + ":" + xpnport + "   (" + xpndesc + ")" );       //New
    11651165
     1166   //Also clear Wavelengths && Lambda ranges:
     1167   cb_pltrec ->clear();
     1168   le_lrange ->setText("");
     1169   
     1170   
    11661171   pb_loadXpn ->setEnabled( true );
    11671172   pb_loadAUC ->setEnabled( true );
     
    15821587      //msg_data_avail->close();
    15831588      //ok_msg_data->click();
     1589
     1590      //ALEXEY: make sure ExpID is coupled to the RunID which is already in the autoflow DB
     1591      if ( !runID_passed.isEmpty() || runID_passed != "NULL" )
     1592  {
     1593    if ( runID_passed.toInt() != RunID_to_retrieve.toInt() )
     1594      {
     1595        RunID_to_retrieve = runID_passed;
     1596        qDebug() << "Correcting RunID to : " << RunID_to_retrieve;
     1597      }
     1598  }
     1599 
    15841600     
    15851601      //ALEXEY: need to update 'autoflow' table with the unique RunID_to_retrieve && Start Run Time fields !!!
     
    19852001        //emit experiment_complete_auto( currentDir, ProtocolName, invID_passed, correctRadii  );  // Updtade later: what should be passed with signal ??
    19862002
    1987         reset_auto();
     2003        //reset_auto();
    19882004        emit experiment_complete_auto( details_at_live_update );
    19892005       
     
    20792095void US_XpnDataViewer::check_for_data( QMap < QString, QString > & protocol_details)
    20802096{
     2097  //Also reset the panel before reattachement
     2098  reset_auto();
     2099 
    20812100  xpn_data->setEtimOffZero(); //ALEXEY: intialize etimoff to zero for the first time
    20822101
     
    21362155    disconnect(timer_data_init, SIGNAL(timeout()), 0, 0);   //Disconnect timer from anything
    21372156   
    2138     reset_auto();
     2157    //reset_auto();
    21392158
    21402159    emit close_program();
     
    22322251      timer_end_processes->stop();
    22332252      disconnect(timer_end_processes, SIGNAL(timeout()), 0, 0);   //Disconnect timer from anything
    2234      
    2235       reset_auto();
     2253
     2254      //ALEXEY: may not be needed
     2255      //reset_auto();
    22362256      qDebug() << "LIVE UPDATE panel has been reset!";
    22372257      qDebug() << "AFTER: " << in_reload_auto << ", " << in_reload_all_data << ", " << in_reload_data_init << ", " << in_reload_check_sysdata;
     
    25482568     updateautoflow_record_atLiveUpdate();
    25492569
    2550      reset_auto();
     2570     //reset_auto();
    25512571     emit experiment_complete_auto( details_at_live_update  );
    25522572     return;
     
    39643984
    39653985        updateautoflow_record_atLiveUpdate();
    3966         reset_auto();
     3986        //reset_auto();
    39673987
    39683988        in_reload_auto   = false;
Note: See TracChangeset for help on using the changeset viewer.