Commit Graph

4874 Commits

Author SHA1 Message Date
Gaute Lindkvist
57b33b0d4c
First implementation of Headless (#4392)
* Revert "#4377 Octave : Use RiaLogging for error messages instead of QErrorMessage "

This reverts commit f758a8edb2.

* Revert "#4380 Preferences : Changing scene font size when geo mech view is open causes crash"

This reverts commit df62a41397.

* Revert "#4379 Documentation : Update command line parser for import of summary files"

This reverts commit d0b5357ed4.

* Unfinished WIP

* Builds but crashes

* Refactored code now builds and runs

* ResInsight can now run the unittests headless

* Can run some command files successfully

* Build on Linux

* Extra headless hack header

* Moved PdmUiItem hack to cpp file

* Fix headless crash in RimWellAllocationPlot

* Handle error gracefully if ExportSnapshots command is executed from console

* Add caf::QIconProvider and remove some hacks

* Also made the greying out of disabled icons work for a couple of cases where it didn't.

* Linux build fix

* #4380 Reimplement fix df62a41397 by @magnesj on top of Headless code changes

* #4379 Reintroduce kode from d0b5357ed4 by @magnesj

* #4377 Restore f758a8edb2 in new Headless code
2019-05-06 10:36:05 +02:00
Magne Sjaastad
df62a41397 #4380 Preferences : Changing scene font size when geo mech view is open causes crash
Guard access to annotationCollection, as this is nullptr for geo mech views.
2019-04-30 07:40:00 +02:00
Gaute Lindkvist
950458455d #4360 Make sure we display cell colors for grids without dynamic variables even if the project has wells in it 2019-04-26 14:23:05 +02:00
Gaute Lindkvist
f567be6d96 #4371 Store Sector Model settings in Project Dialog Data 2019-04-26 13:42:35 +02:00
Magne Sjaastad
11e91f5d1c #4375 Robustness : Make sure we handle missing data gracefully 2019-04-26 12:50:36 +02:00
Magne Sjaastad
ba9b84850d #4368 RFT and PLT plots : Disable advanced grid line settings 2019-04-26 09:30:28 +02:00
Gaute Lindkvist
2452bc3a21 #4364 Make sure the correct flow coefficient is exported for ICDs/ICVs in WSEGVALV MSW export 2019-04-26 08:29:04 +02:00
Magne Sjaastad
b6c9e3b278 #4363 RFT plots: For Measured Depths PL is sometimes used for grid pressures 2019-04-25 16:02:47 +02:00
Magne Sjaastad
c2fb16a4d3 #4352 Fractures : Make sure appropriate value is always returned 2019-04-25 08:20:48 +02:00
Magne Sjaastad
3cdf19b19d #4357 Grid Case Group Statistics: Crash when creating contour map 2019-04-25 07:42:38 +02:00
Magne Sjaastad
319050b992 #4352 Fractures : Delegate isEnabled to leaf classes 2019-04-25 07:25:52 +02:00
Magne Sjaastad
521e170178 #4352 Hide Fracture CONDUCTIVTY legend if no visible fractures 2019-04-24 13:07:54 +02:00
Magne Sjaastad
60153b20ec
Merge pull request #4350 from OPM/cpp-check-cleanup
Cpp check cleanup
2019-04-24 09:09:18 +02:00
Magne Sjaastad
5123d5d0c5 #4351 Regression test : Guard null pointer access 2019-04-24 07:46:51 +02:00
Gaute Lindkvist
195fc85a5a Improve Simulation Well Color UI 2019-04-23 08:38:49 +02:00
Gaute Lindkvist
c8184065e3 #4326 Invert Grid Cross Plot Y-axis when displaying DEPTH 2019-04-23 08:35:18 +02:00
Magne Sjaastad
3d3e6064b1 #4348 System , cppcheck : Remove unused functions 2019-04-21 09:36:25 +02:00
Magne Sjaastad
843a791218 #4348 System , cppcheck : Remove unused functions 2019-04-21 09:28:23 +02:00
Magne Sjaastad
8d4142187e #4348 System , cppcheck : Remove unused functions 2019-04-21 09:11:20 +02:00
Magne Sjaastad
b786c2c5f3 #4348 System , cppcheck : Remove unused functions 2019-04-21 07:53:52 +02:00
Magne Sjaastad
8cefcbb562 #4348 System , cppcheck : Remove unused variables 2019-04-20 15:11:21 +02:00
Magne Sjaastad
ca72e6ab89 #4348 System , cppcheck : Remove unused variables 2019-04-20 14:34:23 +02:00
Magne Sjaastad
64fc5d71ef #4348 System , cppcheck : Use size_t when counting parameter instances 2019-04-20 13:53:51 +02:00
Magne Sjaastad
e4672aefa9 #4348 System , cppcheck : Remove duplicate test 2019-04-20 13:46:12 +02:00
Gaute Lindkvist
4439f7609b #4317 Add default ellipse fracture template 2019-04-16 13:30:03 +02:00
Gaute Lindkvist
a8bcfefca2 #4309 Offset text annotations label position slightly to make labels less likely to be obscured by grid 2019-04-16 13:02:31 +02:00
Gaute Lindkvist
e0bbda85d9 #4312 Move handleMdiWindowClosed call from widget destructors to MdiSubWindow closeEvent
* This way the mdi window still exists at the time of removal and we can handle the removal orderly
2019-04-16 12:14:54 +02:00
Gaute Lindkvist
a98b1d3494 #4339 Show actual parameter names instead of X and Y in Grid Cross Plot Show Data 2019-04-15 11:55:40 +02:00
Gaute Lindkvist
983fed11a3 #4323 Make sure time step legend doesn't show up unexpectedly
* Don't make it the default. The legend is handled well when changing to time step
2019-04-15 11:12:16 +02:00
Gaute Lindkvist
8846798ccf #4338 Add grouping result to Grid Cross Plot Data set property editor 2019-04-15 11:06:27 +02:00
Gaute Lindkvist
48c6139cb2 #4337 Group grid cross plots created from view by formations 2019-04-15 10:45:46 +02:00
Gaute Lindkvist
c2032fd948 Set grouping by formations and category colors as default for Grid Cross Plots if formations are available 2019-04-15 09:36:13 +02:00
Gaute Lindkvist
3a91412d6c #4336 make sure data colors are updated in Grid Cross plots when changing legend colors 2019-04-15 09:32:35 +02:00
Gaute Lindkvist
89a16103c9 Make sure picking of text and reach circle annotations isn't enabled after loading project 2019-04-12 14:47:36 +02:00
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
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
Gaute Lindkvist
0e52426071 #4014 Use Vec3d Editor for Text and ReachCircle Annotations 2019-02-06 08:21:14 +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
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
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
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
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
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
d882261511 #4027 Increase max padding for GeoMech contour maps 2019-01-31 16:05:25 +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
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
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
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
98f2b50180 #3958 Refactoring: Remove more direct use of scalarResultIndex related to CellEdge 2019-01-25 16:19:15 +01:00
Jacob Støren
d8eded7d49 #3958 Refactoring: Removed result index from NNC data 2019-01-25 16:19:15 +01:00
Jacob Støren
09011862cd #3958 Refactoreing: Rename 2019-01-25 16:19:14 +01:00
Jacob Støren
1d8e31fe91 #3958 Refactoring: Fix after update from dev 2019-01-25 16:19:14 +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
5a01fdb88e #3958 Refactoring: Replaced result info based lookups with result address.
Replaced access of resultInfo as vector with single access based on address.
Moved RigEclipseResultAddress to a separate new file.
2019-01-25 16:19:13 +01:00
Jacob Støren
8e16d3ff20 #3958 Refactoring: Moved code into CaseCellResultsData.
Made methods private
2019-01-25 16:19:13 +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
Gaute Lindkvist
49a6650e77 Make Valve template units visible 2019-01-23 11:01:48 +01:00
Gaute Lindkvist
3fddca093e Fix compile warning in GeoMechContourMapProjection 2019-01-23 09:45:06 +01:00
Gaute Lindkvist
bfdf55ec7b geomec pick 2019-01-23 09:41:24 +01:00
Gaute Lindkvist
796c6a0e0a #3987 Fix picking on Geo Mech contour maps 2019-01-23 09:23:22 +01:00
Gaute Lindkvist
d9f7e68739 Add legend levels field to Contor Map projection and make sliders delay update until release 2019-01-22 15:48:21 +01:00
Gaute Lindkvist
19bf92c336 Move distance transform to RiaImageTools 2019-01-22 15:47:25 +01:00
Gaute Lindkvist
9a3a61811f #3980 Optimizing and expanding geomech boundaries to outside Pore pressure region 2019-01-22 14:00:40 +01:00
Gaute Lindkvist
810a991ba4 #3979 #3980 Contour Maps: Fix GeoMech crash and make limit to POR-result optional. 2019-01-22 14:00:09 +01:00
Gaute Lindkvist
4cd43d76d2 #3975 Avoid wrapping header lines in eclipse output + well plan 2019-01-18 14:55:12 +01:00
Gaute Lindkvist
b800510568 #3970 Make min/max for all time steps available for all results in contour map 2019-01-18 13:53:03 +01:00
Gaute Lindkvist
26015753a3 Massively improve contour map speed by polygon simplification before clipping 2019-01-18 13:53:03 +01:00
Gaute Lindkvist
b1ad93f4b9 #3970 Contour Maps: improve edge look
* Remove excess tiny triangles around edges
* Remove labels from contour lines that overlap inner contour lines
2019-01-17 20:18:15 +01:00
Magne Sjaastad
e75362f87e System : Avoid file global variables (cotire)
When multiple files defines the same variable in global file scope, a name clash happens in cotire. Prefer using static const members instead.
2019-01-16 15:56:16 +01:00
Magne Sjaastad
bde2c0109c Fix signed/unsigned assignment issue 2019-01-16 15:56:16 +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
Gaute Lindkvist
314a5747db #3957 Restore UI-order in Well Path Valve property editor 2019-01-15 17:13:23 +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
791a896be4 #3952 Summary : Create plot if no plot exists when loading summary case 2019-01-14 13:54:19 +01:00
Magne Sjaastad
ce51f40a3f #3952 Summary : Create folders for input data and plots 2019-01-14 11:14:18 +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
59a9136bf1 #3807 Make sure changing weights updates contour map 2019-01-11 16:14:54 +01:00
Gaute Lindkvist
9a6d0ab9ef #3807 Tidy up contour map code after splitting out Eclipse specific code 2019-01-11 16:08:37 +01:00
Gaute Lindkvist
bad98b81ad #3807 Make RimEclipseContourMapProjection a child of an abstract RimContourMapProjection 2019-01-11 16:06:54 +01:00
Gaute Lindkvist
fb5c222047 #3961 Disable case name in auto name for 3d Views by default 2019-01-11 16:06:53 +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
Gaute Lindkvist
4f09b6fbf6 #3945 Fix bug related to updating Contour Map when changing result and weighting parameter 2019-01-11 12:32:46 +01:00
Gaute Lindkvist
d1a457bf07 #3943 Stop regenerating map geometry when altering other geometry.
* Do this by caching results and clearing the cache in three stages with each dependent on the previous stages:
  1. Grid Mapping
  2. Results
  3. Geometry
* Clearing grid mapping clears results and clearing results clears geometry.
* Some operations require only geometry changes, while others require a full change to grid mapping and consequently everything else.
2019-01-11 10:48:28 +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
Gaute Lindkvist
14cce66d2a #3945 Avoid ray tracing around edges of contour map 2019-01-10 21:16:22 +01:00
Gaute Lindkvist
23142acc01 #3942 disable contour smoothing when contour lines are disabled 2019-01-10 20:58:36 +01:00
Gaute Lindkvist
82686ffe14 #3945 Avoid redoing ray tracing for contour maps when we can 2019-01-10 20:55:58 +01:00
Gaute Lindkvist
a309ffd1ea #3941 Slighly improve contour map performance 2019-01-10 19:13:18 +01:00
Gaute Lindkvist
602bca4ea6 #3939 Make sure contour smoothing doesn't cause level overlap. 2019-01-10 16:07:58 +01:00
Gaute Lindkvist
8428e848de #3941 Improve contour map performance by several measures
* Discarding triangles that aren't inside current level. Big gain.
* Checking bbox for contour levels. Minor gain.
* Doing less interpolation. Minor gain.
2019-01-10 14:53:37 +01:00