Commit Graph

364 Commits

Author SHA1 Message Date
Bjørn Erik Jensen
e5570441f6 #2751 Rename ensamble to ensemble 2018-04-19 14:00:18 +02:00
Bjørn Erik Jensen
21a81744f1 #2610 New command, display ensamble curves with single color 2018-04-06 11:58:06 +02: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
72013f4ff8 #2535 Use the MainWindowTools class instead of MainWindow directly (part 2) 2018-02-27 16:46:53 +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
Magne Sjaastad
1ae30ef11a (clang-tidy) : modernize-use-nullptr 2018-02-18 18:56:43 +01:00
Magne Sjaastad
bf0b4f68e1 Merge message box fixes into dev, #2443 2018-02-02 14:47:05 +01:00
Magne Sjaastad
dc0c6d1b47 #2443 : Remove obsolete includes of QMessageBox 2018-02-02 09:37:00 +01:00
Bjørn Erik Jensen
7779ff5ed0 Merge branch '2018.01.01-patch' into dev. #2229 2018-01-31 08:33:51 +01:00
Bjørn Erik Jensen
fa66cf14cd #2229 curve creator. Update when adding/deleting calculated curves as well 2018-01-31 08:32:14 +01:00
Rebecca Cox
47d8508196 Merge remote-tracking branch 'origin/2018.01.01-patch' into dev 2018-01-26 10:29:01 +01:00
Magne Sjaastad
0559084d93 #2325 Summary plot: Apply axis settings on preview plot 2018-01-25 21:16:35 +01:00
Rebecca Cox
81a7fb204d #2360 Elm Props: Correct UI text 2018-01-10 16:32:59 +01:00
Jacob Støren
cb6d49a611 #2331 Renamed RimView to Rim3dView 2018-01-09 10:11:28 +01:00
Magne Sjaastad
57a691f8da Remove "ResInsight:" prefix 2017-12-18 14:30:19 +01:00
Magne Sjaastad
7e71f50581 #2248 Source Stepping : Update toolbar when required for cross plot curves 2017-12-15 12:16:47 +01:00
Magne Sjaastad
2771270d24 #2248 Source Stepping : Update toolbar on new / delete of summary curve 2017-12-15 10:37:55 +01:00
Bjørn Erik Jensen
e35a448dae Summary Cross Plot. Hide Paste Excel data for cross plots 2017-12-15 10:10:21 +01:00
Bjørn Erik Jensen
0cce524af1 Summary plot. Fix paste excel data command name 2017-12-15 10:01:39 +01:00
Bjørn Erik Jensen
3034fdd289 #2268 Summary plot. Fix missing Switch Axis command 2017-12-15 09:19:22 +01:00
Magne Sjaastad
3b9e7d0106 Avoid call to updateConnectedEditors from updatePlotTitle 2017-12-14 15:04:18 +01:00
Jacob Støren
ebe60d8b16 Curve Creator Curve Name Configuration group name updated 2017-12-14 13:05:37 +01:00
Magne Sjaastad
9a805ac834 #2262 Curve Creator : Improved default collapsed state of UI groups 2017-12-14 10:14:22 +01:00
Magne Sjaastad
a37771e933 #2262 Curve Creator : Add support for creation of new auto titled plots 2017-12-14 10:13:53 +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
898c7a0483 #987 Curve Creator : Use auto-generated plot name as default plot name 2017-12-13 08:06:34 +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
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
Jacob Støren
04e5ccfd7e #2238 Lift limitation of plotting Flooded PV as time history curve 2017-12-07 19:31:28 +01:00
Magne Sjaastad
93b69b807f #2198 Summary Plot : Set default curve selection 2017-12-04 14:36:17 +01:00
Magne Sjaastad
67fe2e268a #2211 Curve Calculator : Add default curve calculation before displaying dialog 2017-12-04 11:58:24 +01:00
Magne Sjaastad
f79e31be8f #2216 Disable creation of new calculation object as this causes crash
Introduced in  8281391fb9
2017-12-04 10:21:02 +01:00
Bjørn Erik Jensen
8281391fb9 #2211 Curve calc. Create new calculation if empty 2017-12-01 15:36:46 +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
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
a460124055 CSV import. Add tooltip to custom date time format field 2017-11-30 15:23:59 +01:00
Rebecca Cox
bb4390651d #2144 Context menu: Remove commands from well path and sim well 2017-11-30 12:06:14 +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
1d9d8f6794 Add RiuTools with function for default window flags 2017-11-29 08:50:48 +01:00
Bjørn Erik Jensen
622161776e CSV import. Rename ColumnInfo to Column 2017-11-28 11:35:17 +01:00
Bjørn Erik Jensen
0dbcc43d9c CSV import dialog. Highlight selected time series column 2017-11-28 11:02:46 +01:00
Bjørn Erik Jensen
4b14a4fdda CSV import dialog. Use html table in preview text box 2017-11-28 11:02:46 +01:00
Bjørn Erik Jensen
6d4820a691 CSV import. Replaced old ASCII parser by the new RifCsvUserDataParser 2017-11-28 11:02:46 +01:00
Bjørn Erik Jensen
bdc680bc03 ASCII import dialog. Determine default decimal separator 2017-11-27 12:39:12 +01:00
Bjørn Erik Jensen
e53059e2c8 ASCII import dialog. Update preview when cell separator is modified 2017-11-27 11:35:00 +01:00
Bjørn Erik Jensen
2d221495eb ASCII import dialog. Use monospace font in preview widget 2017-11-27 11:01:37 +01:00
Bjørn Erik Jensen
4a61692d36 ASCII import. Reorganize dialog layout 2017-11-27 11:01:37 +01:00
Bjørn Erik Jensen
f34b2bb612 CSV import. Add argument to method. Texts in drop down 2017-11-27 11:01:37 +01:00
Magne Sjaastad
3e5a4945d1 QDialog Constructor : Use windows flags to avoid '?' on Windows 2017-11-27 09:16:18 +01:00
Magne Sjaastad
128f2eaee7 #2178 Summary Curve Edit : Create autoname for plot when possible 2017-11-27 09:16:18 +01:00
Magne Sjaastad
5e3467a5f6 (#861) Summary Plot : Add support for autogenerated plot name 2017-11-24 15:33:50 +01:00
Magne Sjaastad
20b3de9f7a Remove unused function 2017-11-24 15:33:49 +01:00
Bjørn Erik Jensen
800ac30d81 #2018 CSV import. Modify CSV parser interface. Optimization. 2017-11-24 13:54:01 +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
28db4c6e22 #2018 CSV import. Fix decimal point/locale 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
8dd804b5ee Parse options. Rename field 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
Bjørn Erik Jensen
d7dc304eca #2018 Ascii data. Add preview text field to ascii paste dialog 2017-11-23 08:02:27 +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
f14eb44efd #2089 Cross Plot : Make sure context menu items works as expected 2017-11-15 07:07:46 +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
b72ce60379 #2089 Cross Plot : Add new cross plot curve feature 2017-11-14 12:58:28 +01:00
Magne Sjaastad
9adb9ba4b1 #2088 Curve Calculator : Ask user to calculate curves when expression has changed 2017-11-14 08:41:44 +01:00
Magne Sjaastad
2e6c37c266 #2088 Curve Calculator : Use Close button instead of Ok and Cancel 2017-11-14 07:30:49 +01:00
Magne Sjaastad
2c8658c5c2 #2088 Curve Calculator : Insert layout once to avoid debug output warning 2017-11-14 07:28:02 +01:00
Magne Sjaastad
cfaf27d4bf #2105 Curve Calculator : Do not show calculator dialog modal 2017-11-13 21:45:02 +01:00
Bjørn Erik Jensen
bfa1a1cb67 #2051 Curve calc. Edit calculation command 2017-11-08 08:47:17 +01:00
Magne Sjaastad
baa9a47b92 #2089 Cross Plot : Add New and Edit cross plot features 2017-11-07 21:26:44 +01:00
Bjørn Erik Jensen
0f8b7ce907 #2048 Curve calc. Add command icon 2017-11-06 13:50:15 +01:00
Bjørn Erik Jensen
faf703dfeb #2053 Curve calc. Fix Linux build errors 2017-11-06 12:08:13 +01:00
Bjørn Erik Jensen
d5a3b319b8 #2053 Curve calc. Add 'Create copy' context menu 2017-11-06 11:35:54 +01:00
Bjørn Erik Jensen
0f6d5f9c48 #2054 Curve Calc. Add context menu with operators and functions 2017-11-03 08:37:37 +01:00
Bjørn Erik Jensen
62b96a5ae5 #2049 Curve calc. Add curve calc command to more objects and toolbar 2017-11-02 09:30:30 +01:00
Jacob Støren
46e8144f3b #2064 Fix wrong timestep range text in Gui. Complete Fix #1986. Make it possible with Visible cells and FlowDiag/Injection flooding 2017-10-27 17:12:48 +02:00
Magne Sjaastad
0db436a181 #2045 Curve Creator : Avoid dynamic_cast 2017-10-27 09:13:14 +02:00
Magne Sjaastad
1fb6d87c82 #2045 Curve Creator : Clear last curve selection when creating a new plot 2017-10-27 09:01:49 +02:00
Magne Sjaastad
0be241eb59 #2045 Remove obsolete factory and move curve editor into RicSummaryCurveCreator 2017-10-27 08:26:20 +02:00
Magne Sjaastad
1132d1fe7a #2045 Curve Creator : Use unique_ptr and whitespace 2017-10-27 08:22:14 +02:00
Magne Sjaastad
d1579bd792 #2045 Curve Creator : Use PdmPointer 2017-10-27 08:22:14 +02:00
Magne Sjaastad
ae8d614fb0 #2045 Curve Creator : Make sure preview plot is updated in defineUiOrdering 2017-10-27 08:22:14 +02: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
dab23164df Summary Plot : Do not create object editor in command feature constructor 2017-10-27 08:22:14 +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
0bd745dd66 Remove unused variables 2017-10-23 11:37:40 +02:00
Magne Sjaastad
07b3778a75 #2028 Summary : Use SummaryTools to access summary objects 2017-10-20 10:54:48 +02:00
Magne Sjaastad
167f56f95a #2026 Curve Calculator : Update calculated curves and plots 2017-10-20 10:20:58 +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
Magne Sjaastad
9d335e1163 #1999 Curve Creator : Temporary fix for display of calculated curves 2017-10-18 12:47:10 +02:00
Magne Sjaastad
bd8abba779 #2022 Curve Calculator : Add enum Calculated 2017-10-18 12:47:10 +02:00
Unknown
b937bc53d8 #2017 Make all new objects selected after new / edit commands 2017-10-17 13:25:00 +02:00
Rebecca Cox
6674f6087a #1984 Ensure QDateTime spec set to UTC 2017-10-17 09:52:31 +02:00
Magne Sjaastad
ccd839c182 #1977 Curve Calculator : Use smaller and right aligned buttons 2017-10-13 16:22:39 +02:00
Magne Sjaastad
82aee8f5bf #1977 Curve Calculator : Create calculation description from addresses 2017-10-13 14:33:26 +02:00
Magne Sjaastad
15f71c29fa #1977 Curve Calculator : Hide Edit header, hide new/delete variable buttons 2017-10-13 13:47:01 +02:00
Magne Sjaastad
9d0e59c60f #1977 Curve Calculator : Trigger parsing and evaluation of expression 2017-10-13 13:04:54 +02:00
Magne Sjaastad
2dd18cec6e #1977 Curve Calculator : Remove parent pointer from constructor 2017-10-12 21:07:35 +02:00
Magne Sjaastad
ad92b93e06 #1977 Curve Calculator : Rename to RicSummaryCurveCalculatorEditor 2017-10-12 21:07:35 +02:00
Magne Sjaastad
650e29d6d5 #1977 Curve Calculator : Add button box to dialogs 2017-10-12 10:52:30 +02:00
Magne Sjaastad
6fd9bec353 #1977 Curve Calculator : Main dialog with expression editor 2017-10-12 10:52:30 +02:00
Magne Sjaastad
4046665044 #1977 Curve Calculator : Add RiuSummaryCurveDefinition and friends 2017-10-12 10:52:30 +02:00
Bjørn Erik Jensen
0e832fad06 #1978 Curve Creator. Separate selections of observed data and simulated data 2017-10-09 08:54:49 +02:00
Bjørn Erik Jensen
d283e3aa8c Curve creator. Minor refactoring 2017-10-05 16:27:39 +02:00
Magne Sjaastad
a362891d7e #1940 Curve Creator : Make sure the curve tree is updated 2017-10-02 14:49:24 +02:00
Magne Sjaastad
0fd2df9f57 Edit Summary Plot: Improve isCommandEnabled 2017-10-02 12:48:01 +02:00
Magne Sjaastad
eec974c53d #1940 Curve Creator : Always recreate curve creator to ensure stable init 2017-10-02 12:46:40 +02:00
Rebecca Cox
05e3774d36 #1915 Curve creator: Remove option to make default curve filter in preferences 2017-09-29 13:23:23 +02:00
Unknown
e1c58fd1c3 #1945 Curve creator: Remove "Contribute to legend" option 2017-09-29 12:47:10 +02:00
Unknown
8a139f7ebe #1939 Curve creator: Created or edited plots is toggled on Apply/OK 2017-09-28 11:17:00 +02:00
Unknown
29ac350b8f #1939 Curve creator: Select newly created or edited plot on Apply/OK. Will only be visible if plot is toggled 2017-09-28 10:18:16 +02:00
Jacob Støren
00ef13094a Revert hard setting of linestyle NONE fro observed data. Must be more graceful 2017-09-27 19:43:11 +02:00
Bjørn Erik Jensen
fddabb61e2 Curve creator. Set line style NONE for observed data curves (II). Remove test code. 2017-09-27 15:33:46 +02:00
Jacob Støren
53ec396449 #1927 Avoid enabling of command if text is not at least 12 char long 2017-09-27 15:13:35 +02:00
Bjørn Erik Jensen
4f238a74b0 Curve creator. Set line style NONE for observed data curves 2017-09-27 14:58:01 +02:00
Rebecca Cox
31133f31c0 #1938 Curve creator: Close all widgets on closing of curve creator 2017-09-27 14:35:33 +02:00
Bjørn Erik Jensen
4efe9ca944 Observed data. Fixed editor display for observed data 2017-09-26 10:39:36 +02:00
Magne Sjaastad
c7fb2351b1 Cleaned up includes 2017-09-26 08:28:04 +02:00
Magne Sjaastad
e62d5e4277 Cleaned up includes 2017-09-26 08:25:49 +02:00
Bjørn Erik Jensen
4dde03c1ac Curve creator. Fixed observed data address filtering 2017-09-26 08:25:36 +02:00
Bjørn Erik Jensen
8554b7eab0 #1930 Curve creator. GUI adjustments (II) 2017-09-25 15:39:13 +02:00
Bjørn Erik Jensen
05c07693b6 #1930 Curve creator. GUI adjustments 2017-09-25 14:33:21 +02:00
Rebecca Cox
797c040057 #1816 Observed data: Remove superfluous functions in column ascii parser 2017-09-24 18:04:19 +02:00
Jacob Støren
1309424835 #1923 Avoid plot update for each curve when updating the Curve Creator target plot 2017-09-23 09:12:49 +02:00
Jacob Støren
0bb47cba88 #1923 Add no-plot-update versions of update methods in curve system. onLoadDataAndUpdate is improved for summary curve but not always called with the "no update" flag set 2017-09-23 08:47:04 +02:00
Bjørn Erik Jensen
b28bcaa4e4 #1927 Paste Ascii data command. Create an empty summary plot 2017-09-22 15:38:40 +02:00
Magne Sjaastad
aba74bcdfd #1918 Observed Data : Remove RigSummaryCaseData 2017-09-22 15:02:14 +02:00
Magne Sjaastad
32fa6d4920 #1918 Observed Data : Removed RigCase RigSummaryCaseData from RimSummaryCase 2017-09-22 15:02:14 +02:00
Bjørn Erik Jensen
2bad74b4aa #1928 Curve Creator. Appearance label fix. Move group boxes 2017-09-22 14:40:06 +02:00
Bjørn Erik Jensen
d83c468033 #1919 Curve Creator. Fix summary category initial selection 2017-09-22 12:53:54 +02:00
Bjørn Erik Jensen
0ae5c344d3 #1922 Curve creator. Set dialog window title 2017-09-22 12:02:13 +02:00
Bjørn Erik Jensen
f4148dfe7a #1920 Curve creator. Adjust target plot combobox width to contents 2017-09-22 11:49:00 +02:00
Bjørn Erik Jensen
70ede18dc1 #1924 Curve creator. Fix auto appearance behavior 2017-09-22 11:02:49 +02:00
Bjørn Erik Jensen
8e2f97ffea #1921. Fix typo 2017-09-22 10:02:58 +02:00
Bjørn Erik Jensen
1590a2a26e #1921 Curve Creator. Add curve name config 2017-09-22 09:54:55 +02:00
Bjørn Erik Jensen
e7f19ff89d #1914 Curve creator. Bring curve creator dialog to front on new plot and edit plot commands 2017-09-21 15:48:00 +02:00
Bjørn Erik Jensen
00fc2a2eaa #1853 Summary curve filter. Remove unused includes and friend declarations 2017-09-21 15:18:28 +02:00
Rebecca Cox
68a101fe2d #1816 Use new parser on pasting data to summary plot 2017-09-21 12:21:52 +02:00
Bjørn Erik Jensen
4c6c3ae564 #1913 New summary plot. Always show 'new plot' in target plots drop down 2017-09-21 11:00:03 +02:00
Bjørn Erik Jensen
a72f2ea421 #1917 Plot project tree. Clean up summary plot popup menu. 2017-09-21 10:47:55 +02:00
Bjørn Erik Jensen
292ea3c67f #1913 New summary plot. Command brings up curve creator and creates new plot on Apply/OK 2017-09-21 09:50:03 +02:00
Rebecca Cox
9d56cee1be #1816 Observed data: In parser, split header on cellseparator, not tab 2017-09-21 09:00:51 +02:00
Rebecca Cox
d0d8a7d4be #1816 Observed data: Reader interface will be used throughout the code 2017-09-21 09:00:51 +02:00
Bjørn Erik Jensen
b0554516dd #1897 Curve creator. Use only one region editor for region to region category 2017-09-20 13:06:55 +02:00
Bjørn Erik Jensen
89bc438921 #1815 Curve creator. Fix bug related to observed data summaries 2017-09-20 12:55:16 +02:00
Bjørn Erik Jensen
b430982b2f #1895 Curve creator. Filter curves by selecting summary category/categories 2017-09-20 11:42:56 +02:00
Bjørn Erik Jensen
dd8549d3d1 #1815 Curve Creator. Display observed data in summaries editor 2017-09-20 11:20:45 +02:00
Magne Sjaastad
9fee4d0511 #1895 : Curve Creator : Use TreeSelectionEditor for Summary Types 2017-09-20 10:44:14 +02:00