Commit Graph
100 Commits
Author SHA1 Message Date
Magne Sjaastad 7fe945e68d #11842 Fix drag/drop of VFP plot into multiplot
Remove the deprecated plot collection
Make sure the dropped plot is visible in the multi plot
2024-11-04 08:47:21 +01:00
Magne Sjaastad a05645e966 #11844 Quick Access adjustments
Show the Quick Access menu only for objects that implements RimFieldQuickAccessInterface
Show the fields made available by RimFieldQuickAccessInterface
2024-11-04 08:46:55 +01:00
Magne Sjaastad 4cf6a26083 Improve draw performance for active cell grid
* Show timing for geoBuilder.generateSurface()
* Check state of element vector result before geometry is created

* Improve performance for isFaceVisible
Avoid calling costly function cell() when possible
Remove check on fault geometry as this does not affect the visualization

* Performance: Avoid traversal of all cells when computing visibility
When we have an active cell grid, we can skip checking for inactive and invalid state.
Use the list of active grid cells when looping through cells.
2024-11-03 13:38:03 +01:00
Magne Sjaastad 9a1c54c7d6 Add debug timers to import of UNRST files 2024-10-31 19:05:10 +01:00
Magne Sjaastad e6a58d7559 Fix spell check action 2024-10-31 15:39:52 +01:00
Magne Sjaastad 151128d829 Bump version to 2024.09.3-dev.02 2024-10-30 13:58:04 +01:00
Magne Sjaastad 7677466d29 Make sure plot create from Python is visible 2024-10-30 13:54:03 +01:00
Magne Sjaastad 2154c0ae3b Use updated API for total cell count 2024-10-29 18:17:31 +01:00
Magne Sjaastad 95365ad5d0 Add timing support to logger 2024-10-29 14:33:48 +01:00
Magne Sjaastad 924687b11e Remove qt5compat 2024-10-29 14:26:41 +01:00
Magne Sjaastad 4f921b62b6 Remove misleading and confusing error message 2024-10-29 10:29:29 +01:00
Magne Sjaastad 2814b92055 Qt6: Adjustments (#11804)
* Qt6: Avoid insertWidget, use addWidget
In Qt6, the insertWidget function checks if the index parameter is valid based on current widgets present in the layout. This is error prone, and use addWidget to avoid manual counting of index.

* Disable use of Qt keyword foreach

* Replace use of QRegExp with QRegularExpression
Replace use of QRegExp with QRegularExpression
Remove dependency on qt5compat module
Simplify an expression based on review

* Remove Qt5 ifdefs

* Guard access out of bounds seen in debug build

* Avoid reuse of string variable

* Disconnect all signals from the QOpenGLContext
The call stack when this assert happens indicates that there are more signals to be disconnected from the object. Crash is fixed by disconnecting all signals.

Assert seen in debug build:

ASSERT failure in caf::Viewer: "Called object is not of the correct type (class destructor may have already run)", file C:\Qt\6.6.3\msvc2019_64\include\QtCore/qobjectdefs_impl.h, line 130

* Fix issue related to delete of a linked view
Guard null pointer use in view linker. Remove complicated cleanup in destructor in Rim3dVew.
2024-10-28 13:09:18 +01:00
Magne Sjaastad bb047e82d3 #11827 Use FetchContent_MakeAvailable
FetchContent_Populate() is deprecated
2024-10-28 13:08:18 +01:00
Magne Sjaastad 3a6e7997f1 Merge remote-tracking branch 'origin/main' into dev 2024-10-25 09:49:13 +02:00
Magne Sjaastad 47413ede45 Add example for linux CMakeUserPresets 2024-10-25 08:39:50 +02:00
Magne Sjaastad e49c82c4e0 Bump version to 2024.09.2 2024-10-24 19:46:35 +02:00
Magne Sjaastad cf8d84e56a Bump version to RC-03 2024-10-24 19:46:35 +02:00
Magne Sjaastad 26ed0e50d7 #11812 Multi-segment RFT plot: Make sure reservoir Pressure is plotted 2024-10-24 19:46:35 +02:00
Magne Sjaastad 4e888ef624 Bump version 2024-10-24 19:46:35 +02:00
Magne Sjaastad be759a6e7e Improve support for network vectors
Show all text if summary address contains multiple : for network addresses
Consolidate replace of tokens in summary address
2024-10-24 19:46:35 +02:00
Magne Sjaastad cfb120ce2e Fix crash when curve data is missing 2024-10-24 19:46:35 +02:00
Magne Sjaastad 317c737a22 Improve performance when creating multiple plots 2024-10-24 19:46:35 +02:00
Magne Sjaastad cf7f00880a Add support for increase of serial number when data is assigned to a SUMO case 2024-10-24 19:46:35 +02:00
Magne Sjaastad 275a8b7284 Align the search expression with sumo explorer 2024-10-24 19:46:35 +02:00
Magne Sjaastad e476c1c0c5 Bump version 2024-10-24 19:46:35 +02:00
Magne Sjaastad 417acc9d05 Improve performance when computing interpolated values
Use OpenMP when computing interpolated values for a curve.
Use std::lower_bound to quickly find a relevant start index, avoids starting from 0 each time.
2024-10-24 19:46:35 +02:00
Magne Sjaastad d10cce4ead Use hash of input do control if calculation is required
Add hash functions
Add serial number to SummaryReaderInterface
Add hash for RimSummaryCase

Use hash based on input parameters to control caching of data in RimEnsembleStatisticsCase::calculate  and RimEnsembleCurveSet::appendOptionItemsForSummaryAddresses
2024-10-24 19:46:35 +02:00
Magne Sjaastad 4f8619d38c #11798 Use type definition from ClipperLib to avoid overflow
When converting a cvf::Vec3d to an integer vector, the platform int type was used as an intermediate variable. This caused overflow for large double values.
2024-10-24 19:46:35 +02:00
Magne Sjaastad 1f2b180ab7 #11812 Multi-segment RFT plot: Make sure reservoir Pressure is plotted 2024-10-24 12:18:35 +02:00
Magne Sjaastad a9ea615bf0 Add support for increase of serial number when data is assigned to a SUMO case 2024-10-24 08:50:26 +02:00
Magne Sjaastad c795eccf0b Align the search expression with sumo explorer 2024-10-24 08:50:26 +02:00
Magne Sjaastad 2cdb388a0d Bump to dev.07 2024-10-23 12:38:22 +02:00
Magne Sjaastad fd0ebd989b Improve performance when computing interpolated values
Use OpenMP when computing interpolated values for a curve.
Use std::lower_bound to quickly find a relevant start index, avoids starting from 0 each time.
2024-10-23 12:38:22 +02:00
Magne Sjaastad 581b268928 Use hash of input do control if calculation is required
Add hash functions
Add serial number to SummaryReaderInterface
Add hash for RimSummaryCase

Use hash based on input parameters to control caching of data in RimEnsembleStatisticsCase::calculate  and RimEnsembleCurveSet::appendOptionItemsForSummaryAddresses
2024-10-23 12:38:22 +02:00
Magne Sjaastad ac96150875 Bump to dev.06 2024-10-22 18:02:36 +02:00
Magne Sjaastad da4d4c66b1 #11798 Use type definition from ClipperLib to avoid overflow
When converting a cvf::Vec3d to an integer vector, the platform int type was used as an intermediate variable. This caused overflow for large double values.
2024-10-22 10:39:04 +02:00
Magne Sjaastad df091336e0 Move summary tools into separate folder 2024-10-22 07:28:43 +02:00
Magne Sjaastad 95b2f2bbd1 Add icons 2024-10-21 14:11:22 +02:00
Magne Sjaastad eee00ee508 Update default dock state for Quick Access 2024-10-21 14:11:22 +02:00
Magne Sjaastad 2befcf6417 Create quick access objects when opening project and some objects
Create quick access for Eclipse view, IJK slice filters and property filters
Create quick access objects for existing projects automatically
2024-10-21 14:11:22 +02:00
Magne Sjaastad 2e305bd762 Add quick access dock widget 2024-10-21 14:11:22 +02:00
Magne Sjaastad 4ff5aaf381 Add quick access data model objects 2024-10-21 14:11:22 +02:00
Magne Sjaastad b0d967ff40 Preparations for quick access features
* Add tool button editor with callback support
* Guard null pointer usage
* Allow proxy field with no getter
* Remove duplicated code
2024-10-21 14:08:15 +02:00
Magne Sjaastad 5ffd7f3f61 Move Show Disks from Visibility group into Disk group 2024-10-21 12:52:42 +02:00
Magne Sjaastad c3d60869bd Improve support for network vectors
Show all text if summary address contains multiple : for network addresses
Consolidate replace of tokens in summary address
2024-10-21 09:38:33 +02:00
Magne Sjaastad 2aaea1e6db Fix crash when curve data is missing 2024-10-21 09:38:33 +02:00
Magne Sjaastad 77c789a179 Improve performance when creating multiple plots 2024-10-21 09:38:33 +02:00
Magne Sjaastad 04799e044e Fix missing prefix seen in unity builds 2024-10-20 16:35:39 +02:00
Magne Sjaastad 205b29de3c Bump to dev.05 2024-10-18 13:17:09 +02:00
Magne Sjaastad da321830a7 Janitor: Fix some minor GUI issues
Use appendMenu instead of context command builder
Remove case name from import grid feature
Fix shortcut for feature
2024-10-16 14:32:36 +02:00
Magne Sjaastad 4fd9edc7a5 Select realization in Data Sources when clicking on curve 2024-10-16 14:32:36 +02:00
Magne Sjaastad 42d700ff7d Remove unused code 2024-10-16 14:32:36 +02:00
Magne Sjaastad 2619f1a33a #11771 Highlight all curves for a realization when picking
When selecting a single curve in an ensemble, select and highlight all curves connected to this realization.
2024-10-16 14:32:36 +02:00
Magne Sjaastad 23cf3fef3a Call closeProject before quit to ensure a clean shutdown 2024-10-16 14:32:36 +02:00
Magne Sjaastad 383c7e071d Merge in latest changes from main (#11782)
Merge main into dev after release of 2024.9.1
Includes changes to build related to conflicting Python requirements

ortools is used in the Komodo environment. This environment is not compatible with libprotoc 27 and newer. Use pinning to limit version of libprotoc<27.

Add dependency on typing_extensions
2024-10-16 09:27:09 +02:00
Magne Sjaastad 828a41bdfa Bump to 2024.09.2-dev.04 2024-10-15 16:05:00 +02:00
Magne Sjaastad f6ab2f92d3 Python: Adjust pinning to be compatible with ortools
ortools is used in the Komodo environment. This environment is not compatible with libprotoc 27 and newer. Use pinning to limit version of libprotoc<27.

Add dependency on typing_extensions
2024-10-14 19:20:17 +02:00
Magne Sjaastad eeb5f297c2 Bump to 2024.09.2-dev.03 2024-10-14 09:37:41 +02:00
Magne Sjaastad 360024c4bc Make sure the insertWidget function inserts at the correct index
Insert the first widget at index 1 causes crash in Qt6
2024-10-14 09:19:21 +02:00
Magne Sjaastad 709ec7378e #11768 Show current time step in result plot 2024-10-14 09:08:47 +02:00
Magne Sjaastad 8d42b321d3 Use copy_if_different to avoid build errors 2024-10-14 08:53:28 +02:00
Magne Sjaastad 4719090b5f Define long names for summary vectors in JSON files 2024-10-14 08:53:28 +02:00
Magne Sjaastad 0330c3cacd #11761 Add special parsing of SLAVES keyword as the default parsing fails 2024-10-10 11:41:40 +02:00
Magne Sjaastad ca4a7b9000 Remove obsolete code related to Qt5
* Remove bundling of openssl1.1
* Remove obsolete compile flags
* Remove use of obsolete RimCommandObject
* Use QColor::isValidColorName
QColor::isValidColor is deprecated in Qt 6.6, QColor::isValidColorName was introduced in 6.4

* Make sure debug DLLs are copied when required
* Remove Qt5 from AppFwk
* Remove obsolete copy of Qt  DLLs
2024-10-07 10:16:48 +02:00
Magne Sjaastad f67d736c05 Bump to dev.02 2024-10-04 15:44:12 +02:00
Magne Sjaastad b9448c2430 Additional Openssl adjustments 2024-10-04 15:28:42 +02:00
Magne Sjaastad a04d41b043 Use description as key in vcpkg.json 2024-10-04 13:32:53 +02:00
Magne Sjaastad 8d828fdc84 Disable Octave build temporarily 2024-10-04 13:25:20 +02:00
Magne Sjaastad 226ad98931 Add vcpkg.json used to build OpenSSL3 2024-10-04 13:25:20 +02:00
Magne Sjaastad 7362b6a357 Bump to 2024.09.2-dev.01 2024-10-02 15:20:27 +02:00
Magne Sjaastad aabe7b064d #11735 Use static well path geometry if no simulation well data is available
Crash when creating intersection on a simulation well no well data is present at time step
2024-10-02 15:20:27 +02:00
Magne Sjaastad eca17ab92e #11737 Set Unknown as the default type for CONFAC
RFT segment results are accessed using a category, either Annulus, Device, Tubing or Unknown. Set the category for CONFAC to Unknown.
2024-10-02 15:20:27 +02:00
Magne Sjaastad e7a082ac29 Regression Test: Find relevant objects and show them in Property Editor 2024-10-02 15:20:27 +02:00
Magne Sjaastad f43ecd5e92 #11731 Remove creation of same groups twice in RimWellLogExtractionCurve 2024-10-02 15:20:27 +02:00
Magne Sjaastad f031a81803 #11731 Detect when a group box have the same name as an existing group box
Detect when a group box have the same name as an existing group box. This is not currently supported, and leads to dangling group boxes in the Property Editor.

Trigger assert and crash when the situation appears.
2024-10-02 15:20:27 +02:00
Magne Sjaastad 0a44f0f6ae Bump to 2024.09.1 2024-10-02 10:43:27 +02:00
Magne Sjaastad ea85dca234 #11735 Use static well path geometry if no simulation well data is available
Crash when creating intersection on a simulation well no well data is present at time step
2024-10-02 10:43:27 +02:00
Magne Sjaastad 2bad8e89ce #11737 Set Unknown as the default type for CONFAC
RFT segment results are accessed using a category, either Annulus, Device, Tubing or Unknown. Set the category for CONFAC to Unknown.
2024-10-02 10:43:27 +02:00
Magne Sjaastad 7d84c1190d Regression Test: Find relevant objects and show them in Property Editor 2024-10-02 10:43:27 +02:00
Magne Sjaastad f8ce59a4b4 #11731 Remove creation of same groups twice in RimWellLogExtractionCurve 2024-10-02 10:43:27 +02:00
Magne Sjaastad da37687c77 #11731 Detect when a group box have the same name as an existing group box
Detect when a group box have the same name as an existing group box. This is not currently supported, and leads to dangling group boxes in the Property Editor.

Trigger assert and crash when the situation appears.
2024-10-02 10:43:27 +02:00
212f5bf5ae Add support for Qt6 and disable Qt5
Required changes to use Qt6 and disable support for Qt5. There are still some adjustments related to Qt6 to be done, but these changes are not required to make Qt6 compile on relevant systems.

* Build system changes Qt6
* Override enterEvent
* Update QKeySequence
* QtChart changes
* Use QScreen to instepct dotsPerInch
* Add app->quit()
* Required updates for code related to QString
* Use RiaQDateTimeTools
* Required changes related to regular expressions
* Support compile on Qt  < 6.5
When version < 6.5 is found, qt_generate_deploy_app_script() is disabled. Compilation of ResInsight will work, but the install target will be incomplete.
* Octave: add missing header.
* Qt Advanced Docking: force Qt6 where both Qt5 and Qt6 is available.

---------

Co-authored-by: magnesj <1793152+magnesj@users.noreply.github.com>
Co-authored-by: Kristian Bendiksen <kristian.bendiksen@gmail.com>
2024-09-30 11:21:17 +02:00
Magne Sjaastad 300dbdebc7 Bump to 2024.09.1-dev.01 2024-09-27 12:47:15 +02:00
Magne Sjaastad 8d0883cd9c Merge pull request #11728 from OPM/main
Merge from main
2024-09-27 11:32:39 +02:00
Magne Sjaastad 0a0c8fbbe3 Merge pull request #11727 from OPM/dev
2024.09
2024-09-27 11:31:46 +02:00
Magne Sjaastad 5c60fa7b88 Prepare for 2024.09
Add keywords and update license info
2024-09-27 10:39:53 +02:00
Magne Sjaastad d7022fb5f7 Guard null pointer access 2024-09-27 10:39:53 +02:00
Magne Sjaastad b4c7dd411b Make sure curve type rate/acc is calculated for existing project files 2024-09-27 10:39:53 +02:00
Magne Sjaastad ee8925edc6 Prepare for 2024.09
Add keywords and update license info
2024-09-27 10:38:10 +02:00
Magne Sjaastad 360a635cda Guard null pointer access 2024-09-27 10:38:10 +02:00
Magne Sjaastad 67adab8ad3 Make sure curve type rate/acc is calculated for existing project files 2024-09-27 10:38:10 +02:00
Magne Sjaastad e9044c5912 Merge dev into main before release 2024-09-25 09:11:12 +02:00
Magne Sjaastad f54be2783f Bump to 2024.09-RC_03 2024-09-24 14:50:11 +02:00
Magne Sjaastad d2a160f793 Make RFT pressure data more robust
Replace tab with space, and fix an out of bounds bug.
2024-09-24 14:49:10 +02:00
Magne Sjaastad a870fceb42 Intersection: Make sure property filtered geometry is visible
When an intersection geometry is filtered by property filters, make sure that the static geometry is hidden.
2024-09-24 14:49:10 +02:00
Magne Sjaastad 19354ac7b2 Revert "Make sure intersection calculations are done before legend update"
This reverts commit a0997821c6.
2024-09-24 14:49:10 +02:00
Magne Sjaastad e1864bf93b Disable experimental settings for only load active cells 2024-09-24 14:49:10 +02:00
Magne Sjaastad 12ae4dbaaa Improve detection of special *FIP* property names
Make sure RFIP* and SFIP* are not treated as category results
2024-09-24 14:49:10 +02:00
Magne Sjaastad d44cd19951 Bump to 2024.09-RC_02 2024-09-24 07:45:10 +02:00
Magne Sjaastad a0997821c6 Make sure intersection calculations are done before legend update
The legend categories can be filtered to only visible categories. This requires the geometry generators to do intersection calculations, as the legend is created based on intersected cells.
2024-09-24 07:45:10 +02:00