Commit Graph
9629 Commits
Author SHA1 Message Date
Bjørn Erik Jensen 6a2484c40e #3826 Summary curves. Draw error bars in front of all curves except from observed data curves 2018-12-05 09:35:05 +01:00
Magne Sjaastad 968da84051 #3816 Annotations : Guard assert with debug ifdef 2018-12-05 07:36:57 +01:00
Jacob Støren c4cc33b624 #3639 Add map projection icon for Contour maps 2018-12-04 15:13:19 +01:00
Magne Sjaastad af18e30ac6 #3816 Annotations : Assert if resolve of PdmPtrField fails 2018-12-04 14:33:14 +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
Magne Sjaastad 687aadcfde #3816 Annotations : PdmPtr not resolved correctly 2018-12-04 12:30:47 +01:00
Magne Sjaastad 920467e1f3 Fix signed/unsigned compare 2018-12-04 11:49:29 +01:00
Magne Sjaastad 1c9da3d33f #3820 System : Delete RiuViewer directly instead of deleteLater() 2018-12-04 11:43:58 +01:00
Magne Sjaastad 6bcdd4e6c4 Remove unused code 2018-12-03 20:25:24 +01:00
Bjørn Erik Jensen e56090dc92 #3788 Annotations. Set texts and icons 2018-12-03 15:29:23 +01:00
Magne Sjaastad 4026f21a00 Cotire : Fix duplicate global variables 2018-12-03 15:22:09 +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 0371a1962e Add missing include 2018-12-03 14:50:12 +01:00
Magne Sjaastad 68bc466830 #3792 Use font 10 and 14 2018-12-03 14:19:49 +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
Magne Sjaastad a860adb1fb Fix compare of wrong enum type 2018-12-03 14:03:34 +01:00
Magne Sjaastad 8d0926dd53 Fix Linux build issue 2018-12-03 13:55:48 +01:00
Magne Sjaastad df5179207f Revert unintended entries 2018-12-03 13:53:16 +01:00
Magne Sjaastad 1dc65855ae Merge remote-tracking branch 'origin/dev-deeper' into dev 2018-12-03 13:34:22 +01:00
Bjørn Erik Jensen 11e2fe29d4 #3788 Annotations. Mirror global annotations into view annotation collection. Not thorougly testet yet 2018-12-03 13:15:31 +01:00
Jacob Støren 918efd3a27 #3757 Enable Z-buffer testing for text annotations 2018-12-03 11:05:12 +01:00
Jacob Støren f3c0345d3a #3757 Improve position of labels when creating them in 3D view 2018-12-03 11:05:12 +01:00
Jacob Støren a13201e42e #3757 Add selection of text annotations by picking 2018-12-03 11:05:12 +01:00
Gaute Lindkvist e984b06ea6 Fix build problem on Linux by renaming file to correct case 2018-12-03 10:58:49 +01:00
Gaute Lindkvist 9961b39473 Fix build problem on Linux with missing cvfBase.h 2018-12-03 10:58:49 +01:00
Gaute Lindkvist 45e909fcfa #3783 Guard in case of incomplete project data 2018-12-03 10:58:49 +01:00
Magne Sjaastad 0ae2dcaccf #3784 Completion Export : Use isCompletionWellPathEqual() 2018-12-03 10:40:15 +01:00
Magne Sjaastad bbadf3918e #3784 Completion Export : Split on well name instead of well name for export 2018-12-03 10:31:56 +01:00
Magne Sjaastad 52b02a6056 Whitespace 2018-12-03 08:57:28 +01:00
Jacob Støren a9a5eaf604 #3757 New feature to add a text annotation in the 3D view 2018-11-30 14:30:34 +01:00
Jacob Støren 92a45e959e #3757 Rename RiuSelectionManager to Riu3dSelectionManager 2018-11-30 14:30:34 +01:00
Jacob Støren c2206abca5 #3757 Wip: Add draggers to text annotation points when text is selected 2018-11-30 14:30:34 +01:00
Gaute Lindkvist c60e6b8140 #3780 Get rid of debug output from painter
* don't really need the boundingRect override for RiuQwtSymbol
* And it needs a painter
* Just get rid of it and pass in the painter for the labelBoundingRect
2018-11-30 14:01:29 +01:00
Gaute Lindkvist 20534775d6 #3809 Make Flow diagnostics work with contour maps 2018-11-30 13:47:46 +01:00
Gaute Lindkvist 39fd441a59 #3798 Make sure 3d overlay info update is called even if it is inactive
* It also causes animation bar to be hidden if the overlay info is inactive
2018-11-30 11:50:41 +01:00
Gaute Lindkvist 7033b2cd48 #3801 Postpone assignment of old selectedTracer-field to producers and injectors
* initAfterRead is too soon as the solver hasn't been set up yet.
* wait until onEditorWidgetsCreated()
2018-11-30 11:50:36 +01:00
Gaute Lindkvist 4d765f19b6 #3798 Make sure 3d overlay info update is called even if it is inactive
* It also causes animation bar to be hidden if the overlay info is inactive
2018-11-30 11:48:52 +01:00
Gaute Lindkvist 8be822c5d7 #3801 Postpone assignment of old selectedTracer-field to producers and injectors
* initAfterRead is too soon as the solver hasn't been set up yet.
* wait until onEditorWidgetsCreated()
2018-11-30 11:26:38 +01:00
Gaute Lindkvist f18884b675 #3752 Fix crash when closing ResInsight 2018-11-30 09:47:53 +01:00
Gaute Lindkvist f2c7f2ce80 Fix display problems on Linux 2018-11-30 09:47:53 +01:00
Gaute Lindkvist 6f9cac7201 Fix Progress bar alignment on Qt5 2018-11-30 09:47:53 +01:00
Gaute Lindkvist afbe84997e Fix MDI window placement after Qt5 upgrade 2018-11-30 09:47:53 +01:00
Gaute Lindkvist b097c8c9b7 Fix TRUE/true in cafAboutDialog 2018-11-30 09:47:53 +01:00
Gaute Lindkvist 6cee9eb9e6 #3752 Upgrade ResInsight CMake-system to support both Qt5 and Qt5 2018-11-30 09:47:53 +01:00
Gaute Lindkvist 5c66b901c3 #3752 ResInsight code changes to build on both Qt4 and Qt5 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