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

#5389 Delete empty measurement curves after deleting or changing measurements.

Browse Source
This commit is contained in:
Gaute Lindkvist
2020-02-07 13:00:48 +01:00
parent 85bf09cefe
commit 2bb93ef872
11 changed files with 72 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Commands/RicDeleteWellMeasurementFilePathFeature.cpp
View File

@@ -54,7 +54,7 @@ void RicDeleteWellMeasurementFilePathFeature::onActionTriggered( bool isChecked
wellMeasurementCollection->removeMeasurementsForFilePath( filePath );
wellMeasurementCollection->removeFilePath( filePath );
wellMeasurementCollection->deleteAllEmptyCurves();
wellMeasurementCollection->uiCapability()->updateConnectedEditors();
}

1
ApplicationCode/Commands/RicReloadWellMeasurementsFeature.cpp
View File

@@ -53,6 +53,7 @@ void RicReloadWellMeasurementsFeature::onActionTriggered( bool isChecked )
RicWellMeasurementImportTools::removeWellMeasurementsFromFiles( filePaths );
RicWellMeasurementImportTools::importWellMeasurementsFromFiles( filePaths );
RicWellMeasurementImportTools::deleteAllEmptyMeasurementCurves();
}
//--------------------------------------------------------------------------------------------------

15
ApplicationCode/Commands/RicWellMeasurementImportTools.cpp
View File

@@ -141,6 +141,21 @@ void RicWellMeasurementImportTools::removeWellMeasurementsFromFiles( const std::
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicWellMeasurementImportTools::deleteAllEmptyMeasurementCurves()
{
RiaApplication* app = RiaApplication::instance();
std::vector<RimWellMeasurementCollection*> measurementCollections;
app->project()->descendantsIncludingThisOfType( measurementCollections );
for ( auto measurementCollection : measurementCollections )
{
measurementCollection->deleteAllEmptyCurves();
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

1
ApplicationCode/Commands/RicWellMeasurementImportTools.h
View File

@@ -33,6 +33,7 @@ class RicWellMeasurementImportTools
public:
static void importWellMeasurementsFromFiles( const std::vector<RimWellMeasurementFilePath*>& filePaths );
static void removeWellMeasurementsFromFiles( const std::vector<RimWellMeasurementFilePath*>& filePaths );
static void deleteAllEmptyMeasurementCurves();
static void importWellMeasurementsFromFiles( const QStringList& filePaths, RimWellPathCollection* wellPathCollection );

2
ApplicationCode/Commands/WellLogCommands/RicWellLogPlotTrackFeatureImpl.cpp
View File

@@ -54,7 +54,7 @@ void RicWellLogPlotTrackFeatureImpl::moveCurvesToWellLogPlotTrack( RimWellLogTra
curve->firstAncestorOrThisOfType( wellLogPlotTrack );
if ( wellLogPlotTrack )
{
wellLogPlotTrack->takeOutCurve( curve );
wellLogPlotTrack->removeCurve( curve );
wellLogPlotTrack->updateConnectedEditors();
srcTracks.insert( wellLogPlotTrack );
RimWellLogPlot* plot;