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
12,226 Commits 27 Branches 61 Tags 309 MiB
82ef81b51f
Commit Graph

1136 Commits

Author SHA1 Message Date
Magne Sjaastad
218472fe2c Merge branch 'dev' into measurement 2019-01-02 14:32:17 +01:00
Gaute Lindkvist
128208d35a Fix type in RiaColorTools contrastColor 2018-12-21 10:12:58 +01:00
Bjørn Erik Jensen
5976298267 Merge branch 'dev' into measurement 2018-12-21 10:08:41 +01:00
Gaute Lindkvist
9fdec77c94 #3919 Contrast colors for contour lines 2018-12-21 09:48:57 +01:00
Gaute Lindkvist
22f054c6b9 #3919 Apply contrast colours to contour lines as well. 2018-12-21 09:48:57 +01:00
Gaute Lindkvist
6754f837d4 #3876 First label implementation. Not rotated yet. 2018-12-21 09:48:56 +01:00
Bjørn Erik Jensen
21403f4161 #3805 Measurement. Double click in view to reset measurement 2018-12-21 09:23:53 +01:00
Gaute Lindkvist
d259f8f33a Move display transforms from contour map 2018-12-20 14:10:20 +01:00
Bjørn Erik Jensen
d6f4962ed7 #3806 Measurement. Display text label at last clicked position 2018-12-20 12:34:17 +01:00
Gaute Lindkvist
10da90350f #3876 Create Counter Clockwise closed polygons out of the contour line segments 2018-12-20 09:47:25 +01:00
Bjørn Erik Jensen
849a623379 #3804 #3805 Measurement. Add toolbar button and interactive picking 2018-12-19 14:41:17 +01:00
Bjørn Erik Jensen
4873381176 #3868 Annotations. Fix polyline visualization and property editor 2018-12-18 12:50:21 +01:00
Bjørn Erik Jensen
c575e1d29e #3868 Annotations. Remove commented code 2018-12-14 15:34:18 +01:00
Bjørn Erik Jensen
8401e3d9f0 #3868 Annotations. Draw spheres on polylines + toggles conotrolling visibility 2018-12-14 15:32:32 +01:00
Bjørn Erik Jensen
9c750c5287 #3869 Annotations. Closing polyline support 2018-12-13 15:58:32 +01:00
Bjørn Erik Jensen
b4482d20b0 #3723 Annotations. User editable polyline, both in in view and in property editor 2018-12-07 09:11:19 +01:00
Bjørn Erik Jensen
00d767f67c #3789 Annotations. Text appearance settings. New FontCache class 2018-12-05 14:39:07 +01:00
Bjørn Erik Jensen
e56090dc92 #3788 Annotations. Set texts and icons 2018-12-03 15:29:23 +01:00
Magne Sjaastad
8d0926dd53 Fix Linux build issue 2018-12-03 13:55:48 +01:00
Bjørn Erik Jensen
11e2fe29d4 #3788 Annotations. Mirror global annotations into view annotation collection. Not thorougly testet yet 2018-12-03 13:15:31 +01:00
Jacob Støren
918efd3a27 #3757 Enable Z-buffer testing for text annotations 2018-12-03 11:05:12 +01:00
Jacob Støren
a13201e42e #3757 Add selection of text annotations by picking 2018-12-03 11:05:12 +01:00
Bjørn Erik Jensen
d3db1a6075 #3777 Annotations. Use Bounding box to decide whether to draw an object or not 2018-11-29 14:28:33 +01:00
Bjørn Erik Jensen
9dc1e8d063 #3778 Annotations. Move z plane settings to in-view collection 2018-11-29 10:13:19 +01:00
Bjørn Erik Jensen
b5f0459843 #3772 Annotations. Draw reach circle center symbol 2018-11-29 08:48:28 +01:00
Jacob Støren
04754d394f #3776 Add toggle to text and reach circles annotations 2018-11-28 14:36:17 +01:00
Jacob Støren
0f384cf4f7 #3724 Split the line annotation classes into separate files. Cleaned up includes 2018-11-28 12:10:08 +01:00
Bjørn Erik Jensen
c3dd6a14a7 #3763 Annotations. Define annotation plane Z for global annotations 2018-11-28 11:58:38 +01:00
Jacob Støren
29e6e08779 #3724 Added cycling default color to polyline import. Set default line thickness to 2. 
Refactored away unneccesary complexity. loadAndUpdate when opening project file. Toggle now working
 2018-11-27 17:54:42 +01:00
