Commit Graph

7371 Commits

Author SHA1 Message Date
Rebecca Cox
b84812616f Merged from patch-branch to dev-branch 2018-01-18 15:43:27 +01:00
Rebecca Cox
79539c1c99 #2378 Fractures: Hide "Fracture Colors" in Project tree when not in use 2018-01-18 15:04:04 +01:00
Bjørn Erik Jensen
28ea6f054c #2377 summary plot. Add missing curve update 2018-01-18 13:50:39 +01:00
Bjørn Erik Jensen
cdfe7f51d3 #2377 summary plot. Add missing curve update 2018-01-18 13:24:21 +01:00
Rebecca Cox
39cf8e8b0d #2378 Fractures: Hide "Fracture Colors" in Project tree when not in use 2018-01-18 11:42:29 +01:00
Rebecca Cox
bbda7f30a2 NULL -> nullptr 2018-01-18 08:11:26 +01:00
Magne Sjaastad
b6a7dcb7b5 Upped version to 2018.01.00-dev.02 2018-01-17 14:44:21 +01:00
Magne Sjaastad
76b84cbb17 #2361 AppFwk : Make sure field of FilePath supports space, add more tests 2018-01-17 14:32:47 +01:00
Magne Sjaastad
c0d9ef67fa #2361 AppFwk : Make sure identical strings are separated by semicolon 2018-01-17 14:32:47 +01:00
Bjørn Erik Jensen
50c3e5f0d2 #2379 import summary cases. Minor refactoring 2018-01-17 13:15:04 +01:00
Bjørn Erik Jensen
8f384c9752 #2379 import summary cases. Dialog improvements, find button, grouping widgets 2018-01-17 13:05:05 +01:00
Bjørn Erik Jensen
b74dca8de8 #2379 import summary cases. Fix path filtering 2018-01-17 13:05:05 +01:00
Magne Sjaastad
3bcfc09baf #2332 2D Intersection View: Show warning if intersection is not vertical 2018-01-17 11:29:06 +01:00
Magne Sjaastad
03de2aba5b #2332 2D Intersection View: Command to create view 2018-01-17 11:05:31 +01:00
Magne Sjaastad
b53603e906 Use range based for 2018-01-17 09:23:45 +01:00
Magne Sjaastad
0ecfdeee6b Reorder functions, remove unused function 2018-01-17 09:23:45 +01:00
Magne Sjaastad
1523ce55f0 #2150 Fracture : Duplicate fracture geometry for along well pipe fractures 2018-01-17 09:23:45 +01:00
Magne Sjaastad
673ae6b1ff #2150 Fracture : Create two parts of fracture geometry 2018-01-17 09:23:45 +01:00
Magne Sjaastad
828557f71f Whitespace and include cleanup 2018-01-17 09:23:45 +01:00
Jacob Støren
d616548cd0 #2331 Shell of 2dIntersectionView shell added. Fixed access to views on a case including the intersection views also. 2018-01-17 08:10:05 +01:00
Rebecca Cox
548c065290 Fix cotire build 2018-01-16 16:24:29 +01:00
Rebecca Cox
4adec8d2bf #2380 AppFwk: Make template function to find all PdmFields of a type 2018-01-16 16:01:42 +01:00
Bjørn Erik Jensen
735165bb2b #2379 import summary cases. Fixed dialog issues 2018-01-16 13:40:38 +01:00
Jacob Støren
d283f2c733 Fix linux compile issue 2018-01-16 11:22:48 +01:00
Rebecca Cox
dcff8c1536 #2372 Elm Props: Scale Modulus by a factor of 1e-9 2018-01-16 10:56:41 +01:00
Rebecca Cox
305e2aee38 #2372 Elm Props: Add unit [GPA] to Modulus 2018-01-16 10:56:41 +01:00
Jacob Støren
c3c2f3b75a Fix missing include 2018-01-16 10:36:41 +01:00
Jacob Støren
0debeafd68 #2331 Move RimGridView to separate files 2018-01-16 09:37:08 +01:00
Jacob Støren
b1cf7f6674 #2331 Cleaned up whitespace. Made crossectionCollection protected 2018-01-16 08:44:37 +01:00
Magne Sjaastad
424c6a46f6 Whitespace and function headers, move implementation to header 2018-01-16 08:04:49 +01:00
Magne Sjaastad
2457f968cf #2374 Fracture : Incomplete results when computing intersected StimPlan cells 2018-01-16 08:04:49 +01:00
Rebecca Cox
96bff27519 #2372 Elm props: Map modulus and ratio ui names 2018-01-15 17:40:39 +01:00
Rebecca Cox
58123f4a49 #2369 Elm props: Only delete results from the closed files 2018-01-15 16:09:52 +01:00
Jacob Støren
b092565a61 #2331 Introduce new intermediate class RimGridView 2018-01-15 14:53:48 +01:00
Jacob Støren
1bbd3ade7b #2331 WIP: Creating new RimGridView base class 2018-01-15 14:53:48 +01:00
Rebecca Cox
4bf8de2787 #2369 Elm props: Clear cell results on deletion 2018-01-15 14:48:05 +01:00
Rebecca Cox
277bd496f1 Add override keyword 2018-01-15 14:48:05 +01:00
Bjørn Erik Jensen
ac59050824 #2358 Ellipse fracture template. Extracted conductivity method 2018-01-15 13:32:47 +01:00
Magne Sjaastad
523c623d39 #2152 Fracture : Rename UI text 2018-01-15 09:41:00 +01:00
Bjørn Erik Jensen
ee50b0492d #2151 fractures. Turn on/off fractures in views by toggling fracture colors 2018-01-15 09:24:19 +01:00
Magne Sjaastad
b2e0f3df31 #2371 Fracture : Update views after change of stimplan xml file name 2018-01-15 09:16:44 +01:00
Magne Sjaastad
85ead20ec9 #2371 Fracture : Guard for null pointer access 2018-01-15 08:58:56 +01:00
Magne Sjaastad
9820cb45e4 #2371 Fracture Template : Avoid crash when StimPlan xml fails to load 2018-01-15 08:58:56 +01:00
Magne Sjaastad
e5aaf73a84 #2152 Fracture : Add StimPlan cell element color 2018-01-15 08:58:56 +01:00
Rebecca Cox
47e154bf53 #2370 Elm props: Update prop filters + intersections on reload 2018-01-15 08:52:00 +01:00
Rebecca Cox
673ad12dee #2370 Elm Props: Reload selected files. Prop filters etc not updated 2018-01-14 09:10:23 +01:00
Rebecca Cox
a8039b8569 #2369 Elm Props: Remove deleted field results from cache 2018-01-13 12:38:08 +01:00
Rebecca Cox
27901f426c #2369 Elm Props: Close selected files 2018-01-12 16:18:54 +01:00
Rebecca Cox
3b46849c79 Fix warning 2018-01-12 16:14:30 +01:00
Magne Sjaastad
bf1b755dc8 #2361 AppFwk : Improve robustness of load and save of FilePath 2018-01-12 14:56:05 +01:00