mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
Prototype for use of texture on quad
This commit is contained in:
@@ -22,6 +22,7 @@
|
|||||||
#include "RiaFontCache.h"
|
#include "RiaFontCache.h"
|
||||||
|
|
||||||
#include "ContourMap/RigContourMapGrid.h"
|
#include "ContourMap/RigContourMapGrid.h"
|
||||||
|
#include "ContourMap/RigContourMapProjection.h"
|
||||||
#include "ContourMap/RigContourPolygonsTools.h"
|
#include "ContourMap/RigContourPolygonsTools.h"
|
||||||
|
|
||||||
#include "RivMeshLinesSourceInfo.h"
|
#include "RivMeshLinesSourceInfo.h"
|
||||||
@@ -39,7 +40,15 @@
|
|||||||
#include "cvfPart.h"
|
#include "cvfPart.h"
|
||||||
#include "cvfPrimitiveSetIndexedUInt.h"
|
#include "cvfPrimitiveSetIndexedUInt.h"
|
||||||
#include "cvfRay.h"
|
#include "cvfRay.h"
|
||||||
|
#include "cvfRenderStateBlending.h"
|
||||||
|
#include "cvfRenderStateTextureBindings.h"
|
||||||
|
#include "cvfSampler.h"
|
||||||
#include "cvfScalarMapper.h"
|
#include "cvfScalarMapper.h"
|
||||||
|
#include "cvfShaderProgram.h"
|
||||||
|
#include "cvfShaderProgramGenerator.h"
|
||||||
|
#include "cvfShaderSourceProvider.h"
|
||||||
|
#include "cvfTexture.h"
|
||||||
|
#include "cvfTextureImage.h"
|
||||||
#include "cvfViewport.h"
|
#include "cvfViewport.h"
|
||||||
#include "cvfqtUtils.h"
|
#include "cvfqtUtils.h"
|
||||||
|
|
||||||
@@ -56,6 +65,12 @@ RivContourMapProjectionPartMgr::RivContourMapProjectionPartMgr( caf::PdmObject*
|
|||||||
m_pdmObject = pdmObject;
|
m_pdmObject = pdmObject;
|
||||||
|
|
||||||
m_labelEffect = new cvf::Effect;
|
m_labelEffect = new cvf::Effect;
|
||||||
|
|
||||||
|
cvf::ShaderProgramGenerator gen( "Texturing", cvf::ShaderSourceProvider::instance() );
|
||||||
|
gen.addVertexCode( cvf::ShaderSourceRepository::vs_Standard );
|
||||||
|
gen.addFragmentCode( cvf::ShaderSourceRepository::src_Texture );
|
||||||
|
gen.addFragmentCode( cvf::ShaderSourceRepository::fs_Unlit );
|
||||||
|
m_textureShaderProg = gen.generate();
|
||||||
}
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
@@ -102,6 +117,49 @@ void RivContourMapProjectionPartMgr::appendPickPointVisToModel( cvf::ModelBasicL
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
///
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
void RivContourMapProjectionPartMgr::appendProjectionAsTexturedQuad( cvf::ModelBasicList* model,
|
||||||
|
const caf::DisplayCoordTransform* displayCoordTransform,
|
||||||
|
cvf::ScalarMapper* scalarMapper,
|
||||||
|
const RigContourMapProjection& contourMapProjection,
|
||||||
|
const RigContourMapGrid& contourMapGrid )
|
||||||
|
{
|
||||||
|
auto expandedBB = contourMapGrid.expandedBoundingBox();
|
||||||
|
|
||||||
|
cvf::Vec3dArray domainCoords;
|
||||||
|
domainCoords.reserve( 4 );
|
||||||
|
|
||||||
|
domainCoords.add( expandedBB.min() );
|
||||||
|
domainCoords.add( cvf::Vec3d( expandedBB.max().x(), expandedBB.min().y(), expandedBB.min().z() ) );
|
||||||
|
domainCoords.add( expandedBB.max() );
|
||||||
|
domainCoords.add( cvf::Vec3d( expandedBB.min().x(), expandedBB.max().y(), expandedBB.min().z() ) );
|
||||||
|
|
||||||
|
double zValueForContourMap = contourMapGrid.origin3d().z();
|
||||||
|
zValueForContourMap += 0.3 * zValueForContourMap;
|
||||||
|
|
||||||
|
cvf::Vec3dArray displayCoords;
|
||||||
|
displayCoords.reserve( 4 );
|
||||||
|
for ( int i = 0; i < 4; i++ )
|
||||||
|
{
|
||||||
|
auto displayCoord = displayCoordTransform->transformToDisplayCoord( domainCoords[i] );
|
||||||
|
displayCoord.z() = zValueForContourMap;
|
||||||
|
|
||||||
|
displayCoords.add( displayCoord );
|
||||||
|
}
|
||||||
|
|
||||||
|
// Texture image and part can be cached for better performance
|
||||||
|
auto textureImage = RivContourMapProjectionPartMgr::createTexture( &contourMapProjection, scalarMapper );
|
||||||
|
|
||||||
|
bool transparent = true;
|
||||||
|
auto part = createSingleTexturedQuadPart( displayCoords, textureImage, transparent );
|
||||||
|
part->setSourceInfo( new RivObjectSourceInfo( m_pdmObject.p() ) );
|
||||||
|
part->setPriority( RivPartPriority::BaseLevel );
|
||||||
|
|
||||||
|
model->addPart( part.p() );
|
||||||
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
@@ -585,3 +643,164 @@ bool RivContourMapProjectionPartMgr::lineOverlapsWithPreviousContourLevel( const
|
|||||||
{
|
{
|
||||||
return RigContourPolygonsTools::lineOverlapsWithContourPolygons( lineCenter, previousLevel, tolerance );
|
return RigContourPolygonsTools::lineOverlapsWithContourPolygons( lineCenter, previousLevel, tolerance );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
///
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
cvf::ref<cvf::DrawableGeo> RivContourMapProjectionPartMgr::createXYPlaneQuadGeoWithTexCoords( const cvf::Vec3dArray& cornerPoints )
|
||||||
|
{
|
||||||
|
cvf::ref<cvf::Vec3fArray> vertices = new cvf::Vec3fArray;
|
||||||
|
vertices->reserve( 4 );
|
||||||
|
|
||||||
|
for ( const auto& v : cornerPoints )
|
||||||
|
{
|
||||||
|
vertices->add( cvf::Vec3f( v ) );
|
||||||
|
}
|
||||||
|
|
||||||
|
cvf::ref<cvf::Vec2fArray> texCoords = new cvf::Vec2fArray;
|
||||||
|
texCoords->reserve( 4 );
|
||||||
|
texCoords->add( cvf::Vec2f( 0, 0 ) );
|
||||||
|
texCoords->add( cvf::Vec2f( 1, 0 ) );
|
||||||
|
texCoords->add( cvf::Vec2f( 1, 1 ) );
|
||||||
|
texCoords->add( cvf::Vec2f( 0, 1 ) );
|
||||||
|
|
||||||
|
cvf::ref<cvf::DrawableGeo> geo = new cvf::DrawableGeo;
|
||||||
|
geo->setVertexArray( vertices.p() );
|
||||||
|
geo->setTextureCoordArray( texCoords.p() );
|
||||||
|
|
||||||
|
cvf::ref<cvf::UIntArray> indices = new cvf::UIntArray;
|
||||||
|
indices->reserve( 6 );
|
||||||
|
|
||||||
|
for ( uint i : { 0, 1, 2, 0, 2, 3 } )
|
||||||
|
{
|
||||||
|
indices->add( i );
|
||||||
|
}
|
||||||
|
|
||||||
|
cvf::ref<cvf::PrimitiveSetIndexedUInt> primSet = new cvf::PrimitiveSetIndexedUInt( cvf::PT_TRIANGLES );
|
||||||
|
primSet->setIndices( indices.p() );
|
||||||
|
geo->addPrimitiveSet( primSet.p() );
|
||||||
|
|
||||||
|
geo->computeNormals();
|
||||||
|
|
||||||
|
return geo;
|
||||||
|
}
|
||||||
|
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
///
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
cvf::ref<cvf::Part> RivContourMapProjectionPartMgr::createSingleTexturedQuadPart( const cvf::Vec3dArray& cornerPoints,
|
||||||
|
cvf::ref<cvf::TextureImage> image,
|
||||||
|
bool transparent )
|
||||||
|
{
|
||||||
|
cvf::ref<cvf::Part> part = new cvf::Part;
|
||||||
|
|
||||||
|
cvf::ref<cvf::DrawableGeo> geo = createXYPlaneQuadGeoWithTexCoords( cornerPoints );
|
||||||
|
geo->computeNormals();
|
||||||
|
|
||||||
|
cvf::ref<cvf::Effect> eff = new cvf::Effect;
|
||||||
|
bool surfaceEffect = false;
|
||||||
|
if ( surfaceEffect )
|
||||||
|
{
|
||||||
|
caf::SurfaceEffectGenerator geometryEffgen( cvf::Color3f::YELLOW, caf::PO_1 );
|
||||||
|
eff = geometryEffgen.generateCachedEffect();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
cvf::ref<cvf::Texture> texture = new cvf::Texture( image.p() );
|
||||||
|
cvf::ref<cvf::Sampler> sampler = new cvf::Sampler;
|
||||||
|
sampler->setMinFilter( cvf::Sampler::LINEAR );
|
||||||
|
sampler->setMagFilter( cvf::Sampler::NEAREST );
|
||||||
|
sampler->setWrapModeS( cvf::Sampler::CLAMP_TO_EDGE );
|
||||||
|
sampler->setWrapModeT( cvf::Sampler::CLAMP_TO_EDGE );
|
||||||
|
|
||||||
|
cvf::ref<cvf::RenderStateTextureBindings> textureBindings = new cvf::RenderStateTextureBindings;
|
||||||
|
textureBindings->addBinding( texture.p(), sampler.p(), "u_texture2D" );
|
||||||
|
|
||||||
|
eff->setRenderState( textureBindings.p() );
|
||||||
|
eff->setShaderProgram( m_textureShaderProg.p() );
|
||||||
|
|
||||||
|
if ( transparent )
|
||||||
|
{
|
||||||
|
part->setPriority( RivPartPriority::PartType::TransparentSeismic );
|
||||||
|
cvf::ref<cvf::RenderStateBlending> blending = new cvf::RenderStateBlending;
|
||||||
|
blending->configureTransparencyBlending();
|
||||||
|
eff->setRenderState( blending.p() );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
part->setDrawable( geo.p() );
|
||||||
|
part->updateBoundingBox();
|
||||||
|
part->setEffect( eff.p() );
|
||||||
|
|
||||||
|
return part;
|
||||||
|
}
|
||||||
|
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
///
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
QImage RivContourMapProjectionPartMgr::createImage( const RigContourMapProjection* contourMapProjection, cvf::ScalarMapper* scalarMapper )
|
||||||
|
{
|
||||||
|
if ( !contourMapProjection || !scalarMapper ) return {};
|
||||||
|
|
||||||
|
auto vertexSizeIJ = contourMapProjection->numberOfVerticesIJ();
|
||||||
|
int width = static_cast<int>( vertexSizeIJ.x() );
|
||||||
|
int height = static_cast<int>( vertexSizeIJ.y() );
|
||||||
|
|
||||||
|
QImage image( width, height, QImage::Format_ARGB32 );
|
||||||
|
|
||||||
|
auto filteredValues = contourMapProjection->aggregatedVertexResultsFiltered();
|
||||||
|
for ( int y = 0; y < height; ++y )
|
||||||
|
{
|
||||||
|
for ( int x = 0; x < width; ++x )
|
||||||
|
{
|
||||||
|
auto index = contourMapProjection->vertexIndex( x, y );
|
||||||
|
double valueAtVertex = filteredValues[index];
|
||||||
|
|
||||||
|
auto color = scalarMapper->mapToColor( valueAtVertex );
|
||||||
|
|
||||||
|
const int transparency = 255;
|
||||||
|
image.setPixel( x, height - y - 1, qRgba( color.r(), color.g(), color.b(), transparency ) );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return image;
|
||||||
|
}
|
||||||
|
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
///
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
cvf::TextureImage* RivContourMapProjectionPartMgr::createTexture( const RigContourMapProjection* contourMapProjection,
|
||||||
|
cvf::ScalarMapper* scalarMapper )
|
||||||
|
{
|
||||||
|
if ( !contourMapProjection || !scalarMapper ) return {};
|
||||||
|
|
||||||
|
auto vertexSizeIJ = contourMapProjection->numberOfVerticesIJ();
|
||||||
|
int width = static_cast<int>( vertexSizeIJ.x() );
|
||||||
|
int height = static_cast<int>( vertexSizeIJ.y() );
|
||||||
|
|
||||||
|
cvf::TextureImage* textureImage = new cvf::TextureImage();
|
||||||
|
textureImage->allocate( width, height );
|
||||||
|
|
||||||
|
auto dataValues = contourMapProjection->aggregatedVertexResultsFiltered();
|
||||||
|
|
||||||
|
for ( int y = 0; y < height; ++y )
|
||||||
|
{
|
||||||
|
for ( int x = 0; x < width; ++x )
|
||||||
|
{
|
||||||
|
size_t index = contourMapProjection->vertexIndex( x, y );
|
||||||
|
|
||||||
|
double valueAtVertex = dataValues[index];
|
||||||
|
auto color = scalarMapper->mapToColor( valueAtVertex );
|
||||||
|
|
||||||
|
int transparency = 0;
|
||||||
|
if ( valueAtVertex != std::numeric_limits<double>::infinity() )
|
||||||
|
{
|
||||||
|
transparency = 255;
|
||||||
|
}
|
||||||
|
|
||||||
|
textureImage->setPixel( x, y, cvf::Color4ub( color, transparency ) );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return textureImage;
|
||||||
|
}
|
||||||
|
|||||||
@@ -33,6 +33,7 @@
|
|||||||
#include "cvfVector4.h"
|
#include "cvfVector4.h"
|
||||||
|
|
||||||
class RigContourMapGrid;
|
class RigContourMapGrid;
|
||||||
|
class RigContourMapProjection;
|
||||||
|
|
||||||
namespace cvf
|
namespace cvf
|
||||||
{
|
{
|
||||||
@@ -41,6 +42,7 @@ class ScalarMapper;
|
|||||||
class Color3f;
|
class Color3f;
|
||||||
class ModelBasicList;
|
class ModelBasicList;
|
||||||
class Part;
|
class Part;
|
||||||
|
class TextureImage;
|
||||||
} // namespace cvf
|
} // namespace cvf
|
||||||
|
|
||||||
class RivContourMapProjectionPartMgr : public cvf::Object
|
class RivContourMapProjectionPartMgr : public cvf::Object
|
||||||
@@ -71,6 +73,12 @@ public:
|
|||||||
const cvf::Vec2d& pickPoint,
|
const cvf::Vec2d& pickPoint,
|
||||||
const RigContourMapGrid& contourMapGrid ) const;
|
const RigContourMapGrid& contourMapGrid ) const;
|
||||||
|
|
||||||
|
void appendProjectionAsTexturedQuad( cvf::ModelBasicList* model,
|
||||||
|
const caf::DisplayCoordTransform* displayCoordTransform,
|
||||||
|
cvf::ScalarMapper* mapper,
|
||||||
|
const RigContourMapProjection& contourMapProjection,
|
||||||
|
const RigContourMapGrid& contourMapGrid );
|
||||||
|
|
||||||
cvf::ref<cvf::Vec2fArray> createTextureCoords( const std::vector<double>& values, cvf::ScalarMapper* scalarMapper ) const;
|
cvf::ref<cvf::Vec2fArray> createTextureCoords( const std::vector<double>& values, cvf::ScalarMapper* scalarMapper ) const;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
@@ -105,9 +113,17 @@ private:
|
|||||||
const RigContourPolygonsTools::ContourPolygons& previousLevel,
|
const RigContourPolygonsTools::ContourPolygons& previousLevel,
|
||||||
double tolerance );
|
double tolerance );
|
||||||
|
|
||||||
|
// Extracted some code from RivTexturePartMgr. Consider reuse more code.
|
||||||
|
cvf::ref<cvf::Part> createSingleTexturedQuadPart( const cvf::Vec3dArray& cornerPoints, cvf::ref<cvf::TextureImage> image, bool transparent );
|
||||||
|
static cvf::ref<cvf::DrawableGeo> createXYPlaneQuadGeoWithTexCoords( const cvf::Vec3dArray& cornerPoints );
|
||||||
|
static QImage createImage( const RigContourMapProjection* contourMapProjection, cvf::ScalarMapper* scalarMapper );
|
||||||
|
static cvf::TextureImage* createTexture( const RigContourMapProjection* contourMapProjection, cvf::ScalarMapper* scalarMapper );
|
||||||
|
|
||||||
private:
|
private:
|
||||||
caf::PdmPointer<caf::PdmObject> m_pdmObject;
|
caf::PdmPointer<caf::PdmObject> m_pdmObject;
|
||||||
|
|
||||||
std::vector<std::vector<cvf::BoundingBox>> m_labelBoundingBoxes;
|
std::vector<std::vector<cvf::BoundingBox>> m_labelBoundingBoxes;
|
||||||
cvf::ref<cvf::Effect> m_labelEffect;
|
cvf::ref<cvf::Effect> m_labelEffect;
|
||||||
|
|
||||||
|
cvf::ref<cvf::ShaderProgram> m_textureShaderProg;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -110,6 +110,8 @@ RimContourMapProjection::RimContourMapProjection()
|
|||||||
CAF_PDM_InitField( &m_showContourLines, "ContourLines", true, "Show Contour Lines" );
|
CAF_PDM_InitField( &m_showContourLines, "ContourLines", true, "Show Contour Lines" );
|
||||||
CAF_PDM_InitField( &m_showContourLabels, "ContourLabels", true, "Show Contour Labels" );
|
CAF_PDM_InitField( &m_showContourLabels, "ContourLabels", true, "Show Contour Labels" );
|
||||||
CAF_PDM_InitField( &m_smoothContourLines, "SmoothContourLines", true, "Smooth Contour Lines" );
|
CAF_PDM_InitField( &m_smoothContourLines, "SmoothContourLines", true, "Smooth Contour Lines" );
|
||||||
|
CAF_PDM_InitField( &m_showTextureImage, "ShowImage", false, "Show Texture Image" );
|
||||||
|
CAF_PDM_InitField( &m_showTrianglesWithColor, "ShowTrianglesWithColor", true, "Show Triangles with Color" );
|
||||||
|
|
||||||
auto defaultValue = caf::AppEnum<RimIntersectionFilterEnum>( RimIntersectionFilterEnum::INTERSECT_FILTER_NONE );
|
auto defaultValue = caf::AppEnum<RimIntersectionFilterEnum>( RimIntersectionFilterEnum::INTERSECT_FILTER_NONE );
|
||||||
CAF_PDM_InitField( &m_valueFilterType, "ValueFilterType", defaultValue, "Value Filter" );
|
CAF_PDM_InitField( &m_valueFilterType, "ValueFilterType", defaultValue, "Value Filter" );
|
||||||
@@ -208,13 +210,16 @@ void RimContourMapProjection::generateGeometryIfNecessary()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
m_trianglesWithVertexValues = RigContourMapTrianglesGenerator::generateTrianglesWithVertexValues( *m_contourMapGrid,
|
if ( showTrianglesWithColor() )
|
||||||
*m_contourMapProjection,
|
{
|
||||||
m_contourPolygons,
|
m_trianglesWithVertexValues = RigContourMapTrianglesGenerator::generateTrianglesWithVertexValues( *m_contourMapGrid,
|
||||||
contourLevels,
|
*m_contourMapProjection,
|
||||||
m_contourLevelCumulativeAreas,
|
m_contourPolygons,
|
||||||
discrete,
|
contourLevels,
|
||||||
sampleSpacing() );
|
m_contourLevelCumulativeAreas,
|
||||||
|
discrete,
|
||||||
|
sampleSpacing() );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
progress.setProgress( 100 );
|
progress.setProgress( 100 );
|
||||||
}
|
}
|
||||||
@@ -268,6 +273,22 @@ bool RimContourMapProjection::showContourLabels() const
|
|||||||
return m_showContourLabels();
|
return m_showContourLabels();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
///
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
bool RimContourMapProjection::showImage() const
|
||||||
|
{
|
||||||
|
return m_showTextureImage();
|
||||||
|
}
|
||||||
|
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
///
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
bool RimContourMapProjection::showTrianglesWithColor() const
|
||||||
|
{
|
||||||
|
return m_showTrianglesWithColor();
|
||||||
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
@@ -615,6 +636,8 @@ void RimContourMapProjection::defineUiOrdering( QString uiConfigName, caf::PdmUi
|
|||||||
|
|
||||||
legendConfig()->uiOrdering( "NumLevelsOnly", *mainGroup );
|
legendConfig()->uiOrdering( "NumLevelsOnly", *mainGroup );
|
||||||
mainGroup->add( &m_resolution );
|
mainGroup->add( &m_resolution );
|
||||||
|
mainGroup->add( &m_showTextureImage );
|
||||||
|
mainGroup->add( &m_showTrianglesWithColor );
|
||||||
mainGroup->add( &m_showContourLines );
|
mainGroup->add( &m_showContourLines );
|
||||||
mainGroup->add( &m_showContourLabels );
|
mainGroup->add( &m_showContourLabels );
|
||||||
m_showContourLabels.uiCapability()->setUiReadOnly( !m_showContourLines() );
|
m_showContourLabels.uiCapability()->setUiReadOnly( !m_showContourLines() );
|
||||||
|
|||||||
@@ -68,6 +68,8 @@ public:
|
|||||||
|
|
||||||
bool showContourLines() const;
|
bool showContourLines() const;
|
||||||
bool showContourLabels() const;
|
bool showContourLabels() const;
|
||||||
|
bool showImage() const;
|
||||||
|
bool showTrianglesWithColor() const;
|
||||||
|
|
||||||
// k layer filter, only consider kLayers in the given set (0-based index)
|
// k layer filter, only consider kLayers in the given set (0-based index)
|
||||||
void useKLayers( std::set<int> kLayers );
|
void useKLayers( std::set<int> kLayers );
|
||||||
@@ -150,6 +152,8 @@ protected:
|
|||||||
caf::PdmField<bool> m_showContourLines;
|
caf::PdmField<bool> m_showContourLines;
|
||||||
caf::PdmField<bool> m_showContourLabels;
|
caf::PdmField<bool> m_showContourLabels;
|
||||||
caf::PdmField<bool> m_smoothContourLines;
|
caf::PdmField<bool> m_smoothContourLines;
|
||||||
|
caf::PdmField<bool> m_showTextureImage;
|
||||||
|
caf::PdmField<bool> m_showTrianglesWithColor;
|
||||||
|
|
||||||
caf::PdmField<FloodingType> m_oilFloodingType;
|
caf::PdmField<FloodingType> m_oilFloodingType;
|
||||||
caf::PdmField<FloodingType> m_gasFloodingType;
|
caf::PdmField<FloodingType> m_gasFloodingType;
|
||||||
|
|||||||
@@ -345,12 +345,30 @@ void RimEclipseContourMapView::appendContourMapProjectionToModel()
|
|||||||
|
|
||||||
cvf::ref<caf::DisplayCoordTransform> transForm = displayCoordTransform();
|
cvf::ref<caf::DisplayCoordTransform> transForm = displayCoordTransform();
|
||||||
|
|
||||||
m_contourMapProjectionPartMgr->appendProjectionToModel( contourMapProjectionModelBasicList.p(),
|
if ( m_contourMapProjection->showTrianglesWithColor() )
|
||||||
transForm.p(),
|
{
|
||||||
m_contourMapProjection->trianglesWithVertexValues(),
|
m_contourMapProjectionPartMgr->appendProjectionToModel( contourMapProjectionModelBasicList.p(),
|
||||||
*m_contourMapProjection->mapGrid(),
|
transForm.p(),
|
||||||
backgroundColor(),
|
m_contourMapProjection->trianglesWithVertexValues(),
|
||||||
m_contourMapProjection->legendConfig()->scalarMapper() );
|
*m_contourMapProjection->mapGrid(),
|
||||||
|
backgroundColor(),
|
||||||
|
m_contourMapProjection->legendConfig()->scalarMapper() );
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( m_contourMapProjection->showImage() )
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
auto image = RicCreateContourMapPolygonTools::createImage( m_contourMapProjection->mapProjection(),
|
||||||
|
m_contourMapProjection->legendConfig()->scalarMapper()
|
||||||
|
); QString fileName = "f:/scratch/contour-map.png"; image.save( fileName );
|
||||||
|
*/
|
||||||
|
|
||||||
|
m_contourMapProjectionPartMgr->appendProjectionAsTexturedQuad( contourMapProjectionModelBasicList.p(),
|
||||||
|
transForm.p(),
|
||||||
|
m_contourMapProjection->legendConfig()->scalarMapper(),
|
||||||
|
*m_contourMapProjection->mapProjection(),
|
||||||
|
*m_contourMapProjection->mapGrid() );
|
||||||
|
}
|
||||||
|
|
||||||
contourMapProjectionModelBasicList->updateBoundingBoxesRecursive();
|
contourMapProjectionModelBasicList->updateBoundingBoxesRecursive();
|
||||||
frameScene->addModel( contourMapProjectionModelBasicList.p() );
|
frameScene->addModel( contourMapProjectionModelBasicList.p() );
|
||||||
|
|||||||
Reference in New Issue
Block a user