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
13,152 Commits 27 Branches 61 Tags 309 MiB
034f75f64e
Commit Graph

5610 Commits

Author SHA1 Message Date
Gaute Lindkvist
7564c4420f WBS: hide parameters from project tree 2020-01-29 09:45:38 +01:00
Gaute Lindkvist
f68332ec80 #5375 WBS: Rename outside reservoir to non-reservoir 2020-01-29 09:45:38 +01:00
Gaute Lindkvist
ef4bccb52a Fix update of WBS plots when unchecking tracks 2020-01-29 08:38:11 +01:00
Magne Sjaastad
bbe2eddad6 #5407 Color Legend : Set log as default color legend for results based on substring match 2020-01-28 15:34:31 +01:00
Gaute Lindkvist
98dfa8a72b #5388 Make sure plots aren't unchecked if the parent is unchecked 2020-01-27 13:50:15 +01:00
Magne Sjaastad
4b04e58607 #5377 Deeper : Add preference for visibility of faults when creating a new view 2020-01-25 12:04:16 +01:00
Magne Sjaastad
26a96f8e41 #5377 Deeper : Move fields to private 2020-01-25 11:54:40 +01:00
Magne Sjaastad
4636abe564
Merge pull request #5397 from OPM/phase-dist-issues 
Fixes related to Phase Distribution Plots
 2020-01-24 15:25:33 +01:00
Magne Sjaastad
8aa1e6a047 #5356 Phase Distribution Plots : Show title in MDI window title 2020-01-24 11:22:54 +01:00
Magne Sjaastad
f120dd6929 #5356 Phase Distribution Plots : Make sure content is updated when toggeled 2020-01-24 11:09:32 +01:00
Gaute Lindkvist
23e6bc2e86 #5372 Implement getting reservoir bounding box from Python 2020-01-24 11:07:38 +01:00
Magne Sjaastad
2a9af029b8 #5355 Phase Distribution Plots : Hide plot legend in multi plot mode 2020-01-24 10:41:16 +01:00
Magne Sjaastad
8bbfe9e7af Delete unused code 2020-01-23 18:05:45 +01:00
Gaute Lindkvist
1c283d9c2d #5164 Fix crash when adding LAS curve and support TVDRKB from LAS-files 2020-01-23 15:06:32 +01:00
Gaute Lindkvist
bff2abe85b Fix a surface collection crash in RimGeoMechView 2020-01-22 13:29:04 +01:00
Jacob Støren
5e68adc099
Merge pull request #5364 from OPM/fix-separate-results-issues 
#5358, #5317, #5019 Fix several issues regarding separate results def…
 2020-01-22 09:29:03 +01:00
Gaute Lindkvist
56d141d4c3 Support setting Wbs-parameters from Python. 2020-01-22 09:28:46 +01:00
Gaute Lindkvist
954bf1e02e Support setting of child fields from Python and pass in WbsParameters if provided 
Also fixes #5354
 2020-01-22 09:28:46 +01:00
Gaute Lindkvist
5b8b76179b Separate Wbs Parameters from RimWellBoreStabilityPlot 2020-01-22 09:28:46 +01:00
Jacob Støren
27737b51bc #5358, #5317, #5019 Fix several issues regarding separate results definitions 2020-01-21 15:28:26 +01:00
Magne Sjaastad
2adefbcb04 Remove unused code 2020-01-21 14:00:59 +01:00
Magne Sjaastad
48e7736daa Remove unused variables 2020-01-20 11:30:46 +01:00
Kristian Bendiksen
6c0de05262 Update RimWellMeasurementCurve to new api to fix crash in WBS plot. 2020-01-20 10:45:59 +01:00
Kristian Bendiksen
fc43c42f10 #5111 Add command to reload well measurements from file 2020-01-20 10:45:59 +01:00
Kristian Bendiksen
ed19f41586 #5217 Filter well measurements by quality 2020-01-20 10:45:59 +01:00
Kristian Bendiksen
2a0ba626d7 #5217 Add filtering for well measurement. 2020-01-20 10:45:59 +01:00
Kristian Bendiksen
492ec395c0 #5043 Input Property: Show file path in result selection panel 2020-01-20 10:18:52 +01:00
Jacob Støren
1095165a64
Merge pull request #5351 from OPM/feature-reservoir-surface-results 
Feature reservoir surface results
 2020-01-20 07:40:23 +01:00
Jacob Støren
d32db574cb #5318 Surface Intersection geometry with results 2020-01-17 13:24:25 +01:00
Jacob Støren
63eea9de10 #5317 Made RimSurfaceInView inherit RimIntersection 
to get all the separate results stuff from there.
 2020-01-17 13:24:24 +01:00
Jacob Støren
2fa27f8718 #5317, #5318 Refactored RimIntersection, prepare to use as base class for RimSurfaceInView as well 2020-01-17 13:24:24 +01:00
Jacob Støren
cdba7d2104 #5316 Fix crash when no surfaces are present 2020-01-17 13:24:24 +01:00
Jacob Støren
cf74891952 #5317 Add separate results definition objects for Reservoir Surfaces 2020-01-17 13:24:24 +01:00
Jacob Støren
e05f9320d7 Rename to appendIntersectionFacesToModel 2020-01-17 13:24:24 +01:00
Jacob Støren
5b1b7e630a #5316 Prototype of results mapping on native surface nodes only 2020-01-17 13:24:24 +01:00
Magne Sjaastad
0abd839669 #5273 Allen Diagrams: Use const access to Nnc connections 2020-01-17 08:41:16 +01:00
Magne Sjaastad
6761a71798 #5273 Allen Diagrams: Move result names to RiaNccDefines 2020-01-17 08:41:15 +01:00
Gaute Lindkvist
5f7df7f7f5 Zoom depth when the original depth range is invalid 2020-01-16 14:33:33 +01:00
Gaute Lindkvist
edc276db4d Well Log Plot and Well Distribution Plots no longer inherit Multiplot 
* Also cleaned up RiuQwtPlotWidget
 2020-01-16 14:33:33 +01:00
Magne Sjaastad
cca94f0326 #5337 Remove nullpointers before writing to project file 2020-01-16 08:48:01 +01:00
Magne Sjaastad
52d24f9439 Error dialog : Do not display error dialog, write to logging window 
For large projects with many missing files, the file open error dialog will be displayed many times
 2020-01-15 22:47:02 +01:00
