OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-20 11:48:35 -06:00
Code Issues Packages Projects Releases Wiki Activity

#1138 Added result legends

Browse Source
This commit is contained in:
Magne Sjaastad 2017-02-15 11:29:44 +01:00
parent ff59429ad8
commit c815cfa835
2 changed files with 46 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
ApplicationCode/ProjectDataModel/RimFracture.cpp
View File

@ -38,6 +38,7 @@
#include "RimEclipseView.h"
#include "RimEllipseFractureTemplate.h"
#include "RimFractureTemplateCollection.h"
#include "RimLegendConfig.h"
#include "RimOilField.h"
#include "RimProject.h"
#include "RimReservoirCellResultsStorage.h"
@ -45,8 +46,9 @@
#include "RivWellFracturePartMgr.h"
#include "cafPdmUiDoubleSliderEditor.h"
#include "cafHexGridIntersectionTools/cafHexGridIntersectionTools.h"
#include "cafPdmUiDoubleSliderEditor.h"
#include "cafPdmUiTreeOrdering.h"
#include "cvfBoundingBox.h"
#include "cvfGeometryTools.h"
@ -56,6 +58,7 @@
#include "clipper/clipper.hpp"
#include <math.h>
#include <QDebug>
@ -99,6 +102,15 @@ RimFracture::RimFracture(void)
m_displayIJK.registerGetMethod(this, &RimFracture::createOneBasedIJK);
m_displayIJK.uiCapability()->setUiReadOnly(true);
CAF_PDM_InitFieldNoDefault(&m_legendConfigPerm, "LegendConfigPerm", "LegendConfigPerm", "", "", "");
m_legendConfigPerm = new RimLegendConfig;
CAF_PDM_InitFieldNoDefault(&m_legendConfigCond, "LegendConfigCond", "LegendConfigCond", "", "", "");
m_legendConfigCond = new RimLegendConfig;
CAF_PDM_InitFieldNoDefault(&m_legendConfigWidth, "LegendConfigWidth", "LegendConfigWidth", "", "", "");
m_legendConfigWidth = new RimLegendConfig;
m_rigFracture = new RigFracture;
m_recomputeGeometry = true;
@ -110,6 +122,13 @@ RimFracture::RimFracture(void)
//--------------------------------------------------------------------------------------------------
RimFracture::~RimFracture()
{
delete m_legendConfigCond;
delete m_legendConfigPerm;
delete m_legendConfigWidth;
m_legendConfigCond = nullptr;
m_legendConfigPerm = nullptr;
m_legendConfigWidth = nullptr;
}
//--------------------------------------------------------------------------------------------------
@ -620,6 +639,19 @@ void RimFracture::defineEditorAttribute(const caf::PdmFieldHandle* field, QStrin
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimFracture::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/)
{
// TODO: Based on selected result, show correct legend
uiTreeOrdering.add(m_legendConfigCond);
uiTreeOrdering.add(m_legendConfigPerm);
uiTreeOrdering.add(m_legendConfigWidth);
uiTreeOrdering.setForgetRemainingFields(true);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

20
ApplicationCode/ProjectDataModel/RimFracture.h
View File

@ -18,6 +18,8 @@
#pragma once
#include "RimFractureTemplate.h"
#include "cafPdmObject.h"
#include "cafPdmField.h"
@ -26,20 +28,20 @@
#include "cvfObject.h"
#include "cvfVector3.h"
#include "cvfMatrix4.h"
#include "cafPdmProxyValueField.h"
#include "cafPdmPtrField.h"
#include "cafPdmFieldCvfVec3d.h"
#include "cvfPlane.h"
#include "RimFractureTemplate.h"
//#include "RimEllipseFractureTemplate.h"
#include "cafPdmChildField.h"
#include "cafPdmFieldCvfVec3d.h"
#include "cafPdmProxyValueField.h"
#include "cafPdmPtrField.h"
//#include "RimEllipseFractureTemplate.h"
class RigFracture;
class RimEclipseCase;
class RimEllipseFractureTemplate;
class RivWellFracturePartMgr;
class RimLegendConfig;
//==================================================================================================
///
@ -91,7 +93,7 @@ protected:
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override;
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute * attribute) override;
virtual void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "") override;
private:
bool isRecomputeGeometryFlagSet();
@ -117,4 +119,8 @@ private:
caf::PdmField<int> m_k; // Zero based indexing
cvf::ref<RivWellFracturePartMgr> m_rivFracture;
caf::PdmChildField<RimLegendConfig*> m_legendConfigPerm;
caf::PdmChildField<RimLegendConfig*> m_legendConfigCond;
caf::PdmChildField<RimLegendConfig*> m_legendConfigWidth;
};