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,697 Commits 27 Branches 61 Tags 309 MiB
03c1311d58
Commit Graph

1470 Commits

Author SHA1 Message Date
Bjørn Erik Jensen
ebabefcd2c #2368 summary plot. Fix right axis properties update issue 2018-01-29 12:49:32 +01:00
Rebecca Cox
17e38130fc #2319 PLT/Well log plot: Remove auto scale on scroll. Make auto scale from file work 2018-01-29 12:49:32 +01:00
Bjørn Erik Jensen
ecfd1ad817 #2368 summary plot. Fix right axis properties update issue 2018-01-29 12:46:34 +01:00
Rebecca Cox
b7a316589a #2319 PLT/Well log plot: Remove auto scale on scroll. Make auto scale from file work 2018-01-29 10:17:42 +01:00
Magne Sjaastad
4d5503afb4 #2385 Main Window: More flexible docking restrictions 2018-01-26 15:44:25 +01:00
Jacob Støren
5640f91b68 #2412 2D Navigation only for Intersectino Views 2018-01-26 14:33:32 +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
b1bf970ff8 Merge remote-tracking branch 'origin/2018.01.01-patch' into dev 2018-01-25 17:04:59 +01:00
Rebecca Cox
5273ace5e6 #2301 Rel.perm Plot: Add tooltip for cell value 2018-01-25 17:04:20 +01:00
Bjørn Erik Jensen
868e1ef075 #2406 delete plot crash. Guard pointer to view 2018-01-25 15:44:28 +01:00
Bjørn Erik Jensen
3a1c6406ff #2406 delete plot crash. Guard pointer to view 2018-01-25 14:53:51 +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
Magne Sjaastad
1e4b4dbf62 Merge remote-tracking branch 'origin/2018.01.01-patch' into dev 2018-01-25 11:14:09 +01:00
Rebecca Cox
0ea10a45eb #2362 Grdecl SegFault: Guard for empty vectors 2018-01-24 14:58:21 +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
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
e98d969e62 #2358 fracture. Fix linker errors by adding fracture support ifdefs 2018-01-23 20:58:39 +01:00
Bjørn Erik Jensen
9cfd2ff3cf #2358 fracture. When clicking on an ellipse fracture, display info in result into panel 2018-01-23 14:30:58 +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
ba437c605d #2385 Main Window: More flexible docking restrictions 2018-01-19 15:08:31 +01:00
Rebecca Cox
fbb6f56bd3 #2382 Elm props: Update Result Info to show relevant Element Result info 2018-01-19 13:36:51 +01:00
Magne Sjaastad
03de2aba5b #2332 2D Intersection View: Command to create view 2018-01-17 11:05:31 +01:00
Jacob Støren
0debeafd68 #2331 Move RimGridView to separate files 2018-01-16 09:37:08 +01:00
Jacob Støren
b092565a61 #2331 Introduce new intermediate class RimGridView 2018-01-15 14:53:48 +01:00
Jacob Støren
5644684606 #2331 Refactor the viewer-view communication to pave way for 2dIntersection Views 2018-01-12 12:01:04 +01:00
Magne Sjaastad
337310c497 Fix invalid compare 2018-01-12 10:20:09 +01:00
Magne Sjaastad
402a2607c4 #1905 Perforation Intervals : Make sure well path context menu is displayed when clicking a perforation interval 2018-01-12 08:49:01 +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
e0d91f90ae #2360 Elm Props: Correct text in result info 2018-01-11 10:58:52 +01:00
Rebecca Cox
81a7fb204d #2360 Elm Props: Correct UI text 2018-01-10 16:32:59 +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
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
Jacob Støren
25e1db9e8f #2294 Use simplified result access in TOF acc. saturation plot, and fix gas oil colors in plot 2018-01-02 14:45:42 +01:00
Bjørn Erik Jensen
aa40894fe1 #2280 RelPerm/PVT plots. Stacking dock windows by default, result plot visible 2017-12-22 11:37:04 +01:00
Rebecca Cox
8ed0393863 Remove grid index from cell reference text if grid is main grid 2017-12-18 11:27:59 +01:00
Jacob Støren
e6cddc3796 Change name of the Plot Project Tree 2017-12-15 13:37:21 +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
029e0811be #2266 Curve Creator : Make sure all tree selection fields are assigned selection mode 2017-12-15 08:24:00 +01:00
Magne Sjaastad
9612a7162e #2266 Curve Creator : Activate attribute to be able to select item when checked 2017-12-14 16:04:03 +01:00
Jacob Støren
4802451a83 File Import menu cleanup 2017-12-14 14:44:12 +01:00
sigurdp
127f5b40b4 PVT Plot: Added header in PVT plot panel containing cell info 2017-12-14 13:56:08 +01:00
sigurdp
8fdb5cd7ba #2256 PVT Plot: Added text label showing the values for the cell value marker 2017-12-14 12:57:11 +01:00
Rebecca Cox
d777a4a873 #2246 Vector descriptions: Align code 2017-12-14 11:34:22 +01:00
sigurdp
537393311e #2258 Pvt Plot: For the oil phase, connect first point of each curve with a line as a visual aid. 2017-12-14 11:29:23 +01:00
Magne Sjaastad
1f7c153d5a #2246 Vector Descriptions : Removed whitespace 2017-12-14 11:06:01 +01:00
Magne Sjaastad
fcf66588fc #2246 Vector Descriptions : Reorganized (Directional Transmissibility Multipliers) 2017-12-14 11:01:11 +01:00
Magne Sjaastad
0fe0389eb3 #2246 Vector Descriptions : Remove several advanced descriptions 2017-12-14 10:56:24 +01:00
Magne Sjaastad
ab07d4a618 #2246 Vector Descriptions : Remove : at end 2017-12-14 10:38:58 +01:00
Magne Sjaastad
6987a2a4c6 #2246 Vector Descriptions : Shorten percentage and remove space before Limit 2017-12-14 10:32:28 +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
sigurdp
9979f49a7f #2257 Reduced font size of plot title for RelPerm and Pvt plots 2017-12-13 15:19:34 +01:00
sigurdp
92d8856647 Fixes for GCC compile 2017-12-13 15:06:49 +01:00
sigurdp
f716dacb24 Pvt Plot: Display Rs/Rv values of curve's sample points in tool tip, #2255 2017-12-13 14:56:10 +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
Rebecca Cox
17ece26929 Don't set activeReservoirView if selected RimView doesn't have RiuViewer 2017-12-12 14:26:14 +01:00
Magne Sjaastad
b7bdce1d9e Summary Plot Curve Editor : Use () instead of [] around acronyms as [] are used for unit text 2017-12-12 08:56:18 +01:00
sigurdp
01ae19ebbc #2235 RelPerm/PVT Plot: Added unit labels to relevant axes 2017-12-11 16:12:31 +01:00
Magne Sjaastad
f8e7a8aa26 System : Guard null pointer access 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
sigurdp
8a35a53935 #1827 Manually produce context menu for message window in order to avoid Qt's default entries regarding input methods. 2017-12-06 12:30:37 +01:00
sigurdp
e12a931940 Added calculation of PVT related dynamic properties and display of these in the PVT FVF and Viscosity plots as a point marker. Started using flow diagnostics library's output unit conversion for PVT curves to align output units with the case units. #1990 2017-12-05 14:18:46 +01:00
Rebecca Cox
899a226a38 #2226 Well Formations: Avoid adding "Top" to the formation names 2017-12-05 12:56:21 +01:00
sigurdp
ea6ae75033 RelPerm plot: Added option to show left Kr axis using logarithmic scale. #2193 2017-12-05 10:44:36 +01:00
sigurdp
0af37f3613 Changed name of flag and semantics from removeNegativeValues to includePositiveValuesOnly so that only positive values (zero not included) are included. Makes functions more suitable for usage with plots using logarithmic scale. #2193 2017-12-05 10:44:36 +01:00
Magne Sjaastad
149ebbf7b9 Guard against pop_back on empty vector 2017-12-05 10:10:04 +01:00
Magne Sjaastad
93b69b807f #2198 Summary Plot : Set default curve selection 2017-12-04 14:36:17 +01:00
Magne Sjaastad
c0109361ef #2170 Summary Cross Plot : Add keyboard modifiers to source stepping 2017-12-04 08:26:26 +01:00
Magne Sjaastad
eb6b0997c8 #2170 Summary Cross Plot : Improve update and visibility of UI when stepping 2017-12-01 15:15:43 +01:00
Magne Sjaastad
a5b361f8c9 #2170 Summary Cross Plot : Show/hide toolbar based on active view 2017-12-01 13:55:39 +01:00
Rebecca Cox
917b824177 #2144 Context menu: New uiText on menus 2017-12-01 13:31:12 +01:00
Rebecca Cox
c86161a0a6 #2144 Context menu: Add icons to sub menus 2017-12-01 09:11:11 +01:00
Magne Sjaastad
476b96b343 #2144 Context menu : Add support for icons on sub menus 2017-12-01 08:28:41 +01:00
Rebecca Cox
6fc888d718 Capitalize ui name in PDM fields 2017-11-30 13:44:18 +01:00
Rebecca Cox
ce8f9e4559 #2144 Organize context menus 2017-11-30 12:06:14 +01:00
sigurdp
636b68cf52 RelPerm Plot: Show SATNUM in plot title, #2189 2017-11-30 11:28:08 +01:00
sigurdp
e3a794d898 RelPerm Plot: Adjusted curve colors and added symbols to all curves, #2191, #2190 2017-11-30 11:28:08 +01:00
sigurdp
8fd48b9f0e Added include of cmath 2017-11-30 11:28:07 +01:00
Rebecca Cox
cef82c77e3 #2162 Context Menu: Add remaining features to menuBuilder 2017-11-29 16:47:31 +01:00
Magne Sjaastad
fab0e92102 #2187 : Clear summary toolbar when project closes 2017-11-29 16:38:29 +01:00
Magne Sjaastad
6d9891da09 Improve source code layout 2017-11-29 16:38:29 +01:00
Magne Sjaastad
c9ae3821e2 Remove unused code, move implementation to cpp 2017-11-29 16:38:29 +01:00
Magne Sjaastad
f2bd87762c #2187 Summary Plot : Add summary plot tool bar for stepping 2017-11-29 16:38:29 +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
89feb04b31 Remove const_cast 2017-11-29 15:29:33 +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
66082e2160 AppFwk: Set selectAsCurrentItem argument to const 2017-11-29 14:57:04 +01:00
Rebecca Cox
4b57599162 #2162 Context menu: Remove hide intersection slot and use command features 2017-11-29 14:57:04 +01:00
Rebecca Cox
8d99c99cb0 #2162 Context manager: Add pdmObject selection item 2017-11-29 14:57:04 +01:00
Rebecca Cox
4e66cb9b17 Remove unused function 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
sigurdp
7c9a14f78c Added functionality to update RelPerm and PVT plots when time step changes. 
Also added line marker for current cell's pressure in PVT plots.
 2017-11-29 14:14:47 +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