Gaute Lindkvist
8b1aa319a6 #5220 Use caf::PdmUiDoubleEditor for depth axis range in Well Log Plots 
* And set two decimals and fixed notation
 2020-01-13 15:44:37 +01:00
Jacob Støren
5e168d75b3 #5321 Fix Path ID showing up as case name for summary files. 2020-01-13 15:21:15 +01:00
Magne Sjaastad
bd0c165d17 #5326 Phase Distribution : Add individual visibility control of oil/gas/water 2020-01-13 09:10:03 +01:00
Magne Sjaastad
899d1a6f78
Merge pull request #5328 from OPM/fix-cumulative-phase-distr 
UI changes for cumulative phase distribution
 2020-01-12 18:11:40 +01:00
Magne Sjaastad
5d5df1e89f
Merge pull request #5324 from OPM/well-measurements-delete-imported-files-5116 
Well measurements delete imported files 5116
 2020-01-12 17:05:47 +01:00
Magne Sjaastad
8d40d5034f #5326 Phase Distribution : Rename to Cumulative Phase Distribution Plot 2020-01-12 17:05:12 +01:00
Magne Sjaastad
f4725b50df #5326 Phase Distribution : Add Show cumulative phase plot 2020-01-12 16:51:32 +01:00
Magne Sjaastad
fc16c1d88e #5326 Phase Distribution : Add max TOF to property editor 2020-01-12 13:27:18 +01:00
Magne Sjaastad
7de6fda595 #5326 Phase Distribution : Make sure Eclipse case is open 2020-01-12 13:22:52 +01:00
Magne Sjaastad
198f738be8 Flow Diag : Make sure the Eclipse case is open 2020-01-12 13:19:13 +01:00
Magne Sjaastad
276114f668 #5327 Well Measurements : Improve context menus 2020-01-11 08:23:45 +01:00
Magne Sjaastad
cc65ce581f #5327 Well Measurements : Move measurements to first child of parent 
Set uiHidden on field, not the contained object
 2020-01-11 08:05:03 +01:00
Magne Sjaastad
ac752421f1 #5307 Show Plot Data : Fix time step values for calculated summary vectors 2020-01-10 19:46:53 +01:00
Magne Sjaastad
ccb1d95e72 #5323 Well Connection Factor : Update legend range for NAN values 2020-01-10 12:53:33 +01:00
Kristian Bendiksen
49dd2ad307 #5116 Well Measurement: select RimWellMeasurementInView when picking in 3d view. 2020-01-10 12:03:50 +01:00
Kristian Bendiksen
33693932b6 #5116 Remove checkable property for well measurement collection. 2020-01-10 12:03:43 +01:00
Kristian Bendiksen
3bb325c4ee #5116 Add user description field to well measurement file path. 2020-01-10 10:49:22 +01:00
Kristian Bendiksen
d09cae0e55 #5116 Hide unneccessary tree elements for well measurements. 2020-01-10 10:49:22 +01:00
Kristian Bendiksen
391046c4fa #5116 Use lineeditor widget for file path 
This makes it possible to selected the text when field is disabled.
 2020-01-10 10:48:22 +01:00
Kristian Bendiksen
22aece407e #5116 Implement delete of an imported file for well measurements. 2020-01-10 10:32:31 +01:00
Gaute Lindkvist
a58d854030 Fix problem with black background in snapshot export 2020-01-09 14:41:00 +01:00
Gaute Lindkvist
3fc7378b8f Fix plot titles for RFT and PLT plots from old project files. 2020-01-09 14:41:00 +01:00
Gaute Lindkvist
fdb453a813 #5305 Only update parent plot zoom when changing well log curve if the data range changes 2020-01-09 14:41:00 +01:00
Jacob Støren
1a1706d2fa Compile error fix for gcc on ubuntu 16.04 2020-01-09 08:48:05 +01:00
Gaute Lindkvist
b06cadb4e7 Disable TVDRKB for RFT plots until implemented properly 2020-01-08 14:35:48 +01:00
Gaute Lindkvist
10f749f356 #5219 Implement support for TVDRKB for well log depth 
* Also show air gap in title when TVDRKB is selected and not otherwise
 2020-01-08 14:35:48 +01:00
Gaute Lindkvist
de68df122d Add preview mode to multi plots 
* Apply margins matching the Page Layout so the plot is a preview of the PDF output
* Currently not a user setting, just switched off for plots based on MultiPlotPage and on for plots based on
MultiPlotWindow
 2020-01-08 14:35:48 +01:00
Jacob Støren
e6d96316d4 #5285 Visualization and update of Surfaces 2020-01-08 12:11:10 +01:00
Jacob Støren
e9086005d4 #5310 Fix wrong use of new path id. 
Used last used instead of first unused
 2020-01-08 12:09:51 +01:00
Jacob Støren
45a3225ec8 #5285 Surface Import command. SurfaceInView tree-items. Delete. 
Ready to start on visualization code
 2020-01-08 12:09:51 +01:00
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
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
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
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
79641f090f #5300 Formations : Make sure views are updated correctly 2020-01-07 08:47:02 +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
10649fa444 #5281 Summary Plot: Ensemble curve highlight is missing in 2019.12 2020-01-03 12:51:55 +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
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
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
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
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
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
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
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
0b2a78b211 #5232 Templates: Do not write dialog fields to project file 2019-12-17 10:55:51 +01:00
Magne Sjaastad
b6b5b014ad #5226 Ensemble Filter : Remove colors group from property editor 2019-12-17 10:55:19 +01:00
Magne Sjaastad
5d96ce738c #5131 Minor calculation curve adjustments 2019-12-13 15:41:34 +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
Jacob Støren
298b40d6ef Refactor: Centralized generation of path to storage of wellpaths from SSIHUB 2019-12-11 11:39:02 +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
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
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
ad648eadc1 Janitor : Guard access to undefined memory 2019-12-05 11:56:04 +01:00
Gaute Lindkvist
b5ab1d6e82 #5159 Make user defined shale PP proportional to hydrostatic PP 2019-12-04 15:09:04 +01:00
Magne Sjaastad
e138e1f7e8 Merge changes from release-2019.11 2019-12-04 14:05:39 +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
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
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
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
Magne Sjaastad
e0e984f703 #5158 Grid Case Group: Allow statistics on static data only 
Support grid cases with no dynamic data present.
 2019-12-03 14:20:43 +01:00
