Commit Graph

4650 Commits

Author SHA1 Message Date
Gaute Lindkvist
59229b89b7 #4258 Rename Grid Cross Plot "Curve Sets" to "Data Sets". Also renamed code
* Kept XML-strings to avoid breaking compatibility
2019-04-02 08:20:10 +02:00
Magne Sjaastad
2a534f88df #4251 Saturation Pressure Plots: Create curves only for unique values from EQLNUM 2019-03-29 15:15:15 +01:00
Magne Sjaastad
b08271b982 Whitespace 2019-03-29 12:53:13 +01:00
Magne Sjaastad
c5f2b2bca9 #4241 Flow Diagnostics : Fix issue for "Show Contributing" for varying tracers 2019-03-29 12:53:13 +01:00
Gaute Lindkvist
ddf8d8515a #4257 Rename Legend Definition to color legend 2019-03-29 12:47:35 +01:00
Gaute Lindkvist
5695b8ada7 #4263 Fix saving of MDI window geometry without unmaximizing the window before saving 2019-03-29 12:47:35 +01:00
Gaute Lindkvist
75b0905e26 #4243 Grid Cross Plot: Make legend icons black & white when grouping is enabled and set size from font size 2019-03-29 07:53:54 +01:00
Magne Sjaastad
77dbd8a25f Whitespace 2019-03-27 19:20:42 +01:00
Magne Sjaastad
d0a23252ab #4239 Show Well Allocation Plots: Add well name to suggested view name 2019-03-27 19:19:19 +01:00
Gaute Lindkvist
50aac466e6 Minor improvements to grid cross plot axis and plot titles 2019-03-27 15:19:17 +01:00
Gaute Lindkvist
cd03ab865b #4176 Add Separator to paste cross plot curve set feature 2019-03-27 12:01:49 +01:00
Gaute Lindkvist
ab3820fe4f #4176 Limit scope of Delete/Show all linked views command with selection manager 2019-03-27 10:29:26 +01:00
Gaute Lindkvist
2b2323a1b6 Fix crashes in Grid Cross Plot when deleting curve sets 2019-03-27 10:29:26 +01:00
Magne Sjaastad
70b4343f60 Saturation Plots : Hide info box from plots 2019-03-26 15:38:25 +01:00
Magne Sjaastad
4d332ee98e Fix inverted check 2019-03-26 15:38:22 +01:00
Magne Sjaastad
0726b32087 #4230 Plot Cell Property Filter : Return if result property data is missing 2019-03-26 15:38:17 +01:00
Gaute Lindkvist
009dcb5f19 #4226 Add polyline measurement mode 2019-03-26 14:19:02 +01:00
Gaute Lindkvist
9bb657c642 Clear grouping for Grid Cross Plot if the grouping isn't valid when changing case 2019-03-26 11:34:14 +01:00
Gaute Lindkvist
4d7fa66eae #4229 Fix wrong curve names in grid cross plot 2019-03-26 11:34:14 +01:00
Magne Sjaastad
c0f2e05c40 Pressure curves : Improve colors 2019-03-26 09:10:29 +01:00
Magne Sjaastad
92578211b4 Rename to RimAdvancedSnapshotExportDefinition 2019-03-26 09:10:29 +01:00
Gaute Lindkvist
44de29c9e8 #4227 Don't regenerate Contour map when updating measurement 2019-03-25 15:43:19 +01:00
Gaute Lindkvist
aa32caae33 #4158 Implement info box for grid cross plots and improve plot overlay legends 2019-03-25 15:15:21 +01:00
Gaute Lindkvist
c47f2a30d8 #4228 Don't collapse tree structure in project tree when hiding plot window 2019-03-25 15:15:20 +01:00
Magne Sjaastad
31c54bab0b #4219 Contact Pressure plots : Simplify creation of plots, hide obsolete title 2019-03-22 16:19:23 +01:00
Magne Sjaastad
0dd5d40199 #4219 Contact Pressure plots : Add color to annotation lines 2019-03-22 16:19:23 +01:00
Gaute Lindkvist
bf3f505dc1 #4216 Support saving curve appearance 2019-03-22 11:22:31 +01:00
Gaute Lindkvist
97bb7483e5 #4214 Allow setting the curve symbol for Grid Cross Plots 2019-03-22 09:39:40 +01:00
Gaute Lindkvist
4c3c01a661 #4210 Fix crash when creating contour map 2019-03-22 09:28:47 +01:00
Gaute Lindkvist
64fc6447f4 Improve performance of contour line generation 2019-03-22 09:28:47 +01:00
Magne Sjaastad
60c3f60146 #4178 Ensemble Diff : When well is present in only one ensemble, diff causes crash 2019-03-22 08:32:23 +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
Magne Sjaastad
2166d0834e Add missing include for Linux 2019-03-21 14:22:03 +01:00
Gaute Lindkvist
bae8a3373f #4193 Stop calling update of parent in NameConfig::initAfterREad 2019-03-20 18:54:02 +01:00
Gaute Lindkvist
8c06d06e54 #4207 Make grid cross plot symbols smaller and enable concave symbols. 2019-03-20 13:42:01 +01:00
Gaute Lindkvist
f33b739de2 #4164 Update project tree when an MDI window is closed. 2019-03-20 13:42:00 +01:00
Gaute Lindkvist
ba7830e53c #4207 Allow changing color of plot symbol edges and update cross plots
* Cross plots have same color as the symbol itself.
2019-03-20 13:41:59 +01:00
Magne Sjaastad
f14cd3f1f7 #4200 Grid Cross Plot : Improve text for annotation items 2019-03-19 15:52:56 +01:00
Magne Sjaastad
a07f375daf #4200 Grid Cross Plot : Adjustments for Linux 2019-03-19 15:39:49 +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
Magne Sjaastad
3579667cd8 move code to separate functions 2019-03-19 14:26:31 +01:00
Magne Sjaastad
516fd9a929 more text in UI 2019-03-19 12:06:05 +01:00
Magne Sjaastad
6cdfb7da09 wip 2019-03-19 10:58:45 +01:00
Magne Sjaastad
54f97d6409 set eclipsecase in initafterread 2019-03-19 10:56:41 +01:00
Magne Sjaastad
2a1d8379a5 adjustments 2019-03-19 09:43:11 +01:00
Magne Sjaastad
924916fdd7 Filter framework 2019-03-19 09:28:00 +01:00
Magne Sjaastad
18d482ec9a rename 2019-03-19 09:21:13 +01:00
Gaute Lindkvist
155dba5591 #4206 Set new defaults for grid cross plot 2019-03-19 09:08:02 +01:00
Magne Sjaastad
69c264edf5 Custom color and custom plot title 2019-03-18 14:31:06 +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
Magne Sjaastad
795ce019ae Hide annotations from UI 2019-03-18 09:09:41 +01:00
Magne Sjaastad
7f0532999a Merge branch 'dev' into annotation-items 2019-03-18 09:08:56 +01:00
Magne Sjaastad
78940795a8 Use index to map to EQUILNUM 2019-03-14 18:27:32 +01:00
Gaute Lindkvist
52d2eed98b Fix log axis crash in Grid Cross Plot and refactor log axis range code 2019-03-14 09:58:12 +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
75688703d4 #4195 Grid Cross Plot: Adjustments 2019-03-12 22:49:31 +01:00
Magne Sjaastad
15f2a76ee1 #4195 Grid Cross Plot: Add annotation item to axis 2019-03-12 16:05:58 +01:00
Magne Sjaastad
edc6dad0f7 #4194 Grid Cross Plot: Add copy and paste of curve sets 2019-03-12 14:46:57 +01:00
Magne Sjaastad
70f16eae27 Guard null pointer access 2019-03-12 14:46:57 +01:00
Magne Sjaastad
147c4f752f Guard null pointer access 2019-03-12 14:46:57 +01:00
Gaute Lindkvist
117731a24a #4192 Add swap axis and update property editor 2019-03-12 14:34:22 +01:00
Gaute Lindkvist
22f7bf7c21 Update RifReaderEclipseOutput and RimEclipseCase to use new progress tasks 2019-03-12 14:34:22 +01:00
Magne Sjaastad
55c9846aa7 Cotire : Fix name for enum names 2019-03-12 10:27:20 +01:00
Magne Sjaastad
907337015f Minor refactoring fixes 2019-03-12 09:22:48 +01:00
Magne Sjaastad
f7600199c7 Fix whitespace and includes 2019-03-12 09:22:48 +01:00
Magne Sjaastad
246326229e #4189 RFT Plot : Move common code to RifEclipseRftAddress 2019-03-12 09:22:48 +01:00
Magne Sjaastad
564ab1d84b #4189 RFT Plot : Separate request based on PLT/RFT plot 2019-03-12 09:22:48 +01:00
Gaute Lindkvist
e72f57072c #4185 Implement data export for Grid Cross Plot 2019-03-12 09:19:01 +01:00
Magne Sjaastad
6008b8a45d #4154 Summary curves : Test if summary address for error is present before accessing values 2019-03-11 21:24:46 +01:00
Magne Sjaastad
343dd1674e Flow Diag : Show time unit [days] for time of flight 2019-03-11 13:58:09 +01:00
Magne Sjaastad
79a7dfd0c6 Add tooltip text 2019-03-11 11:30:12 +01:00
Magne Sjaastad
89b4279da2 #4186 Dual Porosity Model : Show dual porosity text in label and text in 3D view 2019-03-08 14:52:43 +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
1dd16948af Make category integer the default legend type for Grid Cross Plots 2019-03-07 19:04:10 +01:00
Gaute Lindkvist
6f1ed595b5 #4184 Resize legend if it becomes larger than plot area. 2019-03-07 19:00:38 +01:00
Gaute Lindkvist
804a196ce3 #4167 Implement option for inverting axes 2019-03-07 14:34:47 +01:00
Gaute Lindkvist
d2393cb8a5 #4156 Simplify curve naming code 2019-03-07 14:20:28 +01:00
Gaute Lindkvist
8845c456bc Grid Cross Plot: Use the term Grouping instead of Categorization 2019-03-05 13:35:35 +01:00
Gaute Lindkvist
b6a2bcfa59 #4168 Treat some properties as categories. 2019-03-05 13:12:40 +01:00
Gaute Lindkvist
ac7eccee88 #4157 Grid Cross Plot: Make categorisation legend more like ensemble legend 2019-03-05 10:41:41 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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