OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-15 01:53:46 -06:00
Code Issues Packages Projects Releases Wiki Activity
10,405 Commits 26 Branches 61 Tags 309 MiB
22880d511b
Commit Graph

1433 Commits

Author SHA1 Message Date
Magne Sjaastad
4e6d7d3c40 #3922 Scale bar : Update legend layout when dependent data changes 2019-01-02 11:22:25 +01:00
Magne Sjaastad
98c0406926 Whitespace 2019-01-02 09:45:48 +01:00
Magne Sjaastad
a9c7773ef7 CppCheck : Fix various minor issues 2018-12-21 12:32:57 +01:00
Gaute Lindkvist
128208d35a Fix type in RiaColorTools contrastColor 2018-12-21 10:12:58 +01:00
Bjørn Erik Jensen
5976298267 Merge branch 'dev' into measurement 2018-12-21 10:08:41 +01:00
Bjørn Erik Jensen
21403f4161 #3805 Measurement. Double click in view to reset measurement 2018-12-21 09:23:53 +01:00
Magne Sjaastad
6f3097dd5f Merge remote-tracking branch 'origin/2018.11.01-patch' into dev 2018-12-21 08:46:27 +01:00
Bjørn Erik Jensen
d6f4962ed7 #3806 Measurement. Display text label at last clicked position 2018-12-20 12:34:17 +01:00
Magne Sjaastad
bc86158ff6 #3914 Source Stepping : Add checkbox for include of ensemble cases 2018-12-20 08:36:35 +01:00
Bjørn Erik Jensen
deec4c16e9 #3804 Measurement. Set checkable toolbutton (still changing icon) 2018-12-19 14:49:35 +01:00
Bjørn Erik Jensen
849a623379 #3804 #3805 Measurement. Add toolbar button and interactive picking 2018-12-19 14:41:17 +01:00
Magne Sjaastad
6a340c5b99 #3905 Summary Stepping : Avoid updateUI when not required 2018-12-19 11:21:18 +01:00
Magne Sjaastad
0d1a4cf0a6 #3842 Summary : Update source stepping based on selection 2018-12-17 16:14:32 +01:00
Magne Sjaastad
b3c3631cc4 #3842 : Update toolbar based on selection 2018-12-17 16:05:23 +01:00
Magne Sjaastad
5e466ed5a9 #3841 Summary : Update stepping toolbar when curve is deleted 2018-12-17 07:56:19 +01:00
Magne Sjaastad
19df293f12 #3841 Summary : Update stepping toolbar when curve is deleted 2018-12-17 07:25:25 +01:00
Bjørn Erik Jensen
d482d3a4ca #3826 Summary curves. Draw error bars in front of all curves except from observed data curves 2018-12-13 16:14:13 +01:00
Bjørn Erik Jensen
01249ace3a #3860 Z scale label. Do not show in contour map 2018-12-13 13:20:49 +01:00
Magne Sjaastad
e58941a423 Remove duplicate line 2018-12-12 10:45:11 +01:00
Gaute Lindkvist
914daded6b #3794 Improve wheel zooming 2018-12-12 08:01:13 +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
2e8c2e28a8 #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-12-11 13:18:01 +01:00
Bjørn Erik Jensen
488798c3d8 #3790 Z scale label. Display in upper left corner 2018-12-10 13:04:07 +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
Bjørn Erik Jensen
6a2484c40e #3826 Summary curves. Draw error bars in front of all curves except from observed data curves 2018-12-05 09:35:05 +01:00
Jacob Støren
a13201e42e #3757 Add selection of text annotations by picking 2018-12-03 11:05:12 +01:00
Jacob Støren
a9a5eaf604 #3757 New feature to add a text annotation in the 3D view 2018-11-30 14:30:34 +01:00
Jacob Støren
92a45e959e #3757 Rename RiuSelectionManager to Riu3dSelectionManager 2018-11-30 14:30:34 +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
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
5c66b901c3 #3752 ResInsight code changes to build on both Qt4 and Qt5 2018-11-30 09:47:53 +01:00
Bjørn Erik Jensen
4685d5981d Merge branch 'dev' into dev-deeper 2018-11-28 07:10:56 +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
Jacob Støren
3c32595e25 AppFwk: Moved PdmUi3dObjectEditorHandle and PdmUiSelection3dEditorVisualizer into correct place in PdmUiCore 2018-11-27 10:31:54 +01:00
Jacob Støren
fb93ad7ca7 AppFwk: Make PdmUiSelection3dEditorVisualizer generic, ready to be moved to a separate file 2018-11-26 21:50:46 +01:00
Bjørn Erik Jensen
67ba01f835 #3722 Scale legend. Descrease size 2018-11-21 14:58:47 +01:00
Bjørn Erik Jensen
5e769b337f Merge branch 'dev' into dev-deeper 2018-11-21 14:00:46 +01:00
Bjørn Erik Jensen
2912059922 #3730 Plot Editor. Sort numeric identifiers by numeric value and not alphabetically 2018-11-21 12:31:57 +01:00
Bjørn Erik Jensen
e98b1728f1 #3717 Plot editor. Never plot a default vector 2018-11-21 09:31:52 +01:00
Bjørn Erik Jensen
75c923d102 #3698 Scale bar. Support for both horizontal and vertical orientation 2018-11-16 13:52:05 +01:00
Bjørn Erik Jensen
d8a466a9ef #3698 Scale bar. Take 1. Only vertical variant implemented so far 2018-11-16 13:52:05 +01:00
Gaute Lindkvist
387741d0c1 #3530 Support picking on 2d Maps. 2018-11-14 13:43:55 +01:00
Magne Sjaastad
4117e266ed #3686 Completion Export : Use map based on size_t instead of RigCompletionDataGridCell 
Using RigCompletionDataGridCell as key in a map causes cells with identical local IJK to be treated as same global cell. Use reservoir grid cell index (size_t) as key to be able to handle cells correctly.
 2018-11-14 11:40:23 +01:00
