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
10,019 Commits 27 Branches 61 Tags 309 MiB
5bbde43dad
Commit Graph

2091 Commits

Author SHA1 Message Date
Bjørn Erik Jensen
22c71b60dd #1776 CVS data parser. Made parsing more generic. Handle error result columns 2018-05-23 12:33:26 +02:00
Gaute Lindkvist
208313f672 #2944 Stop auto-zooming on load of Well Log Curves. 2018-05-23 11:29:16 +02:00
Bjørn Erik Jensen
87e91069e0 #2947 File hierarchy dialog. Fix effective filter 2018-05-22 15:10:31 +02:00
Gaute Lindkvist
772e7ec7e6 Revert "#2873 Delegate deletion of summary cases to separate thread." 
This reverts commit 0089e0c218.

Didn't intend this to go into dev now
 2018-05-22 09:22:12 +02:00
Gaute Lindkvist
0089e0c218 #2873 Delegate deletion of summary cases to separate thread. 2018-05-22 09:21:40 +02:00
Jacob Støren
9b9f9b2bf1 #2939 ProgressInfo: Reintroduce process envents, to update the progress dialog durig processing on linux/mac. 
Introduced isActive and used this info to block sheduled redraw/display model regen when progress bar is active, to avoid unintended recursive behaviour resulting in crashes.
 2018-05-21 23:46:35 +02:00
Gaute Lindkvist
3119ab24cb #2934 Delete all selected cases, not just the first one when right clicking and choosing close. 2018-05-18 14:02:49 +02:00
Bjørn Erik Jensen
cb74354bc2 Ensemble curves. Increased ensemble curve count threshold from 200 to 600 2018-05-16 14:54:16 +02:00
Gaute Lindkvist
0c9470fdf0 #2913 Improve coupling between egrid and summary cases 
* Convert RimGridSummaryCase to RimFileSummaryCase when closing grid.
 2018-05-15 15:43:21 +02:00
Bjørn Erik Jensen
7103ff73a2 Renaming 'Restart Files' to 'Origin Files' 2018-05-15 15:08:25 +02:00
Jacob Støren
a222c096f3 #2917 Vector Selection Dialog: Rename method for retreiving all expanded curve defintions. Add method to retreive only the selection (one definition pr ensemble curve set) 2018-05-15 14:26:28 +02:00
Gaute Lindkvist
2e0cd60fc4 #2466 Fix the one occurence of non-guarded activeReservoirView access found. 2018-05-15 11:31:23 +02:00
Magne Sjaastad
19125396a1 #955 Toolbar Button State : Mark calculator button as disabled if no case is open 2018-05-15 10:41:27 +02:00
Bjørn Erik Jensen
6edd240c4c #2912 Ensemble curves. Fixes regarding summary curve definitions 2018-05-15 10:12:04 +02:00
Gaute Lindkvist
77dd3cbc43 #2690 Update all summary curves, not just visible when changing the vector for the whole collection 
* Also make sure the curve names take into account all curves in the project tree and in the legend text.
* Make sure plot name is updated when a curve is deleted.
 2018-05-15 08:43:50 +02:00
Magne Sjaastad
e5227c15f0 #2915 Return if no target plot is available 2018-05-14 20:39:25 +02:00
Magne Sjaastad
94ab7b7923 #955 Guard nullptr access 2018-05-14 20:31:27 +02:00
Magne Sjaastad
6fcc91cdcd #955 Cleanup includes and fix whitespace 2018-05-14 20:31:27 +02:00
Bjørn Erik Jensen
7c0017923c #2658 Ensemble curves. Warning when too many ensemble curves 2018-05-14 14:52:02 +02:00
Jacob Støren
551c74cd28 Import Summary Case Group : Fix dialog title 2018-05-14 10:20:27 +02:00
Bjørn Erik Jensen
dc319646b2 #2658 Ensemble curves. Fix curve set coloring. Minor fixes.Some ClangFormat auto-changes 2018-05-14 09:51:24 +02:00
Magne Sjaastad
078191610c #2903 Plot Name and Legend Text : Fix update of ensembles from curve creator 2018-05-11 20:21:44 +02:00
Gaute Lindkvist
7e54eb055c #2897 Make Export Completion only show up if the user has selected a well path collection or a descendant. 2018-05-11 16:01:25 +02:00
Bjørn Erik Jensen
38540a0a39 #2904 Curve creator. .Fix initial curve visibility 2018-05-11 15:43:12 +02:00
Bjørn Erik Jensen
9f1ea2c42a Curve creator. Fix curve visibility settings 2018-05-11 13:46:42 +02:00
Bjørn Erik Jensen
fcea3ec40f #2658 Curve creator. Update curve tree view to display ensembles as well 2018-05-11 12:35:09 +02:00
Bjørn Erik Jensen
4e9dfafe02 #2894 Summary cases. Moved code to more appropriate location 2018-05-11 09:53:03 +02:00
Bjørn Erik Jensen
1a725de91b Fix build error 2018-05-11 08:35:56 +02:00
Bjørn Erik Jensen
368cca8b8d #2886 Summary groups. Add convert group to ensemble command 2018-05-11 08:33:04 +02:00
Jacob Støren
bb033eb561 #2883, #2890 Fix color assignment and stability for ensemble curve sets 2018-05-11 08:04:09 +02:00
Bjørn Erik Jensen
6270dd3bc9 #2692 Ensemble curves. Add ensemble selection support to curve editor 2018-05-10 21:30:14 +02:00
Gaute Lindkvist
b9cbd7c503 #2881 Continue exporting other completions if one has a unit mismatch. 
* Report an error and continue rather than abort.
 2018-05-09 15:56:24 +02:00
Gaute Lindkvist
5310d28433 #2880 export completions if the the well path name is explictly provided even if unchecked 2018-05-09 15:56:24 +02:00
Jacob Støren
83d3a033d8 #2872 Fix creating range filter slices on LGR 2018-05-09 13:47:58 +02:00
Jacob Støren
0ebedc844f #2849 Rename some Fishbone commands 2018-05-08 16:59:29 +02:00
Bjørn Erik Jensen
98daab46a3 #2819 Ensemble curves. Distinguish between summary case group and ensemble 2018-05-08 15:22:38 +02:00
Bjørn Erik Jensen
763d25040e #2840 Ensemble curve. Copy/paste og curve sets 2018-05-08 10:17:18 +02:00
Jacob Støren
c150f3e578 #2853 Add a specific ensembles icon. Use Cases icon for recursive import 2018-05-07 12:29:06 +02:00
Jacob Støren
c4c0d46692 #2857, #2861, #2853, #2862 Icon improvements: Use new Summary plot icon in combined icons, Observed Data icons, Octave Script icon improvements, Summary Case Group icon 2018-05-07 12:29:06 +02:00
Bjørn Erik Jensen
fb518117c0 #2856 Menus. Import case directly into group 2018-05-07 12:24:52 +02:00
Bjørn Erik Jensen
7903a62cc5 #2818 Summary. Add new-plot-commands to context menus 2018-05-07 09:46:45 +02:00
Jacob Støren
9885c9d2d7 #2809, #2858, #2859 Fix icon inconsistencies. Edd icons for ensemble curves and new icons for cross plot 2018-05-06 10:09:39 +02:00
Bjørn Erik Jensen
58f99a848e #2802 Summary cases import. Display progress info during summary cases creation as well 2018-05-03 13:35:40 +02:00
Bjørn Erik Jensen
ccd0c0d9f9 #2836 Hierarchy import dialog. Insert * in effective filter when path filter is empty 2018-05-03 12:46:15 +02:00
Bjørn Erik Jensen
92fd4183a9 #2797 Ensemble curves. Support for text ensemble parameters. Unit test 2018-05-03 09:55:13 +02:00
Bjørn Erik Jensen
b686c1a081 Hierarchy dialog. Removed duplicate definition 2018-04-30 15:33:04 +02:00
Bjørn Erik Jensen
dc81c889ca #2789 Hierarchy dialog. Prevent double file extension 2018-04-30 14:59:13 +02:00
Bjørn Erik Jensen
d5037bd982 #2812 Origin import dialog. Set arrow cursor while dialog is open 2018-04-30 14:03:46 +02:00
Bjørn Erik Jensen
5ae536cfc7 #2833 Origin import dialog. Prevent error dialog after pressing cancel 2018-04-30 12:53:32 +02:00
Bjørn Erik Jensen
b34deb1038 #2813 Origin import dialog. Add text '+ xxx more files' if number of origin files exceedes 4 2018-04-30 11:26:31 +02:00
Bjørn Erik Jensen
39cfc687bd #2813 Origin import dialog. Copy file name context menu 2018-04-30 10:44:07 +02:00
Magne Sjaastad
6715ef5a8a #2821 Export Completions: Use Split on Well And Completions as default 2018-04-30 08:15:55 +02:00
Magne Sjaastad
1a0f242c0b #2780 Ensemble Curve Set : Improve plot title including ensembles 2018-04-30 08:01:17 +02:00
Bjørn Erik Jensen
14d78571a8 #2813 Origin import dialog. Add toggle 'show full paths' 2018-04-27 15:37:35 +02:00
Bjørn Erik Jensen
6463a67107 #2813 Origin import dialog. Bold group box titles 2018-04-27 13:21:00 +02:00
Bjørn Erik Jensen
313ae8f505 #2813 Origin import dialog. Spacing between groups 2018-04-27 13:07:53 +02:00
Bjørn Erik Jensen
4c2eeb9a9f #2813 Origin import dialog. Full path in tool tip 2018-04-27 12:43:32 +02:00
Bjørn Erik Jensen
fd3bdff4e5 Hierarchy dialog. Do not clear root path field when clicking cancel in browse dialog 2018-04-27 12:43:32 +02:00
Bjørn Erik Jensen
fa2c188452 #2813 Origin import dialog. Import options group box replaced by label 2018-04-27 12:43:32 +02:00
Bjørn Erik Jensen
0fcdfadddc #2813 Origin summary dialog. 'Ok to all' button 2018-04-27 08:27:16 +02:00
Magne Sjaastad
c267f32638 Rename to RiuPlotMainWindow 2018-04-27 06:28:08 +02:00
Bjørn Erik Jensen
3647792eb9 #2807 Origin summary files. Fix 'OK to all' not working issue 2018-04-26 14:27:23 +02:00
Bjørn Erik Jensen
ad6ef2a49b #2806 Origin summary files dialog. Replace text 'Apply settings to...' to 'OK to All' 2018-04-26 09:51:35 +02:00
Bjørn Erik Jensen
93304360fa #2810 import ensemble. Import all summary files even though some files miss ensemble parameters 2018-04-26 09:47:43 +02:00
Gaute Lindkvist
029369d187 #2677 Show curve value when clicking the curve 
This change will show the following:
   - Curve name
   - Well path name
   - Measured depth
   - name of variable
   - value
 2018-04-25 14:13:12 +02:00
