Commit Graph

3677 Commits

Author SHA1 Message Date
Magne Sjaastad
4f4a12b636 #2868 Completion Type : Rename 2018-05-09 11:48:37 +02:00
Magne Sjaastad
e820bd44c7 #2868 Completion Type : Remove obsolete code 2018-05-09 11:48:37 +02:00
Magne Sjaastad
a986f3a4d2 #2868 Completion Type : Simplify update code paths 2018-05-09 11:48:37 +02:00
Magne Sjaastad
9bb8f36052 #2868 Completion Type : Compute completion type based on virtual connection factors 2018-05-09 11:48:37 +02:00
Gaute Lindkvist
f24fb4aaec Fix crash due to global/local grid index mixup when creating fractures on SimWellPaths.
* Introduces a convenience method on the main grid
* Also converts some callers to use the convenience method.
2018-05-09 10:44:29 +02:00
Jacob Støren
43082b4952 #2871 Fault visibility toggle now controls fault label visibility in 2D intersection views also. 2018-05-08 16:26:15 +02:00
Bjørn Erik Jensen
9a5f3fb47e Fix Linux build warning 2018-05-08 15:57:34 +02:00
Bjørn Erik Jensen
98daab46a3 #2819 Ensemble curves. Distinguish between summary case group and ensemble 2018-05-08 15:22:38 +02:00
Bjørn Erik Jensen
763d25040e #2840 Ensemble curve. Copy/paste og curve sets 2018-05-08 10:17:18 +02:00
Gaute Lindkvist
043eaf7db6 Make new vertex creation more robust
* Require that the length of the new segment is shorter than the *current*
  distance to the end of the original segment, rather than the length of the
  complete original segment.
2018-05-08 09:09:36 +02:00
Jacob Støren
20a1e52323 #2850 Fix missing fault-label toggle and color setting awareness in 2D intersection view 2018-05-07 18:06:09 +02:00
Jacob Støren
b6979f32c6 #2808 Add Icon for well CF's 2018-05-07 15:56:23 +02:00
Gaute Lindkvist
c7bf6172f3 #2828 Allow setting curve domain range outside the range of the curve values.
* Note that this implementation simply removes vertices that are outside the range.
* It would look far better to insert vertices at the boundary when a segment is heading
   out of range. This is more complicated.
2018-05-07 14:47:24 +02:00
Magne Sjaastad
d8afe5740b #2803 Ensemble Cases Performance : Use one function to load summary data 2018-05-07 13:14:43 +02:00
Magne Sjaastad
dfa0d15844 #2803 Ensemble Cases Performance : Use loadAllSummaryCaseData() 2018-05-07 12:57:12 +02:00
Jacob Støren
c150f3e578 #2853 Add a specific ensembles icon. Use Cases icon for recursive import 2018-05-07 12:29:06 +02:00
Jacob Støren
c4c0d46692 #2857, #2861, #2853, #2862 Icon improvements: Use new Summary plot icon in combined icons, Observed Data icons, Octave Script icon improvements, Summary Case Group icon 2018-05-07 12:29:06 +02:00
Bjørn Erik Jensen
f71bdda4fb #2856 Menus. Restructure context menu 2018-05-07 12:24:52 +02:00
Gaute Lindkvist
78326bb19c #2703 An initial implementation of filled drawing style with problems remaining.
* New vertices are successfully created in the intersections between the
  curve and draw surface triangles
* New vertices are also inserted along the bottom edge of the filled curve.
* However, new vertices will still need to be inserted in the lines connecting the
  top of the curve and the bottom where they intersect with the triangles.
* The option for filled curves remain hidden in the GUI. See #2860.

