OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#5285 Visualization and update of Surfaces

Browse Source
This commit is contained in:
Jacob Støren
2020-01-08 11:56:48 +01:00
parent e9086005d4
commit e6d96316d4
20 changed files with 369 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
ApplicationCode/ProjectDataModel/Surfaces/RimSurface.cpp
View File

@@ -17,13 +17,14 @@
/////////////////////////////////////////////////////////////////////////////////
#include "RimSurface.h"
#include "RimSurfaceCollection.h"
#include "RigSurface.h"
#include "cafUtils.h"
#include <QFileInfo>
#include <fstream>
#include <iosfwd>
#include <sstream>
#include <string>
CAF_PDM_SOURCE_INIT( RimSurface, "Surface" );
@@ -56,6 +57,30 @@ void RimSurface::setSurfaceFilePath( const QString& filePath )
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimSurface::surfaceFilePath()
{
return m_surfaceDefinitionFilePath().path();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSurface::setColor( const cvf::Color3f& color )
{
m_color = color;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
cvf::Color3f RimSurface::color() const
{
return m_color();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -64,6 +89,14 @@ QString RimSurface::userDescription()
return m_userDescription();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RigSurface* RimSurface::surfaceData()
{
return m_surfaceData.p();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -81,13 +114,17 @@ void RimSurface::fieldChangedByUi( const caf::PdmFieldHandle* changedField,
{
if ( changedField == &m_surfaceDefinitionFilePath )
{
updateDataFromFile();
updateSurfaceDataFromFile();
// Todo: Update visualization
RimSurfaceCollection* surfColl;
this->firstAncestorOrThisOfTypeAsserted( surfColl );
surfColl->updateViews( {this} );
}
else if ( changedField == &m_color )
{
// Todo: Update visualization
RimSurfaceCollection* surfColl;
this->firstAncestorOrThisOfTypeAsserted( surfColl );
surfColl->updateViews( {this} );
}
}
@@ -102,7 +139,7 @@ struct SurfacePointData
//--------------------------------------------------------------------------------------------------
/// Returns false for fatal failure
//--------------------------------------------------------------------------------------------------
bool RimSurface::updateDataFromFile()
bool RimSurface::updateSurfaceDataFromFile()
{
std::ifstream stream( this->surfaceFilePath().toLatin1().data() );