OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity
10,671 Commits 27 Branches 61 Tags 309 MiB
8ce19c742e
Commit Graph

8955 Commits

Author SHA1 Message Date
Magne Sjaastad
a7a771ac7f #4268 libecl : Add test files and unit test reproducing issue 2019-04-01 14:25:25 +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
Magne Sjaastad
79c6ccd393 Show contributing wells : Create new view by default 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
421c374fde #4265 Remove minimize button from MDI windows. It serves no real purpose. 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
22e0ab853b #4261 Remove word "Mode" from Measurement Mode in menus 2019-03-29 12:47:34 +01:00
Magne Sjaastad
8c1c4ea767 #4240 Project Tree : Make sure setActiveReservoirView is called 2019-03-29 12:36:00 +01:00
Magne Sjaastad
16540f6607 Refactor : Use range based for and rename 2019-03-29 11:30:37 +01:00
Magne Sjaastad
de7c05f5cb Refactoring : Use range based for 2019-03-29 11:26:12 +01:00
Magne Sjaastad
b26c61b7bf #4240 Project Tree : Keep selection when clicking on cells 
When current selection in project tree is part of a 3D view, update the selection accordingly. If an item unrelated to 3D view is selected, do nothing when clicking in the 3D view.
 2019-03-29 11:23:46 +01:00
Magne Sjaastad
0f636fcc81 Whitespace 2019-03-29 08:28:31 +01:00
Magne Sjaastad
0d99010227 Remove unused variable 2019-03-29 08:28:22 +01:00
Magne Sjaastad
c4b0bf5890 #4221 MDI window : Move MDI handling to RiuMainWindowBase 2019-03-29 08:26:34 +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
Gaute Lindkvist
ee5935aad6 Linux build fixes 2019-03-29 07:53:54 +01:00
Gaute Lindkvist
47a559b3a8 #4247 Minor improvements to export sector model UI 2019-03-28 22:41:03 +01:00
Gaute Lindkvist
d4f3701da6 #4245 Add export sector model to regular export menu 2019-03-28 20:42:13 +01:00
Gaute Lindkvist
42ff8bde78 #4246 Report error and stop importing faults with a name longer than 8 characters or with a space in the name 2019-03-28 20:31:45 +01:00
Gaute Lindkvist
4ada37c218 #4243 Fix crash in import EGRID or SMSPEC by moving to general import feature 2019-03-28 20:31:45 +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
337345a887 #4222 Add axis labels to Grid Cross Plot pick info 2019-03-27 15:17:52 +01:00
Gaute Lindkvist
a168f8a206 #4238 Increase the size of grid cross plot legends if window has been decreased and then increased again 2019-03-27 15:02:12 +01:00
Gaute Lindkvist
11b078c1a9 #4237 Fix build problem on Qt 4 2019-03-27 14:58:08 +01:00
Gaute Lindkvist
b08504fe05 #4236 Partial revert of fixes for #4221 
* The line in RiuPlotMainWindow from  ef182da8a9 is set back to before
 2019-03-27 14:20:39 +01:00
Gaute Lindkvist
e8efe81796 #4176 Add keyboard shortcuts to Zoom all (Ctrl+Alt+A) and view directions (Ctrl+Alt+N/W/S/etc) 2019-03-27 13:18:19 +01:00
Gaute Lindkvist
2c7ed49708 #4176 Add keyboard shortcuts to show plot and main window 
* Ctrl+Shift+P and Ctrl+Shift+3
 2019-03-27 13:17:04 +01:00
