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,525 Commits 27 Branches 61 Tags 309 MiB
28c77d4b67
Commit Graph

9660 Commits

Author SHA1 Message Date
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
Kristian Bendiksen
a51219b1ca #4857 Fix RicShowFlowCharacteristicsPlotFeature picking. 2019-10-29 09:01:11 +01:00
Kristian Bendiksen
212bdc0648 #4857 Fix RicNewGridTimeHistoryCurveFeature picking. 2019-10-29 09:01:11 +01:00
Kristian Bendiksen
6c3847a2ac #4857 Fix context menus for linked views in co-vizualisation. 2019-10-29 09:01:11 +01:00
Kristian Bendiksen
c02dc40780 #4857 Fix RicShowGridStatisticsFeature picking. 2019-10-29 09:01:11 +01:00
Kristian Bendiksen
9c4696046c #4857 Fix RicCreateGridCrossPlotFeature picking. 2019-10-29 09:01:11 +01:00
Kristian Bendiksen
41b58b9099 #4857 Fix RicShowWellAllocationPlotFeature picking. 2019-10-29 09:01:11 +01:00
Kristian Bendiksen
59c25c6762 #4857 Make RicNewWellLogCurveExtractionFeature picking more conceptually correct. 
The previous code did also work.
 2019-10-29 09:01:11 +01:00
Kristian Bendiksen
734d954cfb #4857 Fix RicEclipseHideFaultFeature picking. 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
3a1f21093e Implement style sheet class for more robush CSS management 2019-10-28 13:22:56 +01:00
Gaute Lindkvist
c0df30f855 Fix plot axis extents to remove lots of whitespace 2019-10-28 13:16:21 +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
12478a6eef #4918 Improve detection of numbers when parsing std string 2019-10-25 16:38:08 +02: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
5183fbd5db #4926 Summary Plot : Add "Plot Preview" to plot editor 2019-10-25 14:27:22 +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
Magne Sjaastad
f2fad7a975 #4926 Summary Templates : Set curve as selected object when case is imported 2019-10-25 13:15:02 +02:00
Kristian Bendiksen
9e1f50f198
Merge pull request #4921 from OPM/fix-contour-map-export-filename-4920 
#4920 Fix second contour map export file name suggestion.
 2019-10-25 12:52:41 +02:00
Magne Sjaastad
29c3ce0d06 #4903 Use helper function for action shortcut everywhere 2019-10-25 12:48:17 +02:00
Magne Sjaastad
f2d5adca60 #4926 Summary Templates : Avoid creation of one extra duplicate curve 2019-10-25 11:57:30 +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
e21e4f5008 Documentation : Updates for Python documentation 2019-10-25 11:20:27 +02:00
Kristian Bendiksen
1e8d1dbe8e Make "export contour map" dialog modal relative to 3D main window. 2019-10-24 21:58:50 +02:00
Kristian Bendiksen
5ecda9d4be #4920 Fix second contour map export file name suggestion. 2019-10-24 21:58:50 +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
Gaute Lindkvist
88a80c1b71 Renames of WelLLogTrack::Widths in create WBS feature 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
cf02211713 Introduce a new RiaPlotWindowRedrawScheduler 
* Also fix order in RiaViewRedrawScheduler.cpp file to match header
 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
