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

Stimplan preprocessor refact (#5895)

Browse Source 
* #5633 Add Fracture Model data object.
* #5633 Add visualization for Fracture Model.
* Use thickness direction well path.
* #5834 WIP Fracture Model: Extract facies names along thickness direction vector
* Update to class enums.
* Remove RimFractureModel dip, tilt and azimuth (no longer used).
* #5824: Fix fracture model direction relative to formation dip
* Workaround problem in generated python code which breaks tests on linux. See #5862.
* Update name of thickness direction well path.
* #5834 Add import command for facies roff file.
* #5834 Show color legend data in facies track.
Also make it possible to change the data source for the curve data in plot.
* Fracture Model: replace "Thickness Type" with "Extraction Type".
* Use shorter curve legends in fracture model plot.
* Use class enum for RimFractureModel::ExtractionType.
* Use RimProject::current() instead of RiaApplication::instance()->project().
* Simplify RimFractureModel by not implementing Rim3dPropertiesInterface.
* Use scoped enums in RiaPlotAnnotationTool.
* Remove unused RimFractureModelPlot fields.
* Hide fracture model plots field, and add accessor methods.
This commit is contained in:
Kristian Bendiksen
2020-05-14 06:39:55 +02:00
committed by GitHub
parent 73ac3e5db1
commit 20ca3354b9
46 changed files with 2290 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/UserInterface/RiuPlotAnnotationTool.cpp
View File

@@ -196,13 +196,13 @@ Qt::Alignment RiuPlotAnnotationTool::trackTextAlignment( TrackSpan trackSpan )
{
switch ( trackSpan )
{
case FULL_WIDTH:
case TrackSpan::FULL_WIDTH:
return Qt::AlignRight;
case LEFT_COLUMN:
case TrackSpan::LEFT_COLUMN:
return Qt::AlignLeft;
case CENTRE_COLUMN:
case TrackSpan::CENTRE_COLUMN:
return Qt::AlignCenter;
case RIGHT_COLUMN:
case TrackSpan::RIGHT_COLUMN:
return Qt::AlignRight;
}
return Qt::AlignRight;

13
ApplicationCode/UserInterface/RiuPlotAnnotationTool.h
View File

@@ -33,11 +33,12 @@ class QwtPlot;
class RiuPlotAnnotationTool
{
public:
enum RegionAnnotationType
enum class RegionAnnotationType
{
NO_ANNOTATIONS = 0,
FORMATION_ANNOTATIONS = 1,
CURVE_ANNOTATIONS = 2
NO_ANNOTATIONS = 0,
FORMATION_ANNOTATIONS = 1,
CURVE_ANNOTATIONS = 2,
RESULT_PROPERTY_ANNOTATIONS = 3
};
enum RegionDisplay
{
@@ -47,7 +48,7 @@ public:
COLOR_SHADING_AND_LINES = 0x05,
LIGHT_LINES = 0x08,
};
enum TrackSpan
enum class TrackSpan
{
FULL_WIDTH,
LEFT_COLUMN,
@@ -67,7 +68,7 @@ public:
const caf::ColorTable& colorTable,
int shadingAlphaByte,
bool showNames = true,
TrackSpan trackSpan = FULL_WIDTH,
TrackSpan trackSpan = TrackSpan::FULL_WIDTH,
const std::vector<Qt::BrushStyle>& brushStyles = {} );
void attachWellPicks( QwtPlot* plot, const std::vector<QString>& names, const std::vector<double>& yPositions );