OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-14 17:44:20 -06:00
Code Issues Packages Projects Releases Wiki Activity
10,052 Commits 26 Branches 61 Tags 309 MiB
8400e4ea02
Commit Graph

10052 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gaute Lindkvist
ddd454077f #3779 Implement accumulator system for ICDs in preparation of using this for AICDs 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
c51b938d03 Switch to more robust check for Qt5 for cafUserInterface. This should be applied to other projects 2018-12-07 12:58:03 +01:00
Bjørn Erik Jensen
c0b7b5d87e caf. Make method const 2018-12-07 12:42:42 +01:00
Bjørn Erik Jensen
a6e9d463f4 #3723 Annotations. Remove commented code. Minor code fixes 2018-12-07 09:52:29 +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
55f980eeb7 Restructure RicMswExportInfo code into multiple files. 2018-12-06 11:32:59 +01:00
Gaute Lindkvist
73be6b6b19 #3779 Split RicMswCompletions into subclasses and move ICD-area and flow coefficient from segment to the icd completion class 2018-12-06 10:55:23 +01:00
Gaute Lindkvist
8fbc1d0953 #3779 Make sure we always have a super valve for segments that overlap with valves. 2018-12-06 10:11:06 +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
Gaute Lindkvist
2ed41d3158 CMake fixes to cafTestApp 2018-12-05 15:47:16 +01:00
Gaute Lindkvist
1bab754b26 Reintroduce CDEStyle to progress bar in 3D view 
* Only works for Qt4
 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
7b9520a8cc Application. Use the new FontCache for applicationwide font creation 2018-12-05 14:53:08 +01:00
Bjørn Erik Jensen
00d767f67c #3789 Annotations. Text appearance settings. New FontCache class 2018-12-05 14:39:07 +01:00
Magne Sjaastad
069d434584 #3827 Fishbone Laterals : Whole well is exported instead of lateral only 2018-12-05 12:47:11 +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
Magne Sjaastad
968da84051 #3816 Annotations : Guard assert with debug ifdef 2018-12-05 07:36:57 +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
aa19715c40 #3822 AppFwk : Improve resolve of PtrField, unit test 2018-12-04 14:10:54 +01:00
Magne Sjaastad
90550fe561 #3822 AppFwk : Improve resolve of PtrField 2018-12-04 14:10:18 +01:00
Magne Sjaastad
687aadcfde #3816 Annotations : PdmPtr not resolved correctly 2018-12-04 12:30:47 +01:00
Magne Sjaastad
920467e1f3 Fix signed/unsigned compare 2018-12-04 11:49:29 +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
Magne Sjaastad
4026f21a00 Cotire : Fix duplicate global variables 2018-12-03 15:22:09 +01:00
Gaute Lindkvist
b06097862f Fix Linux build of caf unit tests 2018-12-03 15:00:53 +01:00
Gaute Lindkvist
8cd2d37b92 Quieten Qt5 check in caf unittests 2018-12-03 15:00:53 +01:00
Magne Sjaastad
0371a1962e Add missing include 2018-12-03 14:50:12 +01:00
Magne Sjaastad
68bc466830 #3792 Use font 10 and 14 2018-12-03 14:19:49 +01:00
Magne Sjaastad
4d25cd0c71 #3792 Add font size 10 and 14 2018-12-03 14:19:49 +01:00
Gaute Lindkvist
7128c58b6c Quiet Qt5 check for cafAppFwk 2018-12-03 14:18:38 +01:00
Magne Sjaastad
a860adb1fb Fix compare of wrong enum type 2018-12-03 14:03:34 +01:00
Magne Sjaastad
8d0926dd53 Fix Linux build issue 2018-12-03 13:55:48 +01:00
Magne Sjaastad
df5179207f Revert unintended entries 2018-12-03 13:53:16 +01:00
Magne Sjaastad
1dc65855ae Merge remote-tracking branch 'origin/dev-deeper' into dev 2018-12-03 13:34:22 +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
Jacob Støren
918efd3a27 #3757 Enable Z-buffer testing for text annotations 2018-12-03 11:05:12 +01:00
Jacob Støren
f3c0345d3a #3757 Improve position of labels when creating them in 3D view 2018-12-03 11:05:12 +01:00
Jacob Støren
a13201e42e #3757 Add selection of text annotations by picking 2018-12-03 11:05:12 +01:00
Gaute Lindkvist
e984b06ea6 Fix build problem on Linux by renaming file to correct case 2018-12-03 10:58:49 +01:00