(#372) Drag Drop Move implemented.

User question on closing/moving a statistics source case
This commit is contained in:
Jacob Støren
2015-08-20 10:24:03 +02:00
parent ac529b77da
commit c599fd39f8
7 changed files with 178 additions and 51 deletions

View File

@@ -385,11 +385,14 @@ void RimIdenticalGridCaseGroup::updateMainGridAndActiveCellsForStatisticsCases()
{
RimEclipseCase* rimStaticsCase = statisticsCaseCollection->reservoirs[i];
rimStaticsCase->reservoirData()->setMainGrid(this->mainGrid());
if (i == 0)
if (rimStaticsCase->reservoirData())
{
rimStaticsCase->reservoirData()->computeActiveCellBoundingBoxes();
rimStaticsCase->reservoirData()->setMainGrid(this->mainGrid());
if (i == 0)
{
rimStaticsCase->reservoirData()->computeActiveCellBoundingBoxes();
}
}
}
}
@@ -404,8 +407,14 @@ void RimIdenticalGridCaseGroup::clearStatisticsResults()
RimEclipseCase* rimStaticsCase = statisticsCaseCollection->reservoirs[i];
if (!rimStaticsCase) continue;
rimStaticsCase->results(RifReaderInterface::MATRIX_RESULTS)->cellResults()->clearAllResults();
rimStaticsCase->results(RifReaderInterface::FRACTURE_RESULTS)->cellResults()->clearAllResults();
if (rimStaticsCase->results(RifReaderInterface::MATRIX_RESULTS)->cellResults())
{
rimStaticsCase->results(RifReaderInterface::MATRIX_RESULTS)->cellResults()->clearAllResults();
}
if (rimStaticsCase->results(RifReaderInterface::FRACTURE_RESULTS)->cellResults())
{
rimStaticsCase->results(RifReaderInterface::FRACTURE_RESULTS)->cellResults()->clearAllResults();
}
for (size_t j = 0; j < rimStaticsCase->reservoirViews.size(); j++)
{

View File

@@ -962,6 +962,7 @@ Qt::ItemFlags RimUiTreeModelPdm::flags(const QModelIndex &index) const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
// OBSOLETE - moved to RiuDragDrop
bool RimUiTreeModelPdm::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent)
{
const MimeDataWithIndexes* myMimeData = qobject_cast<const MimeDataWithIndexes*>(data);
@@ -996,6 +997,7 @@ bool RimUiTreeModelPdm::dropMimeData(const QMimeData *data, Qt::DropAction actio
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
// OBSOLETE - moved to RiuDragDrop
QMimeData* RimUiTreeModelPdm::mimeData(const QModelIndexList &indexes) const
{
MimeDataWithIndexes* myObj = new MimeDataWithIndexes();
@@ -1006,6 +1008,7 @@ QMimeData* RimUiTreeModelPdm::mimeData(const QModelIndexList &indexes) const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
// OBSOLETE - moved to RiuDragDrop
QStringList RimUiTreeModelPdm::mimeTypes() const
{
QStringList types;

View File

@@ -1180,6 +1180,7 @@ bool RimUiTreeView::hasClipboardValidData()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
// OBSOLETE - See RiuDragDrop
void RimUiTreeView::dropEvent(QDropEvent* dropEvent)
{
QModelIndexList affectedModels;