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

#3807 Tidy up contour map code after splitting out Eclipse specific code

Browse Source
This commit is contained in:
Gaute Lindkvist
2019-01-11 16:06:08 +01:00
parent bad98b81ad
commit 9a6d0ab9ef
4 changed files with 431 additions and 432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
ApplicationCode/ProjectDataModel/RimEclipseContourMapProjection.h
View File

@@ -50,41 +50,39 @@ public:
RimEclipseContourMapProjection();
~RimEclipseContourMapProjection() override;
QString resultDescriptionText() const override;
QString weightingParameter() const;
void updatedWeightingResult();
QString weightingParameter() const;
void updatedWeightingResult();
// Eclipse case overrides for contour map methods
QString resultDescriptionText() const override;
RimRegularLegendConfig* legendConfig() const override;
void updateLegend() override;
protected:
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void initAfterRead() override;
private:
typedef RimContourMapProjection::CellIndexAndResult CellIndexAndResult;
void updateGridInformation() override;
void generateGridMapping() override;
void generateResults(int timeStep) override;
bool gridMappingImplNeedsUpdating() const override;
bool resultsImplNeedsUpdating() const override;
void clearImplSpecificResultData() override;
RimGridView* baseView() const override;
bool gridMappingNeedsUpdating() const override;
bool resultsNeedUpdating(int timeStep) const override;
void clearResults() override;
// Eclipse implementation specific data generation methods
double calculateValueInCell(uint i, uint j) const;
double calculateColumnResult(ResultAggregation resultAggregation, size_t cellGlobalIdx) const;
std::vector<CellIndexAndResult> visibleCellsAndOverlapVolumeFrom2dPoint(const cvf::Vec2d& globalPos2d, const std::vector<double>* weightingResultValues = nullptr) const;
std::vector<CellIndexAndResult> visibleCellsAndLengthInCellFrom2dPoint(const cvf::Vec2d& globalPos2d, const std::vector<double>* weightingResultValues = nullptr) const;
double findColumnResult(ResultAggregation resultAggregation, size_t cellGlobalIdx) const;
void updateGridInformation() override;
RimEclipseResultCase* eclipseCase() const;
RimGridView* baseView() const override;
RimEclipseContourMapView* view() const;
protected:
// Framework overrides
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void initAfterRead() override;
protected:
caf::PdmField<bool> m_weightByParameter;
caf::PdmChildField<RimEclipseResultDefinition*> m_weightingResult;