Bjørn Erik Jensen
d8142e3c75 #3758 Annotations. Add appearance settings to line based annotations 2018-11-27 14:27:19 +01:00
Bjørn Erik Jensen
cdaa5e2af6 #3756 Annotation. Refactore features. Add view local text annotations 2018-11-26 15:12:43 +01:00
Jacob Støren
9297c5888c #3724, #3723 Several polyline annotation updates 
Renamed from polyline to polylines.
Split into PolylinesFromFile and UserDefinedPolylines
Add import of polylines from file
 2018-11-26 14:10:20 +01:00
Jacob Støren
bb95daee97 #3724 Fix missing drawing of more than one polyline 2018-11-26 14:08:14 +01:00
Bjørn Erik Jensen
5531504e8e #3706 Annotations. Text annotation border color 2018-11-26 12:49:22 +01:00
Bjørn Erik Jensen
6286a8729b #3706 Annotations. Simple drilling reach circle 2018-11-26 11:08:38 +01:00
Bjørn Erik Jensen
4dc5c66b03 #3706 Annotations. Working text annotation, no view interaction yet. (and no background transparency) 2018-11-26 09:27:39 +01:00
Gaute Lindkvist
8b7b110440 Merge branch 'dev' into dev-deeper 2018-11-26 09:21:33 +01:00
Bjørn Erik Jensen
35405ebafc #3706 Annotations. First commit. Not tested 2018-11-23 13:33:59 +01:00
Magne Sjaastad
4f46a9b3cb #3715 Well connection factor viz : Show fracture well connection factors in cell center 2018-11-23 13:05:34 +01:00
Gaute Lindkvist
a1b7e694a6 #3727 Give packers a more realistic default length 2018-11-22 14:06:03 +01:00
Gaute Lindkvist
ae8cb9d210 #3741 Make it possible to enable/disable all well path components in plots and 3d view. 
* Add check box to casing design and update of plot
* Add isEnabled() method to component interface which controls plotting.
 2018-11-22 13:39:08 +01:00
Gaute Lindkvist
132408ab6f #3727 Additional packer fixes 2018-11-22 13:39:08 +01:00
Gaute Lindkvist
094ae45dcd Formatted contour map code and renamed some methods. 2018-11-21 09:33:21 +01:00
Gaute Lindkvist
58c5f066c3 #3700 Fix bugs related to cell positions and grid extent. 2018-11-20 11:31:22 +01:00
Gaute Lindkvist
42d3e65416 #3700 Add visual picking marker and improve map results 
* Fix "off by half a cell" errors and improve smoothness using averaging and interpolation
 2018-11-19 15:24:18 +01:00
Gaute Lindkvist
b20e801ae1 #3701 Larger margins around axis text 2018-11-15 15:02:07 +01:00
Gaute Lindkvist
387741d0c1 #3530 Support picking on 2d Maps. 2018-11-14 13:43:55 +01:00
Magne Sjaastad
4117e266ed #3686 Completion Export : Use map based on size_t instead of RigCompletionDataGridCell 
Using RigCompletionDataGridCell as key in a map causes cells with identical local IJK to be treated as same global cell. Use reservoir grid cell index (size_t) as key to be able to handle cells correctly.
 2018-11-14 11:40:23 +01:00
Gaute Lindkvist
97f3cbc18d #3656 Improve display of Y-axis values. 2018-11-12 14:30:18 +01:00
Magne Sjaastad
cfbbcacc23 #3634 Regression Test : Use flag to control OpenMP when building geometry 2018-11-12 07:33:08 +01:00
Gaute Lindkvist
53fad80e89 2d Maps: Renames to make classes and variables more consistent. 
* Everything is now named something related to ContourMap:
  - Rim2dEclipseView -> RimContourMapView
  - Rim2dGridProjection -> RimContourMapProjection
  ....
 2018-11-09 09:11:29 +01:00
