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

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

Browse Source
This commit is contained in:
Magne Sjaastad 2018-05-15 10:41:27 +02:00
parent 225aa34775
commit 19125396a1
3 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ApplicationCode/Commands/SummaryPlotCommands/RicShowSummaryCurveCalculatorFeature.cpp
View File

@ -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();
}
//--------------------------------------------------------------------------------------------------

25
ApplicationCode/ProjectDataModel/Summary/RimObservedDataCollection.cpp
View File

@ -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();
RiuPlotMainWindowTools::selectAsCurrentItem(observedData);
RiuPlotMainWindowTools::setExpanded(observedData);
updateNewSummaryObjectCreated(observedData);
this->updateConnectedEditors();
caf::PdmUiObjectEditorHandle::updateUiAllObjectEditors();
return observedData;
}
@ -189,11 +200,9 @@ RimObservedData* RimObservedDataCollection::createAndAddCvsObservedDataFromFile(
return nullptr;
}
RiuPlotMainWindowTools::showPlotMainWindow();
RiuPlotMainWindowTools::selectAsCurrentItem(userData);
RiuPlotMainWindowTools::setExpanded(userData);
updateNewSummaryObjectCreated(observedData);
this->updateConnectedEditors();
caf::PdmUiObjectEditorHandle::updateUiAllObjectEditors();
return observedData;
}

2
ApplicationCode/UserInterface/RiuPlotMainWindow.cpp
View File

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