Commit Graph

6886 Commits

Author SHA1 Message Date
Jacob Støren
63489ba91b Upped to 2017.05.2-dev.13 for D4RM sprint 1 2017-12-04 17:16:36 +01:00
Jacob Støren
b092c6e047 Merge branch 'dev' of https://github.com/OPM/ResInsight.git 2017-12-04 16:38:45 +01:00
Jacob Støren
1ec6d77ff9 #2195 Final fix of missing connections in high level grids, if connections in lower levels exist. 2017-12-04 16:37:53 +01:00
Rebecca Cox
860458eb28 #2123 Formation/Well Path: Code clean up 2017-12-04 15:47:35 +01:00
Magne Sjaastad
93b69b807f #2198 Summary Plot : Set default curve selection 2017-12-04 14:36:17 +01:00
Magne Sjaastad
eaa0a1d6fe #2200 AppFwk Tree Selection Editor: Select item when toggling
When toggling the checked state, also select (highlight) the toggled item
2017-12-04 13:25:47 +01:00
Magne Sjaastad
ae8cdbc546 #2201 Summary Curve : Move button "Vector Selection Dialog" into vector selection group 2017-12-04 13:07:47 +01:00
Magne Sjaastad
6da6a0abe1 #2212 AppFwk : Allow '[' and ']' in filter field text 2017-12-04 12:58:10 +01:00
Magne Sjaastad
aa9a2b2e2e #2214 Summary Source Stepping : Remove obsolete code 2017-12-04 12:30:00 +01:00
Rebecca Cox
c90715d038 Fix linux error 2017-12-04 12:08:29 +01:00
Magne Sjaastad
67fe2e268a #2211 Curve Calculator : Add default curve calculation before displaying dialog 2017-12-04 11:58:24 +01:00
Bjørn Erik Jensen
2a32760132 #2218 observed data. Save ascii parse options to project file and use settings on project load 2017-12-04 11:49:13 +01:00
Jacob Støren
fcd9d0f3e6 #2195 First step in making higher LGR level connections not beeing hidden 2017-12-04 11:42:10 +01:00
Rebecca Cox
8ab70887c3 #2219 Intersections: Fix max height of intersection bug 2017-12-04 10:56:57 +01:00
Rebecca Cox
99dd255ee8 Formations: Change group name 2017-12-04 10:26:34 +01:00
Magne Sjaastad
f79e31be8f #2216 Disable creation of new calculation object as this causes crash
Introduced in  8281391fb9
2017-12-04 10:21:02 +01:00
Magne Sjaastad
c0109361ef #2170 Summary Cross Plot : Add keyboard modifiers to source stepping 2017-12-04 08:26:26 +01:00
Magne Sjaastad
04a80864b1 AppFwk : Make sure uiOrdering is not called more than once 2017-12-04 08:26:26 +01:00
Rebecca Cox
32c1fa25d5 Guard for if eclipseCaseData is null 2017-12-01 15:39:54 +01:00
Rebecca Cox
a5300032e9 #2213 Formations: Select formation on a case, only if a single file is imported 2017-12-01 15:39:54 +01:00
Bjørn Erik Jensen
8281391fb9 #2211 Curve calc. Create new calculation if empty 2017-12-01 15:36:46 +01:00
Bjørn Erik Jensen
83a272296c 2108 summary plot. Display short name in plot for calculated curves 2017-12-01 15:27:47 +01:00
Magne Sjaastad
eb6b0997c8 #2170 Summary Cross Plot : Improve update and visibility of UI when stepping 2017-12-01 15:15:43 +01:00
Magne Sjaastad
a5b361f8c9 #2170 Summary Cross Plot : Show/hide toolbar based on active view 2017-12-01 13:55:39 +01:00
Magne Sjaastad
68bcd5253b #2170 Summary Plot : Show info text when no common identifier is detected 2017-12-01 13:55:39 +01:00
Magne Sjaastad
7f31c245ae #2170 Summary Cross Plot : Improve computation of summary case set 2017-12-01 13:55:39 +01:00
Magne Sjaastad
b8f8b2bc16 #2170 Summary Cross Plot : Show three stepping groups for cross plots 2017-12-01 13:55:39 +01:00
Magne Sjaastad
3276e46e49 #2170 Summary Cross Plot : Basis for source steppint in x, y and union 2017-12-01 13:55:39 +01:00
Magne Sjaastad
a431d10457 #2170 Summary Source Stepping : Do not show summary case step if only one case is available 2017-12-01 13:55:39 +01:00
Magne Sjaastad
6103f290bf #2170 Summary Case: Simplified access function to all cases, remove unused function 2017-12-01 13:55:39 +01:00
Rebecca Cox
a2a7155d1c #2213 Formations: On import, set formation on active case 2017-12-01 13:31:12 +01:00
Rebecca Cox
917b824177 #2144 Context menu: New uiText on menus 2017-12-01 13:31:12 +01:00
Rebecca Cox
1c628fcf3e Change color in statistics dialog 2017-12-01 13:31:12 +01:00
Bjørn Erik Jensen
a61da7b215 #1826. Hide completion type when no time steps are available 2017-12-01 13:22:34 +01:00
Bjørn Erik Jensen
9eb85966ed CSV import. Reopen dialog on parse error 2017-12-01 12:41:44 +01:00
Rebecca Cox
8d7a578d6f #2137 Formation Names: Update all plots necessary when changing formation names on case 2017-12-01 10:26:32 +01:00
Rebecca Cox
86e348a9f8 #2182 RFT: Make path creation of RFT files more robust 2017-12-01 10:19:03 +01:00
Bjørn Erik Jensen
da11a32862 #1942 HDF5 reader. Using RiaQDateTimeTools for parts of the reading. See issue comment for more info 2017-12-01 09:13:42 +01:00
Rebecca Cox
c86161a0a6 #2144 Context menu: Add icons to sub menus 2017-12-01 09:11:11 +01:00
Magne Sjaastad
a96b65cc7f #2144 Context menu builder : Whitespace cleanup and removed unused includes 2017-12-01 08:33:26 +01:00
Magne Sjaastad
476b96b343 #2144 Context menu : Add support for icons on sub menus 2017-12-01 08:28:41 +01:00
Rebecca Cox
cf9203fe0a #2182 RFT: Fix path creation of RFT files 2017-11-30 18:57:14 +01:00
Bjørn Erik Jensen
a460124055 CSV import. Add tooltip to custom date time format field 2017-11-30 15:23:59 +01:00
Bjørn Erik Jensen
6d81c0ea72 Statistics dialog. Do not include snapshot when dialog is not open 2017-11-30 13:48:36 +01:00
Rebecca Cox
6fc888d718 Capitalize ui name in PDM fields 2017-11-30 13:44:18 +01:00
Rebecca Cox
ce8f9e4559 #2144 Organize context menus 2017-11-30 12:06:14 +01:00
Rebecca Cox
845373940f #2144 Context menu: Add Plot well allocation command to wellPath 2017-11-30 12:06:14 +01:00
Rebecca Cox
19e649a674 #2144 Context menu: Change name: New Property Filter -> Property Filter 2017-11-30 12:06:14 +01:00
Rebecca Cox
bb4390651d #2144 Context menu: Remove commands from well path and sim well 2017-11-30 12:06:14 +01:00
Rebecca Cox
503645e688 Add command to check if a well path or sim well is selected in 3d view 2017-11-30 12:06:14 +01:00