Commit Graph

11065 Commits

Author SHA1 Message Date
Jacob Støren
9f494798a9 Whitespace 2019-09-13 11:12:58 +02:00
Magne Sjaastad
22e0a17c83 Update version to 2019.08.1-dev.02 2019-09-12 08:53:07 +02:00
Magne Sjaastad
7fc0a47443 #4687 Summary Template : Add UI to select template
#4705 Summary Template : Add icon and use from features and dialogs
2019-09-12 08:43:29 +02:00
Magne Sjaastad
d045c0aade #4699 Guard use of TERNARY cell result in property filters 2019-09-11 13:31:15 +02:00
Magne Sjaastad
2d555e1b67 Fix missing include 2019-09-11 11:40:22 +02:00
Magne Sjaastad
1ec3694d64
Merge pull request #4697 from OPM/plot-templates-framework
Plot templates framework
2019-09-11 11:14:40 +02:00
Magne Sjaastad
0939b41120 Summary : Make sure field vectors are displayed 2019-09-11 10:54:41 +02:00
Magne Sjaastad
c7bbd14143 Add missing include 2019-09-11 09:56:32 +02:00
Magne Sjaastad
fe4fe36ee9 Refactor : Split calculateValueOptions to separate helper functions 2019-09-11 09:40:25 +02:00
Magne Sjaastad
020313da91 #4657 Summary Templates : Application objects
Add file path to preferences
Show templates in project tree
Add pointer to template to RimSummaryPlot
2019-09-11 09:33:03 +02:00
Magne Sjaastad
87afbaf586 Summary : Propagate uiConfigName to curveSelectionEditor 2019-09-11 09:29:21 +02:00
Magne Sjaastad
b616864416 System : Remove obsolete includes 2019-09-11 09:25:00 +02:00
Gaute Lindkvist
6de86013ac
Merge pull request #4690 from OPM/bug-#4688-contour-diff
#4668 Make contour time and case diff work
2019-09-11 08:58:06 +02:00
Gaute Lindkvist
b8eeb2cc2b
Merge pull request #4693 from OPM/feature-plot-color-fill
#4666 Add colour fill for formations in Well Log Plots
2019-09-11 08:55:22 +02:00
Gaute Lindkvist
baa266f0f9 Improve lines and shading 2019-09-10 16:52:32 +02:00
Gaute Lindkvist
0305399c26 Shift Well Log tracks when deleting a track 2019-09-10 15:21:43 +02:00
Gaute Lindkvist
06cea12447 #4666 Support color fill for formations in Well Log Tracks 2019-09-10 13:23:29 +02:00
Magne Sjaastad
4375bef031 #4644 Summary Plot: Fix missing update of plot title 2019-09-10 10:50:08 +02:00
Gaute Lindkvist
69793cd691
Merge pull request #4689 from OPM/feature-WBS-class
#4665 Implement a Well Bore Stability Plot class
2019-09-10 09:48:28 +02:00
Gaute Lindkvist
3279f51364 #4668 Make contour time and case diff work 2019-09-10 09:18:40 +02:00
Gaute Lindkvist
651971b835 Merge branch 'dev' into feature-WBS-class 2019-09-10 08:47:56 +02:00
Gaute Lindkvist
5c9622dca0 clang-format WBS classes 2019-09-10 08:32:42 +02:00
Magne Sjaastad
8fdb43fe26 #4683 Adjust clang-format 2019-09-10 08:30:56 +02:00
Gaute Lindkvist
a96d959d16
Merge pull request #4686 from OPM/system-refactor-welllogplot
#4665 System refactor welllogplot
2019-09-10 08:26:32 +02:00
Gaute Lindkvist
edbe4f5a35 Align scrollbar with tracks 2019-09-09 16:00:52 +02:00
Gaute Lindkvist
5cfd840025 Fix track widths and canvas top alignment 2019-09-09 14:38:36 +02:00
Gaute Lindkvist
81cb97ead7 Fix memory leak 2019-09-09 13:14:20 +02:00
Gaute Lindkvist
129df990ae #4665 Implement a Well Bore Stability Plot class
* Trigger updates when Ui fields are changed
  * Show only WBS parameter options that have available data
  * Clang-format WBS stuff
2019-09-09 13:12:02 +02:00
Gaute Lindkvist
71c4642f13 Make Well Allocation Plots work well again 2019-09-09 11:00:11 +02:00
Gaute Lindkvist
9fe021c6ca Use layouts for tracks in Well Log Plot 2019-09-06 15:52:45 +02:00
Magne Sjaastad
98e6ff189b System : Avoid extremely large construction statement
Roll out initialization to multiple insert() instead of one large initialization statement. The previous solution causes trouble/warnings on some compilers.
2019-09-06 14:11:22 +02:00
Gaute Lindkvist
ff42e8b1be Merge branch 'dev' into system-refactor-welllogplot 2019-09-06 13:44:20 +02:00
Gaute Lindkvist
de8a5a59f3 Clang-format changed files 2019-09-06 13:17:36 +02:00
Magne Sjaastad
bf9f43c3b4 #4683 Adjust clang-format 2019-09-06 12:58:31 +02:00
Gaute Lindkvist
acc9fe316e Reduce spacing around Well Log Plot Title 2019-09-06 12:54:03 +02:00
Gaute Lindkvist
565e5b0418 RFT/PLT/WAP: Calculate value options for fields inherited from WellLogPlot 2019-09-06 12:53:52 +02:00
Magne Sjaastad
deb73df726 clang-format : Apply clang-format on files coming from feature branch 2019-09-06 12:53:32 +02:00
Magne Sjaastad
d44598c070 #4657 Remove unused parameter 2019-09-06 12:44:41 +02:00
Magne Sjaastad
eb4f44d4d2 #4657 Remove unused functions 2019-09-06 12:43:21 +02:00
Magne Sjaastad
ee11932546 cppcheck : Avoid mix of signed/unsigned and remove unused code 2019-09-06 12:42:19 +02:00
Magne Sjaastad
b1988d4cb5
Merge pull request #4685 from OPM/clang-format-4
Apply clang-format on all files in ApplicationCode
2019-09-06 11:36:43 +02:00
Gaute Lindkvist
45103da354 Fix crashes related to name config and make name correct for old plots when loading 2019-09-06 10:59:47 +02:00
Magne Sjaastad
c2b4e6b6ca clang-format on all files in ApplicationCode, run two 2019-09-06 10:57:31 +02:00
Magne Sjaastad
fe9e567825 #4683 clang-format on all files in ApplicationCode 2019-09-06 10:57:22 +02:00
Magne Sjaastad
3a317504bb #4683 Fix line endings and execute clang-format 2019-09-06 10:56:43 +02:00
Magne Sjaastad
e99b008884 #4683 Adjust clang-format 2019-09-06 10:55:15 +02:00
Magne Sjaastad
ef80f5b629 #4683 System : Remove obsolete include of cvfBase.h 2019-09-06 10:52:54 +02:00
Magne Sjaastad
97d6638293 #4683 VizFwk : Make several header files self contained by include of cvfBase.h 2019-09-06 10:52:50 +02:00
Magne Sjaastad
03fd2c70fe #4683 System : Do not apply cotire on cafCommandFeatures
This library is used by cmake as an OBJECT library, and this construction is not suported by cotire
2019-09-06 10:52:45 +02:00
Magne Sjaastad
19c93170b3 #4683 System : Exclude QRC files from cotire 2019-09-06 10:52:36 +02:00