Author: alexey Date: 2019-05-17 05:39:46 +0000 (Fri, 17 May 2019) New Revision: 2766 Modified: trunk/programs/us_convert/us_convert_gui.cpp trunk/programs/us_convert/us_convert_gui.h Log: bug fix Modified: trunk/programs/us_convert/us_convert_gui.cpp =================================================================== --- trunk/programs/us_convert/us_convert_gui.cpp 2019-05-17 05:09:32 UTC (rev 2765) +++ trunk/programs/us_convert/us_convert_gui.cpp 2019-05-17 05:39:46 UTC (rev 2766) @@ -1137,10 +1137,14 @@ qDebug() << "US_CONVERT: ExpData.invID, invID_passed: " << ExpData.invID << ", " << invID_passed; + QStringList currDir_list = currentDir.split("-run"); + runID_numeric = currDir_list[ currDir_list.size() - 1 ]; + runID_numeric.replace("/",""); + int impType = getImports_auto( currDir ); ProtocolName_auto = protocolName; - //ALEXEY: if there is no radii_correction data found, return for commercial, and present dialogue for academic: + //ALEXEY: if there is no radii_correction data found, return for commercial, and present dialog for academic: if ( correctRadii == "NO" ) { if ( !usmode ) // us_comprojetc @@ -1593,7 +1597,12 @@ // //TEMP // runID += QString("-test"); - qDebug() << "RUNID from files[0]: files[0]" << fname << ", runID: " << runID; + qDebug() << "RUNID from files[0]: files[0]" << fname << ", runID: " << runID; + // QStringList currDir_list = currentDir.split("-run"); + // QString runID_num = currDir_list[ currDir_list.size() - 1 ]; + // runID_num.replace("/",""); + // qDebug() << "Exp. RunID: " << runID_num; + le_runID2->setText( runID ); le_runID ->setText( runID ); @@ -4851,7 +4860,7 @@ QStringList qry; qry << "delete_autoflow_record" - << runID; + << runID_numeric; //db->query( qry ); Modified: trunk/programs/us_convert/us_convert_gui.h =================================================================== --- trunk/programs/us_convert/us_convert_gui.h 2019-05-17 05:09:32 UTC (rev 2765) +++ trunk/programs/us_convert/us_convert_gui.h 2019-05-17 05:39:46 UTC (rev 2766) @@ -140,6 +140,7 @@ QString runType; QString oldRunType; QString runID; + QString runID_numeric; QString tmst_fnamei; QLabel* lb_description;
participants (1)
-
svn@svn.aucsolutions.com