Gaute Lindkvist
53fad80e89 2d Maps: Renames to make classes and variables more consistent. 
* Everything is now named something related to ContourMap:
  - Rim2dEclipseView -> RimContourMapView
  - Rim2dGridProjection -> RimContourMapProjection
  ....
 2018-11-09 09:11:29 +01:00
Gaute Lindkvist
78d81d2630 #3573 Draw axis lines across the whole view for 2d Contour Maps. 2018-10-31 12:13:04 +01:00
Gaute Lindkvist
fc9686faae #3586 Several minor improvements to 2d maps 
* disable z-scale
* hide some cell and grid appearance groups
* disable grid lines on faults
 2018-10-31 11:03:10 +01:00
Gaute Lindkvist
b316e1ee83 #3552 and #453 Tile windows by master/managed view + position if they have different positions 2018-10-24 15:21:54 +02:00
Gaute Lindkvist
f80472ffa6 #3540 Create seperate 2d view with parallel, look down and linked views 2018-10-24 15:21:53 +02:00
Magne Sjaastad
cdda4d74df #3541 HoloLens : Create dummy file backed feature 2018-10-22 12:36:14 +02:00
Gaute Lindkvist
9abbdb2fd8 #3528 Make Casing Design a child object under well path. 2018-10-22 09:35:35 +02:00
Gaute Lindkvist
2194821609 #3527 Implement multiple ICD/AICDs for perforation intervals. 2018-10-22 09:35:35 +02:00
Magne Sjaastad
822645e264 #3524 HoloLens : Add toolbar and icons for operations 2018-10-19 10:09:45 +02:00
Magne Sjaastad
a87eca531c #3523 Holo Lens : Add features for communication with web server 2018-10-19 10:09:45 +02:00
Gaute Lindkvist
e3b7cc0558 #3521 Make different size casings take up different columns. 2018-10-18 20:15:31 +02:00
Magne Sjaastad
6346ed012c clang-tidy : Remove redundant 'virtual' and add 'override' 2018-10-18 19:45:57 +02:00
Magne Sjaastad
726658d642 #3512 System : Remove unused functions 2018-10-18 15:40:11 +02:00
Magne Sjaastad
766fea603e #3512 System : Remove unused functions 2018-10-18 15:14:25 +02:00
Magne Sjaastad
5a1acc124f #3512 System : Remove unused functions 2018-10-17 13:52:48 +02:00
Gaute Lindkvist
2035df2739 #3492 Tidy up color code for well path components/completions and select colors that work better. 2018-10-12 15:05:22 +02:00
Gaute Lindkvist
e7a39fb2f8 #3441 Valve visualisation in 3D view. 2018-10-11 11:18:11 +02:00
Magne Sjaastad
9d9771295f System : Replace NULL with nullptr 2018-10-10 10:17:27 +02:00
Gaute Lindkvist
5261215dcc #3443 Visualise valves in Well Log Plots 2018-10-09 15:45:17 +02:00
Gaute Lindkvist
09f3e0e772 #3466 Minor improvements to plotting of completions 2018-10-09 15:27:46 +02:00
Gaute Lindkvist
751bcc5f28 Added overriden boundingRect method in RiuQwtSymbol to include label. 2018-10-09 14:05:57 +02:00
Gaute Lindkvist
e61e71ecbf #3467 Improved code using RimWellPathComponentInterface 2018-10-09 14:05:57 +02:00
Gaute Lindkvist
1019eeaa6a #3467 New interface class for completions +use RiaDefines::CompletionType 2018-10-09 14:05:57 +02:00
Gaute Lindkvist
f3a2521eda #3466 Add attribute items to legend by creating a new RiuQwtPlotItemGroup that combines sub-graphics 2018-10-09 14:05:57 +02:00
Gaute Lindkvist
fbc49e2b02 #3443 MSW: Visualise perforations, fishbones, packers and fractures in well log plots 2018-10-05 15:35:15 +02:00
Magne Sjaastad
2b1c6e9706 #3428 Text string creation based on date and time : Use toStringUsingApplicationLocale() at relevant places 2018-10-03 08:44:01 +02:00
Jacob Støren
e3c7b4ffa4 #3426 Fix missing update of well targets when view is scaled 2018-10-02 16:29:58 +02:00
Magne Sjaastad
acf6a17c40 Fix warnings 2018-09-27 20:49:47 +02:00
Bjørn Erik Jensen
0c05c93a72 #3420 Result info. Fix cordinate system translations. Renaming to improve readability 2018-09-27 14:47:33 +02:00
Gaute Lindkvist
e8a1d30f2d #3404 Side by side editors, first implementation. 2018-09-26 14:30:50 +02:00
Bjørn Erik Jensen
9aad8b6947 #3260 Well Path Export. Add command to main window export menu 2018-09-25 11:43:03 +02:00
Magne Sjaastad
4009d4d63b System : Introduce compiler warning C4457 with fixes 2018-09-24 21:20:35 +02:00
Bjørn Erik Jensen
fce06c0057 #3391 Ensemble curves. Use vector addresses from the case having the highest number of vectors 2018-09-24 13:59:55 +02:00
Magne Sjaastad
c9f77bae98 #3402 HoloLens : Add visibleParts to RiuViewer 2018-09-21 14:14:19 +02:00
Magne Sjaastad
b6e43de923 #3402 HoloLens : Add override 2018-09-21 14:14:19 +02:00
Bjørn Erik Jensen
7d2889c66b #3318 Plot editor performance. Do not call update method for every toggle change 2018-09-13 12:38:48 +02:00
Magne Sjaastad
f1dd707561 Holo Lens : Create menu and UI for export of data to folder 2018-09-12 10:34:01 +02:00
Magne Sjaastad
bbebbf108f #3340 Remove unused variables 2018-09-10 10:27:54 +02:00
Magne Sjaastad
b81114c7d4 #3340 Add ifdef USE_ODB_API 2018-09-10 10:27:54 +02:00
Gaute Lindkvist
0460eb2ac2 #3309 Toolbar buttons for well log plot data source and make sure only visible curves and zonation/attributes affect the data source. 
* This also required adding some updateConnectedEditors for updating the selected property views when changing the toolbar.
 2018-09-10 10:26:11 +02:00
