Bjørn Erik Jensen
f7ac8fe6e4
Observed data parsing. Add address creation unit test
2018-05-25 15:35:06 +02:00
Magne Sjaastad
40e9151069
Merge branch 'master' into dev
2018-05-25 11:34:54 +02:00
Magne Sjaastad
93ec84efdd
#2967 Fracture Truncation at Faults : Use combo box and obsolete checkbox
2018-05-25 11:31:21 +02:00
Magne Sjaastad
fec963931e
#2967 Fracture Truncation at Faults : Code cleanup before adding trunction
2018-05-25 11:31:21 +02:00
Magne Sjaastad
be14877525
#2970 Faults : Code cleanup
2018-05-25 11:31:21 +02:00
Bjørn Erik Jensen
6913a6829f
#2979 Summary curves. Set symbol skip distance to 0 when creating new observed data curves
2018-05-25 11:28:55 +02:00
Bjørn Erik Jensen
3917a690e6
Updated uml doc file
2018-05-25 11:28:55 +02:00
Bjørn Erik Jensen
403e1759f9
#2778 Observed error bars. Display error bars in the same color as data points
2018-05-25 11:28:55 +02:00
Magne Sjaastad
55341cd74d
Merge pull request #2981 from OPM/2018-05-1-patch
...
Merge into master for Release 2018.05.1 of ResInsight
2018-05-25 10:53:13 +02:00
Magne Sjaastad
67a2974c6f
Set version to 2018.05.1 for release
2018-05-25 09:47:17 +02:00
Magne Sjaastad
992e4bff57
#2961 Check if action is available before adding to menu
2018-05-25 09:37:52 +02:00
Magne Sjaastad
c5e5f81e88
#2961 Make building of Windows menu robust when ODB is disabled
2018-05-25 09:37:42 +02:00
Gaute Lindkvist
14a5fd4009
#2959 Fix crash when loading ODB file without overburden.
2018-05-25 09:36:46 +02:00
Magne Sjaastad
fb7d24e99d
#2734 Perforation Intervals: Add custom start date and custom end date
2018-05-24 20:02:01 +02:00
Magne Sjaastad
24920e2d12
#2961 Check if action is available before adding to menu
2018-05-24 14:58:57 +02:00
Magne Sjaastad
fa13b24b07
#2961 Make building of Windows menu robust when ODB is disabled
2018-05-24 07:46:53 +02:00
Magne Sjaastad
fc1f79a304
#2734 Perforation Intervals: Prepare for stop date
2018-05-23 15:28:54 +02:00
Magne Sjaastad
28278c47ec
2018-05-23 15:08:55 +02:00
Gaute Lindkvist
4c6a56bb52
#2873 Do only one updateAllRequiredEditors when closing cases
...
* Instead of one for every case that is being closed.
2018-05-23 14:38:26 +02:00
Gaute Lindkvist
743993718c
#2873 New AsyncPointerVectorDeleter-classes to handle memory deletion in separate thread.
2018-05-23 14:38:25 +02:00
Bjørn Erik Jensen
22c71b60dd
#1776 CVS data parser. Made parsing more generic. Handle error result columns
2018-05-23 12:33:26 +02:00
Bjørn Erik Jensen
8f5c3436ce
#1776 CSV data parser. Remove double spaces in column names
2018-05-23 12:33:26 +02:00
Gaute Lindkvist
660b6a6430
#2944 Hide auto scale toggles for well log plots.
2018-05-23 11:35:24 +02:00
Gaute Lindkvist
208313f672
#2944 Stop auto-zooming on load of Well Log Curves.
2018-05-23 11:29:16 +02:00
Bjørn Erik Jensen
87e91069e0
#2947 File hierarchy dialog. Fix effective filter
2018-05-22 15:10:31 +02:00
Bjørn Erik Jensen
e8d586054c
ecllib: Temp fix to avoid assert. This fix will be included in the next ecllib release
2018-05-22 14:58:42 +02:00
Jacob Støren
ba89d348c0
Update keywords list for release 2018.05.0
2018-05-22 13:16:17 +02:00
Jacob Støren
464635f785
Upped to 2018.05.0-dev.01 for further development on the dev-branch
2018-05-22 13:10:27 +02:00
Jacob Støren
e2ca982b45
Merge master into dev after release
...
Pull request #2948 from master to dev
2018-05-22 13:05:06 +02:00
Jacob Støren
43fed5cf27
Merge dev into master for Release 2018.05 of ResInsight
2018-05-22 12:05:35 +02:00
Jacob Støren
b35f31cafe
Upped to 2018.05.0 for release
2018-05-22 11:29:40 +02:00
Jacob Støren
3a05abb42b
#2940 Fix crash due to missing guard in geomech camera conversion.
2018-05-22 09:34:27 +02:00
Gaute Lindkvist
772e7ec7e6
Revert " #2873 Delegate deletion of summary cases to separate thread."
...
This reverts commit 0089e0c218
2018-05-22 09:22:12 +02:00
Gaute Lindkvist
0089e0c218
#2873 Delegate deletion of summary cases to separate thread.
2018-05-22 09:21:40 +02:00
Jacob Støren
ec9e2efef4
Fix cotire build problem
2018-05-22 00:16:03 +02:00
Jacob Støren
735524f342
Upped to 2018.01.1-devRC.112
2018-05-21 23:48:56 +02:00
Jacob Støren
9b9f9b2bf1
#2939 ProgressInfo: Reintroduce process envents, to update the progress dialog durig processing on linux/mac.
...
Introduced isActive and used this info to block sheduled redraw/display model regen when progress bar is active, to avoid unintended recursive behaviour resulting in crashes.
2018-05-21 23:46:35 +02:00
Jacob Støren
2e9341c6d1
Merge branch 'Geomech-DisplayCS' into dev
2018-05-18 22:31:51 +02:00
Jacob Støren
d7cffba9f1
#2940 Covert old project file geomech camera mx to new display offsetted regime
2018-05-18 21:38:49 +02:00
Magne Sjaastad
82d6db94cb
WIP : try to fix import of geomech project files
2018-05-18 19:23:36 +02:00
Jacob Støren
5f07b3f2be
Upped version to 2018.01.1-devRC.111
2018-05-18 16:18:19 +02:00
Jacob Støren
86c9ca1fd3
Documentation: Add formations to the documentation project file
2018-05-18 16:05:39 +02:00
Jacob Støren
e86e742915
Merge pull request OPM/CloseMultipleCases
...
#2934 Delete all selected cases, not just the first one when right cl…
2018-05-18 16:03:22 +02:00
Magne Sjaastad
06ae9cf155
2018-05-18 14:29:05 +02:00
Gaute Lindkvist
bef7535eff
#2941 3d well log curves: Fix crash if the draw surface width becomes larger than well path length
2018-05-18 14:26:52 +02:00
Gaute Lindkvist
9e665d5ab1
3d Well Log Plots: Remove curve filled code
2018-05-18 14:26:52 +02:00
Gaute Lindkvist
68dd0ba13e
Switch calculation of extra curve vertices to double precision
2018-05-18 14:26:52 +02:00
Magne Sjaastad
62c3e8324a
#2940 Geomech: Display offset in place for result info
2018-05-18 14:05:25 +02:00
Jacob Støren
73c0373264
#2940 Geomech: Display offset in place for intersections
2018-05-18 14:02:54 +02:00
Gaute Lindkvist
3119ab24cb
#2934 Delete all selected cases, not just the first one when right clicking and choosing close.
2018-05-18 14:02:49 +02:00