Gaute Lindkvist
3a670d94a2 #2801 Fix Cotire build. 2018-04-25 14:13:12 +02:00
Jacob Støren
e86c39b189 #2774 Import Ensemble: Ask for name before importing cases 2018-04-25 12:01:26 +02:00
Jacob Støren
54b21a8a49 Rename of static recursive search dialog method 2018-04-25 11:25:29 +02:00
Jacob Støren
cee99af324 #2768 Improved progress feedback in FileHierarchy dialog 2018-04-25 10:17:41 +02:00
Jacob Støren
9f43da2d10 #2768 Fix missing matches when root + path filter ends with an exact dir-name 2018-04-25 10:17:41 +02:00
Jacob Støren
87ccdd06af #2768 First shot on faster search regime. Some issues left 2018-04-25 10:17:41 +02:00
Gaute Lindkvist
c5e4bf93a6 Summary Case Import cleanup (#2795) 2018-04-25 09:25:35 +02:00
Gaute Lindkvist
e953d6800c #2795 Summary Case Import: When importing grids keep going even if summary file import fails. 2018-04-24 15:55:51 +02:00
Gaute Lindkvist
f456911c80 #2794 Summary Case Import: Improve error reporting. 
* When an error is found with one summary case file, continue importing all the files that worked.
* Report an error in the log window and a message box afterwards about the case that failed.
* Fix crash when loading .EGRID file without a summary case.
 2018-04-24 14:19:08 +02:00
Gaute Lindkvist
765b170efd 3d Well Log Curves (#2784): call createDisplayModelAndRedraw...() when adding LAS and RFT curves. 
* Causes the parts to be created and added to the model.
* This is already done when adding extraction curves.
 2018-04-23 11:35:55 +02:00
Gaute Lindkvist
803b6b8179 3D Well Log Curves(#2676): Enable pick selection of the 3D Tracks and curves 2018-04-23 08:01:32 +02:00
Magne Sjaastad
1ff149c668 #2580 Export Completion Data : Add command in File/Export menu 2018-04-20 15:08:25 +02:00
Bjørn Erik Jensen
8a02fc3095 #2771 Ensemble curves. Add 'Add curve set' command to more tree nodes. Hide curve set collection when empty 2018-04-20 14:59:21 +02:00
Bjørn Erik Jensen
c3ae45e748 #2766 Bugfix. Import egrid files even though there are no associated summary files 2018-04-20 08:28:04 +02:00
Magne Sjaastad
d5bdd1f7a1 #2765 Completions : Use max available diameter when combining multiple completions in same cell 2018-04-19 14:55:14 +02:00
Bjørn Erik Jensen
e5570441f6 #2751 Rename ensamble to ensemble 2018-04-19 14:00:18 +02:00
Gaute Lindkvist
4dc9d1ba8a 3D Well Log Curve (#2747): Add "Add new curve" command to 3D track and other curves. 2018-04-19 13:43:12 +02:00
Bjørn Erik Jensen
32fb519073 #2754 Fix ensemble import workflow 2018-04-19 13:38:07 +02:00
Bjørn Erik Jensen
b3ee1c1f9b #2755 Fix import dialog path filter matching 2018-04-19 12:03:50 +02:00
Jacob Støren
02049abe78 Fix crash and typo and set stat Ensemble index to 1 2018-04-19 09:18:09 +02:00
Magne Sjaastad
305fdfcfc8 Remove unused variables and functions 2018-04-19 07:19:29 +02:00
Bjørn Erik Jensen
3ce2bfd67c #2687 #2750 Add import ensamble command. Add import summary cases commands to plot tree nodes 2018-04-18 13:56:37 +02:00
Magne Sjaastad
f3a235b9df #2748 Completion Type Calculations : Remove unused code 2018-04-17 14:42:15 +02:00
Bjørn Erik Jensen
7afa753d11 #2714 Display a warning in origin summary import dialog when ecllib may fail to read origin files 2018-04-17 11:01:45 +02:00
Bjørn Erik Jensen
0fcc0bea4c 2743 Origin summary import dialog adjustments 2018-04-16 14:11:31 +02:00
Bjørn Erik Jensen
e5e9692eb5 #2710, #2719 Restart preference and dialog adjustments. And some bugfixes 2018-04-13 15:47:43 +02:00
Bjørn Erik Jensen
9f40679f22 #2555 Bugfix 2018-04-13 15:47:43 +02:00
Bjørn Erik Jensen
d7e7c4a463 #2720, #2686, #2701 Origin summary and grid cases import enhancements 2018-04-13 15:47:42 +02:00
Magne Sjaastad
12fcb124c7 #2697 #2700 #2697 Export Completions 
Rename to RicfExportSimWellFractureCompletions
Add missing parameters to RicfExportWellPathCompletions
Add support for individual export multiple completion types into separate sections of same file
 2018-04-13 12:13:27 +02:00
Magne Sjaastad
dfa87b218f #2737 Command File Launcher : Add command for launching command file from UI 2018-04-13 12:04:43 +02:00
Magne Sjaastad
1d3bc6887e #2709 Export of COMPDAT : Always export diameter 2018-04-13 12:04:23 +02:00
Bjørn Erik Jensen
5cc3af4586 #2555 Summary cases. Convert paths to have internal separators ('/') 2018-04-10 13:11:58 +02:00
Gaute Lindkvist
2cc93fb09d 3D Well Log Curves: Command to Delete curve #2667 
* Add delete command with explicit delete feature class.
 2018-04-10 10:57:04 +02:00
Bjørn Erik Jensen
ee9e9b2989 #2685 Origin summary. Split preferences settings into two fields 2018-04-09 13:22:05 +02:00
Magne Sjaastad
7a09b9a146 #2632 Export Completions : Show settings for avalable completions types 2018-04-09 11:36:01 +02:00
Magne Sjaastad
c759ef71b9 #2632 Export Completions : Use common entry point for completion export 2018-04-09 11:36:01 +02:00
Magne Sjaastad
f71563cb1e #2632 Export Completions : Add sub menus for export of completions 2018-04-09 11:36:01 +02:00
Magne Sjaastad
7f137a3e7c #2632 Export Completions : Add exportCompletionsForVisibleSimWells 2018-04-09 11:36:01 +02:00
Magne Sjaastad
4fb1a0385c #2632 Export Completions : Add exportCompletionsForVisibleWellPaths 2018-04-09 11:36:01 +02:00
Magne Sjaastad
e50e34feb4 #2632 Export Completions : Remove support for export of all well path completions 2018-04-09 11:36:01 +02:00
Magne Sjaastad
a40c4df6b3 #2632 Export Completions : Set all completions in same group 2018-04-09 11:36:01 +02:00
Bjørn Erik Jensen
7dc41bd981 #2610 Enable delete command for ensamble curve sets 2018-04-06 11:58:07 +02:00
Bjørn Erik Jensen
21a81744f1 #2610 New command, display ensamble curves with single color 2018-04-06 11:58:06 +02:00
Jacob Støren
584c1084c0 #2664 Fix missing update when creating curve 2018-04-05 14:18:00 +02:00
Bjørn Erik Jensen
1369b11e6e #2555 Guarding for nullptr and some minor fixes 2018-03-21 14:47:23 +01:00
Jacob Støren
dd29a3c727 #2634 Fix wrong MD when context menu creating completions in 2D intersectino View 2018-03-21 14:13:56 +01:00
Magne Sjaastad
ca8e56cff1 Perforation Interval : Do not cast to int when creating new perf interval 2018-03-21 10:16:37 +01:00
Magne Sjaastad
4060e7e5a5 #2631 Text Export to Eclipse : Generated text file has too many characters in line 2018-03-21 07:43:59 +01:00
Jacob Støren
7aa07d6a78 #2486 Wellpaths now reports correct MD in 2D intersection views 2018-03-20 15:44:45 +01:00
Bjørn Erik Jensen
95a9744241 #2555 Add time period for current file as well 2018-03-20 14:32:56 +01:00
Bjørn Erik Jensen
d5bbeffdd0 #2555 Refactored summary restart file import 2018-03-20 14:32:55 +01:00
Bjørn Erik Jensen
2f11395525 #2555 Add preferences for summary restart file import 2018-03-20 14:32:55 +01:00
Bjørn Erik Jensen
2a84cb6ddf #2555 Handle import to separate cases 2018-03-20 14:32:55 +01:00
Bjørn Erik Jensen
8889bdf6d4 #2555 Add applyToAll checkbox 2018-03-20 14:32:54 +01:00
Bjørn Erik Jensen
f98dc2fe5e #2555 Add current summary file to dialog 2018-03-20 14:32:54 +01:00
Bjørn Erik Jensen
208d738846 #2555. Add summary restart file import dialog 2018-03-20 14:32:54 +01:00
Magne Sjaastad
595bf2aa97 #2440 Export Completions: Add MD-in and MD-out to comments 2018-03-20 13:30:18 +01:00
Magne Sjaastad
9656883c92 Fix wrong use of macros in constructor causing crash triggered by regression tests 2018-03-16 13:41:43 +01:00
Rebecca Cox
b189346f32 #2598 3D Well log curve: Add RFT curve code. curveValuesAndMds does currently only give values for a simwell 2018-03-16 11:22:03 +01:00
Rebecca Cox
a41ca4688e #2597 3D Well Log Curve: Make 3d well log curve pure virtual. Add 3d well log extraction curve 2018-03-15 14:17:56 +01:00
Rebecca Cox
7fbf195b18 Add Icon to well log LAS curve 2018-03-15 13:05:00 +01:00
Rebecca Cox
ab800390dd #2597 3D Well Log Curve: Context command to add new curve 2018-03-15 13:05:00 +01:00
Rebecca Cox
87977824db Guard for missing well path 2018-03-14 15:52:10 +01:00
Magne Sjaastad
108ef5eecc #2544 Well CF Viz : Add basiz viz with spheres, add legend to view 2018-03-14 09:35:48 +01:00
Bjørn Erik Jensen
b7e8834b4c #2476 2dIntersectionView. Clean up context menus 2018-03-14 08:05:38 +01:00
Magne Sjaastad
716bb3184b System : Replace tab with four spaces 2018-03-12 11:12:39 +01:00
Magne Sjaastad
8e8c168405 #2546 Well Connection Factors : Several changes related to data access 
Moved rig classes from command feature into ReservoirDataModel\Completions\
 2018-03-12 11:07:46 +01:00
Magne Sjaastad
a38d3735c5 #2557 Non Darcy Flow : Select copy at the end to avoid update of editor too early 2018-03-09 09:47:56 +01:00
Magne Sjaastad
7221efa7b5 #2554 Fracture : Do not exit if debug output file is not possible to open 2018-03-09 09:00:44 +01:00
Magne Sjaastad
4f7291c95d #2583 System : Move regression test framework to separate class 2018-03-08 10:15:51 +01:00
Rebecca Cox
00a0d2b1f6 Avoid crash if selected item is not a PdmObjectHandle 2018-03-07 15:11:21 +01:00
Rebecca Cox
fbdfe90de0 Add override, sort includes 2018-03-07 14:25:12 +01:00
Rebecca Cox
46127ee724 #2581 3D wellLog curves: Add function to set property detaults from view 2018-03-07 14:24:18 +01:00
Rebecca Cox
9b8c06462c #2582 3d well log curves: Select created curve in tree 2018-03-07 13:03:27 +01:00
Rebecca Cox
a37a9d3308 #2582 3D well log curves: Create add 3D well log extraction curve cmd 2018-03-07 12:02:13 +01:00
Magne Sjaastad
91428a028d #2554 Regression Test : Reorganize setting of current working folder 2018-03-07 09:30:15 +01:00
Magne Sjaastad
08ce58b2fa #2554 Export Completions : Do not create two folders if export folder does not exist 2018-03-07 09:30:15 +01:00
Magne Sjaastad
2435e92be1 #2577 Test : Add test toolbar to launch unit tests and regression tests 2018-03-06 13:19:06 +01:00
Magne Sjaastad
0bf72d5f68 #2561 Fracture Templates: Rename command feature files 2018-03-06 07:58:48 +01:00
Magne Sjaastad
bbcc59ee1d #2561 Fracture Templates: Create duplicate of template and convert 2018-03-06 07:54:37 +01:00
Magne Sjaastad
204c0c77b1 #2560 Fracture : Reload XML data after unit system change 2018-03-05 09:56:06 +01:00
Magne Sjaastad
ef2179f1ba #2545 Move fields from public to private 2018-03-02 14:27:52 +01:00
Magne Sjaastad
7bd0bdc612 #2483 Refactoring : Simplify generation of well branch geometry (1) 2018-03-02 14:07:23 +01:00
Bjørn Erik Jensen
3fc99a73bc #2462 Add fracture template id 2018-03-02 09:33:38 +01:00
Magne Sjaastad
25a1823f35 Merge branch 'dev' into cmake-improvements 2018-02-28 08:47:01 +01:00
Magne Sjaastad
89c090ba24 #2536 Build System : Remove obsolete code for cmake older than "2.8.2" 2018-02-28 08:05:00 +01:00
Jacob Støren
267e3ef59d #2535 Use the MainWindowTools class instead of MainWindow directly (part 4) 2018-02-27 16:46:53 +01:00
Jacob Støren
562dfbe9b8 #2535 Use the MainWindowTools class instead of MainWindow directly (part 3) 2018-02-27 16:46:53 +01:00
Jacob Støren
72013f4ff8 #2535 Use the MainWindowTools class instead of MainWindow directly (part 2) 2018-02-27 16:46:53 +01:00
Jacob Støren
d74807d669 #2535 Use the MainWindowTools class instead of MainWindow directly (part 1) 2018-02-27 16:46:53 +01:00
Magne Sjaastad
f4bae6f796 #2529 Fracture : Remove RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES from CMake files 2018-02-26 21:11:14 +01:00
Magne Sjaastad
72b5f540e5 #2529 Fracture : Remove all #ifdef USE_PROTOTYPE_FEATURE_FRACTURES 2018-02-26 20:54:45 +01:00
Magne Sjaastad
0cee37ce86 Add missing ifdef macro for use of fracture template 2018-02-26 14:42:00 +01:00
Magne Sjaastad
c22f38e30c #2509 Fracture : Move fracture commands to separate folder 2018-02-21 19:38:20 +01:00
Magne Sjaastad
8ad30d9350 #2509 Fracture : Disconnect fracture template when unit changes 2018-02-21 19:07:03 +01:00
Magne Sjaastad
c6b12b85e0 Merge fracture unit refactoring into dev #2509 
Add display of M and F in front of fracture templates
Add convert of StimPlan templates
Add copy/paste of StimPlan templates
Remove obsolete unit conversion code
 2018-02-21 10:15:56 +01:00
Magne Sjaastad
0acab5cd65 #2509 Fracture : Add copy / paste of StimPlan 2018-02-21 09:50:50 +01:00
Magne Sjaastad
0d7e4f460c #2509 Fracture : Find matching template when adding new fracture 2018-02-21 09:10:40 +01:00
Magne Sjaastad
28ab07b199 #2509 Fracture : Remove obsolete unit conversion 2018-02-21 09:10:08 +01:00
Magne Sjaastad
35febab8db #2509 Fracture : Add support for unit conversion of stimplan grid coords 2018-02-20 15:15:06 +01:00
Rebecca Cox
2c26ca4243 #2460 Tensor Vectors: Hide tensors on intersection creation 2018-02-20 13:47:47 +01:00
Magne Sjaastad
9b1b94a4ae #2517 Export COMPDATL : Include diameter for LGR grids 2018-02-20 11:26:39 +01:00
Magne Sjaastad
fb95d896ef #2509 Fracture : Add copy / paste of ellipse fracture template 2018-02-20 07:20:25 +01:00
Magne Sjaastad
1ae30ef11a (clang-tidy) : modernize-use-nullptr 2018-02-18 18:56:43 +01:00
Magne Sjaastad
cf11eff319 #2456 Non-Darcy Flow : Allow transmissibilities close to zero when computing d-factor 2018-02-16 11:22:13 +01:00
Magne Sjaastad
504e80534b #2456 Non-Darcy Flow : Export : Use scientific formatting for kh and d-factor 2018-02-16 11:02:50 +01:00
Magne Sjaastad
52621bae6c #2456 Non-Darcy Flow : Include diameter for fracture completions 2018-02-16 10:51:04 +01:00
Magne Sjaastad
dab73009e7 #2456 Non-Darcy Flow : Return the one and only (unmodified) completion 2018-02-16 10:49:53 +01:00
Magne Sjaastad
db20cf4b5b #2492 : Non-Darcy Flow : Ignore WPIMULT export setting if non-Darcy Flow is active 2018-02-16 09:37:55 +01:00
Magne Sjaastad
ac96824640 #2455 Non-Darcy Flow : Add fields to fracture template 2018-02-16 09:37:55 +01:00
Magne Sjaastad
6b246f4671 Remove unused function 2018-02-16 09:37:55 +01:00
Magne Sjaastad
cdfe6e3000 #2475 Fractures: Use filename as default name when importing a StimPlan fracture 2018-02-15 15:00:09 +01:00
Bjørn Erik Jensen
022d2ffd2d #2473 copy intersections. Resolve references and update connected editors 2018-02-15 13:05:42 +01:00
Rebecca Cox
cf3a1ad43f #2392 3D View Context command: "Color Result" 2018-02-12 08:42:12 +01:00
Magne Sjaastad
123a2830aa Merge patch into dev : Snapshot : Always use _ in generated file names #2446 2018-02-09 11:34:05 +01:00
Magne Sjaastad
6e16a47b0d #2446 : Replace - with _ for all generated file names 2018-02-09 11:19:04 +01:00
Magne Sjaastad
778119bf62 #2442 Fracture Template : Move more fields from public to protected 2018-02-08 14:02:02 +01:00
Magne Sjaastad
a1c891cd99 Merge remote-tracking branch 'origin/2018.01.01-patch' into dev 2018-02-08 13:18:36 +01:00
Magne Sjaastad
80eefb3141 #2442 Fracture Template : Move several fields from public to protected 2018-02-08 13:17:31 +01:00
Magne Sjaastad
f053dfa8e3 #2446 : Snapshot : Improve generated file, always use _ in generated filename 2018-02-08 13:17:18 +01:00
Magne Sjaastad
1370cfe3e5 Merge fix for fishbone export into dev #2451 2018-02-08 10:31:51 +01:00
Magne Sjaastad
39949923a6 #2451 Export Completion : Remove obsolete test 2018-02-08 10:25:43 +01:00
Magne Sjaastad
0843c3e464 #2451 Export Completion : Exclude main bore cells correctly 2018-02-08 10:18:01 +01:00
Magne Sjaastad
53a1de91d7 #1968 Export Completions : Improve ordering 2018-02-07 14:07:49 +01:00
Magne Sjaastad
68c21e117b #1968 Readability : Whitespace changes 2018-02-07 14:07:00 +01:00
Magne Sjaastad
76e6ec3aef Remove unused function 2018-02-07 14:07:00 +01:00
Magne Sjaastad
dd34b0111a #1968 Readability : Major whitespace changes 2018-02-07 14:07:00 +01:00
Magne Sjaastad
c695d40266 #2447 Fracture : Set default conductivity result when creating the first fracture 2018-02-06 13:15:36 +01:00
Magne Sjaastad
a283a468c2 #2447 Fracture : Show fracture legend when only ellipse fractures are present 2018-02-06 12:42:13 +01:00
Magne Sjaastad
91e062fd93 #2431 : Add Rim3dView to event interface object 2018-02-05 20:12:22 +01:00
Bjørn Erik Jensen
8c4cad894f #2391 intersections. New copy to all views command feature 2018-02-05 13:24:17 +01:00
Magne Sjaastad
bf0b4f68e1 Merge message box fixes into dev, #2443 2018-02-02 14:47:05 +01:00
Magne Sjaastad
ba09906163 #2443 Replace QMessageBox with RiaLogging to avoid blocking of batch commands 2018-02-02 09:37:34 +01:00
Magne Sjaastad
dc0c6d1b47 #2443 : Remove obsolete includes of QMessageBox 2018-02-02 09:37:00 +01:00
Magne Sjaastad
f21f6e969f #1905 : Make sure picking on perforation intervals reports well path MD 2018-02-02 08:20:57 +01:00
Magne Sjaastad
c5333d09b2 Merge perforation updates into dev #2422 2018-02-01 13:05:00 +01:00
Bjørn Erik Jensen
7131006188 #2422 perforations. Update tree view after perforations import 2018-02-01 09:10:31 +01:00
Magne Sjaastad
d111fde68b #2425 Export Completions : Include cleanup 2018-01-31 10:20:47 +01:00
Magne Sjaastad
8fbd417c4f #2425 Export Completions : Move function 2018-01-31 10:20:47 +01:00
Magne Sjaastad
f8b020e364 #2425 Export Completions : Whitespace 2018-01-31 10:20:47 +01:00
Magne Sjaastad
c04ef6bbbf #2425 Export Completions : Move app logic into separate file 2018-01-31 10:20:47 +01:00
Magne Sjaastad
965deeb67a #2425 Export Completions : Separated feature UI from app logic 2018-01-31 10:20:47 +01:00
Magne Sjaastad
52875a57dc #2423 Export Completions : Cleaned up private functions, moved to cpp and improved whitespace 2018-01-31 10:20:47 +01:00
Magne Sjaastad
20652a0597 #2423 Export Completions : Move folder one level up 2018-01-31 10:20:47 +01:00
Magne Sjaastad
e989b3afc9 #2423 Export Completions : Move Rig*-files to completion export folder 2018-01-31 10:20:47 +01:00
Magne Sjaastad
f0f7c954cc #2423 Export Completions : Move files to separate folder 2018-01-31 10:20:47 +01:00
Magne Sjaastad
e18a08a425 #1758 Use RigMainGrid in interface to CompletionDataGridCell 2018-01-31 10:20:47 +01:00
Magne Sjaastad
54a7320b59 #1758 Export main grid data to one file and LGR data to one file 2018-01-31 10:20:47 +01:00
Magne Sjaastad
38f18dbecb #1758 Add support for export of WPIMULTL 2018-01-31 10:20:47 +01:00
Magne Sjaastad
c7b5e091c6 #1758 Rename to gridName 2018-01-31 10:20:47 +01:00
Magne Sjaastad
5cc6877afa #1758 Use map to sort RigCompletionDataGridCell based on grid 2018-01-31 10:20:47 +01:00
Magne Sjaastad
4516941d2c #1758 Add RigCompletionDataGridCell 2018-01-31 10:20:47 +01:00
Magne Sjaastad
028b5303a7 #1758 Add support for export of COMPDATL for LGR grid 2018-01-31 10:20:47 +01:00
Magne Sjaastad
c0359f1776 #1758 Refactor IJKCellIndex 2018-01-31 10:20:47 +01:00
Magne Sjaastad
85d9d21bb6 #1758 Rename to globalCellIndex 2018-01-31 10:20:47 +01:00
Bjørn Erik Jensen
7779ff5ed0 Merge branch '2018.01.01-patch' into dev. #2229 2018-01-31 08:33:51 +01:00
Bjørn Erik Jensen
fa66cf14cd #2229 curve creator. Update when adding/deleting calculated curves as well 2018-01-31 08:32:14 +01:00
Jacob Støren
c9d6d60931 #2331 GeoMech fixes for intersection view. Paste view and animation of synthetic cases. 2018-01-29 16:16:11 +01:00
Jacob Støren
287992df91 #2331 Update Intersection View List when copying and deleting views 2018-01-29 16:16:11 +01:00
Jacob Støren
f931b92341 #2412 Disable irrelevant toolbar commands 2018-01-29 16:16:11 +01:00
Rebecca Cox
885c03b9a4 Merge remote-tracking branch 'origin/2018.01.01-patch' into dev 2018-01-29 11:24:56 +01:00
Rebecca Cox
d67e1a7d13 #2261 Well Paths: Change newestAddedWellPath to mostRecentlyUpdatedWellPath 2018-01-29 11:24:12 +01:00
Bjørn Erik Jensen
fbe9d2d73d Merge branch '2018.01.01-patch' into dev 2018-01-26 15:56:37 +01:00
Bjørn Erik Jensen
ca3bb02c57 #2356 grid statistics dialog. Display of Mobile Volume Weighted Mean controlled by info box property 2018-01-26 15:53:13 +01:00
Jacob Støren
d8d2076dea #2333 New Intersection View: Update vertical warningtext. Avoid selecting view in tree. 2018-01-26 11:19:16 +01:00
Jacob Støren
02f6b95959 #2333 Add flattened intersectino geometry. Some view modifications to move towards a final 2D view experience 2018-01-26 11:19:15 +01:00
Rebecca Cox
47d8508196 Merge remote-tracking branch 'origin/2018.01.01-patch' into dev 2018-01-26 10:29:01 +01:00
Magne Sjaastad
0559084d93 #2325 Summary plot: Apply axis settings on preview plot 2018-01-25 21:16:35 +01:00
Magne Sjaastad
6ce0037733 #2141 : Fracture : Make sure a new StimPlan fracture get valid defaults 2018-01-25 14:17:10 +01:00
Bjørn Erik Jensen
95db322f57 #2384 multi case import. Fix path filtering. Display relative file names 2018-01-25 13:57:09 +01:00
Bjørn Erik Jensen
3d2e5b6088 #2383 Eclipse cases import. New command feature using file hierarchy dialog 2018-01-24 14:39:06 +01:00
Bjørn Erik Jensen
3f96ad7ad9 File hierarchy dialog. Trim extensions 2018-01-24 14:37:52 +01:00
Bjørn Erik Jensen
5e46a378aa #2384 multi case import. New command feature for importing cases into group recursively 2018-01-24 13:18:47 +01:00
Bjørn Erik Jensen
a039bcd0a9 File hierarchy dialog. Stop if no root dir 2018-01-24 13:18:47 +01:00
Bjørn Erik Jensen
d646af8514 #2384 multi case import. Context menu for on/off/toggle files 2018-01-24 12:36:06 +01:00
Rebecca Cox
8b4a1f05bc #2390 Intersections: Add Copy/Paste 2018-01-24 11:44:20 +01:00
Rebecca Cox
97aab5bda5 Merge remote-tracking branch 'origin/2018.01.01-patch' into dev 2018-01-24 10:56:10 +01:00
Rebecca Cox
650fc2147d #2404 Intersection: Update 3d view when creating new Intersection Box 2018-01-24 10:48:23 +01:00
Bjørn Erik Jensen
7c47783e3a #2384 multi case import. Add check box for each file 2018-01-24 10:43:56 +01:00
Rebecca Cox
e68f0e2be8 Merge branch '2018.01.01-patch' into dev 2018-01-24 08:33:47 +01:00
Jacob Støren
d34b3a7c74 #2331 Add 2d Intersection View collection with automatic views. The create command is adjusted into a "Show" command. 2018-01-23 14:37:52 +01:00
Bjørn Erik Jensen
1c668ce3b4 #2358 fracture. Display values in resultInfo panel when clicking on stim plan fracture cell 2018-01-23 14:14:40 +01:00
Magne Sjaastad
7dbd6c1027 #2398 Fracture : Hide "New Fracture" in context menu when no Fracture Template is defined 2018-01-23 07:28:32 +01:00
Rebecca Cox
b84812616f Merged from patch-branch to dev-branch 2018-01-18 15:43:27 +01:00
Rebecca Cox
79539c1c99 #2378 Fractures: Hide "Fracture Colors" in Project tree when not in use 2018-01-18 15:04:04 +01:00
Bjørn Erik Jensen
28ea6f054c #2377 summary plot. Add missing curve update 2018-01-18 13:50:39 +01:00
Bjørn Erik Jensen
cdfe7f51d3 #2377 summary plot. Add missing curve update 2018-01-18 13:24:21 +01:00
Rebecca Cox
39cf8e8b0d #2378 Fractures: Hide "Fracture Colors" in Project tree when not in use 2018-01-18 11:42:29 +01:00
Bjørn Erik Jensen
50c3e5f0d2 #2379 import summary cases. Minor refactoring 2018-01-17 13:15:04 +01:00
Bjørn Erik Jensen
8f384c9752 #2379 import summary cases. Dialog improvements, find button, grouping widgets 2018-01-17 13:05:05 +01:00
Bjørn Erik Jensen
b74dca8de8 #2379 import summary cases. Fix path filtering 2018-01-17 13:05:05 +01:00
Magne Sjaastad
3bcfc09baf #2332 2D Intersection View: Show warning if intersection is not vertical 2018-01-17 11:29:06 +01:00
Magne Sjaastad
03de2aba5b #2332 2D Intersection View: Command to create view 2018-01-17 11:05:31 +01:00
Bjørn Erik Jensen
735165bb2b #2379 import summary cases. Fixed dialog issues 2018-01-16 13:40:38 +01:00
Jacob Støren
0debeafd68 #2331 Move RimGridView to separate files 2018-01-16 09:37:08 +01:00
Jacob Støren
b1cf7f6674 #2331 Cleaned up whitespace. Made crossectionCollection protected 2018-01-16 08:44:37 +01:00
Jacob Støren
b092565a61 #2331 Introduce new intermediate class RimGridView 2018-01-15 14:53:48 +01:00
Rebecca Cox
4bf8de2787 #2369 Elm props: Clear cell results on deletion 2018-01-15 14:48:05 +01:00
Magne Sjaastad
85ead20ec9 #2371 Fracture : Guard for null pointer access 2018-01-15 08:58:56 +01:00
Rebecca Cox
a97dd087d6 #2349 Elm Props: Use caf::FilePath instead of QString 2018-01-12 14:39:49 +01:00
Jacob Støren
4b26354b30 #2331 Moved redraw scheduling and completion type recalc out of RiaApplication 2018-01-12 12:01:04 +01:00
Magne Sjaastad
7511e8a243 #2322 New View : Improve default values when creating view 2018-01-12 10:55:00 +01:00
Magne Sjaastad
9a2eebe8f5 Fracture : Move public fields to protected, and make RimFractureTemplate friend 2018-01-12 10:21:10 +01:00
Magne Sjaastad
f027027618 #1905 Perforation Intervals : Picking the well path pipe does not work at perforations 
Forward all parts intersected to 3d viewer event handler
 2018-01-12 07:56:35 +01:00
Rebecca Cox
81a7fb204d #2360 Elm Props: Correct UI text 2018-01-10 16:32:59 +01:00
Bjørn Erik Jensen
3f4489c45f #1752 Summary cases import. Minor refactoring 2018-01-10 14:11:57 +01:00
Bjørn Erik Jensen
e743a61d5b #1752. Import multiple summary cases from a directory structure. Take 1 2018-01-10 13:57:20 +01:00
Rebecca Cox
2cd006882f #2360 Elm Props: Wire up reading of elm prop data into data structures 2018-01-10 10:43:33 +01:00
Magne Sjaastad
49eebd0c28 #2359 Fracture : Adjust default parameters for ellipse fracture 2018-01-10 07:44:53 +01:00
Jacob Støren
cb6d49a611 #2331 Renamed RimView to Rim3dView 2018-01-09 10:11:28 +01:00
Rebecca Cox
ab35d30ff5 #2348 Elm Props: "Import Element Property Table" command 2018-01-08 14:48:00 +01:00
Magne Sjaastad
a26f3b6907 #2340 Snapshot : Space in path is replaced with underscore 2018-01-08 11:46:51 +01:00
Bjørn Erik Jensen
4cdc109ec3 #2315. Replaced abs() by fabs() where relevant 2018-01-05 09:29:53 +01:00
Bjørn Erik Jensen
01faccee1c #2306 Export completions. Fix missing files for sim wells 2018-01-02 15:45:48 +01:00
Bjørn Erik Jensen
9d00648703 #1780 Export Completions. Add progress bar 2018-01-02 15:45:48 +01:00
Bjørn Erik Jensen
82d8b7c98a #2295. Guard for null frac template where it is being used 2018-01-02 12:54:10 +01:00
Magne Sjaastad
bdfd3d4e04 #2234 Completion Export : Do not include unticked perf intervals in project tree 2017-12-22 15:08:13 +01:00
Magne Sjaastad
173ef575fd #2234 Completion Export : Do not include unticked fishbones in project tree 2017-12-22 15:01:41 +01:00
Magne Sjaastad
500b298c26 #2293 Completion Export : Make sure one of the available combo box items are selected 2017-12-22 14:43:00 +01:00
Magne Sjaastad
d9e29b91cb #2234 Fractures : Export only sim well fractures ticked on in project tree 2017-12-22 14:43:00 +01:00
Magne Sjaastad
71c1267ab6 #2234 Fractures : Export only well path fractures ticked on in project tree 2017-12-22 14:43:00 +01:00
Bjørn Erik Jensen
4232ef2ffe #1726 Export completion dialog. Use previous case as default 2017-12-22 13:56:39 +01:00
Bjørn Erik Jensen
0869a8edf5 #2120 Perforations import. Lookup well path by fuzzy method instead of exact name match 2017-12-22 13:39:31 +01:00
Bjørn Erik Jensen
6d236c24de #2284 Completion export. Control inclusion of fracture debug info file from preferences 2017-12-22 13:10:35 +01:00
Bjørn Erik Jensen
fc6df4558f #2279 Fishbones. Guard against too small MD 2017-12-22 11:18:37 +01:00
Bjørn Erik Jensen
1d3a31d61f #2279 Fishbones. Default spacing is now 12.5. Place fishbone near well path end if no coordinates are specified 2017-12-22 09:53:08 +01:00
Magne Sjaastad
5153f5b926 CppCheck : Use const reference 2017-12-22 08:19:49 +01:00
Bjørn Erik Jensen
a0cb42a93b RicWellPathImportPerforationIntervalsFeature. Rename method 2017-12-21 14:34:01 +01:00
Bjørn Erik Jensen
8dc47a84a2 Export Completions Dialog. Do not overwrite export folder setting 2017-12-21 12:39:17 +01:00
Bjørn Erik Jensen
a2a2427062 #1903 Export completions. Use project's export completion dialog settings everywhere it's being used 2017-12-20 11:14:13 +01:00
Bjørn Erik Jensen
a05f357597 #1903 Export completions. Save dialog contents 2017-12-20 11:14:13 +01:00
sigurdp
dbd1265f31 #1873: Changed naming scheme when exporting laterals. Make sure fishbone name is exported and be more explicit in the enumeration of the subs and laterals. 
Refactored RimFishbonesMultipleSubs so that it is clear that the fishbone instances only have auto generated names based on their current index.
 2017-12-19 11:06:28 +01:00
Magne Sjaastad
e8200c41ac #2271 Cross Plot : Disable export of plot data 2017-12-18 14:50:08 +01:00
Magne Sjaastad
57a691f8da Remove "ResInsight:" prefix 2017-12-18 14:30:19 +01:00
Magne Sjaastad
7e71f50581 #2248 Source Stepping : Update toolbar when required for cross plot curves 2017-12-15 12:16:47 +01:00
Magne Sjaastad
2771270d24 #2248 Source Stepping : Update toolbar on new / delete of summary curve 2017-12-15 10:37:55 +01:00
Magne Sjaastad
79fea6d9f0 #2248 Source Stepping : Update toolbar when required 2017-12-15 10:37:55 +01:00
Bjørn Erik Jensen
e35a448dae Summary Cross Plot. Hide Paste Excel data for cross plots 2017-12-15 10:10:21 +01:00
Bjørn Erik Jensen
0cce524af1 Summary plot. Fix paste excel data command name 2017-12-15 10:01:39 +01:00
Bjørn Erik Jensen
3034fdd289 #2268 Summary plot. Fix missing Switch Axis command 2017-12-15 09:19:22 +01:00
Magne Sjaastad
3b9e7d0106 Avoid call to updateConnectedEditors from updatePlotTitle 2017-12-14 15:04:18 +01:00
Rebecca Cox
0788cfe3db Remove *inc file format. 2017-12-14 14:26:10 +01:00
Jacob Støren
ebe60d8b16 Curve Creator Curve Name Configuration group name updated 2017-12-14 13:05:37 +01:00
Bjørn Erik Jensen
f84a535511 #2264 PLT plot. Filter wells list based on well geometry and production data 2017-12-14 11:23:04 +01:00
Jacob Støren
8efcccf5c4 #1858 Guard against zero size laterals 2017-12-14 11:11:23 +01:00
Magne Sjaastad
9a805ac834 #2262 Curve Creator : Improved default collapsed state of UI groups 2017-12-14 10:14:22 +01:00
Magne Sjaastad
a37771e933 #2262 Curve Creator : Add support for creation of new auto titled plots 2017-12-14 10:13:53 +01:00
Magne Sjaastad
53d1c7ef66 #2262 Summary Curve Creator : Add support for auto plot title 2017-12-14 09:59:19 +01:00
sigurdp
99378cc23a #2194 RelPerm Plot: Added context menu to show ascii text version of current plot data. Refactor of existing RicTextWidget into RiuTextDialog. 2017-12-13 19:03:30 +01:00
Rebecca Cox
170c00c88a #2210 Add "Export Visible Cells as FLUXNUM/MULTNUM" to file->export 2017-12-13 15:24:40 +01:00
Bjørn Erik Jensen
607d9fff63 2260 Drag/drop LAS file channel. Fix invisible curve issue 2017-12-13 12:38:53 +01:00
Magne Sjaastad
898c7a0483 #987 Curve Creator : Use auto-generated plot name as default plot name 2017-12-13 08:06:34 +01:00
Jacob Støren
7d39d29ca5 Merge fix of #1858 2017-12-12 17:41:45 +01:00
Jacob Støren
dfd25f7b63 #1858 Fix missing connections from fishbone laterals 2017-12-12 17:40:32 +01:00
Jacob Støren
7e820cd251 #1858 General refactoring as preparations. Renaming Whitespace change. Remove obsolete code. 2017-12-12 16:32:57 +01:00
Rebecca Cox
2b0305fcc4 #2247 Add export FLIXNUM/MULTNUM to context menu on Cell Result item in tree view 2017-12-12 16:07:02 +01:00
Rebecca Cox
5a03783328 #2209 Use correct view in cmd "Export Visible Cells as FLUXNUM/MULTNUM" 2017-12-12 15:38:24 +01:00
Bjørn Erik Jensen
6ffcb703fd #2249 Summary Plot Editor. Support for plotting individual aquifers 2017-12-12 15:10:11 +01:00
Jacob Støren
6c3f569499 #1858 Align and remove near struct duplicates of WellPathCellIntersectionInfo 2017-12-12 14:49:10 +01:00
Jacob Støren
b15664cfc5 #1858 Rename WellPathIntersectionInfo classes 2017-12-12 13:53:02 +01:00
Bjørn Erik Jensen
9769d391e1 #2199, #2245 Summary plots. Add paste commands for cross plot. Add duplicate summary plots and curves 2017-12-12 13:22:36 +01:00
Jacob Støren
3a1939d460 #1858 Renaming and whitespace as preparations 2017-12-12 12:47:05 +01:00
Rebecca Cox
03b03cd438 Update plots on well pick import 2017-12-11 15:12:12 +01:00
Bjørn Erik Jensen
c1537664e3 Revert "2108 summary plot. Display short name in plot for calculated curves" 
This reverts commit 83a272296c.
 2017-12-11 14:54:58 +01:00
Magne Sjaastad
1841379e64 #2127 Sim Well Branches : Major refactor of sim well branch computation 
Remove local branch geometry caches
Add checkbox to control if branch detection should be used
Add RiaSimWllBranchTools and move helper functions from RimProject
 2017-12-08 10:24:14 +01:00
Jacob Støren
04e5ccfd7e #2238 Lift limitation of plotting Flooded PV as time history curve 2017-12-07 19:31:28 +01:00
Jacob Støren
cbeb248f6e Fix assert when canceling the Show Contributing Wells 2017-12-07 16:24:53 +01:00
Rebecca Cox
8608e00b35 #2224 Well Formations: Make Reloading the csv file work 2017-12-06 12:01:33 +01:00
Bjørn Erik Jensen
4bef3abda8 RicCellRangeUi. Fix build error. Calling constructor instead of using initializer 2017-12-06 11:47:28 +01:00
Rebecca Cox
5145d3f8a5 #2223 Well Formations: Rename to Well Picks where sensible 2017-12-05 14:14:53 +01:00
Bjørn Erik Jensen
77f4b4bb4b Grid statistics. Add argument to control the result text 2017-12-05 11:24:26 +01:00
Magne Sjaastad
93b69b807f #2198 Summary Plot : Set default curve selection 2017-12-04 14:36:17 +01:00
Magne Sjaastad
67fe2e268a #2211 Curve Calculator : Add default curve calculation before displaying dialog 2017-12-04 11:58:24 +01:00
Magne Sjaastad
f79e31be8f #2216 Disable creation of new calculation object as this causes crash 
Introduced in  8281391fb9
 2017-12-04 10:21:02 +01:00
Rebecca Cox
a5300032e9 #2213 Formations: Select formation on a case, only if a single file is imported 2017-12-01 15:39:54 +01:00
Bjørn Erik Jensen
8281391fb9 #2211 Curve calc. Create new calculation if empty 2017-12-01 15:36:46 +01:00
Bjørn Erik Jensen
83a272296c 2108 summary plot. Display short name in plot for calculated curves 2017-12-01 15:27:47 +01:00
Magne Sjaastad
6103f290bf #2170 Summary Case: Simplified access function to all cases, remove unused function 2017-12-01 13:55:39 +01:00
Rebecca Cox
a2a7155d1c #2213 Formations: On import, set formation on active case 2017-12-01 13:31:12 +01:00
Rebecca Cox
1c628fcf3e Change color in statistics dialog 2017-12-01 13:31:12 +01:00
Bjørn Erik Jensen
9eb85966ed CSV import. Reopen dialog on parse error 2017-12-01 12:41:44 +01:00
Bjørn Erik Jensen
a460124055 CSV import. Add tooltip to custom date time format field 2017-11-30 15:23:59 +01:00
Rebecca Cox
6fc888d718 Capitalize ui name in PDM fields 2017-11-30 13:44:18 +01:00
Rebecca Cox
845373940f #2144 Context menu: Add Plot well allocation command to wellPath 2017-11-30 12:06:14 +01:00
Rebecca Cox
19e649a674 #2144 Context menu: Change name: New Property Filter -> Property Filter 2017-11-30 12:06:14 +01:00
Rebecca Cox
bb4390651d #2144 Context menu: Remove commands from well path and sim well 2017-11-30 12:06:14 +01:00
Rebecca Cox
503645e688 Add command to check if a well path or sim well is selected in 3d view 2017-11-30 12:06:14 +01:00
Bjørn Erik Jensen
1eb4c4d3e6 #1929. Remove all parts of summary curve filter which is not needed for backward compatibility 2017-11-30 11:05:30 +01:00
Bjørn Erik Jensen
c5cc7ed842 Fix crash on Linux when opening model 2017-11-30 09:33:03 +01:00
Rebecca Cox
b9ff4b743b #2162 Context menu: Move geomech new property filter to new feature 2017-11-29 16:25:54 +01:00
Rebecca Cox
aa318a5aaf #2162 Context menu: Use Qt typedef ulonglong, not size_t 2017-11-29 15:26:23 +01:00
Rebecca Cox
0a8b2111bc #2162 Context menu: Add hide intersection box feature 2017-11-29 14:57:04 +01:00
Rebecca Cox
838dc7ada6 #2162 Context manu: Add hide intersection feature 2017-11-29 14:57:04 +01:00
Rebecca Cox
215fdf6233 #2162 Context menu: Move hide fault slot to command feature 2017-11-29 14:57:04 +01:00
Bjørn Erik Jensen
7fa9b15716 #2167 statistics dialog. Include statistics snapshot under 'Snapshot all views to file' 2017-11-29 13:34:55 +01:00
Bjørn Erik Jensen
f8256a30b8 #2167 statistics dialog. Screen dump to clipboard or file 2017-11-29 11:53:53 +01:00
Rebecca Cox
c0615134a9 #2162 Context menu: Move new property filter slot to command feature 2017-11-29 11:06:46 +01:00
Rebecca Cox
48b165e2aa #2162 Context menu: Move IJK-slice features to command 2017-11-29 09:03:22 +01:00
Rebecca Cox
e89d2c0717 Select newest RimWellPath on import of formations and well paths 2017-11-29 08:51:55 +01:00
Magne Sjaastad
1d9d8f6794 Add RiuTools with function for default window flags 2017-11-29 08:50:48 +01:00
Magne Sjaastad
dce728a4a2 #2154 Remove obsolete code 2017-11-29 07:23:16 +01:00
Bjørn Erik Jensen
c530841e41 Statistics dialog. Display time step 2017-11-28 15:07:57 +01:00
Rebecca Cox
38e2b7a74a Formation names: Set default formation info on add curve commands 2017-11-28 12:47:43 +01:00
Rebecca Cox
f9880c6e89 #2122 Formation/Well Path: Change command action text 2017-11-28 12:47:43 +01:00
Bjørn Erik Jensen
622161776e CSV import. Rename ColumnInfo to Column 2017-11-28 11:35:17 +01:00
Bjørn Erik Jensen
0dbcc43d9c CSV import dialog. Highlight selected time series column 2017-11-28 11:02:46 +01:00
Bjørn Erik Jensen
4b14a4fdda CSV import dialog. Use html table in preview text box 2017-11-28 11:02:46 +01:00
Bjørn Erik Jensen
6d4820a691 CSV import. Replaced old ASCII parser by the new RifCsvUserDataParser 2017-11-28 11:02:46 +01:00
Bjørn Erik Jensen
bdc680bc03 ASCII import dialog. Determine default decimal separator 2017-11-27 12:39:12 +01:00
Bjørn Erik Jensen
e53059e2c8 ASCII import dialog. Update preview when cell separator is modified 2017-11-27 11:35:00 +01:00
Bjørn Erik Jensen
2d221495eb ASCII import dialog. Use monospace font in preview widget 2017-11-27 11:01:37 +01:00
Bjørn Erik Jensen
4a61692d36 ASCII import. Reorganize dialog layout 2017-11-27 11:01:37 +01:00
Bjørn Erik Jensen
f34b2bb612 CSV import. Add argument to method. Texts in drop down 2017-11-27 11:01:37 +01:00
Magne Sjaastad
3e5a4945d1 QDialog Constructor : Use windows flags to avoid '?' on Windows 2017-11-27 09:16:18 +01:00
Magne Sjaastad
128f2eaee7 #2178 Summary Curve Edit : Create autoname for plot when possible 2017-11-27 09:16:18 +01:00
Magne Sjaastad
5e3467a5f6 (#861) Summary Plot : Add support for autogenerated plot name 2017-11-24 15:33:50 +01:00
Magne Sjaastad
20b3de9f7a Remove unused function 2017-11-24 15:33:49 +01:00
Unknown
e765a9ad59 #2175 Intersection: Set length in two directions 2017-11-24 15:18:25 +01:00
Unknown
ea74a77978 #2122 Formation/Well Path: Add Import well path formation feature 2017-11-24 15:18:25 +01:00
Bjørn Erik Jensen
800ac30d81 #2018 CSV import. Modify CSV parser interface. Optimization. 2017-11-24 13:54:01 +01:00
Bjørn Erik Jensen
3872be8f35 #2018 CSV import. More date formats. Bugfix in import dialog 2017-11-24 13:54:01 +01:00
Bjørn Erik Jensen
28db4c6e22 #2018 CSV import. Fix decimal point/locale 2017-11-24 13:54:01 +01:00
Bjørn Erik Jensen
11100fb6e0 #2018 CSV import. Select time series column. Columnify preview. Refactoring 2017-11-24 13:54:01 +01:00
Bjørn Erik Jensen
8dd804b5ee Parse options. Rename field 2017-11-24 13:54:01 +01:00
Unknown
ef52927795 #2175 Intersection: Make extrude length option on azimuth, dip plane 2017-11-23 15:20:14 +01:00
Bjørn Erik Jensen
fb24a9f29b #2018 CSV data. First working version of CSV import 2017-11-23 08:02:27 +01:00
Bjørn Erik Jensen
d7dc304eca #2018 Ascii data. Add preview text field to ascii paste dialog 2017-11-23 08:02:27 +01:00
Unknown
3ed9874876 #2164 Intersections: Make context command for Azimuth/Dip intersection 2017-11-21 18:57:05 +01:00
Unknown
ff9cd86491 #2121 Intersections: New context command text and remove includes 2017-11-21 18:43:26 +01:00
Unknown
d5819eaad7 #2163 Make intersection event handler 2017-11-21 15:58:47 +01:00
Unknown
3142f7dd44 #2121 Intersections: Add option "Azimuth, Dip" to Intersecting Geometry 2017-11-21 13:50:18 +01:00
Bjørn Erik Jensen
c366c04fcc #2058 Context command. Minor fix 2017-11-20 14:50:13 +01:00
Bjørn Erik Jensen
36c093d6fb #2058 Context command. Add 'On - others off' command 2017-11-20 14:47:22 +01:00
Bjørn Erik Jensen
c6a3eca3c2 Statistics dialog. Use active reservoir view as context object 2017-11-20 12:46:13 +01:00
Bjørn Erik Jensen
14198191b1 Statistics dialog. Align plots horizontally 2017-11-20 12:46:13 +01:00
Bjørn Erik Jensen
e843c58798 #2020 Move LAS files. Implement isCommandEnabled 2017-11-20 12:46:13 +01:00
Bjørn Erik Jensen
31a84181e6 #2020 Move LAS files. Support for submenus and command features with custom name and user data 2017-11-20 08:27:38 +01:00
Jacob Støren
5731acb319 #2136, #2136 Zoom PLT plot when adding curves (respect autoscale) 
Fix "New PLT plot" command using simwell name and not wellpath name
Rename of some methods
Use Phase Split as default
 2017-11-17 15:35:07 +01:00
Jacob Støren
6951000145 Fishbone Compdat: Use references instead of copy in loops etc. 2017-11-17 11:09:14 +01:00
Bjørn Erik Jensen
41db3e8b10 #2102 Statistics dialog. Adjust text edit height to its contents 2017-11-17 08:30:56 +01:00
Bjørn Erik Jensen
c4385c1c1c Statistics dialog. Fix crash when values equals INF 2017-11-16 14:52:06 +01:00
Bjørn Erik Jensen
d9a4288693 #2102 Statistics dialog. Support for geo mech data 2017-11-16 14:13:50 +01:00
Bjørn Erik Jensen
985388e60f Statistics dialog. Fix crash when no results exist 2017-11-16 13:22:43 +01:00
Magne Sjaastad
fd1ab39cad Remove duplicate file listing 2017-11-16 13:01:32 +01:00
Bjørn Erik Jensen
3bb1933f4d #2102 Statistics dialog. Refactoring 2017-11-16 12:51:08 +01:00
Bjørn Erik Jensen
cdfb839c06 Linux build error fix 2017-11-16 12:06:44 +01:00
Bjørn Erik Jensen
24843f55b6 #2102 Statistics dialog. Dialog contents updates as 3D view is modified 2017-11-16 10:39:54 +01:00
Bjørn Erik Jensen
4b48da4250 #2102 Statistics dialog. First version. Statistics not updating automatically 2017-11-15 20:46:45 +01:00
Jacob Støren
f027f7395d #2126, #2139 Several improvements in PLT Plot 
Improved timestep and source filtering
Show contribution sources on timestep
Axis unit set from the cases actually used
Warning on inconsistent units
 2017-11-15 16:18:36 +01:00
Magne Sjaastad
3b31c4800f #2091 Cross Plot : Rename to using X or Y as postfix to interface 2017-11-15 13:53:32 +01:00
Jacob Støren
07264140cb Add deleteAllCurves method, and rename removeCurve to takeOutCurve in order to minimize wrong use. 2017-11-15 11:32:25 +01:00
Magne Sjaastad
f14eb44efd #2089 Cross Plot : Make sure context menu items works as expected 2017-11-15 07:07:46 +01:00
Magne Sjaastad
d198ae44ba #2092 Cross Plot : Detect if curve is a cross plot curve based on anchestor 2017-11-14 12:58:28 +01:00
Magne Sjaastad
b72ce60379 #2089 Cross Plot : Add new cross plot curve feature 2017-11-14 12:58:28 +01:00
Bjørn Erik Jensen
440b10e381 #2138 PLT Plot. Add context command to tree view and 3D objects 2017-11-14 11:37:22 +01:00
Magne Sjaastad
9adb9ba4b1 #2088 Curve Calculator : Ask user to calculate curves when expression has changed 2017-11-14 08:41:44 +01:00
Magne Sjaastad
2e6c37c266 #2088 Curve Calculator : Use Close button instead of Ok and Cancel 2017-11-14 07:30:49 +01:00
Magne Sjaastad
2c8658c5c2 #2088 Curve Calculator : Insert layout once to avoid debug output warning 2017-11-14 07:28:02 +01:00
Magne Sjaastad
cfaf27d4bf #2105 Curve Calculator : Do not show calculator dialog modal 2017-11-13 21:45:02 +01:00
Rebecca Cox
a4484579e2 Select last imported wellPath on import, not last wellPath in collection 2017-11-13 07:55:22 +01:00
Jacob Støren
c5e4773a58 Fix RFT plot after change of well name meaning 2017-11-10 15:44:35 +01:00
Bjørn Erik Jensen
d3d5a89979 #2100 PLT plot. Refactoring. Use RimWellPlotTools methods 2017-11-09 11:18:57 +01:00
Rebecca Cox
52c1f27ad2 #1972 Toggle grid collection off when creating an intersection 2017-11-08 15:19:35 +01:00
Rebecca Cox
a42786bba0 #1972 Toggle grid collection on property filter creation 2017-11-08 15:19:35 +01:00
Rebecca Cox
c3ebcd7bc5 #1972 Toggle grid collection on range filter creation 2017-11-08 15:19:35 +01:00
Bjørn Erik Jensen
bfa1a1cb67 #2051 Curve calc. Edit calculation command 2017-11-08 08:47:17 +01:00
Magne Sjaastad
baa9a47b92 #2089 Cross Plot : Add New and Edit cross plot features 2017-11-07 21:26:44 +01:00
Magne Sjaastad
82721cb6fa #2003 Observed Data : Improve error display 2017-11-07 11:16:33 +01:00
Bjørn Erik Jensen
0f8b7ce907 #2048 Curve calc. Add command icon 2017-11-06 13:50:15 +01:00
Bjørn Erik Jensen
faf703dfeb #2053 Curve calc. Fix Linux build errors 2017-11-06 12:08:13 +01:00
Bjørn Erik Jensen
d5a3b319b8 #2053 Curve calc. Add 'Create copy' context menu 2017-11-06 11:35:54 +01:00
Bjørn Erik Jensen
0f6d5f9c48 #2054 Curve Calc. Add context menu with operators and functions 2017-11-03 08:37:37 +01:00
Magne Sjaastad
9b7cfdd913 #2066 Observed Data : Improve error reporting 2017-11-03 08:24:25 +01:00
Rebecca Cox
e60941aa2c #2075 RFT Plot: Add "New RFT plot" command to well path 2017-11-02 12:32:54 +01:00
Bjørn Erik Jensen
62b96a5ae5 #2049 Curve calc. Add curve calc command to more objects and toolbar 2017-11-02 09:30:30 +01:00
Bjørn Erik Jensen
e7c0d6d59a #2044 Close LAS file. Update plots after LAS delete and import 2017-10-31 15:42:11 +01:00
Jacob Støren
46e8144f3b #2064 Fix wrong timestep range text in Gui. Complete Fix #1986. Make it possible with Visible cells and FlowDiag/Injection flooding 2017-10-27 17:12:48 +02:00
Magne Sjaastad
0db436a181 #2045 Curve Creator : Avoid dynamic_cast 2017-10-27 09:13:14 +02:00
Magne Sjaastad
1fb6d87c82 #2045 Curve Creator : Clear last curve selection when creating a new plot 2017-10-27 09:01:49 +02:00
Magne Sjaastad
0be241eb59 #2045 Remove obsolete factory and move curve editor into RicSummaryCurveCreator 2017-10-27 08:26:20 +02:00
Magne Sjaastad
1132d1fe7a #2045 Curve Creator : Use unique_ptr and whitespace 2017-10-27 08:22:14 +02:00
Magne Sjaastad
d1579bd792 #2045 Curve Creator : Use PdmPointer 2017-10-27 08:22:14 +02:00
Magne Sjaastad
ae8d614fb0 #2045 Curve Creator : Make sure preview plot is updated in defineUiOrdering 2017-10-27 08:22:14 +02:00
Magne Sjaastad
f83df13394 #2045 Summary : Update object editors when case is created or closed 2017-10-27 08:22:14 +02:00
Magne Sjaastad
dab23164df Summary Plot : Do not create object editor in command feature constructor 2017-10-27 08:22:14 +02:00
Bjørn Erik Jensen
fcefa1e55b WellLogPath. Fix memory leak 2017-10-25 20:23:43 +02:00
Bjørn Erik Jensen
a97fc2b9ba #1948 PLT Plot. Display curves from well log file 2017-10-25 14:43:17 +02:00
Bjørn Erik Jensen
a35329555b #1948 PLT plot. Initial version, RFT plot copy 2017-10-25 14:36:18 +02:00
Bjørn Erik Jensen
b3f77d1d70 #2036. WellLogFile close command 2017-10-25 11:36:34 +02:00
Bjørn Erik Jensen
2d047aab84 WellLogPlot. Automatically select well log file when only one exists 2017-10-24 08:22:08 +02:00
Bjørn Erik Jensen
34d77d2733 WellLogPlot. Handle multiple well log files in well path 2017-10-24 08:22:08 +02:00
Magne Sjaastad
35a2769cab #2032 Curve Calculator : Rename of calculation and calculation collection 2017-10-23 14:42:38 +02:00
Magne Sjaastad
f943a80f95 #2032 Curve Calculator : Rename 2017-10-23 14:27:04 +02:00
Bjørn Erik Jensen
8276d92ce7 #1999 Curve calc. Curve creator now uses CurveDefSelection component 2017-10-23 11:41:49 +02:00
Magne Sjaastad
0bd745dd66 Remove unused variables 2017-10-23 11:37:40 +02:00
Rebecca Cox
359ac1cbd7 Avoid crash when wellPath size = 0 2017-10-23 08:48:56 +02:00
Rebecca Cox
3eaeba8f67 #2025 Formations : Use imported formation names by default when sensible 2017-10-20 16:10:48 +02:00
Rebecca Cox
9bd60ebec2 #2027 Select formation name on formation name import 2017-10-20 14:34:56 +02:00
Rebecca Cox
e9ee33a765 White space clean up 2017-10-20 12:42:41 +02:00
Rebecca Cox
1775045248 #2027 Select Well path on well path import 2017-10-20 12:40:11 +02:00
Magne Sjaastad
07b3778a75 #2028 Summary : Use SummaryTools to access summary objects 2017-10-20 10:54:48 +02:00
Magne Sjaastad
167f56f95a #2026 Curve Calculator : Update calculated curves and plots 2017-10-20 10:20:58 +02:00
Bjørn Erik Jensen
b99f12b3e4 #1998 RFT plot. Support for multiple LAS files per well path 2017-10-19 16:13:53 +02:00
Rebecca Cox
66af820acd Avoid crash on opening of input eclipse case without grid and log error 2017-10-19 11:37:20 +02:00
Magne Sjaastad
22159a1c63 System : Simplify access to selected objects 2017-10-19 10:11:14 +02:00
Magne Sjaastad
215eb58de0 System : Always include Qt using <> and cleaned up some includes/whitespace 2017-10-19 10:11:14 +02:00
Magne Sjaastad
8e105ceb7a System : Set default expand state to true when expanding an item in tree views 2017-10-19 10:11:14 +02:00
Rebecca Cox
74ab333c49 #2017 Select Plot on Add To New Plot on RimWellLogFileChannel 2017-10-18 13:22:20 +02:00
Magne Sjaastad
9d335e1163 #1999 Curve Creator : Temporary fix for display of calculated curves 2017-10-18 12:47:10 +02:00
Magne Sjaastad
bd8abba779 #2022 Curve Calculator : Add enum Calculated 2017-10-18 12:47:10 +02:00
Unknown
b937bc53d8 #2017 Make all new objects selected after new / edit commands 2017-10-17 13:25:00 +02:00
Unknown
6c29a553ec #1882 Well paths: Guard pointers 2017-10-17 13:22:33 +02:00
Bjørn Erik Jensen
01cadd5a1c #2010 RFT plot. Show relevant curves initially 2017-10-17 11:05:14 +02:00
Rebecca Cox
c52d9522c0 Fix crash when right clicking on a well when the case does not have RFT data 2017-10-17 09:52:31 +02:00
Rebecca Cox
c579676543 #2012 Observed data: Select observed data on import 2017-10-17 09:52:31 +02:00
Rebecca Cox
9bd556a1b9 #1996 Remane RimFieldCollection -> RimFaultInViewCollection 2017-10-17 09:52:31 +02:00
Rebecca Cox
6674f6087a #1984 Ensure QDateTime spec set to UTC 2017-10-17 09:52:31 +02:00
Rebecca Cox
97e60ab5f2 #1996: Rename RimFault -> RimFaultInView 2017-10-17 09:52:31 +02:00
Rebecca Cox
7da8e3091b #1996: Rename RimEclipseWellCollection -> RimSimWellInViewCollection 2017-10-17 09:52:31 +02:00
Rebecca Cox
44be1bfd6b #1996 Rename RigSingleWellResultsData -> RigSimWellData 2017-10-17 09:52:31 +02:00
Rebecca Cox
7d908394db #1996 Renaming. Remove unused includes and rename local variables 2017-10-17 09:52:31 +02:00
Rebecca Cox
d748803159 #1996 Rename RimEclipseWell -> RimSimWellInView 2017-10-17 09:52:31 +02:00
Magne Sjaastad
ccd839c182 #1977 Curve Calculator : Use smaller and right aligned buttons 2017-10-13 16:22:39 +02:00
Magne Sjaastad
82aee8f5bf #1977 Curve Calculator : Create calculation description from addresses 2017-10-13 14:33:26 +02:00
Magne Sjaastad
15f71c29fa #1977 Curve Calculator : Hide Edit header, hide new/delete variable buttons 2017-10-13 13:47:01 +02:00
Magne Sjaastad
9d0e59c60f #1977 Curve Calculator : Trigger parsing and evaluation of expression 2017-10-13 13:04:54 +02:00
Magne Sjaastad
2dd18cec6e #1977 Curve Calculator : Remove parent pointer from constructor 2017-10-12 21:07:35 +02:00
Magne Sjaastad
ad92b93e06 #1977 Curve Calculator : Rename to RicSummaryCurveCalculatorEditor 2017-10-12 21:07:35 +02:00
Magne Sjaastad
650e29d6d5 #1977 Curve Calculator : Add button box to dialogs 2017-10-12 10:52:30 +02:00
Magne Sjaastad
6fd9bec353 #1977 Curve Calculator : Main dialog with expression editor 2017-10-12 10:52:30 +02:00
Magne Sjaastad
4046665044 #1977 Curve Calculator : Add RiuSummaryCurveDefinition and friends 2017-10-12 10:52:30 +02:00
Bjørn Erik Jensen
886c1ea256 #1981 RFT Plot. Disabled several commands 2017-10-10 11:18:53 +02:00
Rebecca Cox
dae8d775be Linux build failed. Replace slash 2017-10-09 15:33:01 +02:00
Rebecca Cox
69d4bb69c6 #1979 Observed Data: Add sensible filters on Import observed data file dialog 2017-10-09 15:23:50 +02:00
Rebecca Cox
634108de8c Add wellLog Tools class and move static methods from newCurve-commands 2017-10-09 14:32:15 +02:00
Rebecca Cox
da118ac1da #1971 WLP: Context command to create a new well log RFT curve from a selected well 2017-10-09 14:32:15 +02:00
Bjørn Erik Jensen
0e832fad06 #1978 Curve Creator. Separate selections of observed data and simulated data 2017-10-09 08:54:49 +02:00
Rebecca Cox
984fbc66ac #1970 WLP: Command to create an empty RFT-curve 2017-10-06 14:54:38 +02:00
Jacob Støren
9bb5dcf011 Make wellLogFile field private in RimWellPath. Some whitespace changes 2017-10-06 13:24:45 +02:00
Jacob Støren
6f82f0f614 Rename and whitespace changes 2017-10-06 12:36:21 +02:00
Bjørn Erik Jensen
5f050448f9 Move method to CPP file 2017-10-06 07:41:48 +02:00
Bjørn Erik Jensen
fba1d068e9 Forward declare class 2017-10-05 16:53:14 +02:00
Bjørn Erik Jensen
b6c74ee559 #1842 RFT Plot. Command enabling criteria. Minor refactoring 2017-10-05 16:27:39 +02:00
Bjørn Erik Jensen
d283e3aa8c Curve creator. Minor refactoring 2017-10-05 16:27:39 +02:00
Bjørn Erik Jensen
2add09ea33 #1842 RFT Plot. Show plot when new RFT plot command is triggered 2017-10-05 16:26:39 +02:00
Bjørn Erik Jensen
141bfd27d7 #1842 RFT Plot. Implement property view and RFT plot commands 2017-10-05 16:26:39 +02:00
Bjørn Erik Jensen
536225eb7e #1842 RFT plot. Removed unnecessary fields in RFT plot 2017-10-05 16:26:39 +02:00
Magne Sjaastad
a362891d7e #1940 Curve Creator : Make sure the curve tree is updated 2017-10-02 14:49:24 +02:00
Magne Sjaastad
0fd2df9f57 Edit Summary Plot: Improve isCommandEnabled 2017-10-02 12:48:01 +02:00
Magne Sjaastad
eec974c53d #1940 Curve Creator : Always recreate curve creator to ensure stable init 2017-10-02 12:46:40 +02:00
Arne Morten Kvarving
ab4619bf74 fixed: add missing cmath include statements 
highlighted by building with gcc6
 2017-09-29 18:24:28 +02:00
Rebecca Cox
05e3774d36 #1915 Curve creator: Remove option to make default curve filter in preferences 2017-09-29 13:23:23 +02:00
Unknown
e1c58fd1c3 #1945 Curve creator: Remove "Contribute to legend" option 2017-09-29 12:47:10 +02:00
Unknown
d9bee55116 Observed data: Rename Observed data to Observed Time History Data in GUI 2017-09-29 11:39:07 +02:00
Unknown
8a139f7ebe #1939 Curve creator: Created or edited plots is toggled on Apply/OK 2017-09-28 11:17:00 +02:00
Unknown
068bf64717 #1916 Plot project tree: Select first case of selection after grouping, and leave new group expanded 2017-09-28 10:46:26 +02:00
Unknown
29ac350b8f #1939 Curve creator: Select newly created or edited plot on Apply/OK. Will only be visible if plot is toggled 2017-09-28 10:18:16 +02:00
Jacob Støren
00ef13094a Revert hard setting of linestyle NONE fro observed data. Must be more graceful 2017-09-27 19:43:11 +02:00
Bjørn Erik Jensen
fddabb61e2 Curve creator. Set line style NONE for observed data curves (II). Remove test code. 2017-09-27 15:33:46 +02:00
Jacob Støren
53ec396449 #1927 Avoid enabling of command if text is not at least 12 char long 2017-09-27 15:13:35 +02:00
Rebecca Cox
faf5f59be6 #1820 Observed data: Add close command of observed data 2017-09-27 15:07:32 +02:00
Bjørn Erik Jensen
4f238a74b0 Curve creator. Set line style NONE for observed data curves 2017-09-27 14:58:01 +02:00
Rebecca Cox
31133f31c0 #1938 Curve creator: Close all widgets on closing of curve creator 2017-09-27 14:35:33 +02:00
Rebecca Cox
4019e76ae1 #1938 Curve creator: Show Plot Data will not raise main plot window 2017-09-27 14:35:33 +02:00
Bjørn Erik Jensen
70a41709cf #1842 RFT plot. Initial commit. Under construction... 2017-09-27 12:39:35 +02:00
Bjørn Erik Jensen
4efe9ca944 Observed data. Fixed editor display for observed data 2017-09-26 10:39:36 +02:00
Magne Sjaastad
c7fb2351b1 Cleaned up includes 2017-09-26 08:28:04 +02:00
Magne Sjaastad
e62d5e4277 Cleaned up includes 2017-09-26 08:25:49 +02:00
Bjørn Erik Jensen
4dde03c1ac Curve creator. Fixed observed data address filtering 2017-09-26 08:25:36 +02:00
Bjørn Erik Jensen
8554b7eab0 #1930 Curve creator. GUI adjustments (II) 2017-09-25 15:39:13 +02:00
Magne Sjaastad
ef56591555 #1934 #1839 Observed Data : Add parsing of column based summary data 2017-09-25 14:37:45 +02:00
Bjørn Erik Jensen
05c07693b6 #1930 Curve creator. GUI adjustments 2017-09-25 14:33:21 +02:00
Rebecca Cox
797c040057 #1816 Observed data: Remove superfluous functions in column ascii parser 2017-09-24 18:04:19 +02:00
Jacob Støren
1309424835 #1923 Avoid plot update for each curve when updating the Curve Creator target plot 2017-09-23 09:12:49 +02:00
Jacob Støren
0bb47cba88 #1923 Add no-plot-update versions of update methods in curve system. onLoadDataAndUpdate is improved for summary curve but not always called with the "no update" flag set 2017-09-23 08:47:04 +02:00
Bjørn Erik Jensen
b28bcaa4e4 #1927 Paste Ascii data command. Create an empty summary plot 2017-09-22 15:38:40 +02:00
Magne Sjaastad
aba74bcdfd #1918 Observed Data : Remove RigSummaryCaseData 2017-09-22 15:02:14 +02:00
Magne Sjaastad
32fa6d4920 #1918 Observed Data : Removed RigCase RigSummaryCaseData from RimSummaryCase 2017-09-22 15:02:14 +02:00
Bjørn Erik Jensen
2bad74b4aa #1928 Curve Creator. Appearance label fix. Move group boxes 2017-09-22 14:40:06 +02:00
Bjørn Erik Jensen
d83c468033 #1919 Curve Creator. Fix summary category initial selection 2017-09-22 12:53:54 +02:00
Bjørn Erik Jensen
0ae5c344d3 #1922 Curve creator. Set dialog window title 2017-09-22 12:02:13 +02:00
Bjørn Erik Jensen
f4148dfe7a #1920 Curve creator. Adjust target plot combobox width to contents 2017-09-22 11:49:00 +02:00
Bjørn Erik Jensen
70ede18dc1 #1924 Curve creator. Fix auto appearance behavior 2017-09-22 11:02:49 +02:00
Bjørn Erik Jensen
8e2f97ffea #1921. Fix typo 2017-09-22 10:02:58 +02:00
Bjørn Erik Jensen
1590a2a26e #1921 Curve Creator. Add curve name config 2017-09-22 09:54:55 +02:00
Bjørn Erik Jensen
e7f19ff89d #1914 Curve creator. Bring curve creator dialog to front on new plot and edit plot commands 2017-09-21 15:48:00 +02:00
Bjørn Erik Jensen
00fc2a2eaa #1853 Summary curve filter. Remove unused includes and friend declarations 2017-09-21 15:18:28 +02:00
Rebecca Cox
68a101fe2d #1816 Use new parser on pasting data to summary plot 2017-09-21 12:21:52 +02:00
Bjørn Erik Jensen
4c6c3ae564 #1913 New summary plot. Always show 'new plot' in target plots drop down 2017-09-21 11:00:03 +02:00
Bjørn Erik Jensen
a72f2ea421 #1917 Plot project tree. Clean up summary plot popup menu. 2017-09-21 10:47:55 +02:00
Bjørn Erik Jensen
292ea3c67f #1913 New summary plot. Command brings up curve creator and creates new plot on Apply/OK 2017-09-21 09:50:03 +02:00
Rebecca Cox
9d56cee1be #1816 Observed data: In parser, split header on cellseparator, not tab 2017-09-21 09:00:51 +02:00
Rebecca Cox
d0d8a7d4be #1816 Observed data: Reader interface will be used throughout the code 2017-09-21 09:00:51 +02:00
Jacob Støren
7429b21fff #1910 Use NTG for transmissibility calculations of Perforations and fishbones and as std eclipse calculation as basis for WPIMULT 2017-09-20 15:25:02 +02:00
Bjørn Erik Jensen
b0554516dd #1897 Curve creator. Use only one region editor for region to region category 2017-09-20 13:06:55 +02:00
Bjørn Erik Jensen
89bc438921 #1815 Curve creator. Fix bug related to observed data summaries 2017-09-20 12:55:16 +02:00
Jacob Støren
1326912b7c Merge branch 'dev' of https://github.com/OPM/ResInsight.git 2017-09-20 12:34:08 +02:00
Bjørn Erik Jensen
b430982b2f #1895 Curve creator. Filter curves by selecting summary category/categories 2017-09-20 11:42:56 +02:00
Bjørn Erik Jensen
dd8549d3d1 #1815 Curve Creator. Display observed data in summaries editor 2017-09-20 11:20:45 +02:00
Jacob Støren
b03da807ea Merge fixes related to #1901 Perforation COMPDAT export errors 2017-09-20 11:05:59 +02:00
Magne Sjaastad
9fee4d0511 #1895 : Curve Creator : Use TreeSelectionEditor for Summary Types 2017-09-20 10:44:14 +02:00
Magne Sjaastad
86fa56aedc #1895 Curve Creator : Rename to currentSummaryCategory 2017-09-20 10:15:18 +02:00
Bjørn Erik Jensen
e369b8a131 Cleanup. Remove commented code 2017-09-20 08:23:48 +02:00
Bjørn Erik Jensen
8d23ae478a Curve creator. Fixed label 2017-09-20 08:06:41 +02:00
Bjørn Erik Jensen
a0dae9209e #1815 Observed data. Add folder 'Observed Data' in case editor 2017-09-20 08:06:41 +02:00
Bjørn Erik Jensen
952bfeefe8 #1851 Curve Creator. Appearance editor with apply button 2017-09-20 08:06:41 +02:00
Jacob Støren
8334c36eff #1901 Use correct PERMY and PERMZ in wellpath perforation completion data export 2017-09-19 17:26:13 +02:00
Jacob Støren
dc1844f5d5 #1901 Use the more robust WellLogExtraction system for perforation interval intersection calculations. 2017-09-19 17:20:49 +02:00
Jacob Støren
19354b1a8b #1901 Whitespace changes to improve readability 2017-09-19 15:22:14 +02:00
Rebecca Cox
fe1dfebea2 #1813 Observed data: Remove right click options if any object in selection is an observed data 2017-09-19 14:47:36 +02:00
Rebecca Cox
1eecef9f72 #1813 Observed data: Change ui names 2017-09-19 14:19:44 +02:00
Rebecca Cox
4e82aaf502 #1813 Observed data: Remove right click options for observed data 2017-09-19 14:19:44 +02:00
Rebecca Cox
dd45f7c453 #1818 Observed Data: Command to Import observed data 2017-09-19 14:19:44 +02:00
Rebecca Cox
d23675b466 #1818 Observed data: Create command to import observed data from file 2017-09-19 14:19:44 +02:00
Magne Sjaastad
f9a026ad56 Curve Creator : Show curves above appearance 2017-09-19 11:11:01 +02:00
Bjørn Erik Jensen
da9421485e #1853 Curve Creator. Plot tree view displays curves only 2017-09-19 09:29:24 +02:00
Bjørn Erik Jensen
17e01cd11c #1886 Curve creator. Set visibility to false for curves that should not be displayed 2017-09-18 16:11:44 +02:00
Bjørn Erik Jensen
6892273188 #1841 Curve creator. Improved case selection. Case grouping 2017-09-18 14:49:31 +02:00
Bjørn Erik Jensen
3c3c8fe44b #1886 Curve creator. Renaming 2017-09-18 11:54:38 +02:00
Bjørn Erik Jensen
65692eddab #1886 Curve creator. Implemented editor apply button behavior 2017-09-18 10:45:31 +02:00
Magne Sjaastad
d94eddc1ef #1889 Curve Creator : Close dialog when closing project 2017-09-18 07:46:29 +02:00
Magne Sjaastad
d27dc2be76 #1886 Curve Creator : Add new plot button 2017-09-15 16:15:54 +02:00
Magne Sjaastad
f8ad2f7581 #1889 Curve Creator : Close dialog when close button is pressed 2017-09-15 14:42:48 +02:00
Bjørn Erik Jensen
66d08aeb8d #1886 Curve creator. Copy curves back to target plot 2017-09-15 14:34:33 +02:00
Magne Sjaastad
5eeefc2511 #1889 Curve Creator : Add field editors at bottom of dialog 2017-09-15 13:47:15 +02:00
Magne Sjaastad
c00fb2d1f9 #1889 Curve Creator : Add stretch to bottom field layout 2017-09-15 13:42:43 +02:00
Magne Sjaastad
6855d63394 #1889 Curve Creator : Produce option items in summary plot collection 2017-09-15 13:42:43 +02:00
Bjørn Erik Jensen
9f47226049 #1886 Curve creator. Set target plot from edit summary curve command 2017-09-15 13:37:52 +02:00
Bjørn Erik Jensen
388dcd3552 #1886 curve creator. Populate curve creator and copy curves back to target plot 2017-09-15 11:49:09 +02:00
Magne Sjaastad
35bb8d9366 #1889 Curve Creator : Remove obsolete files 2017-09-15 10:58:12 +02:00
Magne Sjaastad
f1f5ead0ba #1889 Curve Creator : Add dialog with splitter 2017-09-15 10:48:38 +02:00
Bjørn Erik Jensen
ca7ebe16e6 #1888 Curve appearance. Added curly braces and minor refactoring 2017-09-15 08:30:29 +02:00
Bjørn Erik Jensen
a049b5755f CurveCreator : Fix compiler issue on Linux 2017-09-14 15:58:02 +02:00
Bjørn Erik Jensen
7e60fa632f #1888 Curve appearance. Add and delete curves dynamically in preview plot due to current selection 2017-09-14 15:42:08 +02:00
Rebecca Cox
0044fb9e50 #1887 Curve Creator: Make the new SummaryCurveCollection operational 2017-09-14 13:57:27 +02:00
Magne Sjaastad
1ec9e72ce2 #1891 StimPlan : Add support for "Conductivity-propped" 2017-09-14 13:48:33 +02:00
Bjørn Erik Jensen
db233a970f #1888 Curve appearance. Baseline: Curve creator behaves as the old summary curve filter regarding auto appearance 2017-09-14 13:14:06 +02:00
Bjørn Erik Jensen
ba88e81824 #1890 Curve creator. Update curves when changing either case selection or one of the dynamic fields 2017-09-14 08:29:34 +02:00
Magne Sjaastad
66adff30a0 Fix several issues related to signed/unsigned compare 2017-09-14 07:50:41 +02:00
Magne Sjaastad
981333bcd4 CurveCreator : Fix compiler issue on Linux 2017-09-14 07:43:56 +02:00
Jacob Støren
473643fca4 #1847 Add plot and curve list to the Curve Creator 
Cleaned up RicSummaryCurveCreator.h
 2017-09-13 18:55:58 +02:00
Jacob Støren
ebcced932a #1847 Add a temporary field to show the adresses of the selected curves 2017-09-13 17:18:15 +02:00
Bjørn Erik Jensen
d5c293e8ad #1847 Summary curves. Preview for filtering addresses to display 2017-09-13 16:42:01 +02:00
Jacob Støren
46ddee749c #1852 Adjusted field names etc in the UI 2017-09-13 16:38:54 +02:00
Magne Sjaastad
6e4494dca1 #1852 Curve Creator : Show fields in four columns 2017-09-13 15:22:16 +02:00
Magne Sjaastad
87364429f8 #1852 Curve Creator : Add RicSummaryCurveCreatorUi 2017-09-13 13:55:33 +02:00
Jacob Støren
7f07962187 #1693 Reroute all access to RigCaseCellResultsData away from RimReservoirCellResultsStorage 2017-09-13 11:50:27 +02:00
Jacob Støren
bb098a241b #1693 Rename of result() to resultStorage() as step to remove the access to RigCaseCellResultsData through RimReservoirCellResultsStorage 2017-09-13 11:50:27 +02:00
Rebecca Cox
334a9c5bc4 #1840 Summary case: Cut paste with key shortcut and multiselection for copying/cutting with key shortcut 2017-09-13 11:15:28 +02:00
Rebecca Cox
018aea4f58 Add guard against null pointer access 2017-09-13 11:15:28 +02:00
Rebecca Cox
071082a7df #1840 Summary case: clear clipboard on paste, not only set mime data to nullptr 2017-09-13 11:15:28 +02:00
Rebecca Cox
ee25b8424d #1840 Summary case: Cut paste of summary cases 2017-09-13 11:15:28 +02:00
Bjørn Erik Jensen
31d753ca36 #1847 Summary curves. Minor imporvements. Removed code commited by accident 2017-09-13 10:14:18 +02:00
Bjørn Erik Jensen
b101457ff9 #1847 Summary curves. Renaming and simplifications 2017-09-13 07:52:46 +02:00
Bjørn Erik Jensen
f68760fec7 #1847 Summary curves. More work on the RicSummaryCurveCreator 2017-09-13 07:52:46 +02:00
Bjørn Erik Jensen
6583f62ca4 Rename method createCurves to createDefaultCurves 2017-09-13 07:52:46 +02:00
Bjørn Erik Jensen
b5f2233407 #1847 Summary curves. Create first version of RicSummaryCurveCreator 2017-09-13 07:52:46 +02:00
Rebecca Cox
414823827a #1840 Summary case: Rename and code clean up 2017-09-11 10:45:26 +02:00
Rebecca Cox
d1561936b3 #1840 Summary case: Simplified code based on user input 2017-09-11 10:45:26 +02:00
Rebecca Cox
c60465b380 #1840 Summary case: Delete a summary collection with or without its contents 2017-09-11 10:45:26 +02:00
Rebecca Cox
36dec3062a #1751 #1840 Summary case: Remove extra lines in code 2017-09-11 10:45:26 +02:00
Rebecca Cox
5341581bf6 #1751 #1840 Summary case: Remove option to group cases within another case 2017-09-11 10:45:26 +02:00
Rebecca Cox
88d37f6e7c #1751 #1840 Summary case: Feature for deleting all items in a case collection 2017-09-11 10:45:26 +02:00
Rebecca Cox
8991cfef0d #1751 #1840 Summary case: Add group to summary case. Curves will loose their case 2017-09-11 10:45:26 +02:00
Jacob Støren
d638f536d8 #1879 Guard filename generation for cases without timesteps 2017-09-08 14:43:52 +02:00
Magne Sjaastad
fb1b6cc628 CppCheck : Remove unused variables 2017-09-07 22:05:20 +02:00
Magne Sjaastad
b82cf1377d CppCheck : Remove unused variables 2017-09-07 21:30:33 +02:00
Magne Sjaastad
6c3a0d91b4 CppCheck : Add missing init in constructor 2017-09-07 20:46:30 +02:00
Magne Sjaastad
7764f812e4 CppCheck : Intialize all variables in constructor 2017-09-07 20:43:01 +02:00
Magne Sjaastad
8ecfaa2ea7 CppCheck : Avoid potential null pointer access 2017-09-07 20:33:17 +02:00
Rebecca Cox
dd845e3dc7 #1751 Rename RimSummaryCaseCollection to RimSummaryCaseMainCollection 2017-09-06 16:32:52 +02:00
Rebecca Cox
600da3731a #1727 Summary Plot: Add Reload option for group and for individual summary cases 2017-09-06 14:09:15 +02:00
Unknown
a910697f6a #1728 Remove curve filter curves for chosen case(s) 2017-09-06 08:37:28 +02:00
Unknown
f09ec5a7c9 #1728: Change text on feature label 2017-09-06 08:37:28 +02:00
Unknown
a4aa06b75c #1728 Can close all summary cases within one collection 2017-09-06 08:37:28 +02:00
Unknown
e1ab73da30 #1728 Relace tab with spaces 2017-09-06 08:37:28 +02:00
Unknown
1ae9978214 #1728 Curves assisiated with closed summary case(s) are deleted 2017-09-06 08:37:28 +02:00
rebcox1
946351c853 #1728 Add close summary command. Dependent curves yet not deleted 2017-09-06 08:37:28 +02:00
astridkbjorke
3a44cbb986 #1787 Removing code for returning cumulative inflow, only used for testing 2017-08-31 15:30:29 +02:00
astridkbjorke
ad14863a36 #1787 Removing mainGrid from constructor, scaling porevolume by (1-swcr), if swcr is available in file 2017-08-31 14:28:35 +02:00
astridkbjorke
f0f189b311 #1787 Correcting which timestep is used for calculation of total flow into cell 2017-08-31 12:45:05 +02:00
astridkbjorke
0ab95bc1f2 #1787 Sorting out issue with indexing - resultindex vs global index 2017-08-31 12:45:05 +02:00
astridkbjorke
d9589c836a #1787 Removing hardcoding of tracername to dummy value. Changing to have vector of QString for tracernames for calculator. 2017-08-30 10:50:55 +02:00
astridkbjorke
3112c10ec1 #1787 Making test feature to be able to run the calculator 2017-08-30 08:59:05 +02:00
Bjørnar Grip Fjær
1c483c7420 #1697 Export of visible cells to FLUXNUM / MULTNUM .GRDECL file 2017-08-29 14:30:01 +02:00