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
11,579 Commits 27 Branches 61 Tags 309 MiB
aa11e3601b
Commit Graph

4953 Commits

Author SHA1 Message Date
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