OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity
12,256 Commits 28 Branches 61 Tags
2bca842e1b00413619d286dad6fe523f8cf28eee
Commit Graph

12256 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Magne Sjaastad
22b054a63a #5225 Plot Template: Fix crash when selecting directory instead of template item 2019-12-17 10:55:30 +01:00
Magne Sjaastad
5235b5f49e #5227 Ensemble Filter : Create one curve filter by default 2019-12-17 10:55:24 +01:00
Magne Sjaastad
b6b5b014ad #5226 Ensemble Filter : Remove colors group from property editor 2019-12-17 10:55:19 +01:00
Jacob Støren
2d195c93c6 #5235 fix python: project.export_snapshot 2019-12-17 09:43:49 +01:00
Magne Sjaastad
714868b10a Merge pull request #5233 from OPM/avoid-storing-ui-fields 
Templates: Do not write dialog fields to project file
 2019-12-17 08:35:02 +01:00
Magne Sjaastad
17fb70d52d #5232 Templates: Do not write dialog fields to project file 2019-12-17 07:32:19 +01:00
Magne Sjaastad
ff09fba50c Merge pull request #5229 from OPM/release-fixes 
Small fixes related to release
 2019-12-16 14:36:02 +01:00
Magne Sjaastad
563fa8dbaa #5228 Summary Plot: Fix curves from a summary case when .EGRID file is opened 2019-12-16 13:21:43 +01:00
Magne Sjaastad
fc535d6d74 #5225 Plot Template: Fix crash when selecting directory instead of template item 2019-12-16 13:02:31 +01:00
Magne Sjaastad
fee31510d6 #5227 Ensemble Filter : Create one curve filter by default 2019-12-16 12:40:10 +01:00
Magne Sjaastad
839329876a #5226 Ensemble Filter : Remove colors group from property editor 2019-12-16 11:44:25 +01:00
Magne Sjaastad
d5c965aebe #5224 Avoid unicode in description of Summary Address 2019-12-13 15:53:38 +01:00
Magne Sjaastad
91e8b1a839 #5224 Avoid unicode in description of Summary Address 2019-12-13 15:52:28 +01:00
Magne Sjaastad
5d96ce738c #5131 Minor calculation curve adjustments 2019-12-13 15:41:34 +01:00
Magne Sjaastad
dd5ebe494a Merge pull request #5210 from OPM/fix-show-plot-on-calculated-curves-5140 
Fix show plot on calculated curves 5140
 2019-12-13 11:05:25 +01:00
Jacob Støren
0bd9ef925a #5147 RimEclipseResultCase::m_sourSimFileName ->FilePath 2019-12-13 10:27:38 +01:00
Magne Sjaastad
525d4086f9 #5131 Remove obsolete includes 2019-12-13 08:50:01 +01:00
Jacob Støren
b7db416652 #5147 Avoid using RimFormationNames::m_formationNamesFileName in initAfterRead 
The path is not valid during initAfterRead Traversal
 2019-12-12 16:19:50 +01:00
Jacob Støren
1c6c82af85 #5147 Fix RimFileWellPath::setupBeforeSave addressing the filePath 
Needs to copy the cached wellpaths on save.
Split the cached filePath and the uncached filePath to only list the external well paths in the global path list, and to be able to copy the cached files on save.
 2019-12-12 16:15:24 +01:00
Jacob Støren
e4eea67a4e Fix error in cafFilePath QVariant isEqual operator 2019-12-12 16:09:20 +01:00