OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity
12,192 Commits 27 Branches 61 Tags 309 MiB
df5ba4c0d1
Commit Graph

10175 Commits

Author SHA1 Message Date
Gaute Lindkvist
26217dc665 Fix potential incompatibility with grpc v1.23.0+ 
See:
https://github.com/grpc/grpc/pull/19435
 2019-11-26 14:49:53 +01:00
Jacob Støren
191419b6b4 clang-format after intersection rename 2019-11-26 13:56:02 +01:00
Jacob Støren
06596673dc Rename RimIntersectionHandle to RimIntersection 2019-11-26 13:26:37 +01:00
Jacob Støren
0a358941fb Rename RivIntersectionBoxGeometryGenerator to RivBoxIntersectionGeometryGenerator 
Rename RivIntersectionBoxSourceInfo to RivBoxIntersectionSourceInfo
 2019-11-26 13:20:16 +01:00
Jacob Støren
4672528a4d Rename RimintersectionBox to RimBoxIntersection 
Rename RivIntersectionBoxPartMgr to RimBoxIntersectionPartManager
 2019-11-26 13:14:55 +01:00
Jacob Støren
0e14c63f07 Rename crossSection to intersection in general code 2019-11-26 12:45:08 +01:00
Jacob Støren
54c96581f1 Rename RivIntersectionSourceInfo to RivExtrudedCurveIntersectionSourceInfo 2019-11-26 11:56:05 +01:00
Jacob Støren
0617b56850 Rename RivIntersectionGeometryGenerator to RivExtrudedCurveIntersectionGeometryGenerator 
and RivIntersectionPartMgr to RivExtrudedCurveIntersectionPartMgr
 2019-11-26 11:51:54 +01:00
Jacob Støren
152d2bde17 Rename RimIntersection to RimExtrudedCurveIntersection 2019-11-26 11:35:21 +01:00
Jacob Støren
bf8ed71641 Method rename 2019-11-26 10:35:45 +01:00
Jacob Støren
5593fb198c
Merge pull request #5094 from OPM/feature-#5019-separate-intersection-results 
Feature #5019 separate intersection results
 2019-11-26 10:15:30 +01:00
Magne Sjaastad
11f46e3696 #5069 Janitor : Hide some menu items related to toggling 2019-11-26 07:42:50 +01:00
Magne Sjaastad
b758854463 #5069 Janitor : Hide some menu items related to toggling 2019-11-26 07:42:04 +01:00
Magne Sjaastad
be764d76cb #5077 Summary Plots: Simplify context menu 2019-11-25 15:52:09 +01:00
Magne Sjaastad
1e92687745 #5077 Summary Plots: Simplify context menu 2019-11-25 15:51:20 +01:00
Jacob Støren
15aa4d6e0b Merge dev and feature-#5019-separate-intersection-results branch 2019-11-25 15:50:29 +01:00
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
Jacob Støren
c2717f9bb9 #5019 Preliminary fix crash when picking intersections using sep results 2019-11-25 15:36:35 +01:00
Jacob Støren
6e99a43247 #5019 Add/Delete Separate Intersection Result commands 2019-11-25 15:34:36 +01:00
Jacob Støren
7aec88de3c #5019 Fix wrong use of explicit scalar mappers for intersections 
Only 2d intersection view is supposed to use them
 2019-11-25 15:33:42 +01:00
Jacob Støren
baedf02ba9 #5019 Fix crash when case is not set in Separate intersection Result 2019-11-25 15:27:25 +01:00
Gaute Lindkvist
d44775aba6 #5063 Improve auto name for well log plots and use it for well allocation plots 2019-11-25 15:20:15 +01:00
Gaute Lindkvist
95f8c44f0f Improve RimNameConfig API 2019-11-25 15:20:15 +01:00
Gaute Lindkvist
dbee9759a0 #5063 Improve auto name for well log plots and use it for well allocation plots 2019-11-25 15:19:53 +01:00
Gaute Lindkvist
cf7608e6bf Improve RimNameConfig API 2019-11-25 15:19:53 +01:00
Gaute Lindkvist
d770dda163 Converted RiaGrpcCallbacks.h to using instead of typedef 2019-11-25 15:13:30 +01:00
Gaute Lindkvist
dc3c92ab26 Improve plot redraw scheduler 2019-11-25 14:26:52 +01:00
Magne Sjaastad
71ad9e0da2 Merge pull request #5081 from OPM/move-error-bar-curve 
Curve Error Bars : Move to RimPlotCurve
 2019-11-25 14:08:12 +01:00
Magne Sjaastad
62357672e3 Revert "Janitor : Fix memory leak" 
This reverts commit 88d961e516.
 2019-11-25 14:03:09 +01:00
Magne Sjaastad
a511f580e4 Merge pull request #5073 from OPM/progress-bar 
Progress bar to summary reader
 2019-11-25 13:59:18 +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
Jacob Støren
919f035a48 #5019 Add an enable separate results button to each intersection 2019-11-25 13:31:21 +01:00
Jacob Støren
4bafefa225 #5019 2D Intersection views based on separate intersection results now respects the animation toolbar 2019-11-25 13:02:35 +01:00
Jacob Støren
eed9f6abad #5019 Update 2dIntersection views when toggling sparate intersection results 2019-11-25 11:42:46 +01:00
Jacob Støren
9bfe51b205 #5019 Support separate intersection results for 2Dintersection views 2019-11-25 11:40:57 +01:00
Magne Sjaastad
3f75cda593
Merge pull request #5083 from OPM/fix-plot-crash-release-2019.11 
Fix crash when closing and reopening plots
 2019-11-25 09:43:56 +01:00
Magne Sjaastad
9f0c4b4bed
Merge pull request #5081 from OPM/move-error-bar-curve 
Curve Error Bars : Move to RimPlotCurve
 2019-11-25 09:43:38 +01:00
Gaute Lindkvist
1d4d261129 Disable multiplot functionality 2019-11-25 08:41:47 +01:00
Gaute Lindkvist
293290827b Fix crash when closing and reopening plots 2019-11-25 08:32:30 +01:00
Gaute Lindkvist
d6ec710fd9 Fix crash when closing and reopening plots 2019-11-25 08:22:39 +01:00
Magne Sjaastad
36772e77b1 #5079 Curve Error Bars : Move to RimPlotCurve 2019-11-22 14:23:59 +01:00
Jacob Støren
1ab815e673 #5019 Use same code for separate intersection legend setup in eclipse and geomech 2019-11-22 13:31:35 +01:00
Jacob Støren
b5e39519c5 #5019 Separate intersection legends in place in ordinary views 
Needs some cleanup and not working in 2dintersection views
 2019-11-22 12:36:39 +01:00
Jacob Støren
f3b458dfbc Fix regressions for intersection views. 
Introduced by cd08185678
Wrong scalar mappers used when coloring.
Wrong timestep used
 2019-11-21 15:14:17 +01:00
Magne Sjaastad
d079f233a4 Revert "Janitor : Fix memory leak" 
This reverts commit 88d961e516.
 2019-11-21 13:13:25 +01:00