Magne Sjaastad
1d9d8f6794 Add RiuTools with function for default window flags 2017-11-29 08:50:48 +01:00
Rebecca Cox
8cfb983b15 Minor formation gui update 2017-11-28 12:47:43 +01:00
Rebecca Cox
c6b5936b30 #2123 Formation/Well Path: Remove duplicate of "top" in formation names 2017-11-28 12:47:43 +01:00
Rebecca Cox
ebcc9bafd4 #2122 Formation/Well Path: Move menu command 2017-11-28 12:47:43 +01:00
sigurdp
3b1775ad4d #1994 PVT Plot: Removed water phase from plot, started implementing display of pressure marker, but this is not yet active. 2017-11-28 09:15:11 +01:00
sigurdp
aa1bbbe2d9 #1994 First cut implementing PVT plots 2017-11-28 09:15:11 +01:00
Magne Sjaastad
3e5a4945d1 QDialog Constructor : Use windows flags to avoid '?' on Windows 2017-11-27 09:16:18 +01:00
Magne Sjaastad
4299a2ba5e Curve Selector : Remove this as parent to layout to avoid warning of duplicate layouts 2017-11-27 07:56:21 +01:00
Magne Sjaastad
0a8a67c2aa #2179 Summary Plot : Change identifier using PgUp / PgDown 2017-11-24 18:13:43 +01:00
Unknown
ea74a77978 #2122 Formation/Well Path: Add Import well path formation feature 2017-11-24 15:18:25 +01:00
sigurdp
61779e5876 Changed margins around plot in RelPerm plot 2017-11-24 09:05:03 +01:00
sigurdp
e79816b62e Added missing include for GCC 2017-11-24 08:36:44 +01:00
sigurdp
0872728d17 #2061 Added calculation and display of intersection markers in RelPerm plot to show the selected cell's SWAT SGAS values 2017-11-24 08:36:44 +01:00
sigurdp
e83b3a8c02 #2062 Prefix the Saturation title on the x-axis with "Water", "Gas" or "Water/Gas" depending on the curves present in the plot. 2017-11-24 08:36:44 +01:00
sigurdp
65fe3ba902 #2063 Added support for showing RelPerm plot curves without end-point scaling 2017-11-24 08:36:44 +01:00
sigurdp
14c1b5a595 Enabled caclulation and plotting of PCOG and PCOW now that opm-flowdiagnostics-applications have been updated 2017-11-24 08:36:44 +01:00
sigurdp
5f5abdf347 Working on adding SWAT and SGAS markers to RelPerm plot, #2061 2017-11-24 08:36:44 +01:00
Bjørn Erik Jensen
e65370eff7 #2160 Curve Address Selection. Fix duplicate observed data header 2017-11-23 08:02:27 +01:00
Bjørn Erik Jensen
fb24a9f29b #2018 CSV data. First working version of CSV import 2017-11-23 08:02:27 +01:00
Magne Sjaastad
1918a70d21 #2158 Curve Address Selection : Select first case as default 2017-11-22 09:15:48 +01:00
Unknown
3ed9874876 #2164 Intersections: Make context command for Azimuth/Dip intersection 2017-11-21 18:57:05 +01:00
Unknown
d5819eaad7 #2163 Make intersection event handler 2017-11-21 15:58:47 +01:00
Magne Sjaastad
a2a4ab59c5 Fix invalid compare 2017-11-21 09:59:53 +01:00
Magne Sjaastad
f73e964d23 Curve Definition Selection : Make robust for invalid or missing input 2017-11-21 09:43:34 +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
Magne Sjaastad
5cbaf3c1eb #2125 Refactor : Return by value instead of incoming parameter 2017-11-17 13:50:25 +01:00
Bjørn Erik Jensen
af1ffcb71c #2102 Statistics dialog. Add command to 3d context menu 2017-11-16 14:24:01 +01:00
Bjørn Erik Jensen
4b48da4250 #2102 Statistics dialog. First version. Statistics not updating automatically 2017-11-15 20:46:45 +01:00
Magne Sjaastad
762a21d940 #2093 Cross Plot : Add push button to select curve address 2017-11-15 15:20:47 +01:00
Rebecca Cox
02c8c18212 #2124 Curve calculator: add "sum" to scalar functions 2017-11-14 12:49:14 +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
cfaf27d4bf #2105 Curve Calculator : Do not show calculator dialog modal 2017-11-13 21:45:02 +01:00
Rebecca Cox
7aada0a1dc #2124 Curve calc: Remove useless functions and rearrange context menu 2017-11-13 15:37:07 +01:00
Magne Sjaastad
612dfd7c9f #2106 Well log plot : Increase delay before of legend widget is updated 2017-11-13 12:56:23 +01:00
Rebecca Cox
75c506e257 #2109 Remove automatic color on well labels on background change 2017-11-13 07:55:22 +01:00
Magne Sjaastad
c9fd4604db System : Make sure MessagePanel is visible for log messages of type warning and error 2017-11-09 14:15:05 +01:00
Rebecca Cox
ea4a92ab27 Rename wellPathsPartManager -> wellPathCollection 2017-11-08 09:07:44 +01:00
Rebecca Cox
de8b953360 #2094 Move annotation functions from updateGridBoxData to new function 2017-11-08 09:07:44 +01:00
Rebecca Cox
93a83cd756 #2094 Update well name color in 3d view (not sim well) 2017-11-08 09:07:44 +01:00
Bjørn Erik Jensen
bfa1a1cb67 #2051 Curve calc. Edit calculation command 2017-11-08 08:47:17 +01:00
Magne Sjaastad
0502b95d86 #2091 Cross Plot : Improve interface of RiuLineSegmentQwtPlotCurve 
Remove duplicate code
 2017-11-08 07:38:25 +01:00
