Commit Graph
100 Commits
Author SHA1 Message Date
Gaute Lindkvist 92e4fa9024 #3863 fix default MSW parameters for perforation intervals. 2018-12-12 15:37:10 +01:00
Gaute Lindkvist 8821a37b90 #3853 Remove zero padding and unnecessary space at beginning and end of row for WSEGAICD 2018-12-12 15:07:04 +01:00
Gaute Lindkvist b2d178e584 #3857 Fix split on well and completion for MSW export. 2018-12-12 11:04:55 +01:00
Gaute Lindkvist 509f77c7f1 #3855 Limit entry and exit lengths in perforation COMPSEGS when perforation doesn't pass through entire cell. 2018-12-12 09:44:00 +01:00
Gaute Lindkvist 762b6ef382 Fix name for MSW export file for fishbones 2018-12-12 09:10:19 +01:00
Gaute Lindkvist 18a5961230 #3857 Support file split option in command file for export MSW 2018-12-12 08:42:24 +01:00
Gaute Lindkvist 914daded6b #3794 Improve wheel zooming 2018-12-12 08:01:13 +01:00
Gaute Lindkvist 240c748910 #3830 Replace column headers in WSEGAICD table with numbers with a description of the numbers first.
* This way columns don't take up much space.
2018-12-11 21:05:43 +01:00
Gaute Lindkvist 2766b18a2f #3844 and #3845 Split MSW export the same way as regular export and unify names. 2018-12-11 20:06:41 +01:00
Gaute Lindkvist 41dc8feca3 #3849 Shorten column space for WSEGAICD table to 1 2018-12-11 16:57:05 +01:00
Gaute Lindkvist 3dafd06859 #3850 Implement calculation of AICD length 2018-12-11 16:21:17 +01:00
Gaute Lindkvist e510237793 Make Qt5 fix for RiaApplication::launchUnitTests() a bit safer. 2018-12-11 15:39:12 +01:00
Gaute Lindkvist cd75be6671 #3848 Fix crash with text picking by guarding pointer to scene. 2018-12-11 15:33:47 +01:00
Gaute Lindkvist f3a2f0c5b2 Fix build problem on Qt5 in relation to unit tests. 2018-12-11 15:32:08 +01:00
Gaute Lindkvist 5368574848 #3846 Make HF- the default pressure drop for MSW and put quotes around the text. 2018-12-11 15:32:07 +01:00
Gaute Lindkvist d78cda3234 #3847 Use export name for well names in MSW export 2018-12-11 15:32:07 +01:00
Gaute Lindkvist 17e12a92a0 Update CMake to only look for Qt5 if RESINSIGHT_BUILD_WITH_QT5 is set 2018-12-10 15:10:46 +01:00
Gaute Lindkvist a6493042d4 #3779 Fix inf -> 1* output in AICD export tables 2018-12-10 10:04:08 +01:00
Gaute Lindkvist 15576a9ae3 #3779 Preliminary AICD output 2018-12-07 15:48:18 +01:00
Gaute Lindkvist ddd454077f #3779 Implement accumulator system for ICDs in preparation of using this for AICDs 2018-12-07 15:48:18 +01:00
Gaute Lindkvist 539914a541 Fix crash in RimWellPathValve when perforation is larger than wellpath
* This is the case with the Completions_msw Regression test
2018-12-07 12:58:03 +01:00
Gaute Lindkvist c51b938d03 Switch to more robust check for Qt5 for cafUserInterface. This should be applied to other projects 2018-12-07 12:58:03 +01:00
Gaute Lindkvist e677778ddd #3828 Refactor Completion export code by splitting out MSW export into separate files
* Plus fill in some incomplete functionality regarding MSW export
2018-12-07 09:46:39 +01:00
Gaute Lindkvist 55f980eeb7 Restructure RicMswExportInfo code into multiple files. 2018-12-06 11:32:59 +01:00
Gaute Lindkvist 73be6b6b19 #3779 Split RicMswCompletions into subclasses and move ICD-area and flow coefficient from segment to the icd completion class 2018-12-06 10:55:23 +01:00
Gaute Lindkvist 8fbc1d0953 #3779 Make sure we always have a super valve for segments that overlap with valves. 2018-12-06 10:11:06 +01:00
Gaute Lindkvist 29c3e10617 #3779 Implement AICD ui and settings 2018-12-05 15:47:16 +01:00
Gaute Lindkvist e67a9ef12a Make sure changes to valves and perforation interval visibility is reflected in track. 2018-12-05 15:47:16 +01:00
Gaute Lindkvist 4591d9f20e #3615 Fix z-order so packers are added after other components
*  Valves are added last of all
* This way packers are displayed on top of perforation intervals and fishbones.
2018-12-05 15:47:16 +01:00
Gaute Lindkvist c1c897d7a4 #3616 Make 1m the default length of packers 2018-12-05 15:47:16 +01:00
Gaute Lindkvist 420944e910 #3442 Improve ICD/ICV export to add a small 0.1 length segment for each segment containing valves. 2018-12-05 15:47:16 +01:00
Gaute Lindkvist 2ed41d3158 CMake fixes to cafTestApp 2018-12-05 15:47:16 +01:00
Gaute Lindkvist 1bab754b26 Reintroduce CDEStyle to progress bar in 3D view
* Only works for Qt4
2018-12-05 15:47:16 +01:00
Gaute Lindkvist b06097862f Fix Linux build of caf unit tests 2018-12-03 15:00:53 +01:00
Gaute Lindkvist 8cd2d37b92 Quieten Qt5 check in caf unittests 2018-12-03 15:00:53 +01:00
Gaute Lindkvist 7128c58b6c Quiet Qt5 check for cafAppFwk 2018-12-03 14:18:38 +01:00
Gaute Lindkvist e984b06ea6 Fix build problem on Linux by renaming file to correct case 2018-12-03 10:58:49 +01:00
Gaute Lindkvist 9961b39473 Fix build problem on Linux with missing cvfBase.h 2018-12-03 10:58:49 +01:00
Gaute Lindkvist 45e909fcfa #3783 Guard in case of incomplete project data 2018-12-03 10:58:49 +01:00
Gaute Lindkvist c60e6b8140 #3780 Get rid of debug output from painter
* don't really need the boundingRect override for RiuQwtSymbol
* And it needs a painter
* Just get rid of it and pass in the painter for the labelBoundingRect
2018-11-30 14:01:29 +01:00
Gaute Lindkvist 20534775d6 #3809 Make Flow diagnostics work with contour maps 2018-11-30 13:47:46 +01:00
Gaute Lindkvist 39fd441a59 #3798 Make sure 3d overlay info update is called even if it is inactive
* It also causes animation bar to be hidden if the overlay info is inactive
2018-11-30 11:50:41 +01:00
Gaute Lindkvist 7033b2cd48 #3801 Postpone assignment of old selectedTracer-field to producers and injectors
* initAfterRead is too soon as the solver hasn't been set up yet.
* wait until onEditorWidgetsCreated()
2018-11-30 11:50:36 +01:00
Gaute Lindkvist 4d765f19b6 #3798 Make sure 3d overlay info update is called even if it is inactive
* It also causes animation bar to be hidden if the overlay info is inactive
2018-11-30 11:48:52 +01:00
Gaute Lindkvist 8be822c5d7 #3801 Postpone assignment of old selectedTracer-field to producers and injectors
* initAfterRead is too soon as the solver hasn't been set up yet.
* wait until onEditorWidgetsCreated()
2018-11-30 11:26:38 +01:00
Gaute Lindkvist f18884b675 #3752 Fix crash when closing ResInsight 2018-11-30 09:47:53 +01:00
Gaute Lindkvist f2c7f2ce80 Fix display problems on Linux 2018-11-30 09:47:53 +01:00
Gaute Lindkvist 6f9cac7201 Fix Progress bar alignment on Qt5 2018-11-30 09:47:53 +01:00
Gaute Lindkvist afbe84997e Fix MDI window placement after Qt5 upgrade 2018-11-30 09:47:53 +01:00
Gaute Lindkvist b097c8c9b7 Fix TRUE/true in cafAboutDialog 2018-11-30 09:47:53 +01:00
Gaute Lindkvist 6cee9eb9e6 #3752 Upgrade ResInsight CMake-system to support both Qt5 and Qt5 2018-11-30 09:47:53 +01:00
Gaute Lindkvist 5c66b901c3 #3752 ResInsight code changes to build on both Qt4 and Qt5 2018-11-30 09:47:53 +01:00
Gaute Lindkvist ddb546d877 #3754 Upgrade CAF CMake-system to support both Qt4 and Qt5 2018-11-30 09:47:53 +01:00
Gaute Lindkvist cc7269c717 #3752 CAF code changes to build on both Qt4 and Qt5 2018-11-30 09:47:53 +01:00
Gaute Lindkvist 398a59d0a6 Add some more checks to the SILENCE_TR1 warnings for Ceevis unittests/gtest 2018-11-30 09:47:53 +01:00
Gaute Lindkvist a7e76679e1 #3754 Support both Qt4 and Qt5 in Ceevis build. 2018-11-30 09:47:53 +01:00
Gaute Lindkvist 237623ef21 #3752 CVF Code changes to build on Qt4 and Qt5 2018-11-30 09:47:53 +01:00
Gaute Lindkvist 83c5f63291 #3754 Qt4/Qt5 CMake build configuration for Nightcharts and ExpressionParser 2018-11-30 09:47:53 +01:00
Gaute Lindkvist cc672eb31b #3752 Upgrade Qwt to 6.1.3 to support Qt5 2018-11-30 09:47:53 +01:00
Gaute Lindkvist 100aabd332 CVF Code changes to hide std::tr1 warnings so unit tests build. 2018-11-30 09:47:51 +01:00
Gaute Lindkvist 7fd3dac2ef Revert "#3751 Fix keyboard selection in Summary Plot Editor"
This reverts commit ab0fa2fb19.

