r2764 - in trunk/programs: us_com_project us_convert
Author: alexey Date: 2019-05-15 20:19:58 +0000 (Wed, 15 May 2019) New Revision: 2764 Modified: trunk/programs/us_com_project/us_com_project_gui.cpp trunk/programs/us_convert/us_convert_gui.cpp Log: remove treating duplicates in channel description for now... Modified: trunk/programs/us_com_project/us_com_project_gui.cpp =================================================================== --- trunk/programs/us_com_project/us_com_project_gui.cpp 2019-05-13 22:25:23 UTC (rev 2763) +++ trunk/programs/us_com_project/us_com_project_gui.cpp 2019-05-15 20:19:58 UTC (rev 2764) @@ -387,7 +387,7 @@ return; - // Dialog of aexisting autoflow records + // Dialog of existing autoflow records US_Passwd pw; US_DB2* dbP = new US_DB2( pw.getPasswd() ); list_all_autoflow_records( autoflowdata, dbP ); @@ -397,7 +397,7 @@ int prx; hdrs << "ID" << "Run Name" - << "Optima" + << "Optima Name" << "Created" << "Started"; @@ -415,8 +415,12 @@ if ( pdiag->exec() == QDialog::Accepted ) autoflow_id_selected = autoflowdata[ prx ][ 0 ]; else - return; - + { + //ALEXEY: define what to do if Optima is occupied, OR if there is another Optima (occupied or not) + // autoflowdata[ i ][ 2 ]; // <-- gives Optima Name + // autoflowdata[ i ][ 4 ]; // <-- STARTED / NOT STARTED + return; + } // ------------------------------------------------------------------------------------------------- // Get detailed info on the autoflow record @@ -430,8 +434,7 @@ QString invID_passed = protocol_details[ "invID_passed" ]; QString ProtName = protocol_details[ "protocolName" ]; - - + //ALEXEY: if stage=="EDITING" && curDir.isEmpty() (NULL) /* -- that means that Run Completed but Directory was created on different computer Modified: trunk/programs/us_convert/us_convert_gui.cpp =================================================================== --- trunk/programs/us_convert/us_convert_gui.cpp 2019-05-13 22:25:23 UTC (rev 2763) +++ trunk/programs/us_convert/us_convert_gui.cpp 2019-05-15 20:19:58 UTC (rev 2764) @@ -1536,54 +1536,54 @@ le_runID ->setText( runID ); scanTolerance = 5.0; - //ALEXEY: Remove Duplicates in Channel's description - for (int i = 0; i < allData.size(); i++) - { - qDebug() << "Description BEFORE: " << i << ", " << allData[ i ].description; + // //ALEXEY: Remove Duplicates in Channel's description + // for (int i = 0; i < allData.size(); i++) + // { + // qDebug() << "Description BEFORE: " << i << ", " << allData[ i ].description; - QString desc = allData[ i ].description; - desc.replace(",", ""); - QString desc_a = desc.split(QRegExp(";"))[0]; - QString desc_b = desc.split(QRegExp(";"))[1]; + // QString desc = allData[ i ].description; + // desc.replace(",", ""); + // QString desc_a = desc.split(QRegExp(";"))[0]; + // QString desc_b = desc.split(QRegExp(";"))[1]; - //list of channel A desc - QStringList desc_list_a = desc_a.split(QRegExp("\\s+")); - desc_list_a.removeDuplicates(); + // //list of channel A desc + // QStringList desc_list_a = desc_a.split(QRegExp("\\s+")); + // desc_list_a.removeDuplicates(); - //list of channel B desc - QStringList desc_list_b = desc_b.split(QRegExp("\\s+")); - desc_list_b.removeDuplicates(); + // //list of channel B desc + // QStringList desc_list_b = desc_b.split(QRegExp("\\s+")); + // desc_list_b.removeDuplicates(); - QString final_desc(""); + // QString final_desc(""); - for ( int i=0; i<desc_list_a.size(); i++ ) - { - if ( desc_list_a[i].isEmpty() ) - continue; - final_desc += desc_list_a[i]; + // for ( int i=0; i<desc_list_a.size(); i++ ) + // { + // if ( desc_list_a[i].isEmpty() ) + // continue; + // final_desc += desc_list_a[i]; - if ( i != desc_list_a.size() - 1) - final_desc += QString(" "); - else - final_desc += QString("; "); + // if ( i != desc_list_a.size() - 1) + // final_desc += QString(" "); + // else + // final_desc += QString("; "); - } - for ( int i=0; i<desc_list_b.size(); i++ ) - { - if ( desc_list_b[i].isEmpty() ) - continue; - final_desc += desc_list_b[i]; + // } + // for ( int i=0; i<desc_list_b.size(); i++ ) + // { + // if ( desc_list_b[i].isEmpty() ) + // continue; + // final_desc += desc_list_b[i]; - if ( i != desc_list_b.size() - 1) - final_desc += QString(" "); - // else - // final_desc += QString("; "); + // if ( i != desc_list_b.size() - 1) + // final_desc += QString(" "); + // // else + // // final_desc += QString("; "); - } + // } - allData[ i ].description = final_desc; - qDebug() << "Description AFTER: " << i << ", " << allData[ i ].description; - } + // allData[ i ].description = final_desc; + // qDebug() << "Description AFTER: " << i << ", " << allData[ i ].description; + // } if ( ! init_output_data() ) return;
participants (1)
-
svn@svn.aucsolutions.com