#3807 Initial implementation of GeoMech contour maps.

This commit is contained in:
Gaute Lindkvist
2019-01-16 10:51:43 +01:00
parent aed0de8a2b
commit 1f754f2b63
34 changed files with 2108 additions and 525 deletions

View File

@@ -33,6 +33,8 @@
#include "Rim2dIntersectionViewCollection.h"
#include "RimFormationNames.h"
#include "RimGeoMechCellColors.h"
#include "RimGeoMechContourMapView.h"
#include "RimGeoMechContourMapViewCollection.h"
#include "RimGeoMechPropertyFilter.h"
#include "RimGeoMechPropertyFilterCollection.h"
#include "RimGeoMechResultDefinition.h"
@@ -79,6 +81,10 @@ RimGeoMechCase::RimGeoMechCase(void)
CAF_PDM_InitField(&m_reloadElementPropertyFileCommand, "reloadElementPropertyFileCommand", false, "", "", "", "");
caf::PdmUiPushButtonEditor::configureEditorForField(&m_reloadElementPropertyFileCommand);
CAF_PDM_InitFieldNoDefault(&m_contourMapCollection, "ContourMaps", "2d Contour Maps", "", "", "");
m_contourMapCollection = new RimGeoMechContourMapViewCollection;
m_contourMapCollection.uiCapability()->setUiTreeHidden(true);
}
//--------------------------------------------------------------------------------------------------
@@ -158,6 +164,14 @@ void RimGeoMechCase::reloadDataAndUpdate()
v->loadDataAndUpdate();
v->setCurrentTimeStep(v->currentTimeStep());
}
for (RimGeoMechContourMapView* contourMap : m_contourMapCollection->views())
{
CVF_ASSERT(contourMap);
contourMap->loadDataAndUpdate();
contourMap->updateGridBoxData();
contourMap->updateAnnotationItems();
}
}
}
@@ -274,6 +288,12 @@ std::vector<Rim3dView*> RimGeoMechCase::allSpecialViews() const
{
views.push_back(geoMechViews[vIdx]);
}
for (RimGeoMechContourMapView* view : m_contourMapCollection->views())
{
views.push_back(view);
}
return views;
}
@@ -292,9 +312,22 @@ void RimGeoMechCase::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering
uiTreeOrdering.add(&m_2dIntersectionViewCollection);
}
if (!m_contourMapCollection->views().empty())
{
uiTreeOrdering.add(&m_contourMapCollection);
}
uiTreeOrdering.skipRemainingChildren(true);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimGeoMechContourMapViewCollection* RimGeoMechCase::contourMapCollection()
{
return m_contourMapCollection;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -319,6 +352,10 @@ void RimGeoMechCase::initAfterRead()
riv->setGeoMechCase(this);
}
for (RimGeoMechContourMapView* contourMap : m_contourMapCollection->views())
{
contourMap->setGeoMechCase(this);
}
}
//--------------------------------------------------------------------------------------------------