Rebecca Cox
f3b7f0abd6 #1392 Improve Dark 3D-View background support 2017-11-07 15:08:32 +01:00
Rebecca Cox
de093fda4c Formation names: Change color of annotations 2017-11-07 10:00:10 +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
c6f3638dad #2053 Curve calc. Resove ptr field and fix a bug 2017-11-06 11:35:54 +01:00
Bjørn Erik Jensen
d5a3b319b8 #2053 Curve calc. Add 'Create copy' context menu 2017-11-06 11:35:54 +01:00
Rebecca Cox
cac5fa42a5 Fix crash on plot deletion 2017-11-03 13:23:06 +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
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
Magne Sjaastad
6aaa8f7606 #2067 NNC : Guard before accessing values 2017-10-31 10:22:20 +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
Rebecca Cox
112390e0a8 #2055 Curve Creator: Remove all text within "( )" , last period and "See note..." 2017-10-27 14:28:53 +02:00
Rebecca Cox
11a7cd4b69 #2038 RFT Plot: Remove last annotation line in plot 2017-10-27 14:28:53 +02:00
sigurdp
44e2d7d403 Workaround for compiler errors in cotire build due to local classes having the same name 2017-10-27 13:50:32 +02:00
Bjørn Erik Jensen
71caab54ec Added first cut extraction and plotting of RelPerm plots. Also added skeleton implementation of extraction and plotting of PVT plots. #1991, #1992, #1992, #2014 2017-10-27 10:20:34 +02:00
Magne Sjaastad
5844657a47 #2045 Curve Creator : Never auto add options for selected cases 2017-10-27 08:22:14 +02:00
Rebecca Cox
27df9145f5 Fix build 2017-10-25 16:00:46 +02:00
Rebecca Cox
89cedb350a #2038 RFT Plot: Add formation names 2017-10-25 16:00:46 +02:00
Bjørn Erik Jensen
a35329555b #1948 PLT plot. Initial version, RFT plot copy 2017-10-25 14:36:18 +02:00
Rebecca Cox
b2f4cd6696 #1845 RFT/PLT Plot: Add support for annotation of Qwt plot 2017-10-25 14:21:59 +02:00
Magne Sjaastad
4c223defec #2000 Curve Creator : Use descriptive texts for variable shortnames 2017-10-25 10:16:59 +02:00
Magne Sjaastad
95a0c47d1c #2000 Curve Creator : Fix initialization of map, and use std::string 2017-10-25 10:16:59 +02:00
Magne Sjaastad
85e2a5d3f3 2031 Curve Calculator : Move private class to cpp 2017-10-24 10:05:11 +02:00
Magne Sjaastad
035e2ccaf9 #2031 Curve Calculator : Add display of curve address 2017-10-24 09:58:04 +02:00
Magne Sjaastad
9455ed1bac #2031 Curve Creator : Select default category 2017-10-24 09:58:04 +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
58cd4d112a RegTest : Add support for execution of a subset of tests 2017-10-20 15:48:12 +02:00
Bjørn Erik Jensen
c3ee28de5f Fix Linux warning 2017-10-20 08:54:25 +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
18ebd742e6 #1997 Time Step Filtering: Add missing file 2017-10-19 10:00:47 +02:00
Rebecca Cox
adf55ec762 #1987 Time Step Filtering: Support dynamic NNC data time step filtering 2017-10-19 09:57:10 +02:00
Magne Sjaastad
d5d26a36f2 #2022 Curve Calculator : Wire up access to calculated curve data 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
Rebecca Cox
764833edcf #2013 Create map for summary vector -> description 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
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
sigurdp
8d96e9e35a Renamed RiuEclipseSelectionItem::m_cellIndex to RiuEclipseSelectionItem::m_gridLocalCellIndex 2017-10-16 14:35:43 +02:00
Magne Sjaastad
dffaf8ed25 Guard for empty summary case 2017-10-13 13:44:18 +02:00
Magne Sjaastad
d02274a897 #1969 Curve Calculator : Support single select in tree selection editor 2017-10-13 08:54:06 +02:00
Magne Sjaastad
069d5ddf3b #1969 Curve Calculator : Include missing handling of observed data postfix 2017-10-12 21:51:45 +02:00
Magne Sjaastad
c2b543b375 #1977 Curve Calculator : Rename to RiuSummaryCurveDefSelectionEditor 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
e95b9a66a5 #1969 Curve Calculator : Guard against invalid summary category 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
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
b6c74ee559 #1842 RFT Plot. Command enabling criteria. 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
6ca1ef6653 Reorganized includes 2017-10-03 14:50:06 +02:00
Unknown
1ae470a415 #1946 Observed Data: Add Command to File->Import menu in main window 2017-09-29 11:38:19 +02:00
Rebecca Cox
31133f31c0 #1938 Curve creator: Close all widgets on closing of curve creator 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
Magne Sjaastad
802a9154e4 #1912 Curve Creator : Avoid selection in main project tree when clicking on curve 2017-09-27 08:12:01 +02:00
Magne Sjaastad
7e2b0d20b5 Remove unused code and clean up includes 2017-09-21 15:12: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
Rebecca Cox
dd45f7c453 #1818 Observed Data: Command to Import observed data 2017-09-19 14:19:44 +02:00
Magne Sjaastad
d94eddc1ef #1889 Curve Creator : Close dialog when closing project 2017-09-18 07:46:29 +02:00
Magne Sjaastad
35bb8d9366 #1889 Curve Creator : Remove obsolete files 2017-09-15 10:58:12 +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
Magne Sjaastad
87364429f8 #1852 Curve Creator : Add RicSummaryCurveCreatorUi 2017-09-13 13:55:33 +02:00
Magne Sjaastad
526e1cafbc #1852 Curve Creator : Add custom object editor 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
Rebecca Cox
3f7f175564 #1840 Summary case: Event filter choses one cut feature directly 2017-09-13 11:15:28 +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
ee25b8424d #1840 Summary case: Cut paste of summary cases 2017-09-13 11:15:28 +02:00
Rebecca Cox
6dc14c09b1 #1840: Summary case: Drag and drop between folders 2017-09-13 11:15:28 +02:00
Magne Sjaastad
8ecfaa2ea7 CppCheck : Avoid potential null pointer access 2017-09-07 20:33:17 +02:00
Magne Sjaastad
e634ff664e #1866 AppFwk : Rename to QTreeViewStateSerializer 2017-09-07 09:34:06 +02:00
Bjørnar Grip Fjær
fa943226bc #1835 Tof Acc Sat Plot: Add a max TOF range field 2017-08-29 15:32:11 +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
Magne Sjaastad
56312a4883 Initialize pointer to nullptr 2017-08-29 11:03:45 +02:00
Magne Sjaastad
7fe2eb6750 #1766 Add RicImportEclipseCaseTimeStepFilterFeature to import menu 2017-08-25 06:53:17 +02:00
Bjørnar Grip Fjær
a9b316febb #1797 TOF-Acc Sat Plot: Add mouse tracking with data info 2017-08-22 13:11:50 +02:00
Bjørnar Grip Fjær
6e1e55ffba #1796 Ensure TOF-Acc Sat. plot is replotted when new samples are set 2017-08-22 12:45:20 +02:00
Magne Sjaastad
56a04de2ff Merge remote-tracking branch 'origin/dev' into pre-proto 2017-08-22 09:36:05 +02:00
Magne Sjaastad
4718caed9a #1794 Put all fracture command ids inside ifdefs 2017-08-21 20:44:28 +02:00
Bjørnar Grip Fjær
6c0f4fa0c0 #1806 Ensure time steps are calculated when opening project with saved flow characteristics plot 2017-08-21 13:09:06 +02:00
Magne Sjaastad
51c30448e9 Merge remote-tracking branch 'origin/dev' into pre-proto 2017-08-21 10:42:11 +02:00
Magne Sjaastad
a961221c2c Merge remote-tracking branch 'origin/hdf-prototype' into dev 2017-08-17 07:30:01 +02:00
Bjørnar Grip Fjær
323417364d #1126 Ensure cumulative saturation TOF plot data is only loaded when visible 2017-08-16 09:39:34 +02:00
Bjørnar Grip Fjær
2c2c82643d #1126 Adjust colors for cumulative saturation by TOF plot 2017-08-16 09:30:40 +02:00
Bjørnar Grip Fjær
db675aa6d8 #1126 Adjust cumulative saturation by TOF plot title size 2017-08-15 16:38:32 +02:00
Bjørnar Grip Fjær
030ad9cec4 #1126 Add "Accumulated Saturation by Time of Flight"-plot 2017-08-15 16:00:32 +02:00
Magne Sjaastad
5eb4eafb6e Merge branch 'dev' into hdf-prototype 2017-08-14 10:47:44 +02:00
Magne Sjaastad
0ba1746755 Merge branch 'dev' into pre-proto 2017-08-11 16:14:00 +02:00
Magne Sjaastad
89684c243f #1755 Use namespace RiaDefines instead of class 2017-08-11 14:28:42 +02:00
Magne Sjaastad
c4aa625d33 #1755 Move porosity model enum to separate file 2017-08-11 14:27:56 +02:00
Magne Sjaastad
88bbea6339 #1755 Remove porosity enum from RifReaderInterface 2017-08-11 14:27:22 +02:00
Bjørnar Grip Fjær
eee4a65497 Merge remote-tracking branch 'origin/dev' into pre-proto 2017-08-08 14:24:42 +02:00
Bjørnar Grip Fjær
37456bfa9b #1730 Include more information in snapshot filenames 2017-08-04 11:25:42 +02:00
Bjørnar Grip Fjær
7179aaeac9 Merge branch 'dev' into pre-proto 2017-08-01 12:44:11 +02:00
Jacob Støren
4bc465e096 Guard time history curve creation (Result Plot) from combined results. 2017-07-04 15:32:59 +02:00
Magne Sjaastad
d265f79242 #1670 Fix wrong include path 2017-06-29 22:41:34 +02:00
Bjørnar Grip Fjær
de414c4277 #1645 Load dynamic NNC results from restart file 2017-06-26 10:25:08 +02:00
Jacob Støren
33b037a80b #1440 Merge dev into pre-proto (WellPath viz restructure and constness) 
Had to do quite a bit constness fiddeling to make the merge work
 2017-06-22 10:42:07 +02:00
