Commit Graph

6750 Commits

Author SHA1 Message Date
Magne Sjaastad
f1fbe4d8ac PlotCurve : Remove duplicate code 2018-04-27 11:58:22 +02:00
Magne Sjaastad
ae3cc0010d Reapply import menu improvements in 3bc102bb01
Changes was unitentionally reverted by 132db2bb1e
2018-04-27 09:33:11 +02:00
Bjørn Erik Jensen
0fcdfadddc #2813 Origin summary dialog. 'Ok to all' button 2018-04-27 08:27:16 +02:00
Magne Sjaastad
478955d0f6 #2816 Summary Curves : Replace empty auto name with plot title
Also add a fallback if everything else ends up with an empty name
2018-04-27 07:38:32 +02:00
Magne Sjaastad
6ed6a55c4e #2831 System : Display text in status bar to ensure the widget is created 2018-04-27 06:55:26 +02:00
Magne Sjaastad
c267f32638 Rename to RiuPlotMainWindow 2018-04-27 06:28:08 +02:00
Magne Sjaastad
515ed8a649 #2798 Dock Widgets : Store dock widget state when closed by "x" 2018-04-26 20:40:06 +02:00
Magne Sjaastad
132db2bb1e #2798 Dock Widgets : Improve menus and handling of tabbed dock widgets
Create dock widgets based on static names
Build Windows menu based on static names
Wire up toggleView actions to RiuDockWidgetTools
Change dock widget visibility based on view
2018-04-26 20:05:42 +02:00
Magne Sjaastad
014944b4c0 #2798 Dock Widgets : Raise widget to make it top most widget if tabbed 2018-04-26 19:57:51 +02:00
Magne Sjaastad
97baff4e0f #2798 Dock Widgets : Add RiuDockWidgetTools 2018-04-26 19:52:27 +02:00
Bjørn Erik Jensen
3647792eb9 #2807 Origin summary files. Fix 'OK to all' not working issue 2018-04-26 14:27:23 +02:00
Bjørn Erik Jensen
fb384e596d #2811 Ensemble curve set. Set initial ensemble 2018-04-26 11:48:12 +02:00
Bjørn Erik Jensen
145b85cc1b #2779 Ensemble curves. Add import sub menu 2018-04-26 11:20:47 +02:00
Bjørn Erik Jensen
3bc102bb01 #2779 Ensemble curves. Reorganize import menu in main and plot windows 2018-04-26 10:58:59 +02:00
Bjørn Erik Jensen
ad6ef2a49b #2806 Origin summary files dialog. Replace text 'Apply settings to...' to 'OK to All' 2018-04-26 09:51:35 +02:00
Bjørn Erik Jensen
93304360fa #2810 import ensemble. Import all summary files even though some files miss ensemble parameters 2018-04-26 09:47:43 +02:00
Gaute Lindkvist
029369d187 #2677 Show curve value when clicking the curve
This change will show the following:
   - Curve name
   - Well path name
   - Measured depth
   - name of variable
   - value
