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
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
Kristian Bendiksen
37615f1bc8
Fix file filter for RicImportPolylinesAnnotationFeature.
2019-11-04 20:56:26 +01:00
Magne Sjaastad
03d13f668b
Merge pull request #4980 from OPM/adjust-clang-format
...
Adjust clang-format settings
2019-11-04 20:29:09 +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
946f9e7f91
Merge pull request #4979 from OPM/clang-format-fixes
...
Janitor : Apply clang-format fixes on codebase in ApplicationCode
2019-11-04 14:28:07 +01:00
Magne Sjaastad
96a26662fc
Janitor : Apply clang-format fixes on codebase in ApplicationCode
2019-11-04 11:34:34 +01:00
Magne Sjaastad
c5e3bc6898
Merge pull request #4978 from OPM/improve-history-curve-symbol-colors
...
Improve history curve symbol colors
2019-11-04 11:03:05 +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
ed54ccbd01
#4971 Fix Background color in comparison view is always the default color
2019-11-04 10:01:40 +01:00
Jacob Støren
58940a31c8
Updated viewer display model generation sequence diagram
...
New names and flow
2019-11-04 09:48:12 +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
e70ef260cc
Merge pull request #4976 from OPM/placeholder-text-combo-box
...
Summary : Add placeholder text to combo box editor
2019-11-03 19:12:33 +01:00
Magne Sjaastad
a950852559
#4972 Summary : Add placeholder text to combo box editor
2019-11-03 14:49:08 +01:00
Magne Sjaastad
ee3f6a5a43
Merge pull request #4975 from OPM/janitor-issues-2
...
Janitor issues (2)
2019-11-03 14:47:13 +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
Magne Sjaastad
18eee02bb1
#4966 tNav Crash on import : Guard null pointer access in flow diag library
2019-11-02 07:38:23 +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
8f1e272b8b
Add a plantuml diagram describing display model generation in views
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
720c83d2e3
caf::Viewer: Fixed linux warnings and a bogus comparison
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
e62645341c
caf::Viewer: Add method to get correct ray definition when it is inside comparison view
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
11f42fcc7b
#4956 caf: Fixed background color change problem in List Editor
2019-11-01 15:57:03 +01:00
