Commit Graph

115 Commits

Author SHA1 Message Date
Magne Sjaastad
edf44cb4c0 Prepare CMake to support both Qt5 andf Qt6
CEE_USE_QT6 controls if Qt6 is used.
Improved install and package for Qt6, target version Qt 6.5.3
Added Qt6 to github action for AppFwkUnitTest
2024-01-09 11:02:41 +01:00
Magne Sjaastad
118d88b973 Create singleton before displaying window 2024-01-09 11:02:41 +01:00
Magne Sjaastad
50234f0ea8 Add missing includes 2024-01-07 18:28:36 +01:00
Eirik Marthinsen
1f1904d72b Add dependency on QtSvg for project cafUserInterface
The project cafUserInterface requires the library QtSvg because of the
use of QSvgRenderer in cafUiIconFactory.cpp. The library has to be
linked into the final executable. The target introdicing the dependency
should also be the one specifying it.

This allows us to remove the dependency from targets that doesn't
directly use QtSvg at all.

Closes #10955
2023-12-16 17:39:09 +01:00
Magne Sjaastad
678a368361
Refactor LayoutOptions to improve readability
* Make it possible to use designated initializer list
- remove default constructor
- move static member to outer scope

* Add helper function to add field on same row
2023-11-10 14:48:56 +01:00
Magne Sjaastad
a0d696e596 Add Value Range editor backed by std::pair<double, double> 2023-09-22 09:30:08 +02:00
Magne Sjaastad
40080a99de
9978 Improve UI for long drop-down lists, use tree selection more
* Improve tree selection editor
- always call defineEditorAttributes
- use heightHint in editor attributes 
- use tree selection editor as default editor for std::vector

* Use tree selection editor instead of list selection editor
List selection editor must be used when editing std::vector<cvf::vec3d> and similar. Replace other use of list selection editor with tree selection editor.

* Set checked state based on text string for integer only models
For models with only integer values, use text string to define the items to be selected. The full list will always be visible, and the checked state will be updated when editing the filter text.

Example: "1, 5-7" will set items 1, 5, 6, 7 checked and all other items unchecked

* Minor fixes
- Set placeholder text after content is added (to ensure correct data type)
- Fix check of integers. `canConvert<int>()`returns true for both QString and int. Thus convert to string and then check for int conversion.

* Activate filtering when unchecking all items in list with only integers
- Reactivate filtering when uncheck of all items for a list with only integer values (to keep consistency between filter and list)
- Update function name for clarity

---------

Co-authored-by: Jørgen Herje <jorgen.herje@ceetronsolutions.com>
2023-05-22 15:44:37 +02:00
Magne Sjaastad
0c90f67dcc
Change API for PdmObjectHandle and PdmFieldHandle
* Refactor interface to PdmObjectHandle and PdmFieldHandle
Return objects instead of passing in structures as parameters