2018-04-25 14:13:12 +02:00
Gaute Lindkvist
3a670d94a2 #2801 Fix Cotire build. 2018-04-25 14:13:12 +02:00
Magne Sjaastad
a0e4f71138 #2715 Add direct access to RigFemPartCollection from a GeoMechView 2018-04-25 12:45:58 +02:00
Magne Sjaastad
8383ee12cf #2715 Mohr Circle plot: Early exit if element type is not HEX8P 2018-04-25 12:45:58 +02:00
Magne Sjaastad
9856038524 #2715 Geo Mech : Show element type in Result Info 2018-04-25 12:45:58 +02:00
Magne Sjaastad
bc26fa697c #2715 Mohr Circle plot : Do as little as possible if not visible 2018-04-25 12:45:58 +02:00
Magne Sjaastad
fdcf9f3ba4 #2715 Mohr Circle plot : Hide dock widet by default 2018-04-25 12:45:58 +02:00
Jacob Støren
e86c39b189 #2774 Import Ensemble: Ask for name before importing cases 2018-04-25 12:01:26 +02:00
Jacob Støren
54b21a8a49 Rename of static recursive search dialog method 2018-04-25 11:25:29 +02:00
Jacob Støren
4a7f54689e #2799 Origin Summary Cases: Fix option order in preference dialog 2018-04-25 11:21:30 +02:00
Jacob Støren
cee99af324 #2768 Improved progress feedback in FileHierarchy dialog 2018-04-25 10:17:41 +02:00
Jacob Støren
9f43da2d10 #2768 Fix missing matches when root + path filter ends with an exact dir-name 2018-04-25 10:17:41 +02:00
Jacob Støren
87ccdd06af #2768 First shot on faster search regime. Some issues left 2018-04-25 10:17:41 +02:00
Gaute Lindkvist
a7c72b549b #2790 Progress bar when importing summary cases. 2018-04-25 09:26:12 +02:00
Gaute Lindkvist
c5e4bf93a6 Summary Case Import cleanup (#2795) 2018-04-25 09:25:35 +02:00
Gaute Lindkvist
e953d6800c #2795 Summary Case Import: When importing grids keep going even if summary file import fails. 2018-04-24 15:55:51 +02:00
Gaute Lindkvist
f456911c80 #2794 Summary Case Import: Improve error reporting.
* When an error is found with one summary case file, continue importing all the files that worked.
* Report an error in the log window and a message box afterwards about the case that failed.
* Fix crash when loading .EGRID file without a summary case.
2018-04-24 14:19:08 +02:00
Magne Sjaastad
b6aa35bf11 #2793 RegTest, Fault visibility : Add translation code for older project files 2018-04-24 12:56:28 +02:00
Magne Sjaastad
9ac3d806e2 #2663 Rename 2018-04-23 23:06:21 +02:00
Magne Sjaastad
a9b1883dc8 #2663 Zoom All : Check if completions intersects bounding box of model 2018-04-23 22:52:44 +02:00
Jacob Støren
54c7932806 Fix crashes when reading an odb file fails due to corruption 2018-04-23 16:35:19 +02:00
Gaute Lindkvist
51fb8a6935 #2787 Import summary case does not work on linux
* Make sure summary files are added to class member in getFilesToImportUsingPrefs.
* The code used to return a vector of summary files, now just a boolean and the files
   are meant to be added to the vector for later retrieval.
2018-04-23 14:50:12 +02:00
Gaute Lindkvist
765b170efd 3d Well Log Curves (#2784): call createDisplayModelAndRedraw...() when adding LAS and RFT curves.
* Causes the parts to be created and added to the model.
* This is already done when adding extraction curves.
2018-04-23 11:35:55 +02:00
Gaute Lindkvist
c5e58df751 3d Well Log Curves (#2783): Enable picking with the track background switched off.
* Add part to the model, but set the color mask false, depth test/write off.
* Result is an invisible part that is present for picking.
2018-04-23 11:35:55 +02:00
Jacob Støren
9d406fef8a Fix crash in summary plot due to missing guarding in ensemble legend layout 2018-04-23 11:07:15 +02:00
Jacob Støren
851e68ac31 #2663 Code adjustment to avoid creating a geometry generator when not needed 2018-04-23 10:31:07 +02:00
Jacob Støren
f507a35c8f #2785 Fix crash detected by regression test. 2018-04-23 10:31:07 +02:00
Gaute Lindkvist
803b6b8179 3D Well Log Curves(#2676): Enable pick selection of the 3D Tracks and curves 2018-04-23 08:01:32 +02:00
Jacob Støren
e2d5dd0381 #2657 Improved ensemble curve set legend placement and update 2018-04-20 19:57:40 +02:00
Jacob Støren
22a1448ea6 Fix gcc 6 linux errors 2018-04-20 19:38:21 +02:00
Jacob Støren
c2704727ce #2657 Made a sensible stable default layout 2018-04-20 19:30:12 +02:00
Jacob Støren
977fe0fb96 #2657 Make ensemble curve set legends appear in snapshot images 2018-04-20 18:37:27 +02:00
Jacob Støren
48814e33c4 #2775 Add progress when loading summary cases 2018-04-20 18:36:29 +02:00
Jacob Støren
4d1595681a #2657 Add title to legend, and hide the legend when ensemble curve set are not visible 2018-04-20 18:34:36 +02:00
Jacob Støren
72fc66f827 #2657 Better initial position of Ensemble curve color legend. Use preferred size 2018-04-20 16:59:10 +02:00
Jacob Støren
3957027b4b #2657 Final cleanup and refactoring of legends size system 2018-04-20 16:59:10 +02:00
Jacob Støren
03ec76c20a #2657 Add a preferredSize method to the legends 2018-04-20 16:59:10 +02:00
Jacob Støren
1f8d4437bf Remove the unused, unnecessary "position" from several methods and the overlay layout struct 2018-04-20 16:59:10 +02:00
Bjørn Erik Jensen
b102b3025a #2689 Ensemble curves. Hide legend when toggling off legend tree node 2018-04-20 15:49:13 +02:00
Magne Sjaastad
1ff149c668 #2580 Export Completion Data : Add command in File/Export menu 2018-04-20 15:08:25 +02:00
Bjørn Erik Jensen
8a02fc3095 #2771 Ensemble curves. Add 'Add curve set' command to more tree nodes. Hide curve set collection when empty 2018-04-20 14:59:21 +02:00
Bjørn Erik Jensen
8bcec23390 #2689 Ensemble curves. Set default ensemble parameter 2018-04-20 14:59:20 +02:00
Magne Sjaastad
ac10c4b9ac #2770 : Never compute completion type for simulation well fractures 2018-04-20 14:22:55 +02:00
Magne Sjaastad
98e95fe5bf #2770 Fracture : Trigger recompute when well collection is toggeled 2018-04-20 14:22:55 +02:00
Magne Sjaastad
4eec46cbdc #2770 Fracture : Extract startTimer() 2018-04-20 14:22:55 +02:00
Magne Sjaastad
95151193e9 #2770 Fracture : Only evaluate visibble geometry for completion types 2018-04-20 14:22:55 +02:00
Magne Sjaastad
69630211ca #2770 Fracture : Recompute completion type when required 2018-04-20 14:22:55 +02:00
Bjørn Erik Jensen
68b360a03f #2769 Ensemble curves. Fix crash when clicking on ensemble curve 2018-04-20 12:30:59 +02:00
Bjørn Erik Jensen
b4fae86aea #2689 Ensemble curves. Hide vector selection button 2018-04-20 11:33:45 +02:00
Bjørn Erik Jensen
27ba7c5d9d #2689 Ensemble curves. Adapt legend range settings to curve set 2018-04-20 11:28:28 +02:00
Bjørn Erik Jensen
6c45725b19 #2689 ensemble curves. Make the curve set legend work. Cache summary addresses for performance reasons 2018-04-20 10:17:26 +02:00
Magne Sjaastad
9550864c9e #2711 Project File : Use forward slash for project file path in XML 2018-04-20 10:07:00 +02:00
Bjørn Erik Jensen
c3ae45e748 #2766 Bugfix. Import egrid files even though there are no associated summary files 2018-04-20 08:28:04 +02:00
Magne Sjaastad
9e40ba39c8 #2684 Well CF Visualization: Option to turn off CF visualization on closed connections 2018-04-19 22:28:22 +02:00
Magne Sjaastad
e6781e2de4 #2683 Well CF Visualization: Refactor computation of connection factor location 2018-04-19 21:49:01 +02:00
Magne Sjaastad
f365dae014 #2683 Well CF Visualization: Add missing null pointer test 2018-04-19 20:29:24 +02:00
Magne Sjaastad
7156779e3d Rename 2018-04-19 20:20:57 +02:00
Magne Sjaastad
c16c10e774 #2683 Well CF Visualization: Show connection factors on closed connections 2018-04-19 20:18:15 +02:00
Magne Sjaastad
7676ba4f20 #2683 Refactoring : Use range based for and rename 2018-04-19 16:20:43 +02:00
Magne Sjaastad
39cb9326e4 #2683 Well CF Visualization: Sim Well pipe color should be gray for closed existing connections 2018-04-19 16:13:18 +02:00
Magne Sjaastad
d5bdd1f7a1 #2765 Completions : Use max available diameter when combining multiple completions in same cell 2018-04-19 14:55:14 +02:00
Bjørn Erik Jensen
e5570441f6 #2751 Rename ensamble to ensemble 2018-04-19 14:00:18 +02:00
Magne Sjaastad
6ff50f3bca #2762 System : Use infinity() instead of HUGE_VAL (gcc6 fix) 2018-04-19 13:55:22 +02:00
Magne Sjaastad
fd0228ee01 System : Use numeric_limits::infinity instead of HUGE_VALF 2018-04-19 13:55:22 +02:00
Magne Sjaastad
2a840bae76 System : Use numeric_limits::max instead of INT_MAX 2018-04-19 13:55:22 +02:00
Gaute Lindkvist
53d5c809ac 3D Well Log Curves (#2764): Rim3dWellLogFileCurve does not react to draw plane changes 2018-04-19 13:53:57 +02:00
Gaute Lindkvist
bf5d95d873 3D Well Log Curves (#2672): Max and min value control for each curve. 2018-04-19 13:43:12 +02:00
Gaute Lindkvist
5d89ad3a6d 3D Well Log Curves (#2674): Show what the value axis direction is 2018-04-19 13:43:12 +02:00
Gaute Lindkvist
4dc9d1ba8a 3D Well Log Curve (#2747): Add "Add new curve" command to 3D track and other curves. 2018-04-19 13:43:12 +02:00
Bjørn Erik Jensen
32fb519073 #2754 Fix ensemble import workflow 2018-04-19 13:38:07 +02:00
Bjørn Erik Jensen
b3ee1c1f9b #2755 Fix import dialog path filter matching 2018-04-19 12:03:50 +02:00
Jacob Støren
bc05621812 Fix assert in Ensemble Curveset destructor 2018-04-19 09:24:36 +02:00
Jacob Støren
02049abe78 Fix crash and typo and set stat Ensemble index to 1 2018-04-19 09:18:09 +02:00
Magne Sjaastad
dcde9ccf72 #2727 Legends : Move enum to RimLegendConfig 2018-04-19 08:42:49 +02:00
Magne Sjaastad
cdbfed9f36 Legends : Changed to private functions, added override, other cleanup 2018-04-19 08:37:41 +02:00
Bjørn Erik Jensen
22d3e59570 #2610 Cleanup RimEnsambleCurveSet class 2018-04-19 08:30:24 +02:00
Bjørn Erik Jensen
fff5ee4ea1 #2691 Complete curve set vector selection from the property panel 2018-04-19 08:30:24 +02:00
Magne Sjaastad
305fdfcfc8 Remove unused variables and functions 2018-04-19 07:19:29 +02:00
Jacob Støren
53a6e0e502 #2657 WIP: Add movable widget with color legend for ensemble curve sets to summary plot 2018-04-18 15:59:18 +02:00
Bjørn Erik Jensen
e468227dfe Fix Linux warning 2018-04-18 14:13:37 +02:00
Bjørn Erik Jensen
3ce2bfd67c #2687 #2750 Add import ensamble command. Add import summary cases commands to plot tree nodes 2018-04-18 13:56:37 +02:00
Gaute Lindkvist
916fb59bee 3D Well Log Curves (#2673): Simplify draw plane text
* Above, Below, Left, Right, Vertical, Horizontal
2018-04-18 11:33:04 +02:00
Gaute Lindkvist
01a1f660e7 3D Well Log Curves (#2746): Handle set scale.
* Transform to display coordinates *before* calculating normals and generating curves.
2018-04-18 11:33:04 +02:00
Gaute Lindkvist
3303350193 Rename member variable in RivWellPathsPartManager to get rid of spelling error. 2018-04-18 11:33:04 +02:00
Magne Sjaastad
978a74a1fe #2727 Legends : Remove obsolete functions 2018-04-18 10:43:01 +02:00
Magne Sjaastad
71b7bd21f9 #2727 Legends : Add RimLegendConfig as base for Regular and Ternary 2018-04-18 10:36:33 +02:00
Magne Sjaastad
3bc85ce794 #2727 Legends : Rename to RimRegularLegendConfig 2018-04-18 10:10:39 +02:00
Gaute Lindkvist
d7204363a0 3D Well Log Curves (#2673): Consolidate the draw plane position control. 2018-04-18 08:38:15 +02:00
Gaute Lindkvist
56dd1b3eb9 Legends (#2749): Clean up enable/showLegend option
* Make public field private ...
* Make the option invisible from within the property panel.
2018-04-18 08:37:30 +02:00
Bjørn Erik Jensen
c3e9a39532 #2688 Set different curves color for each curve set 2018-04-18 08:32:48 +02:00
Magne Sjaastad
2452c965ab #2728 Well CF Visualization: Contributions in same cell are not added 2018-04-17 16:01:29 +02:00
Magne Sjaastad
f3a235b9df #2748 Completion Type Calculations : Remove unused code 2018-04-17 14:42:15 +02:00
Magne Sjaastad
ba3074ff08 #2748 Completion Type Calculations : Use findIntersectedGlobalCellIndices 2018-04-17 14:42:15 +02:00
Magne Sjaastad
7a2979ca56 Always show all completion type categories in Property Filter
Revert change introduced in 0f696b81
2018-04-17 14:42:15 +02:00
Gaute Lindkvist
9da3f09782 3D Well Log Curves (#2668): Implement Draw-plane width control
* Apply a factor between 0.25 and 2.5 times the characteristic cell size
* Make the offset from the pipe scale with the plane width up to a maximum offset.
* Organise the CurveCollection settings into two groups.
2018-04-17 13:44:03 +02:00
Gaute Lindkvist
36b1dcf85f 3D Well Log Curves(#2678): Remove camera aligned draw plane 2018-04-17 13:44:03 +02:00
Gaute Lindkvist
290d58e7fd 3D Well Log Curves(#2678): Remove curve drawing options that aren't yet implemented.
* drawing style (i.e. filled)
* coloring style (i.e. color by curve value)
2018-04-17 13:44:03 +02:00
Gaute Lindkvist
1180c199b4 3D Well Log Curves (#2669): Implement control of single color.
* Set a cycled default whenever a curve is added to a collection.
2018-04-17 13:44:03 +02:00
Gaute Lindkvist
501e80b1ad 3D Well Log Curves(#2671): Make curve draw plane background optional 2018-04-17 13:44:03 +02:00
Gaute Lindkvist
092624799e 3D Well Log Curves: Renaming of the term normals in curve/grid-generation
* Make it more obvious we are talking about the normals to the 3D well log curve.
2018-04-17 13:44:03 +02:00
Gaute Lindkvist
5e6613d428 3D Well Log Curves (#2671): Apply white background to curve draw plane. 2018-04-17 13:44:02 +02:00
Bjørn Erik Jensen
54097b7cc0 #2722 Show axis for ensamble curves as well 2018-04-17 11:56:39 +02:00
Bjørn Erik Jensen
7afa753d11 #2714 Display a warning in origin summary import dialog when ecllib may fail to read origin files 2018-04-17 11:01:45 +02:00
Bjørn Erik Jensen
a8fb4469b4 Fix a bug in commonRootPath logic 2018-04-17 11:01:45 +02:00
Magne Sjaastad
c0704a65f3 #2744 Well Log Extractor : Replace use of cornerIndices with cellCornerVertices 2018-04-17 10:14:57 +02:00
Magne Sjaastad
34cbd79410 #2744 Well Log Extractor : Support detection of small well path inside one cell 2018-04-17 09:41:08 +02:00
Magne Sjaastad
4fc6da2c76 #2744 Well Log Extractor : Add failing test for well path inside one cell 2018-04-17 09:35:04 +02:00
Magne Sjaastad
43e5fb00f4 Testing : Fix invalid index in small mock model 2018-04-17 07:55:52 +02:00
Jacob Støren
5769ba45f1 #2739 Normal intersection box mesh lines now not labled as fault mesh lines 2018-04-17 07:42:41 +02:00
Jacob Støren
1da9501bcc #2742 Hide the Show Points toggle when not needed 2018-04-16 15:14:07 +02:00
Bjørn Erik Jensen
0fcc0bea4c 2743 Origin summary import dialog adjustments 2018-04-16 14:11:31 +02:00
Bjørn Erik Jensen
e5e9692eb5 #2710, #2719 Restart preference and dialog adjustments. And some bugfixes 2018-04-13 15:47:43 +02:00
Bjørn Erik Jensen
9f40679f22 #2555 Bugfix 2018-04-13 15:47:43 +02:00
Bjørn Erik Jensen
d7e7c4a463 #2720, #2686, #2701 Origin summary and grid cases import enhancements 2018-04-13 15:47:42 +02:00
Gaute Lindkvist
edf23b5265 Remove epsilon guard in setAutomaticRanges for RimLegendConfig. 2018-04-13 15:33:37 +02:00
Gaute Lindkvist
4c5b90f363 Add get methods for drawStyle and coloringStyle for Rim3dWellLogCurve 2018-04-13 15:33:37 +02:00
Gaute Lindkvist
fd63ae7531 3D Well path plots: clean up some indentation and remove an unnecessary epsilon 2018-04-13 15:33:37 +02:00
Gaute Lindkvist
b48adbbaa9 3D Well log curves: Use the new generalized interpolation for normals
* Don't have to perform the normal generation again for grid points.
2018-04-13 14:56:19 +02:00
Gaute Lindkvist
1bb1b3004e Generalize the interpolation in RigWellPath
* Make it possible to interpolate any vector along the well path,
  not just the well path points. This way it can be used for normals.
* The interpolation line needs to be a weighted sum of vectors from
  the two closest points rather than the previous point + a segment,
  which only works for points.
* If used for normals, the end result *has to be normalized*
2018-04-13 14:56:18 +02:00
Gaute Lindkvist
e8b006d068 3D Well Log Curves (#2671): Split normals, border and surface into several drawables.
* Also create a closed LINES_LOOP out of the mesh border.
  * This will facilitate using different effects on the different parts.
    i.e. solid border and white surface background.
2018-04-13 14:55:44 +02:00
Gaute Lindkvist
6e0b7e2305 Improve 3D Well path plots
* Always generate in up-direction and rotate to left/right/down
* Generate a "dominant direction" by interrogating the whole curve, not
  just the first and last item.
* Improve maths:
  - Generate a projection plane spanned by UP and the dominant direction.
  - Project the tangent onto this projection plane.
  - Generate normal as the cross product between the projected tangent and
    the normal to the projection plane.
  - Rotate the normal into left/right/down if required.
2018-04-13 14:55:44 +02:00
Magne Sjaastad
12fcb124c7 #2697 #2700 #2697 Export Completions
Rename to RicfExportSimWellFractureCompletions
Add missing parameters to RicfExportWellPathCompletions
Add support for individual export multiple completion types into separate sections of same file
2018-04-13 12:13:27 +02:00
Magne Sjaastad
dfa87b218f #2737 Command File Launcher : Add command for launching command file from UI 2018-04-13 12:04:43 +02:00
Magne Sjaastad
1d3bc6887e #2709 Export of COMPDAT : Always export diameter 2018-04-13 12:04:23 +02:00
Jacob Støren
0bf6db50f9 Fix crash due to empty fault label parts 2018-04-13 11:30:01 +02:00
Jacob Støren
c784deae25 #2437 Add fault-labels to 2d Intersection view 2018-04-10 15:35:37 +02:00
Bjørn Erik Jensen
3f429ccfd7 #2555 Add canonicalPath method to improve path handling 2018-04-10 13:11:59 +02:00
Bjørn Erik Jensen
5cc3af4586 #2555 Summary cases. Convert paths to have internal separators ('/') 2018-04-10 13:11:58 +02:00
Bjørn Erik Jensen
951e0f7aa0 #2555 Detect restart file reference looping. Break out if loop is detected 2018-04-10 13:11:58 +02:00
Gaute Lindkvist
2cc93fb09d 3D Well Log Curves: Command to Delete curve #2667
* Add delete command with explicit delete feature class.
2018-04-10 10:57:04 +02:00
Jacob Støren
fee549de35 Adjust an argument order in RigWellPathGeometryTools 2018-04-09 13:23:09 +02:00
Bjørn Erik Jensen
ee9e9b2989 #2685 Origin summary. Split preferences settings into two fields 2018-04-09 13:22:05 +02:00
Gaute Lindkvist
3116a4a223 Shifted pure virtual updateLegends to RiuViewerToViewInterface 2018-04-09 13:14:19 +02:00
Gaute Lindkvist
b6fb60115a Refactored after review 2018-04-09 13:14:19 +02:00