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

#1544 Removed unused functions and other minor improvements

Browse Source
This commit is contained in:
Magne Sjaastad
2018-01-19 12:28:12 +01:00
parent ba437c605d
commit 8e5bcef7c7
4 changed files with 39 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ApplicationCode/ModelVisualization/RivReservoirSimWellsPartMgr.cpp
View File

@@ -29,15 +29,15 @@
#include "RimSimWellInViewCollection.h"
#include "RimSimWellInView.h"
#include "RivWellHeadPartMgr.h"
#include "RivSimWellPipesPartMgr.h"
#include "RivWellConnectionsPartMgr.h"
#include "RivWellHeadPartMgr.h"
#include "RivWellSpheresPartMgr.h"
#include "cafPdmFieldCvfColor.h"
#include "cafPdmFieldCvfMat4d.h"
#include "cvfTransform.h"
#include "RivWellSpheresPartMgr.h"
#include "RivWellConnectionsPartMgr.h"
//--------------------------------------------------------------------------------------------------
///
@@ -176,16 +176,3 @@ void RivReservoirSimWellsPartMgr::updatePipeResultColor(size_t frameIndex)
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const std::vector< std::vector <cvf::Vec3d> >* RivReservoirSimWellsPartMgr::centerLineOfWellBranches(int wellIdx)
{
if (wellIdx < static_cast<int>(m_wellPipesPartMgrs.size()))
{
return &(m_wellPipesPartMgrs[wellIdx]->centerLineOfWellBranches());
}
return NULL;
}

33
ApplicationCode/ModelVisualization/RivReservoirSimWellsPartMgr.h
View File

@@ -1,24 +1,23 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2011-2012 Statoil ASA, Ceetron AS
//
//
// ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
//
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#pragma once
#include "cvfBase.h"
#include "cvfCollection.h"
#include "cvfVector3.h"
@@ -27,9 +26,9 @@
namespace cvf
{
class Transform;
class ModelBasicList;
}
class Transform;
class ModelBasicList;
} // namespace cvf
class RimEclipseView;
class RivSimWellPipesPartMgr;
@@ -37,6 +36,9 @@ class RivWellHeadPartMgr;
class RivWellSpheresPartMgr;
class RivWellConnectionsPartMgr;
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
class RivReservoirSimWellsPartMgr : public cvf::Object
{
public:
@@ -51,15 +53,12 @@ public:
void appendDynamicGeometryPartsToModel(cvf::ModelBasicList* model, size_t frameIndex);
void updatePipeResultColor(size_t frameIndex);
const std::vector< std::vector <cvf::Vec3d> >* centerLineOfWellBranches(int wellIdx);
private:
caf::PdmPointer<RimEclipseView> m_reservoirView;
cvf::ref<cvf::Transform> m_scaleTransform;
cvf::Collection< RivSimWellPipesPartMgr > m_wellPipesPartMgrs;
cvf::Collection< RivWellHeadPartMgr > m_wellHeadPartMgrs;
cvf::Collection< RivWellSpheresPartMgr > m_wellSpheresPartMgrs;
cvf::Collection< RivWellConnectionsPartMgr > m_wellConnPartMgrs;
caf::PdmPointer<RimEclipseView> m_reservoirView;
cvf::ref<cvf::Transform> m_scaleTransform;
cvf::Collection<RivSimWellPipesPartMgr> m_wellPipesPartMgrs;
cvf::Collection<RivWellHeadPartMgr> m_wellHeadPartMgrs;
cvf::Collection<RivWellSpheresPartMgr> m_wellSpheresPartMgrs;
cvf::Collection<RivWellConnectionsPartMgr> m_wellConnPartMgrs;
};

18
ApplicationCode/ModelVisualization/RivSimWellPipesPartMgr.cpp
View File

@@ -70,6 +70,24 @@ RivSimWellPipesPartMgr::~RivSimWellPipesPartMgr()
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivSimWellPipesPartMgr::setScaleTransform(cvf::Transform * scaleTransform)
{
m_scaleTransform = scaleTransform;
scheduleGeometryRegen();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivSimWellPipesPartMgr::scheduleGeometryRegen()
{
m_needsTransformUpdate = true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

6
ApplicationCode/ModelVisualization/RivSimWellPipesPartMgr.h
View File

@@ -47,15 +47,13 @@ public:
RivSimWellPipesPartMgr(RimEclipseView* reservoirView, RimSimWellInView* well);
~RivSimWellPipesPartMgr();
void setScaleTransform(cvf::Transform * scaleTransform) { m_scaleTransform = scaleTransform; scheduleGeometryRegen();}
void setScaleTransform(cvf::Transform * scaleTransform);
void scheduleGeometryRegen() { m_needsTransformUpdate = true; }
void scheduleGeometryRegen();
void appendDynamicGeometryPartsToModel(cvf::ModelBasicList* model, size_t frameIndex);
void updatePipeResultColor(size_t frameIndex);
const std::vector< std::vector <cvf::Vec3d> >& centerLineOfWellBranches() { return m_pipeBranchesCLCoords;}
private:
caf::PdmPointer<RimEclipseView> m_rimReservoirView;
caf::PdmPointer<RimSimWellInView> m_rimWell;