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

#5116 Implement delete of an imported file for well measurements.

Browse Source
This commit is contained in:
Kristian Bendiksen
2020-01-08 14:16:19 +01:00
parent 16f3108e64
commit 22aece407e
12 changed files with 322 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
ApplicationCode/ProjectDataModel/RimWellMeasurementCollection.cpp
View File

@@ -20,6 +20,7 @@
#include "RimProject.h"
#include "RimWellLogTrack.h"
#include "RimWellMeasurement.h"
#include "RimWellMeasurementFilePath.h"
#include "cafCmdFeatureMenuBuilder.h"
#include "cafPdmUiTableViewEditor.h"
@@ -40,6 +41,9 @@ RimWellMeasurementCollection::RimWellMeasurementCollection()
m_measurements.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP );
m_measurements.uiCapability()->setUiTreeHidden( true );
CAF_PDM_InitFieldNoDefault( &m_importedFiles, "ImportedFiles", "Imported Files", "", "", "" );
m_importedFiles.uiCapability()->setUiTreeHidden( false );
this->setName( "Well Measurements" );
}
@@ -88,6 +92,7 @@ void RimWellMeasurementCollection::insertMeasurement( RimWellMeasurement* insert
else
m_measurements.push_back( measurement );
addFilePath( measurement->filePath() );
this->updateAllReferringTracks();
}
@@ -97,6 +102,7 @@ void RimWellMeasurementCollection::insertMeasurement( RimWellMeasurement* insert
void RimWellMeasurementCollection::appendMeasurement( RimWellMeasurement* measurement )
{
m_measurements.push_back( measurement );
addFilePath( measurement->filePath() );
this->updateAllReferringTracks();
}
@@ -145,6 +151,7 @@ void RimWellMeasurementCollection::defineEditorAttribute( const caf::PdmFieldHan
void RimWellMeasurementCollection::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
{
uiOrdering.add( &m_measurements );
uiOrdering.skipRemainingFields( true );
}
//--------------------------------------------------------------------------------------------------
@@ -153,6 +160,7 @@ void RimWellMeasurementCollection::defineUiOrdering( QString uiConfigName, caf::
void RimWellMeasurementCollection::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering,
QString uiConfigName /*= ""*/ )
{
uiTreeOrdering.add( &m_importedFiles );
uiTreeOrdering.skipRemainingChildren( true );
}
@@ -171,3 +179,68 @@ void RimWellMeasurementCollection::fieldChangedByUi( const caf::PdmFieldHandle*
this->updateAllReferringTracks();
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::set<QString> RimWellMeasurementCollection::importedFiles() const
{
std::set<QString> importedFiles;
for ( auto importedFile : m_importedFiles )
{
importedFiles.insert( importedFile->filePath() );
}
return importedFiles;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellMeasurementCollection::addFilePath( const QString& filePath )
{
std::set<QString> existingFilePaths = importedFiles();
if ( existingFilePaths.find( filePath ) == existingFilePaths.end() )
{
RimWellMeasurementFilePath* measurementFilePath = new RimWellMeasurementFilePath;
measurementFilePath->setFilePath( filePath );
m_importedFiles.push_back( measurementFilePath );
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellMeasurementCollection::removeFilePath( RimWellMeasurementFilePath* measurementFilePath )
{
m_importedFiles.removeChildObject( measurementFilePath );
delete measurementFilePath;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellMeasurementCollection::removeMeasurementsForFilePath( RimWellMeasurementFilePath* measurementFilePath )
{
// Find all measurements for this file path
std::vector<RimWellMeasurement*> measurementsToRemove;
for ( auto attr : m_measurements )
{
if ( attr->filePath() == measurementFilePath->filePath() )
{
measurementsToRemove.push_back( attr );
}
}
// Remove then remove them without invalidating the iterator
for ( unsigned int i = 0; i < measurementsToRemove.size(); i++ )
{
m_measurements.removeChildObject( measurementsToRemove[i] );
delete measurementsToRemove[i];
}
RimProject* proj;
this->firstAncestorOrThisOfTypeAsserted( proj );
proj->scheduleCreateDisplayModelAndRedrawAllViews();
this->updateAllReferringTracks();
}