Commit Graph

8639 Commits

Author SHA1 Message Date
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
b4d8dc7819 Update Curve Names when changing parameters 2019-02-28 18:30:07 +01:00
Gaute Lindkvist
d1c14f9729 #4118 Limit data points in grid cross plot by cells visible in view 2019-02-27 14:34:18 +01:00
Gaute Lindkvist
618369d7a8 Only allow eclipse cases for Grid Cross Plots 2019-02-27 13:47:10 +01:00
Gaute Lindkvist
27f9e95e51 #4105 Remove sum from info box for Contour Maps
* The sum is misleading and isn't showing a value that makes any sense to the user.
2019-02-27 13:34:09 +01:00
Gaute Lindkvist
e1dbbbaf51 #4117 Grid Cross Plot Reliability and UI improvements 2019-02-27 12:47:00 +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
1b9a0fe5a7 #4117 Refactor Grid Cross plot result extraction and categorisation 2019-02-27 10:57:17 +01:00
Gaute Lindkvist
b6348b8374 #4117 Categorization by any Eclipse result 2019-02-27 09:25:08 +01:00
Gaute Lindkvist
41b6cd55f2 #4117 Implement formation categorisation 2019-02-26 16:22:01 +01:00
Gaute Lindkvist
aa5935d5db Fix some issues related to legends in Grid Cross Plots 2019-02-26 15:42:58 +01:00
Gaute Lindkvist
7fa174807e #4139 Ensure property editor is in sync with Qwt range 2019-02-26 11:44:26 +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
2582e98961 #4135 Fix oversized legend icon for the first cross plot entry 2019-02-25 08:32:01 +01:00
Magne Sjaastad
415a8bba94 #4131 Qt5: Use showNormal() instead of show() 2019-02-22 13:18:53 +01:00
Gaute Lindkvist
39a0c3f4d0 #4128 Show Qwt symbol and color as icon in project tree 2019-02-22 11:37:17 +01:00
Gaute Lindkvist
26f4577803 #4129 Don't recreate all curves when toggling curve set 2019-02-22 10:15:07 +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
1536645e7c #4132 Temporarily fix contour map crash by commenting out processEvents 2019-02-22 09:06:51 +01:00
Gaute Lindkvist
64949011b3 Remove an async delete child objects operation 2019-02-22 08:44:10 +01:00
Gaute Lindkvist
760fcaef43 #4130 3D Cross Plot: Improve window management 2019-02-21 15:42:40 +01:00
Gaute Lindkvist
7e57ec39ea 3D Cross Plot: Improve colors and symbols in legend 2019-02-21 15:42:40 +01:00
Magne Sjaastad
6b3808b696 3D cross plot : Make sure the grid file is loaded before accessing data 2019-02-21 13:56:37 +01:00
Magne Sjaastad
287ff64fc2 System : Output messages to std cout when running regression tests from command line 2019-02-21 13:13:19 +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
Gaute Lindkvist
8182421fb5 Fix category indentation in GeoMech results 2019-02-21 08:10:35 +01:00
Magne Sjaastad
ec2d2ce559 Whtespace 2019-02-20 14:45:06 +01:00
Magne Sjaastad
eb28bb8520 #4085 3D view: Add check box for version info text 2019-02-20 14:40:25 +01:00
Magne Sjaastad
5449ef39dd Revert "#4114 Regression Test : Remove cached pointer to eclipse case"
This reverts commit f2146c6007.
2019-02-20 13:38:48 +01:00
Gaute Lindkvist
90b189f490 #4115 Avoid updating plots in RimEclipseCase::computeCachedData() 2019-02-20 11:51:39 +01:00
Magne Sjaastad
2894002b05 #4114 Regression Test : Missing data for flow diag property filter 2019-02-20 11:43:35 +01:00
Magne Sjaastad
f2146c6007 #4114 Regression Test : Remove cached pointer to eclipse case 2019-02-20 11:35:31 +01:00
Magne Sjaastad
9c4afc52fd #4085 3D view: Improve overlay item colors 2019-02-18 21:01:37 +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
3acd426ead Whitespace 2019-02-18 11:15:34 +01:00
Magne Sjaastad
7fe0b92839 #4111 Move resultDefinition field to private 2019-02-18 11:07:54 +01:00
Magne Sjaastad
fdf3313320 Whitespace 2019-02-18 10:55:35 +01:00
Magne Sjaastad
f9021117f4 #4111 3D calculations : Always show difference options 2019-02-18 10:52:11 +01:00
Magne Sjaastad
3ca43b1644 #4107 New Intersection : Do not hide grid cells in 3D scene 2019-02-17 12:20:37 +01:00
Gaute Lindkvist
6bdd4b8178 #4088 Update View names in Window Title when changing the custom name part 2019-02-15 13:36:20 +01:00
Gaute Lindkvist
aeb964a89a #4096 Make sure the base time steps are taken from the base case
* Also clear time lapse option when changing base case. We don't know if the currently
  selected time step exists in the new case.