Gaute Lindkvist
a842f3d445 #3633 2d Maps: Make contour lines optional 2018-11-05 16:19:16 +01:00
Gaute Lindkvist
f71c4c75f5 2d Maps: Remove unnecessary prototype code 2018-11-02 16:25:23 +01:00
Bjørn Erik Jensen
e634e28944 Try to fix build error on Linux 2018-11-01 09:35:47 +01:00
Gaute Lindkvist
ee388ca4b0 #3591 Improve edges on contour map. 2018-10-31 16:17:09 +01:00
Gaute Lindkvist
78d81d2630 #3573 Draw axis lines across the whole view for 2d Contour Maps. 2018-10-31 12:13:04 +01:00
Gaute Lindkvist
69d079f942 #3505 First go at contour lines 2018-10-30 16:25:33 +01:00
Gaute Lindkvist
eb46fad1ec #3501 Support property filters for 2d Maps 2018-10-30 11:44:00 +01:00
Magne Sjaastad
d353cfb8ec #3558 Grid items in Project Tree : Use main grid to control fault visibility 2018-10-29 11:23:19 +01:00
Gaute Lindkvist
643dd5596b #3556 Remove gray borders on 2d maps. 2018-10-29 10:00:39 +01:00
Magne Sjaastad
e3d985d220 #3558 Grid items in Project Tree : Remove obsolete field showMainGrid 2018-10-26 16:23:18 +02:00
Gaute Lindkvist
f80472ffa6 #3540 Create seperate 2d view with parallel, look down and linked views 2018-10-24 15:21:53 +02:00
Gaute Lindkvist
2194821609 #3527 Implement multiple ICD/AICDs for perforation intervals. 2018-10-22 09:35:35 +02:00
Gaute Lindkvist
5cddab62ac #3529 Scale length of 3D well path components by well path radius 2018-10-19 15:01:04 +02:00
Gaute Lindkvist
814fc334cc #3535 2d Maps: Improve performance of grid projection 2018-10-19 15:00:45 +02:00
Magne Sjaastad
6346ed012c clang-tidy : Remove redundant 'virtual' and add 'override' 2018-10-18 19:45:57 +02:00
Magne Sjaastad
5a1acc124f #3512 System : Remove unused functions 2018-10-17 13:52:48 +02:00
Gaute Lindkvist
075c3eb627 2d Maps: Fix bug when there's no range filters active 2018-10-17 13:51:19 +02:00
Gaute Lindkvist
0880fd5dec #3502 #3501. Weights and range filter. 2018-10-17 13:29:13 +02:00
Gaute Lindkvist
fd3b68834d Renamed RigTernaryResultAccessor2d.h|cpp to remove the 2d. 2018-10-17 13:26:44 +02:00
Gaute Lindkvist
e053ec211a #3499 Add seperate legend for 2d projection view 2018-10-16 10:44:25 +02:00
Gaute Lindkvist
222ac5137f #3498 Implement 2d grid projection prototype with regular grid. 2018-10-16 10:44:25 +02:00
Gaute Lindkvist
2035df2739 #3492 Tidy up color code for well path components/completions and select colors that work better. 2018-10-12 15:05:22 +02:00
Gaute Lindkvist
256e5de30c Fix crash in RivWellPathPartMgr following valve updates 2018-10-11 12:46:10 +02:00
Gaute Lindkvist
f85e1bdb98 #3441 Slight tweaks to casing shoe 3D-look and added Packers. 2018-10-11 11:33:45 +02:00
Gaute Lindkvist
e7a39fb2f8 #3441 Valve visualisation in 3D view. 2018-10-11 11:18:11 +02:00
Magne Sjaastad
9d9771295f System : Replace NULL with nullptr 2018-10-10 10:17:27 +02:00
Bjørn Erik Jensen
063b7121b1 #3289 Well path creation. When clicking on a well path, use tangent. Rename arguments 2018-10-01 10:08:09 +02:00
Magne Sjaastad
09baef3e1c Remove local variable definition shadowing other variable 2018-09-28 09:39:10 +02:00
Magne Sjaastad
acf6a17c40 Fix warnings 2018-09-27 20:49:47 +02:00
Magne Sjaastad
4877e058ed Fix warnings 2018-09-27 20:17:56 +02:00
Bjørn Erik Jensen
ade352a259 Rename method 2018-09-27 09:55:28 +02:00
Magne Sjaastad
4009d4d63b System : Introduce compiler warning C4457 with fixes 2018-09-24 21:20:35 +02:00
Magne Sjaastad
b17865e117 System : Remove unused code 2018-09-21 16:31:31 +02:00
Magne Sjaastad
0127e0c1b5 #3343 Holo Lens : Use default surface color from geo mech 2018-09-21 14:14:19 +02:00
Magne Sjaastad
163193dc6c Whitespace 2018-09-21 14:14:19 +02:00
Magne Sjaastad
32237b6c7c #3401 HoloLens : Add detection of mesh line parts 2018-09-21 14:14:19 +02:00
Jacob Støren
7e78c77b90 Remove compiler warning 2018-09-20 14:53:54 +02:00
Magne Sjaastad
aa3287f615 #3379 Holo Lens : Add RivCellSetEnum to RivSouceInfo 2018-09-19 14:34:00 +02:00
Magne Sjaastad
56c91c39fd #3379 Holo Lens : Add source pdmObject to RivSouceInfo 2018-09-19 14:34:00 +02:00
Magne Sjaastad
fe4ce550e0 Add override 2018-09-13 08:17:17 +02:00
Magne Sjaastad
a1518bd9ec Whitespace 2018-09-12 14:44:41 +02:00
Magne Sjaastad
6f555c495a #3354 Fracture Viz : Geometry from previous fracture template is not removed 2018-09-11 14:46:55 +02:00
Magne Sjaastad
d5b10546b8 #3032 Completion Export Fracture Header : Refactoring 
Rename to reservoirCellIndicesOpenForFlow
Include inactive cells in area calculation
Consider containment/truncation for header related calculations
Moved calculations from stim plan fracture to stim plan calculator
 2018-09-11 13:35:35 +02:00
