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,405 Commits 27 Branches 61 Tags 309 MiB
a51219b1ca
Commit Graph

9557 Commits

Author SHA1 Message Date
Gaute Lindkvist
e242304b4d #4729 Ensemble RFT: Keep matching sources when switching well 2019-09-26 10:02:29 +02:00
Gaute Lindkvist
4709bb1402 #4769 Remove stepping toolbar for Ensemble RFT. 
* It doesn't work right and the usefulness is limited.
 2019-09-26 09:18:55 +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
931e7dc42d #4767 Fix selection of view subitems jumps to view 2019-09-25 15:58:28 +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
Jacob Støren
bfff15568d #4712 Fix stray widgets in Plot Property Panel 
Added comments showing that the reason is mainly deleteLater beeing called outside all event loops
 2019-09-25 13:09:47 +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
Magne Sjaastad
611e1f24d3 #4753 Fix selection of plot subitems jumps to parent plot 2019-09-24 12:35:03 +02:00
Magne Sjaastad
980d483024
Merge pull request #4752 from OPM/use-wstring-for-file-path 
#4751 System : Use std::wstring to communicate file path
 2019-09-24 11:09:01 +02:00
Magne Sjaastad
e3aa160265
Python doc adjustments (#4756) 
* Doc and adjustments of project.py

* Doc and adjustments view.py

* Python doc cleanup

* Python : Add copy of files to deployment folder

* Python : Several updates to doc

* Python : Limit line lenghts

* Minor adjustments
 2019-09-24 11:06:24 +02:00
Gaute Lindkvist
8209adfe91 Python: Fix wrong use of enumerate 2019-09-24 09:58:50 +02:00
Gaute Lindkvist
0a6128de0f Fix wrong Grid->grid rename in GRPC CMakeLists.cmake 2019-09-24 08:59:52 +02:00
Jacob Støren
77062e4c45
Merge pull request #4754 from OPM/bugfixes-new-summary-plot-features 
Bugfixes new summary plot features
 2019-09-23 20:39:56 +02:00
Gaute Lindkvist
0125b13241 Additional python PEP 8 fixes 2019-09-23 15:26:49 +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
Magne Sjaastad
f41edcee44 #4751 System : Use std::wstring to communicate file path 2019-09-23 13:37:29 +02:00
Jacob Støren
bb6d465a51 #4748 Hide the text based curve editor from cross plots 2019-09-23 12:34:10 +02:00
Jacob Støren
10a532a3b5 #4747 Fixed Summary Command Line -e/c/cl combined with -s 2019-09-23 11:58:53 +02:00
Gaute Lindkvist
a2bad82391
#4736 System python command refactor (#4743) 
* Move case loading commands from Commands to project and case
* Major refactor
* Fix problems with Python examples
* Add ability to export snapshot from just one view + fixup
* Case comments and black
* Make all modules pass pylint test
 2019-09-23 11:50:33 +02:00
Magne Sjaastad
00eb02ccec
Merge pull request #4745 from OPM/sync-tree-selection-with-field-value 
Auto scroll to checked item
 2019-09-20 14:58:30 +02:00
Magne Sjaastad
385207eebe Compare with correct enum 2019-09-20 14:50:41 +02:00
Magne Sjaastad
f7b53aa666 Fix signed/unsigned compare 2019-09-20 14:19:17 +02:00
Gaute Lindkvist
374a4e396b
Merge pull request #4738 from OPM/system-python-renames-pep8 
#4736 Renames of python methods and variables to match PEP8
 2019-09-20 12:23:34 +02:00
Magne Sjaastad
a7c92a43e5 #4741 Summary Plot Editor : Add first item in intermediate selection when summary vector is selected 2019-09-20 12:08:57 +02:00
Magne Sjaastad
a9080e14c3 #4722 AppFwk: Rename 2019-09-20 09:54:10 +02:00
Magne Sjaastad
b92618ebd3 #4722 Summary Plot Editor : Set the current category to the first selected category 2019-09-20 09:45:15 +02:00
Gaute Lindkvist
2b33592c66 Example renames 2019-09-19 15:14:01 +02:00
Gaute Lindkvist
502a1532b6 #4736 View.py renames 2019-09-19 15:02:55 +02:00
Magne Sjaastad
f088d99a02 Fix invalid case in file name 2019-09-19 14:32:35 +02:00
Gaute Lindkvist
3aa3bb67a7 #4736 Properties renames 2019-09-19 14:25:38 +02:00
Gaute Lindkvist
ca919402e9 fixes 2019-09-19 14:10:52 +02:00
Gaute Lindkvist
505660f9d6 #4736 Project renames 2019-09-19 14:02:23 +02:00
Gaute Lindkvist
9a0f135431 #4736 test fixes 2019-09-19 13:56:29 +02:00
Gaute Lindkvist
9bc2781817 #4736 Instance.py renames 2019-09-19 13:34:34 +02:00
Gaute Lindkvist
8ff0c05760 #4736 GridCaseGroup.py renames 2019-09-19 13:27:26 +02:00
Gaute Lindkvist
0657bd1f11 #4736 Commands.py renames 2019-09-19 13:25:04 +02:00
Gaute Lindkvist
e5987c26d7 #4736 Case.py renames 2019-09-19 13:15:58 +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
c6dbc34183 Fix QString arg issue in Ensemble RFT error message 2019-09-19 10:53:06 +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
fe8bd23cac System : Disable warnings 2019-09-16 20:30:49 +02:00
Magne Sjaastad
8a7dee705a System : Move include and compiler defs to ApplicationCode 2019-09-16 13:29:44 +02:00
Magne Sjaastad
8c189922e0 System : Move include of Eigen into ApplicationCode 2019-09-16 13:18:56 +02:00
Magne Sjaastad
f7a36e1c99 #4709 Summary Plot Editor : Increase height for summary vector widgets 2019-09-13 20:29:29 +02:00
Magne Sjaastad
8e3e16c7e6 #4709 Summary Plot Editor : Avoid default selection of field vectors 2019-09-13 19:16:06 +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
da47acfc1c #4644 Summary Plot: Fix missing update of plot title 2019-09-13 13:46:56 +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
Jacob Støren
9f494798a9 Whitespace 2019-09-13 11:12:58 +02:00
Magne Sjaastad
36303aa7bd #4710 Qt5 : Use QString() instead of QString::null 2019-09-13 10:02:52 +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
2d555e1b67 Fix missing include 2019-09-11 11:40:22 +02:00
Magne Sjaastad
0939b41120 Summary : Make sure field vectors are displayed 2019-09-11 10:54:41 +02:00
Magne Sjaastad
c7bbd14143 Add missing include 2019-09-11 09:56:32 +02:00
Magne Sjaastad
fe4fe36ee9 Refactor : Split calculateValueOptions to separate helper functions 2019-09-11 09:40: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
Magne Sjaastad
87afbaf586 Summary : Propagate uiConfigName to curveSelectionEditor 2019-09-11 09:29:21 +02:00
Magne Sjaastad
b616864416 System : Remove obsolete includes 2019-09-11 09:25:00 +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
b8eeb2cc2b
Merge pull request #4693 from OPM/feature-plot-color-fill 
#4666 Add colour fill for formations in Well Log Plots
 2019-09-11 08:55:22 +02:00
Gaute Lindkvist
baa266f0f9 Improve lines and shading 2019-09-10 16:52:32 +02:00
Gaute Lindkvist
0305399c26 Shift Well Log tracks when deleting a track 2019-09-10 15:21:43 +02:00
Gaute Lindkvist
06cea12447 #4666 Support color fill for formations in Well Log Tracks 2019-09-10 13:23:29 +02:00
Magne Sjaastad
4375bef031 #4644 Summary Plot: Fix missing update of plot title 2019-09-10 10:50:08 +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
Magne Sjaastad
8fdb43fe26 #4683 Adjust clang-format 2019-09-10 08:30:56 +02:00
Gaute Lindkvist
a96d959d16
Merge pull request #4686 from OPM/system-refactor-welllogplot 
#4665 System refactor welllogplot
 2019-09-10 08:26:32 +02:00
Gaute Lindkvist
edbe4f5a35 Align scrollbar with tracks 2019-09-09 16:00:52 +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
Magne Sjaastad
98e6ff189b System : Avoid extremely large construction statement 
Roll out initialization to multiple insert() instead of one large initialization statement. The previous solution causes trouble/warnings on some compilers.
 2019-09-06 14:11:22 +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
Magne Sjaastad
bf9f43c3b4 #4683 Adjust clang-format 2019-09-06 12:58:31 +02:00
Gaute Lindkvist
acc9fe316e Reduce spacing around Well Log Plot Title 2019-09-06 12:54:03 +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
d44598c070 #4657 Remove unused parameter 2019-09-06 12:44:41 +02:00
Magne Sjaastad
eb4f44d4d2 #4657 Remove unused functions 2019-09-06 12:43:21 +02:00
Magne Sjaastad
ee11932546 cppcheck : Avoid mix of signed/unsigned and remove unused code 2019-09-06 12:42:19 +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
c2b4e6b6ca clang-format on all files in ApplicationCode, run two 2019-09-06 10:57:31 +02:00
Magne Sjaastad
fe9e567825 #4683 clang-format on all files in ApplicationCode 2019-09-06 10:57:22 +02:00
Magne Sjaastad
3a317504bb #4683 Fix line endings and execute clang-format 2019-09-06 10:56:43 +02:00
Magne Sjaastad
e99b008884 #4683 Adjust clang-format 2019-09-06 10:55:15 +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
e6a92cc3be Fix crash in plot picker 2019-09-04 20:25:41 +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
c8726e667d #4672 Bundle missing Qt5 libs 2019-09-04 11:11:02 +02:00
Gaute Lindkvist
322b755f24 #4661 Python: Fix pip-package generation and add instructions 2019-09-04 11:02:25 +02:00
Magne Sjaastad
6f9236d8e9 Python Doc : Add Python logo 2019-09-04 11:02:18 +02:00
Magne Sjaastad
b01ee88fe0 Python doc : Split into three python documents 2019-09-04 11:02:09 +02:00
Magne Sjaastad
2497adf92c Python doc : Add more tables 2019-09-04 11:01:32 +02:00
Magne Sjaastad
8e8aeaed6d Python Doc : Add examples 2019-09-04 10:59:15 +02:00
Magne Sjaastad
cf1b9f40b7 Python doc : Added examples page 2019-09-04 10:58:13 +02:00
Gaute Lindkvist
d30c289b64 #4655 Python Fix crash when streaming properties to ResInsight 2019-09-04 10:58:12 +02:00
Magne Sjaastad
35b596a53c Python doc : Add doc directly in client code for export flow characteristics 2019-09-04 10:58:12 +02:00
Magne Sjaastad
89883c8606 Python doc : Add more doc and example for timestep class 2019-09-04 10:57:46 +02:00
Gaute Lindkvist
48a4b18289 #4626 Add support for printing debug info for Python 2019-09-04 10:57:46 +02:00
Gaute Lindkvist
1aafed74e3 gRPC: bundle grpcio-tools rather than just grpcio 2019-09-04 10:57:46 +02:00
Gaute Lindkvist
2d72e157f9 Python: updated AppInfo.py to reflect merger of App and Instance 2019-09-04 10:57:11 +02:00
Gaute Lindkvist
eacd457483 Update WellPathGeometryTools after review 2019-09-04 10:54:41 +02:00
Gaute Lindkvist
686d3f0189 Remove debug messages from RimWellLogRftCurve 2019-09-04 08:13:37 +02:00
Gaute Lindkvist
3244e868e7 #4672 Bundle missing Qt5 libs 2019-09-03 19:09:31 +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
Gaute Lindkvist
b93f4fac0f #4661 Python: Fix pip-package generation and add instructions 2019-09-03 12:25:02 +02:00
Magne Sjaastad
0237e885ad Python Doc : Add Python logo 2019-09-03 11:10:59 +02:00
Magne Sjaastad
b287e2e128 Python doc : Split into three python documents 2019-09-03 10:59:00 +02:00
Magne Sjaastad
70394f95e5 Python doc : Add more tables 2019-09-03 10:55:26 +02:00
Gaute Lindkvist
b5964063a3 Better spline handling 2019-09-03 09:58:44 +02:00
Magne Sjaastad
f77882058b Python Doc : Add examples 2019-09-03 07:25:51 +02:00
Magne Sjaastad
2e6d86d213 Python doc : Added examples page 2019-09-02 21:17:21 +02:00
Gaute Lindkvist
551e459942 #4655 Python Fix crash when streaming properties to ResInsight 2019-09-02 15:12:22 +02:00
Magne Sjaastad
97f18962de Python doc : Add doc directly in client code for export flow characteristics 2019-09-02 15:11:34 +02:00
Magne Sjaastad
ca644ba477 Python doc : Add more doc and example for timestep class 2019-09-02 14:55:21 +02:00
Gaute Lindkvist
5d8feb1536 Use splines and more robust mechanism 2019-08-30 15:23:11 +02:00
Magne Sjaastad
4a50e5f4c6 #4652 Summary Curve Selector : Set case sensitivity to insensitive 2019-08-30 12:17:39 +02:00
Gaute Lindkvist
20e90bc172 More work on interpolation 2019-08-29 22:30:15 +02:00
Magne Sjaastad
3748ea097a Add missing include 2019-08-29 18:32:47 +02:00
Gaute Lindkvist
7a29e1a35a
Merge pull request #4648 from OPM/feature-ensemble-rft 2019-08-29 09:10:37 +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
Magne Sjaastad
ee7f97b6d4 Whitespace 2019-08-28 13:38:06 +02:00
Gaute Lindkvist
2c6191c94b
Merge branch 'dev' into feature-ensemble-rft 2019-08-28 12:56:27 +02:00
Magne Sjaastad
4d7ff7cf2a Add keywords based on 2019.08 2019-08-28 12:47:34 +02:00
Magne Sjaastad
072c71d8c9
Merge pull request #4647 from OPM/feature-#4583-summary-without-rft 
Feature #4583 summary without rft
 2019-08-28 12:46:03 +02:00
Gaute Lindkvist
8cd7f7fa52 #4626 Add support for printing debug info for Python 2019-08-28 11:50:18 +02:00
Gaute Lindkvist
fd41f91ec5 Fix build issues by adding RiaLogging.h to RicSummaryPlotFeatureImpl.cpp 2019-08-28 11:36:29 +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
0770517c9f #4587 Summ. Comm. Line: Use only cases defined in --summaryplot when creating curves. Use first of them as history refernce etc. 2019-08-28 10:12:53 +02:00
Jacob Støren
46104f426a #4573 --summaryplot now creates multiple plots. one pr summary vector matching the vector filters. Added option -s to create a single plot 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
c628fcd5f4 Added warnings when a summary vector filter is not matching any vectors in a case. 2019-08-28 10:12:53 +02:00
Jacob Støren
1534a045c7 #4001 implement -nl and -h sub-options for --summaryplot 2019-08-28 10:12:52 +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
6880483453 gRPC: bundle grpcio-tools rather than just grpcio 2019-08-27 15:49:49 +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
6cd37e1130 Python: updated AppInfo.py to reflect merger of App and Instance 2019-08-27 10:46:24 +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
7b9e6677ff GRPC: Move to version strings rather than int to avoid octal numbers 2019-08-26 15:48:20 +02:00
Gaute Lindkvist
8294408050
Merge pull request #4633 from OPM/feature-default-scriptpath 
#4535  Add default script path with Python examples
 2019-08-26 12:56:57 +02:00
Gaute Lindkvist
2c5ca4ce46 Import and plot of FMU RFT data works 2019-08-26 12:52:07 +02:00
Gaute Lindkvist
82e674d6cd
Merge pull request #4632 from OPM/bug-#4629 
#4629 Fix setting and reading of summary time values
 2019-08-26 12:39:01 +02:00
Gaute Lindkvist
f76c67dab3 Ensemble RFT: reduce number of points in statistics curves -> makes them less squiggly 2019-08-26 11:58:31 +02:00
Gaute Lindkvist
4bddefeb0c #4608 Add only one legend item per RFT ensemble 2019-08-26 11:58:18 +02:00
Gaute Lindkvist
510ea3f8be Fix build problem on Linux in RicSUmmaryPlotFeatureImpl 2019-08-26 11:57:05 +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
f1ccf4550f #4535 Add default script path with Python examples 2019-08-26 11:39:49 +02:00
Gaute Lindkvist
1009f1ff45 #4629 Fix setting and reading of summary time values 2019-08-26 11:38:41 +02:00
Magne Sjaastad
7d5df167fd Make sure all plot windows are resized to predefined size 2019-08-26 11:00:09 +02:00
Magne Sjaastad
4b92427a4d
Merge pull request #4630 from OPM/release-adjustments 
Release adjustments
 2019-08-26 10:33:04 +02:00
Gaute Lindkvist
222f230687
#4578 Add commands for create and clone view (#4625) 2019-08-26 10:04:44 +02:00
Gaute Lindkvist
a1f9c4c1cd Comment for circular import of Python module 2019-08-26 10:03:56 +02:00
Gaute Lindkvist
09c1ba26b3
Merge pull request #4628 from OPM/feature-python-command-line 
#4610 Python: Add support for sending in command line arguments when launching ResInsight
 2019-08-26 10:02:21 +02:00
Magne Sjaastad
896d086d0d Rename tab name to Plotting 2019-08-26 10:02:02 +02:00
Gaute Lindkvist
51793ea7b3 Fix error in CloneView result 2019-08-26 10:01:40 +02:00
Magne Sjaastad
88ca2c558d Move data and time format to plotting 2019-08-26 10:00:13 +02:00
Gaute Lindkvist
e7f90c0ecf Clang-format 2019-08-26 09:57:50 +02:00
Magne Sjaastad
afc2b21708 Add more data format variants 2019-08-26 09:56:17 +02:00
Magne Sjaastad
cae2d13aeb Fix implicit type conversion issues 2019-08-23 16:43:05 +02:00
Magne Sjaastad
94a967cea4 #4624 Customization of date format: Make sure time is reported above date 2019-08-23 16:23:07 +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
f279aeced7 #4610 Enable command line options and port number in rips.Instance.launch() 2019-08-23 15:31:44 +02:00
Gaute Lindkvist
72a954e9f7 Python: Stop copying Python files to build folder. 2019-08-23 15:31:32 +02:00
Gaute Lindkvist
7951899717 #4624 Allow customization of date/time components in labels 2019-08-23 14:28:11 +02:00
Magne Sjaastad
529f181689 #4601 Make sure 3D main window is focus window when opening grid 2019-08-23 14:01:01 +02:00
Magne Sjaastad
d663ea2ae7 Documentation updates 2019-08-23 11:44:28 +02:00
Magne Sjaastad
d6c80f52a7 Documentation updates 2019-08-23 11:42:14 +02:00
Magne Sjaastad
45b53af1be #4611 Python : Remove reference do deleted module App 2019-08-23 11:42:14 +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
a86ae13bb7 Rename command line argument to --server 2019-08-22 14:42:14 +02:00
Magne Sjaastad
4dcd7663c9
Merge pull request #4618 from OPM/feature-python-instance-app 
#4611 Merge Python classes app and instance
 2019-08-22 14:19:37 +02:00
Gaute Lindkvist
4afe159f91 #4611 Remove App.py 2019-08-22 14:16:51 +02:00
Magne Sjaastad
8c7d7e8711
Merge pull request #4620 from OPM/bug-#4617 
#4617 Disallow creating ensemble curve sets if you have no ensemble
 2019-08-22 14:16:12 +02:00
Gaute Lindkvist
fb4aff4836 GRPC Build issues: make sure we don't run configure_file on generated sources 2019-08-22 13:32:25 +02:00
Gaute Lindkvist
84c1442af7 #4617 Disallow creating ensemble curve sets if you have no ensemble 2019-08-22 13:07:21 +02:00
Gaute Lindkvist
5b0d77f19a Configure setup.py and RiaVersionInfo.py first 2019-08-22 12:53:08 +02:00
Gaute Lindkvist
e03b578075 Install from Python source directory and not binary directory 2019-08-22 12:53:07 +02:00
Gaute Lindkvist
07cb9e52cb #4611 Merge python classes App and Instance 2019-08-22 11:32:08 +02:00
Gaute Lindkvist
28bb8641d2 #4615 Make Python code show up in Visual Studio project 2019-08-22 10:42:55 +02:00
Magne Sjaastad
f13f6c29e7
Merge pull request #4613 from OPM/bug-#4612 
#4612 Fix build error without GRPC
 2019-08-22 09:33:59 +02:00
Gaute Lindkvist
52c9830192 Python: remove text reference to GRPC from About dialog 2019-08-22 08:50:58 +02:00
Gaute Lindkvist
9a2cf3d1ce #4612 Fix build error without GRPC 2019-08-22 08:38:49 +02:00
Gaute Lindkvist
4af1963ac0
#4551 Optionally Bundle grpcio Python module and dependencies (#4602) 
* #4551 Optionally Bundle grpcio Python module and dependencies

* More status messages
 2019-08-21 15:29:25 +02:00
Gaute Lindkvist
7bfe4f4bfe
#4603 Python: add case Id to exportSnapshots (#4604) 
* #4603 Python: add case Id to exportSnapshots
* Fixup after review
 2019-08-21 15:11:29 +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
Magne Sjaastad
97c795cda4 Remove duplicate function hiding base class implementation 2019-08-19 21:07:35 +02:00
Gaute Lindkvist
6c0e2bb3ad #4597 Python: add exportSnapshots example and more comments in examples 2019-08-19 13:48:36 +02:00
Gaute Lindkvist
edfb39c9b7 #4596 Python: Add gridPath method to Case and add simpler activeCellInfo method 2019-08-19 13:48:36 +02:00
Gaute Lindkvist
68d3ffdbb2 #4596 fix applyCellResult legend range 2019-08-19 13:48:36 +02:00
Jacob Støren
2d2ecc3031 Recursive Import Dialog: Cleaned up code 2019-08-19 11:44:19 +02:00
Jacob Støren
3d9ed39795 Recursive Import Dialog: Fixed "/*" not working on linux. 
Layout changes: Removed Files Found label.
Moved Effective Filter and Find button into the Filter group
Higher minimumsize for result list
 2019-08-19 11:16:24 +02:00
Jacob Støren
f6ae265b38 Recursive import Dialog: Fix missing progress info at certain times 2019-08-19 11:16:24 +02:00
Jacob Støren
8c144dce7f #4589 Recursive Import Dialog: Merged Root and path filter into one field 
Add "Root" label to show the root of the found files
 2019-08-19 11:16:24 +02:00
Jacob Støren
7939e457f8 #4589 Recursive Import Dialog: Rename to RicRecursiveFileSearchDialog 2019-08-19 11:16:24 +02:00
Jacob Støren
19126d96ec #4589 Recursive Import Dialog: Add a method to extract the root path from a search path string. Also added unit test for this 2019-08-19 11:16:24 +02:00
Jacob Støren
9a21ceb74f #4589 Recursive Import Dialog: Rename widgets to distinguish them from data 2019-08-19 11:16:24 +02:00
Magne Sjaastad
17876c76ae #4562 Summary : Group LGR categories at bottom of list 2019-08-19 10:10:45 +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