Commit Graph

514 Commits

Author SHA1 Message Date
Bjørn Erik Jensen
6d3659dfe6 #3067 Ensemble curve filter. Set default parameter at filter creation 2018-06-21 09:29:02 +02:00
Bjørn Erik Jensen
2eef989389 #3060 Resampled plot export. Implement dialog. Resample plot data according to spec from Equinor 2018-06-20 09:41:01 +02:00
Bjørn Erik Jensen
7e6943aa96 #3060 Resampled plot export. Prepare for resampling during summary plot export 2018-06-19 15:44:27 +02:00
Bjørn Erik Jensen
ef2f8087dc #3056 Ensemble curve filters. Fix default min/max values and set field default 2018-06-19 10:05:00 +02:00
Bjørn Erik Jensen
81ae384e19 #2659 Ensemble statistics. Set default field values 2018-06-19 09:24:31 +02:00
Magne Sjaastad
174538bb92 #3052 Summary Plot : Make name helper class more robust 2018-06-18 21:58:32 +02:00
Bjørn Erik Jensen
bc28b4b8f1 #3056 Ensemble curve filters. Add new filter button. Fix delete filter bug, use internal garbage collector to achieve delayed object delete 2018-06-18 15:19:41 +02:00
Bjørn Erik Jensen
ef5ef6d9ca Ensemble curve filter collection. Privatized some methods 2018-06-18 12:57:07 +02:00
Bjørn Erik Jensen
65de617935 #3056 Ensemble curve filters. Add dynamic groups for filtering 2018-06-18 12:01:01 +02:00
Bjørn Erik Jensen
9f1e4fa721 #2659 Ensemble statistics. Do not set statistic curves color when updating ensemble curve color 2018-06-15 16:21:32 +02:00
Bjørn Erik Jensen
12d01a7a10 #2659 Ensemble statistics. Do not create statistic curves when no ensemble is selected 2018-06-15 16:03:56 +02:00
Bjørn Erik Jensen
ee195e909b #2659 Ensemble statistics. Disable statistic curves if not possible to calculate percentile 2018-06-15 14:27:14 +02:00
Bjørn Erik Jensen
9cf4938651 #2659 Ensemble statistics. Do not show statistic curves in curve creator 2018-06-15 10:54:30 +02:00
Bjørn Erik Jensen
1abea45d45 #2659 Ensemble statistics. Support for setting curve color. Group check boxes 2018-06-15 09:06:44 +02:00
Bjørn Erik Jensen
06749a20e0 #2659 Ensemble statistics. New percentiles calculation algorithm 2018-06-14 15:36:19 +02:00
Bjørn Erik Jensen
b5ad3681cc #2659 Ensemble statistics. Add labels to symbols on the statistic curves 2018-06-14 14:10:51 +02:00
Bjørn Erik Jensen
a5f69a59d0 Ensemble statistics. Fix unit tests and some warnings on Linux 2018-06-14 11:01:49 +02:00
Bjørn Erik Jensen
114c746342 Ensemble curve set. Speed up calculate value options 2018-06-14 10:18:40 +02:00
Bjørn Erik Jensen
9c06df11d5 #2659 Ensemble statistics. New and more precise way to calculate statistics 2018-06-14 08:37:56 +02:00
Bjørn Erik Jensen
2eee3f770b #2659 Ensemble statistics. Small fixes 2018-06-13 13:35:33 +02:00
Bjørn Erik Jensen
7b462616bf #2659 Ensemble statistics. Do not update curve appearance for statistic curves 2018-06-13 10:23:56 +02:00
Bjørn Erik Jensen
661ce06553 #3030 Ensemble curve filter. Move filters to table in property editor 2018-06-13 09:06:34 +02:00
Bjørn Erik Jensen
4491b1de63 #2659 Ensemble statistics. Use resampling during statistics calculations 2018-06-12 14:22:32 +02:00
Bjørn Erik Jensen
eebd8bef2d Move RigCurveDataTools and RigTimeHistoryCurveMerger to Application/Tools plus rename 2018-06-08 15:10:45 +02:00
Bjørn Erik Jensen
14cf6470f0 #2660 Ensemble filtering. Fix sliders and labels 2018-06-08 10:45:31 +02:00
Bjørn Erik Jensen
7cd371c1f8 #2659 Ensemble statistics. Fix plot editor issues 2018-06-08 08:43:24 +02:00
Bjørn Erik Jensen
cb6657266a #2659 Ensemble statistics. Move classes to separate files 2018-06-07 10:50:32 +02:00
Bjørn Erik Jensen
69accdc4c6 #2659 Ensemble statistics. First version 2018-06-07 10:04:16 +02:00
Magne Sjaastad
8b3d4b0fc4 Ensemble Curves : Do not update plot for every curve update 2018-06-04 08:11:45 +02:00
Magne Sjaastad
e4003b611d Fix linux build 2018-06-01 16:38:19 +02:00
Bjørn Erik Jensen
3aa7204191 #2660 Ensemble curves filtering. Refactoring 2018-06-01 15:43:58 +02:00
Magne Sjaastad
ea7c5b6a76 #2975 Ensemble Curve Set: Add compound update function updateAll() 2018-06-01 15:37:47 +02:00
Bjørn Erik Jensen
d52229aa65 #3000 Ensemble plot. Make curve attachment more robuts 2018-05-31 13:45:33 +02:00
Bjørn Erik Jensen
92ccf64571 #3000 Ensemble plot. Fix duplicate plot legend items 2018-05-31 13:29:52 +02:00
Bjørn Erik Jensen
0b4156da02 #2660 Ensemble curves. Curve filtering 2018-05-31 10:24:16 +02:00
Bjørn Erik Jensen
0b42c4730d #2994 Summary plot. Use symbols and no line as default style for observed data curves 2018-05-28 14:25:45 +02:00
Bjørn Erik Jensen
10b3d0f6db #2776 Error bars. Moved eclipse address parsing to RifEclipseSummaryAddress class 2018-05-28 11:20:20 +02:00
Bjørn Erik Jensen
312d302848 #2778 Error bars. Move error bars checkbox 2018-05-25 15:36:57 +02:00
Bjørn Erik Jensen
403e1759f9 #2778 Observed error bars. Display error bars in the same color as data points 2018-05-25 11:28:55 +02:00
Gaute Lindkvist
743993718c #2873 New AsyncPointerVectorDeleter-classes to handle memory deletion in separate thread. 2018-05-23 14:38:25 +02:00
Bjørn Erik Jensen
22c71b60dd #1776 CVS data parser. Made parsing more generic. Handle error result columns 2018-05-23 12:33:26 +02:00
Gaute Lindkvist
772e7ec7e6 Revert "#2873 Delegate deletion of summary cases to separate thread."
This reverts commit 0089e0c218.