Magne Sjaastad
bbebbf108f #3340 Remove unused variables 2018-09-10 10:27:54 +02:00
Magne Sjaastad
3e10e59445 #3268 MSW Fracture Export: Add allFractures and allFishbones 2018-09-07 13:45:14 +02:00
Magne Sjaastad
eefb131701 #3268 MSW Fracture Export : Add activeFishbonesSubs 2018-09-07 13:45:14 +02:00
Gaute Lindkvist
ea8721f6ff Fix crash in 3d well log curve rendering. 2018-09-04 12:57:55 +02:00
Gaute Lindkvist
e3baaa4133 #3261 Show 3d well log curves even if the grid result isn't dynamic. 
* Have to be more precise on whether to attach the results as a static or dynamic property.
* Also rewrite some 3dWellLogPlanePartMgr code to only create one draw surface for each draw plane used for the curves.
 2018-09-04 12:01:07 +02:00
Magne Sjaastad
417ef314b4 #3246 Fracture Visualization: Move fracture coordinates into separate scope 2018-08-30 08:26:29 +02:00
Magne Sjaastad
25b78626be #3246 Fracture Visualization: Use display coordinates 2018-08-30 08:22:53 +02:00
Magne Sjaastad
9e3a100bcc #3253 OpenMP : Give name to all critical sections 2018-08-27 13:04:29 +02:00
Jacob Støren
9025cedecb #3204 Add double precision to OffshoreSphericalCoords 2018-08-14 11:41:20 +02:00
Jacob Støren
fb7a7e39eb #3201 #3202 Split in separate files. Move offshore spherical coords stuff to separate file in RiaTools 2018-08-14 11:41:19 +02:00
Magne Sjaastad
76913aded5 CppCheck : Use std::array 2018-08-10 16:05:35 +02:00
Magne Sjaastad
25ac317639 #3195 Grid Box : Enable depth test for all grid box lines 
The text labels are always visible, also through geometry. The line closest to label text was set to no depth test, probably to match the text visibility. This is changed by this commit, and the top line will be hidden by reservoir geometry.

