Commit Graph

11547 Commits

Author SHA1 Message Date
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
904808394b caf::Viewer: Maintain a flag telling if we have an active comparison view.
Set a custom widget property to communicate it to PdmUiSelection3dEditorVisualizer
Add method to specifically get the Ray intersect speck from each rendering
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
Jacob Støren
3aa4e37383 Add a plantuml of the well target 3D editor system 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
be1781fd3b AppFwk : Make sure painter->save always matches painter->restore 2019-11-06 10:36:05 +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
Gaute Lindkvist
6d1d7bde23
Merge pull request #4986 from OPM/feature-view-id-tag
Add a view id tag to project tree and tooltip
2019-11-05 14:13:46 +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
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
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
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
c6e4641725 caf::Viewer: Avoid updating boundingboxes when static models are not removed 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
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