mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
#1138 Added result legends
This commit is contained in:
@@ -38,6 +38,7 @@
|
|||||||
#include "RimEclipseView.h"
|
#include "RimEclipseView.h"
|
||||||
#include "RimEllipseFractureTemplate.h"
|
#include "RimEllipseFractureTemplate.h"
|
||||||
#include "RimFractureTemplateCollection.h"
|
#include "RimFractureTemplateCollection.h"
|
||||||
|
#include "RimLegendConfig.h"
|
||||||
#include "RimOilField.h"
|
#include "RimOilField.h"
|
||||||
#include "RimProject.h"
|
#include "RimProject.h"
|
||||||
#include "RimReservoirCellResultsStorage.h"
|
#include "RimReservoirCellResultsStorage.h"
|
||||||
@@ -45,8 +46,9 @@
|
|||||||
|
|
||||||
#include "RivWellFracturePartMgr.h"
|
#include "RivWellFracturePartMgr.h"
|
||||||
|
|
||||||
#include "cafPdmUiDoubleSliderEditor.h"
|
|
||||||
#include "cafHexGridIntersectionTools/cafHexGridIntersectionTools.h"
|
#include "cafHexGridIntersectionTools/cafHexGridIntersectionTools.h"
|
||||||
|
#include "cafPdmUiDoubleSliderEditor.h"
|
||||||
|
#include "cafPdmUiTreeOrdering.h"
|
||||||
|
|
||||||
#include "cvfBoundingBox.h"
|
#include "cvfBoundingBox.h"
|
||||||
#include "cvfGeometryTools.h"
|
#include "cvfGeometryTools.h"
|
||||||
@@ -56,6 +58,7 @@
|
|||||||
|
|
||||||
#include "clipper/clipper.hpp"
|
#include "clipper/clipper.hpp"
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
|
|
||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
|
|
||||||
|
|
||||||
@@ -99,6 +102,15 @@ RimFracture::RimFracture(void)
|
|||||||
m_displayIJK.registerGetMethod(this, &RimFracture::createOneBasedIJK);
|
m_displayIJK.registerGetMethod(this, &RimFracture::createOneBasedIJK);
|
||||||
m_displayIJK.uiCapability()->setUiReadOnly(true);
|
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_rigFracture = new RigFracture;
|
||||||
m_recomputeGeometry = true;
|
m_recomputeGeometry = true;
|
||||||
|
|
||||||
@@ -110,6 +122,13 @@ RimFracture::RimFracture(void)
|
|||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
RimFracture::~RimFracture()
|
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);
|
||||||
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -18,6 +18,8 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#include "RimFractureTemplate.h"
|
||||||
|
|
||||||
#include "cafPdmObject.h"
|
#include "cafPdmObject.h"
|
||||||
|
|
||||||
#include "cafPdmField.h"
|
#include "cafPdmField.h"
|
||||||
@@ -26,20 +28,20 @@
|
|||||||
#include "cvfObject.h"
|
#include "cvfObject.h"
|
||||||
#include "cvfVector3.h"
|
#include "cvfVector3.h"
|
||||||
#include "cvfMatrix4.h"
|
#include "cvfMatrix4.h"
|
||||||
|
|
||||||
#include "cafPdmProxyValueField.h"
|
|
||||||
#include "cafPdmPtrField.h"
|
|
||||||
#include "cafPdmFieldCvfVec3d.h"
|
|
||||||
#include "cvfPlane.h"
|
#include "cvfPlane.h"
|
||||||
|
|
||||||
#include "RimFractureTemplate.h"
|
#include "cafPdmChildField.h"
|
||||||
//#include "RimEllipseFractureTemplate.h"
|
#include "cafPdmFieldCvfVec3d.h"
|
||||||
|
#include "cafPdmProxyValueField.h"
|
||||||
|
#include "cafPdmPtrField.h"
|
||||||
|
|
||||||
|
//#include "RimEllipseFractureTemplate.h"
|
||||||
|
|
||||||
class RigFracture;
|
class RigFracture;
|
||||||
class RimEclipseCase;
|
class RimEclipseCase;
|
||||||
class RimEllipseFractureTemplate;
|
class RimEllipseFractureTemplate;
|
||||||
class RivWellFracturePartMgr;
|
class RivWellFracturePartMgr;
|
||||||
|
class RimLegendConfig;
|
||||||
|
|
||||||
//==================================================================================================
|
//==================================================================================================
|
||||||
///
|
///
|
||||||
@@ -91,7 +93,7 @@ protected:
|
|||||||
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override;
|
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override;
|
||||||
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) 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 defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute * attribute) override;
|
||||||
|
virtual void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "") override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
bool isRecomputeGeometryFlagSet();
|
bool isRecomputeGeometryFlagSet();
|
||||||
@@ -117,4 +119,8 @@ private:
|
|||||||
caf::PdmField<int> m_k; // Zero based indexing
|
caf::PdmField<int> m_k; // Zero based indexing
|
||||||
|
|
||||||
cvf::ref<RivWellFracturePartMgr> m_rivFracture;
|
cvf::ref<RivWellFracturePartMgr> m_rivFracture;
|
||||||
|
|
||||||
|
caf::PdmChildField<RimLegendConfig*> m_legendConfigPerm;
|
||||||
|
caf::PdmChildField<RimLegendConfig*> m_legendConfigCond;
|
||||||
|
caf::PdmChildField<RimLegendConfig*> m_legendConfigWidth;
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user