2019-02-15 13:16:51 +01:00
Gaute Lindkvist
e0913d8a21 #4096 Reorder case / time diff to put case diff first 2019-02-15 13:16:51 +01:00
Gaute Lindkvist
eb0c2e4737 #4096 Simplify code for loading case and time diff to use same method 2019-02-15 13:16:51 +01:00
Gaute Lindkvist
fbd1486a4c #4096 Fix combination of case and time diff for identical cases 2019-02-15 13:16:51 +01:00
Gaute Lindkvist
833a29c3c2 #4062 #4081 Make time and case diff apply immediately and don't change variable name
* Instead show the change in the Result label, legend and info box.
2019-02-15 13:16:51 +01:00
Magne Sjaastad
69bbf6921c #4092 Summary Plot: Data Source fails for combined Well and Segment plot 2019-02-15 12:31:32 +01:00
Magne Sjaastad
4eea7e91ee #4093 RFT Plot : Not possible to select both RFT and Grid as source at the same time
Avoid updating the UI selections based on curves in defineUiOrdering
2019-02-15 10:53:56 +01:00
Magne Sjaastad
a0c983a84e #4095 System : Add preferences to control project changed and Octave warning dialogs 2019-02-15 09:07:13 +01:00
Magne Sjaastad
cdbb13f9f4 System : Set object name of toolbar to be able to serialize toolbar state 2019-02-15 09:04:55 +01:00
Magne Sjaastad
1abf370176 #4091 Whitespace 2019-02-14 21:44:01 +01:00
Magne Sjaastad
22a0957d9b #4091 Reload case : Remove unused includes 2019-02-14 21:42:31 +01:00
Magne Sjaastad
e660433d29 #4091 Reload case : Move reload of case into helper function 2019-02-14 21:26:54 +01:00
Magne Sjaastad
4e9895ef0e System : Remove unused class 2019-02-14 15:11:27 +01:00
Magne Sjaastad
5c355245f9 Typo : Use lower case for "of" 2019-02-13 11:23:47 +01:00
Magne Sjaastad
237f31ca17 #4076 Result difference options : Show result diff on "Cell Result" 2019-02-13 09:37:02 +01:00
Gaute Lindkvist
d9da9a7752 #4053 Add ensemble input to import toolbar + geomech import toolbar 2019-02-12 17:00:55 +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
79e1170ed8 #4050 3D calculations : UI for case difference
Show case diff for static and generated
2019-02-12 15:19:41 +01:00
Magne Sjaastad
1d4ab1a0b2 #4048 #4050 3D calculations : Add UI and calculation of case difference 2019-02-12 14:49:37 +01:00
Magne Sjaastad
93eca21b69 #4068 System : Add forward declare 2019-02-12 14:49:37 +01:00
Magne Sjaastad
157ff774e8 #4068 System : Add forward declare 2019-02-12 14:49:37 +01:00
Magne Sjaastad
39af63a27d #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
Magne Sjaastad
67a960dae5 #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
Gaute Lindkvist
0fd51b2088 #4025 Show delayed action progress bar during contour map generation 2019-02-11 13:10:38 +01:00
Magne Sjaastad
72e9683ac9 #4049 : Add "Disabled" to drop down item of time steps 2019-02-11 12:41:34 +01:00
Magne Sjaastad
f631321ad1 #4049 3D calculations : Use _dt_<time step index> to indicate time differenc 2019-02-11 07:59:03 +01:00
Magne Sjaastad
7ea2a907ad #4049 3D calculations : Add time step index to list of date strings 2019-02-11 07:58:03 +01:00
Magne Sjaastad
288ee59587 #4066 System : Improve cmake macros for cotire 2019-02-11 07:13:08 +01:00
Magne Sjaastad
06feb039fc #4029 3D calculations : Hide ternary and completion type from diff variables 2019-02-08 14:03:54 +01:00
Magne Sjaastad
3cd14df5b6 #4029 3D calculations : Move result string function to RiaDefines 2019-02-08 13:59:10 +01:00
Magne Sjaastad
3586988d1d Whitespace 2019-02-08 13:02:48 +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
189234c0c9 #3920 Create Well Path: New well name not used in Completions 2019-02-07 08:44:12 +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
1717a5bf30 #3995 Completions : Reorder items in context menu 2019-02-07 07:26:25 +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
Magne Sjaastad
152c1ad941 #3958 Rename to "Time Difference" 2019-02-06 13:28:14 +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
4ec8869743 Rename in caf::PdmUiVec3dEditor 2019-02-06 09:39:47 +01:00
Gaute Lindkvist
e4fa4b9994 Set a default Radius=100 for reach circles so they show up as soon as you pick 2019-02-06 08:21:14 +01:00
Gaute Lindkvist
8400e4ea02 Renames in RicPickEvent 2019-02-06 08:21:14 +01:00
Gaute Lindkvist
0e52426071 #4014 Use Vec3d Editor for Text and ReachCircle Annotations 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
fad4dc91d7 #4036 Ensemble : Use list editor instead of drop down when selecting parameter 2019-02-05 11:18:06 +01:00
Magne Sjaastad
9fbb14d6e3 #4008 Summary Plots: Cases/Plots should always be expanded by default 2019-02-05 08:42:23 +01:00
Magne Sjaastad
987c38ec38 Whitespace 2019-02-05 08:41:25 +01:00
Magne Sjaastad
619abd2f1f #4000: Rename Observed Time History Data -> Observed Data 2019-02-05 08:18:49 +01:00
Magne Sjaastad
47abb3c6a1 #3999 Summary : Rename to Cases and Data 2019-02-05 08:18:20 +01:00
Magne Sjaastad
5fd80920c8 Merge remote-tracking branch 'origin/master' into dev 2019-02-04 15:48:36 +01:00
Gaute Lindkvist
d70e94ca85 #3996 Shift Measurement text box to not overlap with current segment
* Check if line is tending left or tending right and shift box if it is tending left.
2019-02-04 15:29:07 +01:00
Gaute Lindkvist
f15d6dd385 #3997 Use AppEnum for font size in preferences as well so it is more easily shared. 2019-02-04 15:20:56 +01:00
Magne Sjaastad
5bbde43dad #4007 : Import feature : Use text "Import Eclipse Files" 2019-02-04 14:49:59 +01:00
Gaute Lindkvist
08cdd73148 #4024 Always report that a time step dependent result is visible in GeoMech contour maps
* However, if a result is not a valid time step result, we instead show a dummy 0-result across the reservoir.
* This way we show something even if a valid result is not chosen.
* Also make this more obvious by reporting it in info box and legend.
2019-02-04 12:02:12 +01:00
Gaute Lindkvist
956c973d17 #4032 Fix SFG-values in Well bore stability plots 2019-02-04 11:37:15 +01:00
Magne Sjaastad
d275b2bf60 #4031 Ensemble : Fix operator< 2019-02-04 11:22:38 +01:00
Gaute Lindkvist
9bc6a4bc21 #4034 Make it optional to GeoMech Contour Map boundaries vertically
* Map boundaries rather than grid boundaries.
* Does not limit height by default, but make it possible.
* Make sure we don't try to apply filters if the filter collection is inactive

