OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-11 16:06:04 -06:00
Code Issues Packages Projects Releases Wiki Activity
10,590 Commits 29 Branches 61 Tags 290 MiB
650af20e06
Commit Graph

2226 Commits

Author SHA1 Message Date
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
Magne Sjaastad
d2431a40a9 CppCheck : Remove unused variable, use range based for 2018-12-21 12:17:07 +01:00
Magne Sjaastad
6b952add64 CppCheck : Make sure all variables are initialized in constructor 2018-12-21 11:30:29 +01:00
Bjørn Erik Jensen
5976298267 Merge branch 'dev' into measurement 2018-12-21 10:08:41 +01:00
Bjørn Erik Jensen
21403f4161 #3805 Measurement. Double click in view to reset measurement 2018-12-21 09:23:53 +01:00
Magne Sjaastad
6f3097dd5f Merge remote-tracking branch 'origin/2018.11.01-patch' into dev 2018-12-21 08:46:27 +01:00
Bjørn Erik Jensen
d6f4962ed7 #3806 Measurement. Display text label at last clicked position 2018-12-20 12:34:17 +01:00
Magne Sjaastad
284e07b967 #3907 Summary : Consider combined curve count when assigning color 2018-12-20 10:46:48 +01:00
Gaute Lindkvist
708f24943b Hide Unit Test Feature if USE_UNIT_TESTS is not defined 2018-12-20 09:50:05 +01:00
Magne Sjaastad
755e1405db #3909 Ensemble : Sort files alphabetically in find dialog 2018-12-20 09:05:35 +01:00
Magne Sjaastad
f7a7a943d7 #3911 Ensemble import : Remember separate file path for ensemble 2018-12-20 08:50:21 +01:00
Bjørn Erik Jensen
849a623379 #3804 #3805 Measurement. Add toolbar button and interactive picking 2018-12-19 14:41:17 +01:00
sigurdp
928a0628cd HoloLens: First cut, optimization of array data communication to sharing server. ResInsight will try and detect changes in its internal arrays, and will only announce changed arrays to the server (through meta data.) Previously, ResInsight would send all array data to the server unconditionally. Now the set of arrays/packets to send is controlled by the sharing server through its response to a post of new meta data. 2018-12-19 12:32:18 +01:00
sigurdp
f8a0a0e8bb Reference correct local variable when calling deleteLater() 2018-12-19 12:32:18 +01:00
sigurdp
0e910e7391 HoloLens: Added support for session pin code and bearer authentication. Improved session management and error handling. Added some dignostic timings for sending of array data. 2018-12-18 22:08:57 +01:00
Jacob Støren
07f8221676 #3898, #3899, #3900 Better source stepping command icons. Combine curve and stepping icons. Improved Clear source curve command enabling 2018-12-18 17:15:54 +01:00
Gaute Lindkvist
394c84efef #3854 Add MSW reference depth to Perforations 2018-12-18 17:09:43 +01:00
Gaute Lindkvist
9851a2d938 #3853 Add line shift to compdat export table rows if the line exceeds 132 characters 2018-12-18 17:09:43 +01:00
Gaute Lindkvist
a9f70a13b3 #3851 Just one ICV per completion, not one per segment. 2018-12-18 17:09:43 +01:00
Gaute Lindkvist
fff70bb9f6 #3888 Report error if the valve is invalid 2018-12-18 16:49:52 +01:00
Magne Sjaastad
9af5adf066 #3842 Summary : Commands for set/clear of stepping data source 2018-12-17 16:00:40 +01:00
Gaute Lindkvist
3adb1cc4bd #3884 Implemented Valve Templates for MSW parameters 2018-12-14 16:03:04 +01:00
Bjørn Erik Jensen
8401e3d9f0 #3868 Annotations. Draw spheres on polylines + toggles conotrolling visibility 2018-12-14 15:32:32 +01:00
Bjørn Erik Jensen
295da5658e #3793 View auto name. Move ViewNameConfig to 3dView and replace current name field. InitAfterRead update to be backward compatible 2018-12-14 13:43:25 +01:00
Gaute Lindkvist
47bb14eb06 #3864 Update and clamp valve positions to perforation interval when perforation interval changes. 2018-12-14 08:45:43 +01:00
Magne Sjaastad
543b8fc1cc Completion export : Remove early return to be able to compute WPIMULT correct 2018-12-13 22:29:56 +01:00
Magne Sjaastad
dc70c1f8e0 Completion export : Remove early return to be able to compute WPIMULT correct 2018-12-13 22:28:56 +01:00
Magne Sjaastad
74b4828219 #3870 Abort when creating contour map : Remove assert 2018-12-13 14:28:14 +01:00
Gaute Lindkvist
8821a37b90 #3853 Remove zero padding and unnecessary space at beginning and end of row for WSEGAICD 2018-12-12 15:07:04 +01:00
Magne Sjaastad
d90c5f07bd Use size_t instead of int 2018-12-12 15:05:36 +01:00
Magne Sjaastad
6665ac9cc6 #3796 Summary Plot Stepping toolbar : Update on plot editor close 2018-12-12 11:22:59 +01:00
Magne Sjaastad
a85b958a0f #3796 Summary Plot Stepping toolbar : Update on plot editor close 2018-12-12 11:21:21 +01:00
Gaute Lindkvist
b2d178e584 #3857 Fix split on well and completion for MSW export. 2018-12-12 11:04:55 +01:00
Gaute Lindkvist
ea371f8321 #3858 add quotes to pressure drop text and make HF- default 2018-12-12 10:20:12 +01:00
Gaute Lindkvist
509f77c7f1 #3855 Limit entry and exit lengths in perforation COMPSEGS when perforation doesn't pass through entire cell. 2018-12-12 09:44:00 +01:00
Gaute Lindkvist
762b6ef382 Fix name for MSW export file for fishbones 2018-12-12 09:10:19 +01:00
Gaute Lindkvist
240c748910 #3830 Replace column headers in WSEGAICD table with numbers with a description of the numbers first. 
* This way columns don't take up much space.
 2018-12-11 21:05:43 +01:00
