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

Make sure phase distribution plots are enabled when loading project file

Browse Source
This commit is contained in:
Magne Sjaastad 2020-02-14 09:38:16 +01:00
parent 3ba301f56e
commit 7f2331a4db
3 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ApplicationCode/Application/RiaApplication.cpp
View File

@ -508,6 +508,7 @@ bool RiaApplication::loadProject( const QString& projectFileName,
RimMainPlotCollection* mainPlotColl = m_project->mainPlotCollection(); RimMainPlotCollection* mainPlotColl = m_project->mainPlotCollection();
mainPlotColl->ensureCalculationIdsAreAssigned(); mainPlotColl->ensureCalculationIdsAreAssigned();
mainPlotColl->ensureDefaultFlowPlotsAreCreated();
} }
for ( RimOilField* oilField : m_project->oilFields ) for ( RimOilField* oilField : m_project->oilFields )

7
ApplicationCode/ProjectDataModel/Flow/RimFlowPlotCollection.cpp
View File

@ -23,7 +23,6 @@
#include "RimFlowCharacteristicsPlot.h" #include "RimFlowCharacteristicsPlot.h"
#include "RimProject.h" #include "RimProject.h"
#include "RimWellAllocationPlot.h" #include "RimWellAllocationPlot.h"
#include "RimWellDistributionPlot.h"
#include "RimWellDistributionPlotCollection.h" #include "RimWellDistributionPlotCollection.h"
#include "cafProgressInfo.h" #include "cafProgressInfo.h"
@ -209,12 +208,6 @@ void RimFlowPlotCollection::ensureDefaultFlowPlotsAreCreated()
m_flowCharacteristicsPlot = new RimFlowCharacteristicsPlot; m_flowCharacteristicsPlot = new RimFlowCharacteristicsPlot;
} }
// if ( !m_dbgWellDistributionPlot() )
//{
// m_dbgWellDistributionPlot = new RimWellDistributionPlot;
// m_dbgWellDistributionPlot->setAsPlotMdiWindow();
//}
if ( !m_wellDistributionPlotCollection() ) if ( !m_wellDistributionPlotCollection() )
{ {
m_wellDistributionPlotCollection = new RimWellDistributionPlotCollection; m_wellDistributionPlotCollection = new RimWellDistributionPlotCollection;

5
ApplicationCode/ProjectDataModel/Flow/RimFlowPlotCollection.h
View File

@ -51,9 +51,8 @@ public:
void ensureDefaultFlowPlotsAreCreated(); void ensureDefaultFlowPlotsAreCreated();
private: private:
caf::PdmChildField<RimFlowCharacteristicsPlot*> m_flowCharacteristicsPlot; caf::PdmChildField<RimFlowCharacteristicsPlot*> m_flowCharacteristicsPlot;
caf::PdmChildField<RimWellAllocationPlot*> m_defaultWellAllocPlot; caf::PdmChildField<RimWellAllocationPlot*> m_defaultWellAllocPlot;
// caf::PdmChildField<RimWellDistributionPlot*> m_dbgWellDistributionPlot;
caf::PdmChildField<RimWellDistributionPlotCollection*> m_wellDistributionPlotCollection; caf::PdmChildField<RimWellDistributionPlotCollection*> m_wellDistributionPlotCollection;
caf::PdmChildArrayField<RimWellAllocationPlot*> m_storedWellAllocPlots; caf::PdmChildArrayField<RimWellAllocationPlot*> m_storedWellAllocPlots;
caf::PdmChildArrayField<RimFlowCharacteristicsPlot*> m_storedFlowCharacteristicsPlots; caf::PdmChildArrayField<RimFlowCharacteristicsPlot*> m_storedFlowCharacteristicsPlots;