Commit Graph

307 Commits

Author SHA1 Message Date
Gaute Lindkvist
92bcae2805 Add not equals operator to PdmDataValueField 2018-08-27 11:33:02 +02:00
Gaute Lindkvist
208505ee5f Fix Linux build issue with cafSelectionManager 2018-08-22 13:10:18 +02:00
Gaute Lindkvist
12202fe4e6 #3255 Add convenience methods to caf::SelectionManager 2018-08-22 13:04:00 +02:00
Jacob Støren
296854d749 caf: Rename of SelectionRole to SelectionLevel and
CURRENT to FIRST_LEVEL
Replace use of SelectionLevel enum as argument with int
2018-08-21 16:44:19 +02:00
Jacob Støren
0e92c1d594 caf: Replace selection role with selectionLevel.
Use std::map for storage of the different selections
Started to remove the SelectionRole Enum
2018-08-21 16:44:19 +02:00
Jacob Støren
e10754cffb #2607 caf: Add selection level to the "notify selection changed" system 2018-08-21 16:44:19 +02:00
Magne Sjaastad
56bf2ede7d #3222 AppFwk : Improve robustness/maintainability (3) 2018-08-20 08:56:35 +02:00
Magne Sjaastad
26f6eb1dd4 #3222 AppFwk : Improve robustness/maintainability (2) 2018-08-20 08:24:24 +02:00
Magne Sjaastad
cd63332514 #3222 AppFwk : Improve robustness/maintainability 2018-08-20 08:02:36 +02:00
Magne Sjaastad
37369cb0fb AppFwk : Add const 2018-08-20 08:02:36 +02:00
Jacob Støren
096536a341 caf: Use caf::Factory macro for factory registration in field editors. Removed obsolete code 2018-08-17 12:32:40 +02:00
Magne Sjaastad
97c3b9efea #3214 AppFwk : Add function to get referencing objects of specified type 2018-08-15 13:01:11 +02:00
Magne Sjaastad
8425ea96ad #3185 Remove FixedArray 2018-08-07 10:37:52 +02:00
Bjørn Erik Jensen
13e5a3214b #3087 Show plot data. Display tabbed dialog for summary data 2018-07-02 11:45:14 +02:00
Magne Sjaastad
e45ac4d705 AppFwk : Add include 2018-06-29 17:15:28 +02:00
Jacob Støren
99565f62f2 AppFwk: Fix missing type guard in multi select field edit code. Added Assert in updateUI to prevent accidental recursive calling. 2018-06-29 16:23:26 +02:00
Jacob Støren
8e53e2a3cf AppFwk: Remove NotificationCenter from SelectionManager 2018-06-28 09:58:51 +02:00
Jacob Støren
08c78471c3 AppFwk: Introduce SelectionChangedReceiver as a slimmer replacement for NotificationCenter 2018-06-27 17:24:05 +02:00
Jacob Støren
66cec70718 AppFwk: Support field changed on multiple objects in general.
Not only inside the command framework on CURRENT selection
2018-06-27 13:13:24 +02:00
Jacob Støren
ad709d76a2 AppFwk: Change interface of uiOrder insertion to direct insert
Instead of find + insert
2018-06-25 12:57:11 +02:00
Jacob Støren
73a52c4929 AppFwk: Index based uiordering insertion. 2018-06-25 12:57:11 +02:00
Magne Sjaastad
17ee25d0b2 AppFwk : Rename to uiField() and setUiField() 2018-06-15 14:22:03 +02:00
Magne Sjaastad
d7037acedf #3048 AppFwk : Wire up functions for custom context menu
Add PdmUiObjectHandle ::defineCustomContextMenu()
2018-06-15 12:53:32 +02:00
Magne Sjaastad
e8204465f9 #3048 AppFwk : Add setCustomContextMenuEnabled to PdmUiItem 2018-06-15 12:53:32 +02:00
Magne Sjaastad
e370dee3b0 #3037 Rename using Q for table view model and tree view model 2018-06-11 11:16:39 +02:00
Gaute Lindkvist
68f965f6bb Fix Linux build problem with cafAsyncObjectDeleter 2018-06-08 13:18:30 +02:00
Gaute Lindkvist
5f766e5228 #3013 Make sure all existing connections for PdmObjects are removed before async delete
* Clear all PdmPointer connections (including selection manager)
* Send all threads to the new caf::AsyncWorkerManager which can join the threads
  before program exit if the caller has asked for that.