Gaute Lindkvist
2766b18a2f #3844 and #3845 Split MSW export the same way as regular export and unify names. 2018-12-11 20:06:41 +01:00
Gaute Lindkvist
41dc8feca3 #3849 Shorten column space for WSEGAICD table to 1 2018-12-11 16:57:05 +01:00
Gaute Lindkvist
3dafd06859 #3850 Implement calculation of AICD length 2018-12-11 16:21:17 +01:00
Gaute Lindkvist
5368574848 #3846 Make HF- the default pressure drop for MSW and put quotes around the text. 2018-12-11 15:32:07 +01:00
Gaute Lindkvist
d78cda3234 #3847 Use export name for well names in MSW export 2018-12-11 15:32:07 +01:00
Magne Sjaastad
eaa0592a9d Add missing initialization 2018-12-11 15:09:19 +01:00
Magne Sjaastad
33a8f773ae #3827 Fishbone Laterals : Whole well is exported instead of lateral only 2018-12-11 13:22:50 +01:00
Bjørn Erik Jensen
97aad76c23 #3791 Contour map. Remove IJ cell ref from info text 2018-12-11 13:21:48 +01:00
Magne Sjaastad
3a31199365 #3784 Completion Export : Use isCompletionWellPathEqual() 2018-12-11 13:14:09 +01:00
Magne Sjaastad
fe17e9e0c0 #3784 Completion Export : Split on well name instead of well name for export 2018-12-11 13:14:04 +01:00
Bjørn Erik Jensen
deb2755285 #3781 Carfin export. Correct NX, NY and NZ values 2018-12-11 13:10:54 +01:00
Bjørn Erik Jensen
a996019a76 #3837 Annotations. Fix non working create text annotation command 2018-12-11 12:21:47 +01:00
Bjørn Erik Jensen
65390ac6e9 #3836 Annotations. Polyline edit fixes. Default pos 2018-12-11 11:51:09 +01:00
Gaute Lindkvist
37b5d10c49 #3829 Remove spaces in Export Completion file names: Patch fix 2018-12-11 11:46:40 +01:00
Bjørn Erik Jensen
1c1680ef63 #3781 Carfin export. Correct NX, NY and NZ values 2018-12-10 14:40:21 +01:00
Bjørn Erik Jensen
488798c3d8 #3790 Z scale label. Display in upper left corner 2018-12-10 13:04:07 +01:00
Gaute Lindkvist
a6493042d4 #3779 Fix inf -> 1* output in AICD export tables 2018-12-10 10:04:08 +01:00
Gaute Lindkvist
15576a9ae3 #3779 Preliminary AICD output 2018-12-07 15:48:18 +01:00
Gaute Lindkvist
ddd454077f #3779 Implement accumulator system for ICDs in preparation of using this for AICDs 2018-12-07 15:48:18 +01:00
Bjørn Erik Jensen
a6e9d463f4 #3723 Annotations. Remove commented code. Minor code fixes 2018-12-07 09:52:29 +01:00
Gaute Lindkvist
e677778ddd #3828 Refactor Completion export code by splitting out MSW export into separate files 
* Plus fill in some incomplete functionality regarding MSW export
 2018-12-07 09:46:39 +01:00
Bjørn Erik Jensen
b4482d20b0 #3723 Annotations. User editable polyline, both in in view and in property editor 2018-12-07 09:11:19 +01:00
Gaute Lindkvist
55f980eeb7 Restructure RicMswExportInfo code into multiple files. 2018-12-06 11:32:59 +01:00
Gaute Lindkvist
73be6b6b19 #3779 Split RicMswCompletions into subclasses and move ICD-area and flow coefficient from segment to the icd completion class 2018-12-06 10:55:23 +01:00
Gaute Lindkvist
8fbc1d0953 #3779 Make sure we always have a super valve for segments that overlap with valves. 2018-12-06 10:11:06 +01:00
Gaute Lindkvist
420944e910 #3442 Improve ICD/ICV export to add a small 0.1 length segment for each segment containing valves. 2018-12-05 15:47:16 +01:00