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,192 Commits 27 Branches 61 Tags 309 MiB
df5ba4c0d1
Commit Graph

10175 Commits

Author SHA1 Message Date
Jacob Støren
3488280c69 #5285 Add icons to the Surface items 2020-01-08 12:09:51 +01:00
Jacob Støren
26db8d7351 #5285 Surface import command Items and parsing infrastructure 2020-01-08 12:09:50 +01:00
Gaute Lindkvist
993b98f977 Set a sensible font size for Plot symbol labels (i.e. "P10", "P90" etc) 2020-01-07 14:59:18 +01:00
Gaute Lindkvist
4829c5eba2 Move to pixel size instead of point size for fonts 2020-01-07 14:59:18 +01:00
Gaute Lindkvist
f279e85c2c Improved font handling 2020-01-07 14:26:46 +01:00
Gaute Lindkvist
7bd62052ca Much improved legend rendering 2020-01-07 14:26:46 +01:00
Gaute Lindkvist
185b26514b Multi plot: Fix rendering of single plots to PDF 2020-01-07 14:26:46 +01:00
Gaute Lindkvist
1885d8bd6e Multiplot: Fix update issue following change between portrait and landscape 2020-01-07 14:26:46 +01:00
Gaute Lindkvist
a0cac2fefa #5288 Fix update issues 2020-01-07 14:26:46 +01:00
Gaute Lindkvist
0692ea28ad Fix legends for ensemble plots 2020-01-07 14:26:46 +01:00
Gaute Lindkvist
281fa24a2d Render at resolution required to match widget size 2020-01-07 14:26:46 +01:00
Gaute Lindkvist
81c092f2c4 #5293 Fix draw of category legend rectangles 2020-01-07 14:26:46 +01:00
Gaute Lindkvist
9ffbd97f8c Multi page plot works 2020-01-07 14:26:46 +01:00
Gaute Lindkvist
27788b1abd Change from QPainter to QPaintDevice in the API for PDF rendering 
* This is to be able to use QPagedPaintDevice::nextPage in the Multi plot rendering.
 2020-01-07 14:26:46 +01:00
