[us-commits] r2753 - in trunk/programs: us_com_project us_xpn_viewer

[svn at svn.aucsolutions.com]

Author: alexey
Date: 2019-05-02 18:46:22 +0000 (Thu, 02 May 2019)
New Revision: 2753

Modified:
   trunk/programs/us_com_project/us_com_project_gui.cpp
   trunk/programs/us_xpn_viewer/us_xpn_viewer_gui.cpp
Log:
minor but important updates on job reattachement... 



Modified: trunk/programs/us_com_project/us_com_project_gui.cpp
===================================================================
--- trunk/programs/us_com_project/us_com_project_gui.cpp	2019-05-02 15:21:51 UTC (rev 2752)
+++ trunk/programs/us_com_project/us_com_project_gui.cpp	2019-05-02 18:46:22 UTC (rev 2753)
@@ -344,6 +344,7 @@
   // protocol_details[ "experimentName" ] = QString("some_name");
   // protocol_details[ "CellChNumber" ] = QString("8");
   // protocol_details[ "TripleNumber" ] = QString("38");
+  // //protocol_details[ "TripleNumber" ] = QString("39"); //ALEXEY - incorrect - for testing
   // protocol_details[ "OptimaName" ] = QString("Optima 2");     // <-- Optima 2
   // protocol_details[ "duration" ]   = QString("36000");
   // protocol_details[ "dataPath" ]   = QString("/home/alexey/ultrascan/imports/RxRPPARhet-PPRE-MWL_180419-run352");

Modified: trunk/programs/us_xpn_viewer/us_xpn_viewer_gui.cpp
===================================================================
--- trunk/programs/us_xpn_viewer/us_xpn_viewer_gui.cpp	2019-05-02 15:21:51 UTC (rev 2752)
+++ trunk/programs/us_xpn_viewer/us_xpn_viewer_gui.cpp	2019-05-02 18:46:22 UTC (rev 2753)
@@ -2069,8 +2069,10 @@
 DbgLv(1) << "RDr:     iRId" << iRunId << "sMsks scnmask" << sMasks << scanmask;
 
  qDebug() << "RDr:     iRId" << iRunId << "sMsks scnmask" << sMasks << scanmask;
-   
- xpn_data->import_data( iRunId, scanmask );                              // ALEXEY <-- actual data retreiving
+
+ //ALEXEY: maybe put in_reload_check_sysdata = true; and then false (after xpn_data->import_data( iRunId, scanmask ); )
+ in_reload_check_sysdata = true; //ALEXEY
+ xpn_data->import_data( iRunId, scanmask );                               // ALEXEY <-- actual data retreiving
    int ntsrows        = xpn_data->countOf( "scan_rows" );
 DbgLv(1) << "RDr:     ntsrows" << ntsrows;
 DbgLv(1) << "RDr:      knt(triple)   " << xpn_data->countOf( "triple"    );
@@ -2087,6 +2089,8 @@
 
    le_status->setText( tr( "Initial Raw Optima data import complete." ) );
    qApp->processEvents();
+   in_reload_check_sysdata = false; //ALEXEY
+   
 double tm1=(double)sttime.msecsTo(QDateTime::currentDateTime())/1000.0;
    QStringList opsys;