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
15,416 Commits 27 Branches 61 Tags 309 MiB
95e9ef8bf1
Commit Graph

687 Commits

Author SHA1 Message Date
Kristian Bendiksen
144138904d Avoid index-based iterator. 2022-05-09 15:36:27 +02:00
Kristian Bendiksen
b761bb42af Grid Calculator: Fix view updates when calculation is changed or removed. 2022-05-09 15:36:27 +02:00
Kristian Bendiksen
fdefb214d8 Grid Calculator: Minor tweaks to UI. 2022-05-09 15:36:27 +02:00
Kristian Bendiksen
4304bbbc48 Grid Calculator: refactor summary curve calculator and add grid calculator. 2022-05-09 15:36:27 +02:00
Magne Sjaastad
74ace7ea44
Summary Multi Plot : Improve default behaviour (#8885) 
* Summary Multi Plot : Improve default behaviour

- Perform zoom when stepping to next item
- Set defaults for range aggregation and source stepping dimension based on content when creating a multi summary plot

* Plot Axis Appearance : Do not use bold for text configuration

* Improve how scale factor for legend values are computed

* Improve defaults for range aggregation and step dimension

* Reorder Capability : Get UI item before reordering is issued

Get UI item before reordering is issued, as this operation will invalidate the tree model
 2022-05-06 12:09:55 +02:00
Magne Sjaastad
74075cc9ab
Merge pull request #8888 from OPM/8887-fix-reorder-capability 
Fix reorder capability
 2022-05-06 10:52:08 +02:00
Magne Sjaastad
cc397efe3e Performance : Simplify use of update schedulers 
Extract code to RiaScheduler
Add PlotCollectionScheduler
 2022-05-05 14:15:45 +02:00
jonjenssen
296ddbde42
Merge pull request #8882 from OPM/append_curves 
Summary Multiplot: Source Stepping append curves with performance fixes
 2022-05-04 13:11:04 +02:00
Magne Sjaastad
bb6ca0848d #8859 Add drop target for calculation variables 2022-05-04 09:10:32 +02:00
Jon Jenssen
2c1ef661b0 Avoid regenerating viewer pages when just stepping curves in plots 2022-05-03 16:31:30 +02:00
jonjenssen
d3ce7a2096
Add support for all summary data types in data sources tree (#8873) 
* Add support for all summary data types in data sources tree
* Use item icons for folders.
 2022-05-03 16:29:55 +02:00
jonjenssen
3de8010c2b
Source stepping and toolbar updates (#8866) 
* Move layout options to separate toolbar
* Enable stepping on quantities, remove special history curve stepping for now
* Allow stepping ensembles and cases
* Add step next/prev and add new sub plot
 2022-05-03 11:30:09 +02:00
Magne Sjaastad
46173af8c3
Merge pull request #8865 from OPM/8863-summary-issues 2022-05-03 08:51:26 +02:00
Magne Sjaastad
64bed1d611
Summary Multi Plot: Minor adjustments (#8856) 
Remove obsolete single summary template code
Always use maximized state of the QMdiSubWindow when a plot or view is deleted.
Move time axis to top
Set correct text for unused axis
Avoid assert when layout is requested for non existing legend
 2022-04-29 15:31:07 +02:00
Magne Sjaastad
f54399960d
Improve drag and drop features and right click commands (#8854) 2022-04-29 12:28:09 +02:00
Magne Sjaastad
172f891be9
Remove obsolete template commands (#8851) 
* Remove obsolete template commands

Use first object in object list when creating plots for templates and a case is selected. (use first well in well list, first group in group list, ...)

* Always create the reference string
 2022-04-28 18:28:24 +02:00
Magne Sjaastad
b030e617c6 #8849 Data Sources : Add append curves to plot based on selection 2022-04-28 12:20:15 +02:00
jonjenssen
5d9f7b165c
More summary data types in data source tree (#8840) 
* Add support for block data in data sources tree
* Add option to show summary data sub-tree for single realizations inside an ensemble
 2022-04-27 01:51:55 +02:00
Magne Sjaastad
774538868a #8844 Summary Multi Plot : Optional auto appearance settings 2022-04-26 15:05:00 +02:00
Magne Sjaastad
73d598ee7e Fix crash during delete of multiplot 2022-04-26 15:05:00 +02:00
Magne Sjaastad
386ba1cbac Use plot axis as key to compute range values from sub plots 2022-04-26 15:05:00 +02:00
Magne Sjaastad
cb8b18222e #8827 Avoid UI updates during delete of a sub plot 2022-04-26 13:01:31 +02:00
jonjenssen
0f5d949af0
Merge pull request #8838 from OPM/datasource_steppingtoolbar 
Add simplified data source stepping control in toolbar
 2022-04-26 12:08:22 +02:00
Magne Sjaastad
853b4a26d5 #8822 Summary Axis: Add tick mark count to y-axis 2022-04-22 23:14:48 +02:00
Kristian Bendiksen
73f5c793e8
Merge pull request #8828 from OPM/summary-axis-cleanup 
Combine Link axis range with axis range aggregation. Zoom All will now respect the different axis range aggregation method.
 2022-04-22 22:16:36 +02:00
Magne Sjaastad
1840a95810 Preferences: Move colorCurvesByPhase and hide Qt Charts settings 2022-04-22 08:08:06 +02:00
Jon Jenssen
5457c96a63 Remove obsolete open editor command 2022-04-21 17:28:50 +02:00
Magne Sjaastad
caaca138c0
Curve Colors : Add support for color assignment based on summary phase (oil, gas or water) 2022-04-20 14:29:40 +02:00
Magne Sjaastad
87b822a80f
Curve Style : Add support for curve fitting for non-solid line styles 2022-04-20 14:25:47 +02:00
Kristian Bendiksen
3a461473d0 #8767 Multi Plot: Add support for computing range for a summary curve across all realization, regions or wells. 2022-04-20 14:00:21 +02:00
jonjenssen
db3395da44
Fix Summary Multiplot subplot colspan issue (#8805) 
Fix colspan bug for summary multiplots
 2022-04-19 12:34:40 +02:00
Magne Sjaastad
a6eda226f4 #8813 Regression Test : Fix crash in regression tests 2022-04-19 09:52:34 +02:00
Magne Sjaastad
30aaadb58c #8798 Summary Curve Selection : Always show ensemble realizations cases 2022-04-08 13:22:42 +02:00
Magne Sjaastad
8cdef0d861 #8782 Summary Plot: drag'n'drop data vector issue 
Duplicate only matching vectors
More rename for Group
 2022-04-08 13:22:29 +02:00
Magne Sjaastad
93614ef272
Merge pull request #8791 from OPM/8790-rename-to-group 
Rename summary references to "Group"
 2022-04-07 21:06:40 +02:00
Magne Sjaastad
f099a8c89f #8779 Summary Multi Plot : Add flag to control visibility of axis number values 
Useful for making plots anonymized
 2022-04-07 17:49:07 +02:00
Magne Sjaastad
a0507c85f4 #8779 Summary Multi Plot : Sync time axis properties across sub plots 2022-04-07 17:49:07 +02:00
Magne Sjaastad
6ecb1a8ea0 #8779 Summary Multi Plot : Rearrange property editor 
Compute common range for all sub plots when activating sync of sub plot axes
 2022-04-07 17:49:07 +02:00
jonjenssen
d156160daf
Summary Multiplot: sync plot selection in tree with view (#8788) 
* Make sure the subplot selected in the tree is shown in the multiplot viewer. 
* Clean up multiplot toolbar handling a bit
* Remove old summary plot toolbar.
 2022-04-07 16:24:27 +02:00
jonjenssen
3590c52cdc
Deprecate single summary plots and plot collections. (#8777) 
* Deprecate single summary plots and plot collections. Replace functionality using summary multi plots. Clean up some code. Fix crash when trying to normalize an empty curve
 2022-04-06 17:39:07 +02:00
Magne Sjaastad
9bbc709157 #8773 Source Stepping : Show data source stepping on summary multiplot 2022-04-06 10:05:43 +02:00
Magne Sjaastad
6417daf167 #8773 Source Stepping : Realization cases are missing in some cases 2022-04-06 10:05:43 +02:00
Magne Sjaastad
22673c1073 Summary Multiplot: Add icon and update text 
minor adjustments
 2022-04-06 10:05:43 +02:00
Kristian Bendiksen
1407c6f96f RimPlotAxisProperties: reset "always required" bool on reload. 2022-04-06 09:03:53 +02:00
Kristian Bendiksen
449b4e4781 RimPlotAxisProperties: only allow plot axis positions left and right. 2022-04-06 09:03:53 +02:00
Kristian Bendiksen
45d28de6d3 #8768 Multi Plot: Add option to sync all sub plots axis properties. 2022-04-06 09:03:53 +02:00
Magne Sjaastad
ca61e9f9a8 Multi Axis: Make sure widget axis is created during assignment of plot axis 2022-04-04 14:44:29 +02:00
Kristian Bendiksen
11060078d8 RiuQwtPlotWidget: fix actions on selection of axis. 2022-04-04 12:10:20 +02:00
Kristian Bendiksen
288269fad7 Multiaxis: Use correct mapping from PlotAxis to QwtAxisId. 2022-04-04 12:10:20 +02:00
Kristian Bendiksen
395541ebe0 Summary Plot: Make the general plot options expanded by default. 2022-04-04 12:10:20 +02:00
Kristian Bendiksen
32ec472829 Multiaxis plot: fix moving axis from other side 2022-04-04 12:10:20 +02:00
Magne Sjaastad
dde0487024 Multiaxis: add support for Qwt multiaxis plot 2022-04-04 12:10:20 +02:00
jonjenssen
22d6e3f853
Merge pull request #8765 from OPM/summarymultiplot_performance2 
Summary Multiplot performance improvements and fixes
 2022-04-01 19:23:27 +02:00
Magne Sjaastad
46a8bd58b2
#8761 Multiplot template support 2022-04-01 12:04:46 +00:00
Magne Sjaastad
b822996fc3 FIx regression blocking drag and drop of well names into existing plots 2022-03-31 14:43:56 +02:00
Magne Sjaastad
15f17234c8 #8747 MultiPlot : Duplicate and append plots for selected objects 2022-03-31 14:04:33 +02:00
jonjenssen
28dcd47d73 Hide summary multiplot tree node if only one summary plot 2022-03-31 13:03:03 +02:00
Jon Jenssen
2eb1713866 Fix mouse wheel not working in 3D view if a plot window is created. 
Fix issue with multiplot sometimes being shown incorrectly when switching between fullscreen plots
 2022-03-30 16:19:16 +02:00
Magne Sjaastad
9c987855f2 Merge remote-tracking branch 'origin/patch_2021.10.3' into dev 2022-03-28 09:06:38 +02:00
Magne Sjaastad
7c4e81f59f Adaption of #8356 Summary Data : Add support for use of summary summary data from Python 2022-03-28 08:46:10 +02:00
Magne Sjaastad
ef842e7f27 #8416 VFP Plot : Support import of all units (Field, PVT, ..) 2022-03-28 08:46:10 +02:00
Magne Sjaastad
c48451a532 Summary Import : Support cases with one file per time step (#8493) 2022-03-28 08:46:10 +02:00
Magne Sjaastad
cf4d2c9ad2 Janitor : Support import of stand alone ESMRY files 
All import of summary data was previously started from a SMSPEC file. As the ESMRY file is completely independent, it is useful to import these files directly.
 2022-03-28 08:46:10 +02:00
Magne Sjaastad
f028491bb9 #8409 NNC : Make sure user defined legend ranges work 2022-03-28 08:46:10 +02:00
Magne Sjaastad
e09a839228 Merge pull request #8402 from OPM/8401-flow-vector-result 
Use OpenMP for vector calculations

Janitor: Use field of double instead of float to avoid rounding errors. If float is used in field, the current editor is has rounding effects that makes the text representation of 0.1 turn into 0.09999999....
 2022-03-28 08:46:10 +02:00
Magne Sjaastad
869921d300 #8375 Flow Vectors : Avoid recomputing NNCs when accessing flow data 
Avoid include of RigNNCData.h in header files.
 2022-03-28 08:46:10 +02:00
Magne Sjaastad
985a2c8f30 Merge pull request #8376 from OPM/fault_visibilityupdates 
Faults: Add Visibiliy mode for overlapping area
 2022-03-28 08:46:10 +02:00
jonjenssen
19dc7493a8 Change ouput model name 2022-03-28 08:46:10 +02:00
jonjenssen
abd4e80b48 Add well angles in degrees, not radians. 2022-03-28 08:46:10 +02:00
jonjenssen
f41c772f03 Show plot curves at the first level below a summary plot. 2022-03-25 20:02:23 +01:00
jonjenssen
8d3f41ded8
Merge pull request #8732 from OPM/summarymultiplot_updates2 
Summary Multiplot updates
 2022-03-25 11:39:12 +01:00
Kristian Bendiksen
80234ca105
#8644: Avoid overwriting preferences for date and time axis format (#8725) 
Co-authored-by: kriben <kriben@users.noreply.github.com>
 2022-03-24 11:57:05 +01:00
Magne Sjaastad
696c6a15fa #8676 QtChart : Create curve legend widget for multiplot 2022-03-23 14:28:56 +01:00
Kristian Bendiksen
d4d79d3dec #8623 Contour Map: exclude surfaces from appearing 
Fixes #8623.
 2022-03-23 13:37:38 +01:00
Magne Sjaastad
f45637b7f0
#8715 Fix multi summary title and legend updates 2022-03-23 13:35:47 +01:00
Kristian Bendiksen
c00aea75fb #8662 QtCharts: Implement tooltip when hovering over curves 2022-03-21 14:56:23 +01:00
Kristian Bendiksen
c87d68899e #8635 Improve well head position on extreme grids. 
Fixed by introducing max characteristic cell size for extreme grids.

Fixes #8635.
 2022-03-21 14:29:45 +01:00
kriben
f27a5b4e9e Fixes by clang-format 2022-03-21 14:23:14 +01:00
Kristian Bendiksen
ca769a53d4 #8649 Contour Map: Show static data for all time steps. 2022-03-21 14:23:14 +01:00
Jon Jenssen
560917a481 Rename NewSummaryPlot command to what it actually is - OpenSummaryPlotEditor command. Remove unused includes. 
Move Single Summary Plots to bottom of tree and show them as Single Summary Plots.
 2022-03-21 13:05:57 +01:00
jonjenssen
e20adcdb69
Further Summary Multiplot improvements (#8707) 
* Create a specialized summary plot page for showing multi plots
* Make summary plots always show in grid of selected size.
* Allow dragging summary addresses into empty main window area
* Limit grid to 4x4 cells
 2022-03-21 11:31:25 +01:00
Magne Sjaastad
8d3f381b4f
Janitor: Update qwt to 6.2.0 2022-03-18 13:16:07 +01:00
jonjenssen
ffc84457c6
Summary Multiplot: add button to create plot copy (#8698) 
* Add button to create a duplicate of the active summary multiplot
* Block dropping other things than RimSummaryAddress objects in empty areas
 2022-03-16 14:14:14 +01:00
jonjenssen
75a3d3d8f1
Summary Multiplot: drag/drop updates (#8692) 
Drag'n'drop improvements - accept drops in empty multiplot areas to create new plots
 2022-03-15 15:57:15 +01:00
Kristian Bendiksen
20ec6e20f2 Summary Plot: fix axis logic for left axis 2022-03-14 15:48:24 +01:00
Magne Sjaastad
0ca70249ae
Move defines to RiaDateTimeDefines 2022-03-14 09:18:48 +01:00
Magne Sjaastad
e435e28e7d #8660 Axis range: If water cut is assigned, use 0..1 as axis value range 2022-03-14 08:24:49 +01:00
Magne Sjaastad
806a149809
Fix several deprecation warnings (#8657) 
* Use constructor instead of nullptr for WindowFlags
* Use constructor instead of nullptr for Alignment
* Disable deprecation warning for QProcess
* Add string split method to RaTextStringTools
* Add caf.cpp used to manage Qt function deprecations
* Use position()
 2022-03-11 13:24:01 +01:00
Kristian Bendiksen
72fc47e003 #8452 QtCharts: Add fill color and pattern 2022-03-11 13:15:20 +01:00
Magne Sjaastad
0bab8a9834
Fix update issues when switching from axis side (#8664) 
* #8610 Ensemble import : Set default axis
* Summary Axis : Delete previous axis when switching side
* Janitor: Use auto and empty()
 2022-03-11 13:11:24 +01:00
Magne Sjaastad
262aed3c8d #8663 QtCharts: Update labels when date format changes 2022-03-11 11:39:51 +01:00
Magne Sjaastad
721ba508de Axis sync: Reset zoom to make sure the complete range for min/max is available 2022-03-11 08:41:53 +01:00
jonjenssen
c9b762fb16
Merge pull request #8654 from OPM/filter_wheelevents 
Summary Multiplot: page scroll and zoom fixes
 2022-03-10 13:13:44 +01:00
Jon Jenssen
cdbeec7ff8 Remove unused include 2022-03-09 11:29:03 +01:00
Jon Jenssen
d7555cbf4c Add support for giving all axes with the same label the same range. 2022-03-09 11:29:03 +01:00
Magne Sjaastad
728885a6c8 Janitor : Fix invalid rename introduce by horizontal/vertical depth log plots 
Fix deprecated
 2022-03-09 08:33:56 +01:00
Magne Sjaastad
6700c21086 Janitor : Use RimWellLogTrack in RimDepthTrackPlot 2022-03-09 08:33:56 +01:00
Jon Jenssen
85d3f98f91 Allow drag'n'drop of realizations into summary plots 
Improve "Create Summary Case Group" feature to not delete selected realizations from the source collection.
 2022-03-08 07:55:39 +01:00
Kristian Bendiksen
93f754102d #8615 Qt Charts: fix use-after-free crash. 
Fixes #8615.
 2022-03-04 18:11:10 +01:00
Kristian Bendiksen
7a954804ef #8451 Qt Charts: show fewer curve symbols. 
The "Symbol Skip Distance" is used to space the symbols.

Fixes #8451.
 2022-03-04 18:11:10 +01:00