Commit Graph

7417 Commits

Author SHA1 Message Date
Jacob Støren
cb38d435cd #2457 Make 2d intersection view length start at well start 2018-02-13 16:56:48 +01:00
Rebecca Cox
3b627ce1c4 #2413 2D Intersection View: Add geoMech result title to infoText 2018-02-13 14:01:37 +01:00
Rebecca Cox
4eb80e83bb #2465 Property panel: Update UI fields from selected result on tree view object changed 2018-02-13 13:29:47 +01:00
Jacob Støren
2e8a497989 #2461 Align the vertices between shader and fixed function rendering methods. 2018-02-13 12:53:50 +01:00
Jacob Støren
ab27efcb7d #2461 Add explicit render code for shader based rendering. Should solve the issue. 2018-02-13 12:12:55 +01:00
Rebecca Cox
c8182fbb2f Merge to fix #588 2018-02-13 10:50:18 +01:00
Rebecca Cox
b49396b88c #588 GeoMech Color result: Make active result visible in property editor when selecting a object ofType/containing Result definition 2018-02-13 10:49:26 +01:00
Rebecca Cox
fa4535a18e #2413 2D Intersection View: Create more space in info text 2018-02-13 08:48:15 +01:00
Magne Sjaastad
2ff5842f28 Clang : Avoid special template helper on Windows 2018-02-12 20:12:04 +01:00
Magne Sjaastad
13606f0295 Clang : Exclude special code in release() to avoid warning 2018-02-12 20:09:01 +01:00
Magne Sjaastad
c208569fb6 Clang : Remove inline from template function 2018-02-12 20:09:01 +01:00
Magne Sjaastad
59958dcc3a Fix picking on fracture geometry when scale factor is different to 1.0 2018-02-12 20:08:43 +01:00
Rebecca Cox
5195ea502a #2413 2D Intersection View: Add Text info 2018-02-12 15:58:47 +01:00
Rebecca Cox
7222a6ba46 Fix colors on tensor glyphs 2018-02-12 13:06:56 +01:00
Jacob Støren
c3c2dfc678 #2337 Made EdgeAxis overly item more robust. Some cleanup and renaming. 2018-02-12 10:07:07 +01:00
Rebecca Cox
fb5055581d Merge to fix #2458 2018-02-12 09:41:14 +01:00
Rebecca Cox
b8c9989d0b #2458 Cell Result: Select chosen result type on load 2018-02-12 09:40:10 +01:00
Rebecca Cox
063802130c Fix window edge axis crash 2018-02-12 09:05:58 +01:00
Rebecca Cox
cf3a1ad43f #2392 3D View Context command: "Color Result" 2018-02-12 08:42:12 +01:00
Jacob Støren
c6846f0d57 Fix linux compile issues 2018-02-09 16:47:24 +01:00
Jacob Støren
d86b6f690e #2337 Place legends aware of the possible edge axis border and enable the border by default in Intersection views 2018-02-09 14:10:26 +01:00
Jacob Støren
068adf6aa2 #2337 Fix crash when having too few tickmarks. Some rename 2018-02-09 14:09:41 +01:00
Jacob Støren
e76f8cfbcc #2337 Add an improved tick mark generator 2018-02-09 14:08:55 +01:00
Jacob Støren
911571e267 #2337 Window Edge axis overlay item working. 2018-02-09 14:08:55 +01:00
Rebecca Cox
c3ea8f3415 2344 Tensor vectors: Code cleanup 2018-02-09 11:44:42 +01:00
Magne Sjaastad
123a2830aa Merge patch into dev : Snapshot : Always use _ in generated file names #2446 2018-02-09 11:34:05 +01:00
Magne Sjaastad
6e16a47b0d #2446 : Replace - with _ for all generated file names 2018-02-09 11:19:04 +01:00
Rebecca Cox
f747c22fd3 #2344 Tensor vectors: Avoid creating vectors of Infinity result values 2018-02-09 10:10:09 +01:00
Magne Sjaastad
b068296afd #2455 Non-Darcy Flow: Add fields to fracture template 2018-02-09 07:26:51 +01:00
Rebecca Cox
bd0d23520b #2344 Tensor Vectors: Vector visualization code 2018-02-08 16:43:18 +01:00
Magne Sjaastad
778119bf62 #2442 Fracture Template : Move more fields from public to protected 2018-02-08 14:02:02 +01:00
Magne Sjaastad
a1c891cd99 Merge remote-tracking branch 'origin/2018.01.01-patch' into dev 2018-02-08 13:18:36 +01:00
Magne Sjaastad
80eefb3141 #2442 Fracture Template : Move several fields from public to protected 2018-02-08 13:17:31 +01:00
Magne Sjaastad
beb122c6d0 System : Fix compiler warning 2018-02-08 13:17:31 +01:00
Magne Sjaastad
f053dfa8e3 #2446 : Snapshot : Improve generated file, always use _ in generated filename 2018-02-08 13:17:18 +01:00
Bjørn Erik Jensen
6f3a84c2b0 Merge branch '2018.01.01-patch' into dev. #2453 2018-02-08 11:45:15 +01:00
Bjørn Erik Jensen
2e0069456f #2453 Stim plan. Removed double string splitting loop 2018-02-08 11:37:07 +01:00
Bjørn Erik Jensen
7ddfaeb234 #2388 fractures. Support for asymmetric stim plan 2018-02-08 11:05:55 +01:00
Magne Sjaastad
1370cfe3e5 Merge fix for fishbone export into dev #2451 2018-02-08 10:31:51 +01:00
Magne Sjaastad
39949923a6 #2451 Export Completion : Remove obsolete test 2018-02-08 10:25:43 +01:00
Magne Sjaastad
0843c3e464 #2451 Export Completion : Exclude main bore cells correctly 2018-02-08 10:18:01 +01:00
Magne Sjaastad
53a1de91d7 #1968 Export Completions : Improve ordering 2018-02-07 14:07:49 +01:00
Magne Sjaastad
68c21e117b #1968 Readability : Whitespace changes 2018-02-07 14:07:00 +01:00
Magne Sjaastad
76e6ec3aef Remove unused function 2018-02-07 14:07:00 +01:00
Magne Sjaastad
dd34b0111a #1968 Readability : Major whitespace changes 2018-02-07 14:07:00 +01:00
Jacob Støren
bb53b926bf #2345 Add + and * operators to the tensor class, to make averaging possible. 2018-02-07 13:10:36 +01:00
Jacob Støren
bd14c65678 #2334 Add visualization of well paths and simulation wells to Intersection Views. 2018-02-07 11:44:38 +01:00
Magne Sjaastad
598d2c9b96 System : clang-format : One parameter per line 2018-02-07 09:55:28 +01:00
Magne Sjaastad
d208f63255 Add .clang-format to cmakelist 2018-02-07 08:54:53 +01:00
Jacob Støren
59b0a4bd1e Remove obsolete code 2018-02-06 14:55:55 +01:00