Commit Graph

238 Commits

Author SHA1 Message Date
Magne Sjaastad
865fbf0cba Summary connections and completions (#12156)
* Add category WELL_CONNECTION
* Throw exception if category string is invalid
* Make it possible to step connections
* Add definition of completion vectors
* Use WELL_CONNECTION for CPRL
* Convert "WGPRL__2:MY-WELL1-A5" to "WGPRL:MY-WELL1-A5:2"
Use the syntax for well completions in opm-common
* More tests for different variants of summary texts
2025-02-13 08:31:53 +01:00
Magne Sjaastad
938222f878 #12091 Show dialog with cancel button when requesting authorization tokens 2025-02-03 12:45:30 +01:00
Magne Sjaastad
ca0179d118 Remove obsolete CMake statements
When using modern CMake and Qt6 we can remove obsolete source_group() and QT_MOC_HEADERS
2025-01-28 07:01:42 +01:00
jonjenssen
b999faf293 Statistics Contourmap UI updates (#12060)
* Enable time step selections and controls in view
* Support loading just what we need for statistics contour maps by using custom reader settings
* Close case once done with it unless there are active views.
* Add selection of user interface case (for result selection, display of wells, faults...)
* Avoid int overflow for nested progresses by using double
* Improve auto naming
* Misc. UI improvements
2025-01-14 21:52:54 +01:00
Magne Sjaastad
997e14c90e #11993 Improve ensemble search dialog
Use tree view instead of list view. Add filtering based on text match using realization numbers. Clean up user interface. Rename several GUI items.
2024-12-19 14:55:37 +01:00
Magne Sjaastad
1ce2f9651c #11954 Improve the curve merger algorithm
* Add flag to indicate identical X values when curves are merged
* Detect if x values are monotonically increasing
2024-12-03 16:53:11 +01:00
Arne Morten Kvarving
6d4824b204 fixed: build against QT 6.8 2024-12-03 12:40:26 +01:00
Magne Sjaastad
041e2f2e13 #11938 Cloud Config: Show the full path to config file for cloud services 2024-11-29 06:28:02 +01:00
Magne Sjaastad
9b6e441386 Make it possible to exclude partial delta curves
Make sure statistics curves are recomputed on flag change

When toggling "Discard Missing or Incomplete Realizations", make sure the statistics is recomputed and the ensemble plots updated.
2024-11-18 07:45:20 +01:00
Kristian Bendiksen
c2ec023720 Add utility for finding min/max of vector. 2024-11-13 15:36:44 +01:00
Magne Sjaastad
b0344a1e72 Logging: Skip identical messages logged close in time
There can be situations where multiple identical log messages are computed in a short time interval. Default time interval is set to 1 second, if the message is reported after this interval, the message is added to the log.
2024-11-13 15:18:10 +01:00
Magne Sjaastad
67e6df28b5 #11857 Make sure the summary curve type is updated
Always compute curve type Rate or Accumulated based on address if Auto curve type is set.
2024-11-06 07:16:07 +01:00
Magne Sjaastad
9ed4318470 Avoid redraw of 3D views during summary import 2024-11-04 17:34:49 +01:00
Magne Sjaastad
275526a64a Remove unused includes
Remove unused includes, mostly AppEnum.h
2024-11-04 09:54:23 +01:00
jonjenssen
da683bed9e Move Rig well related things to subfolder and update include statements 2024-10-31 15:08:59 +01:00
Magne Sjaastad
95365ad5d0 Add timing support to logger 2024-10-29 14:33:48 +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
c795eccf0b Align the search expression with sumo explorer 2024-10-24 08:50:26 +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
df091336e0 Move summary tools into separate folder 2024-10-22 07:28:43 +02:00
Magne Sjaastad
4719090b5f Define long names for summary vectors in JSON files 2024-10-14 08:53:28 +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
e7a082ac29 Regression Test: Find relevant objects and show them in Property Editor 2024-10-02 15:20:27 +02:00
Magne Sjaastad
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
Kristian Bendiksen
ff3b932257 Cloud: fix crash in PdmUiEditorHandle due to recursive event loop. 2024-09-09 14:32:32 +02:00
Magne Sjaastad
7ba4329bb4 Add qt-version to matrix configuration 2024-09-06 12:11:50 +02:00
Magne Sjaastad
a443655b42 Prefix NetworkAuth includes 2024-09-06 12:11:50 +02:00
Magne Sjaastad
03c0e97296 Prefix Sql includes 2024-09-06 12:11:50 +02:00
magnesj
fc2106edb0 Fixes by clang-tidy 2024-09-02 15:26:44 +02:00
Kristian Bendiksen
cf7a38375d #11649 Reverse order of terms in polynomial expression. 2024-08-30 10:21:49 +02:00
Magne Sjaastad
27c46a65fd Improve user control on resampling operations
Allow user to specify Accumulated or Rate for a summary curve. Default setting is Auto, and summary address is used to derive Accumulated/Rate. User can set curve type explicitly.
2024-08-28 15:23:07 +02:00
Kristian Bendiksen
0518e594ce Improve caching. 2024-08-28 08:33:44 +02:00
Kristian Bendiksen
44076f4911 Sumo: load parameter sensitivities (i.e. "parameters.txt") for ensembles. 2024-08-28 08:33:44 +02:00
Kristian Bendiksen
f6fa93bb66 Sumo: Fix concurrency issue when stepping too fast. 2024-08-23 12:18:05 +02:00
Kristian Bendiksen
ef9a397188 Sumo: improve logging and remove some unused code. 2024-08-23 12:18:05 +02:00
Kristian Bendiksen
123f6fdcfa Sumo: Fix incorrect signal-slot connection. 2024-08-23 12:18:05 +02:00
Kristian Bendiksen
12069ca80a Sumo: Fix incorrect signal connection.
The signal was not connect using the std::function signalCallable.
Therefore the signal would never trigger the QEventLoop::quit() slot,
and UI would be stuck waiting for the time out.
2024-08-23 12:18:05 +02:00
Kristian Bendiksen
f777dfa4ba Sumo: Increase request timeout. 2024-08-23 12:18:05 +02:00
Magne Sjaastad
1a3a005c1c Add optional import of SUMO/OSDU settings from JSON (#11630)
Add optionally import of SUMO/OSDU settings from JSON. Check for sumo_config.json and osdu_config.json. If present, import settings to preferences and set fields read only.
2024-08-22 07:18:06 +02:00
Kristian Bendiksen
bf2a852b4d Add cancellation of well path collection loading. 2024-08-16 15:46:22 +02:00
Magne Sjaastad
f0e19b0fb5 Use vcpkg for fast-float and spdlog 2024-08-14 13:58:11 +02:00
Kristian Bendiksen
76a1d43b0e Osdu: make sure token is valid before background loading. 2024-08-14 11:32:07 +02:00
Kristian Bendiksen
e9c46c5cec Rename RimSummaryCaseCollection to RimSummaryEnsemble. 2024-07-30 08:55:12 +02:00
Magne Sjaastad
6fb74654a1 Improve interface for string operations
Trim incoming string before converting to number
Remove use of std::strtod and std::stoi
Use std::string_view instead of std::string when possible
2024-07-25 21:21:53 +02:00
Magne Sjaastad
d8bd7bc81a Cloud connector cleanup
* Rename to RiaOAuthHttpServerReplyHandler
* Add comment header
* SUMO: Use function pointer to simplify network request
2024-07-23 11:49:07 +02:00
Kristian Bendiksen
773d9b08c9 Janitor: remove unused code. 2024-07-13 12:07:49 +02:00
Kristian Bendiksen
2aa1bfe940 Cloud: save expiration timestamp for access token.
Expired access tokens are ignored when reading from file.
2024-07-13 12:07:49 +02:00
Kristian Bendiksen
3e2af38c90 Cloud: Use separate files for Osdu and Sumo tokens. 2024-07-13 12:07:49 +02:00
Kristian Bendiksen
896e4979bf Cloud: Handle refresh of access token. 2024-07-12 19:18:09 +02:00