Magne Sjaastad
36b4ad8860 #1440 Add timeStepDates() to RimCase 2017-06-16 17:20:08 +02:00
Jacob Støren
1911092cb7 Merge dev into pre-proto 2017-06-14 23:25:55 +02:00
Magne Sjaastad
12bbaa898d Added several missing copyright headers 2017-06-14 07:53:28 +02:00
Magne Sjaastad
a8b8e061d7 #1596 Merge dev into pre-proto 2017-06-14 07:25:34 +02:00
Magne Sjaastad
cf859e7c16 #1596 Rename from RimDefines to RiaDefines 2017-06-13 15:41:52 +02:00
Magne Sjaastad
a45aee0cc2 Merge branch 'fishbones' into pre-proto 2017-05-23 10:28:42 +02:00
Magne Sjaastad
6e78c0b2cc Fix computation of measured depth when picking in 3D 2017-05-20 20:10:03 +02:00
Magne Sjaastad
d8dc62c5a7 #1510 Remove invalid usage of namespace caf for features 
Also add override keyword
 2017-05-19 13:40:38 +02:00
Magne Sjaastad
829df457ff #1502 Fishbones : Add "New Perforation" to context menu when clicking on well path 2017-05-19 11:03:22 +02:00
Magne Sjaastad
f81ef5b2fe #1486 Use RiuWellPathSelectionItem to communicate data to feature 2017-05-16 10:22:16 +02:00
Magne Sjaastad
25e6aec94a Merge branch 'dev' into fishbones 2017-05-15 13:37:09 +02:00
Magne Sjaastad
e38b7329d1 #1469 Use time step strings from case 2017-05-15 09:17:06 +02:00
Bjørnar Grip Fjær
dc4e7e0773 #1451 Add table editor for perforation intervals 2017-05-12 10:02:00 +02:00
Magne Sjaastad
4204d49f30 #1469 Add checkbox for legend visibility 2017-05-11 21:44:44 +02:00
Magne Sjaastad
764a68c032 #1469 Add large symbols for each value in Lorenz plot + legend 2017-05-11 14:04:29 +02:00
Magne Sjaastad
0c0c21e495 #1469 Reorder includes and fix comments and whitespace 2017-05-11 11:43:15 +02:00
Magne Sjaastad
84b922ba82 #1476 Include isFile() when checking if a file exists 2017-05-11 09:23:13 +02:00
Magne Sjaastad
a8cab547a0 1251 Added RivObjectSourceInfo for selecting any pdmObject 2017-05-05 12:18:10 +02:00
Magne Sjaastad
5e14e56609 #1062 Use minimalistic title flags for dialogs 2017-04-27 14:22:47 +02:00
Bjørnar Grip Fjær
700a73ca19 #1012 Do not toggle object when pressing enter after renaming in summary window 2017-04-26 15:43:34 +02:00
Jacob Støren
6f07a3698b #1427 Enable the new Well Log Curve command for Simulation Wells 2017-04-25 16:12:55 +02:00
Jacob Støren
f40cf3a9b7 #1427 Apply specific changes from pre-proto regarding selection in 3D 
To be used for transporting branch index from 3D context menu operation to feature.
 2017-04-25 16:12:55 +02:00
Magne Sjaastad
63b07b1152 #1430 When closing top level windows, do not close project if other is visible 2017-04-25 15:01:31 +02:00
Magne Sjaastad
c35e79c3b5 Merge branch 'dev' into pre-proto 2017-04-20 13:40:56 +02:00
Magne Sjaastad
d7d80bc53e #1401 Ask user to save modified project before project close 2017-04-20 10:02:25 +02:00
Magne Sjaastad
66a42074c3 #1373 Fix missing include 2017-04-19 15:31:06 +02:00
Magne Sjaastad
9caaeac237 #1373 Add feature ShowTotalAllocationData 2017-04-19 13:48:15 +02:00
Magne Sjaastad
4ac35c4e30 #1373 Add context menu launcher and use from well allocation plot 2017-04-19 12:14:01 +02:00
Magne Sjaastad
0292f06aea #1404 Select corresponding object before displaying context menu 2017-04-19 07:46:39 +02:00
Magne Sjaastad
7592137b78 #1373 Use selectAsCurrentItem in MainPlotWindow 2017-04-19 07:36:11 +02:00
Jacob Støren
03ab71f82f #1411 Fixed the window activation bug introduced by 442d9d2e 2017-04-07 18:00:59 +02:00
Magne Sjaastad
947845e7fd #1404 Added plot object picker, and use from Well Allocation plot 2017-04-07 11:25:55 +02:00
Magne Sjaastad
6f5d451c66 #1405 Use left mouse click to select well log track 2017-04-07 11:12:57 +02:00
Bjørnar Grip Fjær
224211f765 #1406 Automatically show process monitor when executing script 2017-04-07 09:21:48 +02:00
Jacob Støren
970595e0f5 Flow Characteristics Plot: Fixed missing replot when changing case to case without any solved flow diag timesteps 2017-04-06 11:00:06 +02:00
Jacob Støren
6c7dfdca7b #1395 Renamed TopologyItem to GeometrySelectionItem including Keywords with friends. 
Changed keyword to GridTimeHistoryCurve (previously missing Grid)
 2017-04-04 16:10:00 +02:00
