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,404 Commits 53 Branches 83 Tags
212bdc06484a7b2e97799db59ac59a2bcce51e3d
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Magne Sjaastad 1671fe44b2 #4775 Summary : Add max width to line edit 2019-10-21 16:36:28 +02:00
Magne Sjaastad 7be2cc3031 #4775 Summary : Add text based curve creation to toolbar 2019-10-21 16:19:28 +02:00
Magne Sjaastad 3a174edf0e #4901 AppFwk : Add label editor 2019-10-21 15:47:13 +02:00
Magne Sjaastad 4920ccd667 Merge pull request #4898 from OPM/fix-update-ensemble 
#4851 Ensemble RFT : Fix update of color of ensemble curves on project load
 2019-10-21 07:58:49 +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
Magne Sjaastad f114a37b3c Merge pull request #4897 from OPM/summary-data-show-short-text-labels 
#4876 Resampeled Plot Data: Show time short text labels when possible
 2019-10-20 08:44:27 +02:00
Magne Sjaastad 53e8cc82bd #4876 Resampeled Plot Data: Show time short text labels when possible 2019-10-19 15:05:59 +02:00
Magne Sjaastad d59cdfa6ec Merge pull request #4895 from OPM/fix-cumulative-curve-statistics-resample 
Fix cumulative curve statistics resampling
 2019-10-19 13:33:26 +02:00
Magne Sjaastad c0d678d355 Merge pull request #4896 from OPM/add-error-message-to-fmu-import 
Add error message to FMU import
 2019-10-18 18:16:58 +02:00
Magne Sjaastad 6d7b29bb29 #4893 Formations : Make sure "layer_zone_table.txt" is defined once 2019-10-18 14:45:12 +02:00
Magne Sjaastad 3f617c93d2 #4893 Import Observed FMU data : Add error message 2019-10-18 14:36:53 +02:00
Magne Sjaastad 537184328a #4877 Refactor and rename to RiuSummaryQuantityNameInfoProvider 2019-10-18 14:28:02 +02:00
Magne Sjaastad 1cab88e9c5 #4877 Detect correct accumulation type for statistics curves 2019-10-18 14:22:15 +02:00
Magne Sjaastad 4dcdc2a1ee Set version to 2019.08.2-dev.04 2019-10-16 12:53:45 +02:00
Magne Sjaastad bb74ac24f8 Merge pull request #4875 from OPM/fix-dual-porosity-issues 
Fix dual porosity issues
 2019-10-16 11:59:17 +02:00
Magne Sjaastad 61db98ef04 #4874 Dual Porosity : Missing active cells in some cases 2019-10-16 11:11:01 +02:00
Magne Sjaastad a53f1e1e91 #4638 Dual porosity : Make sure geometry is regenerated when switching between matrix/fracture 2019-10-16 10:15:51 +02:00
Magne Sjaastad 715a1c66e5 Merge pull request #4848 from OPM/command-line-snapshots 
#4847 Command Line Snapshots : Make sure image size is handled correctly
 2019-10-11 14:01:54 +02:00
Magne Sjaastad c19bae3a07 #4852 Command Line : Enable commented code 2019-10-11 13:03:14 +02:00
Magne Sjaastad 0e2cee7295 #4852 Command Line : Add snapshotexportfolder 2019-10-11 12:35:41 +02:00
Magne Sjaastad 225893dcda #4852 Command Line : Add snapshotsize 2019-10-11 10:57:20 +02:00
Magne Sjaastad 4bfcf86962 #4847 Move setFixedWindowSizeFor3dViews to RiuMainWindowTools 2019-10-11 08:54:23 +02:00
Magne Sjaastad 69ff4d25f2 #4847 Command Line Snapshots : Make sure image size is handled correctly 2019-10-11 08:32:08 +02:00
Magne Sjaastad 71760b0e34 Merge pull request #4844 from OPM/improve-command-line- 
#4765 Summary : Support command line snapshots without a project file
 2019-10-10 07:52:55 +02:00
Magne Sjaastad 75140c2406 #4765 Summary : Support command line snapshots without a project file 
Use current working directory as base, and create a sub folder named "snapshots". Export snapshots from the application into this folder.
 2019-10-09 15:21:51 +02:00
Magne Sjaastad 35004ef7b2 #4843 AppFwk : Remove debug output to avoid noise 2019-10-09 13:07:19 +02:00
Magne Sjaastad b24b0932a3 Merge pull request #4836 from OPM/fix-transfer-of-single-timestep-data 
#4835 Python Cell Results : Not possible to write data if no dynamic data is present
 2019-10-08 11:45:39 +02:00