Jacob Støren
c1df283369 Fix crash in intersection coloring wne geometry is missing 2019-11-21 12:43:26 +01:00
Jacob Støren
10257e3bfb Fix missing rebuild of intersections in geomech view 
Fix missing ternary legend reset
Fix missing regular legend reset in geomech view
 2019-11-21 10:05:56 +01:00
Jacob Støren
53f2c94763 #5019 Sep Intersection Res: Fix missing use of user range when loading from project file 2019-11-21 09:24:24 +01:00
Jacob Støren
5d03ecb115 Add some const to GeoMechResultDefinition 
To prepare for separate legend update code needed bu #5019
 2019-11-21 08:30:04 +01:00
Jacob Støren
31a698243d #5019 Update display model on separate intersection settings change 2019-11-21 08:28:00 +01:00
Gaute Lindkvist
5fae9646ae
Fix curves not showing up after moving plots to multi plot (#5070) 
* Fix curves not showing up after moving plots to multi plot

* Fix typo in RiuQwtPlotWidget::closeEvent

* Fix incompatibility with release-branch
 2019-11-21 08:22:33 +01:00
Gaute Lindkvist
f130163ee8 Fix up tests to match new view id 2019-11-21 08:15:17 +01:00
Gaute Lindkvist
dfb5896edf Revert case Ids to start at 0 2019-11-21 08:15:17 +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
Magne Sjaastad
f0e728d303
Merge pull request #5073 from OPM/progress-bar 
Progress bar to summary reader
 2019-11-21 07:10:32 +01:00
Kristian Bendiksen
3fafe90aeb #5047 Remove input property collection from project tree. 2019-11-20 22:01:07 +01:00
Magne Sjaastad
caf5ce8666 Janitor : Add missing includes 2019-11-20 15:29:53 +01:00
Magne Sjaastad
ec7f1a1a7f #5028 Performance Summary : Add progress bar to summary reader 2019-11-20 15:24:05 +01:00
Gaute Lindkvist
f2be9dd3b8 Fix typo in RiuQwtPlotWidget::closeEvent 2019-11-20 14:26:15 +01:00
Gaute Lindkvist
7f0efb61f4 Remove superfluous updateLayout from RimPlot 2019-11-20 14:07:20 +01:00
Gaute Lindkvist
8f6e875ea4 Fix curves not showing up after moving plots to multi plot 2019-11-20 14:04:22 +01:00
Jacob Støren
a181e0c11d #5019 Refactoring Move IntersectionResultsColoringTool to a separate file 
Also moved the implementation code
 2019-11-20 13:59:16 +01:00
Gaute Lindkvist
bf6da1c6c4 Guard creation of view widget in RimMultiPlotWindow 2019-11-20 13:38:50 +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
Jacob Støren
cd08185678 #5019 Use the static methods to color intersections as well 
Move all the color/texture  generation methods into a separate tools class.
(Only scope wise)
 2019-11-20 13:01:25 +01:00
Jacob Støren
46f335ad0b #5019 Refactor the color generation in the boxintersection into static methods 
These methods are to be used from the normal intersections as well.
 2019-11-20 12:00:43 +01:00
Magne Sjaastad
5fc576b8f3 Janitor : Release memory to make it easier to detect memory leaks 2019-11-20 11:48:02 +01:00
Magne Sjaastad
0bf782147a Janitor : RimProject : Skip obsolete delete in desctructor 2019-11-20 11:42:13 +01:00
Magne Sjaastad
4225e67834 Janitor : Make sure memory is released by using unique_ptr 2019-11-20 11:41:14 +01:00
Jacob Støren
c8053284d1 #5019 Add relevant access to IntersectionResultDefinition 
Implement initAfterRead to populate the resultDefinitions with correct case
 2019-11-20 10:39:48 +01:00
Jacob Støren
c79de08c40 Improve const-ness somewhat on some results color related methods 2019-11-20 10:39:48 +01:00
Jacob Støren
6e96570995 #5019 Position the separate source box/intersections correctly acc to displayOffset 2019-11-20 10:39:48 +01:00
Jacob Støren
439071dddf Fix crash when copying the intersection. 
Updating of the default is handled later, so is not neccesary when doint initAfterRead after deserialization.
 2019-11-20 10:39:48 +01:00
Jacob Støren
dcb32c285f Unification of color texturing code in Intersection and -Box 2019-11-20 10:39:48 +01:00
Jacob Støren
57dfd3b67a Intersection color texturing: Remove dependency on view and RimEclipseResultColor 
Also start to harmonize intersection and intersection box texturing
 2019-11-20 10:39:48 +01:00
Jacob Støren
db0bbb96c4 #5019 Use hex grid interface creation from data source for all intersections 2019-11-20 10:39:48 +01:00
Jacob Støren
612332cbbc #5019 Move RimIntersectionHandle to separate files Use in RimIntersectionBox 2019-11-20 10:39:48 +01:00
Jacob Støren
9ed3d8babc #5019 WIP: Made fields in IntersectionHandle protected 2019-11-20 10:39:48 +01:00
Jacob Støren
8fb3fbc097 #5019 WIP: Create a RimIntersectionHandle base class 2019-11-20 10:39:48 +01:00
Jacob Støren
62ed71ed76 #5019 Intersections have first data source as ianctive default 
Icon state update for IResDefCollection
 2019-11-20 10:39:48 +01:00
Jacob Støren
fec449dc43 #5019 Add separate intersection results collection and items 2019-11-20 10:39:47 +01:00
Magne Sjaastad
88d961e516 Janitor : Fix memory leak 2019-11-20 09:07:59 +01:00
Magne Sjaastad
6b782cb646 #5067 Janitor : Fix memory leak when opening summary files 2019-11-20 07:05:24 +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
Gaute Lindkvist
4d38c2ea39 #5061 WAP: Trigger reload of Well Allocation Data when updating depth type 2019-11-19 13:18:36 +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
Gaute Lindkvist
ae9575feb2 #5049 Fix missing axis title for well allocation plots 2019-11-19 10:33:18 +01:00
Gaute Lindkvist
94cc635649 Fix MSVCRTD warning message in release with debug and GRPC 2019-11-19 10:06:45 +01:00
Magne Sjaastad
710352e4bf Janitor : Remove unused code and reorganize includes 2019-11-19 08:50:03 +01:00
Gaute Lindkvist
6f4ae69cc9 #5048 Add comment to well log curve for zoom calculation 2019-11-19 08:16:56 +01:00
Gaute Lindkvist
61e443cc69 #5048 Fix zoom all for well allocation plots 2019-11-19 08:02:36 +01:00
Jacob Støren
470dab8d58
Merge pull request #5059 from OPM/feature-well-path-modeling-improvements 
Feature well path modeling improvements
 2019-11-18 13:03:28 +01:00
Jacob Støren
72cc643cd1 Update unit tests to accomodate changes in PolyArcLineSampler 2019-11-18 10:29:53 +01:00
Jacob Støren
6c0c5803da #5058 Use two decimals in vector positions in Well Paths 2019-11-18 09:51:51 +01:00
Jacob Støren
9f6d6f693e #5050 Improve Insert Well Target command 2019-11-18 09:51:51 +01:00
Magne Sjaastad
5d3082d4e2 #5056 AppFwk : Include cafCommandFeatures in ResInsight 2019-11-15 15:33:31 +01:00
Magne Sjaastad
40f95f349c #5053 Ensemble RFT : Avoid selection of large number of time steps 2019-11-15 13:11:19 +01:00
Jacob Støren
de6dab7d2e
Merge pull request #5046 from OPM/bugfixes-wellpath-modelling 
Bugfixes wellpath modeling
 2019-11-15 09:16:02 +01:00
Jacob Støren
f6675b7c45 #4789, #5045 Made wellpath calculator control dogleg editability 
Making them correct.
Doglegs with an actual value less than the user provided value  are colored green.
Removed the text stating that the constraint is not met.
 2019-11-14 17:23:52 +01:00
Jacob Støren
effa3025e1 #5044 Add a max angle for sampling of arcs at approx 6 deg dogleg 2019-11-14 17:05:10 +01:00
Magne Sjaastad
3455b305e0 Revert "#5031 Summary Data : Make sure the reader is created in constructor" 
This reverts commit 2b8219a855.
 2019-11-14 15:18:03 +01:00
Jacob Støren
e82f6a5ab7 #5030, #5035 Fix missing update of intersection boundingboxes. 
Regression introduced by 3c3c207bbc
Which removes (mostly) unneccessary recursiveBBox updates when inserting static models in viewer
The commit might expose other bugs as well.
 2019-11-14 14:00:54 +01:00
Jacob Støren
fe88fb9ccb #5037 Fixed crash in well path target points geometry generation 2019-11-14 13:48:54 +01:00
Gaute Lindkvist
aa40816f49 #5026 Fix summary plot closing crash 2019-11-13 14:41:17 +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
57f6ee0660 #5033 Ensemble RFT : Auto select first date if no date is matching 2019-11-13 11:12:51 +01:00
Magne Sjaastad
280f8c1d45 #5031 Summary Data : Only use openMP on open of summary file 2019-11-12 18:26:47 +01:00
Magne Sjaastad
2b8219a855 #5031 Summary Data : Make sure the reader is created in constructor 2019-11-12 18:25:38 +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
8157790068 #5022 Performance Summary : Use openmp when loading metadata for cases 2019-11-11 12:35:27 +01:00
Magne Sjaastad
aa11e3601b #5020 Flow Diag : Avoid creating plots in constructor to make pytest work 2019-11-11 09:47:01 +01:00
Magne Sjaastad
cb89823474 #5020 Flow Diag : Improve default initialization of plots 2019-11-08 14:20:11 +01:00
Magne Sjaastad
66b0184971 Summary Command Line : Help text adjustments 2019-11-08 12:45:08 +01:00
Jacob Støren
4658893850
Merge pull request #5018 from OPM/bugfix-#4869-create-rangefilter-on-inactive-view 
Bugfix #4869 create rangefilter on inactive view
 2019-11-08 12:35:24 +01:00
Jacob Støren
19fe1fcd1b
Merge pull request #5017 from OPM/feature-adjust-comparison-overlay-items 
Feature adjust comparison overlay items
 2019-11-08 11:24:09 +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
0f6a4c0934 Fix opengl errors when resizing comparison view to invalid size 
Clamp to min 0.0 width
 2019-11-08 10:40:37 +01:00
Jacob Støren
8eb94eaabe Fix bbox invalid assert in RiuViewer in debug build 2019-11-08 10:40:37 +01:00
Jacob Støren
a9dc07ddc9 #4995 Place legends from comparison view to the right. 
Adjust the axiscross to follow the legends
 2019-11-08 10:40:37 +01:00
Jacob Støren
331361e2b2 Cleanup of add legend code in RiuViewer 
Preparations
 2019-11-08 10:40:37 +01:00
Gaute Lindkvist
3d6b53841d #5010 Attempt to read formation file even if it isn't called .lyr 2019-11-07 14:33:54 +01:00
Gaute Lindkvist
c5bca4cc7e Hide RimViewWindow::m_viewId so it doesn't show up in property editors 2019-11-07 12:50:17 +01:00
Magne Sjaastad
c7e97b4447
Merge pull request #5008 from OPM/avoid-virtual-method-constructors 
Avoid virtual calls in constructor and desctructors
 2019-11-07 09:46:36 +01:00
Magne Sjaastad
70d220ae19 Janitor : Remove unused variable 2019-11-07 09:44:50 +01:00
Magne Sjaastad
d1ca612e3a System : Add doxygen generation of Project Data Model 2019-11-07 09:28:11 +01:00
Magne Sjaastad
388b92c092 #5007 Janitor : Do not call virtual methods from constructors 2019-11-07 09:01:31 +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
a413f672ec #5007 Janitor : Do not call virtual methods from destructors 2019-11-07 08:48:11 +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
7670874181 #5006 Changed first default color of created well paths 2019-11-06 18:01:55 +01:00
Jacob Støren
6bd07aa8ee #650 Removed the ugly nan legend displayed while loading things 2019-11-06 18:01:55 +01:00
Jacob Støren
55470cc1cd #5004 Remove comparison view option from 2dIntersection view 2019-11-06 18:01:55 +01:00
Jacob Støren
d82b957add Improve linked views toolbutton icon slightly 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
9f320c1dda
Merge pull request #5000 from OPM/move-3d-settings-to-system-tab 
Move 3d settings to system tab
 2019-11-06 12:45:34 +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
dc983b5b84 #4982 Preferences : Add groups to System tab 2019-11-06 11:32:17 +01:00
Magne Sjaastad
0b3e5ecf0c #4982 Preferences : Move Show 3D information to development tab 2019-11-06 11:22:03 +01:00
Magne Sjaastad
2aa704b18a #4982 Preferences : Move Use Shaders to development tab 2019-11-06 11:10:33 +01:00
Magne Sjaastad
28c77d4b67 #82 Import Ascii-data : Minor code adjustments 2019-11-06 10:54:42 +01:00
Magne Sjaastad
c090992342 Rename to Stop Comparison 2019-11-06 10:15:51 +01:00
Magne Sjaastad
309e4f9f31 #4993 Fix import property from text file when LGR is present 2019-11-06 09:39:27 +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
3203881418 More improvements to column/rowspan system 2019-11-06 08:24:57 +01:00
Magne Sjaastad
16536cfde7 Fix missing return statement 2019-11-05 15:47:32 +01:00
Jacob Støren
58c1734334
Merge pull request #4985 from OPM/feature-fix-point-manipulators-in-comparison-view 
#4981 Fix well target manipulators not responding
 2019-11-05 15:42:02 +01:00
Gaute Lindkvist
b227ef7bdb #4992 Rename combination plots to plot report 2019-11-05 15:34:36 +01:00
Gaute Lindkvist
c1dfe193d7 #4990 Column and row span 2019-11-05 15:34:36 +01:00
Kristian Bendiksen
31e0a0349f Add more comments. 2019-11-05 14:10:14 +01:00
Kristian Bendiksen
44b9e52e1b #4965 Fix crash when importing Eclipse input case. 
Added guard to avoid importing faults from the input property files when
faults already exists in the eclipse case. Faults can theoretically appear
in any of the files, but reading and appending them to the existing fault
collection is not currently supported.
 2019-11-05 13:32:13 +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
f1e987f0b9 Extract method for reading input property data for remaing keywords. 2019-11-05 12:23:26 +01:00
Kristian Bendiksen
9c53cfb44f Extract more methods from RifEclipseInputPropertyLoader::loadAndSyncronizeInputProperties. 2019-11-05 12:23:26 +01:00
Kristian Bendiksen
c3dc8376be Extract two utility methods to make loadAndSyncronizeInputProperties smaller. 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
357b07506f Move RimEclipseInputPropertyCollection to make it available in RimEclipseResultCase. 
Ref #82.
 2019-11-05 12:21:29 +01:00
Kristian Bendiksen
ce15aa1b5e Extract utility for loading input properties from file. 2019-11-05 12:21:29 +01:00
Gaute Lindkvist
03ff43237d Add a view id tag to project tree and tooltip 
* Remove it from property editor
 2019-11-05 11:09:18 +01:00
Gaute Lindkvist
f222f73718 #4984 Grid Cross Plot: Make sure pick point information is on top of highlighted curve 2019-11-05 11:09:18 +01:00
Gaute Lindkvist
c7b5957571 #4983 Fix drag zoom on Summary and Grid cross plots 2019-11-05 11:09:18 +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
Jacob Støren
3c3c207bbc #4981 Fix well target manipulators not responding 
Moved z scale change notification to method setting zscale for label
Was always done, and recreated target manipulators at first mousemove
Avoid updating cached values in scene on repeated calls to show gridbox
 2019-11-05 09:30:58 +01:00
Jacob Støren
03b44fc36f Avoid regenerating gridbox when unchanged 2019-11-05 09:30:58 +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
Magne Sjaastad
e8cdf1a8ef Janitor : Remove boolean function always returning true 2019-11-04 10:16:29 +01:00
Magne Sjaastad
9ae07c838a #4919 Summary Plot : Improve colors of history curve symbols 2019-11-04 10:15:57 +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
Jacob Støren
52177994bd Improve readability of 3dView measurement in comparison view fix 2019-11-04 09:09:03 +01:00
Magne Sjaastad
a950852559 #4972 Summary : Add placeholder text to combo box editor 2019-11-03 14:49:08 +01:00
Magne Sjaastad
cd054f2170 Janitor : Use const ref when possible (2) 2019-11-03 14:08:21 +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
Magne Sjaastad
4ff56c7751 Janitor : Set copy constructor and assignment operator deleted 2019-11-03 11:14:48 +01:00
Magne Sjaastad
688750dfab Janitor : Make sure normalization of second vector also is verified 2019-11-03 08:54:12 +01:00
Magne Sjaastad
f35edc302f Janitor : Remove double if statement with identical test 2019-11-03 08:50:08 +01:00
Magne Sjaastad
67e7bb0cf3
Fixes detected by cppcheck (#4974) 
* Janitor : Remove obsolete pointer to dialog

* Janitor : Remove unused functions

* Janitor : Remove unused functions

* Janitor : Add explicit to constructors

* Janitor : Remove unused variables

* Janitor : Remove unused functions related to summary plot templates

* clang-tidy : Use nullptr instead of 0

* clang-tidy : Fix usage of virtual and override

* Upped to version 2019.08.2-dev.05

* Janitor : Remove unused variables

* Janitor : Clean up several cppcheck issues

* Janitor : Add cppcheck config files

* Janitor : Use const when possible
 2019-11-03 08:37:03 +01:00
Jacob Støren
6220225cfa #4970 Fix measurement text not visible in comparison view 2019-11-01 16:42:42 +01:00
Jacob Støren
f7fb4caa69 #4880 Fix annotations missing in comparison view 2019-11-01 15:57:04 +01:00
Jacob Støren
8bdb05447c Reordered Rim3dView.h 2019-11-01 15:57:04 +01:00
Jacob Støren
e85cd1b456 #4880 Further renaming of methods in Rim3dView 2019-11-01 15:57:04 +01:00
Jacob Støren
c9af22cf91 #4880 Refactoring in Rim3dView: De-virtualize updateCurrentTimeStepAndRedraw 2019-11-01 15:57:04 +01:00
Jacob Støren
b51e054ffd Renaming of more methods in Rim3dView. 
Removed virtual method from RiuViewerToViewInterface as it was not used from the interface.
 2019-11-01 15:57:03 +01:00
Jacob Støren
7f3f6419ac Rename virtual methods in Rim3dView 
To make it more clear that they are virtual methods to be distinguished from implementations in the base class. Also make their meaning somewhat more expressed.
 2019-11-01 15:57:03 +01:00
Jacob Støren
1ef4d49f14 #4857 Fix Intersection Box 3d manipulator interaction in comparison views 2019-11-01 15:57:03 +01:00
Jacob Støren
ce28f1e858 #4857 Avoid switching active view when creating intersectinos 2019-11-01 15:57:03 +01:00
Jacob Støren
dbd09e97e3 #4857 Fix intersection polyline picking in comparison view 2019-11-01 15:57:03 +01:00
Jacob Støren
99fb39bd68 Rename SubWindowActivated blocking methods 
to clarify their differences
 2019-11-01 15:57:03 +01:00
Kristian Bendiksen
60ac760254 Add txt suffix file pattern to make windows dialog behave better on windows. 2019-11-01 15:07:08 +01:00
Kristian Bendiksen
4c11564838 #4941 Workaround strange file name validation in "Export FLUXNUM/MULTINUM" dialog. 
Having an explicit filter for the default suffix (*.grdecl) removes the
strange complaint about the default file name not being valid.
 2019-11-01 15:07:08 +01:00
Gaute Lindkvist
a6b6411b6b Fix compile warning in RigGeoMechWellLogExtractor.cpp 2019-11-01 08:26:59 +01:00
Gaute Lindkvist
c5f5242f81 Fix compile warning in RifActiveCellsReader-Test.cpp 2019-11-01 08:26:34 +01:00
Magne Sjaastad
a5aa49c705 #4961 Summary : Fix description of some vectors 2019-10-31 18:54:27 +01:00
Gaute Lindkvist
5f72c03d52 Fix warning in RImSummaryCurvesCalculator 2019-10-31 15:37:30 +01:00
Gaute Lindkvist
39cefcd0bb Enable drag and drop of all plots in tree view 2019-10-31 15:34:16 +01:00
Gaute Lindkvist
e8c745d704 Implement creation of combination plots from selected plots 2019-10-31 15:12:54 +01:00
Gaute Lindkvist
30db19a1d0 Create Grid plot collection and allow creation of new combination plots 2019-10-31 14:09:50 +01:00
Magne Sjaastad
e042b2d17b #4958 Summary adjustments : Rename to Last used summary template 2019-10-31 11:55:53 +01:00
Magne Sjaastad
1d88f4d48a Guard null pointer access 2019-10-31 09:38:44 +01:00
Magne Sjaastad
45cc94abd2 Janitor : apply clang-format 2019-10-31 09:35:48 +01:00
Magne Sjaastad
856580699c
Merge pull request #4955 from OPM/summary-adjustments 
Summary adjustments
 2019-10-30 14:40:20 +01:00
Gaute Lindkvist
35ecde99c8 Add an assert on object name to RiuWidgetStyleSheet 2019-10-30 12:54:52 +01:00
Gaute Lindkvist
5c79ff2573 Clean up RiuWidgetStyleSheet and add more comments 2019-10-30 12:54:51 +01:00
Gaute Lindkvist
a925c0f29e Partial revert of 38e0b150 2019-10-30 12:54:51 +01:00
Gaute Lindkvist
9f927e74f3 Make RiuWidgetStyleSheet::refreshWidget() private 2019-10-30 12:00:19 +01:00
Gaute Lindkvist
4847f46840 Fix Stylesheets after review 2019-10-30 11:56:28 +01:00
Gaute Lindkvist
38e0b150ac Allow deleting of the last sub plot and have nice visible drop targets 2019-10-30 11:56:22 +01:00
Gaute Lindkvist
089ca3d39d #4931 Add available diameters to casing design and split casing and liner. 2019-10-30 11:53:02 +01:00
Gaute Lindkvist
f741c878db Update depth axis grid when changing grid line setting 2019-10-30 11:53:02 +01:00
Magne Sjaastad
e4fd536d21
Merge pull request #4950 from OPM/summary-curve-filter-recently-used-to-registry 
Summary curve filter recently used
 2019-10-30 11:12:59 +01:00
Magne Sjaastad
d6b7aa301c #4951 Summary Plot Template : Hide template collection in project tree 2019-10-30 10:48:23 +01:00
Magne Sjaastad
2dfa6b9d9f #4951 Summary Plot Template : Remove obsolete template pointer 2019-10-30 10:45:15 +01:00
Magne Sjaastad
a1e40524bc #4951 Summary Plot Template : Adjust size of UI 2019-10-30 10:42:16 +01:00
Magne Sjaastad
25e7c3ecc1 #4951 Summary Plot Template : Hide default plot template from UI 2019-10-30 10:41:38 +01:00
Jacob Støren
f7f3e72700 Fix crash when closing project due to virtual call inside destructor. 
isScaleZEditable called inside destructor of Rim3dView when the deleted view is the active view
 2019-10-30 09:26:41 +01:00
Magne Sjaastad
bcb4150ae4 #4951 Summary Plot Template : Hide context menu to select template 2019-10-30 09:26:41 +01:00
Magne Sjaastad
18c52b0e18 Janitor : Avoid using .. when referencing include files 2019-10-30 09:12:13 +01:00
Jacob Støren
42b7bce1ee
Merge pull request #4947 from OPM/feature-co-visualization-into-linked-views 
Improve Linked Views and include Co visualization #4892
 2019-10-30 08:39:07 +01:00
Magne Sjaastad
350a812634 #4949 Recently used files : Use string list serializer 2019-10-29 14:23:01 +01:00
Magne Sjaastad
facfd062dc #4949 Summary Curve Filter Toolbar : Store recently used strings to registry 2019-10-29 14:17:24 +01:00
Jacob Støren
2702c3b078 #4857 Avoid crash in annotations picking whith distorted view 2019-10-29 13:54:32 +01:00
Jacob Støren
469397bfd1 #4857 Fix crash due to missing guarding when loading project 2019-10-29 13:49:24 +01:00
Magne Sjaastad
ba89a60e8d #4946 Ensemble Colors : Show color control in curve filter property editor 2019-10-29 13:40:57 +01:00
Jacob Støren
06d1500a3f Remove obsolete code 2019-10-29 13:18:10 +01:00
Gaute Lindkvist
6c45c88619
Merge pull request #4923 from OPM/system-stylesheet-manager 
Implement style sheet manager for more robush CSS management
 2019-10-29 13:11:56 +01:00
Jacob Støren
3998a6001e #4892 Improve Link Visible Views icon 2019-10-29 12:48:38 +01:00
Jacob Støren
5ea43dda19 #4892 Add "Compare To ..." command in views 2019-10-29 12:48:38 +01:00
Jacob Støren
a89670bc22 #4892 Set As Primary Linked View disabled for unlinked views, 
to reduce clutter in menu
 2019-10-29 12:48:38 +01:00
Jacob Støren
1774d123cc #4892 Simplified Unlink View command. Works on pprimary view as well. 2019-10-29 12:48:38 +01:00
Jacob Støren
159d54477a #4892 Simplified Link View command. Allowed to link a view without a previous primary view. 2019-10-29 12:48:37 +01:00
Jacob Støren
5ee8c3b50e #4892 Improved names and added improved icons to linked views commands 2019-10-29 12:47:01 +01:00
Jacob Støren
b2f8c56a0d Fixed crash on project close introduced by update of MDI window title with Primary/Controlled 2019-10-29 12:47:01 +01:00
Jacob Støren
ff7c586021 #4892 Add 3DView context command to remove comparison view 2019-10-29 12:47:01 +01:00
Jacob Støren
b729ce7228 #4892 Add (Primary) and (Controlled) labels to view window titles 2019-10-29 12:47:01 +01:00
Jacob Støren
3710b4ba58 #4892 Avoid comparison view accidentally added when linking views 2019-10-29 12:47:01 +01:00
Jacob Støren
26a5b4fbae #4892 LinkViews: Avoid using selected views when rightclicking in 3D View 2019-10-29 12:47:01 +01:00
Jacob Støren
d5a39ab3aa #4892 Improved names and added improved icons to linked views commands 2019-10-29 12:47:01 +01:00
Jacob Støren
6af4356f36 #4892 Add Comparison view drop-down to linked view master. 
Works as shadow of the views comparison view setting.
Make it follow the dependent viewcontrollers managed view.
Comparison view dropdown moved to "Viewer" group in view panel.
Avoid infinite recursion loops when comparison views are set up in circle
 2019-10-29 12:47:01 +01:00
Jacob Støren
27d65af027 Fix crashes when scene in one view is empty 2019-10-29 12:47:01 +01:00
Jacob Støren
c76699cdb8
Merge pull request #4943 from OPM/feature-picking-in-comparison-view-fixes 
Picking in comparison view fixes
 2019-10-29 12:41:14 +01:00
Kristian Bendiksen
c72369a1bb #4857 Fix RicAdd3dWellLogCurveFeature picking in comparison view. 2019-10-29 10:52:04 +01:00
Kristian Bendiksen
a373f89295 #4857 Fix RicSaveEclipseVisibleCellsFeature/RicSaveEclipseActiveVisibleCellsqFeature picking in comparison view. 2019-10-29 10:52:04 +01:00
Kristian Bendiksen
849def6ee5 #4857 Fix RicExportEclipseSectorModelFeature picking in comparison view. 2019-10-29 10:52:04 +01:00
Kristian Bendiksen
2c3b51ad3f #4857 Fix measurement picking in comparison view. 2019-10-29 10:52:04 +01:00
Magne Sjaastad
1bf8341ba7 #4944 Ensemble RFT : Add missing initialization 2019-10-29 09:29:15 +01:00
Kristian Bendiksen
6e43fee396 #4857 Fix RicNewWellPathIntersectionFeature picking. 
Also avoid confusing active view change.
 2019-10-29 09:01:11 +01:00
Kristian Bendiksen
a51219b1ca #4857 Fix RicShowFlowCharacteristicsPlotFeature picking. 2019-10-29 09:01:11 +01:00
Kristian Bendiksen
212bdc0648 #4857 Fix RicNewGridTimeHistoryCurveFeature picking. 2019-10-29 09:01:11 +01:00
Kristian Bendiksen
6c3847a2ac #4857 Fix context menus for linked views in co-vizualisation. 2019-10-29 09:01:11 +01:00
Kristian Bendiksen
c02dc40780 #4857 Fix RicShowGridStatisticsFeature picking. 2019-10-29 09:01:11 +01:00
Kristian Bendiksen
9c4696046c #4857 Fix RicCreateGridCrossPlotFeature picking. 2019-10-29 09:01:11 +01:00
Kristian Bendiksen
41b58b9099 #4857 Fix RicShowWellAllocationPlotFeature picking. 2019-10-29 09:01:11 +01:00
Kristian Bendiksen
59c25c6762 #4857 Make RicNewWellLogCurveExtractionFeature picking more conceptually correct. 
The previous code did also work.
 2019-10-29 09:01:11 +01:00
Kristian Bendiksen
734d954cfb #4857 Fix RicEclipseHideFaultFeature picking. 2019-10-29 09:01:11 +01:00
Magne Sjaastad
23e8db65c2 Merge remote-tracking branch 'origin/dev' into summary-text-edit-in-toolbar 2019-10-28 20:49:29 +01:00
Magne Sjaastad
0af6a1d95d #4775 Summary : Use combo box with history to edit text based curve creation 2019-10-28 20:41:15 +01:00
Gaute Lindkvist
3a1f21093e Implement style sheet class for more robush CSS management 2019-10-28 13:22:56 +01:00
Gaute Lindkvist
c0df30f855 Fix plot axis extents to remove lots of whitespace 2019-10-28 13:16:21 +01:00
Gaute Lindkvist
625feaf36c #4929 Fix legend fonts in Summary plot 2019-10-28 13:16:00 +01:00
Gaute Lindkvist
4bce02c375 Add simple fix for Grid Cross plot as well 
* TODO:  make sure the methods in RimSummaryPlot and RimGridCrossPlot are called when using the generic virtual method in RimPlotInterface.
* This requires a bit of thought, since they have parameters which the generic version does not have
 2019-10-28 10:18:24 +01:00
Gaute Lindkvist
c200ea0687 Fix asciiDataForPlotExport compile warnings 2019-10-28 10:18:24 +01:00
Gaute Lindkvist
edead9e3af Made RiuQwtPlotWidget axis operations much more general 2019-10-28 10:18:03 +01:00
Gaute Lindkvist
0e9cda8e84 Fix update of fonts in summary and grid cross plot axes 2019-10-28 10:18:03 +01:00
Magne Sjaastad
12478a6eef #4918 Improve detection of numbers when parsing std string 2019-10-25 16:38:08 +02:00
Magne Sjaastad
72e3ddc35e #4934 Preferences : More robust storing of data to registry 2019-10-25 15:55:27 +02:00
Magne Sjaastad
2f3fcf7eec
Merge pull request #4932 from OPM/summary-adjustments 
Summary Adjustments
 2019-10-25 15:17:40 +02:00
Magne Sjaastad
5183fbd5db #4926 Summary Plot : Add "Plot Preview" to plot editor 2019-10-25 14:27:22 +02:00
Magne Sjaastad
6110748192 #4926 Summary Plot : Add push button to edit plot 2019-10-25 13:53:51 +02:00
Magne Sjaastad
cea853b94f #4926 Summary Templates : Improve placeholder text 2019-10-25 13:33:27 +02:00
Magne Sjaastad
0657155d86 #4926 Summary Templates : Move curve text edit group to top, collapse others 2019-10-25 13:29:32 +02:00
Magne Sjaastad
f2fad7a975 #4926 Summary Templates : Set curve as selected object when case is imported 2019-10-25 13:15:02 +02:00
Kristian Bendiksen
9e1f50f198
Merge pull request #4921 from OPM/fix-contour-map-export-filename-4920 
#4920 Fix second contour map export file name suggestion.
 2019-10-25 12:52:41 +02:00
Magne Sjaastad
29c3ce0d06 #4903 Use helper function for action shortcut everywhere 2019-10-25 12:48:17 +02:00
Magne Sjaastad
f2d5adca60 #4926 Summary Templates : Avoid creation of one extra duplicate curve 2019-10-25 11:57:30 +02:00
Gaute Lindkvist
785f039a1d #4925 Add guard on view missing after d8a8a615 to RImViewLinker::findNameAndIconFromView 2019-10-25 11:48:51 +02:00
Magne Sjaastad
e21e4f5008 Documentation : Updates for Python documentation 2019-10-25 11:20:27 +02:00
Kristian Bendiksen
1e8d1dbe8e Make "export contour map" dialog modal relative to 3D main window. 2019-10-24 21:58:50 +02:00
Kristian Bendiksen
5ecda9d4be #4920 Fix second contour map export file name suggestion. 2019-10-24 21:58:50 +02:00
Magne Sjaastad
76d196a91a
Merge pull request #4902 from OPM/summary-text-edit-in-toolbar 
Summary text editor in toolbar
 2019-10-24 21:44:33 +02:00
Gaute Lindkvist
6687b6ad94 Fix delete of tracks by adding virtual plot interface destructor 2019-10-24 14:59:16 +02:00
Gaute Lindkvist
b343aa1ae9 Fix update of track names following DnD 2019-10-24 14:59:16 +02:00
Gaute Lindkvist
88a80c1b71 Renames of WelLLogTrack::Widths in create WBS feature 2019-10-24 14:59:16 +02:00
Magne Sjaastad
f68eb93ac6 #4851 Ensemble RFT : Make sure colors are created correctly 
Lindkvist: Fixed commit to work with new Grid Plot code
 2019-10-24 14:59:16 +02:00
Magne Sjaastad
e2da391371 #4851 Ensemble RFT : Fix update of color of ensemble curves on project load 
Lindkvist: updated to work with new Grid Plot code
 2019-10-24 14:59:16 +02:00
Gaute Lindkvist
a48f4903ea Disable common data source in well allocation plots 
(they have common data selection explicitly)
 2019-10-24 14:59:16 +02:00
Gaute Lindkvist
aef0e0a70f More precise view id 2019-10-24 14:59:16 +02:00
Gaute Lindkvist
c578a43b53 Introduce RimGridPlotWindow and RiuQwtPlotWidget 2019-10-24 14:59:16 +02:00
Gaute Lindkvist
2857a13e7c Columns in well log plots 2019-10-24 14:59:16 +02:00
Gaute Lindkvist
cf02211713 Introduce a new RiaPlotWindowRedrawScheduler 
* Also fix order in RiaViewRedrawScheduler.cpp file to match header
 2019-10-24 14:59:16 +02:00
Gaute Lindkvist
dfe9390c30 Revert "#4851 Ensemble RFT : Fix update of color of ensemble curves on project load " 
This reverts commit 328cf44d94.
 2019-10-24 14:59:16 +02:00
Gaute Lindkvist
771d12c563 Revert "clang-format fixes" 
This reverts commit 86c75ca678.
 2019-10-24 14:59:16 +02:00
Gaute Lindkvist
edc4486de7 Revert " #4851 Ensemble RFT : Make sure colors are created correctly" 
This reverts commit cb5195bac2.
 2019-10-24 14:59:16 +02:00
Magne Sjaastad
580d826922 Clear line edit when content do not match 2019-10-24 10:04:42 +02:00
Gaute Lindkvist
0fd7f40e46 Stop reselecting on activation in plot view if a child is already selected 2019-10-24 09:10:34 +02:00
Gaute Lindkvist
3422f1b609 Fix view id in well allocation plots 2019-10-24 09:08:04 +02:00
Gaute Lindkvist
2d6e631107 Fix crash when changing application fonts 2019-10-24 09:07:19 +02:00
Gaute Lindkvist
3a90bf1e76 Use QwtPlotZoneItems instead of QwtPlotShapeItems for formations 2019-10-24 09:06:44 +02:00
Gaute Lindkvist
af72538516 Stop using gradient for AccumulatedPhaseFractionsPlot 2019-10-24 09:06:05 +02:00
Magne Sjaastad
bbfc6188e9 #4775 Summary : Do not change source selection if no sources are matching 2019-10-23 17:39:16 +02:00
Magne Sjaastad
4c48f557b0 #4822 Countour Map Export: Add export to context menu in 3D view 2019-10-23 17:03:09 +02:00
Magne Sjaastad
cb7e948fef #4904 Multiple restart-files : Fix wrong time step date 2019-10-23 12:43:34 +02:00
Magne Sjaastad
8ca1ae4888
Merge pull request #4911 from OPM/ensemble-rft-colors-on-load 
Additional fix for ensemble rtf colors
 2019-10-23 09:39:04 +02:00
Magne Sjaastad
b3ee5a2e01
Merge pull request #4910 from OPM/ensemble-legend-icon-and-text 
Improve ensemble statistics legend icon and text
 2019-10-23 09:38:27 +02:00
Magne Sjaastad
cb5195bac2 #4851 Ensemble RFT : Make sure colors are created correctly 2019-10-23 09:16:54 +02:00
Magne Sjaastad
86c75ca678 clang-format fixes 2019-10-23 09:14:14 +02:00
Kristian Bendiksen
29fdca3f69
Merge pull request #4871 from OPM/feature-export-contour-map-data 
Feature export contour map data
 2019-10-23 08:43:51 +02:00
Magne Sjaastad
05d2645a0a #4909 Summary Legend Text : Improve text for statistics curves 2019-10-23 08:43:44 +02:00
Kristian Bendiksen
610535aecc #4819 Minor review tweaks. 2019-10-22 21:58:46 +02:00
Kristian Bendiksen
bd804ee821 #4819 #4820 Rename action to avoid confusing user with ascii. 
Command menu item is now "Export Contour Map to Text". Also update file names to
match.
 2019-10-22 21:58:46 +02:00
Kristian Bendiksen
fd9277f92d #4819 Export correct case and time step name for contour map. 2019-10-22 21:58:46 +02:00
Kristian Bendiksen
f70fbe0071 #4819 Add methods to get case and time step name for RimContourMapProjection. 2019-10-22 21:58:46 +02:00
Kristian Bendiksen
eb829abf72 #4819 Replace default marker for undefined values with user-defined string. 2019-10-22 21:58:46 +02:00
Kristian Bendiksen
e692dfaf4f Add method to change default marker in RifTextDataTableFormatter. 2019-10-22 21:58:45 +02:00
Kristian Bendiksen
acddb4a156 #4819 Export correct UTM coordinates. 2019-10-22 21:58:45 +02:00
Kristian Bendiksen
847bd0736a #4819 Write contour map metadata header. 2019-10-22 21:58:45 +02:00
Kristian Bendiksen
10d257480d Expose RimContourMapProjection methods to find coordinates for export. 2019-10-22 21:58:45 +02:00
Kristian Bendiksen
174248087d #4819 Add option to exclude undefined values from contour map export. 2019-10-22 21:58:45 +02:00
Kristian Bendiksen
8e076b3acb #4821 Add python objects for Contour Map export. 2019-10-22 21:58:45 +02:00
Jacob Støren
63917a61b5
Merge pull request #4907 from OPM/feature-picking-in-comparison-view 
Feature fix picking in comparison view step 1
 2019-10-22 16:07:59 +02:00
Jacob Støren
d802edc145 #4858 Remove unused time step link option from comparison view settings. 2019-10-22 13:54:10 +02:00
Jacob Støren
016f26725a #4862 Lock scale Z in comparison view to follow the main view. 
#4858 Make timestep independent in comparison view. Make Linked Views timestep linking work
 2019-10-22 13:39:18 +02:00
Magne Sjaastad
2d2ce4a71e #4906 Ensemble Statistics Legend Icons : Fix missing symbol text 2019-10-22 13:14:16 +02:00
Magne Sjaastad
28ef4166ea #4775 Summary : Improve event handling and add shorcut 2019-10-22 10:39:18 +02:00
Kristian Bendiksen
c615c7507b #4820 Start using RicfCommand for RicExportContourMapToAsciiFeature. 2019-10-22 09:15:26 +02:00
Kristian Bendiksen
8f115a0b34 Avoid fallthrough in switch statement. 2019-10-22 08:43:07 +02:00
Gaute Lindkvist
dc9e064c9a #4819 Basic export and nearly completed UI. 2019-10-22 08:43:07 +02:00
Gaute Lindkvist
b3dd2109ac #4819 Add separate header prefix for RifTextDataTableFormatter. 2019-10-22 08:43:07 +02:00
Gaute Lindkvist
7f3240fd70 #4819 Export contour map to ascii. 2019-10-22 08:43:07 +02:00
Kristian Bendiksen
3cbbf1fd6e
Merge pull request #4870 from OPM/system-refactor-EclipseDataTableFormatter-rename 
Rename RifEclipseOutputDataTable* to RifTextDataTable*
 2019-10-22 08:27:32 +02:00
Magne Sjaastad
1671fe44b2 #4775 Summary : Add max width to line edit 2019-10-21 16:36:28 +02:00
Magne Sjaastad
7be2cc3031 #4775 Summary : Add text based curve creation to toolbar 2019-10-21 16:19:28 +02:00
Jacob Støren
86cb90515b #4894 Fix missing updates when changing zscale and using linked views. 
Prepare for fix of scalez-problems with comparison view
 2019-10-21 09:01:35 +02:00
Jacob Støren
d8a8a615a8 #4900 Align name and icon of linked views with ordinary views 2019-10-21 09:00:35 +02:00
Magne Sjaastad
328cf44d94 #4851 Ensemble RFT : Fix update of color of ensemble curves on project load 2019-10-20 10:46:05 +02:00
Magne Sjaastad
53e8cc82bd #4876 Resampeled Plot Data: Show time short text labels when possible 2019-10-19 15:05:59 +02:00
Magne Sjaastad
d59cdfa6ec
Merge pull request #4895 from OPM/fix-cumulative-curve-statistics-resample 
Fix cumulative curve statistics resampling
 2019-10-19 13:33:26 +02:00
Jacob Støren
ab190fce8b Fixed missing pragma once 2019-10-18 15:00:59 +02:00
Magne Sjaastad
6d7b29bb29 #4893 Formations : Make sure "layer_zone_table.txt" is defined once 2019-10-18 14:45:12 +02:00
Magne Sjaastad
3f617c93d2 #4893 Import Observed FMU data : Add error message 2019-10-18 14:36:53 +02:00
Magne Sjaastad
537184328a #4877 Refactor and rename to RiuSummaryQuantityNameInfoProvider 2019-10-18 14:28:02 +02:00
Magne Sjaastad
1cab88e9c5 #4877 Detect correct accumulation type for statistics curves 2019-10-18 14:22:15 +02:00
Jacob Støren
ceee8b6a85 #4857 Remove obsolete code 2019-10-18 10:20:22 +02:00
Jacob Støren
4253c32dac #4857 RicIntersectionBox[XYZ]SliceFeature 2019-10-18 10:17:50 +02:00
Gaute Lindkvist
905c34968f Added missing RicfSetPlotWindowSize files 2019-10-18 08:23:57 +02:00
Gaute Lindkvist
0e5b9687b4 Fix missing GeoMech result definition in Well Log Curves 2019-10-18 08:14:34 +02:00
Gaute Lindkvist
3eaf933efc Python command for setting plot window size 2019-10-18 08:12:36 +02:00
Jacob Støren
b785969d68 #4857 RicNewPolylineIntersectionFeature, RicNewAzimuthDipIntersectionFeature, RicIntersectionBoxAtPosFeature 2019-10-17 16:39:24 +02:00
Jacob Støren
03987a5f71 #4857 RicEclipsePropertyFilterNewInViewFeature, RicGeoMechPropertyFilterNewInViewFeature 2019-10-17 15:58:52 +02:00
Jacob Støren
5f9424f7b7 #4857 Fixed RicSelectColorResult 2019-10-17 15:40:36 +02:00
Jacob Støren
5a72de405d #4857 Add support to distinguish 3D-view commands done in the main and comparison view 
Support annotation and rangefilter creation in the comparison view
 2019-10-17 15:02:39 +02:00
Jacob Støren
caed6bfa91 #4881 Fix crash when creation global annotations with geomech view present 2019-10-17 15:02:38 +02:00
Jacob Støren
b2015ce91b #4857 Fix missing highlight of cell in comparison view 2019-10-17 15:02:38 +02:00
Jacob Støren
d4ebf8d543 #4857 Viewer Commands: Handle general picking in the comparison view 2019-10-17 15:02:38 +02:00
Jacob Støren
39801a2018 #4857 Handle comparison views in the custom 3D navigation policies 2019-10-17 15:02:38 +02:00
Jacob Støren
bba8fea197 #4857 Refactoring: Use legendConfigs method when removing legends on updateLegends 2019-10-17 15:02:38 +02:00
Magne Sjaastad
bb74ac24f8
Merge pull request #4875 from OPM/fix-dual-porosity-issues 
Fix dual porosity issues
 2019-10-16 11:59:17 +02:00
Magne Sjaastad
61db98ef04 #4874 Dual Porosity : Missing active cells in some cases 2019-10-16 11:11:01 +02:00
Gaute Lindkvist
2ad42b7fcf Fix typo in CMake for set_cell_result.py 2019-10-16 10:31:58 +02:00
Magne Sjaastad
a53f1e1e91 #4638 Dual porosity : Make sure geometry is regenerated when switching between matrix/fracture 2019-10-16 10:15:51 +02:00
Gaute Lindkvist
d681b75d24 Rename RifEclipseOutputDataTable* to RifTextDataTable* 2019-10-15 17:05:46 +02:00
Gaute Lindkvist
bc8134009b #4867 Rename python examples to avoid mixed case 2019-10-15 16:31:40 +02:00
Gaute Lindkvist
d21afc5a41 #4866 Fix Python example script 2019-10-15 16:26:41 +02:00
Gaute Lindkvist
d3140b6aac
System command command file merger (#4845) 
* Move Import WellPaths command-file functionality into RicImportWellPaths

* Add new RICF_init macros for command file objects

* Make project save commands available in Python

* Fix RiaLogging build errors

* Move RiaLogging include from RiaGrpcServer.h to cpp file
 2019-10-15 15:46:19 +02:00
Jacob Støren
f24543ce56 #4859 Update the view when the comparison view is changed 2019-10-15 14:28:15 +02:00
Jacob Støren
98f9eef0da #4865 Use View autoname as MDI-window title 2019-10-14 12:09:41 +02:00
Jacob Støren
440a152089 #4863, #4865 Use autoname in the view dropdowns 2019-10-14 12:08:54 +02:00
Jacob Støren
308b3613b7 #4864 add a separate icon for geomech views 2019-10-14 11:34:38 +02:00
Jacob Støren
4a9dc3bcbe #4849 Fix crash, timestep and legend issues on cyclick connections 2019-10-11 14:52:49 +02:00
Jacob Støren
b0f8dfa9e6 #4849 Co-visualization: Simple use of the comparison view support in the Viewer classes 
The feature is ready for testing.
 2019-10-11 14:52:49 +02:00
Jacob Støren
aee42f403b #4849 RiuViewer: Add support for a comparison gridbox 
Add support for controlling the Comparison view window
Use overlay rendering for overlay items
Add a removeColorLegend method
Update overlay positioning on each redraw
 2019-10-11 14:52:49 +02:00
Magne Sjaastad
c19bae3a07 #4852 Command Line : Enable commented code 2019-10-11 13:03:14 +02:00
Magne Sjaastad
0e2cee7295 #4852 Command Line : Add snapshotexportfolder 2019-10-11 12:35:41 +02:00
Magne Sjaastad
225893dcda #4852 Command Line : Add snapshotsize 2019-10-11 10:57:20 +02:00
Magne Sjaastad
4bfcf86962 #4847 Move setFixedWindowSizeFor3dViews to RiuMainWindowTools 2019-10-11 08:54:23 +02:00
Magne Sjaastad
69ff4d25f2 #4847 Command Line Snapshots : Make sure image size is handled correctly 2019-10-11 08:32:08 +02:00
Magne Sjaastad
75140c2406 #4765 Summary : Support command line snapshots without a project file 
Use current working directory as base, and create a sub folder named "snapshots". Export snapshots from the application into this folder.
 2019-10-09 15:21:51 +02:00
Gaute Lindkvist
172c0dfa1c Revert "Reintroduce nextValid-fields as OBSOLETE fields in RimProject" 
This reverts commit 411e5cf49f.
 2019-10-09 12:50:41 +02:00
Gaute Lindkvist
708d4b6197 Fix compile issue after RicImportWellPath rename 2019-10-09 11:00:11 +02:00
Gaute Lindkvist
ba528c9c0a Fix Python plot export 2019-10-09 10:51:24 +02:00