Commit Graph

4338 Commits

Author SHA1 Message Date
Gaute Lindkvist
bad98b81ad #3807 Make RimEclipseContourMapProjection a child of an abstract RimContourMapProjection 2019-01-11 16:06:54 +01:00
Gaute Lindkvist
fb5c222047 #3961 Disable case name in auto name for 3d Views by default 2019-01-11 16:06:53 +01:00
Gaute Lindkvist
f3c188ef56 #3807 Rename RimContourMapView to RimEclipseContourMapView 2019-01-11 16:06:53 +01:00
Gaute Lindkvist
31c67e29e4 #3807 Rename RimContourMapProjection to RimEclipseContourMapProjection 2019-01-11 16:06:53 +01:00
Gaute Lindkvist
4f09b6fbf6 #3945 Fix bug related to updating Contour Map when changing result and weighting parameter 2019-01-11 12:32:46 +01:00
Gaute Lindkvist
d1a457bf07 #3943 Stop regenerating map geometry when altering other geometry.
* Do this by caching results and clearing the cache in three stages with each dependent on the previous stages:
  1. Grid Mapping
  2. Results
  3. Geometry
* Clearing grid mapping clears results and clearing results clears geometry.
* Some operations require only geometry changes, while others require a full change to grid mapping and consequently everything else.
2019-01-11 10:48:28 +01:00
Magne Sjaastad
d460d3d77d #3944 clang-tidy : Apply modernize-deprecated-headers 2019-01-11 08:14:53 +01:00
Magne Sjaastad
81c3ee5df2 #3944 System : Improve code quality using clang-tidy
Remove redundant virtual and add override
2019-01-11 08:14:53 +01:00
Gaute Lindkvist
14cce66d2a #3945 Avoid ray tracing around edges of contour map 2019-01-10 21:16:22 +01:00
Gaute Lindkvist
23142acc01 #3942 disable contour smoothing when contour lines are disabled 2019-01-10 20:58:36 +01:00
Gaute Lindkvist
82686ffe14 #3945 Avoid redoing ray tracing for contour maps when we can 2019-01-10 20:55:58 +01:00
Gaute Lindkvist
a309ffd1ea #3941 Slighly improve contour map performance 2019-01-10 19:13:18 +01:00
Gaute Lindkvist
602bca4ea6 #3939 Make sure contour smoothing doesn't cause level overlap. 2019-01-10 16:07:58 +01:00
Gaute Lindkvist
8428e848de #3941 Improve contour map performance by several measures
* Discarding triangles that aren't inside current level. Big gain.
* Checking bbox for contour levels. Minor gain.
* Doing less interpolation. Minor gain.
2019-01-10 14:53:37 +01:00
Magne Sjaastad
6db80f40b9 #3856 Update copyright headers 2019-01-09 15:29:24 +01:00
Gaute Lindkvist
225f190f4b #3934 Improve picking speed on contour map 2019-01-09 09:57:47 +01:00
Gaute Lindkvist
1a5fdec2d3 #3934 Make contour map colors exactly match the contour lines. 2019-01-09 09:09:26 +01:00
Gaute Lindkvist
b281a801a8 Fix zoom check in RimContourMapView 2019-01-09 09:04:11 +01:00
Gaute Lindkvist
bac377a4eb #3934 Optionally (on default) smooth all contour lines 2019-01-09 08:42:20 +01:00
Gaute Lindkvist
7fccdf7153 #3934 Implement area threshold for contour polygons 2019-01-09 08:42:20 +01:00
Magne Sjaastad
20f9bf4318 #3935 Measurements : Add Esc button to abort measurement mode 2019-01-08 14:55:44 +01:00
Gaute Lindkvist
f099b8a747 Make contour map labels default on 2019-01-08 11:07:37 +01:00
Gaute Lindkvist
8de9a46c6a Rename RimContourMapProjection::generateTriangles to generateTrianglesWithVertexValues
Signed-off-by: Gaute Lindkvist <lindkvis@gmail.com>
2019-01-08 11:07:37 +01:00
Gaute Lindkvist
7a275be335 #3876 Implement rotated labels on contour maps 2019-01-08 11:07:37 +01:00
Gaute Lindkvist
71cacc550f #3881 Smooth outer contour line and clip geometry 2019-01-08 11:07:37 +01:00
Gaute Lindkvist
ec0419a945 #3881 Prepare for better edge clipping by making interpolation function more accessible. 2019-01-08 11:07:36 +01:00
Magne Sjaastad
e835e2b32a #3924 Measurements : Improve text in tool tip 2019-01-08 07:11:00 +01:00
Magne Sjaastad
ecb1b83dfa #3927 Measurements : Compute horizontal area of polygon 2019-01-03 11:34:50 +01:00
Magne Sjaastad
8f85e49849 #3924 Measurements : Rename, fix issues with points in multiple views 2019-01-03 07:18:22 +01:00
Magne Sjaastad
31a30f8a94 #3924 Measurements : Hide measurement from project tree 2019-01-03 07:08:25 +01:00
Magne Sjaastad
855e22abb4 #3924 Measurements : Redraw immediately instead of schedule redraw 2019-01-02 15:04:33 +01:00
Magne Sjaastad
218472fe2c Merge branch 'dev' into measurement 2019-01-02 14:32:17 +01:00
Gaute Lindkvist
c1f9e664cd #3876 Fix picking offset issue arising from contour line fixes. 2019-01-01 16:20:04 +01:00
Gaute Lindkvist
e63ba3ee6d #3768 and #3903 Fix border issue by making OpenGL widget a child of the main window. 2019-01-01 15:14:45 +01:00
Magne Sjaastad
a9c7773ef7 CppCheck : Fix various minor issues 2018-12-21 12:32:57 +01:00
Magne Sjaastad
be77e4e048 CppCheck : Guard null pointer access 2018-12-21 12:31:42 +01:00
Magne Sjaastad
6b952add64 CppCheck : Make sure all variables are initialized in constructor 2018-12-21 11:30:29 +01:00
Magne Sjaastad
8bc8ac5e58 CppCheck : Remove unused function 2018-12-21 11:29:14 +01:00
Bjørn Erik Jensen
5976298267 Merge branch 'dev' into measurement 2018-12-21 10:08:41 +01:00
Magne Sjaastad
47f50c8195 Remove unused functions/variables 2018-12-21 10:07:26 +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
Magne Sjaastad
6f3097dd5f Merge remote-tracking branch 'origin/2018.11.01-patch' into dev 2018-12-21 08:46:27 +01:00
Gaute Lindkvist
9b7f516a2e #3863 fix default MSW parameters for perforation intervals. 2018-12-20 16:08:05 +01:00
Gaute Lindkvist
ac1f57e5f9 #3915 Make valve count mode label "Start/End/Number" instead of "Start/End/Number of Valves".
* This way it works for both ICDs/AICDs and fishbones.
* Not necessary for patch branch.
2018-12-20 14:21:47 +01:00
Gaute Lindkvist
8442cc3f92 #3915 use subs instead of valves for fishbones 2018-12-20 14:10:20 +01:00
Gaute Lindkvist
d259f8f33a Move display transforms from contour map 2018-12-20 14:10:20 +01:00
Gaute Lindkvist
e837d2e9ee #3915 use subs instead of valves for fishbones 2018-12-20 14:09:57 +01:00
Bjørn Erik Jensen
d6f4962ed7 #3806 Measurement. Display text label at last clicked position 2018-12-20 12:34:17 +01:00
Magne Sjaastad
284e07b967 #3907 Summary : Consider combined curve count when assigning color 2018-12-20 10:46:48 +01:00