Magne Sjaastad
65f4a5e089 Fix signed/unsigned compare 2020-01-07 13:09:44 +01:00
Magne Sjaastad
15dc0e974b
Assign calculation ID to existing addresses (#5304) 
#5278 Assign calculation ID to existing addresses
 2020-01-07 12:29:12 +01:00
Magne Sjaastad
4811cfb28f
Merge pull request #5301 from OPM/bugfix-summary-selection-5278 
#5278 Fix selection of calculated curves in summary selction dialog
 2020-01-07 11:21:33 +01:00
Magne Sjaastad
79641f090f #5300 Formations : Make sure views are updated correctly 2020-01-07 08:47:02 +01:00
Kristian Bendiksen
e535e2e42f #5216 Uppercase all property names ("kind") in well measurement import 
This fixes the problem of mixed case.
 2020-01-06 20:40:39 +01:00
Kristian Bendiksen
dbb60e6577 #5216 Allow whitespace before comments in well measurement import. 2020-01-06 20:27:53 +01:00
Kristian Bendiksen
7014f7e3a5 #5216 Change order of name and value in well measurement import 2020-01-06 20:16:19 +01:00
Kristian Bendiksen
f3d03fe653 #5278 Fix selection of calculated curves in summary selction dialog 
The INPUT_ID was not set correctly, and has been removed. The calculation id is
now appended to the vector name, and extracted again when selecting an item.
 2020-01-06 19:57:24 +01:00
Magne Sjaastad
ff2963293b #5300 Formations : Move update of Rim-related structures to RimEclipseCase 2020-01-06 15:27:16 +01:00
Magne Sjaastad
7d05a8bd0a #5300 Formations : Fix update issues 2020-01-06 14:33:54 +01:00
Magne Sjaastad
a7366fbebf Guard null pointer access 2020-01-06 11:22:39 +01:00
Jacob Støren
84dab9eccb #5283 Fixed error in Allen diagram for NNC's with same formation on both sides. 2020-01-03 14:25:34 +01:00
Magne Sjaastad
10649fa444 #5281 Summary Plot: Ensemble curve highlight is missing in 2019.12 2020-01-03 12:51:55 +01:00
Magne Sjaastad
576dfa80ac Make it possible to store project file without global path section 
If you have a project file with an alias section, this project is not possible to open in previous versions. Add a menu entry in the Testing menu to allow storage without alias.
 2020-01-03 12:51:40 +01:00
Magne Sjaastad
1c4feade71 #5279 Formations GeoMech : Add const and simplify access 2020-01-03 11:59:17 +01:00
Magne Sjaastad
afc9ace33e #5279 Formations : Add const and simplify access 2020-01-03 09:59:38 +01:00
Magne Sjaastad
dffef1cf54 #5276 Ensemble : Guard null pointer access causing crash 2020-01-03 07:09:35 +01:00
Jacob Støren
d074964901 #5274 Add text to Result Info panel for Allen diagram data 
Rename result variables to prepare for more Allen results
Rename methods to clarify meaning
 2020-01-02 12:46:38 +01:00
Jacob Støren
a42d5e9bc8 Rename to clarify meaning of gridLocalCellIndex 2020-01-02 12:45:01 +01:00
Jacob Støren
f1cee7ab36 #5269 Cycle cell selection when clicking an NNC 2020-01-02 12:39:14 +01:00
Jacob Støren
bbb5e89fe7
Merge pull request #5266 from OPM/feature-allen-diagram-results-on-faults 
Feature allen diagram results on faults
 2020-01-02 10:33:00 +01:00
Jacob Støren
0d6b139891 #5200 Enable only category legend when allen diagram is selected 2020-01-02 08:56:45 +01:00
Jacob Støren
5dee4e7478 Missing include Compile fix 2019-12-20 14:33:03 +01:00
Jacob Støren
1d97f376fb #5200 New allen result type, and working full and binary allen diagrams for formations 2019-12-20 13:55:56 +01:00
Jacob Støren
12e49656df #5200 Allen results as separate results type only visible for faults 2019-12-20 13:55:56 +01:00
Magne Sjaastad
831b899091 #5200 Prototype of use of formation names for allen diagram 2019-12-20 13:55:43 +01:00
Magne Sjaastad
582720f74e #5261 System : Allow export of field and object keywords from test menu 2019-12-20 11:22:29 +01:00
Magne Sjaastad
e37795a4dd Add object and field keywords names for release 2019.12 2019-12-20 10:53:34 +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
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
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
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
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
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
Magne Sjaastad
92c767989f #5237 MSW: Use 7 numbers for roughness number format 2019-12-17 14:11:23 +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
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
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
Kristian Bendiksen
d6ff1eb847 #5140 Fix incorrect values for "Show Plot Data" action on calculated summary curves. 
Fixed by checking if all the variables in a calculated expression is based on
accumulated data.
 2019-12-11 15:14:50 +01:00
Kristian Bendiksen
da7c582ae1 #5131 Avoid setting calculation twice. 2019-12-11 15:12:13 +01:00
Jacob Støren
298b40d6ef Refactor: Centralized generation of path to storage of wellpaths from SSIHUB 2019-12-11 11:39:02 +01:00
Jacob Støren
0f9b667c55 Guard against missing well path geometry data 2019-12-11 10:27:49 +01:00
Magne Sjaastad
1628f01939 #5131 : Calculated curves : Use find in RimSummaryCalculationCollection 2019-12-11 09:47:26 +01:00
Magne Sjaastad
532d5899de #5131 : Calculated curves : Show native address in title 2019-12-11 09:47:26 +01:00
Magne Sjaastad
03581804e2 #5131 : Calculated curves : Always show legend text 2019-12-11 09:47:26 +01:00
Jacob Støren
37b32c4e8a #5147 RimFormationNames::m_formationNamesFileName -> FilePath 2019-12-11 09:31:13 +01:00
Magne Sjaastad
8a88208f65 #5207 Curve Calculator : Move dialog to RiuPlotMainWindow 2019-12-11 09:29:41 +01:00
Kristian Bendiksen
b4c5f123fb #5131 Update calculation cross plot curves when summary case is replaced. 2019-12-11 09:29:35 +01:00
Kristian Bendiksen
35df3cc9d3 #5131 Update calculation curves when summary case is replaced. 2019-12-11 09:29:35 +01:00
Jacob Støren
b1942e0844 #5147 RimWellLogFile::m_fileName ->FilePath 2019-12-11 08:38:31 +01:00
Jacob Støren
7f1ccc0169 #5147 RimStimPlanFractureTemplate::m_stimPlanFileName -> FilePath 2019-12-11 08:30:32 +01:00
Jacob Støren
eb421db040 #5147 RimWellPath::m_wellPathFormationFilePath ->FilePath 
RimFileWellPath::m_filepath ->FilePath
 2019-12-11 08:23:37 +01:00
Jacob Støren
059288ef97 #5147 RimEclipseInputProperty::fileName -> caf::FilePath 2019-12-10 16:58:07 +01:00
Jacob Støren
11807029a5 #5147 RimEclipseInputCase::m_gridFileName -> FilePath 2019-12-10 16:43:12 +01:00
Jacob Støren
723caaaf79 #5147 RimEclipseCase::m_filesContainingFaults -> vector<FilePath> 2019-12-10 16:36:07 +01:00
Jacob Støren
d19c87c23a #5147 RimEclipseResultCase::caseFileName -> PdmField<caf::FilePath> 2019-12-10 16:19:39 +01:00
Jacob Støren
18cf59530f #5147 RimSummaryCase::m_summaryHeaderFilename -> PdmField<caf::FilePath> 2019-12-10 16:12:21 +01:00
Jacob Støren
a9d089df6d #5147 PdmField<caf::FilePath> now uses a reference list in the start of the project file to store the paths. 2019-12-10 14:58:47 +01:00
Magne Sjaastad
8e540efa37 Merge pull request #5199 from OPM/msw-fixes 
Several critical fixes for MSW export
 2019-12-06 14:39:13 +01:00
Gaute Lindkvist
a629a957cc #5084 Rework RicNewSummaryPlotFeature to create ensemble plots when that makes sense 2019-12-06 13:37:31 +01:00
Gaute Lindkvist
e199182e2f #5178 Fix axis rounding on plots other than Well Log Plots 2019-12-06 09:21:07 +01:00
Gaute Lindkvist
ea793c15f3 Fix ensemble selection if statistics curves are not shown 2019-12-06 08:13:31 +01:00
Gaute Lindkvist
0b5188e4b7 Fix updates after legend change 2019-12-06 08:13:31 +01:00
Gaute Lindkvist
08afc1f8d7 Add automatic name updating of EnsembleRftCurveSets 2019-12-06 08:13:31 +01:00
Gaute Lindkvist
9c458ec3ba Fixed typo in comment SFINA -> SFINAE 2019-12-06 08:13:31 +01:00
Gaute Lindkvist
7fd4aa1ce9 #5002 Ensemble RFT curve sets with parameter coloring and separate legends 2019-12-06 08:13:31 +01:00
Gaute Lindkvist
f56a34843a Refactored ensemble parameter legends 2019-12-06 08:13:31 +01:00
Magne Sjaastad
d4b7797bb1 #5187 Info Box: Change defaults for Statistics Options 2019-12-06 07:47:19 +01:00
Kristian Bendiksen
54820eb20a
Merge pull request #5173 from OPM/feature-well-measurement-reorg 2019-12-05 15:51:24 +01:00
Magne Sjaastad
948d193e3e #5189 Grid Case Group: Read Well Data Source when importing project 2019-12-05 14:29:53 +01:00
Magne Sjaastad
cebe0485da #5100 Regression Test : Avoid deleteLater() to have full control on memory management timing 2019-12-05 14:21:57 +01:00
Magne Sjaastad
2f2a2188fe #5100 Regression Test : Move summary dialog to main plot window 2019-12-05 14:21:35 +01:00
Magne Sjaastad
d6bdc53ee5 #5185 Regression Test : Always set regression image size on snapshot commands 2019-12-05 11:56:10 +01:00
Magne Sjaastad
ad648eadc1 Janitor : Guard access to undefined memory 2019-12-05 11:56:04 +01:00
Gaute Lindkvist
1d62d3534c Remove use of QFontMetrics width 2019-12-04 15:09:04 +01:00
Gaute Lindkvist
a7e3cc154a #5160 Fix wording around FG in shale calculation 2019-12-04 15:09:04 +01:00
Gaute Lindkvist
b5ab1d6e82 #5159 Make user defined shale PP proportional to hydrostatic PP 2019-12-04 15:09:04 +01:00
Gaute Lindkvist
3c29ffbfab Revert "Always hide drop target for Grid Plots in release-2019.11" 
* This commit was never meant to go into dev

This reverts commit 62655e17c6.
 2019-12-04 14:17:28 +01:00
Magne Sjaastad
e138e1f7e8 Merge changes from release-2019.11 2019-12-04 14:05:39 +01:00
Gaute Lindkvist
2e7d581c3e Apply correct frame indices for OBG0 and SH_MK WBS curve calculation 2019-12-04 13:36:22 +01:00
Gaute Lindkvist
df5c5fb2a8 #5161 Make the WBS parameter curves work right 2019-12-04 13:36:22 +01:00
Gaute Lindkvist
4bbb12e32a #5161 Don't attempt to export empty LAS-curves. It will crash in LAS-exporter. 2019-12-04 13:36:22 +01:00
Magne Sjaastad
87fecb876f Janitor : Avoid use of smart pointer on a QObject 2019-12-04 13:04:44 +01:00
Magne Sjaastad
df55c5f6dc Janitor : Avoid replot in destructor of RimPlotCurve 2019-12-04 12:48:48 +01:00
Magne Sjaastad
1ba2fc14a5 #5177 Saturation Plots : Plots are not deleted on project close 2019-12-04 12:48:48 +01:00
Gaute Lindkvist
2e8518b7c9 #5179 Fix missing LAS-file data in plots when las-file doesn't contain TVD 2019-12-04 12:37:25 +01:00
Gaute Lindkvist
3903d08b7a Always hide drop target for Grid Plots in release-2019.11 2019-12-04 12:37:18 +01:00
Gaute Lindkvist
ed1d02535d #5179 Fix missing LAS-file data in plots when las-file doesn't contain TVD 2019-12-04 12:36:22 +01:00
Gaute Lindkvist
9599b309bc Replace all occurences of QPalette::Background with QPalette::Window 
QPalette::Background is deprecated and gives warning in Qt 5.13
 2019-12-04 12:34:17 +01:00
Gaute Lindkvist
5139f1cadb #5174 Paint non-filled plot symbols with curve color rather than edge color 2019-12-04 12:34:17 +01:00
Gaute Lindkvist
cd5b432267 #5171 Fix legend updates by getting rid of the show/hideEvent crash fix 
* The crash is instead fixed by getting rid of deleteLater()
 2019-12-04 12:34:17 +01:00
Gaute Lindkvist
b5712987de Fix y-axis text for observed data 2019-12-04 12:34:17 +01:00
Gaute Lindkvist
445f28d26f Replace all occurences of QPalette::Background with QPalette::Window 
QPalette::Background is deprecated and gives warning in Qt 5.13
 2019-12-04 12:34:04 +01:00
Gaute Lindkvist
62655e17c6 Always hide drop target for Grid Plots in release-2019.11 2019-12-04 12:34:04 +01:00
Gaute Lindkvist
f795dfcf11 #5174 Paint non-filled plot symbols with curve color rather than edge color 2019-12-04 12:34:04 +01:00
Gaute Lindkvist
28a0a3ad06 #5171 Fix legend updates by getting rid of the show/hideEvent crash fix 
* The crash is instead fixed by getting rid of deleteLater()
 2019-12-04 12:34:04 +01:00
Gaute Lindkvist
3e39866f6f Fix y-axis text for observed data 2019-12-04 12:34:04 +01:00
Magne Sjaastad
4fb0542946 #5125 Well measurements : Select all wells by default 2019-12-04 10:41:44 +01:00
Magne Sjaastad
0a1e6fc1d3 #5125 Well measurements : Hide legend if well measurement is unchecked 2019-12-04 08:40:39 +01:00
Magne Sjaastad
04162059b7 #5169 Observed Data : Do not repeat curve name twice 2019-12-04 08:05:46 +01:00
Kristian Bendiksen
cf15beb808 #5110 Update well measurement plots when WBS well is changed. 2019-12-03 21:19:02 +01:00
Kristian Bendiksen
12abf6494f #5110 Show only relevant well measurements in WBS track. 2019-12-03 21:19:02 +01:00
Kristian Bendiksen
0e4f9fe114 #5125 Show well measurements based on selection in RimWellMeasuremenInView. 2019-12-03 21:19:02 +01:00
Kristian Bendiksen
3583e2ee10 #5125 Update RimWellMeasurementInViewCollection when measurements are imported. 2019-12-03 21:19:02 +01:00
Kristian Bendiksen
66ac8fee1d #5125 Use category legend for well measurements without values. 2019-12-03 21:19:02 +01:00
Kristian Bendiksen
6efceea597 #5125 Make each well measurement a checkable entity. 2019-12-03 21:19:02 +01:00
Kristian Bendiksen
ad9c767a36 #5125 Only update relevant grid view on well measurement changes. 2019-12-03 21:19:02 +01:00
Kristian Bendiksen
660d68a4d1 #5125 Update well measurement colors on legend changes in 3d views. 2019-12-03 21:19:02 +01:00
Magne Sjaastad
8f99eb2274 #5169 Observed Data : Do not repeat curve name twice 2019-12-03 20:19:20 +01:00