Commit Graph

2502 Commits

Author SHA1 Message Date
Magne Sjaastad
c9abd09495 Merge pull request #5091 from OPM/integrate-from-release-branch
Integrate from release branch
2019-11-25 15:39:15 +01:00
Gaute Lindkvist
cf7608e6bf Improve RimNameConfig API 2019-11-25 15:19:53 +01:00
Magne Sjaastad
72a5c6cfef Merge pull request #5071 from OPM/memory-fixes
Release of memory
2019-11-25 13:58:55 +01:00
Gaute Lindkvist
db869ccbd5 Improve plot redraw scheduler 2019-11-25 13:55:49 +01:00
Magne Sjaastad
22ca504907 Merge pull request #5065 from OPM/remove-input-property-collection-from-tree
#5047 Remove input property collection from project tree.
2019-11-21 07:11:35 +01:00
Kristian Bendiksen
3fafe90aeb #5047 Remove input property collection from project tree. 2019-11-20 22:01:07 +01:00
Gaute Lindkvist
85d683634c Further refactoring 2019-11-20 13:14:45 +01:00
Gaute Lindkvist
228810fd05 Refactor view id 2019-11-20 13:14:45 +01:00
Gaute Lindkvist
d9043db5e0 Refactor RimPlotWindow and RimPlotInterface 2019-11-20 13:14:45 +01:00
Gaute Lindkvist
4dd0651dae Remove width scaling factors 2019-11-20 13:14:45 +01:00
Gaute Lindkvist
8252ab8808 Rename GridPlot to MultiPlot throughout 2019-11-20 13:14:45 +01:00
Gaute Lindkvist
a73c7a4b97 Rename Plot Report and Combination Plot to Multi Plot 2019-11-20 13:14:45 +01:00
Gaute Lindkvist
81db22586d Remove description-field from RimPlotWindow
* Leave it to sub-classes to deal with this
2019-11-20 13:14:45 +01:00
Kristian Bendiksen
5e480bf438 #5042 Add "Export Property To File" command to eclipse view. 2019-11-19 22:23:03 +01:00
Magne Sjaastad
c042aec22a Merge pull request #5062 from OPM/bug-#5061-wap-depth
Bug #5061 wap depth
2019-11-19 14:13:15 +01:00
Gaute Lindkvist
60b09d7bfd #5061 WAP: fix update of well allocation data when changing depth type 2019-11-19 13:19:56 +01:00
Magne Sjaastad
651c28dc49 clang-format : Added extension .inl
Applied clang-format on all files in ApplicationCode including new extension .inl. Also includes some missing clang-format on other files.
2019-11-19 11:09:52 +01:00
Jacob Støren
9f6d6f693e #5050 Improve Insert Well Target command 2019-11-18 09:51:51 +01:00
Jacob Støren
fe88fb9ccb #5037 Fixed crash in well path target points geometry generation 2019-11-14 13:48:54 +01:00
Kristian Bendiksen
f8468dc7a6 Merge pull request #5009 from OPM/feature-replace-summary-case
Replace binary eclipse case and summary case feature.

