Magne Sjaastad
f22161bf6e
Merge branch 'master' into 'dev'
...
Previous attempts to merge failed due to bugs in merge tools. Performing merge from command line works as expected.
2019-12-20 10:39:29 +01:00
Magne Sjaastad
46c14af2fd
Merge pull request #5257 from OPM/feature-well-dist-clang
...
Well distribution plots
2019-12-19 14:29:56 +01:00
Magne Sjaastad
4d3113255e
Minor code adjustments
2019-12-19 11:55:34 +01:00
Magne Sjaastad
4ccbd274b8
clang-format : Apply clang-fomat on ApplicationCode
2019-12-19 11:11:33 +01:00
sigurdp
260ff04b19
Added grouping of small contributions to well distribution plot
2019-12-19 11:09:01 +01:00
sigurdp
bf61c76e51
Filter out TOF values greater than 73000 and remove wells with zero aggregated volume
2019-12-19 11:09:01 +01:00
sigurdp
3f36826662
First working version of well distribution plots
2019-12-19 11:09:01 +01:00
sigurdp
4ce07ebb23
Added constructor parameter to RimMultiPlotWindow for hiding contained plots in tree view
2019-12-19 11:09:01 +01:00
sigurdp
3b1b7aafbb
Added PhaseType app enum
2019-12-19 11:09:01 +01:00
sigurdp
92bb34197e
First cut implementation, very much still a work in progress
2019-12-19 11:09:01 +01:00
sigurdp
349886d73e
Skeleton for well distribution plot
2019-12-19 11:09:01 +01:00
Magne Sjaastad
ba0ef5c7e8
Merge branch 'master' into dev
2019-12-19 09:34:34 +01:00
Magne Sjaastad
823e2abe7a
Merge pull request #5253 from OPM/release-2019-12
...
Release of 2019.12
2019-12-19 09:13:57 +01:00
Magne Sjaastad
fd86c830f6
Upped to 2019.12.0
2019-12-19 08:34:45 +01:00
Magne Sjaastad
682c1324b7
Merge branch 'master' into release-2019.11
2019-12-19 08:00:41 +01:00
Magne Sjaastad
69885af447
Upped to 2019.12-RC05
2019-12-18 15:51:58 +01:00
Jacob Støren
b01c4409f1
Merge pull request #5246 from OPM/feature-external-file-reference-list-in-project-file
...
Feature: #5147 External file reference list in project file
2019-12-18 15:47:50 +01:00
Jacob Støren
6f97dca264
#5252 Fixed crash and missing statistics with combined IJK results for visible cells only
2019-12-18 15:47:13 +01:00
Magne Sjaastad
91cd27d589
#5251 Comparison View : Guard null pointer access
2019-12-18 15:47:06 +01:00
Jacob Støren
c9270cdbca
#5252 Fixed crash and missing statistics with combined IJK results for visible cells only
2019-12-18 15:45:07 +01:00
Magne Sjaastad
3100ed655d
Manual copy of code from release-2019.11
2019-12-18 15:44:48 +01:00
Magne Sjaastad
6ae0c5e816
Merge pull request #5241 from OPM/fix-crash-well-production-plots
...
Fix crash when creating prodution rate plot.
2019-12-18 15:36:06 +01:00
Magne Sjaastad
4a0b602851
Upped to 2019.12.0-RC04
2019-12-18 12:32:06 +01:00
Magne Sjaastad
ab371fb2bb
#5251 Comparison View : Guard null pointer access
2019-12-18 12:30:32 +01:00
Gaute Lindkvist
47b93dc0d1
Implement pdf rendering ( #5250 )
...
* First PDF creation support
* Reimplement info box
* Set title and make overlay frame margins more unified
* Remove a style sheet that was never meant to be applied to Project Tree
* Update RiuDraggableOverlayFrame when changing content
* Default page layout in Preferences
* undo removal of elision
* Remove friend class assignment in cafCategoryMapper
* the required methods have been made public
* Fix up after review
* Remove spurious const on by-value return
* Fix compile errors on Linux
* Fix size adjustment of legends with plot resizing
2019-12-18 12:25:19 +01:00
Magne Sjaastad
314e98d407
#5249 Update clang-format
2019-12-18 11:12:47 +01:00
Magne Sjaastad
67cd398414
Prepare for release of 2019.12.0
2019-12-18 10:20:30 +01:00
Jacob Støren
1575705835
Fix whitespace difference
2019-12-18 09:05:39 +01:00
Magne Sjaastad
f339b52907
#5036 Octave : Simplify error message
2019-12-18 08:34:21 +01:00
Magne Sjaastad
b013475fa8
#5036 Octave : Simplify error message
2019-12-18 08:34:04 +01:00
Magne Sjaastad
2b21a37f0d
Upped to 2019.12.0-RC03
2019-12-18 08:12:07 +01:00
Magne Sjaastad
a9548c8c01
Merge pull request #5243 from OPM/bug-#5234-summary-xplot-axis
...
#5234 Fix auto scale of cross plot x-axis
2019-12-18 08:00:10 +01:00
Magne Sjaastad
0085ab3c12
Merge pull request #5244 from OPM/bug-#5234-release-2019.11
...
#5234 Fix auto scale of cross plot x-axis
2019-12-18 07:59:56 +01:00
Gaute Lindkvist
2b4da10610
#5234 Fix auto scale of cross plot x-axis
...
* The issue is that the bottom axis is really a QwtDateScaleEngine as opposed to a QwtLinearScaleEngine.
* This may have worked before by "accident" before the changes to the date format on the date/time axis.
* The fix is that if we want a QwtLinearScaleEngine and have a QwtDateScaleEngine we replace the scale engine.
2019-12-17 19:31:45 +01:00
Gaute Lindkvist
73b2c96dae
#5234 Fix auto scale of cross plot x-axis
...
* The issue is that the bottom axis is really a QwtDateScaleEngine as opposed to a QwtLinearScaleEngine.
* This may have worked before by "accident" before the changes to the date format on the date/time axis.
* The fix is that if we want a QwtLinearScaleEngine and have a QwtDateScaleEngine we replace the scale engine.
2019-12-17 19:29:51 +01:00
Jacob Støren
c35938e449
#5242 Fix intersection views visible in comparison view drop-down
2019-12-17 14:53:16 +01:00
Jacob Støren
b6252c9d59
#5240 Avoid duplicate entries when opening summary-, and gridcases
2019-12-17 14:53:08 +01:00
Jacob Støren
43e8311207
#5242 Fix intersection views visible in comparison view drop-down
2019-12-17 14:37:57 +01:00
Jacob Støren
1e67540b92
#5240 Avoid duplicate entries when opening summary-, and gridcases
2019-12-17 14:28:51 +01:00
Magne Sjaastad
92c767989f
#5237 MSW: Use 7 numbers for roughness number format
2019-12-17 14:11:23 +01:00
Magne Sjaastad
87d0efe7c1
#5237 MSW: Use 7 numbers for roughness number format
2019-12-17 14:10:59 +01:00
Jacob Støren
2ca3345a20
Add save() as a command to the python interface
...
Fix export_snapshot issue
2019-12-17 13:27:02 +01:00
Jacob Støren
7f393f5ad8
#5147 Use "PathId_000" as base for the path ids
2019-12-17 13:24:37 +01:00
Kristian Bendiksen
8f7a9dc3ce
Fix crash when creating prodution rate plot.
2019-12-17 13:05:10 +01:00
Magne Sjaastad
bd74a3ce73
#5238 Ensemble RFT : Hide P50 from statistics
2019-12-17 12:05:36 +01:00
Magne Sjaastad
d65c84049d
Merge pull request #5236 from OPM/cherrypick-from-release
...
Cherrypick several fixes from release branch
2019-12-17 12:05:14 +01:00
Magne Sjaastad
d24fe229b0
#5238 Ensemble RFT : Hide P50 from statistics
2019-12-17 12:03:11 +01:00
Jacob Støren
c551baf409
#5235 fix python: project.export_snapshot
2019-12-17 10:56:00 +01:00
Magne Sjaastad
0b2a78b211
#5232 Templates: Do not write dialog fields to project file
2019-12-17 10:55:51 +01:00
Magne Sjaastad
af6e713414
#5228 Summary Plot: Fix curves from a summary case when .EGRID file is opened
2019-12-17 10:55:37 +01:00
