OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity
12,095 Commits 27 Branches 61 Tags 309 MiB
22aece407e
Commit Graph

5200 Commits

Author SHA1 Message Date
Jacob Støren
e78b0d4204 #4994 Make ComparisonView mode for InfoBox and animation progress 2019-11-08 10:40:37 +01:00
Jacob Støren
a9dc07ddc9 #4995 Place legends from comparison view to the right. 
Adjust the axiscross to follow the legends
 2019-11-08 10:40:37 +01:00
Gaute Lindkvist
3d6b53841d #5010 Attempt to read formation file even if it isn't called .lyr 2019-11-07 14:33:54 +01:00
Gaute Lindkvist
c5bca4cc7e Hide RimViewWindow::m_viewId so it doesn't show up in property editors 2019-11-07 12:50:17 +01:00
Magne Sjaastad
c7e97b4447
Merge pull request #5008 from OPM/avoid-virtual-method-constructors 
Avoid virtual calls in constructor and desctructors
 2019-11-07 09:46:36 +01:00
Magne Sjaastad
70d220ae19 Janitor : Remove unused variable 2019-11-07 09:44:50 +01:00
Magne Sjaastad
a413f672ec #5007 Janitor : Do not call virtual methods from destructors 2019-11-07 08:48:11 +01:00
Magne Sjaastad
0caaaf7159 clang-format : Fixes related to bug in clang-format plugin 
The LLVM/clang plugin to visual studio has a bug related to single space formatting changes. This commit fixes invalid formatting related to these issues.
 2019-11-07 07:37:50 +01:00
Jacob Støren
6bd07aa8ee #650 Removed the ugly nan legend displayed while loading things 2019-11-06 18:01:55 +01:00
Jacob Støren
55470cc1cd #5004 Remove comparison view option from 2dIntersection view 2019-11-06 18:01:55 +01:00
Magne Sjaastad
9f320c1dda
Merge pull request #5000 from OPM/move-3d-settings-to-system-tab 
Move 3d settings to system tab
 2019-11-06 12:45:34 +01:00
Magne Sjaastad
25d2ee0e27
Merge pull request #4989 from OPM/import-ascii-data-to-simulation-case 
Import ascii data to simulation case
 2019-11-06 11:35:35 +01:00
Magne Sjaastad
0b3e5ecf0c #4982 Preferences : Move Show 3D information to development tab 2019-11-06 11:22:03 +01:00
Magne Sjaastad
28c77d4b67 #82 Import Ascii-data : Minor code adjustments 2019-11-06 10:54:42 +01:00
Magne Sjaastad
791de201b3 #82 Import Ascii-data : Add icon and move item in context menu 2019-11-06 09:38:32 +01:00
Gaute Lindkvist
3203881418 More improvements to column/rowspan system 2019-11-06 08:24:57 +01:00
Magne Sjaastad
16536cfde7 Fix missing return statement 2019-11-05 15:47:32 +01:00
Gaute Lindkvist
b227ef7bdb #4992 Rename combination plots to plot report 2019-11-05 15:34:36 +01:00
Gaute Lindkvist
c1dfe193d7 #4990 Column and row span 2019-11-05 15:34:36 +01:00
Kristian Bendiksen
470fab787d Hide InputPropertyCollection until it has some items. 2019-11-05 12:23:26 +01:00
Kristian Bendiksen
22a5a1fe0f #82 Import ascii grdecl input properties into simulation case. 
This allows data from text files to be imported into a binary Eclipse case
imported based on *.EGRID.
 2019-11-05 12:23:26 +01:00
Kristian Bendiksen
357b07506f Move RimEclipseInputPropertyCollection to make it available in RimEclipseResultCase. 
Ref #82.
 2019-11-05 12:21:29 +01:00
Kristian Bendiksen
ce15aa1b5e Extract utility for loading input properties from file. 2019-11-05 12:21:29 +01:00
Gaute Lindkvist
03ff43237d Add a view id tag to project tree and tooltip 
* Remove it from property editor
 2019-11-05 11:09:18 +01:00
Kristian Bendiksen
7d817d0277
Merge pull request #4967 from OPM/improve-export-filedialog-behaviour 
Improve export filedialog behaviour
 2019-11-05 10:39:50 +01:00
Magne Sjaastad
57cab2457e clang-format : Set PenaltyBreakAssignment to 130 2019-11-04 15:08:09 +01:00
Magne Sjaastad
7c8cf60dba clang-format : Set AllowAllParametersOfDeclarationOnNextLine to false 2019-11-04 14:35:41 +01:00
Magne Sjaastad
96a26662fc Janitor : Apply clang-format fixes on codebase in ApplicationCode 2019-11-04 11:34:34 +01:00
Magne Sjaastad
e8cdf1a8ef Janitor : Remove boolean function always returning true 2019-11-04 10:16:29 +01:00
Magne Sjaastad
9ae07c838a #4919 Summary Plot : Improve colors of history curve symbols 2019-11-04 10:15:57 +01:00
Jacob Støren
5044784201
Merge pull request #4968 from OPM/feaure-fix-point-picking-in-comparison-view 
Fixes several issues from #4857
#4956 Fix List editor background setting
#4880 Fix annotations missing in comparison view
 2019-11-04 09:44:56 +01:00
