OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-14 09:33:56 -06:00
Code Issues Packages Projects Releases Wiki Activity
10,971 Commits 26 Branches 61 Tags 309 MiB
7ab9b2a889
Commit Graph

268 Commits

Author SHA1 Message Date
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
Magne Sjaastad
53f1765fd7 Fixed wrong index guarding 2015-09-18 19:39:17 +02:00
Magne Sjaastad
dcf9ac9b50 Check if index is valid when resolving child objects 2015-09-18 18:49:53 +02:00
Magne Sjaastad
6be5be4746 Added macro for pure virtual classes 2015-09-18 13:46:17 +02:00
Magne Sjaastad
dc7735a67d Fixed missing code changes related to previous commit 2015-08-27 11:56:52 +02:00
Magne Sjaastad
492bf96598 Moved Xml related functions from PdmDocument to XmlObjectHandle 
Moved and renamed initAfterReadRecursively, setupBeforeSaveRecursively
and resolveReferencesRecursively to XmlObjectHandle. Updated unit tests.
Removed resolveReferences() from PdmPtrField.
 2015-08-27 11:43:27 +02:00
Magne Sjaastad
4f5f50fb4f Fixed up unit tests 2015-08-27 11:00:49 +02:00
Magne Sjaastad
90b6dd44ee Created infrastructure used to resolve references for ptrFields 2015-08-26 14:48:20 +02:00
Jacob Støren
0ac86aeff3 Fwk: Added convenience methods to access the ui/xml capabilities in objects 2015-08-20 15:22:43 +02:00
Jacob Støren
04368bd8a3 (#349) Removed updateConnectedUIEditors 2015-08-20 10:43:55 +02:00
Jacob Støren
5cd416ce6b (#357) Renamed PdmUiObjectHandle::owner() to objectHandle() 2015-08-14 16:15:49 +02:00
Jacob Støren
d3b1af3724 firstAnchestorOrThisOfType : Initialize returnvalue to NULL 2015-08-14 15:17:03 +02:00
Jacob Støren
f5d15c19e1 firstAnchestorOfType now considers the object itself as well. 
It is thus renamed to firstAnchestorOrThisOfType
 2015-08-14 14:04:47 +02:00
Magne Sjaastad
9cae0e09ff Fixed copyOfTypedObjects 2015-08-14 10:17:32 +02:00
Magne Sjaastad
a1ecc50605 Added CopyReferencesToClipboardFeature 2015-08-14 10:17:31 +02:00
Jacob Storen
47819812bf Fix of Linux compile errors and warnings 2015-08-13 06:23:51 -07:00
Magne Sjaastad
e12a5b62de Renamed to PdmObjectCollection 2015-08-13 13:06:57 +02:00
Magne Sjaastad
2b47793d68 Integrated fix for undo framework. Added virtual destructors. 2015-08-13 13:06:56 +02:00
Jacob Støren
8ad3f9b8c3 Fixed missing parent = NULL, if parentField() is NULL 2015-08-13 11:47:04 +02:00
Jacob Støren
f8518037fe cafPdm: Re-Added PdmObjectHandle::firstAncestorOfType() 2015-08-13 11:38:29 +02:00
Magne Sjaastad
c2fe5f3a16 Added PdmGuardedObjects and use this container from UiListView 2015-08-12 18:27:59 +02:00
Magne Sjaastad
711cc16da1 Added firstAncestorOfType 2015-08-12 11:10:20 +02:00
Magne Sjaastad
005114cc3e Fixed several todo for RimEclipseStatisticsCaseCollection::parentCaseGroup(), removed comments 2015-08-11 18:42:44 +02:00
Magne Sjaastad
c7fca88bdc Allow invalid PdmUiTreeOrdering objects, and display message in Debug 2015-08-11 11:15:30 +02:00
Magne Sjaastad
e3bfca8174 Revert "Improved default parsing of visible items to establish root items in the tree view" 
This reverts commit 550eccc521.
 2015-08-10 21:44:50 +02:00
Pål Hagen
319d9a1aa7 Added new method index() 2015-08-10 16:57:16 +02:00
Magne Sjaastad
550eccc521 Improved default parsing of visible items to establish root items in the tree view 2015-08-09 10:56:52 +02:00
Magne Sjaastad
28aee8ef0d Reintroduced asserts 2015-08-07 12:41:03 +02:00
Magne Sjaastad
ac45fb111b Added missing childObjects() for PtrField and fixed legend tree view visibility for PtrFields 2015-08-06 08:08:15 +02:00
Magne Sjaastad
57e363896f Replaced uiField() and xmlField() with uiCapability() and xmlCapability() 2015-08-05 12:34:07 +02:00
Magne Sjaastad
c09143e706 Intermediate fixes to avoid noise from asserts 2015-08-04 15:57:37 +02:00
Magne Sjaastad
392876dcaa Intermediate fix for fields with multiple parents. Asserts must be reintroduced later. 2015-08-04 14:32:18 +02:00
Magne Sjaastad
7039deed44 Added helper class for read/write to QSettings 2015-08-04 11:46:46 +02:00
Magne Sjaastad
62308340ee Improved comments 2015-08-04 09:26:58 +02:00
Magne Sjaastad
0113d2bd24 Removed obsolete file 2015-08-04 08:42:15 +02:00
Magne Sjaastad
31b3e506e9 Changed container from PdmChildArrayField to std::vector 2015-08-01 23:16:01 +02:00
Magne Sjaastad
92f0d64eaf PdmDocument inherits directly from PdmObject and not PdmObjectGroup 2015-08-01 23:04:04 +02:00
Magne Sjaastad
97c5091d71 Moved static members to public visibility temporarily 2015-07-31 18:48:54 +02:00
Magne Sjaastad
93654de7d7 Added missing include 2015-07-31 18:48:13 +02:00
Magne Sjaastad
58149cbdb9 Copied in RPM/Fwk/AppFwk 
Commented out use of stipple line, as VizFwk is not update yet
 2015-07-29 14:19:43 +02:00
Jacob Storen
3bd9360911 Linux compile fix. 
Needed to move the implementation of copyByType() out of the class definition.
 2015-06-29 03:37:02 -07:00
Jacob Støren
948f4d5d58 Fwk: Added missing "setupBeforeSave" when copying. 
This fixes #110 Copy view function resize/move grid in ResInsight
 2015-06-29 10:48:25 +02:00
Jacob Støren
01cfed9ab7 Fixed crash after copy/paste of view and case 2014-08-28 13:37:56 +02:00
Magne Sjaastad
786f3bbd9c Fwk: Moved static functions to pdmDocument 2014-08-19 10:57:08 +02:00
Magne Sjaastad
659c90e3e9 Fwk: Created a separate update function for uiIconState 2014-08-19 10:38:35 +02:00
Jacob Støren
7a3d90daa4 Removed fvector and replaced with FixedArray. 
Needs replacing with std::array when we get to c++11
 2014-08-14 10:56:21 +02:00
Magne Sjaastad
da108bfb03 Fwk: Moved function call out of initAfterRead 2014-08-14 10:56:15 +02:00
Magne Sjaastad
c579c61404 Fwk: Update enabled state for icons based on object toggle field 2014-08-14 10:56:07 +02:00
Magne Sjaastad
486f383de7 Integrated changes for framework 
Pdm fields can contain a forward declared Pdm object without the include
file
VizFwk: Added VertexColoring shader to be able to use per vertex color
used from drawableGeo::setColorArray()
 2014-04-11 11:06:42 +02:00
Jacob Støren
b23490106e Added IntArray6 2013-12-12 22:18:17 +01:00
Jacob Støren
776ed7755e Improved FixedArray 2013-12-06 14:22:01 +01:00
Magne Sjaastad
19737aa99a Use const access for FixedArray. Added sorting of faults 2013-12-05 09:59:05 +01:00
Jacob Støren
40b4a98498 Fixed error in comment 2013-12-04 11:24:57 +01:00
Jacob Støren
c537d7179b Caf Field: Comments etc. regarding optionvalues 
Fields with option values implicitly have an index based
seUiValue/uiValue interface. This is commented better. Fields of AppEnum
specialization was not quite in line with the rest of the optionValue
system. That is commented and some ifdeffed code has been added to
highlight what could be done when we dare.
 2013-10-18 10:11:57 +02:00
Jacob Støren
86fe500690 caf AppEnum: Added index() method 2013-10-18 10:05:25 +02:00
Magne Sjaastad
2413c4ac2d Fixed const issues on Linux 2013-09-25 15:21:30 +02:00
Magne Sjaastad
ac02a97c39 Improved tree ordering system 2013-09-25 15:06:44 +02:00
sigurdp
f64d9b7e64 Moved CAF to Fwk/AppFwk and moved/renamed VisualizationModules to Fwk/VizFwk 2013-09-20 16:01:20 +02:00