Introduced by  https://github.com/OPM/ResInsight/issues/266
 2018-08-10 13:18:16 +02:00
Magne Sjaastad
8425ea96ad #3185 Remove FixedArray 2018-08-07 10:37:52 +02:00
Magne Sjaastad
aeae19c748 #3185 Use std::array instead of FixedArray 2018-08-07 10:07:42 +02:00
Magne Sjaastad
371969db3c #3038 Remove code duplication 2018-08-07 09:54:12 +02:00
Magne Sjaastad
5bbc0ee89f CppCheck : memcpy did not copy all data as intended 2018-08-03 07:12:40 +02:00
Magne Sjaastad
fe07b60392 CppCheck : Several fixes 
Add missing initializers
Guard potential null pointer access
 2018-08-02 19:22:03 +02:00
Magne Sjaastad
9b302d15a3 Grid Box Generator : Improve robustness for invalid bounding box 2018-06-29 16:42:23 +02:00
Magne Sjaastad
a90755c899 Guard null pointer access 2018-06-29 16:42:23 +02:00
Magne Sjaastad
451ce82aa9 Guard null pointer access 2018-06-29 16:42:23 +02:00
Magne Sjaastad
4ae3290e3c #1722 Completion Export : Use RimTools::wellPathCollection 2018-06-29 10:48:45 +02:00
Magne Sjaastad
c79b120031 #3035 Whitespace 2018-06-25 08:24:47 +02:00
Magne Sjaastad
1575a6564a #3035 Consolidate duplicate code 2018-06-25 08:19:29 +02:00
Magne Sjaastad
b317ea9e9e #3035 Fault Truncation: Display a mask for fracture outside grid 2018-06-25 07:45:25 +02:00
Gaute Lindkvist
a0f5db5d7e #2965 Implement option (on by default) to follow time step in 3D view. 2018-06-20 11:46:19 +02:00
Bjørn Erik Jensen
eebd8bef2d Move RigCurveDataTools and RigTimeHistoryCurveMerger to Application/Tools plus rename 2018-06-08 15:10:45 +02:00
Magne Sjaastad
b0ee5a2834 #2969 Fracture Truncations : Visualize fault truncations 2018-05-31 08:30:04 +02:00
Magne Sjaastad
54f5ab66b4 #2969 Add const to currentActiveCellInfo 2018-05-31 08:30:04 +02:00
Gaute Lindkvist
bef7535eff #2941 3d well log curves: Fix crash if the draw surface width becomes larger than well path length 2018-05-18 14:26:52 +02:00
Gaute Lindkvist
9e665d5ab1 3d Well Log Plots: Remove curve filled code 2018-05-18 14:26:52 +02:00
Gaute Lindkvist
68dd0ba13e Switch calculation of extra curve vertices to double precision 2018-05-18 14:26:52 +02:00
Jacob Støren
73c0373264 #2940 Geomech: Display offset in place for intersections 2018-05-18 14:02:54 +02:00
Jacob Støren
c1b4cfc3e6 #2925 3D Well Log Curves: Fix missing plot/curves when Color Result = None. Moved the part generation from appendDynamicGeometryParts to appendStatic... 2018-05-15 18:09:46 +02:00
Gaute Lindkvist
1b6d6e714c #2923 Show sensible curve segments to range limits when points are outside range 2018-05-15 17:16:43 +02:00
Gaute Lindkvist
c959db73a1 #2887 Tidy up 3D well log curve configuration to more obvious documentation. 2018-05-09 15:56:24 +02:00
Magne Sjaastad
52c2a93c05 #2882 CF Visualization : Never show connection factor for parent grid cells 2018-05-09 14:31:30 +02:00
Jacob Støren
43082b4952 #2871 Fault visibility toggle now controls fault label visibility in 2D intersection views also. 2018-05-08 16:26:15 +02:00
Gaute Lindkvist
043eaf7db6 Make new vertex creation more robust 
* Require that the length of the new segment is shorter than the *current*
  distance to the end of the original segment, rather than the length of the
  complete original segment.
 2018-05-08 09:09:36 +02:00
