Commit Graph

4690 Commits

Author SHA1 Message Date
Gaute Lindkvist
9aa7ac2591 Make sure auto zoom isn't disabled at the end of zoomAll() for grid cross plot 2019-04-12 14:47:36 +02:00
Gaute Lindkvist
9834a421c8 Fix problem in font size application to annotations 2019-04-12 14:47:21 +02:00
Gaute Lindkvist
9d06b59357 #4255 Read default plot font sizes from preferences and apply 2019-04-12 14:47:21 +02:00
Gaute Lindkvist
798e3ff19e #4256 Update fonts in Project and views when changing preferences 2019-04-12 14:47:21 +02:00
Gaute Lindkvist
58735350a3 #4322 Ensure toggling of data sets don't cause zoom all 2019-04-12 13:15:51 +02:00
Gaute Lindkvist
34fd604bd8 #4316 Fix regression issue with export completion and import menus showing up everywhere 2019-04-12 13:15:51 +02:00
Gaute Lindkvist
c82a4a5537 #4316 Fix context menu with multiple selected well paths 2019-04-12 09:09:12 +02:00
Magne Sjaastad
c0859e3b65 #4301 Contour map : Add setter for RigEclipseResultAddress 2019-04-10 08:55:15 +02:00
Gaute Lindkvist
855eb0e099 #4307 Fix crash in contour map with static properties 2019-04-09 17:26:20 +02:00
Gaute Lindkvist
f36c38533b #4275 Hide UI for case-diff when flow diagnostics is enabled 2019-04-09 13:30:21 +02:00
Gaute Lindkvist
cd870f089b #4304 Add pre-defined templates for each valve type and fix icons and labels. 2019-04-09 13:30:20 +02:00
Gaute Lindkvist
c0f3258f19 Work in progress 2019-04-09 10:30:15 +02:00
Magne Sjaastad
b03e75065c Whitespace 2019-04-09 09:51:19 +02:00
Magne Sjaastad
af46490b9f #4303 Calculated curve : Always show scaling factor in axis legend text 2019-04-09 09:51:19 +02:00
Gaute Lindkvist
64f537ad05 Make valve templates a bit more accessible 2019-04-08 14:24:43 +02:00
Gaute Lindkvist
4e10aa8ffa #4262 Tidy up well path menus 2019-04-08 14:24:43 +02:00
Gaute Lindkvist
1e223a508a Fix compile warning in RimSaturationPressurePlot 2019-04-08 14:24:43 +02:00
Magne Sjaastad
be6b82ab0e #4285 Octave : Disable octave argument logging 2019-04-08 07:57:49 +02:00
Magne Sjaastad
bf7987e4ac #4285 Octave : Add logging of arguments 2019-04-05 19:12:19 +02:00
Magne Sjaastad
08d4697632 #4285 Octave : Make sure absolute absoluteFilePath() is used 2019-04-05 19:09:41 +02:00
Magne Sjaastad
f2af02cc2d #4297 2D intersection view: Initialize with timestep from source view 2019-04-05 14:17:44 +02:00
Gaute Lindkvist
fccb363f53 #4282 Remove horizontal scrollbar from result property list 2019-04-05 13:05:48 +02:00
Gaute Lindkvist
c1a5397a6f #4282 Make RimCrossPlotDataSet UI take up less space by using an invisible group around properties 2019-04-05 13:05:47 +02:00
Magne Sjaastad
26f89f6e35 #4016 Observed Cases : Simplify access functions 2019-04-05 10:11:30 +02:00
Magne Sjaastad
7af16ce24c #4285 Octave : Move creation of command line arguments to RimCalcScript 2019-04-04 21:37:22 +02:00
Magne Sjaastad
fd774bec39 #4285 Octave : Rename to absoluteFileName 2019-04-04 21:18:20 +02:00
Magne Sjaastad
b8ff8a2de8 #4287 Preferences : Rename from fault file prefix to general prefix 2019-04-04 20:28:36 +02:00
Magne Sjaastad
a812190af3 #4281 Saturation pressure plots : Delay loading of EQUIL until required 2019-04-04 19:38:15 +02:00
Gaute Lindkvist
000b6713b1 #4283 Improve window tiling during resize 2019-04-04 19:23:43 +02:00
Gaute Lindkvist
14bcfb8122 #4274 Reapply side-by-side x/y properties in Grid Cross Plot Data Set 2019-04-04 08:47:37 +02:00
Gaute Lindkvist
5e517e47dd Labels on top fixes 2019-04-04 08:47:36 +02:00
Gaute Lindkvist
815689372a Fix Linux build problem by forcing use of function value to yield case diff values 2019-04-03 15:43:43 +02:00
Magne Sjaastad
f7be3c4bf2 Whitespace 2019-04-03 15:04:21 +02:00
Magne Sjaastad
4ba6e6959b #4279 Octave Script Folders : Disable default search of sub folders and add option to search 2019-04-03 15:01:13 +02:00
Magne Sjaastad
e486432391 #4276 RFT-plot: Add support for Measured Depth as Y-axis 2019-04-03 12:27:49 +02:00
Gaute Lindkvist
7d78956781 #4196 Apply background color, well label color and z-scale automatically from preferences
* Ask to change existing views if their values are different from the previous Preferences default
2019-04-03 08:39:26 +02:00
Gaute Lindkvist
69b01bcca7 Fix typo in GridCrossPlotDataSet 2019-04-03 08:39:25 +02:00
Gaute Lindkvist
935eaf7e59 #4272 Temporary fix by not having X and Y-property in Grid Cross Plot Data Set side-by-side 2019-04-03 08:37:56 +02:00
Gaute Lindkvist
c2eafebfc8 Add a few sensible asserts to RimGridCrossPlotDataSet 2019-04-03 08:37:56 +02:00
Magne Sjaastad
ab7dd90483 #4251 Saturation Pressure Plots: Make sure result is loaded before accessing data 2019-04-02 12:41:26 +02:00
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