Commit Graph
777 Commits
Author SHA1 Message Date
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
Magne Sjaastad 4d25cd0c71 #3792 Add font size 10 and 14 2018-12-03 14:19:49 +01:00
Gaute Lindkvist 7128c58b6c Quiet Qt5 check for cafAppFwk 2018-12-03 14:18:38 +01:00
Gaute Lindkvist b097c8c9b7 Fix TRUE/true in cafAboutDialog 2018-11-30 09:47: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
Gaute Lindkvist 7fd3dac2ef Revert "#3751 Fix keyboard selection in Summary Plot Editor"
This reverts commit ab0fa2fb19.

* This change should never have been merged back into the repo.
2018-11-30 09:45:50 +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 8b7b110440 Merge branch 'dev' into dev-deeper 2018-11-26 09:21:33 +01:00
Gaute Lindkvist 40f466fb0c #3751 Fix keyboard selection by overriding keyPressEvent and emitting clicked() 2018-11-26 08:01:54 +01:00
Gaute Lindkvist ab0fa2fb19 #3751 Fix keyboard selection in Summary Plot Editor 2018-11-23 15:36:33 +01:00
Gaute Lindkvist 2cf5357a47 #3738 Active correct item when clicking in Summary Plot Editor 2018-11-23 15:11:23 +01:00
Bjørn Erik Jensen 15a6bc358b Merge branch 'dev' into dev-deeper 2018-11-22 14:21:00 +01:00
Gaute Lindkvist d69153c013 #3489 Fix legend text for flow diagnostics. 2018-11-22 13:39:07 +01:00
Bjørn Erik Jensen 67ba01f835 #3722 Scale legend. Descrease size 2018-11-21 14:58:47 +01:00
Bjørn Erik Jensen 5e769b337f Merge branch 'dev' into dev-deeper 2018-11-21 14:00:46 +01:00
Magne Sjaastad 11de63a5ef Fix Linux build 2018-11-21 10:55:57 +01:00
Gaute Lindkvist 9145e6011d #3697 Fix zoom issues with ortographic views 2018-11-20 13:49:19 +01:00
Bjørn Erik Jensen 75c923d102 #3698 Scale bar. Support for both horizontal and vertical orientation 2018-11-16 13:52:05 +01:00
Bjørn Erik Jensen 05e04bb588 #3698 Scale bar. Fixed axis length 2018-11-16 13:52:05 +01:00
Bjørn Erik Jensen d8a466a9ef #3698 Scale bar. Take 1. Only vertical variant implemented so far 2018-11-16 13:52:05 +01:00
Magne Sjaastad 9b41685035 #3662 AppFwk : Allow interaction in second main window 2018-11-12 09:49:35 +01:00
Magne Sjaastad cfbbcacc23 #3634 Regression Test : Use flag to control OpenMP when building geometry 2018-11-12 07:33:08 +01:00
Gaute Lindkvist 937dacd7df Assert on contourLevel range not being empty for cafContourLines 2018-11-05 14:41:12 +01:00
Gaute Lindkvist 1422403b71 #3596 Add new aggregation for Oil / Water / HC columns and improve speed and reliability.
* Avoid calculating results many times for each change.
* Avoid drawing spurious contour lines when results are undefined.
* Add aggregation type to legend header (#3594).
2018-11-05 14:31:23 +01:00
Magne Sjaastad 2143673aa7 #3583 Property Editor : Set unused grid cells to stretch 0 2018-11-02 14:58:08 +01:00
Magne Sjaastad a3aeb424b3 Revert "#3564 System : Recreate QGridLayout for each property editor"
This reverts commit f6c92a15a6.
2018-11-02 14:04:29 +01:00
Magne Sjaastad 78505bb44d System : Fix name collision of macro expansion
The macro CAF_PDM_UI_FIELD_EDITOR_SOURCE_INIT expands to a variable name colliding with an identical variable name in a different file. Cotire put the two files into same file, and this causes compilation issues.

Fixed by removing some empty lines in one file, to make sure the two statements are defined at different lines.
2018-11-01 19:56:55 +01:00
Gaute Lindkvist ee388ca4b0 #3591 Improve edges on contour map. 2018-10-31 16:17:09 +01:00
Gaute Lindkvist e9de865c1f Rebase conrec code off the Paul D. Bourke C-code and fix copyright.
* Rebased to the C-code by Bourke himself to avoid the sneaky little requirement
added by Nicholas Yue that only allows redistribution with explicit permission.
2018-10-31 11:31:02 +01:00
Gaute Lindkvist 0d3b205dac #3589 Fix regression in column width for table in well path creation. 2018-10-31 09:32:10 +01:00
Gaute Lindkvist 69d079f942 #3505 First go at contour lines 2018-10-30 16:25:33 +01:00
Magne Sjaastad f6c92a15a6 #3564 System : Recreate QGridLayout for each property editor
If the layout is reused, the rows grow over time. This causes the Cell Result to not fill all available space.
2018-10-26 11:39:58 +02: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 71a1bd98ab #3441 Improve table view to work better with more attribute types. 2018-10-05 15:35:15 +02:00
Jacob Støren bd79bd89c1 #3449 Improve checkbox column size hint, alignment and "hit" rectanngle 2018-10-03 08:40:28 +02:00
Jacob Støren 979882da03 AppFwk: Read only checkboxes in table view, now is rendered disabled 2018-10-02 16:52:56 +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
Gaute Lindkvist 33a171fbcf #3419 Implement buttons to add communicating tracers to the selected injectors or producers. 2018-09-28 15:46:08 +02:00
Gaute Lindkvist e91bdece9c Ui Form Layout, simplify comment for label content margin shift. 2018-09-28 15:46:08 +02:00