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
Gaute Lindkvist
975cd15c32
#3910 Unit test for reg exp validator
2018-12-20 09:50:05 +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
Magne Sjaastad
bc86158ff6
#3914 Source Stepping : Add checkbox for include of ensemble cases
2018-12-20 08:36:35 +01:00
Magne Sjaastad
1ac998973e
#3913 Source Case Stepping : Exclude ensemble and observed cases from list
2018-12-20 08:13:49 +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
b30008c5c8
Revert " #3862 Reload case. Reset time step filter during reload to fix issue"
...
This reverts commit d202e430d2
.
2018-12-19 13:04:03 +01:00
Magne Sjaastad
b7e569d09a
#3904 Summary : Move function
2018-12-19 10:07:33 +01:00
Bjørn Erik Jensen
d202e430d2
#3862 Reload case. Reset time step filter during reload to fix issue
2018-12-19 08:26:35 +01:00
Magne Sjaastad
cad072ba0b
#3902 Summary Stepping : Fix issues for well name, region and well group name
2018-12-18 22:55:35 +01:00
Magne Sjaastad
a442ddff04
#3901 Summary Stepping : Improve source case stepping
2018-12-18 22:55:35 +01:00
Jacob Støren
07f8221676
#3898 , #3899 , #3900 Better source stepping command icons. Combine curve and stepping icons. Improved Clear source curve command enabling
2018-12-18 17:15:54 +01:00
Gaute Lindkvist
5ed13d3530
Fix QValidator build problem on Linux related to Annotations
2018-12-18 17:09:43 +01:00
Gaute Lindkvist
394c84efef
#3854 Add MSW reference depth to Perforations
2018-12-18 17:09:43 +01:00
Gaute Lindkvist
7296c11bc2
#3877 Add RegExp-validator to "Well name for export" field for COMPDAT export
...
* Max 8 characters, minimum 1
* Only alpha-numeric characters and hyphen and underscore are acceptable. (no space)
2018-12-18 17:09:43 +01:00
Bjørn Erik Jensen
4f1f52ec5c
Annotations. Hide isActive field in property editor
2018-12-18 15:08:27 +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
a2e2907e41
#3883 Annotations. Validate line thickness
2018-12-18 10:48:48 +01:00
Magne Sjaastad
024aa8af51
#3782 StimPlan : Beta value of zero invalidates mean calculation
2018-12-17 16:24:42 +01:00
Magne Sjaastad
6325b9c878
#3782 StimPlan : Beta value of zero invalidates mean calculation
2018-12-17 16:24:02 +01:00
Magne Sjaastad
fb9e5ee210
#3842 : Update icons in project tree
2018-12-17 16:01:15 +01:00
Magne Sjaastad
9af5adf066
#3842 Summary : Commands for set/clear of stepping data source
2018-12-17 16:00:40 +01:00
Magne Sjaastad
ec528108d4
#3842 Summary : Application logic for supporting stepping data source
2018-12-17 15:59:50 +01:00
Magne Sjaastad
b1da83ee33
#3842 Summary : Use one curve as basis for source data stepping
2018-12-17 15:54:23 +01:00
Magne Sjaastad
67d0d5f38d
#3891 StimPlan : BETA values for transversal and azimuth
2018-12-17 11:17:41 +01:00
Magne Sjaastad
d40675f222
#3891 StimPlan : BETA values for transversal and azimuth
2018-12-17 10:33:42 +01:00
Gaute Lindkvist
0ba7725c23
#3825 Time Step Filter: disable IO for field not available for user.
2018-12-17 08:03:21 +01:00
Magne Sjaastad
9ef915b0a8
Summary : Guard invalid data
2018-12-17 07:56:29 +01:00
Magne Sjaastad
c488348168
#3835 Ensemble : Improve hos curve visibility is defined
2018-12-17 07:56:24 +01:00
Magne Sjaastad
5e466ed5a9
#3841 Summary : Update stepping toolbar when curve is deleted
2018-12-17 07:56:19 +01:00
Magne Sjaastad
86d801a138
Summary : Guard invalid data
2018-12-17 07:28:27 +01:00
Magne Sjaastad
1654c3cc58
#3835 Ensemble : Improve hos curve visibility is defined
2018-12-17 07:26:22 +01:00
Magne Sjaastad
19df293f12
#3841 Summary : Update stepping toolbar when curve is deleted
2018-12-17 07:25:25 +01:00
Gaute Lindkvist
d6e40f25ff
#3879 Rename valve location parameter to Number of Valves
2018-12-14 16:03:04 +01:00
Gaute Lindkvist
3adb1cc4bd
#3884 Implemented Valve Templates for MSW parameters
2018-12-14 16:03:04 +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
295da5658e
#3793 View auto name. Move ViewNameConfig to 3dView and replace current name field. InitAfterRead update to be backward compatible
2018-12-14 13:43:25 +01:00
Bjørn Erik Jensen
fa55e1b3f5
#3793 Views. Rename RimContourMapNameConfig to RimViewNameConfig
2018-12-14 13:42:07 +01:00
Gaute Lindkvist
47bb14eb06
#3864 Update and clamp valve positions to perforation interval when perforation interval changes.
2018-12-14 08:45:43 +01:00
Magne Sjaastad
529ca6285b
#3873 Create LGR : Use isCell instead of isValid
...
isCell evaluates the global grid cell index, and must be used before accessing the global cell index.
2018-12-13 20:08:24 +01:00
Magne Sjaastad
c2ddeb33aa
#3873 Create LGR : Use isCell instead of isValid
...
isCell evaluates the global grid cell index, and must be used before accessing the global cell index.
2018-12-13 20:06:05 +01:00
Magne Sjaastad
4ad982ada6
#3872 Summary Plot : Move last activated curve on top within category
2018-12-13 16:14:29 +01:00
Bjørn Erik Jensen
d482d3a4ca
#3826 Summary curves. Draw error bars in front of all curves except from observed data curves
2018-12-13 16:14:13 +01:00
Magne Sjaastad
0fa5a5b000
#3871 Summary Plot : Missing assignment of curve z-value
2018-12-13 16:07:17 +01:00
Magne Sjaastad
f36d0eeee7
#3872 Summary Plot : Move last activated curve on top within category
2018-12-13 16:05:58 +01:00
Bjørn Erik Jensen
9c750c5287
#3869 Annotations. Closing polyline support
2018-12-13 15:58:32 +01:00
Magne Sjaastad
a87c4efd93
#3871 Summary Plot : Missing assignment of curve z-value
2018-12-13 15:37:06 +01:00
Bjørn Erik Jensen
8d28e86bce
#3867 Anntoations. Remove TextAnnotation's child nodes
2018-12-13 15:14:04 +01:00
Bjørn Erik Jensen
01249ace3a
#3860 Z scale label. Do not show in contour map
2018-12-13 13:20:49 +01:00
Gaute Lindkvist
92e4fa9024
#3863 fix default MSW parameters for perforation intervals.
2018-12-12 15:37:10 +01:00
Gaute Lindkvist
ea371f8321
#3858 add quotes to pressure drop text and make HF- default
2018-12-12 10:20:12 +01:00
Gaute Lindkvist
3dafd06859
#3850 Implement calculation of AICD length
2018-12-11 16:21:17 +01:00
Gaute Lindkvist
5368574848
#3846 Make HF- the default pressure drop for MSW and put quotes around the text.
2018-12-11 15:32:07 +01:00
Gaute Lindkvist
7c110091d5
#3809 Make Flow diagnostics work with contour maps
2018-12-11 13:39:28 +01:00
Gaute Lindkvist
2ae4e483ed
#3783 Guard in case of incomplete project data
2018-12-11 13:14:58 +01:00
Bjørn Erik Jensen
70db2bdd2e
#3760 Summary plot. Z ordering different types of summary curves
2018-12-11 13:12:47 +01:00
Gaute Lindkvist
8570e51362
#3798 Make sure 3d overlay info update is called even if it is inactive
...
* It also causes animation bar to be hidden if the overlay info is inactive
2018-12-11 13:12:06 +01:00
Gaute Lindkvist
4bdab329e1
#3801 Postpone assignment of old selectedTracer-field to producers and injectors
...
* initAfterRead is too soon as the solver hasn't been set up yet.
* wait until onEditorWidgetsCreated()
2018-12-11 13:05:13 +01:00
Bjørn Erik Jensen
d91e79f247
#3838 Annotations. Add name to user defined polylines
2018-12-11 12:37:11 +01:00
Bjørn Erik Jensen
65390ac6e9
#3836 Annotations. Polyline edit fixes. Default pos
2018-12-11 11:51:09 +01:00