Gaute Lindkvist
385f7ad0da #3305 Implement well path attribute track in well bore stability plots 
* Fix depth start and end of attributes to match the TVD/MD display setting.
 2018-09-05 15:19:22 +02:00
Magne Sjaastad
e4809af096 System : Use cvf::UNDEFINED_SIZE_T 2018-09-05 13:57:58 +02:00
Gaute Lindkvist
d81b85c54c #3277 Implement stepping for Common Data Source and rename Plot Source Stepping for summary plots. 
* The name for the UI groups is now "Data Source" for both types of data source stepping.
 2018-09-05 11:49:26 +02:00
Gaute Lindkvist
12484bf1e9 #3297 Make casing shoe a right-angled triangle and refactor symbols 
* Put plot symbol enum inside the symbol class.
* Put line style enums inside the line class.
* Add custom capability.
 2018-09-04 12:02:06 +02:00
Gaute Lindkvist
4fd9cdfda3 #3300 Fix crash when loading formation indices as part of a project file. 
* Rename structGrid() to getOrCreateStructGrid() to make it obvious that it allocates internally.
 2018-09-04 09:33:48 +02:00
Gaute Lindkvist
adc9ad322a #3187 symbols and labels for well path attributes, initial work. 2018-08-30 16:06:20 +02:00
Jacob Støren
bddaf9d602 #3291 Fix by differensiating between dynamic and default pickEventHandlers 2018-08-30 15:43:55 +02:00
Bjørn Erik Jensen
37961717e3 #3213 Observed data import. Handle custom vector naming. Fix failing unit tests 2018-08-30 13:30:54 +02:00
Bjørn Erik Jensen
2e8bf5aafe #3213 Observed data import. Add categories to vector table. Modify category identification. Update unit test 2018-08-30 11:17:52 +02:00
Jacob Støren
9cd9173000 #3249 Add possibility to add and remove pickEventHandlers 2018-08-29 16:04:08 +02:00
Jacob Støren
8fca7475e9 caf: Renamed the WidgetBasedObjectEditor to FormLayoutObjectEditor 2018-08-27 16:25:26 +02:00
Jacob Støren
0a2b68348f #3249 Refactoring: Rename of classes to PickEventHandler 2018-08-27 16:25:26 +02:00
Jacob Støren
cbb7f4b0c9 #3249 Refactoring: Cleaned up displayContextMenu and handlePickAction in ViewerCommands 2018-08-27 16:25:26 +02:00
Jacob Støren
58617b7510 #3249 Refactoring: Rename of ViewerEvent to PickEvent 2018-08-27 16:25:26 +02:00
Jacob Støren
ad9864240c #3249 Refactoring: Remove the old extractintersectionData. 
Replace it with a separate find method.
Use RiuPickItemInfo in the RicViewerEventObject
 2018-08-27 16:25:26 +02:00
