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,580 Commits 53 Branches 83 Tags
544c1605106e9ecae44d0a82549b4ed6c558d2ae
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 585a496db7 Merge pull request #5021 from OPM/improve-default-flow-diag-plots 
#5020 Flow Diag : Improve default initialization of plots
 2019-11-08 15:25:35 +01:00
Magne Sjaastad cb89823474 #5020 Flow Diag : Improve default initialization of plots 2019-11-08 14:20:11 +01:00
Magne Sjaastad 66b0184971 Summary Command Line : Help text adjustments 2019-11-08 12:45:08 +01:00
Magne Sjaastad 157219e63d #5015 libecl : Make sure *.UNSMRY is closed properly after data is read 
Earlier attempts to fix this caused major performance issues. Now closing the file stream when reading of vector data is completed, seems to work as expected.
 2019-11-08 11:12:06 +01:00
Magne Sjaastad 4c9048cd6a Revert "#5015 libecl : Make sure *.UNSMRY is closed properly after data is read" 
This reverts commit f1070cdb82.
 2019-11-08 11:05:14 +01:00
Magne Sjaastad f1070cdb82 #5015 libecl : Make sure *.UNSMRY is closed properly after data is read 2019-11-08 08:58:33 +01:00
Magne Sjaastad c7e97b4447 Merge pull request #5008 from OPM/avoid-virtual-method-constructors 
Avoid virtual calls in constructor and desctructors
 2019-11-07 09:46:36 +01:00
Magne Sjaastad 70d220ae19 Janitor : Remove unused variable 2019-11-07 09:44:50 +01:00
Magne Sjaastad d1ca612e3a System : Add doxygen generation of Project Data Model 2019-11-07 09:28:11 +01:00
Magne Sjaastad 388b92c092 #5007 Janitor : Do not call virtual methods from constructors 2019-11-07 09:01:31 +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
Magne Sjaastad 9f320c1dda Merge pull request #5000 from OPM/move-3d-settings-to-system-tab 
Move 3d settings to system tab
 2019-11-06 12:45:34 +01:00
Magne Sjaastad 25d2ee0e27 Merge pull request #4989 from OPM/import-ascii-data-to-simulation-case 
Import ascii data to simulation case
 2019-11-06 11:35:35 +01:00
Magne Sjaastad dc983b5b84 #4982 Preferences : Add groups to System tab 2019-11-06 11:32:17 +01:00
Magne Sjaastad 0b3e5ecf0c #4982 Preferences : Move Show 3D information to development tab 2019-11-06 11:22:03 +01:00
Magne Sjaastad 2aa704b18a #4982 Preferences : Move Use Shaders to development tab 2019-11-06 11:10:33 +01:00
Magne Sjaastad 28c77d4b67 #82 Import Ascii-data : Minor code adjustments 2019-11-06 10:54:42 +01:00
Magne Sjaastad be1781fd3b AppFwk : Make sure painter->save always matches painter->restore 2019-11-06 10:36:05 +01:00
Magne Sjaastad c090992342 Rename to Stop Comparison 2019-11-06 10:15:51 +01:00
Magne Sjaastad 309e4f9f31 #4993 Fix import property from text file when LGR is present 2019-11-06 09:39:27 +01:00
Magne Sjaastad 791de201b3 #82 Import Ascii-data : Add icon and move item in context menu 2019-11-06 09:38:32 +01:00
Magne Sjaastad 16536cfde7 Fix missing return statement 2019-11-05 15:47:32 +01:00
Magne Sjaastad 03d13f668b Merge pull request #4980 from OPM/adjust-clang-format 
Adjust clang-format settings
 2019-11-04 20:29:09 +01:00
Magne Sjaastad 57cab2457e clang-format : Set PenaltyBreakAssignment to 130 2019-11-04 15:08:09 +01:00
Magne Sjaastad 7c8cf60dba clang-format : Set AllowAllParametersOfDeclarationOnNextLine to false 2019-11-04 14:35:41 +01:00
Magne Sjaastad 946f9e7f91 Merge pull request #4979 from OPM/clang-format-fixes 
Janitor : Apply clang-format fixes on codebase in ApplicationCode
 2019-11-04 14:28:07 +01:00
Magne Sjaastad 96a26662fc Janitor : Apply clang-format fixes on codebase in ApplicationCode 2019-11-04 11:34:34 +01:00
Magne Sjaastad c5e3bc6898 Merge pull request #4978 from OPM/improve-history-curve-symbol-colors 
Improve history curve symbol colors
 2019-11-04 11:03:05 +01:00
Magne Sjaastad e8cdf1a8ef Janitor : Remove boolean function always returning true 2019-11-04 10:16:29 +01:00
Magne Sjaastad 9ae07c838a #4919 Summary Plot : Improve colors of history curve symbols 2019-11-04 10:15:57 +01:00
Magne Sjaastad e70ef260cc Merge pull request #4976 from OPM/placeholder-text-combo-box 
Summary : Add placeholder text to combo box editor
 2019-11-03 19:12:33 +01:00
Magne Sjaastad a950852559 #4972 Summary : Add placeholder text to combo box editor 2019-11-03 14:49:08 +01:00
Magne Sjaastad ee3f6a5a43 Merge pull request #4975 from OPM/janitor-issues-2 
Janitor issues (2)
 2019-11-03 14:47:13 +01:00