Magne Sjaastad
e1ca217422 #1371 Removed dependency on opm-parser 2017-04-04 13:53:44 +02:00
Magne Sjaastad
8255a3aaa3 Merge branch 'dev' into pre-proto 2017-04-03 07:34:56 +02:00
Jacob Støren
e5f593db60 #1375 Reduced window zoom limit to 10 decades instead of 4 2017-03-31 16:27:05 +02:00
Jacob Støren
442d9d2e41 #1380 Major refactor of the management of views to fix the active view problem. Expect some trouble following this. 2017-03-31 15:13:50 +02:00
Jacob Støren
a914e38d53 #1380 Wip: Started to allign all the view widgets, preparing to avoid duplicated code when mdi window to RimViewWindow translation. 2017-03-31 15:13:50 +02:00
Bjørnar Grip Fjær
c30afc9ece #895 Ensure property editor is updated after all project data is loaded 2017-03-30 09:29:48 +02:00
Bjørnar Grip Fjær
e998f09250 Fixed typo 2017-03-29 11:22:12 +02:00
Jacob Støren
ba60bf3c13 #1321 Added a comand to show Flow Characteristics plot. Added timestp colors, zoom, mouse tracking, and titles 2017-03-28 23:36:56 +02:00
Magne Sjaastad
a6ce3c9ef4 Fixed missing includes on Linux 2017-03-28 09:47:06 +02:00
Jacob Støren
233c248491 #1366 Wheel works without Ctrl pressed 2017-03-27 18:22:09 +02:00
Jacob Støren
0c834cdc0f Cleaning 2017-03-27 18:13:38 +02:00
Jacob Støren
c0ff734cc7 Preparations for #1321: Aligned default stuff between the plot types. 2017-03-27 18:13:38 +02:00
Jacob Støren
a82677c743 #1366 Added wheel zoom to point. 
Also preparations for #1321
 2017-03-27 18:13:38 +02:00
Jacob Støren
f05a4027aa #1321 Applied new plot marker tracker class to well log plots 2017-03-27 18:13:38 +02:00
Jacob Støren
ba1dfee4e6 #1321 Finalized plot marker refactoring 2017-03-27 18:13:38 +02:00
Jacob Støren
ef8a98d4e1 #1321 Wip: Refactoring plot marker to be used more generally. Eg Flow Characteristics plots 2017-03-27 18:13:38 +02:00
Jacob Støren
76019109f6 Cr Lf cleanup 2017-03-27 18:13:38 +02:00
Jacob Støren
1fefc6124f #1321 Wip: First shot on bringing the flow characteristics curves up into the open. 2017-03-27 18:13:38 +02:00
Magne Sjaastad
03741fd7da CppCheck : Reduced variable scope 2017-03-24 09:30:36 +01:00
Magne Sjaastad
881ba2986f #1357 Use recently created method 2017-03-24 07:10:02 +01:00
Magne Sjaastad
5530945972 #1323 Show context menu in Result Plot dock widget 2017-03-20 13:16:47 +01:00
Magne Sjaastad
bdf2ea4961 #1323 Added context menu in 3D "Plot Time History for Selected Cells" 2017-03-19 08:59:46 +01:00
Magne Sjaastad
ad90d3f38f #1322 Several refactorings of RimSummaryPlot, added TimeHistoryCurve support 
Removed unique_pointer, as childFields now owns (and deletes) the contained object
Simplified extraction of visible curves
Simplified calculation of zoom range
 2017-03-19 08:45:29 +01:00
Magne Sjaastad
4b7b11e45b Added missing include for Linux 2017-03-16 08:56:53 +01:00
Magne Sjaastad
36728a2a97 #1293 Added context menu to summary plot 2017-03-16 08:38:34 +01:00
Magne Sjaastad
141257c83e #1293 Added "Show Plot Data" to context menu of plots 2017-03-16 08:23:27 +01:00
Magne Sjaastad
10edf44ee3 #1293 Show plot data in text widget 2017-03-15 20:15:04 +01:00
Magne Sjaastad
3d67946976 Merge remote-tracking branch 'origin/dev' into pre-proto 2017-03-15 10:10:43 +01:00
Magne Sjaastad
647b4348eb Renamed to eclipseCaseData 2017-03-15 09:10:16 +01:00
Magne Sjaastad
a81980c235 #1185 Added "Plot Production Rates" for sim well in 3D and project tree 2017-03-08 11:42:08 +01:00
Jacob Støren
bd688f7ce8 #1292 Fixed CppCheck Issues in UserInterface 2017-03-06 11:20:28 +01:00
Jacob Støren
ad517894d3 Fixed possible CppCheck detected bug regarding Result info and result plot for Geomech models. Triangle hit was not propagated properly. 2017-03-03 17:17:41 +01:00
Jacob Støren
4312968124 Removed CppCheck Warnings 2017-03-03 17:09:30 +01:00
Jacob Støren
f15d698342 #1174 Made 3D main window pop up, and set wether to show Max Fractrion Injectors or Producers. Set timestep in 3D view to match plot. 2017-03-02 16:10:18 +01:00
Magne Sjaastad
1b01e98c0e Merged branch dev into pre-proto 2017-02-27 14:03:33 +01:00
Magne Sjaastad
bf1f8fcbaa #1254 Use static methods instead of macros 2017-02-27 13:17:32 +01:00
Magne Sjaastad
10f14aee8e Merge remote-tracking branch 'refs/remotes/origin/dev' 2017-02-27 07:13:06 +01:00
Magne Sjaastad
5c20bff5d1 #1255 Remove includes from header files 2017-02-24 11:07:26 +01:00
Magne Sjaastad
3a98e17163 #1254 Infrastructure for logging including Messages dock widget 2017-02-23 15:02:55 +01:00
Magne Sjaastad
555ecba8b3 #1251 Added RivObjectSourceInfo for selecting any pdmObject 2017-02-23 11:52:56 +01:00
Magne Sjaastad
cc5f5eddd0 Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
 2017-02-22 13:12:23 +01:00
Magne Sjaastad
421dda1042 #1245 Property Editor : Use size hint displaying preferences 2017-02-22 11:58:56 +01:00
Magne Sjaastad
c180e06172 Removed duplicate feature 2017-02-22 09:43:15 +01:00
Magne Sjaastad
1753449772 Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
	ApplicationCode/UserInterface/RiuViewerCommands.cpp
 2017-02-22 09:42:51 +01:00
Magne Sjaastad
7f21582610 Use fontMetrics of widget instead of empty QPainter to get valid values 2017-02-21 10:31:16 +01:00
Magne Sjaastad
b2ec4e055f #1174 Added Show contributing wells from 3D view 2017-02-21 09:49:27 +01:00
Magne Sjaastad
91a962ab21 #1174 Rename 2017-02-21 09:13:33 +01:00
Magne Sjaastad
75f2a6cb9f #1236 Property Editor : Scroll bar for reduced screen area 2017-02-20 14:32:12 +01:00
Magne Sjaastad
a10b96ba3e Merged branch dev into pre-proto 2017-02-17 11:38:32 +01:00
Jacob Støren
590f9995c8 1212 Turned off shadow, changed to radial edge gradient to make the colors more easy to read. 2017-02-16 11:39:02 +01:00
Magne Sjaastad
f9d8ab8bad Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/ProjectDataModel/RimEclipseWellCollection.cpp
	ApplicationCode/Resources/ResInsight.qrc
 2017-02-16 10:18:39 +01:00
Jacob Støren
ad5e18afa6 #1226 Show the complete text in the summary plot tooltip text 2017-02-15 12:29:58 +01:00
Magne Sjaastad
4ff12a4999 #1208 Removed duplicate text generation for one grid cell 2017-02-14 09:52:02 +01:00
Magne Sjaastad
e43f531a0f #1208 Use category text instead of category index 2017-02-14 09:47:19 +01:00
Jacob Støren
df35335744 #1172 Well Alloc plot: Sorted the tracers according to contribution. 2017-02-14 08:10:39 +01:00
Magne Sjaastad
45f3240932 #1174 Added context menu to WellAllocationPlot and added feature 2017-02-13 13:29:31 +01:00
Jacob Støren
edab09823d Whitespace 2017-02-13 10:29:58 +01:00
Jacob Støren
321b9e2d62 #1173 Made the legend a separate hide/show entity, and changed the overall layout of the well allocation plot 2017-02-13 08:44:29 +01:00
Jacob Støren
30ea467f0e Whitespace 2017-02-13 08:44:29 +01:00
Jacob Støren
3e7413831a #1173 Added the possibility to hide the legend in a Well Alloc plots ((including WellLog plot ) 
Also changed the background color to white.
 2017-02-13 08:44:29 +01:00
