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
13,140 Commits 27 Branches 61 Tags 309 MiB
f2696b003d
Commit Graph

459 Commits

Author SHA1 Message Date
Gaute Lindkvist
ea793c15f3 Fix ensemble selection if statistics curves are not shown 2019-12-06 08:13:31 +01:00
Gaute Lindkvist
0b5188e4b7 Fix updates after legend change 2019-12-06 08:13:31 +01:00
Gaute Lindkvist
08afc1f8d7 Add automatic name updating of EnsembleRftCurveSets 2019-12-06 08:13:31 +01:00
Gaute Lindkvist
9c458ec3ba Fixed typo in comment SFINA -> SFINAE 2019-12-06 08:13:31 +01:00
Gaute Lindkvist
7fd4aa1ce9 #5002 Ensemble RFT curve sets with parameter coloring and separate legends 2019-12-06 08:13:31 +01:00
Gaute Lindkvist
cd5b432267 #5171 Fix legend updates by getting rid of the show/hideEvent crash fix 
* The crash is instead fixed by getting rid of deleteLater()
 2019-12-04 12:34:17 +01:00
Gaute Lindkvist
8e94caceed Fix Well Allocation Plot depth axis zoom 2019-11-29 15:03:37 +01:00
Gaute Lindkvist
d05328e184 #5129 Fix depth ranges when curve units don't match display units 2019-11-29 15:03:37 +01:00
Jacob Støren
191419b6b4 clang-format after intersection rename 2019-11-26 13:56:02 +01:00
Gaute Lindkvist
dbee9759a0 #5063 Improve auto name for well log plots and use it for well allocation plots 2019-11-25 15:19:53 +01:00
Gaute Lindkvist
85d683634c Further refactoring 2019-11-20 13:14:45 +01:00
Gaute Lindkvist
228810fd05 Refactor view id 2019-11-20 13:14:45 +01:00
Gaute Lindkvist
d9043db5e0 Refactor RimPlotWindow and RimPlotInterface 2019-11-20 13:14:45 +01:00
Gaute Lindkvist
81db22586d Remove description-field from RimPlotWindow 
* Leave it to sub-classes to deal with this
 2019-11-20 13:14:45 +01:00
