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

WellLogPath. Fix memory leak

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2017-10-25 20:20:12 +02:00
parent e7ced4f59b
commit fcefa1e55b
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,7 +53,7 @@ void RicWellLogFileCloseFeature::onActionTriggered(bool isChecked)
if (parentWellPath != nullptr) if (parentWellPath != nullptr)
{ {
parentWellPath->removeWellLogFile(wellLogFile); parentWellPath->deleteWellLogFile(wellLogFile);
} }
parentWellPath->updateConnectedEditors(); parentWellPath->updateConnectedEditors();
} }

7
ApplicationCode/ProjectDataModel/RimWellPath.cpp
View File

@@ -653,13 +653,14 @@ void RimWellPath::addWellLogFile(RimWellLogFile* logFileInfo)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimWellPath::removeWellLogFile(const RimWellLogFile* logFileInfo) void RimWellPath::deleteWellLogFile(RimWellLogFile* logFileInfo)
{ {
auto pdmObject = dynamic_cast<caf::PdmObjectHandle*>(logFileInfo);
for (size_t i = 0; i < m_wellLogFiles.size(); i++) for (size_t i = 0; i < m_wellLogFiles.size(); i++)
{ {
if (m_wellLogFiles[i] == logFileInfo) if (m_wellLogFiles[i] == pdmObject)
{ {
m_wellLogFiles.erase(i); m_wellLogFiles.removeChildObject(pdmObject);
break; break;
} }
} }

2
ApplicationCode/ProjectDataModel/RimWellPath.h
View File

@@ -65,7 +65,7 @@ public:
virtual ~RimWellPath(); virtual ~RimWellPath();
void addWellLogFile(RimWellLogFile* logFileInfo); void addWellLogFile(RimWellLogFile* logFileInfo);
void removeWellLogFile(const RimWellLogFile* logFileInfo); void deleteWellLogFile(RimWellLogFile* logFileInfo);
virtual caf::PdmFieldHandle* userDescriptionField(); virtual caf::PdmFieldHandle* userDescriptionField();
virtual caf::PdmFieldHandle* objectToggleField(); virtual caf::PdmFieldHandle* objectToggleField();