Gaute Lindkvist
9f5d098e14 #4176 Add standard keyboard shortcut for Help Contents F1 2019-03-27 13:15:20 +01:00
Gaute Lindkvist
45ea093dee #4176 Add keyboard shortcuts to enter measurement modes 2019-03-27 13:11:10 +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
3d3868e29d Fix up keyboard shorcut on < Qt 5.10 2019-03-27 12:01:49 +01:00
Gaute Lindkvist
af20545691 #4176 Enable short cut text in copy/paste context menus 2019-03-27 11:03:10 +01:00
Gaute Lindkvist
9306961df4 #4176 Enable Del keyboard shortcut for delete commands 2019-03-27 11:03:10 +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
Gaute Lindkvist
8173cb88ee Update GeoMech import icons to look more deformed 2019-03-27 08:50:22 +01:00
Gaute Lindkvist
62c8a7ae7c Fix missing rescaled ensemble icon 2019-03-27 08:50:22 +01:00
Magne Sjaastad
349a026a8e Temporary workaround : Add missing icon 2019-03-26 17:48:27 +01:00
Gaute Lindkvist
10af680dd8 Ensemble Improvements 2019-03-26 17:23:12 +01:00
Gaute Lindkvist
c3d4914997 #4077 Separate icons for different GeoMech import 2019-03-26 17:23:12 +01:00
Magne Sjaastad
9f7be1489d Whitespace 2019-03-26 16:21:28 +01:00
Magne Sjaastad
507973688e #4221 Window Management : Make sure restore of windows works from file 2019-03-26 16:19:56 +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
d0ee914d5c #4230 Grid Cross Plot: Add more checking of required input data 2019-03-26 15:38:20 +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
Magne Sjaastad
733b7201b5 #4230 Grid Cross Plot: Return if required data is missing 2019-03-26 15:38:15 +01:00
Gaute Lindkvist
feb8ede0df Increase size of Save icon to match size of nearby icons 2019-03-26 14:21:36 +01:00
Gaute Lindkvist
009dcb5f19 #4226 Add polyline measurement mode 2019-03-26 14:19:02 +01:00
Gaute Lindkvist
c379a87306 Reset save icon 2019-03-26 14:19:02 +01:00
Gaute Lindkvist
5b7bf99b82 #4222 Implement picking to display point value in Grid Cross Plot 2019-03-26 14:17:35 +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
97d71acaf8 #4220 Make sure we pass enterEvent of RiuViewer on to caf::Viewer 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
5325f1d5fb Whitespace 2019-03-26 09:10:29 +01:00
Magne Sjaastad
d208d9104b #4213 Export Advanced Snapshot : Fix crash caused by nullptr in case list 2019-03-26 09:10:29 +01:00
Magne Sjaastad
92578211b4 Rename to RimAdvancedSnapshotExportDefinition 2019-03-26 09:10:29 +01:00
Magne Sjaastad
8832a0a7c6 Rename to RiuAdvancedSnapshotExportWidget 2019-03-26 09:10:29 +01:00
Magne Sjaastad
3d33126dac Rename to RicAdvancedSnapshotExportFeature 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
Gaute Lindkvist
44f3882ecb #4220 Apply picking cursor only when over a 3d View 2019-03-25 15:15:20 +01:00
Magne Sjaastad
ef182da8a9 #4221 Window Management : When a view or plot is maximized, show following views as maximize 2019-03-25 07:57:35 +01:00
Magne Sjaastad
5c316cecdd Whitespace 2019-03-25 07:38:33 +01:00
Magne Sjaastad
58d369d32b #4073 3D calculations : Compare main grid cell value if LGR is present 2019-03-25 07:36:33 +01:00
Magne Sjaastad
bcadb4383c #4219 Contact Pressure plots : Add error message 2019-03-22 16:19:23 +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
49c66d0a5f #4218 Read units from Eclipse input grids 2019-03-22 15:28:03 +01:00
Gaute Lindkvist
ec525e8774 Move ProgressBlocker creation to unit test launch method 2019-03-22 15:28:03 +01:00
Magne Sjaastad
32419b1e00 #4217 Summary : Fix memory leak for vector of time_t values 2019-03-22 13:47:12 +01:00
Gaute Lindkvist
de2920c7c2 Add ProgressInfoBlocker and add to unit tests 2019-03-22 13:30:18 +01:00
Gaute Lindkvist
e40b3aa6e8 Fix expected MD5 strings in Eclipse Output test for Linux 2019-03-22 13:16:13 +01:00
Gaute Lindkvist
97e847a9d1 #4217 Fix memory leak in summary import 2019-03-22 11:43:13 +01:00
Gaute Lindkvist
bf3f505dc1 #4216 Support saving curve appearance 2019-03-22 11:22:31 +01:00
Gaute Lindkvist
646d79ce57 #4209 Support other units than metric when exporting input grid. 2019-03-22 10:37:40 +01:00
Gaute Lindkvist
ed88147d53 Fix Linux build issue 2019-03-22 09:51:37 +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
f8102797c1 #4208 Store last used folder when exporting Sector Model + warning for LGRs 2019-03-21 14:45:47 +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
Gaute Lindkvist
88d2ad2c35 Refactor grid export and fault export 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
Gaute Lindkvist
28e6bf8d2d Export Sector model: write floats to file instead of doubles 2019-03-19 11:43:43 +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
Gaute Lindkvist
dd5402756c #4203 Support cell refinement for Sector Export 2019-03-19 10:49:09 +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
b64727816c Add reference to documentation 2019-03-15 11:50:21 +01:00
Magne Sjaastad
78940795a8 Use index to map to EQUILNUM 2019-03-14 18:27:32 +01:00
Gaute Lindkvist
136f13e145 #4198 Make sure exit application works as expected with both windows open 2019-03-14 15:24:11 +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
0527fd8030 #4195 Grid Cross Plot: Add import of equil 2019-03-12 18:35:12 +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
Gaute Lindkvist
749e19a879 Create a simpler task system for handling sub tasks in progress dialog. 
* Remove incrementProgressAndUpdateNextStep() method
 2019-03-12 14:34:22 +01:00