0fd7f40e46 Stop reselecting on activation in plot view if a child is already selected 2019-10-24 09:10:34 +02:00
Gaute Lindkvist
3422f1b609 Fix view id in well allocation plots 2019-10-24 09:08:04 +02:00
Gaute Lindkvist
2d6e631107 Fix crash when changing application fonts 2019-10-24 09:07:19 +02:00
Gaute Lindkvist
3a90bf1e76 Use QwtPlotZoneItems instead of QwtPlotShapeItems for formations 2019-10-24 09:06:44 +02:00
Gaute Lindkvist
af72538516 Stop using gradient for AccumulatedPhaseFractionsPlot 2019-10-24 09:06:05 +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
4c48f557b0 #4822 Countour Map Export: Add export to context menu in 3D view 2019-10-23 17:03:09 +02:00
Magne Sjaastad
cb7e948fef #4904 Multiple restart-files : Fix wrong time step date 2019-10-23 12:43:34 +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
610535aecc #4819 Minor review tweaks. 2019-10-22 21:58:46 +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
fd9277f92d #4819 Export correct case and time step name for contour map. 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
eb829abf72 #4819 Replace default marker for undefined values with user-defined string. 2019-10-22 21:58:46 +02:00
Kristian Bendiksen
e692dfaf4f Add method to change default marker in RifTextDataTableFormatter. 2019-10-22 21:58:45 +02:00
Kristian Bendiksen
acddb4a156 #4819 Export correct UTM coordinates. 2019-10-22 21:58:45 +02:00
Kristian Bendiksen
847bd0736a #4819 Write contour map metadata header. 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
Kristian Bendiksen
174248087d #4819 Add option to exclude undefined values from contour map export. 2019-10-22 21:58:45 +02:00
Kristian Bendiksen
8e076b3acb #4821 Add python objects for Contour Map 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
2d2ce4a71e #4906 Ensemble Statistics Legend Icons : Fix missing symbol text 2019-10-22 13:14:16 +02:00
Magne Sjaastad
28ef4166ea #4775 Summary : Improve event handling and add shorcut 2019-10-22 10:39:18 +02:00
Kristian Bendiksen
c615c7507b #4820 Start using RicfCommand for RicExportContourMapToAsciiFeature. 2019-10-22 09:15:26 +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
Jacob Støren
ab190fce8b Fixed missing pragma once 2019-10-18 15:00:59 +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
3f617c93d2 #4893 Import Observed FMU data : Add error message 2019-10-18 14:36:53 +02:00
Magne Sjaastad
537184328a #4877 Refactor and rename to RiuSummaryQuantityNameInfoProvider 2019-10-18 14:28:02 +02:00
Magne Sjaastad
1cab88e9c5 #4877 Detect correct accumulation type for statistics curves 2019-10-18 14:22:15 +02:00
Jacob Støren
ceee8b6a85 #4857 Remove obsolete code 2019-10-18 10:20:22 +02:00
Jacob Støren
4253c32dac #4857 RicIntersectionBox[XYZ]SliceFeature 2019-10-18 10:17:50 +02:00
Gaute Lindkvist
905c34968f Added missing RicfSetPlotWindowSize files 2019-10-18 08:23:57 +02:00
Gaute Lindkvist
0e5b9687b4 Fix missing GeoMech result definition in Well Log Curves 2019-10-18 08:14:34 +02:00
Gaute Lindkvist
3eaf933efc Python command for setting plot window size 2019-10-18 08:12:36 +02:00
Jacob Støren
b785969d68 #4857 RicNewPolylineIntersectionFeature, RicNewAzimuthDipIntersectionFeature, RicIntersectionBoxAtPosFeature 2019-10-17 16:39:24 +02:00
Jacob Støren
03987a5f71 #4857 RicEclipsePropertyFilterNewInViewFeature, RicGeoMechPropertyFilterNewInViewFeature 2019-10-17 15:58:52 +02:00
Jacob Støren
5f9424f7b7 #4857 Fixed RicSelectColorResult 2019-10-17 15:40:36 +02:00
Jacob Støren
5a72de405d #4857 Add support to distinguish 3D-view commands done in the main and comparison view 
Support annotation and rangefilter creation in the comparison view
 2019-10-17 15:02:39 +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
39801a2018 #4857 Handle comparison views in the custom 3D navigation policies 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
bb74ac24f8
Merge pull request #4875 from OPM/fix-dual-porosity-issues 
Fix dual porosity issues
 2019-10-16 11:59:17 +02:00
