Commit Graph

2748 Commits

Author SHA1 Message Date
Magne Sjaastad
87fecb876f Janitor : Avoid use of smart pointer on a QObject 2019-12-04 13:04:44 +01:00
Kristian Bendiksen
12abf6494f #5110 Show only relevant well measurements in WBS track. 2019-12-03 21:19:02 +01:00
Kristian Bendiksen
3583e2ee10 #5125 Update RimWellMeasurementInViewCollection when measurements are imported. 2019-12-03 21:19:02 +01:00
Kristian Bendiksen
66ac8fee1d #5125 Use category legend for well measurements without values. 2019-12-03 21:19:02 +01:00
Gaute Lindkvist
44a4ba8785 Make capital letter *.LAS files show up in import dialog 2019-12-03 14:38:31 +01:00
Gaute Lindkvist
73f5ac5126 Make capital letter *.LAS files show up in import dialog 2019-12-03 14:37:28 +01:00
Magne Sjaastad
b9989b0ebd Merge release into dev
There are quite large diff between release and dev, so do a merge to ease later syncing
2019-12-02 12:47:52 +01:00
Kristian Bendiksen
e87466717c #5047 Remove input property collection from project tree. 2019-12-02 10:45:06 +01:00
Jacob Støren
f3fc7351d4 #5011 Add icon to Replace Case commands 2019-12-02 10:26:11 +01:00
Magne Sjaastad
d68e764a8f Merge pull request #5122 from OPM/timer-improvements
Timer improvements
2019-12-02 10:22:29 +01:00
Gaute Lindkvist
538e42f278 #5106 Fix crash when importing multiple well paths with the same name 2019-12-02 08:01:38 +01:00
Gaute Lindkvist
7c3d45770b Remove unused variable 2019-12-02 08:01:38 +01:00
Gaute Lindkvist
76d7f526ba #5137 load curve data after creating new well log curves 2019-12-02 08:01:38 +01:00
Gaute Lindkvist
82155ae779 #5106 Fix crash when importing multiple well paths with the same name 2019-11-30 12:11:35 +01:00
Gaute Lindkvist
d09e33f6d8 Remove unused variable 2019-11-29 16:25:16 +01:00
Gaute Lindkvist
eb246bd6fc #5137 load curve data after creating new well log curves 2019-11-29 16:25:16 +01:00
Gaute Lindkvist
2336ff4908 #5135 Avoid crash when clicking on a simulation wlel in a statistics case 2019-11-29 15:59:04 +01:00
Jacob Støren
4026e859d2 #5011 Add icon to Replace Case commands 2019-11-29 13:37:38 +01:00
Jacob Støren
021af085a7 #5119, #5120 Default case for intersection result
Fixed missing intersection colors when cellresults are turned off
2019-11-29 10:27:43 +01:00
Jacob Støren
5556d2d9eb #5112 Make selected result definition available through 3ditem selection system
Make PVT, Relperm, Mohr and rResult plot aware
2019-11-28 14:09:52 +01:00
Jacob Støren
8cc2194764 (#5112) Move cell and nnc picking code to a separate pick event handler 2019-11-28 14:09:52 +01:00
Magne Sjaastad
f1b57f3920 #5100 Regression Test : Guard timer for holo lens if no session in running 2019-11-28 07:50:07 +01:00
Magne Sjaastad
dc2af5e0c8 #5102 Janitor : Guard null pointer access 2019-11-28 07:30:02 +01:00
Gaute Lindkvist
ded7be1d73 Make azimuth in WBS plots continous in most cases 2019-11-27 14:17:23 +01:00
Kristian Bendiksen
b4fea5f00a #5001 Move RimWellMeasurementCollection from RimWellPath to
RimWellPathCollection.

Also add filtering of measurements by well path.
2019-11-27 12:05:51 +01:00
Kristian Bendiksen
18c2350bdf #5001 Add measurements to WBS plot. 2019-11-27 12:05:51 +01:00
Kristian Bendiksen
e380168f13 #5001 Show result info when picking RimWellMeasurement in 3d view. 2019-11-27 12:05:51 +01:00
Kristian Bendiksen
d266e44f1f #5001 Add RicImportWellMeasurementsFeature. 2019-11-27 12:05:51 +01:00
Magne Sjaastad
bfdc84a744 #5102 Janitor : Guard null pointer access 2019-11-27 10:17:31 +01:00
Gaute Lindkvist
431f0ff347 Add additional WBS curves and rewrite parameters 2019-11-27 10:14:15 +01:00
Jacob Støren
191419b6b4 clang-format after intersection rename 2019-11-26 13:56:02 +01:00
Jacob Støren
0a358941fb Rename RivIntersectionBoxGeometryGenerator to RivBoxIntersectionGeometryGenerator
Rename RivIntersectionBoxSourceInfo to RivBoxIntersectionSourceInfo
2019-11-26 13:20:16 +01:00
Jacob Støren
4672528a4d Rename RimintersectionBox to RimBoxIntersection
Rename RivIntersectionBoxPartMgr to RimBoxIntersectionPartManager
2019-11-26 13:14:55 +01:00
Jacob Støren
0e14c63f07 Rename crossSection to intersection in general code 2019-11-26 12:45:08 +01:00
Jacob Støren
54c96581f1 Rename RivIntersectionSourceInfo to RivExtrudedCurveIntersectionSourceInfo 2019-11-26 11:56:05 +01:00
Jacob Støren
0617b56850 Rename RivIntersectionGeometryGenerator to RivExtrudedCurveIntersectionGeometryGenerator
and RivIntersectionPartMgr to RivExtrudedCurveIntersectionPartMgr
2019-11-26 11:51:54 +01:00
Jacob Støren
152d2bde17 Rename RimIntersection to RimExtrudedCurveIntersection 2019-11-26 11:35:21 +01:00
Jacob Støren
15aa4d6e0b Merge dev and feature-#5019-separate-intersection-results branch 2019-11-25 15:50:29 +01:00
Magne Sjaastad
c9abd09495 Merge pull request #5091 from OPM/integrate-from-release-branch
Integrate from release branch
2019-11-25 15:39:15 +01:00
Jacob Støren
6e99a43247 #5019 Add/Delete Separate Intersection Result commands 2019-11-25 15:34:36 +01:00
Gaute Lindkvist
95f8c44f0f Improve RimNameConfig API 2019-11-25 15:20:15 +01:00
Gaute Lindkvist
cf7608e6bf Improve RimNameConfig API 2019-11-25 15:19:53 +01:00
Gaute Lindkvist
dc3c92ab26 Improve plot redraw scheduler 2019-11-25 14:26:52 +01:00
Magne Sjaastad
72a5c6cfef Merge pull request #5071 from OPM/memory-fixes
Release of memory
2019-11-25 13:58:55 +01:00
Gaute Lindkvist
db869ccbd5 Improve plot redraw scheduler 2019-11-25 13:55:49 +01:00
Gaute Lindkvist
1d4d261129 Disable multiplot functionality 2019-11-25 08:41:47 +01:00
Magne Sjaastad
22ca504907 Merge pull request #5065 from OPM/remove-input-property-collection-from-tree
#5047 Remove input property collection from project tree.
2019-11-21 07:11:35 +01:00
Kristian Bendiksen
3fafe90aeb #5047 Remove input property collection from project tree. 2019-11-20 22:01:07 +01:00
Magne Sjaastad
caf5ce8666 Janitor : Add missing includes 2019-11-20 15:29:53 +01:00
Gaute Lindkvist
85d683634c Further refactoring 2019-11-20 13:14:45 +01:00