Magne Sjaastad
722492b5c1 #1180 Use RiaColorTables for selection colors in 3D view 2017-02-10 08:27:20 +01:00
Magne Sjaastad
3c3e0d96ff #1180 Added color table framework files and color tables 2017-02-10 08:22:26 +01:00
Jacob Støren
a736d41eb7 #1169 Added text on the x-axis 2017-02-08 13:23:52 +01:00
Magne Sjaastad
93954fece0 Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/Commands/RicDeleteItemFeature.cpp
 2017-02-08 07:35:20 +01:00
Magne Sjaastad
7652009fe7 #1190 Disabled drrop of items into well allocation objects 2017-02-07 09:39:40 +01:00
Magne Sjaastad
6dc0a7ff59 Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
	ApplicationCode/ProjectDataModel/RimEclipseWell.cpp
	ApplicationCode/ProjectDataModel/RimEclipseWellCollection.cpp
	ResInsightVersion.cmake
 2017-02-03 10:51:46 +01:00
Jacob Støren
01864aee09 Well Alloc Plot: Added case and timestep to title, Adjusted font. 2017-02-03 08:51:43 +01:00
Jacob Støren
45dc7a1c08 #1165 Reduced size and spacing. 2017-02-02 16:03:39 +01:00
Magne Sjaastad
40dbf78aa9 #1165 Added title to well allocation plot 2017-02-02 14:17:36 +01:00
Magne Sjaastad
9493a1dfc0 Use hasWellResult instead of firstResultTimeStep 2017-02-02 12:52:32 +01:00
Magne Sjaastad
fad0974b3f #1148 Use tristate for well cell visibility 2017-02-02 09:59:26 +01:00
Magne Sjaastad
b13ca8bb1c #1135 Compute accumulated length along sim well and added slider 2017-01-30 14:28:41 +01:00
Magne Sjaastad
8f4fa4592a #1078 Improved well cells and well cell fence settings 2017-01-26 17:41:34 +01:00
Magne Sjaastad
e845ae1ed8 Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/CMakeLists.txt
	ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
	ApplicationCode/ProjectDataModel/RimEclipseWell.h
	ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake
 2017-01-24 15:23:02 +01:00
Magne Sjaastad
055315085e #1108 Created settings object for "Well Allocation Factors" pie chart 2017-01-23 13:29:06 +01:00
Magne Sjaastad
2511a59f8a #1116 Added RiuNightchartsWidget 2017-01-23 12:59:24 +01:00
Jacob Støren
c025c2a3d7 Renaming in the aftermath of the MDI window control refactorization. Aligned fieldChangedByUi in that respact as well. 2017-01-20 11:38:18 +01:00
Jacob Støren
a1aec0b5e0 Fixed compile error not catched by cotire compilation 2017-01-20 10:32:01 +01:00
Jacob Støren
6bd8a4d51a #1106, #1107, #1009, #1113 Started using WellLog plot for the Accumulated Well Flow plot 2017-01-19 17:58:07 +01:00
Jacob Støren
43249f7af8 Refactor related to #1106, #1107, #1109, #1113. Refactored the MDI control 
of windows. This might introduce problems.
 2017-01-19 17:54:01 +01:00
Magne Sjaastad
da371c099b Merged branch dev into pre-proto 2017-01-19 10:45:22 +01:00
Magne Sjaastad
2edc090c89 Restored previous behaviour related to result accessor creation 2017-01-19 10:39:08 +01:00
Magne Sjaastad
9b42f1ca8c Reverted 4ec7c97a77 
Access of RimEclipseCase was done by firstAncestorOf from, and in several cases RimEclipseCase is not parent of RimEclipseCellColors. RimEclipseCase must be explicitly specified.
 2017-01-19 10:37:59 +01:00
Magne Sjaastad
36bcdab426 Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/ModelVisualization/RivPipeGeometryGenerator.h
	ApplicationCode/ProjectDataModel/RimEclipseWell.cpp
	ApplicationCode/ProjectDataModel/RimEclipseWell.h
	ApplicationCode/UserInterface/RiuViewerCommands.cpp
 2017-01-18 12:19:07 +01:00
Magne Sjaastad
e0ba009e34 Cleaned up includes 
Removed includes to cvfLibCore and friends. Removed several includes from header files.
 2017-01-17 15:11:02 +01:00
Magne Sjaastad
1b5dc51a7e #1084 Snapshot : Removed header above table 2017-01-17 13:11:09 +01:00
Magne Sjaastad
9c1e9f0970 #1080 Snapshot : Show parameter and case as default 2017-01-17 10:40:38 +01:00
Magne Sjaastad
22f870bff0 #1082 Snapshot : Added four empty rows 2017-01-16 23:21:28 +01:00
Magne Sjaastad
723e0f9286 #1107 #1111 Added update of well allocation plot from 3D view 2017-01-13 13:32:17 +01:00
Magne Sjaastad
0cbdcd587d #1105 Stripped down basic infrastructure code 2017-01-13 13:32:17 +01:00
Magne Sjaastad
894b4468b4 #1125 Limit size of string in legend and info, reordered tracer combo 2017-01-12 15:00:23 +01:00
Magne Sjaastad
8ce8b4e7f1 #1105 Added framework files for Well Allocation plot 2017-01-12 15:00:23 +01:00
Magne Sjaastad
00db484f0c #1056 Do not show time history plots for flow data 2017-01-12 10:42:51 +01:00
Magne Sjaastad
b104b1a97c #1056 Simplified TimeHistoryResultAccessor 
#1056 Simplified TimeHistoryResultAccessor
 2017-01-12 07:22:19 +01:00
Magne Sjaastad
4ec7c97a77 #1056 Removed obsolete code 2017-01-11 21:41:22 +01:00
Magne Sjaastad
4a9fec49bf #1056 Added cell edge picking text info 2017-01-11 21:07:03 +01:00
Magne Sjaastad
9cd17ec508 Merge dev into pre-proto 
Conflicts:
	ApplicationCode/ProjectDataModel/RimEclipseView.cpp
	ApplicationCode/ProjectDataModel/RimEclipseView.h
 2017-01-10 10:09:44 +01:00
Magne Sjaastad
8970d93a4d #1068 Renamed to RigEclipseCaseData 2017-01-10 09:51:39 +01:00
Magne Sjaastad
f70806e056 #1068 Avoid include of RigCell.h and RigSingleWellResultsData in RigCaseData.h 2017-01-10 09:20:03 +01:00
Magne Sjaastad
9cacf0db6c #1068 Access mainGrid directly from RimEclipseView 2017-01-10 09:20:03 +01:00
Magne Sjaastad
785a5e9ff8 #1060 Use DisplayCoordTransform in ResultTextBuilder 2017-01-09 07:43:17 +01:00
Jacob Støren
ebddaa31e6 #1054 Added sensible information to the Result Info window when picking Flow Diag results. 
Also rolled out the use of resultVariableUiName() to places that should use it.
 2017-01-04 13:13:06 +01:00
