diff --git a/ApplicationCode/Commands/FlowCommands/RicShowFlowCharacteristicsPlotFeature.cpp b/ApplicationCode/Commands/FlowCommands/RicShowFlowCharacteristicsPlotFeature.cpp index 9177768572..c42777535e 100644 --- a/ApplicationCode/Commands/FlowCommands/RicShowFlowCharacteristicsPlotFeature.cpp +++ b/ApplicationCode/Commands/FlowCommands/RicShowFlowCharacteristicsPlotFeature.cpp @@ -20,10 +20,12 @@ #include "RiaApplication.h" +#include "RicWellLogTools.h" + +#include "RigFlowDiagResults.h" #include "RimEclipseResultCase.h" #include "RimEclipseView.h" #include "RimFlowCharacteristicsPlot.h" -#include "RigFlowDiagResults.h" #include "RimFlowDiagSolution.h" #include "RimFlowPlotCollection.h" #include "RimMainPlotCollection.h" @@ -40,14 +42,13 @@ RimEclipseResultCase* activeEclipseResultCase() { RimView * activeView = RiaApplication::instance()->activeReservoirView(); - auto eclView = dynamic_cast(activeView); + RimEclipseView* eclView = dynamic_cast(activeView); if (!eclView) return nullptr; - auto eclCase = dynamic_cast(eclView->ownerCase()); - - return eclCase; + RimEclipseResultCase* eclCase = dynamic_cast(eclView->ownerCase()); + return eclCase; } //-------------------------------------------------------------------------------------------------- @@ -61,6 +62,8 @@ bool RicShowFlowCharacteristicsPlotFeature::isCommandEnabled() if (!eclCase->defaultFlowDiagSolution()) return false; + if (RicWellLogTools::isWellPathOrSimWellSelectedInView()) return false; + return true; } diff --git a/ApplicationCode/Commands/RicShowGridStatisticsFeature.cpp b/ApplicationCode/Commands/RicShowGridStatisticsFeature.cpp index e059c4a67c..d56a52e3df 100644 --- a/ApplicationCode/Commands/RicShowGridStatisticsFeature.cpp +++ b/ApplicationCode/Commands/RicShowGridStatisticsFeature.cpp @@ -20,11 +20,12 @@ #include "RiaApplication.h" #include "RicGridStatisticsDialog.h" +#include "RicWellLogTools.h" -#include "RimProject.h" #include "Rim3dOverlayInfoConfig.h" #include "RimEclipseView.h" #include "RimGeoMechView.h" +#include "RimProject.h" #include "cafSelectionManagerTools.h" @@ -39,6 +40,8 @@ CAF_CMD_SOURCE_INIT(RicShowGridStatisticsFeature, "RicShowGridStatisticsFeature" //-------------------------------------------------------------------------------------------------- bool RicShowGridStatisticsFeature::isCommandEnabled() { + if (RicWellLogTools::isWellPathOrSimWellSelectedInView()) return false; + return RiaApplication::instance()->activeReservoirView() != nullptr; } @@ -60,6 +63,6 @@ void RicShowGridStatisticsFeature::onActionTriggered(bool isChecked) //-------------------------------------------------------------------------------------------------- void RicShowGridStatisticsFeature::setupActionLook(QAction* actionToSetup) { - actionToSetup->setText("Grid statistics"); + actionToSetup->setText("Grid Statistics"); actionToSetup->setIcon(QIcon(":/statistics.png")); // Todo: Change icon } diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicNewGridTimeHistoryCurveFeature.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicNewGridTimeHistoryCurveFeature.cpp index 70792f26c3..c08e1fe156 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicNewGridTimeHistoryCurveFeature.cpp +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicNewGridTimeHistoryCurveFeature.cpp @@ -19,9 +19,11 @@ #include "RicNewGridTimeHistoryCurveFeature.h" #include "RiaApplication.h" +#include "RiaSummaryTools.h" #include "RicNewSummaryCurveFeature.h" #include "RicSelectSummaryPlotUI.h" +#include "RicWellLogTools.h" #include "WellLogCommands/RicWellLogPlotCurveFeatureImpl.h" #include "RimEclipseCellColors.h" @@ -44,7 +46,6 @@ #include "cvfColor3.h" #include -#include "RiaSummaryTools.h" CAF_CMD_SOURCE_INIT(RicNewGridTimeHistoryCurveFeature, "RicNewGridTimeHistoryCurveFeature"); @@ -200,6 +201,8 @@ QString RicNewGridTimeHistoryCurveFeature::suggestedNewPlotName() //-------------------------------------------------------------------------------------------------- bool RicNewGridTimeHistoryCurveFeature::isCommandEnabled() { + if (RicWellLogTools::isWellPathOrSimWellSelectedInView()) return false; + std::vector items; RiuSelectionManager::instance()->selectedItems(items);