Author: alexey Date: 2019-05-12 22:05:47 +0000 (Sun, 12 May 2019) New Revision: 2762 Modified: trunk/programs/us_convert/us_convert_gui.cpp trunk/utils/us_xpn_data.cpp Log: For importing data, remove dplicates in channel description.. Modified: trunk/programs/us_convert/us_convert_gui.cpp =================================================================== --- trunk/programs/us_convert/us_convert_gui.cpp 2019-05-11 06:54:32 UTC (rev 2761) +++ trunk/programs/us_convert/us_convert_gui.cpp 2019-05-12 22:05:47 UTC (rev 2762) @@ -1536,11 +1536,62 @@ 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; + + 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 B desc + QStringList desc_list_b = desc_b.split(QRegExp("\\s+")); + desc_list_b.removeDuplicates(); + + 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]; + + 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]; + + 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; + } + if ( ! init_output_data() ) return; setTripleInfo(); le_description -> setText( allData[ 0 ].description ); + + init_excludes(); plot_current(); saveStatus = NOT_SAVED; @@ -2216,6 +2267,8 @@ void US_ConvertGui::getLabInstrumentOperatorInfo_auto( void ) { + le_status->setText( tr( "Uploading Protocol Details..." ) ); + qApp->processEvents(); // Check DB connection US_Passwd pw; Modified: trunk/utils/us_xpn_data.cpp =================================================================== --- trunk/utils/us_xpn_data.cpp 2019-05-11 06:54:32 UTC (rev 2761) +++ trunk/utils/us_xpn_data.cpp 2019-05-12 22:05:47 UTC (rev 2762) @@ -1423,6 +1423,9 @@ DbgLv(1) << "BldRawD trip" << trnode << "descr" << rdata.description << "celchn" << celchn; + qDebug() << "BUILD_RAW_DATA trip: descr: " << trnode << "descr" << rdata.description + << "celchn" << celchn; + QDateTime time10=QDateTime::currentDateTime(); for ( int sgx = 0; sgx < nstgn; sgx++ ) { // Set scan values