Commit Graph
85 Commits
Author SHA1 Message Date
jonjenssen d4ff0a0175 Missing legend (#9095)
* Make sure ensemble curveset legends are shown in multiplot legend.
* Remove information already shown in title from curve legend.
* Fix missing legend when creating curve plot from ensemble curves
* Show actual curve color in legend
2022-06-29 11:49:46 +02:00
jonjenssen 2fdd5875ea Update multiplot source stepping - append plot (#9030)
* Make sure we append a new plot for all plots that matches the current source stepper, allows stepping and appending multiple plots at once
2022-06-09 13:23:28 +02:00
jonjenssen fd7821a10b Add preferences setting for maximum search depth in script folders. Clean up context menu a bit. (#9012) 2022-06-02 06:53:05 +02:00
jonjenssen 41904df681 New feature: delete unchecked subitems (#9010)
* New feature: delete unchecked subitems
2022-06-02 06:50:14 +02:00
jonjenssen 9f4d242a5d Plot Template updates (#9002)
* Ensemble plot templates now have .erpt extension and new icon
* Default plot templates are given a checkmark overlay on the icon
* Context menu has been cleaned up a bit
* Old default template is really just the last used template. Rename it.
* Add max. recursive depth setting in preferences for plot template searches
* Only create plots based on correct template type when importing ensembles or single cases
* Support creating new plot from template explorer
* Update last used template when creating a new plot from a template
2022-06-01 10:45:44 +02:00
jonjenssen db589c7e32 Show progress bar when appending plots to multiplot (#8976)
* Show progress bar when appending plots to multiplot
* Stop plot manager from going crazy creating plots when filter text is blank
* Speed up plot manager create plot
2022-05-30 11:39:05 +02:00
jonjenssen 8e3289a432 Default summaryplot improvements (#8950)
* Add summary default plot type selection in preferences
* Create plots as set in preferences when loading summary cases. Allow selecting default plot templates from templates explorer tree
* Do not create plot if data vector setting is empty
2022-05-25 11:01:45 +02:00
jonjenssen 3b927e1c09 Split summary plot into multiple plots (#8910)
* Support splitting a summary plot with multiple curves into a new multiplot with one plot per curve
* Make sure the correct plot is deleted if using the plot context menu.
2022-05-13 16:36:30 +02:00
jonjenssen 6f26f8e462 Speed up summary case close/delete for ensembles (#8907)
* Speed up summary case close/delete for ensembles
2022-05-12 22:51:15 +02:00
jonjenssen 4f31f5c76e Add support for deleting plot templates (#8908) 2022-05-12 21:46:35 +02:00
jonjenssen 828e8ec440 Show templates as separate project explorer tab. (#8902)
Add templates as separate project explorer tab.
Add support for renaming and editing templates
2022-05-11 19:46:17 +02:00
jonjenssen 65827f9c1c Improve summary case import performance (#8897)
* Improve summary case import performance
2022-05-11 10:47:12 +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
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
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
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
jonjenssen db3395da44 Fix Summary Multiplot subplot colspan issue (#8805)
Fix colspan bug for summary multiplots
2022-04-19 12:34:40 +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
jonjenssen 22d6e3f853 Merge pull request #8765 from OPM/summarymultiplot_performance2
Summary Multiplot performance improvements and fixes
2022-04-01 19:23:27 +02:00
jonjenssen ebba37a623 Merge pull request #8754 from OPM/multiplot_improvements
Summary Multiplot: add new plot from a single curve in an ensemble plot and improve general plot performance
2022-03-31 12:34:07 +02:00
jonjenssen 3bb6642900 Stop ResInsight from crashing when calculating cell volume (#8374)
* Stop ResInsight from crashing when calculating cell volume
2022-03-28 08:46:10 +02:00
jonjenssen 8d3f41ded8 Merge pull request #8732 from OPM/summarymultiplot_updates2
Summary Multiplot updates
2022-03-25 11:39:12 +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
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
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
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
jonjenssen 0cd965dd5b Summary plot crash fixes (#8595)
Disable assert for duplicated signal connections for now, just ignore everyone but the first one
Temp. workaround for crash when duplicating plot axis properties.
Update test
2022-03-01 17:27:46 +01:00
jonjenssen 208ae7692b Merge pull request #8578 from OPM/summaryplot_fromdatavector
Summary Plot: create new plot from data vector tree nodes
2022-02-22 11:32:35 +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
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
jonjenssen d9bb82de91 Merge pull request #8447 from OPM/intersection_filterupdate
Intersection: depth filter updates
2022-01-16 23:56:00 +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
jonjenssen 55ba4bc802 Intersection depthfilter (#8408)
* Implement a simple depth filter to cut all geometry below a certain level for intersections
* Add option to override all curve intersection cut depths from collection.
* Add support for showing intersection above or below threshold. Update label texts.
2022-01-05 15:52:04 +01:00
jonjenssen 58f5c2e92b Stop ResInsight from crashing when calculating cell volume (#8374)
* Stop ResInsight from crashing when calculating cell volume
2021-12-17 16:10:24 +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
jonjenssen 08af2e7c17 WIA: Add better support for list parameters (#8266)
* Add better support for list parameters
2021-11-09 18:17:47 +01:00
jonjenssen e9925ec65a Show parameter descriptions as tooltips (#8261) 2021-11-08 14:48:52 +01:00
jonjenssen 89a5258405 Merge pull request #8255 from OPM/wia_paramupdates
GeoMech/WIA: update input parameters and model size settings
2021-11-07 23:26:42 +01:00
jonjenssen c81f6b44db Merge pull request #8201 from OPM/move_intersections
Move intersection related files into subfolder
2021-10-26 14:41:43 +02:00
jonjenssen 059f30236b Merge pull request #8168 from OPM/intersection_displacement
GeoMech: Support showing displacements on intersections, too
2021-10-20 01:41:14 +02: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
jonjenssen 750c1832e5 Ignore CMakePresets.json file used by VisualStudio (#8131) 2021-10-07 09:19:12 +00:00
jonjenssen 7b78c2d35b GeoMech: show deformations in grid view (#8123)
Enable support in geomech view to show grid deformations
2021-10-07 02:12:42 +02:00
jonjenssen 72ce82b08b Add parameter value check to see if it is possible to continue or not. (#8091) 2021-10-01 16:32:11 +02:00
jonjenssen 69c829dc32 Make sure we load two results files after wia script has completed. (#8088) 2021-10-01 15:15:30 +02:00
jonjenssen c88424dbcf Revert "Use devtoolset-9 on CentOS 7"
This reverts commit 72dcc46e27.
2021-09-30 08:18:03 +02:00
jonjenssen 66852c4dad WellIA: Load results after external computations script has completed (#8062)
* Load result after modeling has completed.
* Select new geomech view in project tree when importing a new geomech case
2021-09-28 12:39:54 +02:00
jonjenssen de1d02e7bc Rewrite to make code compile (#8061)
It should now be possible to build on centos 7, too
2021-09-28 11:31:13 +02:00
jonjenssen d206a93939 Fix comment typo 2021-09-27 13:21:00 +02:00
jonjenssen 72dcc46e27 Use devtoolset-9 on CentOS 7 2021-09-27 13:18:40 +02:00
jonjenssen d09ae4e1cb Improved ODB support (#8046)
* Experiments for supporting visualization of new ODB files from WIA workflow

* Some more experiments to get odb working for wia results

* More work in progress, experimenting to get wellIA result files to load properly

* Make sure all part geometries use the same global bounding box

* Clean up code

* Add some safeguards for data calculations
Move parts below grid in project tree

* Fix warnings

* Add support for C3D8RT elements
Add some more safeguards for missing data
Remove strange part handling

* Support elements with reduced number of integration points by pretending to have 8.

* Change integration point mapping to correct order (ref. Stein and Abaqus 2019 doc)

* Do not allocate too much memory for element nodal results for 20 element node types

* Code cleanup.
Revert back to old integration point numbering scheme (ref. Stein)

* And, another integration point order update...

* Update comments
2021-09-27 12:44:29 +02:00
jonjenssen 0c69cdf203 Use only one implementation of lineIndicesFromQuadVertexArray (#7980)
* Use only one implementation of lineIndicesFromQuadVertexArray
2021-09-10 06:19:44 +00:00
jonjenssen a5b80c649b Merge pull request #7960 from OPM/geomech_WIA4
GeoMech: Well Integrity Analysis
2021-09-09 17:34:27 +02:00
jonjenssen 605af789c6 Protect against crash in 3d view due to nullptr in linkwellpathfeature command check (#7876)
* Protected against crash in 3d view due to nullptr

* Code cleanup
2021-08-14 14:23:55 +02:00
jonjenssen aa2b4305de Improve handling of LGRs in cell filters (#7783)
* Improve handling of LGRs in cell filters
2021-06-25 14:44:52 +02:00
jonjenssen 66b2b50a1d Enable starting FaultRA processing from 3d view (#7801) 2021-06-18 16:51:05 +02:00
jonjenssen 0825fa10ac delete existing database file before processing a new fault (#7793) 2021-06-18 11:28:47 +02:00
jonjenssen a4fd24a15a Improve handling of LGRs in cell filters (#7783)
* Improve handling of LGRs in cell filters
2021-06-16 17:31:25 +02:00
jonjenssen e2e04db6eb Write numbers as numbers in json, not strings (#7736) 2021-05-28 15:24:30 +02:00
jonjenssen 8752eebdca Fault React. Assessment updates, part 2 (#7735)
* Add additional parameters to postprocessing script.
2021-05-28 14:31:36 +02:00
jonjenssen ae7285b478 Fault Reactivation Assessment: updates and tweaks (#7732)
* Add flag to keep temp. parameter files or not.
* Ask user if it is ok to clean the output folder if selected.
* Add property for elastic table input file.
* Do not show legend by default when refreshing tsurfs
* Make sure all loadsteps are enabled in post processing json file
* Support running adv. proc without req. basic proc to be run first
2021-05-28 00:55:54 +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
jonjenssen 242e23a7c9 Fix crash when exporting surface. (#7705) 2021-05-20 10:28:53 +02:00
jonjenssen 1465b179c5 Disable streamlines icon in explorer for eclipse input cases. (#7697) 2021-05-19 18:24:02 +02:00
jonjenssen 4a4db5a3f2 Fault reactivation assessment #7321 (#7690)
Fault Reactivation Assessment implementation (ref issue #7321)
2021-05-18 14:28:54 +02:00
jonjenssen 766ea6aab2 Streamline improvement (#7435)
* Use updated generator. Switch to using priority list for seeds. Fix phase reporting and sign issues. Fix step size when growing.
* Reduce memory footprint by simplifying viz. code and filter out unused tracers early
* Remove unused viz. code.
2021-03-02 01:53:31 +01:00
9bd0a9ebac Streamlines: New generator and UI usability improvements (#7424)
Co-authored-by: jonjenssen <jonjenssen@users.noreply.github.com>
Co-authored-by: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
2021-02-25 16:38:56 +01:00
jonjenssen 05aceef936 Polygonfilter updates2 (#7286)
* Make sure all contourmap copies are getting the correct case set for cell filters when creating/copying maps.

* Rewrite polyline part manager to be more generic, not just linked to annotations.
* Add new partmgr for cell filters to draw polygon filter outlines in both eclipse and geomech views
* Show lines/spheres for polygon filter outline
* Add color edit for line and spheres
* Add support for z plane lock in poygon filter outline
* Add new flags for enabling filter and/or polyline display

* Add K range filter to polygon filter

* Enable picking automatically when creating a new polygon filter
2021-01-26 13:08:21 +01:00
jonjenssen a01c511308 Make sure surfaces are turned off in all contourmaps. (#7241) 2021-01-19 14:59:06 +01:00
jonjenssenandMagne Sjaastad 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
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
jonjenssen 74f413b6d6 Rearrange cell filter related files in source code tree (#6998)
* Move cell filter related classes to separate subfolder
* Update cmake files
2020-11-16 17:07:16 +01:00
jonjenssen 5c4498db9f RFT Plot - make sure we handle feet vs. meters in well log type plots (#6551)
* Fix the meter <-> feet conversion (it was backwards)

* Make sure we refresh the plots after changing the depth axis unit

* Make sure formation overlays etc. also gets converted to correct depth unit (correct as in the same unit any loaded Eclipse Result case use)
2020-09-25 11:14:56 +02:00
jonjenssen 8bb460c2db Make sure we read the LAS file contents, too, when loading a project (#6507)
* Make sure we read the LAS file contents, too, when loading a project
* Refactor WellPathCollection data loading on project open to simplify things a bit.
2020-09-21 10:59:08 +02:00
jonjenssen bc82166151 Support for copying GeoMech case settings using new input (#6471)
* Support copy and replace geomech case, to support importing another data file, but keep the view setup

* Make sure surfaces and intersections get updated with the correct separate result, too

* Simplify/refactor code

* Better naming
2020-09-10 12:54:43 +02:00
jonjenssen f38d119cc8 Add reordering to some more collections (#6430)
* Add reordering to some more collections

* Fix unused vars
2020-09-07 13:48:42 +02:00
jonjenssen cfe64f5706 Surface python interface (#6370)
* Add python interface for importing surfaces with example.
2020-08-26 12:31:23 +02:00
jonjenssen 7cb9a071c1 Surface: Support for folders, copy and drag'n'drop (#6335)
* Enable surface reordering support. Automatically update surface in view ordering based on surface collection ordering

* Remove obsolete code

* Enable drag'n'drop support for surfaces within a surface collection. Still missing the collection update part.

* Bring back code lost in prev. commit

* Add code to accept drops in surface collections. Keep view  in sync.

* Add command for adding additional surface folders.

* Make sure we use the current surface collection as our parent when importing

* Enable name editing.
Make sure we use the correct surface collection when importing/creating surfaces

* More work on getting surface collections working.

* Clean up naming

* Make sure name for surfaceinviewcollection is read only

* Support drawing surfaces from subcollections, too

* Allow deleting subfolders.
Fix legends in view

* Refactor topmost flag for surface collections.

* Fix reload surface to work in all subfolders, too
Add copy surface skeleton. Actual copy operation is still missing

* Add support for copying surfaces

* Remove possibility to choose I and J slice directions for grid case surfaces.

* Fix warnings.

* Make sure we create the surface folder at the correct level

* More warning fix

* Use XML serialization for copy operation

* Fix missing delete

* Fix typo

* Remove unnecessary method.
2020-08-24 11:09:22 +02:00
jonjenssenandgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> bbc659799e Surfaces: Improve UI and usability for surfaces (#6290)
* Add reload command to surface context menus. Still missing the part that actually reloads the data.

* Add additional check for null ptr to avoid crash

* Surfaces: implements reload command in context menu to reload surface data from its source (i.e. a file).
Rename function names to better show what they are actually doing
Refactor a bit to give all RimSurface subclasses the same interface for reloading data.
Also makes sure new RimGridCaseSurface instances are shown by default in the view(s)

* Fixes by clang-format

* Include offset and slice index in surface name shown in project explorer

* Allow importing the same file multiple times

* Disable lighting for surfaces, as it doesn't look good for now. Fixes #6084

* Surfaces: Remove depth offset setting from view. Add slider to depth offset edit for surface

* Create new surfaces only on collection context menu

* Make sure tree view icon is enabled/disabled when the check box is clicked

* Fix depth offset for grid case surfaces, missing base function call.

* Make public method .. public.

* Add reload command to surface context menus. Still missing the part that actually reloads the data.

* Add additional check for null ptr to avoid crash

* Surfaces: implements reload command in context menu to reload surface data from its source (i.e. a file).
Rename function names to better show what they are actually doing
Refactor a bit to give all RimSurface subclasses the same interface for reloading data.
Also makes sure new RimGridCaseSurface instances are shown by default in the view(s)

* Fixes by clang-format

* Include offset and slice index in surface name shown in project explorer

* Allow importing the same file multiple times

* Disable lighting for surfaces, as it doesn't look good for now. Fixes #6084

* Surfaces: Remove depth offset setting from view. Add slider to depth offset edit for surface

* Create new surfaces only on collection context menu

* Make sure tree view icon is enabled/disabled when the check box is clicked

* Fix depth offset for grid case surfaces, missing base function call.

* Make public method .. public.

* Fixes by clang-format

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2020-08-11 11:34:34 +02:00
jonjenssen ad7c62bceb Merge pull request #6270 from OPM/surface_bugfixes
Hide surfaces when generating contour map view
2020-08-05 14:58:43 +02:00
jonjenssen 652dd838ed Merge pull request #6269 from OPM/clang-format-patches
Fixes by clang-format
2020-08-05 14:12:32 +02:00