From 903b692e8e73d836be5b14009fc7299fa359525b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A5l=20Hagen?= Date: Mon, 21 Sep 2015 14:10:04 +0200 Subject: [PATCH] (#468) Renamed method --- .../WellLogCommands/RicNewWellLogFileCurveFeature.cpp | 6 +++--- .../WellLogCommands/RicNewWellLogFileCurveFeature.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ApplicationCode/Commands/WellLogCommands/RicNewWellLogFileCurveFeature.cpp b/ApplicationCode/Commands/WellLogCommands/RicNewWellLogFileCurveFeature.cpp index 827f2d674b..d21829ba0e 100644 --- a/ApplicationCode/Commands/WellLogCommands/RicNewWellLogFileCurveFeature.cpp +++ b/ApplicationCode/Commands/WellLogCommands/RicNewWellLogFileCurveFeature.cpp @@ -44,7 +44,7 @@ CAF_CMD_SOURCE_INIT(RicNewWellLogFileCurveFeature, "RicNewWellLogFileCurveFeatur //-------------------------------------------------------------------------------------------------- bool RicNewWellLogFileCurveFeature::isCommandEnabled() { - return selectedWellLogPlotTrack() != NULL || selectedWellLogPlotTrackWithLogFile() != NULL; + return selectedWellLogPlotTrack() != NULL || selectedWellPathWithLogFile() != NULL; } //-------------------------------------------------------------------------------------------------- @@ -59,7 +59,7 @@ void RicNewWellLogFileCurveFeature::onActionTriggered(bool isChecked) } else { - RimWellPath* wellPath = selectedWellLogPlotTrackWithLogFile(); + RimWellPath* wellPath = selectedWellPathWithLogFile(); if (wellPath) { RimWellLogPlotTrack* wellLogPlotTrack = RicNewWellLogPlotFeatureImpl::createWellLogPlotTrack(); @@ -91,7 +91,7 @@ RimWellLogPlotTrack* RicNewWellLogFileCurveFeature::selectedWellLogPlotTrack() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimWellPath* RicNewWellLogFileCurveFeature::selectedWellLogPlotTrackWithLogFile() +RimWellPath* RicNewWellLogFileCurveFeature::selectedWellPathWithLogFile() { std::vector selection; caf::SelectionManager::instance()->objectsByType(&selection); diff --git a/ApplicationCode/Commands/WellLogCommands/RicNewWellLogFileCurveFeature.h b/ApplicationCode/Commands/WellLogCommands/RicNewWellLogFileCurveFeature.h index d6e9dd9deb..7a14d1096c 100644 --- a/ApplicationCode/Commands/WellLogCommands/RicNewWellLogFileCurveFeature.h +++ b/ApplicationCode/Commands/WellLogCommands/RicNewWellLogFileCurveFeature.h @@ -44,5 +44,5 @@ protected: private: RimWellLogPlotTrack* selectedWellLogPlotTrack(); - RimWellPath* selectedWellLogPlotTrackWithLogFile(); + RimWellPath* selectedWellPathWithLogFile(); };