Commit Graph
100 Commits
Author SHA1 Message Date
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
Gaute Lindkvist 3203881418 More improvements to column/rowspan system 2019-11-06 08:24:57 +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
Gaute Lindkvist 6d1d7bde23 Merge pull request #4986 from OPM/feature-view-id-tag
Add a view id tag to project tree and tooltip
2019-11-05 14:13:46 +01:00
Gaute Lindkvist f222f73718 #4984 Grid Cross Plot: Make sure pick point information is on top of highlighted curve 2019-11-05 11:09:18 +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
Gaute Lindkvist c7b5957571 #4983 Fix drag zoom on Summary and Grid cross plots 2019-11-05 11:09:18 +01:00
Gaute Lindkvist a6b6411b6b Fix compile warning in RigGeoMechWellLogExtractor.cpp 2019-11-01 08:26:59 +01:00
Gaute Lindkvist c5f5242f81 Fix compile warning in RifActiveCellsReader-Test.cpp 2019-11-01 08:26:34 +01:00
Gaute Lindkvist 32622ff250 Merge pull request #4959 from OPM/feature-combination-plot-2
Create Grid plot collection and allow creation of new combination plots
2019-10-31 15:54:34 +01:00
Gaute Lindkvist 5f72c03d52 Fix warning in RImSummaryCurvesCalculator 2019-10-31 15:37:30 +01:00
Gaute Lindkvist 39cefcd0bb Enable drag and drop of all plots in tree view 2019-10-31 15:34:16 +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
Gaute Lindkvist 35ecde99c8 Add an assert on object name to RiuWidgetStyleSheet 2019-10-30 12:54:52 +01:00
Gaute Lindkvist 5c79ff2573 Clean up RiuWidgetStyleSheet and add more comments 2019-10-30 12:54:51 +01:00
Gaute Lindkvist a925c0f29e Partial revert of 38e0b150 2019-10-30 12:54:51 +01:00
Gaute Lindkvist 9f927e74f3 Make RiuWidgetStyleSheet::refreshWidget() private 2019-10-30 12:00:19 +01:00
Gaute Lindkvist 4847f46840 Fix Stylesheets after review 2019-10-30 11:56:28 +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
Gaute Lindkvist 6c45c88619 Merge pull request #4923 from OPM/system-stylesheet-manager
Implement style sheet manager for more robush CSS management
2019-10-29 13:11:56 +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
Gaute Lindkvist 785f039a1d #4925 Add guard on view missing after d8a8a615 to RImViewLinker::findNameAndIconFromView 2019-10-25 11:48:51 +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
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
Gaute Lindkvist 7e5d358fa1 Simplified code following further review 2019-10-24 14:13:19 +02:00
Gaute Lindkvist 7bbe505d39 #4762 Fix ecl_grid_reset_actnum in the libecl-team suggested way 2019-10-24 14:13:19 +02:00
Gaute Lindkvist 1255c877d7 Revert "#4762 Fix reset_actnum libecl crash on load"
We will check in a different fix on recommendation by libecl team

This reverts commit 047136e8b8.
2019-10-24 14:13:19 +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
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
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
Gaute Lindkvist 2ad42b7fcf Fix typo in CMake for set_cell_result.py 2019-10-16 10:31:58 +02:00
Gaute Lindkvist 47eeed4a11 Merge pull request #4872 from OPM/system-python-pep8-fixes
System python pep8 fixes
2019-10-16 08:22:27 +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
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
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
Gaute Lindkvist 10e55d3e5f Fix legend update and remove Qt warnings 2019-10-04 10:27:15 +02:00
Gaute Lindkvist 09388b22c8 Avoid plot title dictating the plot width. 2019-10-04 08:50:35 +02:00
Gaute Lindkvist 45d6acadaa Fix Well Log Plot depth axis label 2019-10-03 15:45:20 +02:00
Gaute Lindkvist 1309db884d Simplify Well Log Plot events and updating 2019-10-03 15:32:35 +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
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 26b9466990 Update dev to 2019.08.2 2019-10-03 09:49:17 +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
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
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
Gaute Lindkvist 62c48d3cdb #4797 Alphabetize order of well log channels in LAS-file export 2019-09-30 15:35:15 +02:00
Gaute Lindkvist 288acda703 #4801 Prefix WBS-las export and capitalize file name 2019-09-30 15:35:15 +02:00
Gaute Lindkvist 7f4869f37c #4802 Change default colors of WBS plots 2019-09-30 15:35:15 +02:00
Gaute Lindkvist 2daa4dea93 Merge pull request #4794 from OPM/bug-#4790-subwindows
#4790 Window maximation state and other subwindow fixes
2019-09-30 15:35:04 +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
Gaute Lindkvist 7625da7a21 #4790 Make sure window maximation state is restored after project load + tiling fixes 2019-09-27 15:29:24 +02:00
Gaute Lindkvist 1e75c3aff6 Merge pull request #4771 from OPM/feature-ensemble-sources
Ensemble RFT: Keep matching sources when switching well  plus lots of other changes
2019-09-27 11:04:42 +02:00
Gaute Lindkvist f3dfba7a81 Fixup after review 2019-09-27 11:02:03 +02:00
Gaute Lindkvist 4852f729ff #4781 Make sure horizontal well log plot legends expand vertically if needed. 2019-09-27 10:22:07 +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 da6c7cf621 #4788 Ensemble RFT: fix missing statistics curves by having better bounds calculation for the curves. 2019-09-27 10:06:26 +02:00
Gaute Lindkvist 1968703da8 #4782 Well Log Plots: make default variable PORO 2019-09-27 10:06:15 +02:00
Gaute Lindkvist 79da8ba5b5 #4773 Ensemble RFT: load formation file when loading observed data 2019-09-26 15:43:13 +02:00