Jacob Støren
52177994bd Improve readability of 3dView measurement in comparison view fix 2019-11-04 09:09:03 +01:00
Magne Sjaastad
a950852559 #4972 Summary : Add placeholder text to combo box editor 2019-11-03 14:49:08 +01:00
Magne Sjaastad
93f6bc8c72 Janitor : Remove invalid conditionals 2019-11-03 11:43:46 +01:00
Magne Sjaastad
67e7bb0cf3
Fixes detected by cppcheck (#4974) 
* Janitor : Remove obsolete pointer to dialog

* Janitor : Remove unused functions

* Janitor : Remove unused functions

* Janitor : Add explicit to constructors

* Janitor : Remove unused variables

* Janitor : Remove unused functions related to summary plot templates

* clang-tidy : Use nullptr instead of 0

* clang-tidy : Fix usage of virtual and override

* Upped to version 2019.08.2-dev.05

* Janitor : Remove unused variables

* Janitor : Clean up several cppcheck issues

* Janitor : Add cppcheck config files

* Janitor : Use const when possible
 2019-11-03 08:37:03 +01:00
Jacob Støren
6220225cfa #4970 Fix measurement text not visible in comparison view 2019-11-01 16:42:42 +01:00
Jacob Støren
f7fb4caa69 #4880 Fix annotations missing in comparison view 2019-11-01 15:57:04 +01:00
Jacob Støren
8bdb05447c Reordered Rim3dView.h 2019-11-01 15:57:04 +01:00
Jacob Støren
e85cd1b456 #4880 Further renaming of methods in Rim3dView 2019-11-01 15:57:04 +01:00
Jacob Støren
c9af22cf91 #4880 Refactoring in Rim3dView: De-virtualize updateCurrentTimeStepAndRedraw 2019-11-01 15:57:04 +01:00
Jacob Støren
b51e054ffd Renaming of more methods in Rim3dView. 
Removed virtual method from RiuViewerToViewInterface as it was not used from the interface.
 2019-11-01 15:57:03 +01:00
Jacob Støren
7f3f6419ac Rename virtual methods in Rim3dView 
To make it more clear that they are virtual methods to be distinguished from implementations in the base class. Also make their meaning somewhat more expressed.
 2019-11-01 15:57:03 +01:00
Jacob Støren
1ef4d49f14 #4857 Fix Intersection Box 3d manipulator interaction in comparison views 2019-11-01 15:57:03 +01:00
Kristian Bendiksen
60ac760254 Add txt suffix file pattern to make windows dialog behave better on windows. 2019-11-01 15:07:08 +01:00
Gaute Lindkvist
5f72c03d52 Fix warning in RImSummaryCurvesCalculator 2019-10-31 15:37:30 +01:00
Gaute Lindkvist
e8c745d704 Implement creation of combination plots from selected plots 2019-10-31 15:12:54 +01:00
Gaute Lindkvist
30db19a1d0 Create Grid plot collection and allow creation of new combination plots 2019-10-31 14:09:50 +01:00
Magne Sjaastad
1d88f4d48a Guard null pointer access 2019-10-31 09:38:44 +01:00
Magne Sjaastad
45cc94abd2 Janitor : apply clang-format 2019-10-31 09:35:48 +01:00
Magne Sjaastad
856580699c
Merge pull request #4955 from OPM/summary-adjustments 
Summary adjustments
 2019-10-30 14:40:20 +01:00
Gaute Lindkvist
a925c0f29e Partial revert of 38e0b150 2019-10-30 12:54:51 +01:00
Gaute Lindkvist
38e0b150ac Allow deleting of the last sub plot and have nice visible drop targets 2019-10-30 11:56:22 +01:00
Gaute Lindkvist
089ca3d39d #4931 Add available diameters to casing design and split casing and liner. 2019-10-30 11:53:02 +01:00
Gaute Lindkvist
f741c878db Update depth axis grid when changing grid line setting 2019-10-30 11:53:02 +01:00
Magne Sjaastad
e4fd536d21
Merge pull request #4950 from OPM/summary-curve-filter-recently-used-to-registry 
Summary curve filter recently used
 2019-10-30 11:12:59 +01:00
Magne Sjaastad
d6b7aa301c #4951 Summary Plot Template : Hide template collection in project tree 2019-10-30 10:48:23 +01:00
Magne Sjaastad
2dfa6b9d9f #4951 Summary Plot Template : Remove obsolete template pointer 2019-10-30 10:45:15 +01:00
Jacob Støren
f7f3e72700 Fix crash when closing project due to virtual call inside destructor. 
isScaleZEditable called inside destructor of Rim3dView when the deleted view is the active view
 2019-10-30 09:26:41 +01:00
Magne Sjaastad
bcb4150ae4 #4951 Summary Plot Template : Hide context menu to select template 2019-10-30 09:26:41 +01:00
Magne Sjaastad
18c52b0e18 Janitor : Avoid using .. when referencing include files 2019-10-30 09:12:13 +01:00
Magne Sjaastad
facfd062dc #4949 Summary Curve Filter Toolbar : Store recently used strings to registry 2019-10-29 14:17:24 +01:00
Magne Sjaastad
ba89a60e8d #4946 Ensemble Colors : Show color control in curve filter property editor 2019-10-29 13:40:57 +01:00
Jacob Støren
1774d123cc #4892 Simplified Unlink View command. Works on pprimary view as well. 2019-10-29 12:48:38 +01:00
Jacob Støren
b2f8c56a0d Fixed crash on project close introduced by update of MDI window title with Primary/Controlled 2019-10-29 12:47:01 +01:00
Jacob Støren
b729ce7228 #4892 Add (Primary) and (Controlled) labels to view window titles 2019-10-29 12:47:01 +01:00
Jacob Støren
3710b4ba58 #4892 Avoid comparison view accidentally added when linking views 2019-10-29 12:47:01 +01:00
Jacob Støren
d5a39ab3aa #4892 Improved names and added improved icons to linked views commands 2019-10-29 12:47:01 +01:00
Jacob Støren
6af4356f36 #4892 Add Comparison view drop-down to linked view master. 
Works as shadow of the views comparison view setting.
Make it follow the dependent viewcontrollers managed view.
Comparison view dropdown moved to "Viewer" group in view panel.
Avoid infinite recursion loops when comparison views are set up in circle
 2019-10-29 12:47:01 +01:00
Jacob Støren
27d65af027 Fix crashes when scene in one view is empty 2019-10-29 12:47:01 +01:00
Jacob Støren
c76699cdb8
Merge pull request #4943 from OPM/feature-picking-in-comparison-view-fixes 
Picking in comparison view fixes
 2019-10-29 12:41:14 +01:00
Kristian Bendiksen
2c3b51ad3f #4857 Fix measurement picking in comparison view. 2019-10-29 10:52:04 +01:00
Magne Sjaastad
1bf8341ba7 #4944 Ensemble RFT : Add missing initialization 2019-10-29 09:29:15 +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
Magne Sjaastad
7be2cc3031 #4775 Summary : Add text based curve creation to toolbar 2019-10-21 16:19:28 +02:00
Jacob Støren
86cb90515b #4894 Fix missing updates when changing zscale and using linked views. 
Prepare for fix of scalez-problems with comparison view
 2019-10-21 09:01:35 +02:00
Jacob Støren
d8a8a615a8 #4900 Align name and icon of linked views with ordinary views 2019-10-21 09:00:35 +02:00
Magne Sjaastad
328cf44d94 #4851 Ensemble RFT : Fix update of color of ensemble curves on project load 2019-10-20 10:46:05 +02:00
Magne Sjaastad
53e8cc82bd #4876 Resampeled Plot Data: Show time short text labels when possible 2019-10-19 15:05:59 +02:00
Magne Sjaastad
d59cdfa6ec
Merge pull request #4895 from OPM/fix-cumulative-curve-statistics-resample 
Fix cumulative curve statistics resampling
 2019-10-19 13:33:26 +02:00
Magne Sjaastad
6d7b29bb29 #4893 Formations : Make sure "layer_zone_table.txt" is defined once 2019-10-18 14:45:12 +02:00
Magne Sjaastad
537184328a #4877 Refactor and rename to RiuSummaryQuantityNameInfoProvider 2019-10-18 14:28:02 +02:00
Gaute Lindkvist
0e5b9687b4 Fix missing GeoMech result definition in Well Log Curves 2019-10-18 08:14:34 +02:00
Jacob Støren
b785969d68 #4857 RicNewPolylineIntersectionFeature, RicNewAzimuthDipIntersectionFeature, RicIntersectionBoxAtPosFeature 2019-10-17 16:39:24 +02:00
Jacob Støren
caed6bfa91 #4881 Fix crash when creation global annotations with geomech view present 2019-10-17 15:02:38 +02:00
Jacob Støren
b2015ce91b #4857 Fix missing highlight of cell in comparison view 2019-10-17 15:02:38 +02:00
Jacob Støren
d4ebf8d543 #4857 Viewer Commands: Handle general picking in the comparison view 2019-10-17 15:02:38 +02:00
Jacob Støren
bba8fea197 #4857 Refactoring: Use legendConfigs method when removing legends on updateLegends 2019-10-17 15:02:38 +02:00
Magne Sjaastad
a53f1e1e91 #4638 Dual porosity : Make sure geometry is regenerated when switching between matrix/fracture 2019-10-16 10:15:51 +02:00
Gaute Lindkvist
d681b75d24 Rename RifEclipseOutputDataTable* to RifTextDataTable* 2019-10-15 17:05:46 +02:00
Jacob Støren
f24543ce56 #4859 Update the view when the comparison view is changed 2019-10-15 14:28:15 +02:00
Jacob Støren
98f9eef0da #4865 Use View autoname as MDI-window title 2019-10-14 12:09:41 +02:00
Jacob Støren
440a152089 #4863, #4865 Use autoname in the view dropdowns 2019-10-14 12:08:54 +02:00
Jacob Støren
308b3613b7 #4864 add a separate icon for geomech views 2019-10-14 11:34:38 +02:00
Jacob Støren
4a9dc3bcbe #4849 Fix crash, timestep and legend issues on cyclick connections 2019-10-11 14:52:49 +02:00
Jacob Støren
b0f8dfa9e6 #4849 Co-visualization: Simple use of the comparison view support in the Viewer classes 
The feature is ready for testing.
 2019-10-11 14:52:49 +02:00
Gaute Lindkvist
172c0dfa1c Revert "Reintroduce nextValid-fields as OBSOLETE fields in RimProject" 
This reverts commit 411e5cf49f.
 2019-10-09 12:50:41 +02:00
Gaute Lindkvist
411e5cf49f Reintroduce nextValid-fields as OBSOLETE fields in RimProject 2019-10-09 10:29:42 +02:00
Gaute Lindkvist
11117383db
#4817 #4830 #4832 #4837 #4839 Python commands for WBS creation, well path import and well log file import (#4838) 
* Better minimum width for well log tracks

* Fix alignment of scrollbar in Well log plots

* Better Well Log Plot export

* Hide scroll bar before plotting
* Better borders

* Create plots through Python

* #4817 Create WBS plots with Python

* Rebase Summary and WellLogPlot on top of a new RimPlot

* Also Python: Allow setting folder as a parameter to export_snapshots

* #4832 Prepare for well path import command

* Well Path import WIP

* #4830 #4832 Import well paths and well log files from file using Python.

* #4837 Implement import of formation names in Python

* Fix debug build issue

* Fix RiaLogging build issue

* Fix warnings

* Yet another RiaLogging.h import added

* #4839 Import exporting of las and ascii files from well log plots
 2019-10-09 09:21:28 +02:00
Magne Sjaastad
b24b0932a3
Merge pull request #4836 from OPM/fix-transfer-of-single-timestep-data 
#4835 Python Cell Results : Not possible to write data if no dynamic data is present
 2019-10-08 11:45:39 +02:00
Magne Sjaastad
482d437505 #4835 Python Cell Results : Not possible to write data if no dynamic data is present 2019-10-08 10:39:22 +02:00
Magne Sjaastad
06b007effb
Ensemble plot templates (#4829) 
* #4828 Summary Plot Templates : Support ensembles as plot data sources

Guard null pointer access and use regexp to match case and index
 2019-10-08 09:08:04 +02:00
Magne Sjaastad
8ef5982756
Merge pull request #4834 from OPM/support-input-as-data-source-for-compdat 
support-input-as-data-source-completions
 2019-10-08 08:24:03 +02:00
Gaute Lindkvist
4a4653a0df
Better minimum width for well log tracks (#4824) 
* Better minimum width for well log tracks

* Fix alignment of scrollbar in Well log plots
 2019-10-07 08:32:34 +02:00
Magne Sjaastad
cd12b3ad4b Guard null pointer access 2019-10-07 07:42:39 +02:00
Magne Sjaastad
2c73b2ed02 #4828 Summary Plot Templates : Support ensembles as plot data sources 2019-10-04 18:46:30 +02:00
Magne Sjaastad
8a11c565f3 #4827 Completion Data : Support Eclipse input text files as data source 2019-10-04 15:55:31 +02:00
Magne Sjaastad
2998ad3bed #4825 Summary Plot Stepping : Key events are not routed correctly 2019-10-04 13:20:15 +02:00
Magne Sjaastad
a6733ae776
Merge pull request #4818 from OPM/improve-ensemble-stepping 
Improve ensemble stepping
 2019-10-04 11:43:06 +02:00
Magne Sjaastad
311dd5b5c4 #4811 Source Stepping : Fix well stepping for ensembles 2019-10-04 09:09:22 +02:00
Gaute Lindkvist
45d6acadaa Fix Well Log Plot depth axis label 2019-10-03 15:45:20 +02:00
Gaute Lindkvist
2cc822399b Renames following review 2019-10-03 14:57:46 +02:00
Gaute Lindkvist
f5b10b4d70
#4800 WBS: Add parameter track which is off by default (#4816) 
* Initial WIP

* Identical results with spreadsheet

* Improved and more robust smoothing by filtering points first

* Improved smoothing and more GUI

* Include mixed-label for smoothing threshold

* Implement WBS parameters track

* Much better alignment of tracks without flickering

* Don't replace user description when dragging and dropping tracks

* Fix missing OBG and SH curves

* Fix curve and track D&D

* Make sure parameter curves aren't WBS curves
 2019-10-03 14:41:37 +02:00
Magne Sjaastad
ff3055b961 #4815 Ensemble Curve Set : Make text match case insensitive 2019-10-03 14:36:10 +02:00
Gaute Lindkvist
55f0cac713
#4664 Implement smoothing of WBS curves (#4809) 
* Initial WIP

* Identical results with spreadsheet

* Improved and more robust smoothing by filtering points first

* Improved smoothing and more GUI

* Include mixed-label for smoothing threshold
 2019-10-03 14:16:56 +02:00
Gaute Lindkvist
86b1264a7b
Merge pull request #4804 from OPM/feature-minor-wbs-changes 
Minor wbs changes
 2019-10-02 17:56:09 +02:00
Magne Sjaastad
86d17441eb #4713 Summary Case : Use "Calculated" as shortname for calculated case 
Seen by running regression tests
 2019-10-01 13:00:09 +02:00
Gaute Lindkvist
763df18b7f
Merge pull request #4805 from OPM/feature-wbs-st-s33 
#4798 Set ST S33 as default geomech curve
 2019-10-01 08:18:00 +02:00
Magne Sjaastad
7ce7211187 Merge remote-tracking branch 'origin/dev' into summary-template-adjustments 2019-09-30 19:43:08 +02:00
Gaute Lindkvist
05b5417fdd #4798 Set ST S33 as default geomech curve 2019-09-30 18:48:02 +02:00
Gaute Lindkvist
2d2a5201d0 #4799 WBS: Make PP go up to seabed and ensure sources are kept valid when source stepping. 2019-09-30 15:35:15 +02:00
Gaute Lindkvist
f2eac1e2ec #4792 Fix xValue range for Well Allocation Plots 2019-09-30 15:35:15 +02:00
Magne Sjaastad
0698674d59 #4796 Summary Plot Template : Add context menu of summary cases 2019-09-30 13:28:08 +02:00
Magne Sjaastad
fbfba745c3 #4796 Summary Plot Template : Add context menu to selected summary cases 2019-09-29 12:31:21 +02:00
Gaute Lindkvist
0e7198f000 #4667 Enable export of all curves in a Well Log Plot or WBS plot to LAS 2019-09-29 11:36:08 +02:00
Magne Sjaastad
a6609c6e06 #4795 Summary Plot : Add updateConnectedEditors() 
Recent changes in logic requires more updateConnectedEditors
 2019-09-28 17:40:40 +02:00
Gaute Lindkvist
f3dfba7a81 Fixup after review 2019-09-27 11:02:03 +02:00
Gaute Lindkvist
f2be5c00fd #4783 Ensemble RFT: make sure we get some default data sources. 2019-09-27 10:06:36 +02:00
Gaute Lindkvist
1968703da8 #4782 Well Log Plots: make default variable PORO 2019-09-27 10:06:15 +02:00
Gaute Lindkvist
e242304b4d #4729 Ensemble RFT: Keep matching sources when switching well 2019-09-26 10:02:29 +02:00
Gaute Lindkvist
85a9ee2d42 Ensemble RFT: make observed error bars horizontal 2019-09-26 08:53:23 +02:00
Gaute Lindkvist
d7197b7a88 Fix crashes in well log plots 2019-09-26 08:45:04 +02:00
Gaute Lindkvist
2a20f84f1f
#4732 Support error bars for observed RFT data (#4760) 
* #4732 Fix missing refresh for ensemble RFT

* WIP

* #4732 Fix missing refresh for ensemble RFT

* WIP

* Make sure Observed RFT data is loaded on startup

* Make error bars work for RFT plots

* #4761 Add labels with formation and value/error to observed data points

* Changes after review
 2019-09-25 17:48:19 +02:00
Jacob Støren
d9b36a0228 #4764 Remove assumed unneccessary and problematic activation of Mdi windows when creating them. 2019-09-25 14:28:09 +02:00
Gaute Lindkvist
3f7fde5227
#4695 Add color shading annotation for WBS parameters, similarly to formations (#4757) 
* First wbs parameter shading
* Fix wrong Grid->grid rename in GRPC CMakeLists.cmake
* Support color shading of Well Log Tracks based on WBS parameters
* Further improvements to shading for WBS
* #4696 Set RIG_NODEL Por-Bar as default Well log extraction curve parameter for GeoMech
* Fix canvas alignment issue for new WBS plots
 2019-09-25 11:59:31 +02:00
Jacob Støren
264cc4b40b #4749 Rename fields and some cleanup 2019-09-23 14:04:23 +02:00
Jacob Støren
9f8393a5c3 #4749 Marking SummaryFilter classes and fields as OBSOLETE 2019-09-23 13:56:40 +02:00
Jacob Støren
515d06c395 #4749 Ensemble curve set vector selection now simplified using editable completion field 2019-09-23 13:42:25 +02:00
Jacob Støren
bb6d465a51 #4748 Hide the text based curve editor from cross plots 2019-09-23 12:34:10 +02:00
Magne Sjaastad
385207eebe Compare with correct enum 2019-09-20 14:50:41 +02:00
Magne Sjaastad
f088d99a02 Fix invalid case in file name 2019-09-19 14:32:35 +02:00
Magne Sjaastad
f2ac170b66 #4733 Summary Template : Add reload of templates 
Adjust save and load of templates
Add save path to preferences
 2019-09-19 11:39:32 +02:00
Gaute Lindkvist
596c18b903 #4731 Fix more crashes for ensemble RFT data import 2019-09-19 10:46:35 +02:00
Gaute Lindkvist
9d62a0c84e #4732 Fix missing refresh for ensemble RFT 2019-09-19 08:38:34 +02:00
Gaute Lindkvist
cdfaedf834
Merge pull request #4730 from OPM/feature-plot-color-fill 
Feature plot color fill
 2019-09-18 15:43:14 +02:00
Gaute Lindkvist
de4a032fe2
Merge pull request #4728 from OPM/feature-ensemble-rft-md-labels 
Feature ensemble rft md labels
 2019-09-18 15:43:04 +02:00
Gaute Lindkvist
a35533f4fc #4732 Switch P10/P90 for Ensemble RFT 2019-09-18 10:21:57 +02:00
Gaute Lindkvist
9d7ebf6ed3 Ensemble RFT: make sure last layer is imported from FMU layer zone file 2019-09-18 09:28:19 +02:00
Gaute Lindkvist
3e9bf9d1d8 #4731 Fix crash when importing formations or well paths after summary import in ensemble RFT 2019-09-18 09:09:49 +02:00
Gaute Lindkvist
63eac19c07 #4727 Apply initial default well path for new RFT Plots 2019-09-17 19:07:55 +02:00
Gaute Lindkvist
0b8d975cbe #4726 Separate axis label for well path derived MD 2019-09-17 18:44:01 +02:00
Gaute Lindkvist
c17ede46fb Fix xValue range calculation of well log curves 2019-09-17 16:26:03 +02:00
Gaute Lindkvist
1e7acd8a10
Merge pull request #4704 from OPM/bug-#4703-geomech-resultpos 
#4703 Fix changing result position in GeoMech result definition
 2019-09-17 16:09:17 +02:00
Magne Sjaastad
d212201a3a #4713 Summary Case : Shortname is not used in plot title 2019-09-13 18:39:23 +02:00
Magne Sjaastad
abb0363b12
Merge pull request #4717 from OPM/feature-Text-Based-Curve-Filter-Editor 
Feature text based curve filter editor
 2019-09-13 18:01:29 +02:00
Magne Sjaastad
c5c4bfb545 Add missing include 2019-09-13 17:16:58 +02:00
Magne Sjaastad
679ce3a222
Merge pull request #4719 from OPM/qt5-use-grab 
#4718 Qt5 : Use grab() instead of grabWidget()
 2019-09-13 16:57:39 +02:00
Magne Sjaastad
33cd6bb0c8 Clang-format after merge 2019-09-13 16:51:21 +02:00
Magne Sjaastad
aaeafa6aef Merge remote-tracking branch 'origin/patch-2018.08.2' into dev 2019-09-13 16:51:03 +02:00
Magne Sjaastad
29cb7cd8dc #4718 Qt5 : Use grab() instead of grabWidget() 2019-09-13 15:13:49 +02:00
Jacob Støren
41f0cd9a67 Missing clang-formatting 2019-09-13 15:04:16 +02:00
Jacob Støren
de17127a08 #4584 Text Based Curve Creation: Add <Outdated> flag if the actual curves does not match the filter 
Add address access on gridTimeHistoryCurves.
 2019-09-13 14:55:41 +02:00
Magne Sjaastad
1cb1720327 #4688 Contour plot : Changing Base Time Step has no effect 2019-09-13 14:55:04 +02:00
Gaute Lindkvist
25c692d3db #4668 Make contour time and case diff work 2019-09-13 14:07:08 +02:00
Magne Sjaastad
b38904d158 #4699 Guard use of TERNARY cell result in property filters 2019-09-13 13:53:24 +02:00
Magne Sjaastad
07ab821646 #4716 Summary Case : Guard access to contained summary reader 2019-09-13 13:17:07 +02:00
Jacob Støren
3896b793a8 #4715 Change "Name" to "Title" in Summ Plot property panel 
#4584 Put The options into a General Options group
Add tooltip to text field
 2019-09-13 12:49:44 +02:00
Jacob Støren
df655eb3ab #4584 Add first implementation of text based curve generation in Summary Plot 2019-09-13 11:31:49 +02:00
Magne Sjaastad
7fc0a47443 #4687 Summary Template : Add UI to select template 
#4705 Summary Template : Add icon and use from features and dialogs
 2019-09-12 08:43:29 +02:00
Gaute Lindkvist
885435fba7 #4703 Fix changing result position in GeoMech result definition 2019-09-11 15:55:37 +02:00
Gaute Lindkvist
460fbb6b9c More work on setting default values when creating new well log plots 2019-09-11 15:54:59 +02:00
Gaute Lindkvist
96fc311668 #4703 Fix changing result position in GeoMech result definition 2019-09-11 15:50:22 +02:00
Gaute Lindkvist
8b052f3c04 #4696 Make Nodel, POR the default GeoMech well log extraction curve 2019-09-11 13:46:31 +02:00
Magne Sjaastad
d045c0aade #4699 Guard use of TERNARY cell result in property filters 2019-09-11 13:31:15 +02:00
Gaute Lindkvist
fb12ad7db0 #4696 Sensible defaults for well log plot and improve reliability of common date source 2019-09-11 12:51:25 +02:00
Magne Sjaastad
020313da91 #4657 Summary Templates : Application objects 
Add file path to preferences
Show templates in project tree
Add pointer to template to RimSummaryPlot
 2019-09-11 09:33:03 +02:00
Gaute Lindkvist
6de86013ac
Merge pull request #4690 from OPM/bug-#4688-contour-diff 
#4668 Make contour time and case diff work
 2019-09-11 08:58:06 +02:00
Gaute Lindkvist
baa266f0f9 Improve lines and shading 2019-09-10 16:52:32 +02:00
Gaute Lindkvist
06cea12447 #4666 Support color fill for formations in Well Log Tracks 2019-09-10 13:23:29 +02:00
Gaute Lindkvist
3279f51364 #4668 Make contour time and case diff work 2019-09-10 09:18:40 +02:00
Gaute Lindkvist
651971b835 Merge branch 'dev' into feature-WBS-class 2019-09-10 08:47:56 +02:00
Gaute Lindkvist
5c9622dca0 clang-format WBS classes 2019-09-10 08:32:42 +02:00
Gaute Lindkvist
5cfd840025 Fix track widths and canvas top alignment 2019-09-09 14:38:36 +02:00
Gaute Lindkvist
81cb97ead7 Fix memory leak 2019-09-09 13:14:20 +02:00
Gaute Lindkvist
129df990ae #4665 Implement a Well Bore Stability Plot class 
* Trigger updates when Ui fields are changed
  * Show only WBS parameter options that have available data
  * Clang-format WBS stuff
 2019-09-09 13:12:02 +02:00
Gaute Lindkvist
71c4642f13 Make Well Allocation Plots work well again 2019-09-09 11:00:11 +02:00
Gaute Lindkvist
9fe021c6ca Use layouts for tracks in Well Log Plot 2019-09-06 15:52:45 +02:00
Gaute Lindkvist
ff42e8b1be Merge branch 'dev' into system-refactor-welllogplot 2019-09-06 13:44:20 +02:00
Gaute Lindkvist
de8a5a59f3 Clang-format changed files 2019-09-06 13:17:36 +02:00
Gaute Lindkvist
565e5b0418 RFT/PLT/WAP: Calculate value options for fields inherited from WellLogPlot 2019-09-06 12:53:52 +02:00
Magne Sjaastad
deb73df726 clang-format : Apply clang-format on files coming from feature branch 2019-09-06 12:53:32 +02:00
Magne Sjaastad
eb4f44d4d2 #4657 Remove unused functions 2019-09-06 12:43:21 +02:00
Gaute Lindkvist
45103da354 Fix crashes related to name config and make name correct for old plots when loading 2019-09-06 10:59:47 +02:00
Magne Sjaastad
fe9e567825 #4683 clang-format on all files in ApplicationCode 2019-09-06 10:57:22 +02:00
Magne Sjaastad
ef80f5b629 #4683 System : Remove obsolete include of cvfBase.h 2019-09-06 10:52:54 +02:00
Gaute Lindkvist
c0f7f4e056 Make plot titles work well in RFT/PLT again 2019-09-05 08:21:31 +02:00
Gaute Lindkvist
42f494be5f Make the refactored RFT and PLT plots work 2019-09-04 20:19:15 +02:00
Gaute Lindkvist
b9d78152e1 Fix crashes 2019-09-04 20:19:06 +02:00
Gaute Lindkvist
a03435b2fe Refactor WellLogPlot, RftPlot, PlotPlot and WellAllocationPlot 2019-09-04 20:18:59 +02:00
Magne Sjaastad
2795855621
Merge pull request #4674 from OPM/feature-ensemble-rft 
#4634 and #4635: Merge feature-ensemble-rft branch
 2019-09-04 11:39:46 +02:00
Gaute Lindkvist
686d3f0189 Remove debug messages from RimWellLogRftCurve 2019-09-04 08:13:37 +02:00
Gaute Lindkvist
ea8a43a724 Add support for estimating md from well path as well 2019-09-03 16:01:55 +02:00
Gaute Lindkvist
6c7325b575 #4663 Fix loading of PLT plots with observed data 2019-09-03 15:25:22 +02:00
Gaute Lindkvist
8c4bb0e163 #4663 Fix loading of PLT plots with observed data 2019-09-03 14:42:01 +02:00
Magne Sjaastad
4a50e5f4c6 #4652 Summary Curve Selector : Set case sensitivity to insensitive 2019-08-30 12:17:39 +02:00
Gaute Lindkvist
94c1fbbabe Fix compile issue after merge 2019-08-29 08:35:28 +02:00
Gaute Lindkvist
789daed42b Interpolating MDvalues 2019-08-28 16:00:33 +02:00
Gaute Lindkvist
2c6191c94b
Merge branch 'dev' into feature-ensemble-rft 2019-08-28 12:56:27 +02:00
Jacob Støren
1a78557bc5 #4583 Remove the now obsolete "Vector Selection Filter" from the Summary curve property panel. Enable the vector field as autocompleted input field. 
Place button to open the single vector selector dialog on the right of the field.
 2019-08-28 10:12:54 +02:00
Jacob Støren
11e73a76fc #4571 Sum. cmd. line: Add support for -s, -n and -e to grid cell plotting 2019-08-28 10:12:54 +02:00
Jacob Støren
889577400a #4571 WIP: Multiplot grid cell plotting 
Basics working. Missing single plot and normalizing
 2019-08-28 10:12:53 +02:00
Jacob Støren
80f0273437 #4570, #4568 Ensemble support for --summaryplot 2019-08-28 10:12:53 +02:00
Jacob Støren
b670f3df0d #4569 Summary Command Line: Add support for normalization (-n) 2019-08-28 10:12:53 +02:00
Jacob Støren
421cbb3e74 #4569 Add normalize functionality to summary plot. Toggle button in Summary Plot. No command line option yet. 2019-08-28 10:12:53 +02:00
Jacob Støren
e04daa7596 #3950 Add the minimal --summaryplot commandline option. 
Using shell globbing for filenames, and only one additional option implemented.
Avoid creating default plot when using --summaryplot
 2019-08-28 10:12:52 +02:00
Gaute Lindkvist
d4fd2d795a Ensemble RFT: make ensemble and observed curves work even if you have a well path with the same name 2019-08-27 10:54:52 +02:00
Magne Sjaastad
1f90323462 #4636 Curve Data Export : Use correct column header for P10/P90 2019-08-27 07:35:35 +02:00
Gaute Lindkvist
2c5ca4ce46 Import and plot of FMU RFT data works 2019-08-26 12:52:07 +02:00
Gaute Lindkvist
4bddefeb0c #4608 Add only one legend item per RFT ensemble 2019-08-26 11:58:18 +02:00
Gaute Lindkvist
71da659506 #4580 Import Eclipse RFT data as part of ensemble import 2019-08-26 11:56:36 +02:00
Gaute Lindkvist
1009f1ff45 #4629 Fix setting and reading of summary time values 2019-08-26 11:38:41 +02:00
Gaute Lindkvist
222f230687
#4578 Add commands for create and clone view (#4625) 2019-08-26 10:04:44 +02:00
Gaute Lindkvist
e7f90c0ecf Clang-format 2019-08-26 09:57:50 +02:00
Magne Sjaastad
cae2d13aeb Fix implicit type conversion issues 2019-08-23 16:43:05 +02:00
Magne Sjaastad
3d8a3df554
Merge pull request #4626 from OPM/feature-date-components 
#4624 Allow customization of date/time components in labels
 2019-08-23 15:57:22 +02:00
Gaute Lindkvist
7951899717 #4624 Allow customization of date/time components in labels 2019-08-23 14:28:11 +02:00
Gaute Lindkvist
2e49670f40 #4578 Add commands for create and clone view 2019-08-23 11:25:00 +02:00
Gaute Lindkvist
3f6d0db07a #4622 Make sure inverted axis values are assigned correctly in GridCrossPlot y-axis properties 2019-08-22 15:50:40 +02:00
Magne Sjaastad
a97066b2f2 Show saturation pressure plot command on context menu of Eclipse view 2019-08-21 08:10:48 +02:00
Magne Sjaastad
fee9a2de19 #4600 Dual porosity: Apply matrix/fracture change immediately 2019-08-21 07:25:17 +02:00
Magne Sjaastad
d86a53f732 #4599 Add "Collapse Others Views/Plots" to context menu of views and plots 2019-08-20 10:39:23 +02:00
Gaute Lindkvist
e58da136e3
#2082 Support custom date time format (#4594) 
* #2082 Support custom date time format

* Clang-format
 2019-08-19 09:37:42 +02:00
Magne Sjaastad
4d8ce1e399 #4483 Summary Plot Stepping: Hide not relevant controls from property editor 2019-08-19 07:56:43 +02:00
Magne Sjaastad
4cb1c9faca #4581 Summary Plot: Add default curve style to preferences for history curves 2019-08-16 15:41:58 +02:00
Magne Sjaastad
c30b34511b #4581 Summary Plot: Rename to setCurveAppearanceFromCaseType() 2019-08-16 14:40:12 +02:00
Magne Sjaastad
c5542463aa #4581 Summary Plot: Add isHistoryQuantity 2019-08-16 14:37:34 +02:00
Magne Sjaastad
7295ba8533 #4567 Summary Plot: Set quantity plot title only WOPT and WOPTH 2019-08-16 12:54:24 +02:00
Magne Sjaastad
010c9a539f #4579 Countour Map : Fix missing data for Eclipse cases 
Introduction of checkable sub grids caused contour maps to display nothing. The problematic code was  m_gridCollection->setActive(false);

Changes in update logic based on checked state of visible grids triggered new computation of visible cells. In this case, all grids where marked as invisible due to the disabled grid collection.
 2019-08-15 10:08:43 +02:00
Jacob Støren
93b4101831 #4003 Use the preferences settings when creating default summary plots. 
Refactored to make assigning default curve appearance easier.
 2019-08-09 13:15:32 +02:00
Jacob Støren
e915c8e18c #4003 Refactoring to prepare for preferences based default summary plot curves 2019-08-09 09:54:55 +02:00
Jacob Støren
0d456a1f1b #4002 Renamed feature that opens the plot editor and created feature to create a new plot directly. The new feature uses the selected summary cases and creates a default curve for each. 2019-08-08 16:22:00 +02:00
Magne Sjaastad
e26cd1a896 #4483 Summary Plot: Fix curve names for segment/block/conmpletions 2019-08-08 09:39:03 +02:00
Magne Sjaastad
44ccbff9ee #4483 Summary Plot: Fix well segment stepping 2019-08-08 09:13:59 +02:00
Magne Sjaastad
ec1cf83b4e #4483 Summary Plot: Data source for well segment number and completions 2019-08-05 21:53:48 +02:00
Gaute Lindkvist
a9ee69587d #4536 Make sure we guard against calculating Mobile Volume Weighted Mean for visible cell stats and not just all cell stats. 2019-08-03 16:21:31 +02:00
Magne Sjaastad
be40ca25af #4411 Grid Cross Plot : Ensure same ordering when updating data 2019-07-31 18:26:50 +02:00
Magne Sjaastad
74f234784b #4411 Grid Cross Plot : Add comments 2019-07-31 18:25:54 +02:00
Gaute Lindkvist
213591f522 #4526 Make sure setting wells for flow diagnostics result works and add simplified API 2019-07-31 09:53:45 +02:00
Gaute Lindkvist
4161171608 Python: avoid __pycache__ turning up as sub-folder in Script Collection 2019-07-30 15:05:22 +02:00
Gaute Lindkvist
92bc71d934 #4528 Fix script paths and adding new scripts 2019-07-30 12:32:10 +02:00
Gaute Lindkvist
7c30af62c2 #4528 #4512 Fix script-locations when loading project and remove initScriptDirectories() 
* Disable IO for scriptlocations and make sure we save it in preferences when editing
* The next valid case Id stuff in initDirectories is irrelevant because it always runs on an
  empty project
 2019-07-30 12:32:10 +02:00
Gaute Lindkvist
979101fe96 #4526 Enable setting of flow diagnostics to cell results 2019-07-30 12:32:10 +02:00
Gaute Lindkvist
beb6256f53 Make it possible to edit case group statistics 2019-07-30 12:32:10 +02:00