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.
* This change should never have been merged back into the repo.
|
2018-11-30 09:45:50 +01:00 |
|
Gaute Lindkvist
|
01e4454d85
|
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: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 |
|
Magne Sjaastad
|
c6df9eb7e7
|
Upped to 2018.11-dev.01
|
2018-11-29 07:06:56 +01:00 |
|
Jacob Støren
|
3cc8ff82d1
|
#3764 Add annotation related icons
|
2018-11-28 15:40:28 +01:00 |
|
Bjørn Erik Jensen
|
b6b96e62f6
|
Annotations. Fix crash
|
2018-11-28 15:27:32 +01:00 |
|
Bjørn Erik Jensen
|
76e8aa9652
|
#3773 Annotations. Remove annotation color factory class
|
2018-11-28 15:15:42 +01:00 |
|
Bjørn Erik Jensen
|
bbec88b5d1
|
#3773 Annotations. Set default color for line based annotations
|
2018-11-28 15:00:34 +01:00 |
|
Jacob Støren
|
0148fc2279
|
#3724 Reload and recreate visualization when changing file
|
2018-11-28 14:36:17 +01:00 |
|
Jacob Støren
|
04754d394f
|
#3776 Add toggle to text and reach circles annotations
|
2018-11-28 14:36:17 +01:00 |
|
Bjørn Erik Jensen
|
30b34bbe67
|
Annotations. Fixed polyline vectors. Use explicit naming
|
2018-11-28 14:21:40 +01:00 |
|
Magne Sjaastad
|
3b5011d573
|
Merge remote-tracking branch 'origin/dev' into dev-deeper
|
2018-11-28 13:56:36 +01:00 |
|
Magne Sjaastad
|
2aa838ee6b
|
Update of keywords
|
2018-11-28 13:54:46 +01:00 |
|
Bjørn Erik Jensen
|
10aae368d3
|
#3775 Annotations. Use depth in GUI, not z, for used defined polylines as well
|
2018-11-28 13:21:59 +01:00 |
|
Bjørn Erik Jensen
|
02eea4bc84
|
#3775 Annotations. Use depth in GUI, not z
|
2018-11-28 13:10:11 +01:00 |
|
Jacob Støren
|
0f384cf4f7
|
#3724 Split the line annotation classes into separate files. Cleaned up includes
|
2018-11-28 12:10:08 +01:00 |
|
Magne Sjaastad
|
6d251edf92
|
Include dev in version info
|
2018-11-28 12:04:31 +01:00 |
|
Magne Sjaastad
|
4c2d3e0130
|
Merge pull request #3774 from OPM/master
Merge pull request #3771 from OPM/dev
|
2018-11-28 12:00:18 +01:00 |
|
Bjørn Erik Jensen
|
c3dd6a14a7
|
#3763 Annotations. Define annotation plane Z for global annotations
|
2018-11-28 11:58:38 +01:00 |
|
Bjørn Erik Jensen
|
0083618dd2
|
#3770 Import perforations. Add RifPerforationIntervalReaderTest
|
2018-11-28 09:50:22 +01:00 |
|
Magne Sjaastad
|
bd44ec8d51
|
Merge pull request #3771 from OPM/dev
Merge dev into master for Release 2018.11
|
2018-11-28 09:39:16 +01:00 |
|
Bjørn Erik Jensen
|
1078ccdee6
|
Merge branch 'dev' into dev-deeper
|
2018-11-28 09:26:57 +01:00 |
|
Magne Sjaastad
|
5f9a80b438
|
Upped to 2018.11
|
2018-11-28 09:25:38 +01:00 |
|
Bjørn Erik Jensen
|
4c9f3cff0f
|
#3770 Import perforations. Fix spaces in well name issue
|
2018-11-28 09:23:09 +01:00 |
|
Bjørn Erik Jensen
|
aae3665539
|
#3755 Annotations. Reach circle name field
|
2018-11-28 07:45:53 +01:00 |
|
Bjørn Erik Jensen
|
4685d5981d
|
Merge branch 'dev' into dev-deeper
|
2018-11-28 07:10:56 +01:00 |
|