Magne Sjaastad cd054f2170 Janitor : Use const ref when possible (2) 2019-11-03 14:08:21 +01:00
Magne Sjaastad b46124efd7 Janitor : Use const ref when possible 2019-11-03 12:19:24 +01:00
Magne Sjaastad 93f6bc8c72 Janitor : Remove invalid conditionals 2019-11-03 11:43:46 +01:00
Magne Sjaastad 4ff56c7751 Janitor : Set copy constructor and assignment operator deleted 2019-11-03 11:14:48 +01:00
Magne Sjaastad 688750dfab Janitor : Make sure normalization of second vector also is verified 2019-11-03 08:54:12 +01:00
Magne Sjaastad f35edc302f Janitor : Remove double if statement with identical test 2019-11-03 08:50:08 +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
Magne Sjaastad 18eee02bb1 #4966 tNav Crash on import : Guard null pointer access in flow diag library 2019-11-02 07:38:23 +01:00
Magne Sjaastad 32b5d7696d System : Remove build warnings (#4963) 2019-11-01 10:00:07 +01:00
Magne Sjaastad a5aa49c705 #4961 Summary : Fix description of some vectors 2019-10-31 18:54:27 +01:00
Magne Sjaastad 3009737636 Upped to version 2019.08.2-dev.05 2019-10-31 18:47:16 +01:00
Magne Sjaastad e042b2d17b #4958 Summary adjustments : Rename to Last used summary template 2019-10-31 11:55:53 +01:00
Magne Sjaastad 1d88f4d48a Guard null pointer access 2019-10-31 09:38:44 +01:00
Magne Sjaastad 45cc94abd2 Janitor : apply clang-format 2019-10-31 09:35:48 +01:00
Magne Sjaastad 856580699c Merge pull request #4955 from OPM/summary-adjustments 
Summary adjustments
 2019-10-30 14:40:20 +01:00
Magne Sjaastad e4fd536d21 Merge pull request #4950 from OPM/summary-curve-filter-recently-used-to-registry 
Summary curve filter recently used
 2019-10-30 11:12:59 +01:00
Magne Sjaastad d6b7aa301c #4951 Summary Plot Template : Hide template collection in project tree 2019-10-30 10:48:23 +01:00
Magne Sjaastad 2dfa6b9d9f #4951 Summary Plot Template : Remove obsolete template pointer 2019-10-30 10:45:15 +01:00
Magne Sjaastad a1e40524bc #4951 Summary Plot Template : Adjust size of UI 2019-10-30 10:42:16 +01:00
Magne Sjaastad 25e7c3ecc1 #4951 Summary Plot Template : Hide default plot template from UI 2019-10-30 10:41:38 +01:00
Magne Sjaastad bcb4150ae4 #4951 Summary Plot Template : Hide context menu to select template 2019-10-30 09:26:41 +01:00
Magne Sjaastad 18c52b0e18 Janitor : Avoid using .. when referencing include files 2019-10-30 09:12:13 +01:00
Magne Sjaastad 350a812634 #4949 Recently used files : Use string list serializer 2019-10-29 14:23:01 +01:00
Magne Sjaastad facfd062dc #4949 Summary Curve Filter Toolbar : Store recently used strings to registry 2019-10-29 14:17:24 +01:00
Magne Sjaastad ba89a60e8d #4946 Ensemble Colors : Show color control in curve filter property editor 2019-10-29 13:40:57 +01:00
Magne Sjaastad ca3e2bdaf7 Merge pull request #4945 from OPM/ensemble-rft-add-missing-initialization 
Ensemble RFT : Add missing initialization
 2019-10-29 11:44:52 +01:00
Magne Sjaastad 1bf8341ba7 #4944 Ensemble RFT : Add missing initialization 2019-10-29 09:29:15 +01:00
Magne Sjaastad 44b154a1e3 Merge pull request #4942 from OPM/summary-text-edit-in-toolbar 
Add combo box to specify text for summary curves
 2019-10-29 06:52:33 +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
Magne Sjaastad 7a470587ac #4924 AppFwk ComboBox: Add minimum width 2019-10-28 20:39:01 +01:00
Magne Sjaastad 022d03a287 #4924 AppFwk ComboBox: Add tooltip 2019-10-28 20:37:27 +01:00
Magne Sjaastad a4c78cb7c3 Merge pull request #4936 from OPM/emsemble-parsing 
Improve detection of numbers when parsing std string
 2019-10-28 07:53:06 +01:00
Magne Sjaastad 2454ff1805 Merge pull request #4935 from OPM/fix-storage-of-preferences 
Preferences : More robust storing of data to registry
 2019-10-25 16:41:44 +02: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
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
Magne Sjaastad e21e4f5008 Documentation : Updates for Python documentation 2019-10-25 11:20:27 +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
Magne Sjaastad 32128f0bf3 #4924 AppFwk : Add support for editable combo box 2019-10-24 21:03:17 +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
Magne Sjaastad 580d826922 Clear line edit when content do not match 2019-10-24 10:04:42 +02:00
Magne Sjaastad 1935451242 AppFwk : Add placeholder text to line edit 2019-10-24 09:44:51 +02:00
Magne Sjaastad d39e31b982 Merge pull request #4916 from OPM/export-contour-map-context-menu 
#4822 Countour Map Export: Add export to context menu in 3D view
 2019-10-23 17:49:02 +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 13bb85ccd5 Merge pull request #4915 from OPM/flow-diag-improve-robustness 
Improve robustness when importing PVT data
 2019-10-23 14:20:15 +02:00
Magne Sjaastad bcc4bc61e0 Merge pull request #4913 from OPM/fix-date-multipe-restart-files 
#4904 Multiple restart-files : Fix wrong time step date
 2019-10-23 13:27:23 +02:00
Magne Sjaastad 5930478a90 #4914 Flow Diag : Improve robustness when reading PVT data 
https://github.com/OPM/opm-flowdiagnostics-applications/pull/98
 2019-10-23 13:24:47 +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
Magne Sjaastad 05d2645a0a #4909 Summary Legend Text : Improve text for statistics curves 2019-10-23 08:43:44 +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