Commit Graph

308 Commits

Author SHA1 Message Date
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
ceecf2e54c #8611 QtChart : Improve time axis grid intervals
Use QCatetoryAxis to display date labels
Use Qwt label formatting and scale dividing tools to produce text labels
2022-03-11 10:35:08 +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
Magne Sjaastad
728885a6c8 Janitor : Fix invalid rename introduce by horizontal/vertical depth log plots
Fix deprecated
2022-03-09 08:33:56 +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
Jon Jenssen
2e9c6e7a64 Allow dragging and dropping ensemble data vectors into summary plots 2022-03-04 17:06:28 +01:00
jonjenssen
abff06d2d5
Summary multiplot improvements (#8598)
* Create multi summary plot from summary plot(s)
* Rearrange multi summary plot properties
* Enable source stepping toolbar for multi summary plot
* Automatically activate new summary plot when creating from data sources -> data vector tree
* Enable global key controls for switching data in summary and multi summary plots
* Update tooltip texts for summary plot toolbar
2022-03-04 10:52:17 +01:00
magnesj
a32dda2e65 Fixes by clang-tidy 2022-03-04 08:00:33 +01:00
Magne Sjaastad
0e57cfe201 Memory Management : Adjustment and fixes
Add release of several static singleton objects
Fix several minor memory leaks
2022-03-03 14:39:41 +01:00
magnesj
e1990afbae Fixes by clang-tidy 2022-02-27 07:58:00 +01:00
Magne Sjaastad
4693dc44ef Memory Management : Fixes related to plot objects and curves 2022-02-26 16:35:27 +01:00
Magne Sjaastad
d5b108d2ef QtChart : Avoid zoom on right mouse button release 2022-02-26 16:35:27 +01:00
Kristian Bendiksen
65e80ca03f QtCharts: Improve name: RitQtChartsPlot::setAxis -> attachSeriesToAxis 2022-02-23 21:54:40 +01:00
Kristian Bendiksen
10cb2d7d0b #8522 Summary Plot: Prune unused axes after move or delete 2022-02-23 21:54:40 +01:00
Kristian Bendiksen
bd22336ba8 #8522 Summary Plot: ensure plot axis are restore when creating plots. 2022-02-23 21:54:40 +01:00
Kristian Bendiksen
3180b419d0 #8522 Summary Plot: Add menu item to add plot axis. 2022-02-23 21:54:40 +01:00
Magne Sjaastad
f154f8c500
Import RFT segment data as well log curve (#8449)
Add reader for RFT data using opm-common
Extend RFT curve with support for RFT segment data
Adjustments related to horizontal well log plots

8581 Well Log Plot : Update of curve appearance does not update plot
2022-02-23 13:57:02 +01:00
Magne Sjaastad
4ed5250d3b
Support horizontally stacked curves (#8553)
* #8548 Horizontal track : Improve stacked curves
* Add horizontal track bar
* Show relevant scroll bar for horizontal and vertical plots
* Show max property value at top for horizontal plots
2022-02-21 07:15:56 +01:00
Kristian Bendiksen
4913677955
8549 qtcharts fix time axis (#8564)
* #8549 QtCharts: Fix time axis range setting
* #8549 QtCharts: Fix 'zoom all' behavior
2022-02-17 10:47:54 +01:00
jonjenssen
4a3d9470b4
Summary Plots: Support dragging wells, groups and regions into plots (#8550)
Support dropping wells, wellgroups and regions into summary plots.
2022-02-16 16:36:50 +01:00
Kristian Bendiksen
7fbff9d58b Qt Charts: Add more major grid lines. 2022-02-16 08:56:15 +01:00
Kristian Bendiksen
2bea99eb5f #8450 Qt Charts: generate nicer numbers when auto scaling. 2022-02-16 08:56:15 +01:00
Magne Sjaastad
477ae02382
Logarithmic curve support and renaming (#8546)
* Add test for both positive and negative numbers
* Remove redundant sample count from parameter list
* Propagate useLogarithmicScale
* Renaming
2022-02-14 11:49:37 +01:00
Magne Sjaastad
1488eec855 Rename to isLogCurve 2022-02-12 14:23:06 +01:00
Kristian Bendiksen
8253cfae2d #8531 QtCharts: Fix performance degradation on ensemble of curves.
The axes signals and slots were connected multiple time leading to a large
number of RiuQtChartsPlotWidget::plotZoomed() calls.
2022-02-11 21:06:03 +01:00
Kristian Bendiksen
654116c573 QtChartView: fix missing rubber bands zoom.
Mouse release event was also not properly handled.
2022-02-11 21:06:03 +01:00
Magne Sjaastad
6c92206893
Make curve drawing more robust (#8537)
* Janitor : Improve robustness

* Guard nullptr access

* Limit the curve points to incoming from/to curve point index range

Co-authored-by: magnesj <magnesj@users.noreply.github.com>
2022-02-11 13:18:36 +01:00
Kristian Bendiksen
6591de716b #8521 Summary Plot: Allow moving axis to other side of plot. 2022-02-11 10:31:01 +01:00
Magne Sjaastad
64bed86f8f
Intersection : Add Python support for triangle and result values (#8505)
#8508 Python : Make sure an empty list will be received as empty list in Python

Co-authored-by: magnesj <magnesj@users.noreply.github.com>
2022-02-07 17:38:19 +00:00
Kristian Bendiksen
e92e2e8764 Summary Plot: Add support for multiple plot axis. 2022-02-07 09:55:11 +01:00
jonjenssen
a3ad9d2c1e
Merge pull request #8524 from OPM/tree_filter
Add Project Tree filter support
2022-02-04 15:49:22 +01:00
jonjenssen
66fd79175c
Project Tree updates (#8490)
Split project tree into multiple dockable tree views for plots, keeping one for 3d views.
2022-01-28 13:19:52 +01:00
Magne Sjaastad
2d2bf0bbc7
CMake : Improve handling of compiler flags (#8486)
#8478 Code cleanup to fix some warnings

Several adjustments to improve the specification and usage of compile flags.
2022-01-26 10:08:28 +01:00
Magne Sjaastad
d5b17976ed
Merge pull request #8459 from OPM/8458-summary-drop-target
Closes #8458
2022-01-21 14:32:51 +01:00
Magne Sjaastad
5ff9f36448
Merge pull request #8461 from OPM/8460-plot-curve-fixes
Guard access to QtCharts objects that might be null
Fix visibility of items in legend based on state in parent plot
2022-01-20 12:52:36 +01:00
Kristian Bendiksen
258fbddc10
Merge pull request #8387 from OPM/qtcharts-summary-plots
Closes #8228 

Major refactoring of summary plotting. Now possible to create plots both with Qwt and QtChart as plotting tool.
2022-01-17 13:14:21 +01:00
jonjenssen
9d4b7422e8
Show summary data as tree structure in explorer. (#8430)
* Show summary data vectors in project explorer for both summary cases and ensembles.
* Enable Drag to be able to drag'n'drop data vector into future summary plot
* Make sure tree is refreshed on reload/replace operations
* Provide case id and ensemble id in drag/drop object in addition to address
2022-01-13 09:02:07 +01:00
Magne Sjaastad
457f9653a8 Janitor : Remove hard-coded height 2022-01-10 21:57:18 +01:00
Magne Sjaastad
e203c76099
#8425 Summary Multi Plots: Add grouping on wells, groups, ...
* #8425 Multi Graph : Support grouping on object name
* #8425 Multi Graph : Improve creation of new graphs
* #8425 Multi Graph : Improve default tick mark count
* Handle history and non history as identical headers
* #8425 Multi Graph : Increase space below a graph
2022-01-10 14:51:31 +01:00
Magne Sjaastad
fef0a2b70c Janitor : Remove obsolete includes in header files 2022-01-07 10:38:56 +01:00
Magne Sjaastad
dfd8b9986f Janitor: Make sure the default legend is configured for intersection results 2022-01-07 10:38:56 +01:00
Magne Sjaastad
1e17da2926 Janitor : Add SOIL SGAS SWAT to RiaResultNames
wip
2022-01-07 10:38:56 +01:00
Magne Sjaastad
9023b01cfa Janitor: Guard null pointer access 2022-01-06 15:49:20 +01:00
Magne Sjaastad
4d21f90bf9
Add summary multi plot
Improve robustness related to update of Summary Plot Manager

Add RimSummaryMultiPlot
Move shared code into RiaSummaryStringTools
Added "Create Summary Multi Plot" to menu of MultiPlot in project tree
2021-12-23 09:30:36 +01:00
Magne Sjaastad
891a2e7c29 #8375 Flow Vectors : Avoid recomputing NNCs when accessing flow data
Avoid include of RigNNCData.h in header files.
2021-12-20 10:23:52 +01:00
jonjenssen
43f298fa97
Merge pull request #8376 from OPM/fault_visibilityupdates
Faults: Add Visibiliy mode for overlapping area
2021-12-17 15:39:22 +01:00
Magne Sjaastad
34fb7d7e84 #8345 Summary Plot Manager : Several improvements
Add checkboxes for individual plots for vectors/addresses and creation of multiplots.
Moved code into RicSummaryPlotBuilder.
Allow UiComboBoxEditor to disable autocomplete.
Create plot using Enter key without modifiers.
2021-12-07 09:53:02 +01:00
Håkon Hægland
254e8a52a0 Add missing limits header in RiuGroupedBarChartBuilder.h
This fixes issue #8330
2021-11-29 11:33:31 +01:00
Kristian Bendiksen
2692578d9b #8284 Well Log Plot: Avoid depth shift due to long title
Fixes #8284.
2021-11-26 10:25:45 +01:00
Magne Sjaastad
6b7916be8a #8316 Summary vector names: Fix wrong category for several keywords 2021-11-25 20:47:12 +01:00
Magne Sjaastad
5fcb81980d #8310 Summary Plot Manager : Add data source filtering 2021-11-19 15:42:26 +01:00
Magne Sjaastad
640b7406ec #8292 Add docking widget used to manage summary plots 2021-11-17 16:26:47 +01:00
Magne Sjaastad
2a65636ba3 #8250 Use variadic macros and remove obsolete parameters 2021-11-14 15:26:09 +01:00
Magne Sjaastad
361bf4090a #8246 Summary Curves : Use icons for summary categories 2021-11-08 09:50:09 +01:00
jonjenssen
b169900c41
GeoMech Intersection updates: support multiple parts (#8160)
* Rearrange intersection classes, split single file into one-per-class

* Support multi-part geomech case intersections
2021-10-15 16:57:18 +02:00
Magne Sjaastad
54a4f35588 #8142 Preferences : Move system settings into separate file 2021-10-13 12:52:02 +02:00
Kristian Bendiksen
9f86bf15ed #8053 StimPlan Model Plot: Smaller font size for Facies log 2021-10-07 11:20:12 +02:00
Magne Sjaastad
f89cd51416 Performance : Use unordered_map
Use of unordered_map gives performance gain of 50% for lookup of addresses based on quantity name. Performance gain due to use of hash inside unordered_map.
2021-09-13 14:08:50 +02:00
jonjenssen
a5b80c649b
Merge pull request #7960 from OPM/geomech_WIA4
GeoMech: Well Integrity Analysis
2021-09-09 17:34:27 +02:00
Magne Sjaastad
638f926429
cmake-format: Allow dangling parenthesis 2021-09-01 08:13:16 +02:00
Magne Sjaastad
b78cf3a4bb
Use cmake-format on all cmake files 2021-08-26 19:46:38 +02:00
Magne Sjaastad
2fc65a3b62
#7892 Basic support for display of surface lines and bands on intersections
Guard divide by zero issues
2D Intersection View: Do not add parts with wrong coordinates
Add bounding box search tree
Add support display of intersection lines for selected surfaces
Show band between two first intersection lines
2021-08-26 08:13:03 +02:00
Magne Sjaastad
54dee08798 #7831 Janitor: Do not create QtChart features if compiled without QtChart 2021-06-30 14:50:28 +02:00
Kristian Bendiksen
f31aecf507 Refactor: extract EnsembleParameter into separate file. 2021-06-30 10:43:11 +02:00
Kristian Bendiksen
fb301ef3ab #7716 Add pdm object for Ensemble Well Logs 2021-06-30 10:43:11 +02:00
Magne Sjaastad
a3d5847733 #7824 Modeled Well Path : Optional support for linking of wells
#7824 Modeled Well Path : Add to context menu in 3D view
2021-06-29 19:04:27 +02:00
Magne Sjaastad
3a1f2c8a05 Janitor : Encapsulate dynamic cast to selection item type 2021-06-29 19:04:27 +02:00
jonjenssen
66b2b50a1d
Enable starting FaultRA processing from 3d view (#7801) 2021-06-18 16:51:05 +02:00
Magne Sjaastad
ea9e3f7a52 Janitor : Hide undo stack behind environmentvariable DEVEL
Move geomech tab after scripting
2021-06-10 14:04:55 +02:00
Magne Sjaastad
9f85975f2c Janitor : Improve icons and availability for new statistics 2021-06-10 09:33:22 +02:00
Magne Sjaastad
4de91e885b #7761 Objective Function : Change formula and add several options 2021-06-09 21:22:37 +02:00
Kristian Bendiksen
b2025fbeef #7667 Refactor: extract number format settings for reuse. 2021-05-29 10:00:27 +02:00
Magne Sjaastad
9d58769f89 Janitor : Avoid include of header file in header 2021-05-26 13:28:45 +02:00
jonjenssen
2e08f278ca
Surface: click on surface in 3d view to display value (#7702)
* Support showing result info for surfaces when clicking on them in the 3d view
2021-05-20 10:29:20 +02:00
Magne Sjaastad
f4c11e2ef2 #7049 Add toolbar button for export completions 2021-05-18 16:22:05 +02:00
Magne Sjaastad
282c6f3586 Remove obsolete code 2021-05-11 09:27:55 +02:00
Magne Sjaastad
1cf1eef048 #7632 Preferences : Add separate tab Eclipse Summary
Remove obsolete includes
2021-04-28 14:10:23 +02:00
magnesj
a44378e2f5 Fixes by clang-tidy 2021-04-15 08:00:07 +02:00
Magne Sjaastad
6421564b77 #7572 Preferences : Remove obsolete includes 2021-04-14 13:53:21 +02:00
Magne Sjaastad
63690d5196 Major rewrite of MSW export model 2021-04-13 07:54:34 +02:00
Magne Sjaastad
d082ce7eb1 #7527 Message Panel : Only update message panel if issued from GUI thread 2021-04-08 07:13:34 -07:00
Magne Sjaastad
fd8d38c4f0 #7519 Curve calculator: Assign unique ID after copy of calculation
Avoid duplicate entries in summary selection dialog
2021-03-26 12:05:52 +01:00
Kristian Bendiksen
45d641f348 #6222 Make cursor tracker readable in well log plot. 2021-03-19 22:00:18 +01:00
Magne Sjaastad
e1b71481ec #7481 Usability : Update plot when menu closes
Parts of progress dialog GUI can be present after menu has closed
2021-03-11 10:45:54 +01:00
Magne Sjaastad
f56b442e26 #7481 Usability : Include case name in menu item text 2021-03-11 10:33:43 +01:00
Magne Sjaastad
4099662cbc #7481 Usability : Open grid model from summary case and summary curve 2021-03-10 21:44:39 +01:00
jonjenssen
207f72c37e Move geomech commands into subfolder 2021-03-09 17:14:18 +01:00
Magne Sjaastad
8bab748fa6 Improve MSW export including multi lateral wells
Based on branch https://github.com/OPM/ResInsight/tree/system-msw-refactor

- Move completion settings to property of well path
- Rename to RimFishbones
- Export implicit COMPSEGS for fishbones main bore
- Add valve for each branch
- Increase version number to be able to handle import of legacy project files
2021-02-26 14:59:57 +01:00
Magne Sjaastad
7d5268987c Janitor : Add missing includes (GNU 8.3.0) 2021-02-22 18:06:18 +01:00
Magne Sjaastad
1caac72715 Janitor : Use std::clamp and remove obsolete includes of cvfMath 2021-02-22 13:37:05 +01:00
Magne Sjaastad
a86d0489ac #7380 Janitor : Use forward declare when possible 2021-02-17 22:28:21 +01:00
Magne Sjaastad
ff92f7b792 Janitor : Remove Multi Case Import dialog and features 2021-02-12 13:18:57 +01:00
Magne Sjaastad
a25e795a02 Divide by Area: Remove duplicate reports of "/A" 2021-02-11 10:37:17 +01:00
Magne Sjaastad
cc292b197a
Result Divided by Area: Establish concept used to compute flow velocity and normalized trans (#7349)
* Geometry Tools : Add convenience functions for polygon area

* #7232 Result Divided by Area: Add cell face result and show in GUI

Native support for flow rate is given by mass rate (mass per time) over a cell face. Add a derived result that takes flow rate divided by cell face area to get velocity (distance per time).

Add support for this concept on relevant native results, and indicate this result type in UI using a "/A" postfix

* Speed up divided-by-area calculations by using openmp

* Some refactoring of result data access.

* Make sure NNC data is scaled correctly in vector flow viz.

Co-authored-by: jonjenssen <jon@soundsoft.no>
2021-02-11 03:01:17 +01:00
Magne Sjaastad
6ebf3aaaca #7350 PVT curves : Use PVTNUM value to get PVT curve data 2021-02-10 15:19:38 +01:00
Magne Sjaastad
bcdba1bb8f #7347 Property Editor : Enable undo/redo of field changed operations 2021-02-10 15:08:35 +01:00
Magne Sjaastad
14c09f30cf #7342 Property Editor : Support multi-select of objects of same type 2021-02-10 15:08:35 +01:00
Magne Sjaastad
f14386314e #7335 Dual poro models : Hide rel perm plots when fracture result is active 2021-02-09 13:06:54 +01:00
Magne Sjaastad
4866794f2b #7289 Script : Add execute of last used script 2021-01-26 12:47:48 +01:00
rubenthoms
bc81437435
Moved UnitSystem from RiaEclipseUnitTools to RiaDefines. (#7225)
* Moved UnitSystem from RiaEclipseUnitTools to RiaDefines.
- Renamed UnitSystem to EclipseUnitSystem
- Replaced header includes and removed obsolete includes of RiaEclipseUnitTools.h
* Moved  result name functions into separate file.
* Minor cleanup

Co-authored-by: rubenthoms <rubenthoms@users.noreply.github.com>
Co-authored-by: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Co-authored-by: magnesj <magnesj@users.noreply.github.com>
2021-01-21 12:58:46 +01:00
Gaute Lindkvist
953e7bd18e #7236 Rewrite window closing in ResInsight 2021-01-20 10:58:06 +01:00
jonjenssen
96fc6cd358
Polygon filter updates (#7216)
* Rename polylinefilter to polygonfilter
* Update icon name, too
* Some GUI adjustments
* Remove obsolete code that came back in a merge somewhere.
Disable auto-enable polygon filter after picking corner points.
* Add option to delete a point in polygon filter point editor by extending generic picker interface
* Rename enum, too.
* Improved filter naming

Co-authored-by: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
2021-01-15 19:16:01 +01:00
Kristian Bendiksen
1f7cb2b973
7147 vfp show plot data (#7154)
* #7147 VFP plots: refactor to separate data extraction and display.
* #7147 VFP Plots: Add "Show Plot Data" functionality.
* #7147 VFP plots: Move defines to separate file
* #7147 VFP plots: Minor adjustments
* #7147 VFP Plot: Show table number in title and auto-generated name.
* #7147 VFP Plot: Add "Show Plot Data" to context menu.
* Remove unused member.
* #7147 VFP Plot: Disable broken curve selection.
* Revert "#7147 VFP Plot: Add "Show Plot Data" to context menu."
This reverts commit 5f3b2f362fcea7fc6de5fd2c614919079629bf1c.
* #7147 VFP Plot: Use event filter to show context menu
* Janitor : Use context menu launcher for WellAllocationPlot and CrossPlot

Co-authored-by: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
2021-01-12 20:51:57 +01:00
jonjenssen
a7775214c8
Rewrite of cell filters. Added new polyline filter and user defined filter types. (#7191)
Make 3d view picker more generic to enable picking cell filter polygon

Give cell filters a new, generic interface for updating included/excluded cells from collection

Remove old range filter collection and replace with new filter collection that supports both range filters, polyline filters and user defined filters.

Update existing range filter code for the new collection and interface

Add user defined cell filter type

Add polyline cell filter type

Implement both Z and K index depth for polyline filters
Allow interactive editing of polyline filter node positions.
Support both geomech and eclipse views
Support view linking with both eclipse and geomech views and the new filter types

Support loading old project files with range filter collections into the new collection type

Adjust to new world order.
2021-01-11 18:47:09 +01:00
Gaute Lindkvist
81699db187 Rename ApplicationCode to ApplicationLibCode 2021-01-11 15:27:45 +01:00