OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

MultiCase import dialog: Fixed errors in remove search folders and cases

Browse Source 
p4#: 20765
This commit is contained in:
Jacob Støren
2013-03-05 14:45:29 +01:00
parent 02c7cc2b06
commit 2c19c8010c
1 changed files with 61 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
ApplicationCode/UserInterface/RiuMultiCaseImportDialog.cpp
View File

@@ -96,6 +96,7 @@ void RiuMultiCaseImportDialog::on_m_addSearchFolderButton_clicked()
{
QString selectedFolder = QFileDialog::getExistingDirectory(this, "Select an Eclipse case search folder" );
QStringList folderNames = m_searchFolders->stringList();
if (!folderNames.contains(selectedFolder))
{
folderNames.push_back(selectedFolder);
@@ -111,11 +112,22 @@ void RiuMultiCaseImportDialog::on_m_addSearchFolderButton_clicked()
void RiuMultiCaseImportDialog::on_m_removeSearchFolderButton_clicked()
{
QModelIndexList selection = ui->m_searchFolderList->selectionModel()->selectedIndexes();
QStringList folderNames = m_searchFolders->stringList();
QStringList searchFoldersToRemove;
for (int i = 0; i < selection.size(); ++i)
{
ui->m_searchFolderList->model()->removeRow(selection[i].row(), selection[i].parent());
searchFoldersToRemove.push_back(folderNames[selection[i].row()]);
}
for (int i = 0; i < searchFoldersToRemove.size(); ++i)
{
folderNames.removeOne(searchFoldersToRemove[i]);
}
m_searchFolders->setStringList(folderNames);
if (selection.size())
{
updateGridFileList();
@@ -131,6 +143,32 @@ void RiuMultiCaseImportDialog::updateGridFileList()
QStringList folderNames = m_searchFolders->stringList();
QStringList gridFileNames;
// Filter the search folders to remove subfolders of existing roots'
bool okToAdd = true;
QStringList searchFoldersToRemove;
for (int i = 0; i < folderNames.size(); ++i)
for (int j = 0; j < folderNames.size(); ++j)
{
if ( i != j)
{
if (folderNames[i].startsWith(folderNames[j]))
{
// Remove folderNames[i]
searchFoldersToRemove.push_back(folderNames[i]);
}
}
}
// Remove the subfolders when adding a root
for (int i = 0; i < searchFoldersToRemove.size(); ++i)
{
folderNames.removeOne(searchFoldersToRemove[i]);
}
for (int i = 0; i < folderNames.size(); i++)
{
QString folderName = folderNames[i];
@@ -195,8 +233,28 @@ QStringList RiuMultiCaseImportDialog::eclipseCaseFileNames() const
void RiuMultiCaseImportDialog::on_m_removeEclipseCaseButton_clicked()
{
QModelIndexList selection = ui->m_eclipseCasesList->selectionModel()->selectedIndexes();
for (int i = 0; i < selection.size(); ++i)
if (selection.size())
{
ui->m_eclipseCasesList->model()->removeRow(selection[i].row(), selection[i].parent());
for (int i = 0; i < selection.size(); ++i)
{
ui->m_eclipseCasesList->model()->removeRow(selection[i].row(), selection[i].parent());
}
QModelIndexList selection = ui->m_eclipseCasesList->selectionModel()->selectedIndexes();
QStringList fileNames = m_eclipseGridFiles->stringList();
QStringList filenamesToRemove;
for (int i = 0; i < selection.size(); ++i)
{
filenamesToRemove.push_back(fileNames[selection[i].row()]);
}
for (int i = 0; i < filenamesToRemove.size(); ++i)
{
fileNames.removeOne(filenamesToRemove[i]);
}
m_eclipseGridFiles->setStringList(fileNames);
}
}