astridkbjorke
6b58adb91b #1044 - pre-proto - Updating indexing for i j and k in SimWellFracture to follow Eclipse indexing (starting with 1) and updating depth of z position at wellpath for WellPathFractures to be displayed as positive 2017-01-04 09:35:35 +01:00
Magne Sjaastad
dc970edf7e Merged in changes from dev 2017-01-03 11:32:00 +01:00
Magne Sjaastad
51e8cae11b Added branch index to source info as basis for more work on #1044 2017-01-03 11:11:36 +01:00
astridkbjorke
b3bc0a9135 #1044 - pre-proto - Added function for creating new sim well fracture, not yet setting correct i j k 2017-01-03 09:37:59 +01:00
astridkbjorke
a45ed4bc19 #1038 - pre-proto - Renaming feature for creating new well path fracture 2017-01-03 09:37:59 +01:00
Magne Sjaastad
66d0bc9488 #1018 Snapshot - set dialog width to 1000 2016-12-22 11:55:26 +01:00
Magne Sjaastad
8d8ef3ddc1 #1018 : Snapshot - Use active view as basis for new snapshot definitions 2016-12-22 08:45:50 +01:00
astridkbjorke
46e4815f9a #1038 - pre-proto - added calculation of measured depth along well path when creating new well path fracture in 3D view 2016-12-21 13:40:53 +01:00
astridkbjorke
7784cad47f Merge branch 'dev' 2016-12-21 08:43:57 +01:00
astridkbjorke
f6221340b1 Merge branch 'dev' 2016-12-21 08:38:52 +01:00
astridkbjorke
2022e2dd3d (#1038) - pre-proto - Added new well path fracture from context menu in 3D view. Measured depth along well path for fracture is not yet updated. 2016-12-21 08:35:44 +01:00
Magne Sjaastad
2e3ba3a644 System : Prepare for temporary selection 2016-12-21 08:22:45 +01:00
Magne Sjaastad
ebb191069f System : Added a temporary selection role to for application specific selection items 2016-12-21 08:05:01 +01:00
Jacob Støren
39ff269e5f Merge branch 'dev' of https://github.com/OPM/ResInsight.git 2016-12-20 14:43:28 +01:00
Jacob Støren
4b64de258e Flow: Avoid crash when picking cells with flow Diag results 2016-12-20 14:42:46 +01:00
astridkbjorke
b6a08700a2 #1044 - pre-proto - Started adding feature for making new simulation well fracture in 3D view, but not finished due to missing infrastructure 2016-12-20 13:10:03 +01:00
astridkbjorke
ff996e75ea Show intersection context menu item when linked view is range filter controlled 2016-12-20 11:25:06 +01:00
Magne Sjaastad
b934ae3f26 Merged branch maintenance-enhancements into dev 2016-12-19 15:12:26 +01:00
Magne Sjaastad
2e30ede5e6 #1018 : Allow table rows to be resized 2016-12-19 15:05:53 +01:00
Magne Sjaastad
3d08b453c4 #1018 Snapshots : Show both case name and view name in view description 2016-12-19 08:49:41 +01:00
Magne Sjaastad
d32ce739c7 #552 Linked views : Hide cursor in dependent views when view receives leave event 2016-12-16 14:53:19 +01:00
Magne Sjaastad
27df0a20cf #552 : Linked Views: Cleanup 2016-12-15 19:00:36 +01:00
Magne Sjaastad
4583dbf3b1 #552 Linked Views : Draw a cross hair marker 2016-12-15 18:45:10 +01:00
Magne Sjaastad
90a2d384d3 #552 Linked Views : Prototype - show label at cursor position in dependant views 2016-12-15 18:20:43 +01:00
astridkbjorke
f57f9d356e #1018 Added saving of snapshots to loop infrastructure already established 2016-12-15 13:57:13 +01:00
astridkbjorke
8bf1456644 #1018 Added loops for making multiple snapshots based on user input in widget. Filnames are generated, but no images saved yet. 2016-12-15 13:57:13 +01:00
Jacob Støren
ec5ad417f3 #1035 Renamed overloaded methods in result accessor to make it easier to see where the flow interception must come. 2016-12-14 14:51:53 +01:00
Magne Sjaastad
69695ffa32 #1018 Snapshots : Resize rows and columns to content 2016-12-14 12:42:13 +01:00
Magne Sjaastad
0fc23c5610 System : Manipulation of time step is now only available from RiuViewer 2016-12-14 10:35:28 +01:00
Magne Sjaastad
c25384b09c #1018 Added UI for export folder location 2016-12-13 16:25:42 +01:00
Magne Sjaastad
b3f294c133 #1018 : Added export button 2016-12-13 15:17:50 +01:00
astridkbjorke
99d54beb4a #1018 Setting default case and view when adding first line to the table in the widget for exporting multiple snapshots. 2016-12-13 14:16:33 +01:00
astridkbjorke
6583c43f1b #1018 Added fields fos specifying start/stop/direction for range filtered snapshots. Added clear functionality and defaults for new lines in table for the MultipleSnapshotsWidgets. 2016-12-13 14:16:33 +01:00
Magne Sjaastad
06d120bd29 #1018 : Added PdmUiTableView used to define multiple snapshot definitions 2016-12-09 14:40:26 +01:00
Magne Sjaastad
331456e619 #1018 : Snapshot : Added table editor to export dialog 2016-12-09 11:11:16 +01:00
Magne Sjaastad
ec3e05e87f #973 Linked views : Update parallel projection settings in linked views 2016-11-24 14:01:47 +01:00
Magne Sjaastad
e0d7849576 System : Improved handling of missing files 2016-11-24 10:51:20 +01:00
Magne Sjaastad
a70939f1b6 #1000 System : Prepare for handling of copy/paste actions 2016-11-24 08:21:59 +01:00
Magne Sjaastad
d59a1a90c6 #999 Summary : Set minimum window size as small as possible 2016-11-23 13:29:26 +01:00
Magne Sjaastad
57aa47ecdd System : Test menu adjustments 2016-11-23 10:15:22 +01:00
Magne Sjaastad
c7ac7ab9f9 #943 Well log plot: Display curve value when pointing with cursor 2016-11-22 11:56:37 +01:00
Jacob Støren
5d04ac198b #859 Added time from start of simulation option 2016-11-22 11:14:02 +01:00
Jacob Støren
ef0a12ea66 Moved New Polyline Intersection context command in viewer together with the other intersection commands. Reordered View link commands 2016-11-17 17:40:31 +01:00
Magne Sjaastad
80b4f63311 #976 Summary : Use large tooltip curve marker to avoid Qwt symbol offset 2016-11-16 12:06:54 +01:00
Magne Sjaastad
f9c3488dbe #870 Use scaleDraw to create value and time text strings 2016-11-11 12:27:26 +01:00
Magne Sjaastad
31b12999b5 #870 Detach plot marker when plot looses focus 2016-11-11 11:41:08 +01:00
Magne Sjaastad
9594685980 #870 Summary : Use pen width 2.0 for curve plot marker 2016-11-10 12:16:33 +01:00
Magne Sjaastad
77cfa25a19 #965 Fixed invalid rescale of right y-asix 2016-11-09 09:28:52 +01:00
Magne Sjaastad
cfe9b5626d #870 Show closest curve point y-value and a plot marker 2016-11-09 09:09:50 +01:00
Jacob Støren
85b1d4a391 #960 Change names on TNH and THQV to TPH and TPQV 2016-11-04 15:27:24 +01:00
Magne Sjaastad
f65559af38 #946 Fixed enabled state for tile window toolbar button 2016-11-03 10:08:45 +01:00
Magne Sjaastad
9e0cf779b6 #949 Intersection : Convert coordinates using DisplayCoordTransform 2016-11-02 14:44:51 +01:00
Jacob Støren
8d2d4dfe30 #941 Added TP, FAULTMOB, PCRIT, TPinc as transformed stress results 2016-11-01 09:29:52 +01:00
Magne Sjaastad
2233eddc1a #850 Summary : Added export menu items to main plot window 2016-10-27 11:10:40 +02:00
Magne Sjaastad
70fb105ced #850 Summary : Added snapshot of all well log plots and summary plots to file 2016-10-27 11:03:13 +02:00
Magne Sjaastad
5a63b841b8 #850 Removed obsolete code 2016-10-27 08:35:57 +02:00
Magne Sjaastad
656d4c6c99 #850 Summary : Added Snapshot to file command feature 2016-10-27 08:09:49 +02:00
Jacob Støren
d3ad0d43bf #933 Moved and renamed TimeHistory calculator to the user interface module 2016-10-26 17:14:33 +02:00
Jacob Støren
c93c7e41df #933 Fixed the closes result for intersections also. Display the tensor data from the closest element node transformed onto the plane. 2016-10-26 17:14:33 +02:00
Jacob Støren
a9b2451cdd #933 Fixed closest result for pr element face-node result when picking on elements. Also fixed the result plot in the same respect. 2016-10-25 14:39:50 +02:00
Magne Sjaastad
a65c800cf0 #916 Created feature for edit of preferences and added to main plot Edit menu 2016-10-24 13:21:49 +02:00
Magne Sjaastad
9c60f507b6 System : Moved files to ApplicationCode/UserInterface 2016-10-21 15:50:47 +02:00
Magne Sjaastad
3081826832 #929 Remove import of Eclipse input case using opm-parser 2016-10-21 09:53:00 +02:00
Jacob Støren
26accc9e9a Merged with dev 2016-10-20 16:19:30 +02:00
Jacob Støren
d8247c2ac6 #914 Added calculation of element face aligned stress 2016-10-20 10:50:29 +02:00
Magne Sjaastad
e732d5c373 #922 Use setValueWithFieldChanged instead of setValueFromUi 2016-10-19 15:30:52 +02:00
Magne Sjaastad
649c11efcb #924 Cleaned up includes and use RimGeoMechResultDefinition instead of RimGeoMechCellColors 2016-10-18 07:31:02 +02:00
Magne Sjaastad
f03e2431f9 #911 Fixed picking on category legend 2016-10-17 11:51:25 +02:00
Magne Sjaastad
f4140ad3e1 Made regression test dialog wider 2016-10-17 10:50:37 +02:00
Magne Sjaastad
d5213b2a43 #862 Added scale picker to select axis 2016-10-14 15:06:21 +02:00
Magne Sjaastad
30bef2bb17 #853 Support zooming when two y-axis are present 2016-10-13 09:33:50 +02:00
Magne Sjaastad
ae1eea4ac6 #779 Added support for filtering of zero and negative values in setSamplesFromDateAndValues 2016-10-12 13:49:57 +02:00
Jacob Støren
e953a0a09a #852 Adjusted default minor time axis tick numers to 1 2016-10-07 11:34:52 +02:00
Magne Sjaastad
15349dd471 #849 Added import summary case to toolbars 2016-10-06 15:17:59 +02:00
Magne Sjaastad
39356c2b2a #849 Added Import Summary Case command 2016-10-06 15:02:11 +02:00
Magne Sjaastad
b4d6e40247 #849 Added import summary case command 2016-10-06 15:02:11 +02:00
Magne Sjaastad
8ef8607d09 #846 Cleaned up includes 2016-10-06 08:33:34 +02:00
Magne Sjaastad
7c5dbf8bc2 #846 Use one tile window feature for both main windows 2016-10-06 07:55:35 +02:00
Magne Sjaastad
95d4cd15cd #846 Mirrored relevant items to plot window menus 2016-10-06 07:55:35 +02:00
Jacob Støren
5988bca3bf #852 Reduced to one minor tick on Y-axis 2016-10-05 16:10:29 +02:00
Jacob Støren
8adeff97fd #852 Increased default font size from 9 to 11 2016-10-05 15:43:27 +02:00
Magne Sjaastad
58a25c9fe9 #846 Created help menu features 2016-10-05 14:23:31 +02:00
Magne Sjaastad
ee0038ac74 #846 Created ImportGeoMechCaseFeature 2016-10-05 14:23:31 +02:00
Magne Sjaastad
8ffe1303df #846 Created save/close project and exit features 2016-10-05 14:23:30 +02:00
Jacob Støren
b2728b070b #871 Keep new zoom settings when toggling the curves/curve filter 2016-10-05 13:56:27 +02:00
Magne Sjaastad
d719491a33 #846 Added Open Last Used Project feature 2016-10-05 10:42:08 +02:00
Magne Sjaastad
b62bf68c07 #846 Created Open Project command feature 2016-10-05 08:54:40 +02:00
Magne Sjaastad
c8b73dad68 #846 Moved recent file management to RiaApplication 2016-10-05 08:54:40 +02:00
Magne Sjaastad
1654ab3c91 Removed unused code 2016-10-05 08:54:39 +02:00
Magne Sjaastad
0b9b0137cd #846 Moved open of plot and 3D view tool buttons to front of toolbars 2016-10-04 13:26:11 +02:00
Magne Sjaastad
6313a06f2e #846 Linux fix 2016-10-04 11:44:31 +02:00
Magne Sjaastad
16f8fc186e #846 Removed obsolete flag to closeProject and make sure project is closed when last main window is closed 2016-10-04 11:03:54 +02:00
Magne Sjaastad
3a2454cba0 #851 Added "Open 3D Window" tool button in plot window. Raise mainWindow when activated from toolbar 2016-10-04 11:03:53 +02:00
Magne Sjaastad
27682f2a34 Select simulation well in property editor when picked in 3D view 2016-10-03 14:33:06 +02:00
Magne Sjaastad
1f1fd72f02 #884 Select intersection in property editor when clicking in 3D scene 2016-10-03 13:07:19 +02:00
Jacob Støren
3e48b102f3 #902 A separate command to add an intersection box at a position 2016-09-30 13:10:49 +02:00
Magne Sjaastad
1537b8c0d1 #884 RimIntersectionBox now manages the box manipulator object 2016-09-30 12:33:32 +02:00
Magne Sjaastad
d7a69bdae8 Merged intersection box interactive manipulation 2016-09-30 10:01:17 +02:00
Jacob Støren
7456d1e697 Revert "#902 Create box at position - context command" We need a separate feature for this 
This reverts commit e36b39289f.
 2016-09-30 09:51:11 +02:00
Magne Sjaastad
593d72d63b (#884) Refactor and cleanup 2016-09-30 09:34:45 +02:00
Magne Sjaastad
d4bdbcb7c8 (#884) Added prototype of event handler for interaction with box 2016-09-30 09:34:39 +02:00
Jacob Støren
e36b39289f #902 Create box at position - context command 2016-09-30 09:07:04 +02:00
Jacob Støren
638f5526ac #899 Fixed Grid On/Off state in toolbar 2016-09-29 15:42:19 +02:00
Jacob Støren
3bca03a722 Fix of missing changes from previous merge commits. Missing rename of anchestor to ancestor 2016-09-28 14:35:57 +02:00
Jacob Støren
cbb626aa31 Merged intersection-box into dev 2016-09-28 14:27:17 +02:00
Magne Sjaastad
6b1dd89b2e #888 Intersection Box: Enable picking on intersection box geometry 2016-09-26 10:35:59 +02:00
Magne Sjaastad
5c4b92f9b8 #818 Intersection Box: Added XYZ slices to context menu in 3D view 2016-09-23 16:12:19 +02:00
Magne Sjaastad
120cc8b6dc #887 Category Legend: Limit legend height when having few categories 2016-09-22 15:31:21 +02:00
Magne Sjaastad
993a67edb6 Increased number of items in recent files to 9 2016-09-22 15:01:52 +02:00
Magne Sjaastad
531aaaa445 AppFwk : Fixed typo of firstAncestorOrThisOfType 2016-09-21 13:59:41 +02:00
Jacob Støren
a9d1f52005 #815 More renaming CrossSection -> Intersection 2016-09-21 11:44:28 +02:00
Jacob Støren
d549f45ad0 #815 More renaming CrossSection -> Intersection 2016-09-21 11:38:37 +02:00
Jacob Støren
08baa5ccc9 #815 Renamed RimCrossSection -> RimIntersection 2016-09-21 10:48:25 +02:00
Jacob Støren
e5cf69a3fe #815 More Rename CrossSection -> Intersection 2016-09-21 10:40:08 +02:00
Magne Sjaastad
33abbed1fd #882 RiaApplication : Renamed to lastUsedDialogDirectory and added currentProjectPath. Use project path as fallback path for LAS export 2016-09-21 09:46:17 +02:00
Magne Sjaastad
0fc911e50b #837 Set category legend width to 150 px 2016-09-14 08:27:04 +02:00
Magne Sjaastad
7306950d9d #831 Category legend use full height to be able to show as many category names as possible 2016-09-12 11:11:25 +02:00
Jacob Støren
78b29fc3a0 Fixed zoom all bounding box issue related to 1209c908e5 
Used explicit mainRendering instead of renderSequence->firstRendering()
 2016-09-07 15:54:12 +02:00
Jacob Støren
1209c908e5 Fixed clip plane related assert on linux. Hopefully the final fix of trouble related to : ca6e650a72 and 80985785 and 0128baddff 
The fundamental problem was that the quad rendering was included in the boundingbox.
 2016-09-07 12:52:40 +02:00
Jacob Støren
c903e87dfd #811, #812 WIP, Formation names coloring of cells. First shot. Works but needs refinment. 2016-09-06 10:27:30 +02:00
Jacob Støren
f03e6de1f2 #810, #813, #808 Display formation name when picking 2016-08-24 15:19:39 +02:00