Closes #4499 and #4987.
2019-11-13 13:29:40 +01:00
Kristian Bendiksen
b09103e596 #4987 Add feature to replace grid case. 2019-11-13 11:42:21 +01:00
Kristian Bendiksen
544c160510 #4499 Add feature to replace summary case. 2019-11-13 11:42:21 +01:00
Magne Sjaastad
e7edb34404 #5031 Summary Data Cache : Remove static set of instances 2019-11-12 17:47:41 +01:00
Magne Sjaastad
2c115278ab Save Project Dialog : Early return if no file name is specified in UI 2019-11-12 15:25:30 +01:00
Magne Sjaastad
66b0184971 Summary Command Line : Help text adjustments 2019-11-08 12:45:08 +01:00
Jacob Støren
ea28cb5733 #4869 Fixed range filter commands on inactive view 2019-11-08 11:23:06 +01:00
Jacob Støren
e78b0d4204 #4994 Make ComparisonView mode for InfoBox and animation progress 2019-11-08 10:40:37 +01:00
Jacob Støren
38e8f04990 Use cvfMath for PI and sin/cos in PointTangentManipulator
To avoid errors from pedantic compilers
2019-11-07 08:58:49 +01:00
Magne Sjaastad
0caaaf7159 clang-format : Fixes related to bug in clang-format plugin
The LLVM/clang plugin to visual studio has a bug related to single space formatting changes. This commit fixes invalid formatting related to these issues.
2019-11-07 07:37:50 +01:00
Jacob Støren
7d2f1ec9c1 Fix M_PI related errors 2019-11-06 18:59:40 +01:00
Jacob Støren
e78ae37cb7 #5005 Improved welltarget 3d dragger geometry 2019-11-06 18:01:55 +01:00
Jacob Støren
277f8c8b7a #4969 Fix Well path and annotation draggers not visible and does not work in comparison view 2019-11-06 14:13:01 +01:00
Jacob Støren
6850a37c11 #4999 Fixed well target manipulators not sensitive sometimes 2019-11-06 14:13:01 +01:00
Jacob Støren
25b97c9cca #4999 Refactoring point target manipulator part manager preparing for fix 2019-11-06 14:13:01 +01:00
Magne Sjaastad
25d2ee0e27 Merge pull request #4989 from OPM/import-ascii-data-to-simulation-case
Import ascii data to simulation case
2019-11-06 11:35:35 +01:00
Magne Sjaastad
c090992342 Rename to Stop Comparison 2019-11-06 10:15:51 +01:00
Magne Sjaastad
791de201b3 #82 Import Ascii-data : Add icon and move item in context menu 2019-11-06 09:38:32 +01:00
Gaute Lindkvist
b227ef7bdb #4992 Rename combination plots to plot report 2019-11-05 15:34:36 +01:00
Kristian Bendiksen
ed59f0b618 Fix "Export Property To File" for RimEclipseResultCase. 2019-11-05 12:23:26 +01:00
Kristian Bendiksen
470fab787d Hide InputPropertyCollection until it has some items. 2019-11-05 12:23:26 +01:00
Kristian Bendiksen
8f085fead8 Make "Import Property" menu item available on RimEclipseInputCase. 2019-11-05 12:23:26 +01:00
Kristian Bendiksen
22a5a1fe0f #82 Import ascii grdecl input properties into simulation case.
This allows data from text files to be imported into a binary Eclipse case
imported based on *.EGRID.
2019-11-05 12:23:26 +01:00
Kristian Bendiksen
7d817d0277 Merge pull request #4967 from OPM/improve-export-filedialog-behaviour
Improve export filedialog behaviour
2019-11-05 10:39:50 +01:00
Kristian Bendiksen
37615f1bc8 Fix file filter for RicImportPolylinesAnnotationFeature. 2019-11-04 20:56:26 +01:00
Magne Sjaastad
57cab2457e clang-format : Set PenaltyBreakAssignment to 130 2019-11-04 15:08:09 +01:00
Magne Sjaastad
7c8cf60dba clang-format : Set AllowAllParametersOfDeclarationOnNextLine to false 2019-11-04 14:35:41 +01:00
Magne Sjaastad
96a26662fc Janitor : Apply clang-format fixes on codebase in ApplicationCode 2019-11-04 11:34:34 +01:00
Jacob Støren
5044784201 Merge pull request #4968 from OPM/feaure-fix-point-picking-in-comparison-view
Fixes several issues from #4857
#4956 Fix List editor background setting
#4880 Fix annotations missing in comparison view
2019-11-04 09:44:56 +01:00
Magne Sjaastad
b46124efd7 Janitor : Use const ref when possible 2019-11-03 12:19:24 +01:00
Magne Sjaastad
93f6bc8c72 Janitor : Remove invalid conditionals 2019-11-03 11:43:46 +01:00