Gaute Lindkvist
60b09d7bfd #5061 WAP: fix update of well allocation data when changing depth type 2019-11-19 13:19:56 +01:00
Magne Sjaastad
40f95f349c #5053 Ensemble RFT : Avoid selection of large number of time steps 2019-11-15 13:11:19 +01:00
Magne Sjaastad
57f6ee0660 #5033 Ensemble RFT : Auto select first date if no date is matching 2019-11-13 11:12:51 +01:00
Magne Sjaastad
aa11e3601b #5020 Flow Diag : Avoid creating plots in constructor to make pytest work 2019-11-11 09:47:01 +01:00
Magne Sjaastad
cb89823474 #5020 Flow Diag : Improve default initialization of plots 2019-11-08 14:20:11 +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
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
Magne Sjaastad
57cab2457e clang-format : Set PenaltyBreakAssignment to 130 2019-11-04 15:08:09 +01:00
Magne Sjaastad
96a26662fc Janitor : Apply clang-format fixes on codebase in ApplicationCode 2019-11-04 11:34:34 +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
Gaute Lindkvist
30db19a1d0 Create Grid plot collection and allow creation of new combination plots 2019-10-31 14:09:50 +01: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
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
3422f1b609 Fix view id in well allocation plots 2019-10-24 09:08:04 +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
8f115a0b34 Avoid fallthrough in switch statement. 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
328cf44d94 #4851 Ensemble RFT : Fix update of color of ensemble curves on project load 2019-10-20 10:46:05 +02:00
Gaute Lindkvist
d681b75d24 Rename RifEclipseOutputDataTable* to RifTextDataTable* 2019-10-15 17:05:46 +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
f2eac1e2ec #4792 Fix xValue range for Well Allocation Plots 2019-09-30 15:35:15 +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
e242304b4d #4729 Ensemble RFT: Keep matching sources when switching well 2019-09-26 10:02:29 +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
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
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
63eac19c07 #4727 Apply initial default well path for new RFT Plots 2019-09-17 19:07:55 +02:00
Magne Sjaastad
29cb7cd8dc #4718 Qt5 : Use grab() instead of grabWidget() 2019-09-13 15:13:49 +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
Gaute Lindkvist
81cb97ead7 Fix memory leak 2019-09-09 13:14:20 +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
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
Gaute Lindkvist
8c4bb0e163 #4663 Fix loading of PLT plots with observed data 2019-09-03 14:42:01 +02:00
Gaute Lindkvist
789daed42b Interpolating MDvalues 2019-08-28 16:00:33 +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
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
Magne Sjaastad
b8f0fcd7e9 Flow Diag : Do not assert when tracername is not found 2019-07-30 11:23:31 +02:00
Magne Sjaastad
0f0e440185 #4136 Flow Characteristics : Avoid space in CSV column header 2019-06-25 18:18:47 +02:00
Magne Sjaastad
b2857676c8 #4136 Command File : Export of flow characteristics 2019-06-25 17:49:47 +02:00
Magne Sjaastad
56a53fedff Flow Characteristics : Load data in default plot when project is loaded 2019-06-23 19:00:14 +02:00
Magne Sjaastad
3c644629df #4136 Export of Flow Characteristics : Use CSV text export 2019-06-23 18:32:05 +02:00
Magne Sjaastad
7879fe186d #4136 Export of Flow Characteristics : Create text for export and add context menu 2019-06-23 15:18:17 +02:00
Magne Sjaastad
79df075fe4 #4136 Export of Flow Characteristics : Rename 2019-06-23 15:12:33 +02:00
Gaute Lindkvist
30769d7f2a Rename caf::PdmUiItem::setUiIcon(QString) to setUiIconFromResourceString 2019-05-06 11:08:59 +02:00
Gaute Lindkvist
57b33b0d4c
First implementation of Headless (#4392) 
* Revert "#4377 Octave : Use RiaLogging for error messages instead of QErrorMessage "

This reverts commit f758a8edb2.

* Revert "#4380 Preferences : Changing scene font size when geo mech view is open causes crash"

This reverts commit df62a41397.

* Revert "#4379 Documentation : Update command line parser for import of summary files"

This reverts commit d0b5357ed4.

* Unfinished WIP

* Builds but crashes

* Refactored code now builds and runs

* ResInsight can now run the unittests headless

* Can run some command files successfully

* Build on Linux

* Extra headless hack header

* Moved PdmUiItem hack to cpp file

* Fix headless crash in RimWellAllocationPlot

* Handle error gracefully if ExportSnapshots command is executed from console

* Add caf::QIconProvider and remove some hacks

* Also made the greying out of disabled icons work for a couple of cases where it didn't.

* Linux build fix

* #4380 Reimplement fix df62a41397 by @magnesj on top of Headless code changes

* #4379 Reintroduce kode from d0b5357ed4 by @magnesj

* #4377 Restore f758a8edb2 in new Headless code
 2019-05-06 10:36:05 +02:00
Magne Sjaastad
b6c9e3b278 #4363 RFT plots: For Measured Depths PL is sometimes used for grid pressures 2019-04-25 16:02:47 +02:00
Magne Sjaastad
e486432391 #4276 RFT-plot: Add support for Measured Depth as Y-axis 2019-04-03 12:27:49 +02:00
Magne Sjaastad
77dbd8a25f Whitespace 2019-03-27 19:20:42 +01:00
Magne Sjaastad
d0a23252ab #4239 Show Well Allocation Plots: Add well name to suggested view name 2019-03-27 19:19:19 +01:00
Magne Sjaastad
907337015f Minor refactoring fixes 2019-03-12 09:22:48 +01:00
Magne Sjaastad
f7600199c7 Fix whitespace and includes 2019-03-12 09:22:48 +01:00
Magne Sjaastad
246326229e #4189 RFT Plot : Move common code to RifEclipseRftAddress 2019-03-12 09:22:48 +01:00
Magne Sjaastad
564ab1d84b #4189 RFT Plot : Separate request based on PLT/RFT plot 2019-03-12 09:22:48 +01:00
Gaute Lindkvist
1e994ac8b8 #4117 Improve time step names for Grid Cross plot categorisation 2019-02-27 11:38:35 +01:00
Magne Sjaastad
4eea7e91ee #4093 RFT Plot : Not possible to select both RFT and Grid as source at the same time 
Avoid updating the UI selections based on curves in defineUiOrdering
 2019-02-15 10:53:56 +01:00
Magne Sjaastad
157ff774e8 #4068 System : Add forward declare 2019-02-12 14:49:37 +01:00
Jacob Støren
5fe4a057ce #3958 Fix warning and error from refactoring 2019-01-29 08:35:42 +01:00
Jacob Støren
dbb2a564a2 #3958 Refactoring: RigCaseCellResultsData: Remove the final result index based interface 2019-01-28 16:18:28 +01:00
Jacob Støren
3e3d3871ed #3958 Refactoring: Remove scalarResultIndex from RigEclipseResultAddress 
and real external use (outside CaseCellResultsData)
Regression tests OK.
 2019-01-25 16:19:15 +01:00
Jacob Støren
ccfee8f34a #3958 Starting refactoring of eclipse results addressing 
Preparations for time diff results
 2019-01-25 16:19:13 +01:00
Magne Sjaastad
a9c7773ef7 CppCheck : Fix various minor issues 2018-12-21 12:32:57 +01:00
Magne Sjaastad
be77e4e048 CppCheck : Guard null pointer access 2018-12-21 12:31:42 +01:00