Jacob Støren
714ba1e605 #3249 Refactoring: RiuPickItemInfo into separate file 2018-08-27 16:25:26 +02:00
Jacob Støren
9ce814a3b2 #3249 Refactoring pick event handling as preparations 2018-08-27 16:25:25 +02:00
Jacob Støren
2ed84c9df2 #2607 WIP: Outline of dragger system based on editors. First visible dragger geometry 2018-08-17 12:32:40 +02:00
Bjørn Erik Jensen
8b14a01a2b #3200 Plot editor. Remove curve sets correctly 2018-08-14 11:01:19 +02:00
Magne Sjaastad
411ef54364 CppCheck : Guard null pointer access 2018-08-06 08:22:05 +02:00
Magne Sjaastad
fe07b60392 CppCheck : Several fixes 
Add missing initializers
Guard potential null pointer access
 2018-08-02 19:22:03 +02:00
Gaute Lindkvist
714aafc05c #3155 Slightly tweak X-autozoom so it zooms to the nearest outside minor tick. 
* Looks much better and makes the problem of having tick labels overlap with neighbour tracks much rarer.
 2018-07-16 08:57:28 +02:00
Gaute Lindkvist
ca1f9506b1 #3155 Implement grid lines settings for depth axis as well 
* Done to "get away with" removing tick marks on all depth axes apart from the first track
 2018-07-16 08:57:28 +02:00
Gaute Lindkvist
162d82f8b7 #3155 Remove track spacing 2018-07-16 08:57:28 +02:00
Gaute Lindkvist
f8a7ba541f #3156 Make formation labels optional even if formation lines are shown 2018-07-16 08:57:28 +02:00
Bjørn Erik Jensen
93af11f934 #3165 Plot source stepping. Reset error bars when stepping through vectors 2018-07-09 09:09:51 +02:00
Bjørn Erik Jensen
08f516bab4 #3149 Export plot data. Right justify columns 2018-07-06 14:41:14 +02:00
Bjørn Erik Jensen
1c28edf2cb #3146 Summary plot. Ensemble color assignment fix. The appearance apply button now works for curve sets as well 2018-07-05 11:38:59 +02:00
Bjørn Erik Jensen
b6deb3ab89 #3142 Show plot data dialog. Do not show decade tab 2018-07-05 10:09:00 +02:00
Bjørn Erik Jensen
5414d29cc6 #3145 Ensemble stat. Show plot data dialog: Increase tab stop size 2018-07-05 09:38:47 +02:00
Bjørn Erik Jensen
a5fe2ed69a #3147 New summary plot. Fix missing initial source selections 2018-07-05 08:22:19 +02:00
Gaute Lindkvist
e5767c4f41 Add back connecting scheduleUpdateChildrenLayout to legendDataChanged 
* This was mistakenly removed
 2018-07-04 16:54:22 +02:00
