Commit Graph

4479 Commits

Author SHA1 Message Date
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
Gaute Lindkvist
d119f3d146 #3825 Time Step Filter: disable IO for field not available for user. 2018-12-11 11:46:40 +01:00
Bjørn Erik Jensen
81e2132752 #3839 Annotations. Remove 'targets' tree node for user defined polylines 2018-12-10 15:09:41 +01:00
Bjørn Erik Jensen
abdc4957cd #3835 Ensemble curves. Fix visibility bug 2018-12-10 14:05:01 +01:00
Bjørn Erik Jensen
488798c3d8 #3790 Z scale label. Display in upper left corner 2018-12-10 13:04:07 +01:00
Gaute Lindkvist
15576a9ae3 #3779 Preliminary AICD output 2018-12-07 15:48:18 +01:00
Bjørn Erik Jensen
6e1b8adba1 Annotations. Fix. Update view local collections when importing polyline from file 2018-12-07 15:13:51 +01:00
Gaute Lindkvist
539914a541 Fix crash in RimWellPathValve when perforation is larger than wellpath
* This is the case with the Completions_msw Regression test
2018-12-07 12:58:03 +01:00
Gaute Lindkvist
e677778ddd #3828 Refactor Completion export code by splitting out MSW export into separate files
* Plus fill in some incomplete functionality regarding MSW export
2018-12-07 09:46:39 +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
Gaute Lindkvist
29c3e10617 #3779 Implement AICD ui and settings 2018-12-05 15:47:16 +01:00
Gaute Lindkvist
e67a9ef12a Make sure changes to valves and perforation interval visibility is reflected in track. 2018-12-05 15:47:16 +01:00
Gaute Lindkvist
4591d9f20e #3615 Fix z-order so packers are added after other components
*  Valves are added last of all
* This way packers are displayed on top of perforation intervals and fishbones.
2018-12-05 15:47:16 +01:00
Gaute Lindkvist
c1c897d7a4 #3616 Make 1m the default length of packers 2018-12-05 15:47:16 +01:00
Gaute Lindkvist
420944e910 #3442 Improve ICD/ICV export to add a small 0.1 length segment for each segment containing valves. 2018-12-05 15:47:16 +01:00
Bjørn Erik Jensen
9d4bcd457d #3814 Annotations. Multiline text annotation support 2018-12-05 15:27:07 +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
23148c621e #3824 Annotations. 'Create annotation' context menu item on each annotation group 2018-12-05 10:23:15 +01:00
Bjørn Erik Jensen
6a2484c40e #3826 Summary curves. Draw error bars in front of all curves except from observed data curves 2018-12-05 09:35:05 +01:00
Jacob Støren
c4cc33b624 #3639 Add map projection icon for Contour maps 2018-12-04 15:13:19 +01:00
Magne Sjaastad
af18e30ac6 #3816 Annotations : Assert if resolve of PdmPtrField fails 2018-12-04 14:33:14 +01:00
Magne Sjaastad
687aadcfde #3816 Annotations : PdmPtr not resolved correctly 2018-12-04 12:30:47 +01:00
Magne Sjaastad
1c9da3d33f #3820 System : Delete RiuViewer directly instead of deleteLater() 2018-12-04 11:43:58 +01:00
Magne Sjaastad
6bcdd4e6c4 Remove unused code 2018-12-03 20:25:24 +01:00
Bjørn Erik Jensen
e56090dc92 #3788 Annotations. Set texts and icons 2018-12-03 15:29:23 +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
Gaute Lindkvist
e984b06ea6 Fix build problem on Linux by renaming file to correct case 2018-12-03 10:58:49 +01:00
Gaute Lindkvist
9961b39473 Fix build problem on Linux with missing cvfBase.h 2018-12-03 10:58:49 +01:00
Gaute Lindkvist
45e909fcfa #3783 Guard in case of incomplete project data 2018-12-03 10:58:49 +01:00
Jacob Støren
a9a5eaf604 #3757 New feature to add a text annotation in the 3D view 2018-11-30 14:30:34 +01:00
Jacob Støren
92a45e959e #3757 Rename RiuSelectionManager to Riu3dSelectionManager 2018-11-30 14:30:34 +01:00
Jacob Støren
c2206abca5 #3757 Wip: Add draggers to text annotation points when text is selected 2018-11-30 14:30:34 +01:00
Gaute Lindkvist
20534775d6 #3809 Make Flow diagnostics work with contour maps 2018-11-30 13:47:46 +01:00
Gaute Lindkvist
4d765f19b6 #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-11-30 11:48:52 +01:00
Gaute Lindkvist
8be822c5d7 #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-11-30 11:26:38 +01:00
Gaute Lindkvist
f18884b675 #3752 Fix crash when closing ResInsight 2018-11-30 09:47:53 +01:00
Gaute Lindkvist
f2c7f2ce80 Fix display problems on Linux 2018-11-30 09:47:53 +01:00
Bjørn Erik Jensen
e489d77c81 #3787 Annotations. Folder for each annotation type 2018-11-30 09:06:01 +01:00
Bjørn Erik Jensen
a239923ebc #3786 Annotations. Use slider for annotations plane depth. Move toggle to top 2018-11-30 08:59:22 +01:00
Bjørn Erik Jensen
7f0b05a93b #3760 Summary plot. Z ordering different types of summary curves 2018-11-29 15:29:15 +01:00
Gaute Lindkvist
f14d36ca23 #3442 Implement export of ICD/ICV table for performations 2018-11-29 15:26:22 +01:00
Gaute Lindkvist
f0d3a36374 #3442 Change defaults for ICDs to values suggested in meeting 2018-11-29 15:25:53 +01:00
Gaute Lindkvist
2414865dbe #3442 UI For ICD/ICV parameters 2018-11-29 15:24:39 +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
Jacob Støren
3cc8ff82d1 #3764 Add annotation related icons 2018-11-28 15:40:28 +01:00
Bjørn Erik Jensen
b6b96e62f6 Annotations. Fix crash 2018-11-28 15:27:32 +01:00
Bjørn Erik Jensen
76e8aa9652 #3773 Annotations. Remove annotation color factory class 2018-11-28 15:15:42 +01:00
Bjørn Erik Jensen
bbec88b5d1 #3773 Annotations. Set default color for line based annotations 2018-11-28 15:00:34 +01:00
Jacob Støren
0148fc2279 #3724 Reload and recreate visualization when changing file 2018-11-28 14:36:17 +01:00
Jacob Støren
04754d394f #3776 Add toggle to text and reach circles annotations 2018-11-28 14:36:17 +01:00
Bjørn Erik Jensen
30b34bbe67 Annotations. Fixed polyline vectors. Use explicit naming 2018-11-28 14:21:40 +01:00
Bjørn Erik Jensen
10aae368d3 #3775 Annotations. Use depth in GUI, not z, for used defined polylines as well 2018-11-28 13:21:59 +01:00
Bjørn Erik Jensen
02eea4bc84 #3775 Annotations. Use depth in GUI, not z 2018-11-28 13:10:11 +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
Bjørn Erik Jensen
aae3665539 #3755 Annotations. Reach circle name field 2018-11-28 07:45:53 +01:00
Bjørn Erik Jensen
4685d5981d Merge branch 'dev' into dev-deeper 2018-11-28 07:10:56 +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
d138770a2a 3767 Annotations. Feature for deleting annotations 2018-11-27 15:44:00 +01:00
Bjørn Erik Jensen
e6685e139a #3758 Annotations. Fix header info. Remove unneccessary includes 2018-11-27 14:43:25 +01:00
Bjørn Erik Jensen
d8142e3c75 #3758 Annotations. Add appearance settings to line based annotations 2018-11-27 14:27:19 +01:00
Gaute Lindkvist
5498c2f466 #3766 Hide blank grid children in GeoMech cases 2018-11-27 13:40:19 +01:00
Jacob Støren
8873cdb1f7 #3757, #3723 Merge cleanup of 3d editor support 2018-11-27 11:45:46 +01:00
Jacob Støren
733324634b #3757, #3723 Split the RicPointTangentManipulator file into the different classes actually contained therein 2018-11-27 11:29:20 +01:00
Bjørn Erik Jensen
e578deb43c #3756 Annotations. Moved files to subdirs 2018-11-27 09:26:30 +01:00
Jacob Støren
fb93ad7ca7 AppFwk: Make PdmUiSelection3dEditorVisualizer generic, ready to be moved to a separate file 2018-11-26 21:50:46 +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
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
Bjørn Erik Jensen
35405ebafc #3706 Annotations. First commit. Not tested 2018-11-23 13:33:59 +01:00
Bjørn Erik Jensen
39a838b406 Merge branch 'dev' into dev-deeper 2018-11-23 08:45:28 +01:00
Gaute Lindkvist
56ae4fa5bd Fix Linux Build Problem after FlowDiag 2018-11-23 08:20:05 +01:00
Magne Sjaastad
314c20a04a #3735 Summary plot : Improve stepping for well path name 2018-11-22 15:24:18 +01:00
Bjørn Erik Jensen
15a6bc358b Merge branch 'dev' into dev-deeper 2018-11-22 14:21:00 +01:00
Bjørn Erik Jensen
ceb5fff780 Create Well Path. Add tooltip containing dog leg unit 2018-11-22 14:20:08 +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
fcc8ee6e27 #3736 Fix Linking issues related to Contour Maps.
* They are not allowed to be master views so a few things should be disallowed.
2018-11-22 13:39:07 +01:00
Gaute Lindkvist
d69153c013 #3489 Fix legend text for flow diagnostics. 2018-11-22 13:39:07 +01:00
Magne Sjaastad
17524f66f8 #3696 Non-Darcy perforation intervals : Set default radius 2018-11-22 09:50:50 +01:00
Magne Sjaastad
a225d1fd1a #3696 Non-Darcy perforation intervals : Remove unit constant from UI 2018-11-22 09:46:40 +01:00
Bjørn Erik Jensen
5e769b337f Merge branch 'dev' into dev-deeper 2018-11-21 14:00:46 +01:00
Bjørn Erik Jensen
b89dcf3eb1 #3690 Missing Summary Data. Fix strange summary vector names in the legend 2018-11-21 12:31:56 +01:00
Gaute Lindkvist
4818a4fd71 #3727 Set packer end when you set packer start and still make it available for edit. 2018-11-21 11:38:56 +01:00
Bjørn Erik Jensen
651084420c #3720 Temp LGR. Hide 'Temporary LGRs' tree node when no temp LGRs exist 2018-11-21 09:58:54 +01:00
Gaute Lindkvist
094ae45dcd Formatted contour map code and renamed some methods. 2018-11-21 09:33:21 +01:00
Gaute Lindkvist
66d5cedb2e #3716 Ensure static results can be shown if there are no dynamic results. 2018-11-20 14:54:30 +01:00
Bjørn Erik Jensen
939dfe664a #3698 Scale bar. Enable check box for showing/hiding scale bar 2018-11-20 12:07:39 +01:00
Bjørn Erik Jensen
e3c619ddfe Merge remote-tracking branch 'origin/dev' into dev-deeper 2018-11-20 11:37:14 +01:00
Gaute Lindkvist
b41217455f #3689 Change order of result aggregation types 2018-11-20 11:32:02 +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
86f40ed8a9 #3580 Fix Linux build problem related to fault appearance 2018-11-19 08:28:45 +01:00
Bjørn Erik Jensen
d8a466a9ef #3698 Scale bar. Take 1. Only vertical variant implemented so far 2018-11-16 13:52:05 +01:00
Magne Sjaastad
3c3bb153ac #3685 Well Path Creation: Set MDRKB at first target when starting from an existing wellpath 2018-11-16 11:35:13 +01:00
Gaute Lindkvist
e2cc7fb423 #3699 Show global east west position when picking on Contour Maps. 2018-11-15 15:19:19 +01:00
Gaute Lindkvist
a1e094625a #3701 Add axis line option to 2d intersection view as well. 2018-11-15 15:02:07 +01:00
Magne Sjaastad
e100c679d3 Temporary fix : Remove call to missing function 2018-11-15 07:15:03 +01:00