* This change should never have been merged back into the repo.
2018-11-30 09:45:50 +01:00
Gaute Lindkvist 01e4454d85 Revert "#3751 Fix keyboard selection in Summary Plot Editor"
This reverts commit ab0fa2fb19.

* This change should never have been merged back into the repo.
2018-11-30 09:22:01 +01:00
Gaute Lindkvist f14d36ca23 #3442 Implement export of ICD/ICV table for performations 2018-11-29 15:26:22 +01:00
Gaute Lindkvist f0d3a36374 #3442 Change defaults for ICDs to values suggested in meeting 2018-11-29 15:25:53 +01:00
Gaute Lindkvist 2414865dbe #3442 UI For ICD/ICV parameters 2018-11-29 15:24:39 +01:00
Gaute Lindkvist 5498c2f466 #3766 Hide blank grid children in GeoMech cases 2018-11-27 13:40:19 +01:00
Gaute Lindkvist 70eca210bf #3765 Support Eclipse cases in Memory Management case list 2018-11-27 13:40:08 +01:00
Gaute Lindkvist d743602b81 #2396 Set better fixed y-axis range for logarithmic scaling 2018-11-27 11:29:55 +01:00
Gaute Lindkvist 49b5b60352 #2396 Add support for locking axes in Cell RelPerm plot
* Also put curves in a grid layout and
shortened logarithmic label to fit better
2018-11-27 10:53:14 +01:00
Gaute Lindkvist 8b7b110440 Merge branch 'dev' into dev-deeper 2018-11-26 09:21:33 +01:00
Gaute Lindkvist 40f466fb0c #3751 Fix keyboard selection by overriding keyPressEvent and emitting clicked() 2018-11-26 08:01:54 +01:00
Gaute Lindkvist 80d48fd669 Move QString include to cpp file of RiaStatisticsTool 2018-11-26 08:01:44 +01:00
Gaute Lindkvist ab0fa2fb19 #3751 Fix keyboard selection in Summary Plot Editor 2018-11-23 15:36:33 +01:00
Gaute Lindkvist 2cf5357a47 #3738 Active correct item when clicking in Summary Plot Editor 2018-11-23 15:11:23 +01:00
Gaute Lindkvist 56ae4fa5bd Fix Linux Build Problem after FlowDiag 2018-11-23 08:20:05 +01:00
Gaute Lindkvist a1b7e694a6 #3727 Give packers a more realistic default length 2018-11-22 14:06:03 +01:00
Gaute Lindkvist ae8cb9d210 #3741 Make it possible to enable/disable all well path components in plots and 3d view.
* Add check box to casing design and update of plot
* Add isEnabled() method to component interface which controls plotting.
2018-11-22 13:39:08 +01:00
Gaute Lindkvist 132408ab6f #3727 Additional packer fixes 2018-11-22 13:39:08 +01:00
Gaute Lindkvist 9dc2452ba1 #3739 Fix crash in Well Bore Stability plots for synt_small.odb 2018-11-22 13:39:08 +01:00
Gaute Lindkvist fcc8ee6e27 #3736 Fix Linking issues related to Contour Maps.
* They are not allowed to be master views so a few things should be disallowed.
2018-11-22 13:39:07 +01:00
Gaute Lindkvist d69153c013 #3489 Fix legend text for flow diagnostics. 2018-11-22 13:39:07 +01:00
Gaute Lindkvist 428f2b9851 #3728 Move WBHP source into header of table rather than as a column 2018-11-21 14:07:14 +01:00
Gaute Lindkvist 4818a4fd71 #3727 Set packer end when you set packer start and still make it available for edit. 2018-11-21 11:38:56 +01:00
Gaute Lindkvist 0eea7d38cf #3728 Put time step into comment table for pressure depletion. 2018-11-21 11:38:56 +01:00
Gaute Lindkvist 094ae45dcd Formatted contour map code and renamed some methods. 2018-11-21 09:33:21 +01:00
Gaute Lindkvist 046a2acc67 #3620 Hide the "New Valve" feature if RESINSIGHT_DEVEL is not 1. 2018-11-20 15:38:43 +01:00
Gaute Lindkvist 9763f420a8 #3718 Update 3d View when deleting casing design 2018-11-20 15:32:09 +01:00
Gaute Lindkvist 66d5cedb2e #3716 Ensure static results can be shown if there are no dynamic results. 2018-11-20 14:54:30 +01:00
Gaute Lindkvist 9145e6011d #3697 Fix zoom issues with ortographic views 2018-11-20 13:49:19 +01:00
Gaute Lindkvist d51f66179a #3711 Report only pressure depletion tables when we do scaling. 2018-11-20 13:47:59 +01:00
Gaute Lindkvist b41217455f #3689 Change order of result aggregation types 2018-11-20 11:32:02 +01:00
Gaute Lindkvist 58c5f066c3 #3700 Fix bugs related to cell positions and grid extent. 2018-11-20 11:31:22 +01:00
Gaute Lindkvist 42d3e65416 #3700 Add visual picking marker and improve map results
* Fix "off by half a cell" errors and improve smoothness using averaging and interpolation
2018-11-19 15:24:18 +01:00
Gaute Lindkvist 86f40ed8a9 #3580 Fix Linux build problem related to fault appearance 2018-11-19 08:28:45 +01:00
Gaute Lindkvist e2cc7fb423 #3699 Show global east west position when picking on Contour Maps. 2018-11-15 15:19:19 +01:00
Gaute Lindkvist a1e094625a #3701 Add axis line option to 2d intersection view as well. 2018-11-15 15:02:07 +01:00
Gaute Lindkvist b20e801ae1 #3701 Larger margins around axis text 2018-11-15 15:02:07 +01:00
Gaute Lindkvist 12fbd968ad #3580 Improve visualisation of faults in Contour Map 2018-11-14 15:41:25 +01:00
Gaute Lindkvist 5bdba24148 2d Maps: Fix crash when generating new map without a result variable set 2018-11-14 14:39:13 +01:00
Gaute Lindkvist c99fb71c36 #3687 Fix view updates if creating a brand new contour map, not based on existing view 2018-11-14 13:49:57 +01:00