Magne Sjaastad
674758fbf6 Remove obsolete include 2019-03-12 10:27:48 +01:00
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
70c3b4df71 Whitespace 2019-03-11 11:45:35 +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
8382b5cfdd #4144 Remove grid import buttons from plot window and add ensemble import 2019-03-08 10:41:32 +01:00
Gaute Lindkvist
b22ca46dc5 #4187 Make WindowCloseButtonHint part of the default dialog flags 
* Dialogs on the Qt5 build has the close button disabled and this fixes that.
 2019-03-08 10:23:18 +01:00
Gaute Lindkvist
e00f983360 #4166 Add feature for swapping cross plot axes + tweaks to legend 
* Also put x and y property side by side in property editor
 2019-03-08 09:59:38 +01:00
Magne Sjaastad
1e777eaea0 Fix invalid initialization 2019-03-08 09:36:14 +01:00
Magne Sjaastad
25549b6b05 #4186 Porosity Model : Make sure fracture model data is read from file 2019-03-07 20:38:42 +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
Magne Sjaastad
102d1c75a7 #4173 Remove obsolete code 2019-03-07 10:25:14 +01:00
Gaute Lindkvist
4c5ffffd60 Set all pointers in RiaApplication to null in constructor initialisation list 2019-03-07 10:21:31 +01:00
Gaute Lindkvist
0cc1b256b2 Add back missing whitespace between functions in RiaApplication 2019-03-07 10:21:23 +01:00
Gaute Lindkvist
e9e21cf30d #4171 Work around assert failure when closing main window last 2019-03-07 09:13:56 +01:00
Gaute Lindkvist
fd01871202 #4173 Fix problems with saving state when closing 3d Window before closing plot window 2019-03-07 09:13:56 +01:00
Gaute Lindkvist
0dbd3e8ad4 #4170 Add Qt version string to ResInsight registry folder 
* Qt version has an impact on whether the strings are compatible.
 2019-03-07 09:13:56 +01:00
Magne Sjaastad
03c9853b6e #4169 Saturation-Pressure plot : Add RigEquil 2019-03-05 21:43:26 +01:00
Magne Sjaastad
11ae710be9 #4169 Saturation-Pressure plot : Add more tests 2019-03-05 14:18:57 +01:00
Magne Sjaastad
6440d8106b #4169 Saturation-Pressure plot : Whitespace 2019-03-05 14:18:57 +01:00
Magne Sjaastad
42f93d3a5a #4169 Saturation-Pressure plot : Read keyword data and add test files 2019-03-05 14:18:57 +01:00
Magne Sjaastad
ea9503d065 #4169 Saturation-Pressure plot : Whitespace 2019-03-05 14:18:57 +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
be95eefd69 Repository wide spelling correction overly -> overlay 
* Impacts CAF and ResInsight
 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
Magne Sjaastad
728eb79a3d #4165 Regression Test : When running on build server, do not open report in browser locally 2019-03-04 11:35:25 +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
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