Magne Sjaastad
c5dc9da4bd
#3924 Measurement : Clean up includes
2019-01-02 14:37:59 +01:00
Magne Sjaastad
218472fe2c
Merge branch 'dev' into measurement
2019-01-02 14:32:17 +01:00
Magne Sjaastad
4e6d7d3c40
#3922 Scale bar : Update legend layout when dependent data changes
2019-01-02 11:22:25 +01:00
Magne Sjaastad
98c0406926
Whitespace
2019-01-02 09:45:48 +01:00
Magne Sjaastad
a9c7773ef7
CppCheck : Fix various minor issues
2018-12-21 12:32:57 +01:00
Gaute Lindkvist
128208d35a
Fix type in RiaColorTools contrastColor
2018-12-21 10:12:58 +01:00
Bjørn Erik Jensen
5976298267
Merge branch 'dev' into measurement
2018-12-21 10:08:41 +01:00
Bjørn Erik Jensen
21403f4161
#3805 Measurement. Double click in view to reset measurement
2018-12-21 09:23:53 +01:00
Magne Sjaastad
6f3097dd5f
Merge remote-tracking branch 'origin/2018.11.01-patch' into dev
2018-12-21 08:46:27 +01:00
Bjørn Erik Jensen
d6f4962ed7
#3806 Measurement. Display text label at last clicked position
2018-12-20 12:34:17 +01:00
Magne Sjaastad
bc86158ff6
#3914 Source Stepping : Add checkbox for include of ensemble cases
2018-12-20 08:36:35 +01:00
Bjørn Erik Jensen
deec4c16e9
#3804 Measurement. Set checkable toolbutton (still changing icon)
2018-12-19 14:49:35 +01:00
Bjørn Erik Jensen
849a623379
#3804 #3805 Measurement. Add toolbar button and interactive picking
2018-12-19 14:41:17 +01:00
Magne Sjaastad
6a340c5b99
#3905 Summary Stepping : Avoid updateUI when not required
2018-12-19 11:21:18 +01:00
Magne Sjaastad
0d1a4cf0a6
#3842 Summary : Update source stepping based on selection
2018-12-17 16:14:32 +01:00
Magne Sjaastad
b3c3631cc4
#3842 : Update toolbar based on selection
2018-12-17 16:05:23 +01:00
Magne Sjaastad
5e466ed5a9
#3841 Summary : Update stepping toolbar when curve is deleted
2018-12-17 07:56:19 +01:00
Magne Sjaastad
19df293f12
#3841 Summary : Update stepping toolbar when curve is deleted
2018-12-17 07:25:25 +01:00
Bjørn Erik Jensen
d482d3a4ca
#3826 Summary curves. Draw error bars in front of all curves except from observed data curves
2018-12-13 16:14:13 +01:00
Bjørn Erik Jensen
01249ace3a
#3860 Z scale label. Do not show in contour map
2018-12-13 13:20:49 +01:00
Magne Sjaastad
e58941a423
Remove duplicate line
2018-12-12 10:45:11 +01:00
Gaute Lindkvist
914daded6b
#3794 Improve wheel zooming
2018-12-12 08:01:13 +01:00
Gaute Lindkvist
cd75be6671
#3848 Fix crash with text picking by guarding pointer to scene.
2018-12-11 15:33:47 +01:00
Gaute Lindkvist
2e8c2e28a8
#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-12-11 13:18:01 +01:00
Bjørn Erik Jensen
488798c3d8
#3790 Z scale label. Display in upper left corner
2018-12-10 13:04:07 +01:00
Gaute Lindkvist
1bab754b26
Reintroduce CDEStyle to progress bar in 3D view
...
* Only works for Qt4
2018-12-05 15:47:16 +01:00
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
Jacob Støren
a13201e42e
#3757 Add selection of text annotations by picking
2018-12-03 11:05:12 +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
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
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
5c66b901c3
#3752 ResInsight code changes to build on both Qt4 and Qt5
2018-11-30 09:47:53 +01:00
Bjørn Erik Jensen
4685d5981d
Merge branch 'dev' into dev-deeper
2018-11-28 07:10:56 +01:00
Gaute Lindkvist
d743602b81
#2396 Set better fixed y-axis range for logarithmic scaling
2018-11-27 11:29:55 +01:00
Gaute Lindkvist
49b5b60352
#2396 Add support for locking axes in Cell RelPerm plot
...
* Also put curves in a grid layout and
shortened logarithmic label to fit better
2018-11-27 10:53:14 +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
fb93ad7ca7
AppFwk: Make PdmUiSelection3dEditorVisualizer generic, ready to be moved to a separate file
2018-11-26 21:50:46 +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
Bjørn Erik Jensen
2912059922
#3730 Plot Editor. Sort numeric identifiers by numeric value and not alphabetically
2018-11-21 12:31:57 +01:00
Bjørn Erik Jensen
e98b1728f1
#3717 Plot editor. Never plot a default vector
2018-11-21 09:31:52 +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
d8a466a9ef
#3698 Scale bar. Take 1. Only vertical variant implemented so far
2018-11-16 13:52:05 +01:00
Gaute Lindkvist
387741d0c1
#3530 Support picking on 2d Maps.
2018-11-14 13:43:55 +01:00
Magne Sjaastad
4117e266ed
#3686 Completion Export : Use map based on size_t instead of RigCompletionDataGridCell
...
Using RigCompletionDataGridCell as key in a map causes cells with identical local IJK to be treated as same global cell. Use reservoir grid cell index (size_t) as key to be able to handle cells correctly.
2018-11-14 11:40:23 +01:00
Gaute Lindkvist
53fad80e89
2d Maps: Renames to make classes and variables more consistent.
...
* Everything is now named something related to ContourMap:
- Rim2dEclipseView -> RimContourMapView
- Rim2dGridProjection -> RimContourMapProjection
....
2018-11-09 09:11:29 +01:00
Gaute Lindkvist
78d81d2630
#3573 Draw axis lines across the whole view for 2d Contour Maps.
2018-10-31 12:13:04 +01:00