* Add nodiscard to several functions
* Remove redundant this->
* Rename to ptrReferencedObjectsByType
2023-05-12 21:41:34 +02:00
Magne Sjaastad
0907f57de9
Use target_include_directory
* Fwk: Avoid use of include_directories
* Remove target_include_directories from Commands
* Refactor cmake includes
- Avoid using include_directories, and use target_include_directories.
- Use add_subdirectory directly from main cmakefile, do not use in ApplicationLibCode.
2023-04-25 13:14:26 +02:00
Magne Sjaastad
b7f8d0e0f1
Increase warning level
* Set warning level to /W3 for MSVC to catch more warnings
* remove several excluded checks for clang
* removed several unused variables
* Hide warnings qwt
* add missing parentheses in logical expressions
* Remove double check on same logical expression
2023-04-17 15:57:39 +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
ee1b363ae0
Add support for field of std::pair<T, U> 2023-03-31 10:21:56 +02:00
Magne Sjaastad
d23c6b4bb6
Janitor: Several code hygiene adjustments (#9981)
* Include all libraries in APP_FWK_LIBRARIES
* Several fixes detected by Static Code Analysis
* Remove unused code
* Add .clang.tidy
* Use QElapsedTimer
* Use horizontalAdvance
* Avoid | between enum of different classes
* Avoid illegal character
* Renaming and reorder of constructor initialization
2023-03-23 15:49:06 +01:00
Magne Sjaastad
f5171310bf
Add option for word wrap in label and checkbox
* Add support for word wrap in checkbox label
* QLabelEditor: Add word wrap and support for wide label
Add support for one label widget spanning the area usually consumed by a label widget and an editor widget.
* Use word wrap in summary calculation dialog
2023-03-09 12:46:55 +01:00
Magne Sjaastad
583c248cf9
Janitor issues
* Use horizontalAdvance
* Remove unused code
* Hide some warnings from Qt code
* Remove message for _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING
* Use CMP0077 NEW
* Move roff libraries to folder Thirdparty
* avoid operator()==
* Remove cmake_minimum_required and set version to 3.15
2023-01-24 12:29:27 +01:00
Magne Sjaastad
945f1b1902
Use field auto values for summary plots
Use auto value concept in summary plot configuration. Default behavior is unchanged, but it is now possible to unlink a field to specify a custom value for this field.

Other changes:
* Add missing requirement for Svg in test application
* Use calculator icon and rename panel text
Use icon and relevant text to make it clear that the content in Calculator Data can be used for Grid Property Calculator and nothing else.
* Add example with scoped enum and auto value
* Use enum value starting av 10 to make sure enum values (not option item index) are working as expected
2022-09-05 14:12:49 +02:00
Magne Sjaastad
e97a476d85
Add framework support for editor auto values
Add support for a field to be linked to a value updated by code outside the object itself. Mark the linked field by using a background color and icons for linked/unlinked state.
The auto value states is set as attributes in the project xml file. 
Add reference implementation in cafTestApplication, see Fwk/AppFwk/cafTests/cafTestApplication/MainWindow.cpp

* Tree View Editor: Avoid sending notification if selection is unchanged
* Use std++17 in test solution
* Move icons to icon factory
* add support for creating QIcon from SVG text string
2022-09-02 13:20:52 +02:00
Magne Sjaastad
c74701b687 Rename several child() and children() functions 2022-05-31 15:05:07 +02:00
Magne Sjaastad
f0ce04597d
Merge pull request #8985 from OPM/8926-remove-useoptionsonly
AppFwk : Remove obsolete useOptionsOnly
2022-05-29 13:01:27 +02: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
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
Magne Sjaastad
7dfa84b0d9 AppFwk : Support notification when key is pressed in Line/ComboBox editors 2021-11-17 16:26:47 +01:00
Magne Sjaastad
1b869a9356 #8250 AppFwk : Introduce variadic macros
Use variadic macros to to support optional parameters in initialization macros
2021-11-14 15:26:09 +01:00
Magne Sjaastad
638f926429
cmake-format: Allow dangling parenthesis 2021-09-01 08:13:16 +02:00
github-actions[bot]
223fe756fe
Fixes by cmake-format (#6874) 2020-10-30 12:31:16 +01:00
Magne Sjaastad
2901ad2c54 #6398 System : Remove cotire 2020-08-29 10:30:56 +02:00
Magne Sjaastad
bdc536dfc4 #6106 Apply clang-format on AppFwk 2020-06-19 08:00:01 +02:00
Gaute Lindkvist
2e79cf614f
Refactor and rename QIconProvider -> IconProvider (#5893)
* Refactor and rename QIconProvider -> IconProvider
* Generate icons on demand as unique_ptrs
2020-05-09 11:25:11 +02:00
Magne Sjaastad
a1eb707b02 Add test project including cvf and fix compile issues 2020-05-08 11:28:55 +02:00
Magne Sjaastad
dfaf595551 Fix line endings 2020-05-06 19:02:50 +02:00
Magne Sjaastad
28aafed44b #5883 Update test project with icon colors from field value 2020-05-06 19:02:50 +02:00
Magne Sjaastad
ff1ecdf38e AppFwk Test : Add prototype code for color category triplets 2020-04-27 07:24:31 +02:00
Magne Sjaastad
4b372b438e System : Remove support for Qt4 2020-04-24 11:40:22 +02:00
Magne Sjaastad
502b08ea61 Fix AppFwk dependencies 2020-03-15 19:18:22 +01:00
Magne Sjaastad
32128f0bf3 #4924 AppFwk : Add support for editable combo box 2019-10-24 21:03:17 +02:00
Magne Sjaastad
a9080e14c3 #4722 AppFwk: Rename 2019-09-20 09:54:10 +02:00
Magne Sjaastad
f4cfc750f1 AppFwk : Apply clang-format 2019-09-20 09:52:12 +02:00
Magne Sjaastad
19c93170b3 #4683 System : Exclude QRC files from cotire 2019-09-06 10:52:36 +02:00
Jacob Støren
236b0cb3d4 Support cmake version < 3.12 on the OBJECT type library cafCommandFeatures 2019-09-02 13:39:48 +02:00
Jacob Støren
01921a50ab caf: Create a new CommandFeature libary.
Move Add and Delete command features there.
Implement generic Toggle Commands.
Make library an cmake "OBJECT" library to allow "registering by static initialization".
Add the concept of CurrentContextMenuTargetWidget  into CmdFeatureManager to support the toggle commands.
Updated test application to use the new commands
2019-08-29 11:48:43 +02:00
Gaute Lindkvist
5365f4dd7d Caf build fixes for CEE_USE_QT5 2019-05-31 11:00:32 +02:00
Gaute Lindkvist
10afe4987b #4448 Clean up CAF Qt5-enabling/detection 2019-05-28 15:58:49 +02:00
Gaute Lindkvist
fe0624e304 Fix build problems in cafTestApp following headless changes 2019-05-06 11:48:23 +02:00
Magne Sjaastad
9ae6b79271 #4387 System : Move clang-tidy and clang-format into ApplicationCode
Prepare for format-on-save
2019-05-03 09:15:18 +02:00
Magne Sjaastad
9edd567d42 AppFwk : Fix missing rename in test application 2019-04-05 13:57:24 +02:00
Gaute Lindkvist
6a2e81ca4b #4282 Add a new cafShortenedQLabel class that provides a label that shortens itself when space is limited 2019-04-05 13:05:14 +02:00
Magne Sjaastad
735bd5a4b1 Whitespace 2019-02-22 07:55:57 +01:00
Magne Sjaastad
24bda0fda2 #4116 PdmUiListView: Scroll to the first selected item when activated
This solution does not always work, but scrolls to the first selected item in most cases
2019-02-22 07:52:19 +01:00
Magne Sjaastad
288ee59587 #4066 System : Improve cmake macros for cotire 2019-02-11 07:13:08 +01:00
Magne Sjaastad
bd6bbe9da9 #4020 System : Use ri_apply_cotire() 2019-02-01 06:56:11 +01:00