Gaute Lindkvist
0d8a034886 Fix Linux build by replacing a HUGE_VAL with std::numeric_limits::infinity 
* This build problem was introduced when fixing a crash issue that came from
  replacing HUGE_VAL with std::numeric_limits::max
 2018-05-07 19:34:22 +02:00
Jacob Støren
20a1e52323 #2850 Fix missing fault-label toggle and color setting awareness in 2D intersection view 2018-05-07 18:06:09 +02:00
Gaute Lindkvist
9125619c41 3D Well Log Curves: Fix crash bug due to wrong value used to force invalid values. 2018-05-07 16:07:13 +02:00
Gaute Lindkvist
c7bf6172f3 #2828 Allow setting curve domain range outside the range of the curve values. 
* Note that this implementation simply removes vertices that are outside the range.
* It would look far better to insert vertices at the boundary when a segment is heading
   out of range. This is more complicated.
 2018-05-07 14:47:24 +02:00
Gaute Lindkvist
57b3ad82a8 #2791 Fix tensor vector colors so principal to has a single color. 2018-05-07 11:17:51 +02:00
Gaute Lindkvist
78326bb19c #2703 An initial implementation of filled drawing style with problems remaining. 
* New vertices are successfully created in the intersections between the
  curve and draw surface triangles
* New vertices are also inserted along the bottom edge of the filled curve.
* However, new vertices will still need to be inserted in the lines connecting the
  top of the curve and the bottom where they intersect with the triangles.
* The option for filled curves remain hidden in the GUI. See #2860.

# Please enter the commit message for your changes. Lines starting
 2018-05-07 11:14:25 +02:00
Gaute Lindkvist
fba437f595 #2791 Rename misspelled "principalNumber" in TensorResultPartMgr 2018-05-07 10:13:17 +02:00
Jacob Støren
d413df0aeb #2730 Category and Scalarmapper Legend: Improve the preferred size 2018-05-04 13:33:06 +02:00
Gaute Lindkvist
23c90bd6eb #2846 Fix bad curve projection 
* Project existing points onto triangles first and make sure we choose the right triangle by
   sorting possible projections by distance.
 * Also allow some tolerance for the inside check.
 * Create the new vertices by projecting the curve segment vector onto each triangle plane
   before looking for intersections with the triangle edges.
 2018-05-03 13:39:39 +02:00
Gaute Lindkvist
944baee00e Fix comment in DrawSurfaceGenerator 2018-05-03 13:39:39 +02:00
Gaute Lindkvist
ffccb078e8 #2841 Fix bad result when z-clipping is applied. 2018-05-02 14:01:50 +02:00
Gaute Lindkvist
a37957824a Clean up 3D well log generator code. Renamed Grid -> DrawSurface and fixed spelling. 2018-05-02 12:10:05 +02:00
Gaute Lindkvist
6e3d989b2f #2825 Fix curve stitching issues against 3dwell log curve background. 2018-05-02 11:51:36 +02:00
Gaute Lindkvist
1f44ea1ea3 Make draw plane selection for curves be unrelated to 3d Track (somewhat related to #2825). 
* Makes more sense user wise and makes for better code.
* Helps refactor code to relate grids to curves so the curves can have access to the grid
   it is being drawn on.
* This will help fix #2825 by being able to project curve points onto the exact triangle geometry.
 2018-05-02 11:51:22 +02:00
Gaute Lindkvist
7307b97466 #2823 Switching curve plane does not work 
* The previous drawable and geometry was kept if switching to a result type without
  valid points.
* The drawable is then stuck in position until switching back to a result
  type that has valid points.
* This commit fixes this by clearing the geometry every time you draw.
* TODO: cache values when it is possible to do so.
 2018-05-02 10:22:37 +02:00
Magne Sjaastad
a0e4f71138 #2715 Add direct access to RigFemPartCollection from a GeoMechView 2018-04-25 12:45:58 +02:00
Magne Sjaastad
9ac3d806e2 #2663 Rename 2018-04-23 23:06:21 +02:00
Magne Sjaastad
a9b1883dc8 #2663 Zoom All : Check if completions intersects bounding box of model 2018-04-23 22:52:44 +02:00