Commit Graph

396 Commits

Author SHA1 Message Date
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
Magne Sjaastad
889f615d19 #2276 : Source Stepping : Improve region ordering
Internally, region numbers are stored in a set and then ordered correctly. When converting to strings for UI, the sorting criteria changes, and the order is wrong. If a vector is used to represent the UI strings, the problem is solved.
2018-01-26 08:16:07 +01:00
Magne Sjaastad
0559084d93 #2325 Summary plot: Apply axis settings on preview plot 2018-01-25 21:16:35 +01:00
Magne Sjaastad
96a900fe0f #2310 Add isProjectFileVersionEqualOrOlderThan to RimProject and use from summary plot 2018-01-04 13:12:07 +01:00
Rebecca Cox
50776f5819 Fix typo 2018-01-03 15:30:27 +01:00
Bjørn Erik Jensen
79bcc2d727 #2296 Summary Plot Title. Fix region number bug 2018-01-03 07:10:23 +01:00
Bjørn Erik Jensen
02fdddad7f Imported observed data. Hide child tree nodes 2017-12-22 10:32:19 +01:00
Bjørn Erik Jensen
862dc2e982 #2290 Summary plot. Full vector name in plot auto title 2017-12-22 10:16:15 +01:00
Magne Sjaastad
5153f5b926 CppCheck : Use const reference 2017-12-22 08:19:49 +01:00
Magne Sjaastad
b768bf8b34 Summary Plot : Set default auto name to true 2017-12-21 21:11:18 +01:00
Magne Sjaastad
388d4196f1 #2283 Cross Plot : Improve curve title and plot title based on x-axis data 2017-12-21 21:03:23 +01:00
Magne Sjaastad
5fab8357ee #2289 Source Stepping : Rename to make it clear what summary case is used 2017-12-21 15:25:09 +01:00
Magne Sjaastad
f3975c8986 #2289 Source Stepping : Always return first case from visible curve cases 2017-12-21 15:25:09 +01:00
Magne Sjaastad
75c94cce7e #2283 Cross Plot : Use empty curve name instead of single pipe "|" 2017-12-21 15:25:09 +01:00
Magne Sjaastad
99893397ea Summary Address : Fixed invalid init of member variables 2017-12-21 15:25:09 +01:00
Magne Sjaastad
679e4c859f #2228 : Curve Creator : Use one group for curve types other han excplicitly handeled 2017-12-18 14:28:20 +01:00
Magne Sjaastad
bc12695af1 #2275 : Source Stepping : Trigger update of required UI when case changes 2017-12-18 09:53:32 +01:00
Magne Sjaastad
55080245b2 #2265 Xml Keywords : Use postfix 'X' for duplicated cross plot field names 2017-12-18 07:13:58 +01:00
Magne Sjaastad
bb1fe0354f #2248 Source Stepping : Always use visible curves as basis for stepping 2017-12-15 10:51:33 +01:00
Magne Sjaastad
79fea6d9f0 #2248 Source Stepping : Update toolbar when required 2017-12-15 10:37:55 +01:00
Magne Sjaastad
530b4d4073 #2248 Source Stepping : Compute visible fields once based on visible curves 2017-12-15 10:37:55 +01:00
Bjørn Erik Jensen
cd3523d91d #2269 Ascii summary curve. Fix property editor layout 2017-12-15 09:55:43 +01:00
Magne Sjaastad
3b9e7d0106 Avoid call to updateConnectedEditors from updatePlotTitle 2017-12-14 15:04:18 +01:00
Magne Sjaastad
603f63a773 #2267 Summary Plot : Remove wrong call to updatePlotTitle 2017-12-14 15:04:18 +01:00
Jacob Støren
a946797394 Adjusted Ui ordering in Summary plot 2017-12-14 14:44:12 +01:00
Magne Sjaastad
dabdcd0aa4 Whitespace 2017-12-14 11:35:28 +01:00
Magne Sjaastad
71b7523e3c #2250 Summary Curve : Support aquifer auto name 2017-12-14 11:35:28 +01:00
Magne Sjaastad
53d1c7ef66 #2262 Summary Curve Creator : Add support for auto plot title 2017-12-14 09:59:19 +01:00
Magne Sjaastad
fbee6e23a9 #2262 Curve Creator : Update curve collection when a curve is turned on/off 2017-12-14 09:59:19 +01:00
Magne Sjaastad
898c7a0483 #987 Curve Creator : Use auto-generated plot name as default plot name 2017-12-13 08:06:34 +01:00
Magne Sjaastad
5566acdcda #987 Summary Auto Title : Add support for auto plot title and improve curve names 2017-12-13 07:40:37 +01:00
Bjørn Erik Jensen
6ffcb703fd #2249 Summary Plot Editor. Support for plotting individual aquifers 2017-12-12 15:10:11 +01:00
Bjørn Erik Jensen
9769d391e1 #2199, #2245 Summary plots. Add paste commands for cross plot. Add duplicate summary plots and curves 2017-12-12 13:22:36 +01:00
Magne Sjaastad
b7bdce1d9e Summary Plot Curve Editor : Use () instead of [] around acronyms as [] are used for unit text 2017-12-12 08:56:18 +01:00
Magne Sjaastad
ab53135f91 #2243 Summary Plot : Reorganize axis properties fields 2017-12-12 08:56:18 +01:00
Magne Sjaastad
96b1fc9160 Whitepace 2017-12-12 08:56:18 +01:00
Magne Sjaastad
e7c08223b6 #2243 Summary Plot : Add control flags for auto title for name, acronym and unit 2017-12-12 08:56:18 +01:00
Magne Sjaastad
bc6a367635 #987 Summary Plot : Do not show default unit text if empty calculation unit text 2017-12-11 14:54:58 +01:00
Magne Sjaastad
ffbd4cda82 #2108 Summary Plot : Use calculation short name in axis title 2017-12-11 14:54:58 +01:00
Bjørn Erik Jensen
c1537664e3 Revert "2108 summary plot. Display short name in plot for calculated curves"
This reverts commit 83a272296c.
2017-12-11 14:54:58 +01:00
Bjørn Erik Jensen
574c5ec466 #1034. Separate font size setting for axis title and axis value labels 2017-12-11 13:42:54 +01:00
Bjørn Erik Jensen
b181d59ba9 1034 Summary plot legend. Support for setting legend font size 2017-12-11 13:10:09 +01:00
Magne Sjaastad
5641ecc1c2 Summary Curve : Move plot axis above vector selection, plus rename and reorder of Vector Selection 2017-12-11 12:15:57 +01:00
Bjørn Erik Jensen
ca91409002 #969, #2240 Summary curve axis. New fields, scaleFactor and numberOfDigits 2017-12-11 11:37:51 +01:00
Magne Sjaastad
ae8cdbc546 #2201 Summary Curve : Move button "Vector Selection Dialog" into vector selection group 2017-12-04 13:07:47 +01:00
Magne Sjaastad
aa9a2b2e2e #2214 Summary Source Stepping : Remove obsolete code 2017-12-04 12:30:00 +01:00
Bjørn Erik Jensen
2a32760132 #2218 observed data. Save ascii parse options to project file and use settings on project load 2017-12-04 11:49:13 +01:00
Magne Sjaastad
c0109361ef #2170 Summary Cross Plot : Add keyboard modifiers to source stepping 2017-12-04 08:26:26 +01:00
Bjørn Erik Jensen
83a272296c 2108 summary plot. Display short name in plot for calculated curves 2017-12-01 15:27:47 +01:00
Magne Sjaastad
eb6b0997c8 #2170 Summary Cross Plot : Improve update and visibility of UI when stepping 2017-12-01 15:15:43 +01:00
Magne Sjaastad
68bcd5253b #2170 Summary Plot : Show info text when no common identifier is detected 2017-12-01 13:55:39 +01:00
Magne Sjaastad
7f31c245ae #2170 Summary Cross Plot : Improve computation of summary case set 2017-12-01 13:55:39 +01:00
Magne Sjaastad
b8f8b2bc16 #2170 Summary Cross Plot : Show three stepping groups for cross plots 2017-12-01 13:55:39 +01:00
Magne Sjaastad
3276e46e49 #2170 Summary Cross Plot : Basis for source steppint in x, y and union 2017-12-01 13:55:39 +01:00
Magne Sjaastad
a431d10457 #2170 Summary Source Stepping : Do not show summary case step if only one case is available 2017-12-01 13:55:39 +01:00
Magne Sjaastad
6103f290bf #2170 Summary Case: Simplified access function to all cases, remove unused function 2017-12-01 13:55:39 +01:00
Bjørn Erik Jensen
9eb85966ed CSV import. Reopen dialog on parse error 2017-12-01 12:41:44 +01:00
Rebecca Cox
6fc888d718 Capitalize ui name in PDM fields 2017-11-30 13:44:18 +01:00
Bjørn Erik Jensen
1eb4c4d3e6 #1929. Remove all parts of summary curve filter which is not needed for backward compatibility 2017-11-30 11:05:30 +01:00
Magne Sjaastad
2a0f1e2fe9 #2187 Summary Plot : Use prev/next buttons for plot source stepping 2017-11-29 16:38:29 +01:00
Magne Sjaastad
f2bd87762c #2187 Summary Plot : Add summary plot tool bar for stepping 2017-11-29 16:38:29 +01:00
Magne Sjaastad
a6470e0415 Summary Plot : Reorder PlotSourceStepping items 2017-11-29 16:38:29 +01:00
Magne Sjaastad
6bc79b812b #2186 Summary Plot : Rename to RimSummaryPlotSourceStepping 2017-11-29 16:38:29 +01:00
Bjørn Erik Jensen
0334a5aec0 CSV import. Fix missing parse error dialog 2017-11-28 11:02:46 +01:00
Bjørn Erik Jensen
fb63647457 ASCII import. Do not add observed data to collection on parse failure 2017-11-27 11:13:06 +01:00
Magne Sjaastad
5ed072007d #2181 : Summary Plot : Show Plot Data : Guard when curve data is incomplete 2017-11-27 09:40:54 +01:00
Magne Sjaastad
1bd0de318f Summary Plot : Move building of auto plot name to SummaryCurveCollection 2017-11-27 09:16:18 +01:00
Magne Sjaastad
20fae240b3 Cross Plot : Improve default curve vector selection 2017-11-27 07:17:26 +01:00
Magne Sjaastad
dba6a5820d #2179 Summary Plot : Make it clear that a ptr field is not yet supported 2017-11-24 18:23:41 +01:00
Magne Sjaastad
0a8a67c2aa #2179 Summary Plot : Change identifier using PgUp / PgDown 2017-11-24 18:13:43 +01:00
Magne Sjaastad
a04c42313f #2168 Summary Plot : Improve identifier stepping 2017-11-24 15:34:02 +01:00
Magne Sjaastad
5e3467a5f6 (#861) Summary Plot : Add support for autogenerated plot name 2017-11-24 15:33:50 +01:00
Magne Sjaastad
b46c19d90f (#2168) Summary Plot : Add support for modifying identifier for curves 2017-11-24 15:32:51 +01:00
Magne Sjaastad
f8f4fbc332 Use convenience function to get a vector of child object 2017-11-24 15:22:37 +01:00
Bjørn Erik Jensen
3872be8f35 #2018 CSV import. More date formats. Bugfix in import dialog 2017-11-24 13:54:01 +01:00
Bjørn Erik Jensen
11100fb6e0 #2018 CSV import. Select time series column. Columnify preview. Refactoring 2017-11-24 13:54:01 +01:00
Bjørn Erik Jensen
1d2067882d CSV import. Read file refactoring 2017-11-24 13:54:01 +01:00
Bjørn Erik Jensen
fb24a9f29b #2018 CSV data. First working version of CSV import 2017-11-23 08:02:27 +01:00
Jacob Støren
df8d23efb9 Changed Select Address to Select Vector... 2017-11-22 14:52:23 +01:00
Magne Sjaastad
d19089710c #2153 Cross Plot : Show warning when no overlapping time steps are present 2017-11-21 11:52:53 +01:00
Magne Sjaastad
a51b4be1dc #2153 Cross Plot : Compute interpolated values based on missing timesteps relative other curve 2017-11-21 11:52:53 +01:00
Jacob Støren
4f653cbf3d Move axis selection into Y-Axis option-group 2017-11-21 10:23:19 +01:00
Magne Sjaastad
c59c167bbf Cross Plot : Set bool in field to false when push button is pressed 2017-11-16 13:06:16 +01:00
Magne Sjaastad
db1fa5ada0 Cross Plot : Use default push button config 2017-11-16 12:51:55 +01:00
Magne Sjaastad
762a21d940 #2093 Cross Plot : Add push button to select curve address 2017-11-15 15:20:47 +01:00
Magne Sjaastad
3b31c4800f #2091 Cross Plot : Rename to using X or Y as postfix to interface 2017-11-15 13:53:32 +01:00
Magne Sjaastad
c0d26a1d4e #2091 Cross Plot : Update UI text for x axis address 2017-11-15 13:53:32 +01:00
Magne Sjaastad
57d9ab83a2 #2092 Cross Plot : Update bottom axis based on cross plot values 2017-11-14 13:55:50 +01:00
Magne Sjaastad
d198ae44ba #2092 Cross Plot : Detect if curve is a cross plot curve based on anchestor 2017-11-14 12:58:28 +01:00
Magne Sjaastad
1376727386 #2092 Cross Plot : Add RimSummaryCrossPlot 2017-11-14 12:58:28 +01:00
Magne Sjaastad
df9e0de39c #2092 Cross Plot : Rename to RimSummaryAxisProperties 2017-11-14 12:58:28 +01:00
Magne Sjaastad
eb28f5a865 #2090 Cross Plot : Use axis config object to control bottom axis - WIP 2017-11-14 12:58:28 +01:00
Magne Sjaastad
90317d861f #2091 Cross Plot : Add support for custom x-axis 2017-11-14 12:58:28 +01:00
Magne Sjaastad
b05a99c763 #2091 Cross Plot : Add fields used to specify address for x-axis 2017-11-14 12:58:28 +01:00
Magne Sjaastad
99124759ed #2091 Cross Plot : Move RimSummaryAddress to separate file and rename 2017-11-14 12:58:28 +01:00
Jacob Støren
324d6d72e3 #2112 Avoid updating legend for each curve. Generalize and roll out the solution found for summary curves 2017-11-11 23:15:13 +01:00
Jacob Støren
aa45dd5fcd #2035 Fix crash when bottom of well path ends after last well cell
Add symbols to curves
2017-11-08 11:59:38 +01:00
Bjørn Erik Jensen
bfa1a1cb67 #2051 Curve calc. Edit calculation command 2017-11-08 08:47:17 +01:00
Magne Sjaastad
0502b95d86 #2091 Cross Plot : Improve interface of RiuLineSegmentQwtPlotCurve
Remove duplicate code
2017-11-08 07:38:25 +01:00
Magne Sjaastad
baa9a47b92 #2089 Cross Plot : Add New and Edit cross plot features 2017-11-07 21:26:44 +01:00
Magne Sjaastad
7104064937 #2089 Cross Plot : Add cross plot collection 2017-11-07 20:40:45 +01:00
Magne Sjaastad
c8e5fb7513 #2003 Observed data : Replace tabs with spaces 2017-11-07 11:16:33 +01:00
Magne Sjaastad
82721cb6fa #2003 Observed Data : Improve error display 2017-11-07 11:16:33 +01:00
Bjørn Erik Jensen
ca4562d853 #2052 Curve calc. Add user defined unit field 2017-11-06 13:26:32 +01:00
Magne Sjaastad
9b7cfdd913 #2066 Observed Data : Improve error reporting 2017-11-03 08:24:25 +01:00
Magne Sjaastad
ea53018f54 #2016 Observed Data : Remove well override from reader interface 2017-11-03 07:40:18 +01:00
Magne Sjaastad
7fbc1d23fd #2016 Observed Data : Hide identifier override fields 2017-11-02 19:54:24 +01:00
Bjørn Erik Jensen
ae20e1af10 Refactoring. RimViewWindow.loadDataAndUpdate -> onLoadDataAndUpdate 2017-10-31 12:49:36 +01:00
Magne Sjaastad
f83df13394 #2045 Summary : Update object editors when case is created or closed 2017-10-27 08:22:14 +02:00
Magne Sjaastad
14f3d2ffc3 Remove unused field 2017-10-27 08:22:14 +02:00
Jacob Støren
12d0457e90 Whitespace changes 2017-10-25 16:04:41 +02:00
Magne Sjaastad
dc82888ede #2031 Curve Calculator : Use unique_ptr 2017-10-23 20:20:18 +02:00
Magne Sjaastad
da8fd7038f #2032 Curve Creator : Move private class to cpp 2017-10-23 14:45:23 +02:00
Magne Sjaastad
35a2769cab #2032 Curve Calculator : Rename of calculation and calculation collection 2017-10-23 14:42:38 +02:00
Magne Sjaastad
f943a80f95 #2032 Curve Calculator : Rename 2017-10-23 14:27:04 +02:00
Bjørn Erik Jensen
8276d92ce7 #1999 Curve calc. Curve creator now uses CurveDefSelection component 2017-10-23 11:41:49 +02:00
Magne Sjaastad
07b3778a75 #2028 Summary : Use SummaryTools to access summary objects 2017-10-20 10:54:48 +02:00
Magne Sjaastad
215eb58de0 System : Always include Qt using <> and cleaned up some includes/whitespace 2017-10-19 10:11:14 +02:00
Magne Sjaastad
8e105ceb7a System : Set default expand state to true when expanding an item in tree views 2017-10-19 10:11:14 +02:00