Commit Graph
34 Commits
Author SHA1 Message Date
Magne Sjaastad 5f7823b8d3 Use point size when defining font size
Avoid pixel size for easier config across multiple environments
Set default font size for plots to 10 points
Use Small instead of XSmall for default font in plot
Remove pt postfix to indicate point size
2025-03-10 16:56:16 +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
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 4b0f2b362e Add support for placing legend at several positions
Show legends on top of preview plot
2023-11-27 13:14:16 +01:00
Magne Sjaastad aaecd846fd Improve plot titles and layout adjustments 2023-07-06 08:40:09 +02:00
Magne Sjaastad 952e766c2f Update clang-format.yml (#10068)
* Update to clang-format-15
Removed two custom .clang-format files in subfolders of AppFwk

* Fixes by clang-format
2023-04-13 07:05:53 +02:00
Magne Sjaastad f8c5cf389f clang-format: Set column width to 140
* Set column width to 140
* Use c++20
* Remove redundant virtual
2023-02-26 10:48:40 +01:00
Jørgen Herje dfb942cc97 Add custom tickmark configuration for Summary Plot (#9867)
- Added custom tickmark configuration in time axis properties for `Time Mode = Date` 
- Refactor code to separate handling of time axis properties and regular axis properties in RimSummaryPlot
- Add method for setting major ticks by use of list for RiuPlotWidget interface.
2023-02-20 14:45:16 +01:00
Kristian Bendiksen 6b631b3d5a #9591 Janitor: remove unused parameter in RiuPlotWigdet::createPlotCurve. 2023-01-09 15:39:42 +01: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
Kristian Bendiksen 32ec472829 Multiaxis plot: fix moving axis from other side 2022-04-04 12:10:20 +02:00
Magne Sjaastad 696c6a15fa #8676 QtChart : Create curve legend widget for multiplot 2022-03-23 14:28:56 +01:00
Magne Sjaastad c03252a581 #8662 QtCharts: Snap tooltip to closest curve point. 2022-03-21 14:56:23 +01:00
Kristian Bendiksen c00aea75fb #8662 QtCharts: Implement tooltip when hovering over curves 2022-03-21 14:56:23 +01:00
Magne Sjaastad 0ca70249ae Move defines to RiaDateTimeDefines 2022-03-14 09:18:48 +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 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
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
Magne Sjaastad 4693dc44ef Memory Management : Fixes related to plot objects and curves 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
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
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
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 e92e2e8764 Summary Plot: Add support for multiple plot axis. 2022-02-07 09:55:11 +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
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