Magne Sjaastad
9424bdd0de #5158 Grid Case Group: Allow statistics on static data only 
Support grid cases with no dynamic data present.
 2019-12-03 12:58:04 +01:00
Gaute Lindkvist
631570f6a5 #5150 Improve wheel zoom with logarithmic axes 
* Limit the amount to scroll at one time and set a fixed minimum
 2019-12-02 12:34:58 +01:00
Magne Sjaastad
e03582ab4b Revert case Ids to start at 0 2019-12-02 12:17:50 +01:00
Magne Sjaastad
45c0ca38f1 #5132 Janitor : Guard index out of bounds 2019-12-02 11:23:34 +01:00
Kristian Bendiksen
e87466717c #5047 Remove input property collection from project tree. 2019-12-02 10:45:06 +01:00
Gaute Lindkvist
4870071b8e #5150 Improve wheel zoom with logarithmic axes 
* Limit the amount to scroll at one time and set a fixed minimum
 2019-12-02 08:01:38 +01:00
Gaute Lindkvist
538e42f278 #5106 Fix crash when importing multiple well paths with the same name 2019-12-02 08:01:38 +01:00
Gaute Lindkvist
c5f21b75fa #5133 Reassign summary curves to the file summary case copy when closing a grid case 2019-12-02 08:01:38 +01:00
Gaute Lindkvist
82155ae779 #5106 Fix crash when importing multiple well paths with the same name 2019-11-30 12:11:35 +01:00
Gaute Lindkvist
bfa9ff637b #5133 Reassign summary curves to the file summary case copy when closing a grid case 2019-11-30 09:46:44 +01:00
Gaute Lindkvist
9656692afc Improve canvas top alignment in well log plots 2019-11-29 15:56:43 +01:00
Gaute Lindkvist
4029953c24 Rename SummaryYAxisFormatter (it isn't just for the Y-axis) 2019-11-29 15:03:52 +01:00
Gaute Lindkvist
ec4194c0b0 Fix Well Allocation Plot depth axis zoom 2019-11-29 15:03:52 +01:00
Gaute Lindkvist
2c1180fa85 Fix Pseudo-length labels for RFT plots 2019-11-29 15:03:52 +01:00
Gaute Lindkvist
9a01c769e9 #5128 Fix right y-axis titles in summary plots 2019-11-29 15:03:52 +01:00
Gaute Lindkvist
602751dccc #5129 Fix depth ranges when curve units don't match display units 2019-11-29 15:03:52 +01:00
Gaute Lindkvist
1267ba64d4 #5051 Do not auto zoom when adding/removing curves in plot 2019-11-29 15:03:52 +01:00
Gaute Lindkvist
dedb437ce5 #5051 Fix Well Log Plot zoom with scrolling with scrollbar 2019-11-29 15:03:52 +01:00
Gaute Lindkvist
d5c3c3f9e8 Rename SummaryYAxisFormatter (it isn't just for the Y-axis) 2019-11-29 15:03:37 +01:00
Gaute Lindkvist
8e94caceed Fix Well Allocation Plot depth axis zoom 2019-11-29 15:03:37 +01:00
Gaute Lindkvist
1b345fa20f Fix Pseudo-length labels for RFT plots 2019-11-29 15:03:37 +01:00
Gaute Lindkvist
e65d9aa22d #5128 Fix right y-axis titles in summary plots 2019-11-29 15:03:37 +01:00
Gaute Lindkvist
d05328e184 #5129 Fix depth ranges when curve units don't match display units 2019-11-29 15:03:37 +01:00
Magne Sjaastad
d4230416af #5132 Janitor : Guard index out of bounds 2019-11-29 13:40:14 +01:00
Jacob Støren
6ac18d52ff #5117 Sep Inter Res: Fix missing use of cathegory legend 2019-11-29 10:27:43 +01:00
Jacob Støren
f446d58b60 #5124, #5123 Fix irratic collapse of property group 
Fix missing timestep menu
 2019-11-29 10:27:43 +01:00
Jacob Støren
021af085a7 #5119, #5120 Default case for intersection result 
Fixed missing intersection colors when cellresults are turned off
 2019-11-29 10:27:43 +01:00
Gaute Lindkvist
3b0ba03e87 Fix duplicate parts of names in Well Log Plots 2019-11-29 08:29:33 +01:00
Gaute Lindkvist
6eccba7398 Fix crash when dragging plot from one multiplot to another 2019-11-28 20:43:49 +01:00
Jacob Støren
ad25bb89c2 #5112 Add cell highlight on intersections with separate intersection result 2019-11-28 14:09:53 +01:00
Jacob Støren
2a3c43bcc3 #5112 Fixed result info text for eclipse 
Needs more testing
 2019-11-28 14:09:52 +01:00
Jacob Støren
5556d2d9eb #5112 Make selected result definition available through 3ditem selection system 
Make PVT, Relperm, Mohr and rResult plot aware
 2019-11-28 14:09:52 +01:00
Gaute Lindkvist
cf190b05c1 #5051 Do not auto zoom when adding/removing curves in plot 2019-11-27 14:17:23 +01:00
Magne Sjaastad
df2fc7111f
Merge pull request #5105 from OPM/feature-wbs-plot-data-along-well-path 
Feature wbs plot data along well path
 2019-11-27 14:08:29 +01:00
Magne Sjaastad
4aac43c167 Fix headers and whitespace 2019-11-27 13:54:58 +01:00
Gaute Lindkvist
18090338c7 Fix zoom all in well log plots 2019-11-27 13:22:23 +01:00
Gaute Lindkvist
62817054c4 Improve canvas top alignment in well log plots 2019-11-27 13:22:23 +01:00
Gaute Lindkvist
4fd9562b4b #5051 Fix Well Log Plot zoom with scrolling with scrollbar 2019-11-27 13:22:23 +01:00
Kristian Bendiksen
6bec758d15 #5001 Add RimWellMeasurementInViewCollection and legends. 2019-11-27 12:05:51 +01:00
Kristian Bendiksen
ea7df94649 #5001 Improve filtering of measurement collection. 2019-11-27 12:05:51 +01:00
Kristian Bendiksen
b4fea5f00a #5001 Move RimWellMeasurementCollection from RimWellPath to 
RimWellPathCollection.

Also add filtering of measurements by well path.
 2019-11-27 12:05:51 +01:00
Kristian Bendiksen
ea534cace6 #5001 Update plots on changes in RimWellMeasurement. 2019-11-27 12:05:51 +01:00
Kristian Bendiksen
18c2350bdf #5001 Add measurements to WBS plot. 2019-11-27 12:05:51 +01:00
Kristian Bendiksen
d266e44f1f #5001 Add RicImportWellMeasurementsFeature. 2019-11-27 12:05:51 +01:00
Kristian Bendiksen
ff15ff939d #5001 Add object definition for well measurement collection. 2019-11-27 12:05:51 +01:00
Kristian Bendiksen
75c3e8732d #5001 Add object definition for well measurement. 2019-11-27 12:05:51 +01:00
Gaute Lindkvist
3db9948a3b #5063 Improve auto name for well log plots and use it for well allocation plots 2019-11-27 10:14:15 +01:00
Gaute Lindkvist
431f0ff347 Add additional WBS curves and rewrite parameters 2019-11-27 10:14:15 +01:00
Magne Sjaastad
4f4c48635b Merge pull request #5099 from OPM/improve-ensemble-statistics 
Improve ensemble statistics
 2019-11-27 09:57:46 +01:00
Magne Sjaastad
a4b08fcd29 #4155 Ensemble Statistics Curves : Guard empty vector 2019-11-26 15:39:59 +01:00
Magne Sjaastad
6969c2f299 #4155 Ensemble Statistics Curves : Add option to include partial curves when computing statistics 2019-11-26 15:02:52 +01:00
Magne Sjaastad
6264eb49c8 #5095 Summary Statistics : Guard vector acces when calculating statistics curves 2019-11-26 15:01:14 +01:00
Jacob Støren
191419b6b4 clang-format after intersection rename 2019-11-26 13:56:02 +01:00
Jacob Støren
06596673dc Rename RimIntersectionHandle to RimIntersection 2019-11-26 13:26:37 +01:00
Jacob Støren
4672528a4d Rename RimintersectionBox to RimBoxIntersection 
Rename RivIntersectionBoxPartMgr to RimBoxIntersectionPartManager
 2019-11-26 13:14:55 +01:00
Jacob Støren
0e14c63f07 Rename crossSection to intersection in general code 2019-11-26 12:45:08 +01:00
Jacob Støren
0617b56850 Rename RivIntersectionGeometryGenerator to RivExtrudedCurveIntersectionGeometryGenerator 
and RivIntersectionPartMgr to RivExtrudedCurveIntersectionPartMgr
 2019-11-26 11:51:54 +01:00
Jacob Støren
152d2bde17 Rename RimIntersection to RimExtrudedCurveIntersection 2019-11-26 11:35:21 +01:00
Jacob Støren
5593fb198c
Merge pull request #5094 from OPM/feature-#5019-separate-intersection-results 
Feature #5019 separate intersection results
 2019-11-26 10:15:30 +01:00
Magne Sjaastad
11f46e3696 #5069 Janitor : Hide some menu items related to toggling 2019-11-26 07:42:50 +01:00
Magne Sjaastad
b758854463 #5069 Janitor : Hide some menu items related to toggling 2019-11-26 07:42:04 +01:00
Magne Sjaastad
be764d76cb #5077 Summary Plots: Simplify context menu 2019-11-25 15:52:09 +01:00
Magne Sjaastad
1e92687745 #5077 Summary Plots: Simplify context menu 2019-11-25 15:51:20 +01:00
Jacob Støren
15aa4d6e0b Merge dev and feature-#5019-separate-intersection-results branch 2019-11-25 15:50:29 +01:00
Magne Sjaastad
c9abd09495
Merge pull request #5091 from OPM/integrate-from-release-branch 
Integrate from release branch
 2019-11-25 15:39:15 +01:00
Jacob Støren
6e99a43247 #5019 Add/Delete Separate Intersection Result commands 2019-11-25 15:34:36 +01:00
Jacob Støren
7aec88de3c #5019 Fix wrong use of explicit scalar mappers for intersections 
Only 2d intersection view is supposed to use them
 2019-11-25 15:33:42 +01:00
Jacob Støren
baedf02ba9 #5019 Fix crash when case is not set in Separate intersection Result 2019-11-25 15:27:25 +01:00
Gaute Lindkvist
d44775aba6 #5063 Improve auto name for well log plots and use it for well allocation plots 2019-11-25 15:20:15 +01:00
Gaute Lindkvist
95f8c44f0f Improve RimNameConfig API 2019-11-25 15:20:15 +01:00
Gaute Lindkvist
dbee9759a0 #5063 Improve auto name for well log plots and use it for well allocation plots 2019-11-25 15:19:53 +01:00
Gaute Lindkvist
cf7608e6bf Improve RimNameConfig API 2019-11-25 15:19:53 +01:00
Magne Sjaastad
71ad9e0da2 Merge pull request #5081 from OPM/move-error-bar-curve 
Curve Error Bars : Move to RimPlotCurve
 2019-11-25 14:08:12 +01:00
Magne Sjaastad
a511f580e4 Merge pull request #5073 from OPM/progress-bar 
Progress bar to summary reader
 2019-11-25 13:59:18 +01:00
Magne Sjaastad
72a5c6cfef Merge pull request #5071 from OPM/memory-fixes 
Release of memory
 2019-11-25 13:58:55 +01:00
Jacob Støren
919f035a48 #5019 Add an enable separate results button to each intersection 2019-11-25 13:31:21 +01:00
Jacob Støren
eed9f6abad #5019 Update 2dIntersection views when toggling sparate intersection results 2019-11-25 11:42:46 +01:00
Jacob Støren
9bfe51b205 #5019 Support separate intersection results for 2Dintersection views 2019-11-25 11:40:57 +01:00
Magne Sjaastad
3f75cda593
Merge pull request #5083 from OPM/fix-plot-crash-release-2019.11 
Fix crash when closing and reopening plots
 2019-11-25 09:43:56 +01:00
Magne Sjaastad
9f0c4b4bed
Merge pull request #5081 from OPM/move-error-bar-curve 
Curve Error Bars : Move to RimPlotCurve
 2019-11-25 09:43:38 +01:00
Gaute Lindkvist
1d4d261129 Disable multiplot functionality 2019-11-25 08:41:47 +01:00
Gaute Lindkvist
293290827b Fix crash when closing and reopening plots 2019-11-25 08:32:30 +01:00
Gaute Lindkvist
d6ec710fd9 Fix crash when closing and reopening plots 2019-11-25 08:22:39 +01:00
Magne Sjaastad
36772e77b1 #5079 Curve Error Bars : Move to RimPlotCurve 2019-11-22 14:23:59 +01:00
Jacob Støren
1ab815e673 #5019 Use same code for separate intersection legend setup in eclipse and geomech 2019-11-22 13:31:35 +01:00
Jacob Støren
b5e39519c5 #5019 Separate intersection legends in place in ordinary views 
Needs some cleanup and not working in 2dintersection views
 2019-11-22 12:36:39 +01:00
Jacob Støren
f3b458dfbc Fix regressions for intersection views. 
Introduced by cd08185678
Wrong scalar mappers used when coloring.
Wrong timestep used
 2019-11-21 15:14:17 +01:00
Jacob Støren
10257e3bfb Fix missing rebuild of intersections in geomech view 
Fix missing ternary legend reset
Fix missing regular legend reset in geomech view
 2019-11-21 10:05:56 +01:00
Jacob Støren
53f2c94763 #5019 Sep Intersection Res: Fix missing use of user range when loading from project file 2019-11-21 09:24:24 +01:00
Jacob Støren
5d03ecb115 Add some const to GeoMechResultDefinition 
To prepare for separate legend update code needed bu #5019
 2019-11-21 08:30:04 +01:00
Jacob Støren
31a698243d #5019 Update display model on separate intersection settings change 2019-11-21 08:28:00 +01:00
Gaute Lindkvist
dfb5896edf Revert case Ids to start at 0 2019-11-21 08:15:17 +01:00
Magne Sjaastad
22ca504907
Merge pull request #5065 from OPM/remove-input-property-collection-from-tree 
#5047 Remove input property collection from project tree.
 2019-11-21 07:11:35 +01:00
Kristian Bendiksen
3fafe90aeb #5047 Remove input property collection from project tree. 2019-11-20 22:01:07 +01:00
Magne Sjaastad
ec7f1a1a7f #5028 Performance Summary : Add progress bar to summary reader 2019-11-20 15:24:05 +01:00
Gaute Lindkvist
7f0efb61f4 Remove superfluous updateLayout from RimPlot 2019-11-20 14:07:20 +01:00
Gaute Lindkvist
bf6da1c6c4 Guard creation of view widget in RimMultiPlotWindow 2019-11-20 13:38:50 +01:00
Gaute Lindkvist
85d683634c Further refactoring 2019-11-20 13:14:45 +01:00
Gaute Lindkvist
228810fd05 Refactor view id 2019-11-20 13:14:45 +01:00
Gaute Lindkvist
d9043db5e0 Refactor RimPlotWindow and RimPlotInterface 2019-11-20 13:14:45 +01:00
Gaute Lindkvist
4dd0651dae Remove width scaling factors 2019-11-20 13:14:45 +01:00
Gaute Lindkvist
8252ab8808 Rename GridPlot to MultiPlot throughout 2019-11-20 13:14:45 +01:00
Gaute Lindkvist
a73c7a4b97 Rename Plot Report and Combination Plot to Multi Plot 2019-11-20 13:14:45 +01:00
Gaute Lindkvist
81db22586d Remove description-field from RimPlotWindow 
* Leave it to sub-classes to deal with this
 2019-11-20 13:14:45 +01:00
Jacob Støren
46f335ad0b #5019 Refactor the color generation in the boxintersection into static methods 
These methods are to be used from the normal intersections as well.
 2019-11-20 12:00:43 +01:00
Magne Sjaastad
0bf782147a Janitor : RimProject : Skip obsolete delete in desctructor 2019-11-20 11:42:13 +01:00
Jacob Støren
c8053284d1 #5019 Add relevant access to IntersectionResultDefinition 
Implement initAfterRead to populate the resultDefinitions with correct case
 2019-11-20 10:39:48 +01:00
Jacob Støren
c79de08c40 Improve const-ness somewhat on some results color related methods 2019-11-20 10:39:48 +01:00
Jacob Støren
439071dddf Fix crash when copying the intersection. 
Updating of the default is handled later, so is not neccesary when doint initAfterRead after deserialization.
 2019-11-20 10:39:48 +01:00
Jacob Støren
57dfd3b67a Intersection color texturing: Remove dependency on view and RimEclipseResultColor 
Also start to harmonize intersection and intersection box texturing
 2019-11-20 10:39:48 +01:00
Jacob Støren
612332cbbc #5019 Move RimIntersectionHandle to separate files Use in RimIntersectionBox 2019-11-20 10:39:48 +01:00
Jacob Støren
9ed3d8babc #5019 WIP: Made fields in IntersectionHandle protected 2019-11-20 10:39:48 +01:00
Jacob Støren
8fb3fbc097 #5019 WIP: Create a RimIntersectionHandle base class 2019-11-20 10:39:48 +01:00
Jacob Støren
62ed71ed76 #5019 Intersections have first data source as ianctive default 
Icon state update for IResDefCollection
 2019-11-20 10:39:48 +01:00
Jacob Støren
fec449dc43 #5019 Add separate intersection results collection and items 2019-11-20 10:39:47 +01:00
Kristian Bendiksen
5e480bf438 #5042 Add "Export Property To File" command to eclipse view. 2019-11-19 22:23:03 +01:00
Gaute Lindkvist
60b09d7bfd #5061 WAP: fix update of well allocation data when changing depth type 2019-11-19 13:19:56 +01:00
Gaute Lindkvist
4d38c2ea39 #5061 WAP: Trigger reload of Well Allocation Data when updating depth type 2019-11-19 13:18:36 +01:00
Gaute Lindkvist
ae9575feb2 #5049 Fix missing axis title for well allocation plots 2019-11-19 10:33:18 +01:00
Magne Sjaastad
710352e4bf Janitor : Remove unused code and reorganize includes 2019-11-19 08:50:03 +01:00
Gaute Lindkvist
6f4ae69cc9 #5048 Add comment to well log curve for zoom calculation 2019-11-19 08:16:56 +01:00
Gaute Lindkvist
61e443cc69 #5048 Fix zoom all for well allocation plots 2019-11-19 08:02:36 +01:00
Jacob Støren
6c0c5803da #5058 Use two decimals in vector positions in Well Paths 2019-11-18 09:51:51 +01:00
Jacob Støren
9f6d6f693e #5050 Improve Insert Well Target command 2019-11-18 09:51:51 +01:00
Magne Sjaastad
40f95f349c #5053 Ensemble RFT : Avoid selection of large number of time steps 2019-11-15 13:11:19 +01:00
Jacob Støren
de6dab7d2e
Merge pull request #5046 from OPM/bugfixes-wellpath-modelling 
Bugfixes wellpath modeling
 2019-11-15 09:16:02 +01:00
Jacob Støren
f6675b7c45 #4789, #5045 Made wellpath calculator control dogleg editability 
Making them correct.
Doglegs with an actual value less than the user provided value  are colored green.
Removed the text stating that the constraint is not met.
 2019-11-14 17:23:52 +01:00
Magne Sjaastad
3455b305e0 Revert "#5031 Summary Data : Make sure the reader is created in constructor" 
This reverts commit 2b8219a855.
 2019-11-14 15:18:03 +01:00
Jacob Støren
e82f6a5ab7 #5030, #5035 Fix missing update of intersection boundingboxes. 
Regression introduced by 3c3c207bbc
Which removes (mostly) unneccessary recursiveBBox updates when inserting static models in viewer
The commit might expose other bugs as well.
 2019-11-14 14:00:54 +01:00
Gaute Lindkvist
aa40816f49 #5026 Fix summary plot closing crash 2019-11-13 14:41:17 +01:00
Kristian Bendiksen
f8468dc7a6
Merge pull request #5009 from OPM/feature-replace-summary-case 
Replace binary eclipse case and summary case feature.

Closes #4499 and #4987.
 2019-11-13 13:29:40 +01:00
Kristian Bendiksen
b09103e596 #4987 Add feature to replace grid case. 2019-11-13 11:42:21 +01:00
Kristian Bendiksen
544c160510 #4499 Add feature to replace summary case. 2019-11-13 11:42:21 +01:00
Magne Sjaastad
57f6ee0660 #5033 Ensemble RFT : Auto select first date if no date is matching 2019-11-13 11:12:51 +01:00
Magne Sjaastad
280f8c1d45 #5031 Summary Data : Only use openMP on open of summary file 2019-11-12 18:26:47 +01:00
Magne Sjaastad
2b8219a855 #5031 Summary Data : Make sure the reader is created in constructor 2019-11-12 18:25:38 +01:00
Magne Sjaastad
8157790068 #5022 Performance Summary : Use openmp when loading metadata for cases 2019-11-11 12:35:27 +01:00
Magne Sjaastad
aa11e3601b #5020 Flow Diag : Avoid creating plots in constructor to make pytest work 2019-11-11 09:47:01 +01:00
Magne Sjaastad
cb89823474 #5020 Flow Diag : Improve default initialization of plots 2019-11-08 14:20:11 +01:00
Jacob Støren
19fe1fcd1b
Merge pull request #5017 from OPM/feature-adjust-comparison-overlay-items 
Feature adjust comparison overlay items
 2019-11-08 11:24:09 +01:00
Jacob Støren
e78b0d4204 #4994 Make ComparisonView mode for InfoBox and animation progress 2019-11-08 10:40:37 +01:00
Jacob Støren
a9dc07ddc9 #4995 Place legends from comparison view to the right. 
Adjust the axiscross to follow the legends
 2019-11-08 10:40:37 +01:00
Gaute Lindkvist
3d6b53841d #5010 Attempt to read formation file even if it isn't called .lyr 2019-11-07 14:33:54 +01:00
Gaute Lindkvist
c5bca4cc7e Hide RimViewWindow::m_viewId so it doesn't show up in property editors 2019-11-07 12:50:17 +01:00
Magne Sjaastad
c7e97b4447
Merge pull request #5008 from OPM/avoid-virtual-method-constructors 
Avoid virtual calls in constructor and desctructors
 2019-11-07 09:46:36 +01:00
Magne Sjaastad
70d220ae19 Janitor : Remove unused variable 2019-11-07 09:44:50 +01:00
Magne Sjaastad
a413f672ec #5007 Janitor : Do not call virtual methods from destructors 2019-11-07 08:48:11 +01:00
Magne Sjaastad
0caaaf7159 clang-format : Fixes related to bug in clang-format plugin 
The LLVM/clang plugin to visual studio has a bug related to single space formatting changes. This commit fixes invalid formatting related to these issues.
 2019-11-07 07:37:50 +01:00
Jacob Støren
6bd07aa8ee #650 Removed the ugly nan legend displayed while loading things 2019-11-06 18:01:55 +01:00
Jacob Støren
55470cc1cd #5004 Remove comparison view option from 2dIntersection view 2019-11-06 18:01:55 +01:00
Magne Sjaastad
9f320c1dda
Merge pull request #5000 from OPM/move-3d-settings-to-system-tab 
Move 3d settings to system tab
 2019-11-06 12:45:34 +01:00
Magne Sjaastad
25d2ee0e27
Merge pull request #4989 from OPM/import-ascii-data-to-simulation-case 
Import ascii data to simulation case
 2019-11-06 11:35:35 +01:00
Magne Sjaastad
0b3e5ecf0c #4982 Preferences : Move Show 3D information to development tab 2019-11-06 11:22:03 +01:00
Magne Sjaastad
28c77d4b67 #82 Import Ascii-data : Minor code adjustments 2019-11-06 10:54:42 +01:00
Magne Sjaastad
791de201b3 #82 Import Ascii-data : Add icon and move item in context menu 2019-11-06 09:38:32 +01:00
Gaute Lindkvist
3203881418 More improvements to column/rowspan system 2019-11-06 08:24:57 +01:00
Magne Sjaastad
16536cfde7 Fix missing return statement 2019-11-05 15:47:32 +01:00
Gaute Lindkvist
b227ef7bdb #4992 Rename combination plots to plot report 2019-11-05 15:34:36 +01:00
Gaute Lindkvist
c1dfe193d7 #4990 Column and row span 2019-11-05 15:34:36 +01:00
Kristian Bendiksen
470fab787d Hide InputPropertyCollection until it has some items. 2019-11-05 12:23:26 +01:00
Kristian Bendiksen
22a5a1fe0f #82 Import ascii grdecl input properties into simulation case. 
This allows data from text files to be imported into a binary Eclipse case
imported based on *.EGRID.
 2019-11-05 12:23:26 +01:00
Kristian Bendiksen
357b07506f Move RimEclipseInputPropertyCollection to make it available in RimEclipseResultCase. 
Ref #82.
 2019-11-05 12:21:29 +01:00
Kristian Bendiksen
ce15aa1b5e Extract utility for loading input properties from file. 2019-11-05 12:21:29 +01:00
Gaute Lindkvist
03ff43237d Add a view id tag to project tree and tooltip 
* Remove it from property editor
 2019-11-05 11:09:18 +01:00
Kristian Bendiksen
7d817d0277
Merge pull request #4967 from OPM/improve-export-filedialog-behaviour 
Improve export filedialog behaviour
 2019-11-05 10:39:50 +01:00
Magne Sjaastad
57cab2457e clang-format : Set PenaltyBreakAssignment to 130 2019-11-04 15:08:09 +01:00
Magne Sjaastad
7c8cf60dba clang-format : Set AllowAllParametersOfDeclarationOnNextLine to false 2019-11-04 14:35:41 +01:00
Magne Sjaastad
96a26662fc Janitor : Apply clang-format fixes on codebase in ApplicationCode 2019-11-04 11:34:34 +01:00
Magne Sjaastad
e8cdf1a8ef Janitor : Remove boolean function always returning true 2019-11-04 10:16:29 +01:00
Magne Sjaastad
9ae07c838a #4919 Summary Plot : Improve colors of history curve symbols 2019-11-04 10:15:57 +01:00
Jacob Støren
5044784201
Merge pull request #4968 from OPM/feaure-fix-point-picking-in-comparison-view 
Fixes several issues from #4857
#4956 Fix List editor background setting
#4880 Fix annotations missing in comparison view
 2019-11-04 09:44:56 +01:00
Jacob Støren
52177994bd Improve readability of 3dView measurement in comparison view fix 2019-11-04 09:09:03 +01:00
Magne Sjaastad
a950852559 #4972 Summary : Add placeholder text to combo box editor 2019-11-03 14:49:08 +01:00
Magne Sjaastad
93f6bc8c72 Janitor : Remove invalid conditionals 2019-11-03 11:43:46 +01:00
Magne Sjaastad
67e7bb0cf3
Fixes detected by cppcheck (#4974) 
* Janitor : Remove obsolete pointer to dialog

* Janitor : Remove unused functions

* Janitor : Remove unused functions

* Janitor : Add explicit to constructors

* Janitor : Remove unused variables

* Janitor : Remove unused functions related to summary plot templates

* clang-tidy : Use nullptr instead of 0

* clang-tidy : Fix usage of virtual and override

* Upped to version 2019.08.2-dev.05

* Janitor : Remove unused variables

* Janitor : Clean up several cppcheck issues

* Janitor : Add cppcheck config files

* Janitor : Use const when possible
 2019-11-03 08:37:03 +01:00
Jacob Støren
6220225cfa #4970 Fix measurement text not visible in comparison view 2019-11-01 16:42:42 +01:00
Jacob Støren
f7fb4caa69 #4880 Fix annotations missing in comparison view 2019-11-01 15:57:04 +01:00
Jacob Støren
8bdb05447c Reordered Rim3dView.h 2019-11-01 15:57:04 +01:00
Jacob Støren
e85cd1b456 #4880 Further renaming of methods in Rim3dView 2019-11-01 15:57:04 +01:00
Jacob Støren
c9af22cf91 #4880 Refactoring in Rim3dView: De-virtualize updateCurrentTimeStepAndRedraw 2019-11-01 15:57:04 +01:00
Jacob Støren
b51e054ffd Renaming of more methods in Rim3dView. 
Removed virtual method from RiuViewerToViewInterface as it was not used from the interface.
 2019-11-01 15:57:03 +01:00
Jacob Støren
7f3f6419ac Rename virtual methods in Rim3dView 
To make it more clear that they are virtual methods to be distinguished from implementations in the base class. Also make their meaning somewhat more expressed.
 2019-11-01 15:57:03 +01:00
Jacob Støren
1ef4d49f14 #4857 Fix Intersection Box 3d manipulator interaction in comparison views 2019-11-01 15:57:03 +01:00
Kristian Bendiksen
60ac760254 Add txt suffix file pattern to make windows dialog behave better on windows. 2019-11-01 15:07:08 +01:00
Gaute Lindkvist
5f72c03d52 Fix warning in RImSummaryCurvesCalculator 2019-10-31 15:37:30 +01:00
Gaute Lindkvist
e8c745d704 Implement creation of combination plots from selected plots 2019-10-31 15:12:54 +01:00
Gaute Lindkvist
30db19a1d0 Create Grid plot collection and allow creation of new combination plots 2019-10-31 14:09:50 +01:00
Magne Sjaastad
1d88f4d48a Guard null pointer access 2019-10-31 09:38:44 +01:00
Magne Sjaastad
45cc94abd2 Janitor : apply clang-format 2019-10-31 09:35:48 +01:00
Magne Sjaastad
856580699c
Merge pull request #4955 from OPM/summary-adjustments 
Summary adjustments
 2019-10-30 14:40:20 +01:00
Gaute Lindkvist
a925c0f29e Partial revert of 38e0b150 2019-10-30 12:54:51 +01:00
Gaute Lindkvist
38e0b150ac Allow deleting of the last sub plot and have nice visible drop targets 2019-10-30 11:56:22 +01:00
Gaute Lindkvist
089ca3d39d #4931 Add available diameters to casing design and split casing and liner. 2019-10-30 11:53:02 +01:00
Gaute Lindkvist
f741c878db Update depth axis grid when changing grid line setting 2019-10-30 11:53:02 +01:00
Magne Sjaastad
e4fd536d21
Merge pull request #4950 from OPM/summary-curve-filter-recently-used-to-registry 
Summary curve filter recently used
 2019-10-30 11:12:59 +01:00
Magne Sjaastad
d6b7aa301c #4951 Summary Plot Template : Hide template collection in project tree 2019-10-30 10:48:23 +01:00
Magne Sjaastad
2dfa6b9d9f #4951 Summary Plot Template : Remove obsolete template pointer 2019-10-30 10:45:15 +01:00
Jacob Støren
f7f3e72700 Fix crash when closing project due to virtual call inside destructor. 
isScaleZEditable called inside destructor of Rim3dView when the deleted view is the active view
 2019-10-30 09:26:41 +01:00
Magne Sjaastad
bcb4150ae4 #4951 Summary Plot Template : Hide context menu to select template 2019-10-30 09:26:41 +01:00
Magne Sjaastad
18c52b0e18 Janitor : Avoid using .. when referencing include files 2019-10-30 09:12:13 +01:00
Magne Sjaastad
facfd062dc #4949 Summary Curve Filter Toolbar : Store recently used strings to registry 2019-10-29 14:17:24 +01:00
Magne Sjaastad
ba89a60e8d #4946 Ensemble Colors : Show color control in curve filter property editor 2019-10-29 13:40:57 +01:00
Jacob Støren
1774d123cc #4892 Simplified Unlink View command. Works on pprimary view as well. 2019-10-29 12:48:38 +01:00
Jacob Støren
b2f8c56a0d Fixed crash on project close introduced by update of MDI window title with Primary/Controlled 2019-10-29 12:47:01 +01:00
Jacob Støren
b729ce7228 #4892 Add (Primary) and (Controlled) labels to view window titles 2019-10-29 12:47:01 +01:00
Jacob Støren
3710b4ba58 #4892 Avoid comparison view accidentally added when linking views 2019-10-29 12:47:01 +01:00
Jacob Støren
d5a39ab3aa #4892 Improved names and added improved icons to linked views commands 2019-10-29 12:47:01 +01:00
Jacob Støren
6af4356f36 #4892 Add Comparison view drop-down to linked view master. 
Works as shadow of the views comparison view setting.
Make it follow the dependent viewcontrollers managed view.
Comparison view dropdown moved to "Viewer" group in view panel.
Avoid infinite recursion loops when comparison views are set up in circle
 2019-10-29 12:47:01 +01:00
Jacob Støren
27d65af027 Fix crashes when scene in one view is empty 2019-10-29 12:47:01 +01:00
Jacob Støren
c76699cdb8
Merge pull request #4943 from OPM/feature-picking-in-comparison-view-fixes 
Picking in comparison view fixes
 2019-10-29 12:41:14 +01:00
Kristian Bendiksen
2c3b51ad3f #4857 Fix measurement picking in comparison view. 2019-10-29 10:52:04 +01:00
Magne Sjaastad
1bf8341ba7 #4944 Ensemble RFT : Add missing initialization 2019-10-29 09:29:15 +01:00
Kristian Bendiksen
6e43fee396 #4857 Fix RicNewWellPathIntersectionFeature picking. 
Also avoid confusing active view change.
 2019-10-29 09:01:11 +01:00
Magne Sjaastad
23e8db65c2 Merge remote-tracking branch 'origin/dev' into summary-text-edit-in-toolbar 2019-10-28 20:49:29 +01:00
Magne Sjaastad
0af6a1d95d #4775 Summary : Use combo box with history to edit text based curve creation 2019-10-28 20:41:15 +01:00
Gaute Lindkvist
625feaf36c #4929 Fix legend fonts in Summary plot 2019-10-28 13:16:00 +01:00
Gaute Lindkvist
4bce02c375 Add simple fix for Grid Cross plot as well 
* TODO:  make sure the methods in RimSummaryPlot and RimGridCrossPlot are called when using the generic virtual method in RimPlotInterface.
* This requires a bit of thought, since they have parameters which the generic version does not have
 2019-10-28 10:18:24 +01:00
Gaute Lindkvist
c200ea0687 Fix asciiDataForPlotExport compile warnings 2019-10-28 10:18:24 +01:00
Gaute Lindkvist
edead9e3af Made RiuQwtPlotWidget axis operations much more general 2019-10-28 10:18:03 +01:00
Gaute Lindkvist
0e9cda8e84 Fix update of fonts in summary and grid cross plot axes 2019-10-28 10:18:03 +01:00
Magne Sjaastad
72e3ddc35e #4934 Preferences : More robust storing of data to registry 2019-10-25 15:55:27 +02:00
Magne Sjaastad
2f3fcf7eec
Merge pull request #4932 from OPM/summary-adjustments 
Summary Adjustments
 2019-10-25 15:17:40 +02:00
Magne Sjaastad
6110748192 #4926 Summary Plot : Add push button to edit plot 2019-10-25 13:53:51 +02:00
Magne Sjaastad
cea853b94f #4926 Summary Templates : Improve placeholder text 2019-10-25 13:33:27 +02:00
Magne Sjaastad
0657155d86 #4926 Summary Templates : Move curve text edit group to top, collapse others 2019-10-25 13:29:32 +02:00
Gaute Lindkvist
785f039a1d #4925 Add guard on view missing after d8a8a615 to RImViewLinker::findNameAndIconFromView 2019-10-25 11:48:51 +02:00
Magne Sjaastad
76d196a91a
Merge pull request #4902 from OPM/summary-text-edit-in-toolbar 
Summary text editor in toolbar
 2019-10-24 21:44:33 +02:00
Gaute Lindkvist
6687b6ad94 Fix delete of tracks by adding virtual plot interface destructor 2019-10-24 14:59:16 +02:00
Gaute Lindkvist
b343aa1ae9 Fix update of track names following DnD 2019-10-24 14:59:16 +02:00
Magne Sjaastad
f68eb93ac6 #4851 Ensemble RFT : Make sure colors are created correctly 
Lindkvist: Fixed commit to work with new Grid Plot code
 2019-10-24 14:59:16 +02:00