OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-09-03 20:53:13 -05:00
Code Issues Packages Projects Releases Wiki Activity
11,184 Commits 53 Branches 83 Tags
7f4869f37cd8e375cf6e269b715d0cc8d326e03e
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Magne Sjaastad 856596c366 Merge pull request #4791 from OPM/fix-e300-wrong-date 
#4770 Incorrect reporting of date for E300 in combination with lab units
 2019-09-27 14:41:48 +02:00
Magne Sjaastad 0c4de184b1 Merge pull request #4768 from OPM/bug-libecl-crash2 
#4762 Fix reset_actnum libecl crash on load
 2019-09-27 14:40:03 +02:00
Magne Sjaastad acb3c3e23b #4770 Incorrect reporting of date for E300 in combination with lab units 
User reports issues with import of dynamic properties for E300 simulation. E100 works as expected. For some reason, the date for all time steps for the E300 simulations is identical. This fix detects the situation, and use the double value from days vector as offset.
 2019-09-27 14:04:13 +02:00
Magne Sjaastad b8e36de943 #4707 Update web address for Help/User Guide/F1 2019-09-26 10:04:26 +02:00
Magne Sjaastad fd49edc91c Upped to 2019.08.1-dev.03 2019-09-26 07:21:26 +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
Magne Sjaastad f41edcee44 #4751 System : Use std::wstring to communicate file path 2019-09-23 13:37:29 +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 daf4132dec #4744 AppFwk : Auto scroll to first checked item 2019-09-20 14:19:26 +02:00
Magne Sjaastad f7b53aa666 Fix signed/unsigned compare 2019-09-20 14:19:17 +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 d4b64c58f2 Merge pull request #4740 from OPM/sync-tree-selection-with-field-value 
Sync tree selection with field value
 2019-09-20 11:19:52 +02:00
Magne Sjaastad a9080e14c3 #4722 AppFwk: Rename 2019-09-20 09:54:10 +02:00
Magne Sjaastad f4cfc750f1 AppFwk : Apply clang-format 2019-09-20 09:52:12 +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
Magne Sjaastad cba51615d8 #4722 Summary Plot Editor : Update current item in tree view 
Make sure the current selected item in the tree view is updated with the value in the underlying field.
 2019-09-20 09:44:26 +02:00
Magne Sjaastad 4d82a65d8b Merge pull request #4737 from OPM/plot-templates-rc2 
#4733 Summary Template : Add reload of templates
 2019-09-20 07:18:55 +02:00
Magne Sjaastad f088d99a02 Fix invalid case in file name 2019-09-19 14:32:35 +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
Magne Sjaastad 977771e3b0 Merge pull request #4734 from OPM/fwk-adjustments 
Add access to reference string
 2019-09-18 14:51:45 +02:00
Magne Sjaastad 01c615889b AppFwk : Add accessor functions to xml reference string 2019-09-18 14:17:49 +02:00
Magne Sjaastad 60b4078829 AppFwk : Guard for null pointer access 2019-09-18 14:17:44 +02:00
Magne Sjaastad eb31e9672f AppFwk : Remove clang-format 
As we now use clang-format on save in ApplicationCode, we need to remove the clang-format file until we decide to use clang-format for code in AppFwk.
 2019-09-18 14:17:39 +02:00
Magne Sjaastad f5d2e594a2 Merge pull request #4721 from OPM/disable-warnings-2 
Disable warnings
 2019-09-16 21:38:03 +02:00
Magne Sjaastad 528d4523bd System : Disable warnings 2019-09-16 21:23:11 +02:00
Magne Sjaastad fe8bd23cac System : Disable warnings 2019-09-16 20:30:49 +02:00
Magne Sjaastad 59616d5c65 AppFwk : Disable some warnings 2019-09-16 13:42:36 +02:00
Magne Sjaastad 29184f4475 System : Disable warnings 2019-09-16 13:33:05 +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 b6dcb6285e Merge pull request #4720 from OPM/minor-summary-adjustments 
Minor summary adjustments
 2019-09-13 20:32:25 +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
Magne Sjaastad 1cb1720327 #4688 Contour plot : Changing Base Time Step has no effect 2019-09-13 14:55:04 +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
Magne Sjaastad 9f47c35bce Merge pull request #4711 from OPM/upgrade_qwt 
Upgrade qwt
 2019-09-13 11:09:20 +02:00
Magne Sjaastad ecf5a67074 System : Upgrade to Qwt 6.1.4 
Avoid use of deprecated Qt functions like QString::null
 2019-09-13 10:07:49 +02:00
Magne Sjaastad 36303aa7bd #4710 Qt5 : Use QString() instead of QString::null 2019-09-13 10:02:52 +02:00
Magne Sjaastad 22e0a17c83 Update version to 2019.08.1-dev.02 2019-09-12 08:53:07 +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
Magne Sjaastad d045c0aade #4699 Guard use of TERNARY cell result in property filters 2019-09-11 13:31:15 +02:00
Magne Sjaastad 2d555e1b67 Fix missing include 2019-09-11 11:40:22 +02:00
Magne Sjaastad 1ec3694d64 Merge pull request #4697 from OPM/plot-templates-framework 
Plot templates framework
 2019-09-11 11:14:40 +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
Magne Sjaastad 4375bef031 #4644 Summary Plot: Fix missing update of plot title 2019-09-10 10:50:08 +02:00
Magne Sjaastad 8fdb43fe26 #4683 Adjust clang-format 2019-09-10 08:30:56 +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
Magne Sjaastad bf9f43c3b4 #4683 Adjust clang-format 2019-09-06 12:58:31 +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
Magne Sjaastad b1988d4cb5 Merge pull request #4685 from OPM/clang-format-4 
Apply clang-format on all files in ApplicationCode
 2019-09-06 11:36:43 +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
Magne Sjaastad 97d6638293 #4683 VizFwk : Make several header files self contained by include of cvfBase.h 2019-09-06 10:52:50 +02:00
Magne Sjaastad 03fd2c70fe #4683 System : Do not apply cotire on cafCommandFeatures 
This library is used by cmake as an OBJECT library, and this construction is not suported by cotire
 2019-09-06 10:52:45 +02:00
Magne Sjaastad 19c93170b3 #4683 System : Exclude QRC files from cotire 2019-09-06 10:52:36 +02:00
Magne Sjaastad e550b435e4 Merge branch 'master' into dev 
Adjust version to next development version
 2019-09-05 13:54:49 +02:00
Magne Sjaastad cdf1b85551 Set version number to 2019.08.1 2019-09-05 11:48:02 +02:00
Magne Sjaastad cfd303c67c Set version to 2019.08.01-rc1 2019-09-05 09:29:44 +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
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
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
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
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
Magne Sjaastad 68532567f2 AppFwk : Use Qt5 by default 2019-09-02 20:48:11 +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
Magne Sjaastad 4a50e5f4c6 #4652 Summary Curve Selector : Set case sensitivity to insensitive 2019-08-30 12:17:39 +02:00
Magne Sjaastad d38fbfee79 Merge pull request #4651 from OPM/system-include-unit-tests 
System : Include build of application unit tests
 2019-08-29 19:54:30 +02:00
Magne Sjaastad 3748ea097a Add missing include 2019-08-29 18:32:47 +02:00