# Please enter the commit message for your changes. Lines starting
2018-05-07 11:14:25 +02:00
Bjørn Erik Jensen
7903a62cc5 #2818 Summary. Add new-plot-commands to context menus 2018-05-07 09:46:45 +02:00
Jacob Støren
9885c9d2d7 #2809, #2858, #2859 Fix icon inconsistencies. Edd icons for ensemble curves and new icons for cross plot 2018-05-06 10:09:39 +02:00
Jacob Støren
4108c72680 Corrected spelling of ensemble 2018-05-06 10:09:39 +02:00
Magne Sjaastad
55796623b5 #2855 Tensor Calculations : Do nothing if tensor is unchecked 2018-05-04 15:23:20 +02:00
Magne Sjaastad
a6b94f7e66 #2803 Ensemble Cases Performance: Show case count in UI 2018-05-04 13:53:47 +02:00
Bjørn Erik Jensen
25dc96fb3b #2721 Ensemble curves. Color ranges, cyclic color range assignment. Minor refactoring 2018-05-04 13:21:57 +02:00
Magne Sjaastad
4b6bd3d9fc #2845 Ensemble Curve Set Legend : Update ensemble legend item text
Use special symbol for curve color by parameter
2018-05-03 14:52:59 +02:00
Magne Sjaastad
c5cd8b2a4b Do not plot ensemble curve set legend 2018-05-03 14:46:04 +02:00
Magne Sjaastad
b21e6414f9 #2845 Ensemble Curve Set Legend : Add name 2018-05-03 14:46:04 +02:00
Gaute Lindkvist
a22f8ed032 Remove superfluous updateConnectedEditor for rim3dWellLogCurves.
* Already happens in resetMinMaxValuesAndUpdateUI
2018-05-03 13:39:39 +02:00
Gaute Lindkvist
f6cbf0f34f #2824 Geomech 3d Well Log Curves: update UI and 3d view when user changes settings 2018-05-03 13:39:39 +02:00
Bjørn Erik Jensen
58f99a848e #2802 Summary cases import. Display progress info during summary cases creation as well 2018-05-03 13:35:40 +02:00
Bjørn Erik Jensen
9150981e13 #2842 Ensemble curve set. Update referring curve sets when adding or removing cases from an ensemble 2018-05-03 12:05:28 +02:00
Bjørn Erik Jensen
6f275e0915 #2844 Ensemble curve set. Fix HUGE_VAL -> numerical_limits 2018-05-03 11:50:19 +02:00
Bjørn Erik Jensen
dd23fa2ead #2844 Ensemble curve set. Show only relevant color modes. Use gray curves for cases without emsemble params 2018-05-03 11:04:01 +02:00
Jacob Støren
8b6c226f5b #2843 Fix missing 2d intersection view name updates 2018-05-03 10:11:30 +02:00
Bjørn Erik Jensen
92fd4183a9 #2797 Ensemble curves. Support for text ensemble parameters. Unit test 2018-05-03 09:55:13 +02:00
Magne Sjaastad
483f19e5ca #2838 Ensemble Curve Name : Show curve name in parameter legend title 2018-05-02 15:14:20 +02:00
Magne Sjaastad
cff95a1880 #2838 Ensemble Curve Name : Hide Qwt legend if result legend is used 2018-05-02 15:14:20 +02:00
Magne Sjaastad
cfab910272 Remove unused code 2018-05-02 15:14:20 +02:00
Magne Sjaastad
95c11d0085 #2838 Ensemble Curve Name : Call updateConnectedEditors on RimSummaryPlot 2018-05-02 15:14:20 +02:00
Magne Sjaastad
b023bd02a3 #2838 Ensemble Curve Name : Improve logic for display of legend 2018-05-02 15:14:20 +02:00
Gaute Lindkvist
26975e3ce3 Fix unit tests by removing assert in RimWellLogCurveNameConfig 2018-05-02 14:22:49 +02:00
Gaute Lindkvist
a37957824a Clean up 3D well log generator code. Renamed Grid -> DrawSurface and fixed spelling. 2018-05-02 12:10:05 +02:00
Gaute Lindkvist
1f44ea1ea3 Make draw plane selection for curves be unrelated to 3d Track (somewhat related to #2825).
* Makes more sense user wise and makes for better code.
* Helps refactor code to relate grids to curves so the curves can have access to the grid
   it is being drawn on.
* This will help fix #2825 by being able to project curve points onto the exact triangle geometry.
2018-05-02 11:51:22 +02:00
Gaute Lindkvist
04f793c19d #2782 Auto name for 3d Well Log Curves 2018-05-02 10:22:36 +02:00
Magne Sjaastad
ccac7643b8 #2820 Legends : Support selection of legend items when clicking in 2D intersection view 2018-04-30 14:47:47 +02:00
Magne Sjaastad
c989d4eb0d Fix crash when picking on legends in 2D intersection view 2018-04-30 14:47:47 +02:00
Magne Sjaastad
9ba93c6385 #2820 Legends: Select tensors when clicking on tensor legend 2018-04-30 14:47:47 +02:00
Magne Sjaastad
0da7686cdb #2760 Ensemble Curves: Show one curve legend 2018-04-30 08:01:17 +02:00
Magne Sjaastad
1a0f242c0b #2780 Ensemble Curve Set : Improve plot title including ensembles 2018-04-30 08:01:17 +02:00
Magne Sjaastad
6bbe025467 Use emtyp() instead of size() 2018-04-27 14:08:12 +02:00
Magne Sjaastad
c0777e4950 #2780 Ensemble Curve Set : Use ensamble name as case name 2018-04-27 14:08:12 +02:00
Magne Sjaastad
67eedc0f46 Move implementation to source file and whitespace cleanup 2018-04-27 14:08:12 +02:00
Magne Sjaastad
44c3e2c602 #2780 Ensemble Curve Set : Add basic auto name of curve set 2018-04-27 14:08:12 +02:00
Magne Sjaastad
c831553cc2 #2816 Summary Curves : Hide legend in Qwt if only one curve is present 2018-04-27 14:08:12 +02:00
Magne Sjaastad
f1fbe4d8ac PlotCurve : Remove duplicate code 2018-04-27 11:58:22 +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
c267f32638 Rename to RiuPlotMainWindow 2018-04-27 06:28:08 +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
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
Magne Sjaastad
a0e4f71138 #2715 Add direct access to RigFemPartCollection from a GeoMechView 2018-04-25 12:45:58 +02:00
Gaute Lindkvist
c5e4bf93a6 Summary Case Import cleanup (#2795) 2018-04-25 09:25:35 +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
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
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
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
3957027b4b #2657 Final cleanup and refactoring of legends size system 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
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
9e40ba39c8 #2684 Well CF Visualization: Option to turn off CF visualization on closed connections 2018-04-19 22:28:22 +02:00
Magne Sjaastad
c16c10e774 #2683 Well CF Visualization: Show connection factors on closed connections 2018-04-19 20:18:15 +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
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
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
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
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
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
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
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
Bjørn Erik Jensen
54097b7cc0 #2722 Show axis for ensamble curves as well 2018-04-17 11:56:39 +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
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
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
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
Gaute Lindkvist
fe56375be6 Added toggle option for legends. 2018-04-09 13:14:19 +02:00
Gaute Lindkvist
38aa447dcd Unify the width of all visible legends.
* Calculate the minimum width to fit the content before the render pass.
  * Set the actual width of all the legends to the largest of the minimum widths.
  * This resizes the legends to always be the same size and reduces the size of you remove
     the widest legend.
2018-04-09 13:14:19 +02:00
Gaute Lindkvist
63ffade452 Set background and frame color from the view plus update frame margins. 2018-04-09 13:14:19 +02:00
Gaute Lindkvist
507229f84b Fixed background color setting for legends and refactored Legend class hierarchy
* Added a new cafTitledOverlayFrame as a base-class for all ResInsight legend classes
  * Inherits cvf::OverlayItem
2018-04-09 13:14:19 +02:00
Magne Sjaastad
f71563cb1e #2632 Export Completions : Add sub menus for export of completions 2018-04-09 11:36:01 +02:00
Magne Sjaastad
7f137a3e7c #2632 Export Completions : Add exportCompletionsForVisibleSimWells 2018-04-09 11:36:01 +02:00
Magne Sjaastad
4fb1a0385c #2632 Export Completions : Add exportCompletionsForVisibleWellPaths 2018-04-09 11:36:01 +02:00
Magne Sjaastad
e50e34feb4 #2632 Export Completions : Remove support for export of all well path completions 2018-04-09 11:36:01 +02:00
Bjørn Erik Jensen
e4ef9bd014 Fix cotire build errors 2018-04-09 10:08:50 +02:00
Bjørn Erik Jensen
8491fd7f6c #2610 Fix a few Linux build errors 2018-04-06 13:56:26 +02:00
Bjørn Erik Jensen
ba5480fa81 #2655, #2610 Add legend config to curve set. No connected to curves yet... 2018-04-06 11:58:06 +02:00
Bjørn Erik Jensen
21a81744f1 #2610 New command, display ensamble curves with single color 2018-04-06 11:58:06 +02:00
Bjørn Erik Jensen
43f1101f1f #2610 Add curve set and curve set collection classes 2018-04-06 11:58:06 +02:00
Bjørn Erik Jensen
f7f09c0719 #2610 Import case realization parameters and store those in summary case 2018-04-06 11:58:05 +02:00
Magne Sjaastad
c0054cff91 #2553 Well CF Visualization: Add recompute of virtual conn factors 2018-04-05 14:25:47 +02:00
Jacob Støren
f7bfe8d003 #2436 Separated Hide grid cells mode as a separate value. Make sure that all the possible drawstyles works as expected, both for 2D intersection view and 3D views. 2018-04-05 07:41:29 +02:00
Rebecca Cox
7024ee045c #2591 3D well log curve: Add option to place at the side of the well 2018-03-22 12:54:31 +01:00
Rebecca Cox
ef1cb3468b 3D well log curves: Code cleanup 2018-03-22 11:45:11 +01:00
Rebecca Cox
85cd8b0e1d 3D Well Log Curve: Give Plane Part Mgr more responsibility 2018-03-21 15:32:15 +01:00
Jacob Støren
dd29a3c727 #2634 Fix wrong MD when context menu creating completions in 2D intersectino View 2018-03-21 14:13:56 +01:00
Jacob Støren
25ff51c82b #2630 Fix wrong picked MD on clipped well paths 2018-03-21 13:56:24 +01:00
Jacob Støren
24955d0ddd #2630 convenince method to convert to utm coordiantes for intersectino points in 2d intersection view 2018-03-21 13:49:58 +01:00
Magne Sjaastad
0f696b81fe #2625 Completion Type Legend : Update property editor categories 2018-03-21 09:06:16 +01:00
Magne Sjaastad
8db8575d1e #2625 Completion Type Legend : Only show categories present in the model 2018-03-21 07:43:59 +01:00
Jacob Støren
c22bafbf29 #2605 Show perforations along well path in 2D intersections view 2018-03-20 17:28:27 +01:00
Jacob Støren
65b35cff92 #2481, #2605, #2486, #2568 Remove obsolete code 2018-03-20 15:44:45 +01:00
Jacob Støren
a9daea0938 #2481, #2605, #2486 Use a flattened version of the normal wellpath visualization in 2D intersection view 2018-03-20 15:44:45 +01:00