Commit Graph

4879 Commits

Author SHA1 Message Date
Kristian Bendiksen
2c3b51ad3f #4857 Fix measurement picking in comparison view. 2019-10-29 10:52:04 +01:00
Kristian Bendiksen
6e43fee396 #4857 Fix RicNewWellPathIntersectionFeature picking.
Also avoid confusing active view change.
2019-10-29 09:01:11 +01:00
Magne Sjaastad
23e8db65c2 Merge remote-tracking branch 'origin/dev' into summary-text-edit-in-toolbar 2019-10-28 20:49:29 +01:00
Magne Sjaastad
0af6a1d95d #4775 Summary : Use combo box with history to edit text based curve creation 2019-10-28 20:41:15 +01:00
Gaute Lindkvist
625feaf36c #4929 Fix legend fonts in Summary plot 2019-10-28 13:16:00 +01:00
Gaute Lindkvist
4bce02c375 Add simple fix for Grid Cross plot as well
* TODO:  make sure the methods in RimSummaryPlot and RimGridCrossPlot are called when using the generic virtual method in RimPlotInterface.
* This requires a bit of thought, since they have parameters which the generic version does not have
2019-10-28 10:18:24 +01:00
Gaute Lindkvist
c200ea0687 Fix asciiDataForPlotExport compile warnings 2019-10-28 10:18:24 +01:00
Gaute Lindkvist
edead9e3af Made RiuQwtPlotWidget axis operations much more general 2019-10-28 10:18:03 +01:00
Gaute Lindkvist
0e9cda8e84 Fix update of fonts in summary and grid cross plot axes 2019-10-28 10:18:03 +01:00
Magne Sjaastad
72e3ddc35e #4934 Preferences : More robust storing of data to registry 2019-10-25 15:55:27 +02:00
Magne Sjaastad
2f3fcf7eec
Merge pull request #4932 from OPM/summary-adjustments
Summary Adjustments
2019-10-25 15:17:40 +02:00
Magne Sjaastad
6110748192 #4926 Summary Plot : Add push button to edit plot 2019-10-25 13:53:51 +02:00
Magne Sjaastad
cea853b94f #4926 Summary Templates : Improve placeholder text 2019-10-25 13:33:27 +02:00
Magne Sjaastad
0657155d86 #4926 Summary Templates : Move curve text edit group to top, collapse others 2019-10-25 13:29:32 +02:00
Gaute Lindkvist
785f039a1d #4925 Add guard on view missing after d8a8a615 to RImViewLinker::findNameAndIconFromView 2019-10-25 11:48:51 +02:00
Magne Sjaastad
76d196a91a
Merge pull request #4902 from OPM/summary-text-edit-in-toolbar
Summary text editor in toolbar
2019-10-24 21:44:33 +02:00
Gaute Lindkvist
6687b6ad94 Fix delete of tracks by adding virtual plot interface destructor 2019-10-24 14:59:16 +02:00
Gaute Lindkvist
b343aa1ae9 Fix update of track names following DnD 2019-10-24 14:59:16 +02:00
Magne Sjaastad
f68eb93ac6 #4851 Ensemble RFT : Make sure colors are created correctly
Lindkvist: Fixed commit to work with new Grid Plot code
2019-10-24 14:59:16 +02:00
Magne Sjaastad
e2da391371 #4851 Ensemble RFT : Fix update of color of ensemble curves on project load
Lindkvist: updated to work with new Grid Plot code
2019-10-24 14:59:16 +02:00
Gaute Lindkvist
a48f4903ea Disable common data source in well allocation plots
(they have common data selection explicitly)
2019-10-24 14:59:16 +02:00
Gaute Lindkvist
aef0e0a70f More precise view id 2019-10-24 14:59:16 +02:00
Gaute Lindkvist
c578a43b53 Introduce RimGridPlotWindow and RiuQwtPlotWidget 2019-10-24 14:59:16 +02:00
Gaute Lindkvist
2857a13e7c Columns in well log plots 2019-10-24 14:59:16 +02:00
Gaute Lindkvist
dfe9390c30 Revert "#4851 Ensemble RFT : Fix update of color of ensemble curves on project load "
This reverts commit 328cf44d94.
2019-10-24 14:59:16 +02:00
Gaute Lindkvist
771d12c563 Revert "clang-format fixes"
This reverts commit 86c75ca678.
2019-10-24 14:59:16 +02:00
Gaute Lindkvist
edc4486de7 Revert " #4851 Ensemble RFT : Make sure colors are created correctly"
This reverts commit cb5195bac2.
2019-10-24 14:59:16 +02:00
Magne Sjaastad
580d826922 Clear line edit when content do not match 2019-10-24 10:04:42 +02:00
Gaute Lindkvist
3422f1b609 Fix view id in well allocation plots 2019-10-24 09:08:04 +02:00
Magne Sjaastad
bbfc6188e9 #4775 Summary : Do not change source selection if no sources are matching 2019-10-23 17:39:16 +02:00
Magne Sjaastad
8ca1ae4888
Merge pull request #4911 from OPM/ensemble-rft-colors-on-load
Additional fix for ensemble rtf colors
2019-10-23 09:39:04 +02:00
Magne Sjaastad
b3ee5a2e01
Merge pull request #4910 from OPM/ensemble-legend-icon-and-text
Improve ensemble statistics legend icon and text
2019-10-23 09:38:27 +02:00
Magne Sjaastad
cb5195bac2 #4851 Ensemble RFT : Make sure colors are created correctly 2019-10-23 09:16:54 +02:00
Magne Sjaastad
86c75ca678 clang-format fixes 2019-10-23 09:14:14 +02:00
Kristian Bendiksen
29fdca3f69
Merge pull request #4871 from OPM/feature-export-contour-map-data
Feature export contour map data
2019-10-23 08:43:51 +02:00
Magne Sjaastad
05d2645a0a #4909 Summary Legend Text : Improve text for statistics curves 2019-10-23 08:43:44 +02:00
Kristian Bendiksen
bd804ee821 #4819 #4820 Rename action to avoid confusing user with ascii.
Command menu item is now "Export Contour Map to Text". Also update file names to
match.
2019-10-22 21:58:46 +02:00
Kristian Bendiksen
f70fbe0071 #4819 Add methods to get case and time step name for RimContourMapProjection. 2019-10-22 21:58:46 +02:00
Kristian Bendiksen
acddb4a156 #4819 Export correct UTM coordinates. 2019-10-22 21:58:45 +02:00
Kristian Bendiksen
10d257480d Expose RimContourMapProjection methods to find coordinates for export. 2019-10-22 21:58:45 +02:00
Jacob Støren
63917a61b5
Merge pull request #4907 from OPM/feature-picking-in-comparison-view
Feature fix picking in comparison view step 1
2019-10-22 16:07:59 +02:00
Jacob Støren
d802edc145 #4858 Remove unused time step link option from comparison view settings. 2019-10-22 13:54:10 +02:00
Jacob Støren
016f26725a #4862 Lock scale Z in comparison view to follow the main view.
#4858 Make timestep independent in comparison view. Make Linked Views timestep linking work
2019-10-22 13:39:18 +02:00
Magne Sjaastad
28ef4166ea #4775 Summary : Improve event handling and add shorcut 2019-10-22 10:39:18 +02:00
Kristian Bendiksen
8f115a0b34 Avoid fallthrough in switch statement. 2019-10-22 08:43:07 +02:00
Gaute Lindkvist
dc9e064c9a #4819 Basic export and nearly completed UI. 2019-10-22 08:43:07 +02:00
Gaute Lindkvist
b3dd2109ac #4819 Add separate header prefix for RifTextDataTableFormatter. 2019-10-22 08:43:07 +02:00
Gaute Lindkvist
7f3240fd70 #4819 Export contour map to ascii. 2019-10-22 08:43:07 +02:00
Kristian Bendiksen
3cbbf1fd6e
Merge pull request #4870 from OPM/system-refactor-EclipseDataTableFormatter-rename
Rename RifEclipseOutputDataTable* to RifTextDataTable*
2019-10-22 08:27:32 +02:00
Magne Sjaastad
1671fe44b2 #4775 Summary : Add max width to line edit 2019-10-21 16:36:28 +02:00