Boundaries
2019-02-04 11:06:07 +01:00
Gaute Lindkvist
1171884c1b #4033 Fix glitch with large padding for GeoMech
* Off by one error in distance transform
* Need a larger bounding box to allow for full padding.
2019-02-04 10:13:42 +01:00
Gaute Lindkvist
78b31db3b8 #4032 Fix SFG-values in Well bore stability plots 2019-02-04 09:27:02 +01:00
Gaute Lindkvist
653b0eb856 #4026 Contour Maps: Set +infinity (invalid) as max value if no valid max value was found 2019-02-04 08:17:02 +01:00
Gaute Lindkvist
9b90799e4c #3986 Fix a CMake warning and remove debug output for Qt5
* Stop trying to copy the MSVC runtime with windeployqt. It isn't needed for private installs and for full installs it is already handled (removes warning about VCINSTALLDIR).
* Don't copy translations and QtQuick-import.
* Set verbosity to 0. This removes some useful messages about which libraries are copied, but also removes many useless warnings. The default verbosity of 1 leaves them all in. It doesn't appear very fine grained.
2019-02-01 12:45:10 +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
bd6bbe9da9 #4020 System : Use ri_apply_cotire() 2019-02-01 06:56:11 +01:00
Magne Sjaastad
ae98ba6c58 System : Silence warning on VS2017 2019-02-01 06:51:01 +01:00
Magne Sjaastad
1a7de264ca #4020 System : Define NOMINMAX before include of windows.h 2019-02-01 06:50:53 +01:00
Gaute Lindkvist
d882261511 #4027 Increase max padding for GeoMech contour maps 2019-01-31 16:05:25 +01:00
Magne Sjaastad
89d55d8354 #3856 Update copyright text in dialogs 2019-01-31 15:17:03 +01:00
Magne Sjaastad
3c0eb02b61 #3952 Summary : Create plot if no plot exists when loading summary case 2019-01-31 14:56:16 +01:00
Magne Sjaastad
061c1d304d #3952 Summary : Expand new summary case 2019-01-31 14:56:04 +01:00
Magne Sjaastad
58651bf15e #3952 Summary : Always create plot main window to allow expanding of items 2019-01-31 14:55:57 +01:00
Magne Sjaastad
e00bbae139 #3952 Summary : Create folders for input data and plots 2019-01-31 14:55:49 +01:00
Magne Sjaastad
baf00eaeab #3968 Ensemble : Not possible to plot two ensembles at the same time
Due to wrong usage of cached number of curves, curves will not be added in some cases. Multiple checking of check boxes will work as a workaround.
2019-01-31 14:41:54 +01:00
Magne Sjaastad
bfa7edd1f9 #3937 Summary : Improve robustness for well and lgr name
A char pointer is communicating the names from libecl, and this pointer must be tested before assigning to a std::string
2019-01-31 09:22:18 +01:00
Magne Sjaastad
ffc3515b49 #3937 Summary : Improve robustness for well and lgr name
A char pointer is communicating the names from libecl, and this pointer must be tested before assigning to a std::string
2019-01-31 09:20:19 +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
61e9a2a696 #3958 First shot on time difference implementation 2019-01-30 16:46:16 +01:00
Jacob Støren
1d60bd9843 Simple rename variables 2019-01-30 15:28:45 +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
d61a18ee6e Fix Linux build by removing unused EnsembleParameter::range 2019-01-30 09:19:17 +01:00
Gaute Lindkvist
54b5dc33f4 #4013 Create variation bins for ensemble parameters based on current data
* Rather than having a fixed index.
* This way the variation is more or less always normal distributed.
2019-01-30 09:07:52 +01:00
Magne Sjaastad
7518a1880a Revert "#4018 Result management : Use ensureReservoirCaseIsOpen instead of open..."
This reverts commit fde60d1e34.
2019-01-29 20:28:33 +01:00
Gaute Lindkvist
4c5e277ebf std::fabs fix for Linux 2019-01-29 16:08:24 +01:00
Gaute Lindkvist
eb498ad0dc #4013 Sort ensemble parameters by variation 2019-01-29 15:42:17 +01:00
Jacob Støren
8a5cbf60fd #3958 Refactoring CaseCellResultsData to propagate result address with timelapse info all the way. 2019-01-29 12:44:23 +01:00
Magne Sjaastad
0a22515a3e #3990 Rename 2019-01-29 11:57:27 +01:00
Magne Sjaastad
c50d75a61f #3990 Flow Diag : Move creation of RigFlowDiagSolverInterface before computeCachedData
computeCachedData triggers update of UI, and update of curves can require RigFlowDiagSolverInterface
2019-01-29 11:57:27 +01:00
Gaute Lindkvist
7a50fa12f8 #3953 Extend well completions spec 2019-01-29 10:18:20 +01:00
Magne Sjaastad
fde60d1e34 #4018 Result management : Use ensureReservoirCaseIsOpen instead of open... 2019-01-29 10:06:37 +01:00
Magne Sjaastad
6935ea0688 #4018 Result management : Ensure result file is open
if no 3D views are present, make sure the result grid case file is open as part of creating a curve.
2019-01-29 10:06:37 +01:00
Jacob Støren
5fe4a057ce #3958 Fix warning and error from refactoring 2019-01-29 08:35:42 +01:00
Jacob Støren
a3660cd496 #3958 Refactoring: Rename modifiable result access to make it easier to track in the code. The existing overloads made things harder to read. 2019-01-29 08:35:42 +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
fe53380a36 #3958 Refactoring: RigCaseCellResultsData: Reorder headerfile
to group the methods sensibly
2019-01-28 16:31:57 +01:00
Jacob Støren
dbb2a564a2 #3958 Refactoring: RigCaseCellResultsData: Remove the final result index based interface 2019-01-28 16:18:28 +01:00
Gaute Lindkvist
a185929826 #3984 Improve layout for new/edit template buttons for valve/fractures 2019-01-28 15:29:20 +01:00
Gaute Lindkvist
80c99f452f Set Default unit label on correct field in valve template collection 2019-01-28 15:29:20 +01:00
Jacob Støren
c159dfb763 #3958 Refactor: Simple renaming 2019-01-25 16:19:15 +01:00