#955 Toolbar Button State : Mark calculator button as disabled if no case is open

ApplicationCode/Commands/SummaryPlotCommands/RicShowSummaryCurveCalculatorFeature.cpp

@@ -54,7 +54,10 @@ void RicShowSummaryCurveCalculatorFeature::hideCurveCalculatorDialog()
 //--------------------------------------------------------------------------------------------------
 bool RicShowSummaryCurveCalculatorFeature::isCommandEnabled()
 {
-    return true;
+    RimProject* proj = RiaApplication::instance()->project();
+    const auto& allSumCases = proj->allSummaryCases();
+    
+    return !allSumCases.empty();
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ProjectDataModel/Summary/RimObservedDataCollection.cpp

@@ -32,6 +32,7 @@
 #include "RimSummaryObservedDataFile.h"
 
 #include "RiuPlotMainWindowTools.h"
+#include "RiuPlotMainWindow.h"
 
 #include "cafUtils.h"
 #include "cafPdmSettings.h"
@@ -108,6 +109,18 @@ bool RimObservedDataCollection::fileExists(const QString& fileName, QString* err
     return true;
 }
 
+void updateNewSummaryObjectCreated(caf::PdmObject* object)
+{
+    RiuPlotMainWindowTools::showPlotMainWindow();
+    RiuPlotMainWindowTools::selectAsCurrentItem(object);
+    RiuPlotMainWindowTools::setExpanded(object);
+
+    caf::PdmUiObjectEditorHandle::updateUiAllObjectEditors();
+
+    RiuPlotMainWindow* mpw = RiaApplication::instance()->mainPlotWindow();
+    if (mpw) mpw->updateSummaryPlotToolBar();
+}
+
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
@@ -130,12 +143,10 @@ RimObservedData* RimObservedDataCollection::createAndAddRsmObservedDataFromFile(
         errorText->append(observedData->errorMessagesFromReader());
     }
 
-    RiuPlotMainWindowTools::showPlotMainWindow();
+    updateNewSummaryObjectCreated(observedData);
-    RiuPlotMainWindowTools::selectAsCurrentItem(observedData);
-    RiuPlotMainWindowTools::setExpanded(observedData);
 
     this->updateConnectedEditors();
-    caf::PdmUiObjectEditorHandle::updateUiAllObjectEditors();
+
     return observedData;
 }
 
@@ -189,11 +200,9 @@ RimObservedData* RimObservedDataCollection::createAndAddCvsObservedDataFromFile(
         return nullptr;
     }
 
-    RiuPlotMainWindowTools::showPlotMainWindow();
+    updateNewSummaryObjectCreated(observedData);
-    RiuPlotMainWindowTools::selectAsCurrentItem(userData);
-    RiuPlotMainWindowTools::setExpanded(userData);
 
     this->updateConnectedEditors();
-    caf::PdmUiObjectEditorHandle::updateUiAllObjectEditors();
+
     return observedData;
 }

ApplicationCode/UserInterface/RiuPlotMainWindow.cpp

@@ -457,6 +457,8 @@ void RiuPlotMainWindow::updateSummaryPlotToolBar()
 
         m_summaryPlotToolBarEditor->hide();
     }
+
+    refreshToolbars();
 }
 
 //--------------------------------------------------------------------------------------------------