diff --git a/Code/Mantid/Framework/ICat/inc/MantidICat/ICat3/ICat3Helper.h b/Code/Mantid/Framework/ICat/inc/MantidICat/ICat3/ICat3Helper.h
index 0df7abeae598316dfc1d1333bfc153b95e0fa13b..acc9e8b29972f1b44ce2683f20b213c470074b21 100644
--- a/Code/Mantid/Framework/ICat/inc/MantidICat/ICat3/ICat3Helper.h
+++ b/Code/Mantid/Framework/ICat/inc/MantidICat/ICat3/ICat3Helper.h
@@ -53,10 +53,10 @@ namespace Mantid
int doSearch(ICat3::ICATPortBindingProxy& icat,boost::shared_ptr<ICat3::ns1__searchByAdvanced>& request,ICat3::ns1__searchByAdvancedResponse& response);
/// calls getInvestigationIncludes api's
- int getDataFiles(long long invId,ICat3::ns1__investigationInclude inclide,API::ITableWorkspace_sptr& responsews_sptr);
+ int getDataFiles(long long invId,ICat3::ns1__investigationInclude include,API::ITableWorkspace_sptr& responsews_sptr);
/// this method calls Icat api getInvestigationIncludes and returns datasets for the given investigation id.
- int doDataSetsSearch(long long invId,ICat3::ns1__investigationInclude inclide,API::ITableWorkspace_sptr& responsews_sptr);
+ int doDataSetsSearch(long long invId,ICat3::ns1__investigationInclude include,API::ITableWorkspace_sptr& responsews_sptr);
/// This method lists the isntruments
void listInstruments(std::vector<std::string>& instruments);
diff --git a/Code/Mantid/Framework/ICat/src/ICat4/ICat4Catalog.cpp b/Code/Mantid/Framework/ICat/src/ICat4/ICat4Catalog.cpp
index 0cd62050e05407edd10ad6594f127d8d0f8bc88a..5dd50dcc8b8a257f7084278ea862fb4617385dca 100644
--- a/Code/Mantid/Framework/ICat/src/ICat4/ICat4Catalog.cpp
+++ b/Code/Mantid/Framework/ICat/src/ICat4/ICat4Catalog.cpp
@@ -487,8 +487,8 @@ namespace Mantid
/**
* Saves result from "getDataFiles" to workspace.
- * @param investigationId :: unique identifier of the investigation
- * @param outputws :: shared pointer to datasets
+ * @param response :: result response from the catalog.
+ * @param outputws :: shared pointer to datasets
*/
void ICat4Catalog::saveDataFiles(std::vector<xsd__anyType*> response, API::ITableWorkspace_sptr& outputws)
{
@@ -744,8 +744,7 @@ namespace Mantid
/**
* Convert a file size to human readable file format.
- * @param size :: The size in bytes of the file.
- * @return string :: A human readable file format (e.g. 5MB).
+ * @param fileSize :: The size in bytes of the file.
*/
std::string ICat4Catalog::bytesToString(int64_t &fileSize)
{
diff --git a/Code/Mantid/Framework/Kernel/src/CatalogInfo.cpp b/Code/Mantid/Framework/Kernel/src/CatalogInfo.cpp
index 95a54de926a1dce97ed97ba0a0a0a9bd8b62daaf..1c128ba6736f871d03fec6536c7cd869f9a6e7a6 100644
--- a/Code/Mantid/Framework/Kernel/src/CatalogInfo.cpp
+++ b/Code/Mantid/Framework/Kernel/src/CatalogInfo.cpp
@@ -151,7 +151,8 @@ namespace Mantid
/**
* Obtain the attribute from a given element tag and attribute name.
- * @param tagName :: The name of the tag to search for.
+ * @param element :: The name of the element in the XML file.
+ * @param tagName :: The name of the tag to search for.
* @param attributeName :: The name of the attribute for the given tag.
* @return The contents of the attribute from an XML element.
*/
diff --git a/Code/Mantid/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/ICatHelper.h b/Code/Mantid/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/ICatHelper.h
index 16ba6813c6554e049766d91ec693071c8153aed6..ec6346c6ad7b4dae9ae058c5b0febf4ddac72630 100644
--- a/Code/Mantid/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/ICatHelper.h
+++ b/Code/Mantid/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/ICatHelper.h
@@ -13,17 +13,17 @@ namespace MantidQt
public:
/// Obtain the list of instruments that are available.
- std::vector<std::string> getInstrumentList();
+ const std::vector<std::string> getInstrumentList();
/// Obtain the list of instruments that are available.
- std::vector<std::string> getInvestigationTypeList();
+ const std::vector<std::string> getInvestigationTypeList();
/// Run the search algorithm with the given user input.
- void executeSearch(std::map<std::string, std::string> userInputs);
+ void executeSearch(const std::map<std::string, std::string> &userInputs);
/// Search for all related dataFiles for the specified investigation.
- void executeGetDataFiles(int64_t investigationId);
+ void executeGetDataFiles(const int64_t &investigationId);
/// Download dataFile (via HTTP or copy if access to archive) and return the path to it.
- std::vector<std::string> downloadDataFiles(std::vector<std::pair<int64_t, std::string>> userSelectedFiles, std::string downloadPath);
+ const std::vector<std::string> downloadDataFiles(const std::vector<std::pair<int64_t, std::string>> &userSelectedFiles, const std::string &downloadPath);
/// Validate each input field against the related algorithm property.
- std::map<std::string, std::string> validateProperties(std::map<std::string, std::string> &inputFields);
+ const std::map<std::string, std::string> validateProperties(const std::map<std::string, std::string> &inputFields);
/// Using a property (isValid) in the list instruments algorithm verify if the session is valid.
bool validSession();
/// Open the login dialog if user not logged in.
@@ -34,6 +34,8 @@ namespace MantidQt
Mantid::API::IAlgorithm_sptr createCatalogAlgorithm(const std::string& algName);
/// Obtain the documentation for a given name from the given algorithm properties.
const std::string propertyDocumentation(const std::vector<Mantid::Kernel::Property*> &properties, const std::string &name);
+ /// Execute the given algorithm asynchronously.
+ void executeAsynchronously(const Mantid::API::IAlgorithm_sptr &algorithm);
};
} // namespace MantidWidgets
diff --git a/Code/Mantid/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/ICatSearch2.h b/Code/Mantid/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/ICatSearch2.h
index 7bdba735deb4e59f6458ddf510756d42f06f7e85..94a94878bdf387c23fe28d6262268e784d2a058d 100644
--- a/Code/Mantid/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/ICatSearch2.h
+++ b/Code/Mantid/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/ICatSearch2.h
@@ -55,11 +55,11 @@ namespace MantidQt
/// Make the headers in the provided table bold.
void emboldenTableHeaders(QTableWidget* table);
/// Setup table prior to adding data to it, such hiding vertical header.
- void setupTable(QTableWidget* table, size_t numOfRows, size_t numOfColumns);
+ void setupTable(QTableWidget* table, const size_t &numOfRows, const size_t &numOfColumns);
/// Populate the provided table with data from the provided workspace.
- void populateTable(QTableWidget* table, Mantid::API::ITableWorkspace_sptr workspace);
+ void populateTable(QTableWidget* table, const Mantid::API::ITableWorkspace_sptr &workspace);
/// Removes data associated with previous search.
- void clearSearch(QTableWidget* table, std::string& workspace);
+ void clearSearch(QTableWidget* table, const std::string &workspace);
/// Clear the "search" frame when an investigation has been selected.
void clearSearchFrame();
/// Clear the "search results" frame if no results are returned from search.
@@ -74,17 +74,17 @@ namespace MantidQt
void loadSettings();
///////////////////////////////////////////////////////////////////////////////
- /// Methods for: "Catalog Search"
+ // Methods for: "Catalog Search"
///////////////////////////////////////////////////////////////////////////////
/// Ensures the correct text box is updated when the date is selected on the calendar.
- void dateSelected(std::string buttonName);
+ void dateSelected(const std::string &buttonName);
/// Populate the instrument list-box.
void populateInstrumentBox();
/// Populate the investigation type list-box.
void populateInvestigationTypeBox();
/// Obtain the users' text input for each search field.
- std::map<std::string, std::string> getSearchFields();
+ const std::map<std::string, std::string> getSearchFields();
///////////////////////////////////////////////////////////////////////////////
// Methods for: "Search results"
@@ -106,17 +106,17 @@ namespace MantidQt
/// Add a row of checkboxes to the first column of a table.
void addCheckBoxColumn(QTableWidget* table);
/// Obtain the file details (file ID and name) for the file to download. (Used in downloadDataFiles).
- std::vector<std::pair<int64_t, std::string>> selectedDataFileNames();
+ const std::vector<std::pair<int64_t, std::string>> selectedDataFileNames();
/// Updates the dataFile text boxes with relevant info about the selected dataFile.
void updateDataFileLabels(QTableWidgetItem* item);
/// Obtain all file extensions from the provided column (dataFileResults -> File name).
std::set<std::string> getDataFileExtensions(Mantid::API::Column_sptr column);
/// Add the list of file extensions to the "Filter type..." drop-down.
- void populateDataFileType(std::set<std::string> extensions);
+ void populateDataFileType(const std::set<std::string> &extensions);
private slots:
/// Selects/deselects ALL rows in dataFile table.
- void selectAllDataFiles(bool toggled);
+ void selectAllDataFiles(const bool &toggled);
/// When the facility login button is clicked
void onFacilityLogin();
/// When the help button is clicked.
@@ -129,7 +129,7 @@ namespace MantidQt
void showDataFileInfo();
///////////////////////////////////////////////////////////////////////////////
- /// SLOTS for: "Catalog Search"
+ // SLOTS for: "Catalog Search"
///////////////////////////////////////////////////////////////////////////////
/// Open the DateTime Calendar to select date.
@@ -168,7 +168,7 @@ namespace MantidQt
/// Enables the download & load button if user has selected a data file to download.
void enableDownloadButtons();
/// Performs filterDataFileType() for specified filer type.
- void doFilter(int index);
+ void doFilter(const int &index);
/// Downloads selected datFiles to a specified location.
void downloadDataFiles();
/// Loads the selected dataFiles into workspaces.
diff --git a/Code/Mantid/MantidQt/MantidWidgets/src/ICatHelper.cpp b/Code/Mantid/MantidQt/MantidWidgets/src/ICatHelper.cpp
index 1d2d46e420ced82055f692fb39505882de09b6b1..9c3b45e9604018cb9951114b720fe5e29ceed993 100644
--- a/Code/Mantid/MantidQt/MantidWidgets/src/ICatHelper.cpp
+++ b/Code/Mantid/MantidQt/MantidWidgets/src/ICatHelper.cpp
@@ -13,10 +13,10 @@ namespace MantidQt
* Obtain the list of instruments from the ICAT Catalog algorithm.
* @return A vector containing the list of all instruments available.
*/
- std::vector<std::string> ICatHelper::getInstrumentList()
+ const std::vector<std::string> ICatHelper::getInstrumentList()
{
auto catalogAlgorithm = createCatalogAlgorithm("CatalogListInstruments");
- catalogAlgorithm->execute();
+ executeAsynchronously(catalogAlgorithm);
// return the vector containing the list of instruments available.
return (catalogAlgorithm->getProperty("InstrumentList"));
}
@@ -25,10 +25,10 @@ namespace MantidQt
* Obtain the list of investigation types from the ICAT Catalog algorithm.
* @return A vector containing the list of all investigation types available.
*/
- std::vector<std::string> ICatHelper::getInvestigationTypeList()
+ const std::vector<std::string> ICatHelper::getInvestigationTypeList()
{
auto catalogAlgorithm = createCatalogAlgorithm("CatalogListInvestigationTypes");
- catalogAlgorithm->execute();
+ executeAsynchronously(catalogAlgorithm);
// return the vector containing the list of investigation types available.
return (catalogAlgorithm->getProperty("InvestigationTypes"));
}
@@ -37,7 +37,7 @@ namespace MantidQt
* Search the archive with the user input terms provided and save them to a workspace ("searchResults").
* @param userInputFields :: A map containing all users' search fields - (key => FieldName, value => FieldValue).
*/
- void ICatHelper::executeSearch(std::map<std::string, std::string> userInputFields)
+ void ICatHelper::executeSearch(const std::map<std::string, std::string> &userInputFields)
{
auto catalogAlgorithm = createCatalogAlgorithm("CatalogSearch");
@@ -46,7 +46,7 @@ namespace MantidQt
// Iterate over the provided map of user input fields. For each field that isn't empty (e.g. a value was input by the user)
// then we will set the algorithm property with the key and value of that specific value.
- for ( std::map<std::string, std::string>::const_iterator it = userInputFields.begin(); it != userInputFields.end(); it++)
+ for (auto it = userInputFields.begin(); it != userInputFields.end(); it++)
{
std::string value = it->second;
// If the user has input any search terms.
@@ -57,18 +57,14 @@ namespace MantidQt
}
}
// Allow asynchronous execution to update label while search is being carried out.
- Poco::ActiveResult<bool> result(catalogAlgorithm->executeAsync());
- while( !result.available() )
- {
- QCoreApplication::processEvents();
- }
+ executeAsynchronously(catalogAlgorithm);
}
/**
* Search the archives for all dataFiles related to an "investigation id" then save results to workspace ("dataFileResults").
* @param investigationId :: The investigation id to use for the search.
*/
- void ICatHelper::executeGetDataFiles(int64_t investigationId)
+ void ICatHelper::executeGetDataFiles(const int64_t &investigationId)
{
auto catalogAlgorithm = createCatalogAlgorithm("CatalogGetDataFiles");
@@ -78,11 +74,7 @@ namespace MantidQt
catalogAlgorithm->setPropertyValue("OutputWorkspace","__dataFileResults");
// Allow asynchronous execution to update label(s) while search is being carried out.
- Poco::ActiveResult<bool> result(catalogAlgorithm->executeAsync());
- while( !result.available() )
- {
- QCoreApplication::processEvents();
- }
+ executeAsynchronously(catalogAlgorithm);
}
/**
@@ -91,7 +83,7 @@ namespace MantidQt
* @param downloadPath :: The location to save the datafile(s).
* @return A vector containing the paths to the file(s) the user wants.
*/
- std::vector<std::string> ICatHelper::downloadDataFiles(std::vector<std::pair<int64_t, std::string>> userSelectedFiles, std::string downloadPath)
+ const std::vector<std::string> ICatHelper::downloadDataFiles(const std::vector<std::pair<int64_t, std::string>> &userSelectedFiles,const std::string &downloadPath)
{
auto catalogAlgorithm = createCatalogAlgorithm("CatalogDownloadDataFiles");
@@ -102,7 +94,7 @@ namespace MantidQt
std::vector<std::string> fileNames;
// For each pair in userSelectedFiles we want to add them to their related vector to pass to the algorithm.
- for (std::vector<std::pair<int64_t,std::string>>::iterator it = userSelectedFiles.begin(); it != userSelectedFiles.end(); ++it)
+ for (auto it = userSelectedFiles.begin(); it != userSelectedFiles.end(); ++it)
{
fileIDs.push_back(it->first);
fileNames.push_back(it->second);
@@ -115,13 +107,7 @@ namespace MantidQt
catalogAlgorithm->setProperty("FileNames",fileNames);
catalogAlgorithm->setProperty("DownloadPath",downloadPath);
- Poco::ActiveResult<bool> result(catalogAlgorithm->executeAsync());
- while( !result.available() )
- {
- //TODO: Inform the user where the file was saved to depending on result, e.g:
- // (You do not have access to the archives. Downloading requested file over Internet...)
- QCoreApplication::processEvents();
- }
+ executeAsynchronously(catalogAlgorithm);
// Return a vector containing the file paths to the files to download.
return (catalogAlgorithm->getProperty("FileLocations"));
}
@@ -131,7 +117,7 @@ namespace MantidQt
* @param inputFields :: The name of the input field and value of the field (key => "StartDate", value => "00/00/0000").
* @return The name of the input field(s) marker to update and related error to throw.
*/
- std::map<std::string, std::string> ICatHelper::validateProperties(std::map<std::string, std::string> &inputFields)
+ const std::map<std::string, std::string> ICatHelper::validateProperties(const std::map<std::string, std::string> &inputFields)
{
auto catalogAlgorithm = createCatalogAlgorithm("CatalogSearch");
@@ -167,7 +153,7 @@ namespace MantidQt
{
auto catalogAlgorithm = createCatalogAlgorithm("CatalogListInstruments");
- catalogAlgorithm->execute();
+ executeAsynchronously(catalogAlgorithm);
if (catalogAlgorithm->getProperty("IsValid"))
{
@@ -189,7 +175,7 @@ namespace MantidQt
if(loginDialog->exec() == QDialog::Accepted)
{
- catalogAlgorithm->execute();
+ executeAsynchronously(catalogAlgorithm);
}
}
@@ -216,11 +202,24 @@ namespace MantidQt
* @param algName :: The name of the algorithm to create.
* @return A shared pointer to the algorithm created.
*/
- Mantid::API::IAlgorithm_sptr ICatHelper::createCatalogAlgorithm(const std::string& algName)
+ Mantid::API::IAlgorithm_sptr ICatHelper::createCatalogAlgorithm(const std::string &algName)
{
// If there is an exception we want it to be thrown.
return Mantid::API::AlgorithmManager::Instance().create(algName);
}
+ /**
+ * Execute the given algorithm asynchronously.
+ * @param algorithm :: The algorithm to execute.
+ */
+ void ICatHelper::executeAsynchronously(const Mantid::API::IAlgorithm_sptr &algorithm)
+ {
+ Poco::ActiveResult<bool> result(algorithm->executeAsync());
+ while(!result.available())
+ {
+ QCoreApplication::processEvents();
+ }
+ }
+
} // namespace MantidWidgets
} // namespace MantidQt
diff --git a/Code/Mantid/MantidQt/MantidWidgets/src/ICatSearch2.cpp b/Code/Mantid/MantidQt/MantidWidgets/src/ICatSearch2.cpp
index e639d2dae89f1d59d6437f31bd302f637d2a83d4..0debb0f3daa74e7ae17c44013360f21976805560 100644
--- a/Code/Mantid/MantidQt/MantidWidgets/src/ICatSearch2.cpp
+++ b/Code/Mantid/MantidQt/MantidWidgets/src/ICatSearch2.cpp
@@ -201,7 +201,7 @@ namespace MantidQt
* @param numOfRows :: The number of rows in the workspace.
* @param numOfColumns :: The number of columns in the workspace.
*/
- void ICatSearch2::setupTable(QTableWidget* table, size_t numOfRows, size_t numOfColumns)
+ void ICatSearch2::setupTable(QTableWidget* table, const size_t &numOfRows, const size_t &numOfColumns)
{
table->setRowCount(static_cast<int>(numOfRows));
table->setColumnCount(static_cast<int>(numOfColumns));
@@ -224,7 +224,7 @@ namespace MantidQt
* @param table :: The table we want to setup.
* @param workspace :: The workspace to obtain data information from.
*/
- void ICatSearch2::populateTable(QTableWidget* table, Mantid::API::ITableWorkspace_sptr workspace)
+ void ICatSearch2::populateTable(QTableWidget* table, const Mantid::API::ITableWorkspace_sptr &workspace)
{
//NOTE: This method freezes up the ICAT search GUI. We will need to do this adding in another thread.
@@ -264,7 +264,7 @@ namespace MantidQt
* @param table :: The table to modify and remove previous results from.
* @param workspace :: The workspace to remove.
*/
- void ICatSearch2::clearSearch(QTableWidget* table, std::string & workspace)
+ void ICatSearch2::clearSearch(QTableWidget* table, const std::string &workspace)
{
// Remove workspace if it exists.
if(Mantid::API::AnalysisDataService::Instance().doesExist(workspace))
@@ -372,7 +372,7 @@ namespace MantidQt
* Updates text field depending on button picker selected.
* @param buttonName :: The name of the text field is derived from the buttonName.
*/
- void ICatSearch2::dateSelected(std::string buttonName)
+ void ICatSearch2::dateSelected(const std::string &buttonName)
{
if (buttonName.compare("startDatePicker") == 0)
{
@@ -435,7 +435,7 @@ namespace MantidQt
* Get the users' input for each search field.
* @return A map containing all users' search fields - (key => FieldName, value => FieldValue).
*/
- std::map<std::string, std::string> ICatSearch2::getSearchFields()
+ const std::map<std::string, std::string> ICatSearch2::getSearchFields()
{
std::map<std::string, std::string> searchFieldInput;
@@ -891,7 +891,7 @@ namespace MantidQt
*
* @return A vector containing the fileID and fileName of the datafile(s) to download.
*/
- std::vector<std::pair<int64_t, std::string>> ICatSearch2::selectedDataFileNames()
+ const std::vector<std::pair<int64_t, std::string>> ICatSearch2::selectedDataFileNames()
{
QTableWidget* table = m_icatUiForm.dataFileResultsTbl;
@@ -950,7 +950,7 @@ namespace MantidQt
/**
* Add the list of file extensions to the "Filter type..." drop-down.
*/
- void ICatSearch2::populateDataFileType(std::set<std::string> extensions)
+ void ICatSearch2::populateDataFileType(const std::set<std::string> &extensions)
{
for( std::set<std::string>::const_iterator iter = extensions.begin(); iter != extensions.end(); ++iter)
{
@@ -966,7 +966,7 @@ namespace MantidQt
* If the user has checked "check all", then check and select ALL rows. Otherwise, deselect all.
* @param toggled :: True if user has checked the checkbox in the dataFile table header.
*/
- void ICatSearch2::selectAllDataFiles(bool toggled)
+ void ICatSearch2::selectAllDataFiles(const bool &toggled)
{
QTableWidget* table = m_icatUiForm.dataFileResultsTbl;
@@ -1016,7 +1016,7 @@ namespace MantidQt
/**
* Performs filter option for specified filer type.
*/
- void ICatSearch2::doFilter(int index)
+ void ICatSearch2::doFilter(const int &index)
{
QTableWidget* table = m_icatUiForm.dataFileResultsTbl;
@@ -1044,8 +1044,6 @@ namespace MantidQt
*/
void ICatSearch2::downloadDataFiles()
{
- std::vector<std::pair<int64_t, std::string>> dataFiles = selectedDataFileNames();
-
QString downloadSavePath = QFileDialog::getExistingDirectory(this, tr("Select a directory to save data files."), m_downloadSaveDir, QFileDialog::ShowDirsOnly);
// The user has clicked "Open" and changed the path (and not clicked cancel).
@@ -1056,7 +1054,7 @@ namespace MantidQt
// Save settings to store for use next time.
saveSettings();
// Download the selected dataFiles to the chosen directory.
- m_icatHelper->downloadDataFiles(dataFiles, m_downloadSaveDir.toStdString());
+ m_icatHelper->downloadDataFiles(selectedDataFileNames(), m_downloadSaveDir.toStdString());
}
}
@@ -1065,13 +1063,11 @@ namespace MantidQt
*/
void ICatSearch2::loadDataFiles()
{
- std::vector<std::pair<int64_t, std::string>> dataFiles = selectedDataFileNames();
-
// Get the path(s) to the file that was downloaded (via HTTP) or is stored in the archive.
- std::vector<std::string> filePaths = m_icatHelper->downloadDataFiles(dataFiles, m_downloadSaveDir.toStdString());
+ std::vector<std::string> filePaths = m_icatHelper->downloadDataFiles(selectedDataFileNames(), m_downloadSaveDir.toStdString());
// Create & initialize the load algorithm we will use to load the file by path to a workspace.
- Mantid::API::Algorithm_sptr loadAlgorithm = Mantid::API::AlgorithmManager::Instance().createUnmanaged("Load");
+ auto loadAlgorithm = Mantid::API::AlgorithmManager::Instance().createUnmanaged("Load");
loadAlgorithm->initialize();
// For all the files downloaded (or in archive) we want to load them.
@@ -1081,7 +1077,12 @@ namespace MantidQt
loadAlgorithm->setPropertyValue("Filename", filePaths.at(i));
// Sets the output workspace to be the name of the file.
loadAlgorithm->setPropertyValue("OutputWorkspace", Poco::Path(Poco::Path(filePaths.at(i)).getFileName()).getBaseName());
- loadAlgorithm->execute();
+
+ Poco::ActiveResult<bool> result(loadAlgorithm->executeAsync());
+ while( !result.available() )
+ {
+ QCoreApplication::processEvents();
+ }
}
}