Didn't intend this to go into dev now
2018-05-22 09:22:12 +02:00
Gaute Lindkvist
0089e0c218 #2873 Delegate deletion of summary cases to separate thread. 2018-05-22 09:21:40 +02:00
Bjørn Erik Jensen
2c2a2c6102 Fix Linux build warning 2018-05-18 10:44:21 +02:00
Gaute Lindkvist
461d22b2b5 #1908 Stop creating new summary cases when opening a project file. 2018-05-15 16:20:25 +02:00
Gaute Lindkvist
d1a706de55 #2913 Make sure only one grid summary case is created per egrid loaded.
* If you open two of the same eclipse case, you will still have two grid summary cases
* But if you open multiple summary cases of the same eclipse case the additional summary cases are file summary cases.
2018-05-15 16:12:12 +02:00
Gaute Lindkvist
0c9470fdf0 #2913 Improve coupling between egrid and summary cases
* Convert RimGridSummaryCase to RimFileSummaryCase when closing grid.
2018-05-15 15:43:21 +02:00
Magne Sjaastad
e355651b99 #2919 Summary Plot Title : Always show "Composed Plot" for curve combinations 2018-05-15 14:39:05 +02:00
Jacob Støren
1b5c1b5e56 #2917 Add method to retreive union of possible summary addresses from ensemble 2018-05-15 14:26:28 +02:00
Magne Sjaastad
3effc4ca66 #2918 Summary Plot Title : Make sure title and curve names are stable when deselecting ensemble curve 2018-05-15 13:58:39 +02:00
Bjørn Erik Jensen
ea50722cdd #2911 Ensemble curves. Fix disappearing right axis 2018-05-15 12:10:57 +02:00
Gaute Lindkvist
76f8b9ac90 #1909 Fix assertation failure in RimSummaryCurveAppearanceCalculator 2018-05-15 11:31:23 +02:00
Magne Sjaastad
19125396a1 #955 Toolbar Button State : Mark calculator button as disabled if no case is open 2018-05-15 10:41:27 +02:00
Magne Sjaastad
225aa34775 #2915 Summary Preview Plot : Register cross plot as MDI window 2018-05-15 10:17:12 +02:00
Bjørn Erik Jensen
6edd240c4c #2912 Ensemble curves. Fixes regarding summary curve definitions 2018-05-15 10:12:04 +02:00
Gaute Lindkvist
77dd3cbc43 #2690 Update all summary curves, not just visible when changing the vector for the whole collection
* Also make sure the curve names take into account all curves in the project tree and in the legend text.
* Make sure plot name is updated when a curve is deleted.
2018-05-15 08:43:50 +02:00
Magne Sjaastad
ca2a46a588 #2915 Summary Preview Plot : Do not add to MDI aread to avoid ghost MDI window 2018-05-14 20:48:44 +02:00
Jacob Støren
f31bef92c1 #2910 Summary Groups: Set default group name to "Group" 2018-05-14 10:20:27 +02:00
Bjørn Erik Jensen
dc319646b2 #2658 Ensemble curves. Fix curve set coloring. Minor fixes.Some ClangFormat auto-changes 2018-05-14 09:51:24 +02:00
Magne Sjaastad
17226dabbc #2908 Ensemble Curve Sets: Use legend icon for colorlegend-using icon in the normal curve legend 2018-05-14 09:20:47 +02:00
Magne Sjaastad
f22dcf0872 #2903 Plot Name and Legend Text : Update text when color mode changes 2018-05-11 22:23:06 +02:00
Magne Sjaastad
078191610c #2903 Plot Name and Legend Text : Fix update of ensembles from curve creator 2018-05-11 20:21:44 +02:00
Magne Sjaastad
2cb123474b Use const reference and use empty() 2018-05-11 19:49:47 +02:00
Magne Sjaastad
4bd7b1eeb6 #2903 Plot Name and Legend Text : Add updateAllTextInPlot 2018-05-11 19:44:01 +02:00
Magne Sjaastad
4c1bcf9613 #2903 Plot Name and Legend Text : Update all plot text when curve changes 2018-05-11 19:29:03 +02:00
Magne Sjaastad
f75995e933 #2903 Plot Name and Legend Text : Rebuild legends if ensemble is toggled 2018-05-11 18:05:03 +02:00
Bjørn Erik Jensen
38540a0a39 #2904 Curve creator. .Fix initial curve visibility 2018-05-11 15:43:12 +02:00
Magne Sjaastad
b24b93eba3 Fix signed / unsigned compare 2018-05-11 14:32:31 +02:00
Gaute Lindkvist
f0be8214b0 #2448 Summary plot: Retain auto zoom for axes you haven't modified the range for. 2018-05-11 14:03:26 +02:00
Bjørn Erik Jensen
450d1177f6 #2898 Ensemble curves. Add vector selection button and dialog 2018-05-11 13:25:01 +02:00
Magne Sjaastad
ff9fbe95b8 #2893 RimSummaryCaseCollection : Use basic name without count as edit name
Use proxy field with item count when we have a solution for one display field handle and one edit field handle
2018-05-11 12:46:29 +02:00
Bjørn Erik Jensen
fcea3ec40f #2658 Curve creator. Update curve tree view to display ensembles as well 2018-05-11 12:35:09 +02:00
Magne Sjaastad
9b16d55ddf #2892 RimSummaryCaseCollection : Hide display text field 2018-05-11 12:26:33 +02:00
Jacob Støren
ca30c58a77 Cleanup in EnsembleColormanager 2018-05-11 09:24:42 +02:00
Jacob Støren
bb033eb561 #2883, #2890 Fix color assignment and stability for ensemble curve sets 2018-05-11 08:04:09 +02:00
Bjørn Erik Jensen
6270dd3bc9 #2692 Ensemble curves. Add ensemble selection support to curve editor 2018-05-10 21:30:14 +02:00
Magne Sjaastad
9560e23b66 #2888 Auto Title : Crash when single summary case is nullptr 2018-05-09 16:02:29 +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
Magne Sjaastad
d8afe5740b #2803 Ensemble Cases Performance : Use one function to load summary data 2018-05-07 13:14:43 +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
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
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
b21e6414f9 #2845 Ensemble Curve Set Legend : Add name 2018-05-03 14:46:04 +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
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
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
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
Gaute Lindkvist
c5e4bf93a6 Summary Case Import cleanup (#2795) 2018-04-25 09:25:35 +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
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
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
6c45725b19 #2689 ensemble curves. Make the curve set legend work. Cache summary addresses for performance reasons 2018-04-20 10:17:26 +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
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
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
Magne Sjaastad
3bc85ce794 #2727 Legends : Rename to RimRegularLegendConfig 2018-04-18 10:10:39 +02:00
Bjørn Erik Jensen
c3e9a39532 #2688 Set different curves color for each curve set 2018-04-18 08:32:48 +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
d7e7c4a463 #2720, #2686, #2701 Origin summary and grid cases import enhancements 2018-04-13 15:47:42 +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
Bjørn Erik Jensen
148d058d88 #2555 Open summary restart dialog if necessary when opening egrid files 2018-03-20 14:32:56 +01:00
Bjørn Erik Jensen
d5bbeffdd0 #2555 Refactored summary restart file import 2018-03-20 14:32:55 +01:00
Bjørn Erik Jensen
2a84cb6ddf #2555 Handle import to separate cases 2018-03-20 14:32:55 +01:00
Bjørn Erik Jensen
208d738846 #2555. Add summary restart file import dialog 2018-03-20 14:32:54 +01:00
Magne Sjaastad
716bb3184b System : Replace tab with four spaces 2018-03-12 11:12:39 +01:00
Magne Sjaastad
25a1823f35 Merge branch 'dev' into cmake-improvements 2018-02-28 08:47:01 +01:00
Magne Sjaastad
89c090ba24 #2536 Build System : Remove obsolete code for cmake older than "2.8.2" 2018-02-28 08:05:00 +01:00
Jacob Støren
d74807d669 #2535 Use the MainWindowTools class instead of MainWindow directly (part 1) 2018-02-27 16:46:53 +01:00
Rebecca Cox
7f246a032a Merge patch into dev with fixes for #2501 2018-02-19 14:16:22 +01:00
Rebecca Cox
119752bf04 #2501 Result Plot: Add "Show Plot Data" to context menu 2018-02-19 14:15:42 +01:00
Magne Sjaastad
1ae30ef11a (clang-tidy) : modernize-use-nullptr 2018-02-18 18:56:43 +01:00
Bjørn Erik Jensen
b0ca4f3199 #2086 Handle extended file name chars on Linux for eclipse cases and summary cases 2018-02-02 14:18:09 +01:00
Bjørn Erik Jensen
bc72c86497 #2229 curve creator. Update when adding/deleting observed summary cases 2018-01-30 15:51:48 +01:00
Bjørn Erik Jensen
4a4dab3f1c #2408 summary plot. Update qwt axis when duplicating curves 2018-01-29 12:46:34 +01:00