Merge pull request #8732 from OPM/summarymultiplot_updates2

Summary Multiplot updates
This commit is contained in:
jonjenssen
2022-03-25 11:39:12 +01:00
committed by GitHub
parent 8feb0c363b
commit 8d3f41ded8
32 changed files with 423 additions and 316 deletions

View File

@@ -778,6 +778,8 @@ bool RiuDragDrop::handleGenericDropEvent( QEvent* event, std::vector<caf::PdmObj
const MimeDataWithIndexes* mimeData = nullptr;
Qt::KeyboardModifiers keyModifiers;
bool bResult = false;
if ( event->type() == QEvent::Drop )
{
// These drop events come from Qwt
@@ -788,6 +790,8 @@ bool RiuDragDrop::handleGenericDropEvent( QEvent* event, std::vector<caf::PdmObj
keyModifiers = dropEvent->keyboardModifiers();
dropEvent->acceptProposedAction();
dropEvent->accept();
bResult = true;
}
}
else if ( event->type() == QEvent::GraphicsSceneDrop )
@@ -799,6 +803,8 @@ bool RiuDragDrop::handleGenericDropEvent( QEvent* event, std::vector<caf::PdmObj
mimeData = qobject_cast<const MimeDataWithIndexes*>( dropEvent->mimeData() );
dropEvent->acceptProposedAction();
dropEvent->accept();
bResult = true;
}
}
@@ -819,8 +825,8 @@ bool RiuDragDrop::handleGenericDropEvent( QEvent* event, std::vector<caf::PdmObj
if ( obj ) droppedObjects.push_back( obj );
}
return true;
bResult = true;
}
return false;
return bResult;
}