Commit Graph

450 Commits

Author SHA1 Message Date
Gaute Lindkvist
15ae290f1d Disconnect parent from all signals when detaching from parent 2020-09-17 08:22:00 +02:00
Gaute Lindkvist
d3152f5030 Get rid of caf::DeleteSignal 2020-09-17 08:22:00 +02:00
Kristian Bendiksen
de7d425474 #6491 Add override keyword in cafPdm* to silence clang warnings. 2020-09-14 21:46:27 +02:00
Kristian Bendiksen
519bbf3174 #6491 Fix incomplete type caf::PdmUiItem when building with clang 2020-09-14 21:46:27 +02:00
Gaute Lindkvist
d08444ec77 #6437 Fix Signal crash and improve signal code
* The crash fix is ensuring we don't loop through m_disconnectCallbacks
  in DeleteSignal::send()
* This is because the callback will end up calling disconnect
  which in turn erases the entry from m_disconnectCallbacks,
  invalidating the iterators used in the loop.
2020-09-04 19:37:45 +02:00
Gaute Lindkvist
69f13b1015 #6360 Fix stacking issues 2020-08-31 08:33:55 +02:00
Magne Sjaastad
2901ad2c54 #6398 System : Remove cotire 2020-08-29 10:30:56 +02:00
Gaute Lindkvist
f82b2f73ec #6320 Refactor of PdmScripting
* Make base class abstract
* Implement support for IOHandling for PdmChild and PdmChildArray fields
2020-08-25 08:33:47 +02:00
Gaute Lindkvist
454e7f17a0 #6322 Fix Python 3.8 problems
* Change base PdmObject class name to PdmObjectBase to avoid name conflicts
* Make all import paths relative
2020-08-24 09:40:36 +02:00
Gaute Lindkvist
86a4f5613c Major improvements to D&D of curves. 2020-08-10 12:58:53 +02:00
Gaute Lindkvist
9393c27b13 Improved naming following review 2020-08-10 09:17:46 +02:00
Gaute Lindkvist
1ad1f7cc05 #6258 General way of reordering child items in the tree view 2020-08-10 09:17:46 +02:00
Gaute Lindkvist
31246b59f3 #6266 Fix unwanted selection change when changing window focus 2020-08-10 09:17:46 +02:00
Gaute Lindkvist
f202f4b8a7 Add caf::Signal::observerCount() and unit test for it 2020-07-27 08:47:01 +02:00
Gaute Lindkvist
dd2917e4af caf::Signal unit tests 2020-07-27 08:47:01 +02:00
Gaute Lindkvist
99762831bd Handle deletion of SignalObservers
Add a beingDeleted signal called in the SignalObserver destructor.
2020-07-27 08:47:01 +02:00
Gaute Lindkvist
088f48f41d Make it possible to block signals 2020-07-27 08:47:01 +02:00
Gaute Lindkvist
beaf4ebd5a Implement signal handler 2020-07-27 08:47:01 +02:00
Gaute Lindkvist
6856597770 Implement stacked well log curves 2020-07-27 08:47:01 +02:00
github-actions[bot]
b2043f7fe4 Fixes by clang-format 2020-06-19 08:05:33 +02:00
Magne Sjaastad
bdc536dfc4 #6106 Apply clang-format on AppFwk 2020-06-19 08:00:01 +02:00
Magne Sjaastad
e3960f13f1 AppFwk : Add border to icons with one color 2020-06-18 09:01:44 +02:00
Magne Sjaastad
4ff1f54e16 AppFwk : Add border to color gradient icons 2020-06-17 14:37:14 +02:00
Gaute Lindkvist
8f359d8a92 Fix problem with storing font sizes 2020-06-10 09:10:24 +02:00
Gaute Lindkvist
664dc03c5b Set a lower limit to available font size 2020-06-08 12:32:52 +02:00
Kristian Bendiksen
23202c9f15 #6018 Remove unnecessary caf::FilePath assignement operator
In C++11 implicit generation of the copy constructor is deprecated if the
class has a user-declared copy assignment operator or a user-declared destructor.
2020-06-03 22:06:30 +02:00
Kristian Bendiksen
8f5edbf5b0 #6029 Fix unsigned/signed comparison in Fwk tests. 2020-06-03 22:06:30 +02:00
Kristian Bendiksen
16c3ce1ca2 #6029 Update test helper to new gtest version. 2020-06-03 22:06:30 +02:00
Kristian Bendiksen
2eb18d8151 #6029 Upgrade gtest to v1.10 for Fwk/. 2020-06-03 22:06:30 +02:00
Gaute Lindkvist
4627e542ba Move caf::FontTools enum setups into caf namespace 2020-06-03 14:16:45 +02:00
Gaute Lindkvist
2c1ee33d54 Enable setting preferred size in caf::IconProvider 2020-06-03 14:00:04 +02:00
Gaute Lindkvist
9130030d7b #5882 Add color gradient as icon for legend palettes. 2020-06-03 14:00:04 +02:00
Gaute Lindkvist
2fe4372dc2 First round of caf::FontTools 2020-06-03 14:00:04 +02:00
Kristian Bendiksen
c366e85682 Refactor delete operations for pdm objects. 2020-05-22 07:02:53 +02:00
Gaute Lindkvist
641d6e2384 #5902 Fix missing labels due to IconProvider 2020-05-11 12:28:47 +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
e422618138 #5883 Icons : Add support for overlay pixmap 2020-05-06 19:02:50 +02:00
Kristian Bendiksen
6de9288597 Silence warnings about unused "type" variable in cafPdm*. 2020-04-30 12:46:50 +02:00
Magne Sjaastad
4b372b438e System : Remove support for Qt4 2020-04-24 11:40:22 +02:00
Gaute Lindkvist
9fcfe4fa84 Merge branch 'dev' into feature-analysis-plots-initial 2020-04-22 16:17:09 +02:00
Gaute Lindkvist
7e3fc1c886 Parameter result cross plot 2020-04-17 19:24:12 +02:00
Magne Sjaastad
3c05fff768 Output field keyword alias names 2020-04-17 13:55:49 +02:00
Magne Sjaastad
66081790dd Move cafPdmField 2020-04-17 13:54:10 +02:00
Magne Sjaastad
77ce1d9fc5 #5749 Python : Add support for std::vector as return value of a function 2020-04-17 13:54:10 +02:00
Magne Sjaastad
32daa567ed Move cafPdmField 2020-04-01 07:21:49 +02:00
Magne Sjaastad
bc56c807c1 #5749 Python : Add support for std::vector as return value of a function 2020-03-31 14:03:14 +02:00
Magne Sjaastad
502b08ea61 Fix AppFwk dependencies 2020-03-15 19:18:22 +01:00
Magne Sjaastad
f216bf8d6a
Python doc improvements (#5669)
* Add tests to xml data type inspection
* Add baseline for testing of PdmScripting
* #5631 Generate doc for Python
2020-03-12 07:45:52 +01:00
Gaute Lindkvist
c51aa91c42
#5632 Python method commands (#5649)
* General PdmObjectMethods for scripting.
2020-03-10 14:11:22 +01:00
Gaute Lindkvist
b77c057e7d Python fixup after code review 2020-03-05 11:09:07 +01:00
Gaute Lindkvist
bd8e079e24 #5632 Generate PdmChildField and PdmChildArrayField methods 2020-03-05 08:40:46 +01:00
Gaute Lindkvist
508d8806e6 Rename PdmXmlFieldHandle::childClassKeyword to dataTypeName to reflect that it will contain names for built in types 2020-03-05 08:40:46 +01:00
Gaute Lindkvist
554f9a1758 Translate data types to Python data types for Python generation 2020-03-05 08:40:46 +01:00
Gaute Lindkvist
b2f55a3101 Make scriptability a CAF-feature 2020-03-05 08:40:46 +01:00
Gaute Lindkvist
2cea7c0321 Implement proxy field python methods 2020-03-05 08:40:46 +01:00
Gaute Lindkvist
1353835bd8 CAF: Move keyword aliases from PdmXmlFieldHandle to PdmFieldHandle 2020-02-25 16:04:53 +01:00
Gaute Lindkvist
d95f3a349d Move to use a static registry of scriptable classes 2020-02-25 13:57:51 +01:00
Gaute Lindkvist
c63c7f2eac CAF: Support class keyword aliases and a scriptable feature
* Also store class keyword in fields so they can be assigned to the correct Python object
  even if the class itself is abstract.
2020-02-25 13:57:51 +01:00
Gaute Lindkvist
83a7ceb204 CAF: expose inheritance stack and make sure we can alias class keywords 2020-02-25 13:57:51 +01:00
Gaute Lindkvist
82cf721ae8 CAF: support aliases for keywords in case of renaming 2020-02-25 13:57:51 +01:00
Magne Sjaastad
2b45a9af7f #5553 AppFwk : Add root in PtrField reference string 2020-02-17 09:11:23 +01:00
Gaute Lindkvist
0d67a179ef #5385 Make QShortenedLabel slightly longer 2020-02-03 10:03:34 +01:00
Gaute Lindkvist
e4ffa5d7b9 #5388 Add a CAF-feature to get the ancestor of a type (but not this) 2020-01-27 13:50:15 +01:00
Magne Sjaastad
4e3a894464 #5370 Unity Build : Add config for AppFwk 2020-01-23 13:37:29 +01:00
Gaute Lindkvist
954bf1e02e Support setting of child fields from Python and pass in WbsParameters if provided
Also fixes #5354
2020-01-22 09:28:46 +01:00
Gaute Lindkvist
6082d0dd2f Add a getter in addition to the () operator for caf::AppEnum
* The operator can be awkward to use currently with class enums
2020-01-16 14:33:33 +01:00
Magne Sjaastad
29e6b09ee9 #5339 AppFwk : Fix robustness for serialization of PdmPtrArrayField 2020-01-15 22:47:02 +01:00
Jacob Støren
e4eea67a4e Fix error in cafFilePath QVariant isEqual operator 2019-12-12 16:09:20 +01:00
Gaute Lindkvist
9c458ec3ba Fixed typo in comment SFINA -> SFINAE 2019-12-06 08:13:31 +01:00
Gaute Lindkvist
c4951a5a03 Enable the use of the C++11 enum class in caf::AppEnum 2019-12-06 08:13:31 +01:00
Magne Sjaastad
1193a9c61e AppFwk : Guard use of front() on empty list 2019-12-02 15:02:10 +01:00
Gaute Lindkvist
85d683634c Further refactoring 2019-11-20 13:14:45 +01:00
Gaute Lindkvist
228810fd05 Refactor view id 2019-11-20 13:14:45 +01:00
Jacob Støren
277f8c8b7a #4969 Fix Well path and annotation draggers not visible and does not work in comparison view 2019-11-06 14:13:01 +01:00
Magne Sjaastad
32128f0bf3 #4924 AppFwk : Add support for editable combo box 2019-10-24 21:03:17 +02:00
Magne Sjaastad
35004ef7b2 #4843 AppFwk : Remove debug output to avoid noise 2019-10-09 13:07:19 +02:00
Gaute Lindkvist
2961782be1 Renamed caf::PdmXmlObjectHandle::isOfClassKeyword to ::inheritsClassWithKeyword 2019-10-09 09:26:30 +02:00
Gaute Lindkvist
11117383db
#4817 #4830 #4832 #4837 #4839 Python commands for WBS creation, well path import and well log file import (#4838)
* Better minimum width for well log tracks

* Fix alignment of scrollbar in Well log plots

* Better Well Log Plot export

* Hide scroll bar before plotting
* Better borders

* Create plots through Python

* #4817 Create WBS plots with Python

* Rebase Summary and WellLogPlot on top of a new RimPlot

* Also Python: Allow setting folder as a parameter to export_snapshots

* #4832 Prepare for well path import command

* Well Path import WIP

* #4830 #4832 Import well paths and well log files from file using Python.

* #4837 Implement import of formation names in Python

* Fix debug build issue

* Fix RiaLogging build issue

* Fix warnings

* Yet another RiaLogging.h import added

* #4839 Import exporting of las and ascii files from well log plots
2019-10-09 09:21:28 +02:00
Jacob Støren
bfff15568d #4712 Fix stray widgets in Plot Property Panel
Added comments showing that the reason is mainly deleteLater beeing called outside all event loops
2019-09-25 13:09:47 +02:00
Magne Sjaastad
01c615889b AppFwk : Add accessor functions to xml reference string 2019-09-18 14:17:49 +02:00
Magne Sjaastad
60b4078829 AppFwk : Guard for null pointer access 2019-09-18 14:17:44 +02:00
Gaute Lindkvist
199e119bbf #4662 Fix erratic behaviour in Tree Selection Editor 2019-09-03 14:42:01 +02:00
Gaute Lindkvist
7ab9b2a889 #4654 Fix QVariant comparisons with std::vector<T> data types 2019-09-02 15:12:22 +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
Jacob Støren
2784f5ce11 caf: notifyFieldChange now uses the QVariant content data when checking for equality 2019-08-28 10:12:54 +02:00
Gaute Lindkvist
e58da136e3
#2082 Support custom date time format (#4594)
* #2082 Support custom date time format

* Clang-format
2019-08-19 09:37:42 +02:00
Gaute Lindkvist
439913b7b1 #4423 First implementation of PdmObject exchange 2019-07-15 12:30:31 +02:00
Jacob Støren
b802937657 Fwk: Added the variable CEE_USE_QT5 as an option in pdmCore and LibGuiQt, to make it visible in the Cmake Gui. 2019-06-25 16:51:45 +02:00
Jacob Støren
ce91cc3cc2 AppFwk: PdmSettings: Added methods that reads and writes (only) valuefields of an object properly 2019-06-25 16:50:03 +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
0544b19afe Fix carriage return difference in CafPdmModel_UnitTests 2019-05-28 15:58:48 +02:00
Gaute Lindkvist
8f3eb6a748 Add Qt5 test to AppFwk main CMakeLists.txt and update CAF to use CEE_USE_QT5 2019-05-28 15:58:48 +02:00
Gaute Lindkvist
af1a5790a2 Fix crash in some unit tests from constructing a QPixmap without a QApplication 2019-05-06 13:35:05 +02:00
Magne Sjaastad
911b69b56f #4388 AppFwk : Make sure context menu policy is set correctly in all use cases 2019-05-06 11:58:06 +02:00
Magne Sjaastad
a852d1a50e #4388 AppFwk : Rename and rewrite of PdmUiFieldHandle::notifyFieldChanged 2019-05-06 11:58:06 +02:00
Jacob Støren
01ac756314 AppFwk: Added a parent editor concept, and adjusted the update regime to make embedded editors trigger update of the containing editor. Removed the update of the fields owner object, which causes trouble for table editors and some derived object editors. 2019-05-06 11:58:06 +02:00
Gaute Lindkvist
30769d7f2a Rename caf::PdmUiItem::setUiIcon(QString) to setUiIconFromResourceString 2019-05-06 11:08:59 +02:00
Gaute Lindkvist
57b33b0d4c
First implementation of Headless (#4392)
* Revert "#4377 Octave : Use RiaLogging for error messages instead of QErrorMessage "

This reverts commit f758a8edb2.

* Revert "#4380 Preferences : Changing scene font size when geo mech view is open causes crash"

This reverts commit df62a41397.

* Revert "#4379 Documentation : Update command line parser for import of summary files"

This reverts commit d0b5357ed4.

* Unfinished WIP

* Builds but crashes

* Refactored code now builds and runs

* ResInsight can now run the unittests headless

* Can run some command files successfully

* Build on Linux

* Extra headless hack header

* Moved PdmUiItem hack to cpp file

* Fix headless crash in RimWellAllocationPlot

* Handle error gracefully if ExportSnapshots command is executed from console

* Add caf::QIconProvider and remove some hacks

* Also made the greying out of disabled icons work for a couple of cases where it didn't.

* Linux build fix

* #4380 Reimplement fix df62a41397 by @magnesj on top of Headless code changes

* #4379 Reintroduce kode from d0b5357ed4 by @magnesj

* #4377 Restore f758a8edb2 in new Headless code
2019-05-06 10:36:05 +02:00
Magne Sjaastad
4c46573fc9 Reintroduce "#4308 System : Add virtual function childFieldChangedByUi"
This reverts commit 91022a7535.
2019-05-03 12:13:11 +02:00
Magne Sjaastad
91022a7535 Revert "#4308 System : Add virtual function childFieldChangedByUi"
This reverts commit fbf9308e2b.
2019-05-03 11:16:09 +02:00
Magne Sjaastad
fbf9308e2b #4308 System : Add virtual function childFieldChangedByUi 2019-04-10 13:55:44 +02:00
Gaute Lindkvist
72052377dc #4305 Adjust size of layouts and labels if the sizeHint has changed 2019-04-09 13:53:33 +02:00
Gaute Lindkvist
c0f3258f19 Work in progress 2019-04-09 10:30:15 +02:00
Magne Sjaastad
387d7cf7c2 System : Use appropriate mode when displaying a cmake message 2019-04-08 12:32:14 +02:00
Gaute Lindkvist
0110e9a0c3 #4282 Make Editor labels use preferred size rather than maximum for expansion. 2019-04-05 13:05:48 +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
Gaute Lindkvist
038d7a7676 #4097 Implement stretch factors for editors 2019-04-04 11:19:35 +02:00
Gaute Lindkvist
117731a24a #4192 Add swap axis and update property editor 2019-03-12 14:34:22 +01:00
Gaute Lindkvist
fac9870c76 Rework caf Layout to work better when number of columns isn't fully specified 2019-02-11 15:48:01 +01:00
Magne Sjaastad
288ee59587 #4066 System : Improve cmake macros for cotire 2019-02-11 07:13:08 +01:00
Magne Sjaastad
9a88c33de0 #4061 VizFwk : Use variable CAF_USE_QT5 2019-02-08 11:28:14 +01:00
Magne Sjaastad
bd6bbe9da9 #4020 System : Use ri_apply_cotire() 2019-02-01 06:56:11 +01:00
Magne Sjaastad
65ee55c96d #3944 clang-tidy : Apply clang-tidy on caf 2019-01-11 08:14:53 +01:00
Magne Sjaastad
98da255772 System : Remove TR1 warnings from gtest 2019-01-07 14:32:29 +01:00
Gaute Lindkvist
17e12a92a0 Update CMake to only look for Qt5 if RESINSIGHT_BUILD_WITH_QT5 is set 2018-12-10 15:10:46 +01:00
Bjørn Erik Jensen
c0b7b5d87e caf. Make method const 2018-12-07 12:42:42 +01:00
Bjørn Erik Jensen
b4482d20b0 #3723 Annotations. User editable polyline, both in in view and in property editor 2018-12-07 09:11:19 +01:00
Magne Sjaastad
aa19715c40 #3822 AppFwk : Improve resolve of PtrField, unit test 2018-12-04 14:10:54 +01:00
Magne Sjaastad
90550fe561 #3822 AppFwk : Improve resolve of PtrField 2018-12-04 14:10:18 +01:00
Gaute Lindkvist
b06097862f Fix Linux build of caf unit tests 2018-12-03 15:00:53 +01:00
Gaute Lindkvist
8cd2d37b92 Quieten Qt5 check in caf unittests 2018-12-03 15:00:53 +01:00
Gaute Lindkvist
ddb546d877 #3754 Upgrade CAF CMake-system to support both Qt4 and Qt5 2018-11-30 09:47:53 +01:00
Gaute Lindkvist
cc7269c717 #3752 CAF code changes to build on both Qt4 and Qt5 2018-11-30 09:47:53 +01:00
Jacob Støren
08de39f15a AppFwk: Update some plantuml docs 2018-11-27 14:59:30 +01:00
Jacob Støren
7a0fcaa2ec AppFwk: Remove obsolete plantuml documentation stuff 2018-11-27 14:59:30 +01:00
Jacob Støren
3c32595e25 AppFwk: Moved PdmUi3dObjectEditorHandle and PdmUiSelection3dEditorVisualizer into correct place in PdmUiCore 2018-11-27 10:31:54 +01:00
Jacob Støren
318cd76b64 AppFwk: Split PdmUiObjectEditorHandle into PdmUiWidgetObjectEditorHandle
making PdmUiObjectEditorHandle  a cleaner interface for PdmUi3dObjectEditorHandle
2018-11-27 09:31:33 +01:00
Jacob Støren
b4572fd9a2 AppFwk: Remove som unused code 2018-11-26 21:51:05 +01:00
Jacob Støren
fb93ad7ca7 AppFwk: Make PdmUiSelection3dEditorVisualizer generic, ready to be moved to a separate file 2018-11-26 21:50:46 +01:00
Gaute Lindkvist
f80472ffa6 #3540 Create seperate 2d view with parallel, look down and linked views 2018-10-24 15:21:53 +02:00
Magne Sjaastad
758598df0e clang-tidy : Use nullptr 2018-10-18 16:36:11 +02:00
Magne Sjaastad
764fb65e8e clang-tidy : Remove redundant 'virtual' and add 'override'
clang-tidy : Remove redundant 'virtual' and add 'override'
2018-10-18 16:35:51 +02:00
Gaute Lindkvist
fcda0b9755 Remove padding to the left in TreeSelectionEditor if the tree doesn't have grand children. 2018-10-02 08:46:24 +02:00
Magne Sjaastad
b584ab905c AppFwk : Activate more warnings 2018-09-27 21:36:52 +02:00
Gaute Lindkvist
8c5e538f01 Implement a way for editors to fit the label to the field. 2018-09-27 16:07:35 +02:00
Magne Sjaastad
a3d8fc1fb3 #3421 Text File Export : Open file as text file when required 2018-09-27 12:42:28 +02:00
Gaute Lindkvist
e8a1d30f2d #3404 Side by side editors, first implementation. 2018-09-26 14:30:50 +02:00
Jacob Støren
10b031fa6d #3353 AppFwk: Add contentTextColor to PdmUiItem 2018-09-24 15:49:16 +02:00
Magne Sjaastad
cb218965c5 #3340 Do not use same variable name twice 2018-09-10 10:27:54 +02:00
Gaute Lindkvist
ac8a11c813 Make caf::PdmPtrField inherit caf::PdmValueField and make it support QVariant. 2018-09-05 11:03:41 +02:00
Jacob Støren
e26a57011d #3296 caf::SelectionManager: Refactoring to avoid sending multiple selection changes
Must be considered if using the CmdSelectionGangeExec
2018-08-31 16:13:46 +02:00
Jacob Støren
99bdece40e #3249 caf: Add isSelected method to selection manager 2018-08-29 16:04:08 +02:00
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