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

Fix missing blocking of selection manager update when updating table selection

Browse Source 
Caused crash in the Well Path editing (dragging targets)
This commit is contained in:
Jacob Støren 2018-08-30 15:43:24 +02:00
parent bddaf9d602
commit e93a07b43b
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewEditor.cpp
View File

@ -298,8 +298,10 @@ void PdmUiTableViewEditor::onSelectionManagerSelectionChanged(int selectionLevel
QItemSelection itemSelection = m_tableModelPdm->modelIndexFromPdmObject(pdmObj); QItemSelection itemSelection = m_tableModelPdm->modelIndexFromPdmObject(pdmObj);
totalSelection.merge(itemSelection, QItemSelectionModel::Select); totalSelection.merge(itemSelection, QItemSelectionModel::Select);
} }
m_isUpdatingSelectionQModel = true;
m_tableView->selectionModel()->select(totalSelection, QItemSelectionModel::SelectCurrent); m_tableView->selectionModel()->select(totalSelection, QItemSelectionModel::SelectCurrent);
m_isUpdatingSelectionQModel = false;
} }
} }
@ -310,7 +312,7 @@ void PdmUiTableViewEditor::onSelectionManagerSelectionChanged(int selectionLevel
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void PdmUiTableViewEditor::slotSelectionChanged(const QItemSelection & selected, const QItemSelection & deselected) void PdmUiTableViewEditor::slotSelectionChanged(const QItemSelection & selected, const QItemSelection & deselected)
{ {
updateSelectionManagerFromTableSelection(); if (!m_isUpdatingSelectionQModel) updateSelectionManagerFromTableSelection();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

1
Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewEditor.h
View File

@ -157,6 +157,7 @@ private:
int m_tableSelectionLevel; int m_tableSelectionLevel;
int m_rowSelectionLevel; int m_rowSelectionLevel;
bool m_isBlockingSelectionManagerChanged; bool m_isBlockingSelectionManagerChanged;
bool m_isUpdatingSelectionQModel;
caf::PdmChildArrayFieldHandle* m_previousFieldHandle; caf::PdmChildArrayFieldHandle* m_previousFieldHandle;
}; };