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
10,580 Commits 27 Branches 61 Tags 309 MiB
86e202aed0
Commit Graph

1074 Commits

Author SHA1 Message Date
Bjørn Erik Jensen
c575e1d29e Annotations. Remove commented code 2018-12-14 15:34:18 +01:00
Bjørn Erik Jensen
8401e3d9f0 Annotations. Draw spheres on polylines + toggles conotrolling visibility 2018-12-14 15:32:32 +01:00
Bjørn Erik Jensen
9c750c5287 Annotations. Closing polyline support 2018-12-13 15:58:32 +01:00
Bjørn Erik Jensen
b4482d20b0 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 Annotations. Text appearance settings. New FontCache class 2018-12-05 14:39:07 +01:00
Bjørn Erik Jensen
e56090dc92 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 Annotations. Mirror global annotations into view annotation collection. Not thorougly testet yet 2018-12-03 13:15:31 +01:00
Jacob Støren
918efd3a27 Enable Z-buffer testing for text annotations 2018-12-03 11:05:12 +01:00
Jacob Støren
a13201e42e Add selection of text annotations by picking 2018-12-03 11:05:12 +01:00
Bjørn Erik Jensen
d3db1a6075 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 Annotations. Move z plane settings to in-view collection 2018-11-29 10:13:19 +01:00
Bjørn Erik Jensen
b5f0459843 Annotations. Draw reach circle center symbol 2018-11-29 08:48:28 +01:00
Jacob Støren
04754d394f Add toggle to text and reach circles annotations 2018-11-28 14:36:17 +01:00
Jacob Støren
0f384cf4f7 Split the line annotation classes into separate files. Cleaned up includes 2018-11-28 12:10:08 +01:00
Bjørn Erik Jensen
c3dd6a14a7 Annotations. Define annotation plane Z for global annotations 2018-11-28 11:58:38 +01:00
Jacob Støren
29e6e08779 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 Annotations. Add appearance settings to line based annotations 2018-11-27 14:27:19 +01:00
Bjørn Erik Jensen
cdaa5e2af6 Annotation. Refactore features. Add view local text annotations 2018-11-26 15:12:43 +01:00
Jacob Støren
9297c5888c , 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 Fix missing drawing of more than one polyline 2018-11-26 14:08:14 +01:00
Bjørn Erik Jensen
5531504e8e Annotations. Text annotation border color 2018-11-26 12:49:22 +01:00
Bjørn Erik Jensen
6286a8729b Annotations. Simple drilling reach circle 2018-11-26 11:08:38 +01:00
Bjørn Erik Jensen
4dc5c66b03 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 Annotations. First commit. Not tested 2018-11-23 13:33:59 +01:00
Magne Sjaastad
4f46a9b3cb Well connection factor viz : Show fracture well connection factors in cell center 2018-11-23 13:05:34 +01:00
Gaute Lindkvist
a1b7e694a6 Give packers a more realistic default length 2018-11-22 14:06:03 +01:00
Gaute Lindkvist
ae8cb9d210 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 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 Fix bugs related to cell positions and grid extent. 2018-11-20 11:31:22 +01:00
Gaute Lindkvist
42d3e65416 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 Larger margins around axis text 2018-11-15 15:02:07 +01:00
Gaute Lindkvist
387741d0c1 Support picking on 2d Maps. 2018-11-14 13:43:55 +01:00
Magne Sjaastad
4117e266ed 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 Improve display of Y-axis values. 2018-11-12 14:30:18 +01:00
Magne Sjaastad
cfbbcacc23 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 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 Improve edges on contour map. 2018-10-31 16:17:09 +01:00
Gaute Lindkvist
78d81d2630 Draw axis lines across the whole view for 2d Contour Maps. 2018-10-31 12:13:04 +01:00
Gaute Lindkvist
69d079f942 First go at contour lines 2018-10-30 16:25:33 +01:00
Gaute Lindkvist
eb46fad1ec Support property filters for 2d Maps 2018-10-30 11:44:00 +01:00
Magne Sjaastad
d353cfb8ec Grid items in Project Tree : Use main grid to control fault visibility 2018-10-29 11:23:19 +01:00
Gaute Lindkvist
643dd5596b Remove gray borders on 2d maps. 2018-10-29 10:00:39 +01:00
Magne Sjaastad
e3d985d220 Grid items in Project Tree : Remove obsolete field showMainGrid 2018-10-26 16:23:18 +02:00
Gaute Lindkvist
f80472ffa6 Create seperate 2d view with parallel, look down and linked views 2018-10-24 15:21:53 +02:00
Gaute Lindkvist
2194821609 Implement multiple ICD/AICDs for perforation intervals. 2018-10-22 09:35:35 +02:00
Gaute Lindkvist
5cddab62ac Scale length of 3D well path components by well path radius 2018-10-19 15:01:04 +02:00
Gaute Lindkvist
814fc334cc 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 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 . 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 Add seperate legend for 2d projection view 2018-10-16 10:44:25 +02:00
Gaute Lindkvist
222ac5137f Implement 2d grid projection prototype with regular grid. 2018-10-16 10:44:25 +02:00
Gaute Lindkvist
2035df2739 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 Slight tweaks to casing shoe 3D-look and added Packers. 2018-10-11 11:33:45 +02:00
Gaute Lindkvist
e7a39fb2f8 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 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 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 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 Holo Lens : Add RivCellSetEnum to RivSouceInfo 2018-09-19 14:34:00 +02:00
Magne Sjaastad
56c91c39fd 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 Fracture Viz : Geometry from previous fracture template is not removed 2018-09-11 14:46:55 +02:00
Magne Sjaastad
d5b10546b8 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 Remove unused variables 2018-09-10 10:27:54 +02:00
Magne Sjaastad
3e10e59445 MSW Fracture Export: Add allFractures and allFishbones 2018-09-07 13:45:14 +02:00
Magne Sjaastad
eefb131701 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 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 Fracture Visualization: Move fracture coordinates into separate scope 2018-08-30 08:26:29 +02:00
Magne Sjaastad
25b78626be Fracture Visualization: Use display coordinates 2018-08-30 08:22:53 +02:00
Magne Sjaastad
9e3a100bcc OpenMP : Give name to all critical sections 2018-08-27 13:04:29 +02:00
Jacob Støren
9025cedecb Add double precision to OffshoreSphericalCoords 2018-08-14 11:41:20 +02:00
Jacob Støren
fb7a7e39eb 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 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 Remove FixedArray 2018-08-07 10:37:52 +02:00
Magne Sjaastad
aeae19c748 Use std::array instead of FixedArray 2018-08-07 10:07:42 +02:00
Magne Sjaastad
371969db3c 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