Bjørn Erik Jensen
224f379ea6 #3143 Summary plot. Remove misplaced delete of QWT curve 2018-07-04 12:48:28 +02:00
Gaute Lindkvist
4112682b6a #3136 Fix RFT/PLT plots and refactor the way Mdi windows are resized when adding/removing plot tracks. 2018-07-04 11:10:32 +02:00
Bjørn Erik Jensen
208ba77765 Add missing include 2018-07-04 09:53:00 +02:00
Bjørn Erik Jensen
76d3ec79fd Error bars. Plot only valid error bar values 2018-07-04 09:34:54 +02:00
Bjørn Erik Jensen
02059debf9 #3087 Show plot data. Add context menu: export to file 2018-07-02 14:29:46 +02:00
Bjørn Erik Jensen
13e5a3214b #3087 Show plot data. Display tabbed dialog for summary data 2018-07-02 11:45:14 +02:00
Gaute Lindkvist
ff84d81e44 Clean up after review 
* Disable grid lines and tick marks if x range is empty.
* Rename intervals to intervalCount when it is an integer count.
* Fix some compile warnings.
 2018-07-02 10:29:32 +02:00
Gaute Lindkvist
ed232b9cbd #2966 Add command to create a well bore stability plot 2018-07-02 10:29:31 +02:00
Gaute Lindkvist
5bc59c1ee9 Fix problem where Well Log Plot looks in main window instead of plot window for MDI child windows. 2018-07-02 10:29:30 +02:00
Gaute Lindkvist
5d6188b39c #3103 Manual tick marker setting 2018-07-02 10:29:30 +02:00
Gaute Lindkvist
707a7a91e6 #3103 Make grid lines match major and minor interval and make the grid lines optional 2018-07-02 09:51:10 +02:00
Gaute Lindkvist
8c445388b8 #3097 Make sure track height takes title into account 2018-07-02 09:51:10 +02:00
Gaute Lindkvist
dadaa87274 #3102 Hide legend scrollbars 2018-07-02 09:51:10 +02:00
Gaute Lindkvist
20a145d760 #3104 More sensible variable width for users: drop down list of narrow, normal, wide, etc. 2018-06-27 08:35:17 +02:00
Gaute Lindkvist
6ae2fbe9d3 #3097 Centered plot title 2018-06-27 08:35:17 +02:00
Gaute Lindkvist
ea2b64ef08 #3102 Well Log Plots: optionally align legend horizontally. 2018-06-27 08:35:17 +02:00
Gaute Lindkvist
e4288972de #3104 Well Log Plots: Implement variable width for tracks 2018-06-27 08:35:17 +02:00
Gaute Lindkvist
ad17ee1050 #3099 Apply QWT-hack to align tracks without xaxis markers and labels. 2018-06-27 08:35:17 +02:00
Gaute Lindkvist
405d470eda #3098 Show depth axis only for left-most plot. They all share the same depth axis anyway. 2018-06-27 08:35:17 +02:00
Gaute Lindkvist
f0bd7c726a #3097 Optionally add plot title to the plot itself 2018-06-27 08:35:17 +02:00
Bjørn Erik Jensen
898df5b68a #3096 Implemented ensemble calulations 2018-06-25 15:15:30 +02:00
Gaute Lindkvist
ed0bcb05a1 Remove some unecessary includes in RiuMainWindow.cpp 2018-06-20 11:46:19 +02:00
Gaute Lindkvist
d13a52a8b4 #3058 Implement a memory cleanup dialog for GeoMech data. 2018-06-19 12:20:21 +02:00
Gaute Lindkvist
e3bffafb46 Make memory critical threshold limits different on Linxu and Windows. 2018-06-19 10:09:51 +02:00
Magne Sjaastad
17ee25d0b2 AppFwk : Rename to uiField() and setUiField() 2018-06-15 14:22:03 +02:00
Gaute Lindkvist
2f0b1cfdb9 #3045 Implement memory display in status bar of the main window 2018-06-15 12:39:54 +02:00
Bjørn Erik Jensen
b5ad3681cc #2659 Ensemble statistics. Add labels to symbols on the statistic curves 2018-06-14 14:10:51 +02:00
Gaute Lindkvist
280656ca26 #3043 Implement Time step filtering on import for Geomech 2018-06-13 14:10:47 +02:00
Magne Sjaastad
d09df6807d #3037 Rename to setChildArrayField 2018-06-11 15:30:19 +02:00
Bjørn Erik Jensen
eebd8bef2d Move RigCurveDataTools and RigTimeHistoryCurveMerger to Application/Tools plus rename 2018-06-08 15:10:45 +02:00
Bjørn Erik Jensen
7cd371c1f8 #2659 Ensemble statistics. Fix plot editor issues 2018-06-08 08:43:24 +02:00
Magne Sjaastad
31d336b928 2018-05-29 14:42:00 +02:00