2018-06-08 12:58:59 +02:00
Bjørn Erik Jensen
73c49b4ce9 Fwk. Fix missing config name bug 2018-05-31 10:24:16 +02:00
Gaute Lindkvist
743993718c #2873 New AsyncPointerVectorDeleter-classes to handle memory deletion in separate thread. 2018-05-23 14:38:25 +02:00
Gaute Lindkvist
772e7ec7e6 Revert "#2873 Delegate deletion of summary cases to separate thread."
This reverts commit 0089e0c218.

Didn't intend this to go into dev now
2018-05-22 09:22:12 +02:00
Gaute Lindkvist
0089e0c218 #2873 Delegate deletion of summary cases to separate thread. 2018-05-22 09:21:40 +02:00
Bjørn Erik Jensen
0e8eae33db #2818 Selection manager. Add strict method variant 2018-05-07 09:46:45 +02:00
Magne Sjaastad
2e122d2ab3 #2554 Regression Test : Move serialization code into RiaRegressionTest 2018-03-07 09:30:15 +01:00
Magne Sjaastad
3fbce58fa5 #2536 Build System AppFwk : Several updates
Simplified automoc
Use target_include_directories and target_link_libraries
Use CMake 2.8.12
2018-02-27 18:37:11 +01:00
Magne Sjaastad
65c3d6ff12 #2536 Build System AppFwk : Use target_include_directories 2018-02-27 17:19:23 +01:00
Magne Sjaastad
309b1f0749 AppFwk Clang : Reorder initialization order to match declaration order 2018-02-23 19:43:48 +01:00
Magne Sjaastad
3239c66f54 AppFwk (clang-tidy) : modernize-use-nullptr 2018-02-18 18:05:08 +01:00
Magne Sjaastad
950617af96 AppFwk : Fix assignment of float value 2018-02-18 17:42:28 +01:00
Magne Sjaastad
2ff5842f28 Clang : Avoid special template helper on Windows 2018-02-12 20:12:04 +01:00
Magne Sjaastad
1419865b89 #2411 AppFwk : Increase precision when writing real numbers to XML 2018-01-26 15:08:40 +01:00
Magne Sjaastad
76b84cbb17 #2361 AppFwk : Make sure field of FilePath supports space, add more tests 2018-01-17 14:32:47 +01:00
Magne Sjaastad
c0d9ef67fa #2361 AppFwk : Make sure identical strings are separated by semicolon 2018-01-17 14:32:47 +01:00
Magne Sjaastad
bf1b755dc8 #2361 AppFwk : Improve robustness of load and save of FilePath 2018-01-12 14:56:05 +01:00
Jacob Støren
57b521c6d9 AppFwk: Add a guarded interface pointer class 2018-01-12 12:01:04 +01:00
Magne Sjaastad
97822cbd2c #2361 AppFwk : Template specialization of stream operator for vector of FilePath 2018-01-11 13:50:26 +01:00
Magne Sjaastad
f86b13adc8 #2361 AppFwk : Add cafFilePath and conversion to QVariant 2018-01-11 13:50:26 +01:00
sigurdp
8c8970cec0 Made PdmChildArrayField::index() const, #1873 2017-12-19 11:02:27 +01:00
Magne Sjaastad
d15808efe6 AppFwk : Add support for output of object and field keywords 2017-12-15 17:01:33 +01:00
Jacob Støren
7ddd5ca7d7 Add some reference code to help improve the CAF_ASSERT at a later point in time. 2017-12-08 16:56:42 +01:00
Magne Sjaastad
13ac632350 AppFwk : Show field tooltip info if debug info is available 2017-12-08 12:47:38 +01:00
Magne Sjaastad
e6805d947b #2098 AppFwk : Add optional display of field keyword in tooltip text 2017-11-08 11:29:41 +01:00
Magne Sjaastad
bd25c9bc9f AppFwk : Add childObjects() to PdmChildArrayField 2017-11-07 20:20:45 +01:00
Magne Sjaastad
257a5c18d2 #2083 AppFwk : Add notification when widgets are created 2017-11-02 08:50:07 +01:00
Bjørn Erik Jensen
f229ce5c23 PdmStreamOperator. Set timespec to UTC for QDateTime fields during project load 2017-10-27 09:35:38 +02:00
Magne Sjaastad
58b062cbdf #2037 AppFwk : Add support for calling updateUi on all object editors
This function is intended to be called when an object is created or deleted to make sure object editors holds valid data
2017-10-27 08:22:14 +02:00
Magne Sjaastad
22159a1c63 System : Simplify access to selected objects 2017-10-19 10:11:14 +02:00
Magne Sjaastad
64a8a07f6a AppFwk : Add disableIO() to PdmXmlFieldHandle 2017-10-03 15:23:44 +02:00
Jacob Støren
f4eadc5cef AppFwk: Addjust default implementation of equal comparisons for QVariant encapsuled field content types that are not directly supported by Qt.
Should now work in most cases, where as it always returned "false" before this fix
2017-09-23 08:26:21 +02:00
Magne Sjaastad
f45d065ac2 AppFwk : Add documentation for how do define OptionItemInfos 2017-09-20 10:06:57 +02:00
Magne Sjaastad
7ebc922541 AppFwk : Return reference to QTextStream for << and >> operator overloads 2017-09-20 10:06:57 +02:00
Magne Sjaastad
9d7dcefc78 (#1883) AppFwk : Refactor of WidgetBasedObjectEditor and friends 2017-09-13 07:16:18 +02:00
Magne Sjaastad
d40a7f11c6 #1883 AppFwk : Add const access functions 2017-09-13 07:08:58 +02:00
Magne Sjaastad
59e818f2b8 AppFwk : Guard against null pointer access 2017-09-13 07:08:06 +02:00
Magne Sjaastad
33e94c447b #1830 AppFwk : Rename to isReadOnly and disable these items in tree view 2017-09-08 07:47:23 +02:00
Magne Sjaastad
2f22f82ba1 #1867 AppFwk : Add PdmUiFieldEditorHandle::updateLabelFromField 2017-09-07 14:56:10 +02:00
Magne Sjaastad
aef886a26e #1830 AppFwk : Add heading concept 2017-09-07 14:56:09 +02:00
Magne Sjaastad
9eab559272 #1830 AppFwk : Add level to PdmOptionItemInfo 2017-09-07 14:56:09 +02:00
Magne Sjaastad
5e6547c0c5 #1830 AppFwk : Move members to private and use getter functions 2017-09-07 09:33:33 +02:00
Magne Sjaastad
7181584657 #1830 AppFwk : Add const to constructors 2017-09-07 09:33:05 +02:00
Jacob Støren
0af879d20e Add simplified UML diagrams for Pdm 2017-09-05 12:31:16 +02:00
Magne Sjaastad
c18e9c1293 #1833 AppFwk: Add support for dynamic labels on group-boxes 2017-08-28 15:14:15 +02:00
Magne Sjaastad
83e663ae13 System : Add caf namespace prefix 2017-08-17 14:06:57 +02:00
Magne Sjaastad
3bbc1c9885 System - Add pthread to unit test link parameters 2017-07-19 16:28:17 +02:00
Magne Sjaastad
ac3abc78da System - Add missing include on Linux 2017-07-19 16:26:11 +02:00
Magne Sjaastad
5a7755fe0c System : PdmPtrField - Remove PdmPointer interface and add operator() 2017-06-30 15:06:01 +02:00
Bjørnar Grip Fjær
45f5b5a80a Make more const accessors available 2017-05-29 12:56:40 +02:00
Magne Sjaastad
530400fb28 #1401 Notify model change when feature is activated 2017-04-20 10:17:05 +02:00
Magne Sjaastad
82b6e4b8f2 #1401 Add ModelChangeDetector 2017-04-19 22:25:31 +02:00
Jacob Støren
cde71ef07a #1344 AppFwk: Renamed methods in uiTreeOrdering to align with uiOrdering 2017-03-22 15:57:04 +01:00
Jacob Støren
c77e674601 #1344 AppFwk: Cleaning up in PdmUiOrdering 2017-03-22 15:02:06 +01:00
Magne Sjaastad
df3ef7106d #1340 AppFwk : Improve how defineUiOrdering handles remaining fields 2017-03-21 13:47:53 +01:00
Jacob Støren
888db49d6c #1337 Caf: Preserve the user collapse settings for each object type within session.
Provide means to set groups collapsed by default in the defineUiOrdering method, and to force the setting disregrding the user actions
2017-03-20 22:12:07 +01:00
Magne Sjaastad
c3bf064661 #1260 Use std::abort instead of assert for release asserts 2017-03-10 14:28:22 +01:00
Magne Sjaastad
6791600d03 #1260 Replaced assert() with CAF_ASSERT() in AppFwk 2017-03-08 08:19:51 +01:00
Magne Sjaastad
a16a0a3bb5 #1260 Added assert that will display message in release (in addition to debug) 2017-03-07 15:45:34 +01:00
Magne Sjaastad
914b1fcab6 Replaced tab with four spaces 2017-03-07 15:43:29 +01:00
Magne Sjaastad
6a3f3e3670 Revert "#1292 Fixed CppCheck Issues in ProjectDataModel : Added assert"
This reverts commit cff588f166.
2017-03-07 12:24:35 +01:00
Magne Sjaastad
cff588f166 #1292 Fixed CppCheck Issues in ProjectDataModel : Added assert
Access the variable to silence CppCheck
2017-03-07 12:09:26 +01:00
Magne Sjaastad
b365834923 #1292 Fixed CppCheck Issues in AppFwk : Removed assign/copy operators 2017-03-07 11:14:29 +01:00
Magne Sjaastad
63baebc698 #1292 Fixed CppCheck Issues in AppFwk/cafProjectDataModel 2017-03-06 19:03:31 +01:00
Magne Sjaastad
a5ed533c00 Improved unit test so they run correctly in debug 2017-03-06 18:33:03 +01:00
Magne Sjaastad
2b029cbc11 #1280 Use nullptr instead of NULL 2017-03-02 18:30:33 +01:00
Magne Sjaastad
3089abc83d #1280 Added firstAncestorOrThisOfTypeAsserted 2017-03-02 18:30:33 +01:00
Magne Sjaastad
38485fd96d Added caf prefix to virtual methods 2017-02-22 13:02:05 +01:00
Magne Sjaastad
03adf8f759 #1232 Delete child objects in destructor of ChildField and ChildArrayField 2017-02-17 11:37:26 +01:00
Jacob Støren
392dfac190 AppFwk: Made updateUiIconFromState handle dynamically assigned icons, and become uiConfigName aware. 2017-02-15 18:29:01 +01:00
Magne Sjaastad
8c01c23e5e #1156 Added tristate class and checkbox editor with tristate support 2017-02-01 09:52:01 +01:00
Magne Sjaastad
6528d243fe AppFwk : Use namespace prefix for parameters
When using Visual Assist for automatic implementation of virtual functions, the namespace must be included to be able to compile the generated code without any changes.
2017-01-26 11:51:52 +01:00
Magne Sjaastad
0a00f15e5d Removed whitespace 2017-01-26 11:31:04 +01:00
Jacob Støren
8004e766ea AppFwk: Improved the message when forgetting to delete a child object 2017-01-19 17:58:00 +01:00
Magne Sjaastad
239322ba50 AppFwk : Removed assert guard, to prepare for delete of contained object 2017-01-13 13:32:17 +01:00
Magne Sjaastad
5d9fd5ddeb #1064 Use constexpr to verify keywords for pdmObject and pdmFields 2017-01-07 08:59:19 +01:00
Jacob Støren
8562d0e98b Merge with Flow Gui additions 2016-12-14 11:16:08 +01:00
Jacob Støren
c555f77a71 AppFwk: Added a convenince constructor to PdmOptionItemInfo to make it easier to use PdmPtrField 2016-12-14 09:12:27 +01:00
Magne Sjaastad
0f630c1f22 System : Added const to functions related to write of field data 2016-12-09 21:17:06 +01:00
Magne Sjaastad
a70939f1b6 #1000 System : Prepare for handling of copy/paste actions 2016-11-24 08:21:59 +01:00
Magne Sjaastad
07a38b6eaf #967 AppFwk : Improved performance of PdmOptionItemInfo::findValues 2016-11-10 08:46:54 +01:00
Jacob Støren
296dac48d3 Removed a call to uiValue() that was not preceeded with valueOptions().
Understood that this is an inherent problem with those two methods, and made a comment on that.
2016-11-04 08:03:22 +01:00
Magne Sjaastad
454805b9de #922 AppFwk : Introduced PdmUiFieldHandleInterface and made setValueFromUiEditor private 2016-10-20 11:31:11 +02:00
Magne Sjaastad
96e532696e #922 AppFwk : Added setValueWithFieldChanged 2016-10-19 15:04:30 +02:00
Jacob Støren
c3eb692afe Merge with branch 'dev' 2016-10-13 12:44:44 +02:00
Jacob Støren
eb066a71b0 caf: Finally removed the enum-index-based communication used in the optionValueLists for AppEnums. Now custom option menues based on AppEnums can use the enum values naturally instead of the enum index. 2016-10-13 12:11:32 +02:00
Magne Sjaastad
8ae75b5f27 AppFwk : Added concept of isUiTreeHidden and isUiTreeChildrenHidden 2016-10-12 10:08:08 +02:00
Magne Sjaastad
531aaaa445 AppFwk : Fixed typo of firstAncestorOrThisOfType 2016-09-21 13:59:41 +02:00
Magne Sjaastad
59afd14339 AppFwk : Added descendantsIncludingThisOfType 2016-09-21 13:03:55 +02:00
Jacob Støren
1a3d8a13af Made uiCapability and xmlCapability const 2016-08-24 15:16:34 +02:00
Magne Sjaastad
e031f89dcc Merged from maintenance branch 2016-08-05 12:13:13 +02:00
Magne Sjaastad
c5d4519eb1 #282 Added category list if category values are present 2016-08-05 10:26:47 +02:00
Jacob Støren
80cdb9dbaf Caf: Adjusted output of references from PtrArrayField 2016-06-20 16:51:36 +02:00
Jacob Støren
eaf6bb6768 Caf: Improved reference parsing by using regexp for splitting an any whitespace 2016-06-20 16:50:47 +02:00
Jacob Støren
4a19589d36 Caf: Linux compile fixes: Missing includes 2016-06-20 00:04:09 +02:00
Jacob Støren
327e8cf64b Caf: Added PdmPtrArrayField to be used in ResInsight as multi select of summary cases 2016-06-19 21:36:44 +02:00
Jacob Støren
0b7abb0cab Caf: Added specialization for PdmPointer<T>.
Preparations for PtrArrayField. Made isEqual use QVariant::value<T>()
2016-06-19 21:36:44 +02:00
Jacob Støren
f2da9bfea1 Caf: Small Adjustments 2016-06-19 21:36:44 +02:00
Jacob Støren
45cf15a941 Caf: PtrFields must not return any childObjects. Fixed Legend definition Object below EclipseCellColor as a consequence. Discovered due to Summary Plot case pointer 2016-06-16 16:55:02 +02:00
Jacob Støren
214f013499 Caf: Fixed issues regarding custom type in fields with multi selection 2016-06-16 16:55:02 +02:00
Jacob Støren
e1fa9aa9f3 Caf: Corrected the spesialization of field of vector and list equality compare, which is supposed to be pr. element 2016-06-16 16:55:02 +02:00
Magne Sjaastad
ef64dc9b62 cotire : Boolean variables are now unique globally in the project 2016-06-10 14:01:41 +02:00
Jacob Støren
c2e62c60ba caf: Added an option on ui fields to not add their value to the list of options if the option does not exist. 2016-06-09 11:08:12 +02:00
Magne Sjaastad
c046e52aff cotire : Boolean variables are now unique in the project and not local to file they are defined in 2016-06-08 12:13:49 +02:00
Jacob Støren
286c434d3a caf: Added assert to guard against forgetting to add the fields using the init field macros 2016-05-31 13:48:22 +02:00
Jacob Støren
d90a6041aa caf: Added CAF_PDM_ABSTRACT_SOURCE_INIT alias 2016-05-31 13:48:22 +02:00
Magne Sjaastad
b9286dcd1d [AppFwk] Updated destructors in unit tests to make sure memory is released correctly 2015-12-22 11:10:50 +01:00
Jacob Støren
891bce069d (#587) Fixed missing initialization. Will probably fix this issue 2015-12-14 14:37:00 +01:00
Magne Sjaastad
a86d24df97 Fwk : Added DEBUG assert to detect when data is present in child fields
Added assert for ChildArrayField and ChildField
2015-12-09 13:34:13 +01:00
Magne Sjaastad
147580e342 Linux fix 2015-11-26 05:54:43 -08:00
Magne Sjaastad
3a3d28003b [Fwk] Use PdmValueFieldSpecialization instead of QVariant constructor 2015-11-26 14:22:52 +01:00
Magne Sjaastad
3e9e5779ab [Fwk] Updated headers and added unit tests, fixed minor issues related to text stream operator overload 2015-11-26 14:22:51 +01:00
Magne Sjaastad
1bdb68e3d7 [Fwk] Moved ProjectDataModel unit test 2015-11-26 14:22:50 +01:00
Magne Sjaastad
1f91405c50 [Fwk] Propagate return value from QFile::open in writeFile() to caller 2015-11-20 10:49:23 +01:00
Magne Sjaastad
13c5dbfbd2 [Fwk] Do not show children if object hides children 2015-11-18 15:55:23 +01:00
Magne Sjaastad
fb55b469a0 System : Replaced tab with four spaces in AppFwk 2015-10-23 15:21:45 +02:00
Magne Sjaastad
d2b5d7ae92 System : Added iterators and at() to ChildArrayField 2015-10-23 09:45:32 +02:00
Magne Sjaastad
5b99439ed8 (#573) Added new copy method for PdmObjects
Added copy method to XmlObjectHandle, and use this method from
PasteEclipseCases
2015-10-23 09:00:17 +02:00
Jacob Storen
10046eed4a Linux fixes 2015-10-14 07:13:45 -07:00
Magne Sjaastad
8698291e7d (#566) Major rewrite of how to build and update PdmUiTreeOrdering items
Removed findChildItemIndex() which caused performance issues for large
models. Replaced with a new algorithm using std::map. Added unit tests
2015-10-14 13:32:35 +02:00
Magne Sjaastad
bcc5d636f8 (#566) Performance: Use set to detect if an object already has been inserted in UiTreeOrdering 2015-10-14 13:23:54 +02:00
Magne Sjaastad
8e03c38901 Return root if reference is empty 2015-10-06 16:12:17 +02:00
Magne Sjaastad
bbc6fb1511 Minor refactor of ReferenceHelper
Removed some asserts
Added more unit tests
2015-10-06 15:03:55 +02:00
Jacob Støren
49ab79219e Fixed crashes regarding general handling of NULL pointers in Child Arrays 2015-09-25 15:24:21 +02:00