Magne Sjaastad 482d437505 #4835 Python Cell Results : Not possible to write data if no dynamic data is present 2019-10-08 10:39:22 +02:00
Magne Sjaastad 06b007effb Ensemble plot templates (#4829) 
* #4828 Summary Plot Templates : Support ensembles as plot data sources

Guard null pointer access and use regexp to match case and index
 2019-10-08 09:08:04 +02:00
Magne Sjaastad 8ef5982756 Merge pull request #4834 from OPM/support-input-as-data-source-for-compdat 
support-input-as-data-source-completions
 2019-10-08 08:24:03 +02:00
Magne Sjaastad 55224bed3d Fix signed/unsigned compare 2019-10-08 08:20:03 +02:00
Magne Sjaastad 1f181fa175 #4827 Completion Data : Guard index out of range 2019-10-08 08:01:25 +02:00
Magne Sjaastad cc746a20cb #4828 Summary Plot Templates : Robustification 2019-10-08 07:27:45 +02:00
Magne Sjaastad 5a410ca8be #4828 Summary Plot Templates : Use regexp to match case and index 2019-10-07 12:05:14 +02:00
Magne Sjaastad 56a5a750f2 #4828 Summary Plot Templates : Improve robustness 2019-10-07 10:30:17 +02:00
Magne Sjaastad 9365511f3d #4828 Summary Plot Templates : Remove unused function 2019-10-07 07:47:44 +02:00
Magne Sjaastad cd12b3ad4b Guard null pointer access 2019-10-07 07:42:39 +02:00
Magne Sjaastad 2c73b2ed02 #4828 Summary Plot Templates : Support ensembles as plot data sources 2019-10-04 18:46:30 +02:00
Magne Sjaastad 8a11c565f3 #4827 Completion Data : Support Eclipse input text files as data source 2019-10-04 15:55:31 +02:00
Magne Sjaastad 3d3ad421dd Merge pull request #4826 from OPM/fix-keyboard-events-stepping 
#4825 Summary Plot Stepping : Key events are not routed correctly
 2019-10-04 14:20:11 +02:00
Magne Sjaastad 2998ad3bed #4825 Summary Plot Stepping : Key events are not routed correctly 2019-10-04 13:20:15 +02:00
Magne Sjaastad a6733ae776 Merge pull request #4818 from OPM/improve-ensemble-stepping 
Improve ensemble stepping
 2019-10-04 11:43:06 +02:00
Magne Sjaastad c111b0d4c3 #4811 Source Stepping : Show ensemble stepping when plot is selected 2019-10-04 09:54:57 +02:00
Magne Sjaastad 311dd5b5c4 #4811 Source Stepping : Fix well stepping for ensembles 2019-10-04 09:09:22 +02:00
Magne Sjaastad ff3055b961 #4815 Ensemble Curve Set : Make text match case insensitive 2019-10-03 14:36:10 +02:00
Magne Sjaastad c90e7e0663 #4814 Ensemble Summary Curves : Fix creation of new curve set 2019-10-03 14:36:10 +02:00
Magne Sjaastad 1e2e02c9ac Merge pull request #4812 from OPM/use-first-ensemble-case 
#4750 Summary : Use first ensemble case if no standalone case is found
 2019-10-03 11:21:00 +02:00
Magne Sjaastad 5a2bea38f7 #4750 Summary : Use first ensemble case if no standalone case is found 2019-10-03 10:12:50 +02:00
Magne Sjaastad 86d17441eb #4713 Summary Case : Use "Calculated" as shortname for calculated case 
Seen by running regression tests
 2019-10-01 13:00:09 +02:00
Magne Sjaastad 6ba4425dad #4766 Crash when Show plot data for ensemble with a stopped simulation 2019-10-01 11:07:46 +02:00
Magne Sjaastad 18e12efaa3 Merge pull request #4803 from OPM/summary-template-adjustments 
Adjustments to summary templates
 2019-09-30 22:27:35 +02:00
Magne Sjaastad 7ce7211187 Merge remote-tracking branch 'origin/dev' into summary-template-adjustments 2019-09-30 19:43:08 +02:00
Magne Sjaastad 7173f1d4be #4796 Summary Plot Template : Fix typo in include file name 2019-09-30 14:05:19 +02:00
Magne Sjaastad 0698674d59 #4796 Summary Plot Template : Add context menu of summary cases 2019-09-30 13:28:08 +02:00
Magne Sjaastad 64e617562d #4796 Summary Plot Template : Add context menu of summary cases 2019-09-30 07:50:51 +02:00
Magne Sjaastad 18e6bec1bf #4796 Summary Plot Template : Move code to SummaryPlotTemplateTools 2019-09-29 12:42:38 +02:00
Magne Sjaastad fbfba745c3 #4796 Summary Plot Template : Add context menu to selected summary cases 2019-09-29 12:31:21 +02:00
Magne Sjaastad a6609c6e06 #4795 Summary Plot : Add updateConnectedEditors() 
Recent changes in logic requires more updateConnectedEditors
 2019-09-28 17:40:40 +02:00
Magne Sjaastad d2df004cf3 #4795 Summary Plot Templates : Make sure summary address is valid 
If the summary address specified in the template does not exist, uses the first valid address of the specified quantity.
 2019-09-27 16:18:12 +02:00
Magne Sjaastad cf482edd3e #4795 Summary Plot Templates : Do not set custom plot title 2019-09-27 16:14:56 +02:00
Magne Sjaastad 1ab58449bd #4793 Summary Plot Templates : Help accessible from About menu 2019-09-27 15:15:09 +02:00
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