mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
Add polygon classes
This commit is contained in:
@@ -22,6 +22,7 @@
|
||||
#include "RiuSeismicHistogramPanel.h"
|
||||
|
||||
#include "Rim3dView.h"
|
||||
#include "RimPolylineTarget.h"
|
||||
#include "RimRegularLegendConfig.h"
|
||||
#include "RimSeismicAlphaMapper.h"
|
||||
#include "RimSeismicDataInterface.h"
|
||||
|
||||
@@ -407,7 +407,7 @@ void RimSeismicView::onUpdateLegends()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimSeismicView::onLoadDataAndUpdate()
|
||||
{
|
||||
updateSurfacesInViewTreeItems();
|
||||
updateViewTreeItems( RiaDefines::ItemIn3dView::ALL );
|
||||
syncronizeLocalAnnotationsFromGlobal();
|
||||
onUpdateScaleTransform();
|
||||
|
||||
@@ -461,23 +461,28 @@ void RimSeismicView::updateGridBoxData()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimSeismicView::updateSurfacesInViewTreeItems()
|
||||
void RimSeismicView::updateViewTreeItems( RiaDefines::ItemIn3dView itemType )
|
||||
{
|
||||
RimSurfaceCollection* surfColl = RimTools::surfaceCollection();
|
||||
auto bitmaskEnum = BitmaskEnum( itemType );
|
||||
|
||||
if ( surfColl && surfColl->containsSurface() )
|
||||
if ( bitmaskEnum.AnyOf( RiaDefines::ItemIn3dView::SURFACE ) )
|
||||
{
|
||||
if ( !m_surfaceCollection() )
|
||||
RimSurfaceCollection* surfColl = RimTools::surfaceCollection();
|
||||
|
||||
if ( surfColl && surfColl->containsSurface() )
|
||||
{
|
||||
m_surfaceCollection = new RimSurfaceInViewCollection();
|
||||
}
|
||||
if ( !m_surfaceCollection() )
|
||||
{
|
||||
m_surfaceCollection = new RimSurfaceInViewCollection();
|
||||
}
|
||||
|
||||
m_surfaceCollection->setSurfaceCollection( surfColl );
|
||||
m_surfaceCollection->updateFromSurfaceCollection();
|
||||
}
|
||||
else
|
||||
{
|
||||
delete m_surfaceCollection;
|
||||
m_surfaceCollection->setSurfaceCollection( surfColl );
|
||||
m_surfaceCollection->updateFromSurfaceCollection();
|
||||
}
|
||||
else
|
||||
{
|
||||
delete m_surfaceCollection;
|
||||
}
|
||||
}
|
||||
|
||||
updateConnectedEditors();
|
||||
|
||||
@@ -90,7 +90,7 @@ protected:
|
||||
|
||||
void setDefaultView() override;
|
||||
|
||||
void updateSurfacesInViewTreeItems() override;
|
||||
void updateViewTreeItems( RiaDefines::ItemIn3dView itemType ) override;
|
||||
|
||||
private:
|
||||
caf::PdmChildField<RimSurfaceInViewCollection*> m_surfaceCollection;
|
||||
|
||||
Reference in New Issue
Block a user