Magne Sjaastad
61db98ef04 #4874 Dual Porosity : Missing active cells in some cases 2019-10-16 11:11:01 +02:00
Gaute Lindkvist
2ad42b7fcf Fix typo in CMake for set_cell_result.py 2019-10-16 10:31:58 +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
Gaute Lindkvist
bc8134009b #4867 Rename python examples to avoid mixed case 2019-10-15 16:31:40 +02:00
Gaute Lindkvist
d21afc5a41 #4866 Fix Python example script 2019-10-15 16:26:41 +02:00
Gaute Lindkvist
d3140b6aac
System command command file merger (#4845) 
* Move Import WellPaths command-file functionality into RicImportWellPaths

* Add new RICF_init macros for command file objects

* Make project save commands available in Python

* Fix RiaLogging build errors

* Move RiaLogging include from RiaGrpcServer.h to cpp file
 2019-10-15 15:46:19 +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
Jacob Støren
aee42f403b #4849 RiuViewer: Add support for a comparison gridbox 
Add support for controlling the Comparison view window
Use overlay rendering for overlay items
Add a removeColorLegend method
Update overlay positioning on each redraw
 2019-10-11 14:52:49 +02:00
Magne Sjaastad
c19bae3a07 #4852 Command Line : Enable commented code 2019-10-11 13:03:14 +02:00
Magne Sjaastad
0e2cee7295 #4852 Command Line : Add snapshotexportfolder 2019-10-11 12:35:41 +02:00
Magne Sjaastad
225893dcda #4852 Command Line : Add snapshotsize 2019-10-11 10:57:20 +02:00
Magne Sjaastad
4bfcf86962 #4847 Move setFixedWindowSizeFor3dViews to RiuMainWindowTools 2019-10-11 08:54:23 +02:00
Magne Sjaastad
69ff4d25f2 #4847 Command Line Snapshots : Make sure image size is handled correctly 2019-10-11 08:32:08 +02:00
Magne Sjaastad
75140c2406 #4765 Summary : Support command line snapshots without a project file 
Use current working directory as base, and create a sub folder named "snapshots". Export snapshots from the application into this folder.
 2019-10-09 15:21:51 +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
708d4b6197 Fix compile issue after RicImportWellPath rename 2019-10-09 11:00:11 +02:00
Gaute Lindkvist
ba528c9c0a Fix Python plot export 2019-10-09 10:51:24 +02:00
Gaute Lindkvist
a5e2e25b1b Fix CaseInfoStreamingExample.py 2019-10-09 10:35:16 +02:00
Gaute Lindkvist
9f0cf91789 Fix Pytest failures 2019-10-09 10:30:19 +02:00
Gaute Lindkvist
411e5cf49f Reintroduce nextValid-fields as OBSOLETE fields in RimProject 2019-10-09 10:29:42 +02:00
Gaute Lindkvist
32817d2cc6 Renamed RicWellPathsImportFileFeature to RicImportWellPaths 2019-10-09 09:27:26 +02:00
Gaute Lindkvist
2961782be1 Renamed caf::PdmXmlObjectHandle::isOfClassKeyword to ::inheritsClassWithKeyword 2019-10-09 09:26:30 +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
Magne Sjaastad
55224bed3d Fix signed/unsigned compare 2019-10-08 08:20:03 +02:00
Magne Sjaastad
1f181fa175 #4827 Completion Data : Guard index out of range 2019-10-08 08:01:25 +02:00
Magne Sjaastad
cc746a20cb #4828 Summary Plot Templates : Robustification 2019-10-08 07:27:45 +02:00
Magne Sjaastad
5a410ca8be #4828 Summary Plot Templates : Use regexp to match case and index 2019-10-07 12:05:14 +02:00
Magne Sjaastad
56a5a750f2 #4828 Summary Plot Templates : Improve robustness 2019-10-07 10:30:17 +02:00