r2774 - in trunk/programs: us_com_project us_convert us_xpn_viewer
Author: alexey Date: 2019-05-21 22:53:01 +0000 (Tue, 21 May 2019) New Revision: 2774 Modified: trunk/programs/us_com_project/us_com_project_gui.cpp trunk/programs/us_convert/us_convert_gui.cpp trunk/programs/us_xpn_viewer/us_xpn_viewer_gui.cpp trunk/programs/us_xpn_viewer/us_xpn_viewer_gui.h Log: some bugs fixes for autoflow... Modified: trunk/programs/us_com_project/us_com_project_gui.cpp =================================================================== --- trunk/programs/us_com_project/us_com_project_gui.cpp 2019-05-21 15:27:52 UTC (rev 2773) +++ trunk/programs/us_com_project/us_com_project_gui.cpp 2019-05-21 22:53:01 UTC (rev 2774) @@ -491,8 +491,12 @@ QString correctRadii = protocol_details[ "correctRadii" ]; QString expAborted = protocol_details[ "expAborted" ]; + QDir directory( currDir ); + + qDebug() << "CURR DIRECTORY : " << currDir; + qDebug() << "1.ExpAborted: " << protocol_details[ "expAborted" ]; + qDebug() << "1.CorrectRadii: " << protocol_details[ "correctRadii" ]; - qDebug() << "CURR DIRECTORY : " << currDir; //ALEXEY: if stage=="EDITING" && curDir.isEmpty() (NULL) /* @@ -513,7 +517,7 @@ //do something //switch_to_post_processing( currDir, ProtName, invID_passed, correctRadii ); - if ( currDir.isEmpty() ) + if ( currDir.isEmpty() || !directory.exists() ) switch_to_live_update( protocol_details ); else switch_to_post_processing( protocol_details ); @@ -699,8 +703,9 @@ protocol_details[ "OptimaName" ] = db->value( 9 ).toString(); protocol_details[ "runStarted" ] = db->value( 10 ).toString(); protocol_details[ "invID_passed" ] = db->value( 11 ).toString(); - protocol_details[ "correctRadii" ] = db->value( 12 ).toString(); - protocol_details[ "expAborted" ] = db->value( 13 ).toString(); + + protocol_details[ "correctRadii" ] = db->value( 13 ).toString(); + protocol_details[ "expAborted" ] = db->value( 14 ).toString(); } } Modified: trunk/programs/us_convert/us_convert_gui.cpp =================================================================== --- trunk/programs/us_convert/us_convert_gui.cpp 2019-05-21 15:27:52 UTC (rev 2773) +++ trunk/programs/us_convert/us_convert_gui.cpp 2019-05-21 22:53:01 UTC (rev 2774) @@ -1153,6 +1153,8 @@ int impType = getImports_auto( details_at_live_update[ "dataPath" ] ); + qDebug() << "ExpAborted: " << details_at_live_update[ "expAborted" ]; + qDebug() << "CorrectRadii: " << details_at_live_update[ "correctRadii" ]; /* -------------------------------------------------------------------------------------------------------------------*/ //ALEXEY: Case when Run was manually aborted from Optima panel: @@ -1778,8 +1780,11 @@ } if (!us_convert_auto_mode) - le_status->setText( tr( "AUC data import IS COMPLETE." ) ); - + { + //le_status->setText( tr( "AUC data import IS COMPLETE." ) ); + le_status->setText( tr( "Loading Data from Disk Successful." ) ); + } + pb_showTmst->setEnabled( ! tmst_fnamei.isEmpty() ); } @@ -2800,7 +2805,8 @@ //le_centerpieceDesc ->setText( QString::number(out_chaninfo[ tripListx ].centerpiece) ); le_centerpieceDesc ->setText( out_chaninfo[ tripListx ].centerpieceName ); - le_status->setText( tr( "AUC data import IS COMPLETE." ) ); + //le_status->setText( tr( "AUC data import IS COMPLETE." ) ); + le_status->setText( tr( "Data Acquision COMPLETE." ) ); enableSaveBtn_auto(); } Modified: trunk/programs/us_xpn_viewer/us_xpn_viewer_gui.cpp =================================================================== --- trunk/programs/us_xpn_viewer/us_xpn_viewer_gui.cpp 2019-05-21 15:27:52 UTC (rev 2773) +++ trunk/programs/us_xpn_viewer/us_xpn_viewer_gui.cpp 2019-05-21 22:53:01 UTC (rev 2774) @@ -1149,7 +1149,93 @@ } +void US_XpnDataViewer::reset_auto( void ) +{ + runID = ""; + currentDir = US_Settings::importDir() + "/" + runID; + cb_cellchn ->disconnect(); + cb_cellchn ->clear(); + le_dir ->setText( currentDir ); + le_runID ->setText( runID ); + //le_dbhost ->setText( xpnhost + ":" + xpnport + " (" + xpndesc + ")" ); //New + pb_loadXpn ->setEnabled( true ); + pb_loadAUC ->setEnabled( true ); + pb_details ->setEnabled( false ); + pb_reload ->setEnabled( false ); + ck_autorld ->setEnabled( true ); + cb_cellchn ->setEnabled( false ); + cb_rstart ->setEnabled( false ); + cb_rend ->setEnabled( false ); + cb_pltrec ->setEnabled( false ); + pb_prev ->setEnabled( false ); + pb_next ->setEnabled( false ); + ct_from ->setEnabled( false ); + ct_to ->setEnabled( false ); + pb_exclude ->setEnabled( false ); + pb_include ->setEnabled( false ); + pb_reset ->setEnabled( false ); + ct_from ->setEnabled( false ); + ct_to ->setEnabled( false ); + pb_exclude ->setEnabled( false ); + pb_include ->setEnabled( false ); + pb_plot2d ->setEnabled( false ); + pb_saveauc ->setEnabled( false ); + pb_showtmst->setEnabled( false ); +// pb_movie2d->setEnabled( false ); + + // Clear any data structures + allData .clear(); + lambdas .clear(); + r_radii .clear(); + excludes .clear(); + runInfo .clear(); + cellchans .clear(); + triples .clear(); + haveData = false; + + dPlotClearAll( data_plot ); + picker ->disconnect(); + data_plot->setAxisScale( QwtPlot::xBottom, 5.8, 7.2 ); + data_plot->setAxisScale( QwtPlot::yLeft , 0.0, 5e+4 ); + grid = us_grid( data_plot ); + data_plot->replot(); + + //ALEXEY: also reset sys data plot/temperature bar/RPM speedometer + dPlotClearAll( data_plot_rpm ); + picker_rpm ->disconnect(); + data_plot_rpm->setAxisScale( QwtPlot::xBottom, 1.0, 14400.0 ); + data_plot_rpm->setAxisScale( QwtPlot::yLeft , 0.0, 6e+4 ); + data_plot_rpm->setAxisScale( QwtPlot::yRight , 0.0, 40 ); + grid_rpm = us_grid( data_plot_rpm ); + data_plot_rpm->replot(); + //RPM/Temp. + rpm_box->setSpeed(0); + temperature_box->setTemp(0); + //times + le_elapsed ->setText("00:00:00"); + le_remaining->setText("00:00:00"); + le_running ->setText("00:00:00"); + + connect( cb_cellchn, SIGNAL( currentIndexChanged( int ) ), + this, SLOT ( changeCellCh( ) ) ); +// connect( plot, SIGNAL( zoomedCorners( QRectF ) ), +// this, SLOT ( currentRectf ( QRectF ) ) ); + + last_xmin = -1.0; + last_xmax = -1.0; + last_ymin = -1.0; + last_ymax = -1.0; + xpn_data = ( xpn_data == NULL ) ? new US_XpnData() : xpn_data; + + connect( xpn_data, SIGNAL( status_text ( QString ) ), + this, SLOT ( status_report( QString ) ) ); + + xpn_data->clear(); + le_status->setText( tr( "(no data loaded)" ) ); + +} + // Slot to read all Optima machines <------------------------------- // New void US_XpnDataViewer::read_optima_machines( US_DB2* db ) { @@ -1868,7 +1954,7 @@ updateautoflow_record_atLiveUpdate(); //emit experiment_complete_auto( currentDir, ProtocolName, invID_passed, correctRadii ); // Updtade later: what should be passed with signal ?? - reset(); + reset_auto(); emit experiment_complete_auto( details_at_live_update ); return; @@ -2314,7 +2400,7 @@ export_auc_auto(); updateautoflow_record_atLiveUpdate(); - reset(); + reset_auto(); emit experiment_complete_auto( details_at_live_update ); return; } @@ -3708,7 +3794,7 @@ // QMessageBox::information( this, mtitle_complete, message_done ); updateautoflow_record_atLiveUpdate(); - reset(); + reset_auto(); //emit experiment_complete_auto( currentDir, ProtocolName, invID_passed, correctRadii ); // Updtade later: what should be passed with signal ?? emit experiment_complete_auto( details_at_live_update ); Modified: trunk/programs/us_xpn_viewer/us_xpn_viewer_gui.h =================================================================== --- trunk/programs/us_xpn_viewer/us_xpn_viewer_gui.h 2019-05-21 15:27:52 UTC (rev 2773) +++ trunk/programs/us_xpn_viewer/us_xpn_viewer_gui.h 2019-05-21 22:53:01 UTC (rev 2774) @@ -295,6 +295,7 @@ private slots: void reset ( void ); + void reset_auto ( void ); void load_xpn_raw ( void ); //QMap <QString, QString> returnSelectedInstrument( US_DB2* = 0 );
participants (1)
-
svn@svn.aucsolutions.com