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
Gaute Lindkvist
398a59d0a6
Add some more checks to the SILENCE_TR1 warnings for Ceevis unittests/gtest
2018-11-30 09:47:53 +01:00
Gaute Lindkvist
a7e76679e1
#3754 Support both Qt4 and Qt5 in Ceevis build.
2018-11-30 09:47:53 +01:00
Gaute Lindkvist
237623ef21
#3752 CVF Code changes to build on Qt4 and Qt5
2018-11-30 09:47:53 +01:00
Gaute Lindkvist
83c5f63291
#3754 Qt4/Qt5 CMake build configuration for Nightcharts and ExpressionParser
2018-11-30 09:47:53 +01:00
Gaute Lindkvist
cc672eb31b
#3752 Upgrade Qwt to 6.1.3 to support Qt5
2018-11-30 09:47:53 +01:00
Gaute Lindkvist
100aabd332
CVF Code changes to hide std::tr1 warnings so unit tests build.
2018-11-30 09:47:51 +01:00
Gaute Lindkvist
7fd3dac2ef
Revert " #3751 Fix keyboard selection in Summary Plot Editor"
...
This reverts commit ab0fa2fb19
2018-11-30 09:45:50 +01:00
Gaute Lindkvist
01e4454d85
Revert " #3751 Fix keyboard selection in Summary Plot Editor"
...
This reverts commit ab0fa2fb19
2018-11-30 09:22:01 +01:00
Bjørn Erik Jensen
e489d77c81
#3787 Annotations. Folder for each annotation type
2018-11-30 09:06:01 +01:00
Bjørn Erik Jensen
a239923ebc
#3786 Annotations. Use slider for annotations plane depth. Move toggle to top
2018-11-30 08:59:22 +01:00
Bjørn Erik Jensen
7f0b05a93b
#3760 Summary plot. Z ordering different types of summary curves
2018-11-29 15:29:15 +01:00
Gaute Lindkvist
f14d36ca23
#3442 Implement export of ICD/ICV table for performations
2018-11-29 15:26:22 +01:00
Gaute Lindkvist
f0d3a36374
#3442 Change defaults for ICDs to values suggested in meeting
2018-11-29 15:25:53 +01:00
Gaute Lindkvist
2414865dbe
#3442 UI For ICD/ICV parameters
2018-11-29 15:24:39 +01:00
Bjørn Erik Jensen
d3db1a6075
#3777 Annotations. Use Bounding box to decide whether to draw an object or not
2018-11-29 14:28:33 +01:00
Bjørn Erik Jensen
9dc1e8d063
#3778 Annotations. Move z plane settings to in-view collection
2018-11-29 10:13:19 +01:00
Bjørn Erik Jensen
b5f0459843
#3772 Annotations. Draw reach circle center symbol
2018-11-29 08:48:28 +01:00
