Commit Graph

2188 Commits

Author SHA1 Message Date
Gaute Lindkvist
f8102797c1 #4208 Store last used folder when exporting Sector Model + warning for LGRs 2019-03-21 14:45:47 +01:00
Gaute Lindkvist
677f42591b #4204 Export faults as part of visible grid export
#4204 Enable reading of faults from a different file than the main grid file
2019-03-21 14:45:47 +01:00
Gaute Lindkvist
88d2ad2c35 Refactor grid export and fault export 2019-03-21 14:45:47 +01:00
Magne Sjaastad
59c83157d1 Merge branch 'annotation-items' into dev 2019-03-19 15:00:30 +01:00
Magne Sjaastad
221afb38d3 select case if many cases present 2019-03-19 14:54:24 +01:00
Gaute Lindkvist
28e6bf8d2d Export Sector model: write floats to file instead of doubles 2019-03-19 11:43:43 +01:00
Gaute Lindkvist
dd5402756c #4203 Support cell refinement for Sector Export 2019-03-19 10:49:09 +01:00
Gaute Lindkvist
f09f487635 #4143 First implementation of export sector model 2019-03-18 12:56:09 +01:00
Magne Sjaastad
614a3628f0 Add collection and feature to create saturation pressure plots 2019-03-18 12:52:11 +01:00
Gaute Lindkvist
136f13e145 #4198 Make sure exit application works as expected with both windows open 2019-03-14 15:24:11 +01:00
Gaute Lindkvist
0ce69d41dd Swap axis settings when swapping Grid Cross Plot axes + fix inverted axes for summary plot 2019-03-14 09:58:11 +01:00
Magne Sjaastad
edc6dad0f7 #4194 Grid Cross Plot: Add copy and paste of curve sets 2019-03-12 14:46:57 +01:00
Gaute Lindkvist
749e19a879 Create a simpler task system for handling sub tasks in progress dialog.
* Remove incrementProgressAndUpdateNextStep() method
2019-03-12 14:34:22 +01:00
Magne Sjaastad
674758fbf6 Remove obsolete include 2019-03-12 10:27:48 +01:00
Gaute Lindkvist
e72f57072c #4185 Implement data export for Grid Cross Plot 2019-03-12 09:19:01 +01:00
Gaute Lindkvist
b22ca46dc5 #4187 Make WindowCloseButtonHint part of the default dialog flags
* Dialogs on the Qt5 build has the close button disabled and this fixes that.
2019-03-08 10:23:18 +01:00
Gaute Lindkvist
e00f983360 #4166 Add feature for swapping cross plot axes + tweaks to legend
* Also put x and y property side by side in property editor
2019-03-08 09:59:38 +01:00
Gaute Lindkvist
89a68d099a #4156 Don't show the common part of Grid Cross Plout curve names in legend 2019-03-05 10:41:41 +01:00
Gaute Lindkvist
3d145464c1 #4145 #4146 Add Create Grid Cross plot command to view and rename filter view 2019-03-01 15:49:02 +01:00
Gaute Lindkvist
1e994ac8b8 #4117 Improve time step names for Grid Cross plot categorisation 2019-02-27 11:38:35 +01:00
Gaute Lindkvist
4c026952a1 #4134 #4124 Refactor RiuSummaryQwtPlot on top of a base RiuQwtPlot class and use this for Cross Plots
* Get a lot of functionality included: zoom, panning, etc.
2019-02-26 11:44:26 +01:00
Gaute Lindkvist
0aa7dc1777 #4121 Set default case and parameters when creating Cross Plot 2019-02-22 09:48:56 +01:00
Gaute Lindkvist
a010fc03d7
3d Cross Plot: First implementation (#4127)
* First cross plot commit

* Made cross plot deal with "all time steps" and categorise curves based on time step

* Support STATIC vs DYNAMIC plotting

* #4115 Avoid updating plots in RimEclipseCase::computeCachedData()

* Make sure loading of Cross plot from file works

* Show Legend in Cross Plot

* Uncheck / Check curves to disable/enable

* Axis titles and checkable data set

* Name config and setting of common plot look

* Fix category indentation in GeoMech results

* Support name configuration for Grid Cross Plot

* Support adding new curve sets

* Improve colors and symbols with better cycling

* Moved GridCrossPlot files to sub directory in ProjectDataModel and Commands

* #4111 3D calculations : Always show difference options

* Whitespace

* #4111 Move resultDefinition field to private

* Whitespace

* #4087 Ensemble : When importing and ensemble, show by default an ensemble plot

* #4085 3D view: Improve overlay item colors

* #4106 Crash on Linux

Temporary workaround to avoid crash

* #4106 Stop trying to do recursive setting tab order widget

* The double pointer was handled wrongly and shift-tab order isn't working anyway.

* #4114 Regression Test : Remove cached pointer to eclipse case

* Revert "#4114 Regression Test : Remove cached pointer to eclipse case"

This reverts commit f2146c6007.

* #4114 Regression Test : Missing data for flow diag property filter

* #4085 3D view: Add check box for version info text

* Whtespace

* Improve labelling of static results

* Fix update of result property when changing type
2019-02-21 12:52:23 +01:00
Magne Sjaastad
ba91122ba6 #4087 Ensemble : When importing and ensemble, show by default an ensemble plot 2019-02-18 13:25:53 +01:00
Magne Sjaastad
7fe0b92839 #4111 Move resultDefinition field to private 2019-02-18 11:07:54 +01:00
Magne Sjaastad
3ca43b1644 #4107 New Intersection : Do not hide grid cells in 3D scene 2019-02-17 12:20:37 +01:00
Magne Sjaastad
e660433d29 #4091 Reload case : Move reload of case into helper function 2019-02-14 21:26:54 +01:00
Gaute Lindkvist
f61a4bcdb1 #4052 Seperate EGRID and GRID file filters 2019-02-12 16:44:37 +01:00
Gaute Lindkvist
72b667a5e3 #4072 Fix well path creation on intersections in 3d View 2019-02-12 16:33:03 +01:00
Magne Sjaastad
93eca21b69 #4068 System : Add forward declare 2019-02-12 14:49:37 +01:00
Magne Sjaastad
803e6cd2b4 #4068 System : Add forward declare 2019-02-12 14:49:37 +01:00
Gaute Lindkvist
8c130bbc6e #4070 Add pick cursor to measurements 2019-02-12 08:21:01 +01:00
Gaute Lindkvist
d9672ad9a1 Simplify pick event system 2019-02-11 15:48:02 +01:00
Magne Sjaastad
288ee59587 #4066 System : Improve cmake macros for cotire 2019-02-11 07:13:08 +01:00
Magne Sjaastad
5dd8f34c3e #3511 Remove setTopWellBoreVolume 2019-02-08 08:16:53 +01:00
Gaute Lindkvist
4e17b5acfa #4047 Alter mouse cursor in Vec3dPickEventHandler 2019-02-07 16:34:43 +01:00
Magne Sjaastad
d20c0fc004 #3862 Reload case does not work correctly
When issuing reload case by right-click on case, reset time history filter
2019-02-07 10:21:08 +01:00
Gaute Lindkvist
5379d692df Fix crash when adding new Stim Plan Templates and clicking cancel in file dialog 2019-02-07 10:10:06 +01:00
Magne Sjaastad
f4e0a154ee #4038 2D plot Source data stepping re-set curve interpolation 2019-02-07 08:30:55 +01:00
Magne Sjaastad
62e2149e55 #3995 Context menu in 3D : Always show create fracture, also when no templates are present 2019-02-07 07:26:02 +01:00
Magne Sjaastad
cb1ab0082a #3995 Perforation feature : Add icon 2019-02-07 07:25:35 +01:00
Gaute Lindkvist
c4f5065032 #4045 Don't accept pick events if the current selected object isn't the object owning the pick handler. 2019-02-06 13:24:26 +01:00
Gaute Lindkvist
dbe21b7809 Renames in RicPickEventHandler hierarchy 2019-02-06 09:45:30 +01:00
Gaute Lindkvist
8400e4ea02 Renames in RicPickEvent 2019-02-06 08:21:14 +01:00
Gaute Lindkvist
058b9cfb7a #4014 Implement caf::PdmUiVec3dEditor and a RicVec3dPickEventHandler 2019-02-06 08:21:14 +01:00
Gaute Lindkvist
5d35678d97 Refactor PickEvent Hierarchy to have a basis in Caf 2019-02-06 08:12:30 +01:00
Magne Sjaastad
619abd2f1f #4000: Rename Observed Time History Data -> Observed Data 2019-02-05 08:18:49 +01:00
Magne Sjaastad
5bbde43dad #4007 : Import feature : Use text "Import Eclipse Files" 2019-02-04 14:49:59 +01:00
Gaute Lindkvist
22b60d4cff Remove unused variables from Well Target Pick Event Handler 2019-02-01 07:56:48 +01:00
Gaute Lindkvist
b4231775ef #4012 Add assert to the well path element intersections 2019-02-01 07:56:05 +01:00
Gaute Lindkvist
e689b7ceaf Updates to make well path creation intersection work better with GeoMech 2019-02-01 07:56:05 +01:00
Gaute Lindkvist
107a4b9b60 #4012 Always place well target points in real cell geometry 2019-02-01 07:56:05 +01:00
Magne Sjaastad
ae98ba6c58 System : Silence warning on VS2017 2019-02-01 06:51:01 +01:00
Gaute Lindkvist
4019f1f981 Remove initialization list use for QStringList 2019-01-31 09:16:35 +01:00
Gaute Lindkvist
69b20a2aa9
#4007 Create new combined import button and move the others to an opt… (#4021)
* #4007 Create new combined import button and move the others to an optional "Import"-toolbar

* #4007 Make sure we check that fileName vector isn't empty before accessing it
2019-01-31 09:02:09 +01:00
Jacob Støren
58ac488929 #3958 Refactoring : RigResultAccessorFactory simplification
To make the result address including basetimestep info reach the CellResultsData class.
2019-01-30 15:25:29 +01:00
Gaute Lindkvist
7a50fa12f8 #3953 Extend well completions spec 2019-01-29 10:18:20 +01:00
Magne Sjaastad
79701a6233 #3988 Deeper : Zoom all of intersections gives empty view
Only allow poly line pick handler to respond when the active view is parent of intersection object.
2019-01-28 22:17:04 +01:00
Jacob Støren
dbb2a564a2 #3958 Refactoring: RigCaseCellResultsData: Remove the final result index based interface 2019-01-28 16:18:28 +01:00
Jacob Støren
3e3d3871ed #3958 Refactoring: Remove scalarResultIndex from RigEclipseResultAddress
and real external use (outside CaseCellResultsData)
Regression tests OK.
2019-01-25 16:19:15 +01:00
Jacob Støren
42afa063d5 #3958 Refactoring: Rename to findOrLoadKnownScalarResult
to make it clear that it does not add a result name to the internal structures.
2019-01-25 16:19:14 +01:00
Jacob Støren
ccfee8f34a #3958 Starting refactoring of eclipse results addressing
Preparations for time diff results
2019-01-25 16:19:13 +01:00
Magne Sjaastad
5d9ef00067 Fix warning on VS2017 2019-01-17 10:23:22 +01:00
sigurdp
ccff90b1d5 #3948 HoloLens : Support for export of text labels. Also added more detailed debug information. 2019-01-17 10:06:35 +01:00
Gaute Lindkvist
3692f66b6d #3526 Support picking of Valve objects and well path attributes 2019-01-16 15:46:15 +01:00
Gaute Lindkvist
431ce346ea #3974 Update view when attributes are created 2019-01-16 15:46:07 +01:00
Gaute Lindkvist
fb92b548c5
#3966 Add buttons for creating/editing fracture templates from fractures (#3973)
* #3966 Add buttons for creating/editing fracture templates from fractures

* Make sure view is updated whenever a new template is created from the fracture
2019-01-16 14:57:43 +01:00
Gaute Lindkvist
1f754f2b63 #3807 Initial implementation of GeoMech contour maps. 2019-01-16 14:09:28 +01:00
Jacob Støren
49292cd2ef #3956 Improve ruler icon 2019-01-16 09:32:59 +01:00
Jacob Støren
d158a3c3bb #3946 Improve HoloLens icons 2019-01-15 18:23:25 +01:00
sigurdp
f2668eae4e HoloLens: Export of cull face mode to JSON 2019-01-15 15:14:06 +01:00
sigurdp
7588c0d2ae HoloLens: Reversed logic for determining face culling mode when exporting meshes 2019-01-15 15:14:06 +01:00
Gaute Lindkvist
5c24153646 #3957 Add button to valve for creating new valve template or editing existing template
* Also added separate delete valve feature so we can clear the template and update the valves referencing it.
2019-01-15 14:30:26 +01:00
Magne Sjaastad
a32ebe4dff #3948 HoloLens : Add labels 2019-01-15 14:07:41 +01:00
sigurdp
469437f320 HoloLens: RicHoloLensRestClient now has an explicit setter for disabling SSL certificate verification. Removed separate flag for controlling whether debug export to file will be done. Now does the export whenever a folder is specified. 2019-01-15 13:23:31 +01:00
Magne Sjaastad
9cbbde3f74 HoloLens : Add missing parent to create session dialog 2019-01-15 13:01:09 +01:00
Magne Sjaastad
17f42df110 #3810 HoloLens : Fix update of checkable toolbar button 2019-01-15 12:52:14 +01:00
Magne Sjaastad
9bb4cb3e1a Measurements : Move setCheckable into feature 2019-01-15 12:13:00 +01:00
Magne Sjaastad
5014c86a3f #3947 HoloLens : Add face culling to VdeExportPart 2019-01-15 11:51:21 +01:00
Magne Sjaastad
6695cf2a39 #3965 HoloLens : Add flag in preferences to disable ssl verification 2019-01-15 11:51:21 +01:00
Magne Sjaastad
791a896be4 #3952 Summary : Create plot if no plot exists when loading summary case 2019-01-14 13:54:19 +01:00
Magne Sjaastad
22e8eb485f #3810 HoloLens : Tool bar button and scheduler for auto sent to server 2019-01-14 08:42:54 +01:00
Gaute Lindkvist
f3c188ef56 #3807 Rename RimContourMapView to RimEclipseContourMapView 2019-01-11 16:06:53 +01:00
Gaute Lindkvist
31c67e29e4 #3807 Rename RimContourMapProjection to RimEclipseContourMapProjection 2019-01-11 16:06:53 +01:00
Magne Sjaastad
6cc2740a74 #3960 Measurements : Add feature activation from context menu, and write Esc as shortcut 2019-01-11 15:49:30 +01:00
Magne Sjaastad
d460d3d77d #3944 clang-tidy : Apply modernize-deprecated-headers 2019-01-11 08:14:53 +01:00
Magne Sjaastad
81c3ee5df2 #3944 System : Improve code quality using clang-tidy
Remove redundant virtual and add override
2019-01-11 08:14:53 +01:00
Magne Sjaastad
67d0b44c1e #3856 Update copyright text in dialogs 2019-01-09 15:29:37 +01:00
Magne Sjaastad
6db80f40b9 #3856 Update copyright headers 2019-01-09 15:29:24 +01:00
Magne Sjaastad
4557514622 Whitespace 2019-01-09 12:48:56 +01:00
Magne Sjaastad
c27d935fc4 Contour map : Disable simulation wells and faults when creating from 3D view 2019-01-09 12:48:42 +01:00
Gaute Lindkvist
225f190f4b #3934 Improve picking speed on contour map 2019-01-09 09:57:47 +01:00
Magne Sjaastad
20f9bf4318 #3935 Measurements : Add Esc button to abort measurement mode 2019-01-08 14:55:44 +01:00
Gaute Lindkvist
ec0419a945 #3881 Prepare for better edge clipping by making interpolation function more accessible. 2019-01-08 11:07:36 +01:00
Magne Sjaastad
ecb1b83dfa #3927 Measurements : Compute horizontal area of polygon 2019-01-03 11:34:50 +01:00
Magne Sjaastad
3543ba7cf3 #3924 Measurements : Remove double mouse click event handling 2019-01-03 07:33:54 +01:00
Magne Sjaastad
8f85e49849 #3924 Measurements : Rename, fix issues with points in multiple views 2019-01-03 07:18:22 +01:00
Magne Sjaastad
ee9721a338 #3924 Measurements : Use CTRL key to append poly line points 2019-01-02 15:04:05 +01:00
Magne Sjaastad
218472fe2c Merge branch 'dev' into measurement 2019-01-02 14:32:17 +01:00
Magne Sjaastad
a9c7773ef7 CppCheck : Fix various minor issues 2018-12-21 12:32:57 +01:00