Rebecca Cox
e8a65989c3
Code cleanup
2018-02-23 07:42:42 +01:00
Rebecca Cox
bf1a621332
#2523 Mohr Circle: Improve circle appearence
2018-02-22 18:10:24 +01:00
Rebecca Cox
28efe4661d
#2522 Mohr circle: Update plot on 3D view selection
2018-02-22 18:04:47 +01:00
Rebecca Cox
d6974bfdba
#2519 Mohr Circle: Create plot widget
2018-02-22 17:45:58 +01:00
Magne Sjaastad
80af97c1a8
#2521 Fishbones : Clamp MD ranges to max MD of well path
2018-02-22 14:48:24 +01:00
Magne Sjaastad
814c55f849
Merge branch 'master' into dev after patch release
2018-02-22 09:34:44 +01:00
Magne Sjaastad
36581daa9b
Merge pull request #2520 from OPM/2018.01.01-patch
...
2018.01.01 patch
2018-02-22 08:11:07 +01:00
Magne Sjaastad
2b8a19d472
Upped to version 2018.01.1
2018-02-22 07:25:37 +01:00
Magne Sjaastad
594be93883
Whitespace cleanup
2018-02-21 19:53:22 +01:00
Magne Sjaastad
c22f38e30c
#2509 Fracture : Move fracture commands to separate folder
2018-02-21 19:38:20 +01:00
Magne Sjaastad
69339ad141
#2507 Non-Dracy Flow : Add display of unit and handle unit conversion
2018-02-21 19:25:05 +01:00
Magne Sjaastad
8ad30d9350
#2509 Fracture : Disconnect fracture template when unit changes
2018-02-21 19:07:03 +01:00
Magne Sjaastad
1b7dabdc51
#2291 Fishbones : Use 6 decimals, as this is required when using MD above 1000
2018-02-21 13:06:03 +01:00
Magne Sjaastad
ad97b19c30
#2509 Fracture : Exclude files when fracture config is not active
2018-02-21 10:41:11 +01:00
Magne Sjaastad
c6b12b85e0
Merge fracture unit refactoring into dev #2509
...
Add display of M and F in front of fracture templates
Add convert of StimPlan templates
Add copy/paste of StimPlan templates
Remove obsolete unit conversion code
2018-02-21 10:15:56 +01:00
Magne Sjaastad
81bb4481ed
#2509 Fracture : Rename
2018-02-21 10:10:22 +01:00
Magne Sjaastad
0acab5cd65
#2509 Fracture : Add copy / paste of StimPlan
2018-02-21 09:50:50 +01:00
Magne Sjaastad
0d7e4f460c
#2509 Fracture : Find matching template when adding new fracture
2018-02-21 09:10:40 +01:00
Magne Sjaastad
28ab07b199
#2509 Fracture : Remove obsolete unit conversion
2018-02-21 09:10:08 +01:00
Magne Sjaastad
f67918eba3
#2509 Fracture : Improve UI
2018-02-21 08:36:18 +01:00
Magne Sjaastad
b0be540977
#2509 Fracture : Remove obsolete unit conversion code
2018-02-21 08:18:55 +01:00
Magne Sjaastad
4e737885e4
#2509 Fracture : Move unit conversion of top/bot perforation depth
2018-02-20 15:35:08 +01:00
Magne Sjaastad
35febab8db
#2509 Fracture : Add support for unit conversion of stimplan grid coords
2018-02-20 15:15:06 +01:00
Rebecca Cox
81287ee7cc
#2484 2D Intersection View: 3D Info text: Show only well name, well path name or intersection name
2018-02-20 14:40:47 +01:00
Rebecca Cox
b69b15145f
#2496 Tensor vectors: Use dark magenta for principal 1 and move color code to RiaColorTables
2018-02-20 14:27:10 +01:00
Magne Sjaastad
479247dc4d
Merge fix for multi case statistics into dev
2018-02-20 14:02:51 +01:00
Rebecca Cox
0366361767
#2460 Tensor vectors: Move cvf::ref of scaler mapper out to avoid nullptr exception
2018-02-20 13:56:36 +01:00
Rebecca Cox
2c26ca4243
#2460 Tensor Vectors: Hide tensors on intersection creation
2018-02-20 13:47:47 +01:00
Rebecca Cox
4ca78ca833
#2460 Tensor Vectors: Use result as colormapping on the vectors
2018-02-20 13:47:47 +01:00
Magne Sjaastad
65f93814fe
#2468 Multi grid statistics : Initialize filename before creating data access object
2018-02-20 13:35:31 +01:00
Magne Sjaastad
9b1b94a4ae
#2517 Export COMPDATL : Include diameter for LGR grids
2018-02-20 11:26:39 +01:00
Magne Sjaastad
79a32af209
Octave Plugin : Move definition of qtDataStreamVersion to RiaSocketServerDefines
...
After conversion from NULL -> nullptr the octave plugins failed to compile. By moving the define of qtDataStreamVersion this issue was resolved, and the dependency from oct-files to RiaSocketServer.h was not required anymore (and removed)
2018-02-20 08:26:19 +01:00
Magne Sjaastad
82e706375a
Octave Plugin : Move definition of qtDataStreamVersion to riSettings
...
After conversion from NULL -> nullptr the octave plugins failed to compile. By moving the define of qtDataStreamVersion this issue was resolved, and the dependency from oct-files to RiaSocketServer.h was not required anymore (and removed)
2018-02-20 08:16:13 +01:00
Magne Sjaastad
fb95d896ef
#2509 Fracture : Add copy / paste of ellipse fracture template
2018-02-20 07:20:25 +01:00
Magne Sjaastad
a218addbe5
clang : Fix to be compatible with Clang 3.8
2018-02-19 21:09:44 +01:00
Rebecca Cox
f0d32e6e45
#2511 2D Intersection view: Avoid selecting intersection in tree when selecting a cell
2018-02-19 15:11:35 +01:00
Rebecca Cox
0cb14397ac
#2503 2D intersection View: Add Z-scale as info in the 3d info box
2018-02-19 15:08:54 +01:00
Magne Sjaastad
0ef0f3b5b1
#2509 Fracture : Guard UI selection of fracture template of different unit
2018-02-19 14:32:33 +01:00
Rebecca Cox
7f246a032a
Merge patch into dev with fixes for #2501
2018-02-19 14:16:22 +01:00
Rebecca Cox
119752bf04
#2501 Result Plot: Add "Show Plot Data" to context menu
2018-02-19 14:15:42 +01:00
Magne Sjaastad
de3aa9f975
#2509 Fracture : Add text to indicate unit of fracture template
2018-02-19 13:54:29 +01:00
Rebecca Cox
542c912df2
Merge patch into dev with fixes for #2403
2018-02-19 09:32:37 +01:00
Rebecca Cox
4d39136212
#2403 Extraction curves: Fix curves without vertical connections
2018-02-19 09:29:14 +01:00
Magne Sjaastad
8d30b6e09f
Use size_t instead of int
2018-02-18 19:01:38 +01:00
Magne Sjaastad
1ae30ef11a
(clang-tidy) : modernize-use-nullptr
2018-02-18 18:56:43 +01:00
Magne Sjaastad
69875eec8f
(clang-tidy) : modernize-use-nullptr
2018-02-18 18:22:23 +01:00
Magne Sjaastad
cfb75ecc34
AppFwk (clang-tidy) : modernize-use-nullptr
2018-02-18 18:17:50 +01:00
Magne Sjaastad
3239c66f54
AppFwk (clang-tidy) : modernize-use-nullptr
2018-02-18 18:05:08 +01:00
Magne Sjaastad
5a2072e6ec
clang-tidy : Add minimal config file
2018-02-18 17:55:20 +01:00
Magne Sjaastad
950617af96
AppFwk : Fix assignment of float value
2018-02-18 17:42:28 +01:00
