Commit Graph

5674 Commits

Author SHA1 Message Date
Unknown
b4fd236701 Fix linux build 2017-11-23 15:24:21 +01:00
Unknown
ef52927795 #2175 Intersection: Make extrude length option on azimuth, dip plane 2017-11-23 15:20:14 +01:00
Unknown
89f67c053f #2121 Intersections: Highlight polyline on Azimuth/dip plane creation 2017-11-23 15:20:14 +01:00
Unknown
ab1ae62f8a #2121 Intersections: Update aximuth angle when creating the plane 2017-11-23 15:20:14 +01:00
Unknown
17cb520879 #2121 Intersections: Set dip angle range to [0, 180] 2017-11-23 15:20:14 +01:00
Unknown
3983aecd2e #2122 Formation/Well Path: Add file reader 2017-11-23 15:20:14 +01:00
Jacob Støren
eaefaf4980 #2119, #2072 Handle well flow condition and total flow 2017-11-23 15:11:43 +01:00
Jacob Støren
69a61a2cb8 #2119, #2072 Move private section to the bottom. Add isTotalFlowChannel 2017-11-23 15:11:43 +01:00
Bjørn Erik Jensen
1acd39898e UserDataParser. Fix unit test 2017-11-23 09:48:36 +01:00
Bjørn Erik Jensen
f87234ad39 Fix unit test compiler errors 2017-11-23 09:28:32 +01:00
Bjørn Erik Jensen
553ef38944 Remove commented code 2017-11-23 09:28:04 +01:00
Bjørn Erik Jensen
8a0545336b Clang format. Set AlignConsecutiveAssignments to true 2017-11-23 08:20:49 +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
Bjørn Erik Jensen
d7dc304eca #2018 Ascii data. Add preview text field to ascii paste dialog 2017-11-23 08:02:27 +01:00
Magne Sjaastad
ac723ab93a ClangFormat : AlignConsecutiveDeclarations: true 2017-11-23 07:14:21 +01:00
Magne Sjaastad
6eda898d9a Always use space instead of tabs 2017-11-23 07:14:21 +01:00
Jacob Støren
df8d23efb9 Changed Select Address to Select Vector... 2017-11-22 14:52:23 +01:00
Jacob Støren
819427e091 #2171 Changed ui texts 2017-11-22 14:52:23 +01:00
Magne Sjaastad
1918a70d21 #2158 Curve Address Selection : Select first case as default 2017-11-22 09:15:48 +01:00
Magne Sjaastad
a07205c047 #2165 Fault Import : Update unit tests 2017-11-22 07:33:58 +01:00
Magne Sjaastad
853e33f7b2 #2165 Fault Import : Improve parsing of fault face text 2017-11-22 07:11:47 +01:00
Unknown
0b981ec82f #2121 Intersection: Update gui text 2017-11-21 18:57:33 +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
Magne Sjaastad
f7de89a584 Test config for clang-format 2017-11-21 15:13:53 +01:00
Unknown
1939e65a5c Fix linux warning 2017-11-21 14:04:16 +01:00
Unknown
3142f7dd44 #2121 Intersections: Add option "Azimuth, Dip" to Intersecting Geometry 2017-11-21 13:50:18 +01:00
Magne Sjaastad
d19089710c #2153 Cross Plot : Show warning when no overlapping time steps are present 2017-11-21 11:52:53 +01:00
Magne Sjaastad
a51b4be1dc #2153 Cross Plot : Compute interpolated values based on missing timesteps relative other curve 2017-11-21 11:52:53 +01:00
Jacob Støren
4f653cbf3d Move axis selection into Y-Axis option-group 2017-11-21 10:23:19 +01:00
Jacob Støren
9faf4f8740 Add "New crossplot and summary curve" command to SummaryCurve Collection context menu 2017-11-21 10:22:36 +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
Magne Sjaastad
4d6d48dc18 #2153 Curve Creator : Clear results before trying to assign values from curve merging 2017-11-21 09:19:39 +01:00
Magne Sjaastad
9d5bf4ce5e #2125 Curve Calculations : Interpolate between N curves 2017-11-21 08:15:29 +01:00
Magne Sjaastad
686a47587b #2125 Curve Calculations : Add TimeHistoryCurveMerger 2017-11-21 08:10:28 +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
Rebecca Cox
19157ce4f7 #2146 Num Flooded PV: Add allTimeSteps for visible native cells 2017-11-20 09:46:29 +01:00
Rebecca Cox
f5290f020b #2146 Num Flooded PV: Add allTimeSteps for all active native cells 2017-11-20 09:46:29 +01:00
Bjørn Erik Jensen
931bc71deb Submenus. Minor refactoring 2017-11-20 09:44:55 +01:00
Bjørn Erik Jensen
e0b6062eca Fix Linux build warning and error 2017-11-20 08:57:20 +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
f032a3eb9f #2136 Sort observed data phases largest first 2017-11-17 20:17:44 +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
8c95975054 #2136 PLT plot curve appearance improved. First group gets solid fill. If Observed data is available, it will be first. The other groups are drawn with a gentle transparency on the last curve to "connect" the groups visually. 2017-11-17 15:33:43 +01:00
Jacob Støren
84c63e7df8 Remove unneccessary code 2017-11-17 15:33:42 +01:00
Magne Sjaastad
8ee0ddb317 #2125 Curve Calculations : Add tools used to interpolate two curves 2017-11-17 14:29:19 +01:00
Magne Sjaastad
5cbaf3c1eb #2125 Refactor : Return by value instead of incoming parameter 2017-11-17 13:50:25 +01:00
Magne Sjaastad
cd368d8ef2 #2125 Refactor : Introduce typedef for CurveIntervals 2017-11-17 13:50:25 +01:00
Magne Sjaastad
827cee6093 #2125 Curve Calculations : Extract isValidValue 2017-11-17 13:50:25 +01:00
Jacob Støren
503c7bf37c Remove memory leak, Simplified code 2017-11-17 11:09:14 +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
5a5a36abf5 RFT plot. Reset branch index when changing well due to exception 2017-11-17 09:02:43 +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
Jacob Støren
30e3622ad4 #2126, #2139 Removed unused methods 2017-11-16 17:02:39 +01:00
Jacob Støren
1808745ea0 #2126, #2139 Rftplot alignment with PLT plot. Move two new static methods to WellPlotTool 2017-11-16 17:02:39 +01:00
Jacob Støren
6b2231478c #2126, #2139 Rftplot alignment with PLT plot. WIP 2 2017-11-16 17:02:39 +01:00
Jacob Støren
49c2d6df0d #2126, #2139 Rftplot alignment with PLT plot. WIP 2017-11-16 17:02:39 +01:00
Jacob Støren
0007682f03 Use RiaRftPltCurveDefinition in Plt Plot 2017-11-16 17:02:39 +01:00
Jacob Støren
7ff93e9154 Remove obsolete code in RimWellPlotTools, sorted header according to actual use. 2017-11-16 17:02:39 +01:00
Jacob Støren
ff7ae94e43 Remove unneccessary guarding against other channels in well log file curve used in rft plot 2017-11-16 17:02:39 +01:00
Rebecca Cox
6347c9d716 #2146 Num Flooded PV: Add allVisibleCells for native 2017-11-16 15:28:12 +01:00
Rebecca Cox
204ee2162a #2146 Num Flooded PV: Add allVisibleCells for flowDiag 2017-11-16 14:59:55 +01:00
Rebecca Cox
92a6819b39 Rename frameIndex -> timeStepIndex 2017-11-16 14:52:18 +01:00
Rebecca Cox
7c19b0601b Rename frameIndex -> timeStepIndex 2017-11-16 14:52:18 +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
af1ffcb71c #2102 Statistics dialog. Add command to 3d context menu 2017-11-16 14:24:01 +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
c59c167bbf Cross Plot : Set bool in field to false when push button is pressed 2017-11-16 13:06:16 +01:00
Magne Sjaastad
fd1ab39cad Remove duplicate file listing 2017-11-16 13:01:32 +01:00
Magne Sjaastad
3f05300d2a Use PdmUiPushButtonEditor::configureEditorForField 2017-11-16 12:51:55 +01:00
Magne Sjaastad
db1fa5ada0 Cross Plot : Use default push button config 2017-11-16 12:51:55 +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
fba74f535f Merged from statistics_dialog 2017-11-16 11:43:24 +01:00
Rebecca Cox
49417bbb3a #2146 Num Flooded PV: Add volume weighted mean for visible cells and current time step 2017-11-16 10:50:55 +01:00
Rebecca Cox
4b2af286e3 #2146 Num Flooded PV: Move getResultIndexableStaticResult 2017-11-16 10:50:55 +01:00
Rebecca Cox
797115d5c1 #2146 Num Flooded PV: Add accessor for flowDiagSolution 2017-11-16 10:50:55 +01:00
Rebecca Cox
969d6342bc include cmath for linux 2017-11-16 10:50:55 +01:00
Rebecca Cox
6c42e74623 #2146 Num Flood PV: Allow artCellInfo to be null if not usingActiveIndex 2017-11-16 10:50:55 +01:00
Rebecca Cox
47429b1c6b #2146 Num Flooded PV: Add weighted mean calulator 2017-11-16 10:50:55 +01:00
Rebecca Cox
2e63ae0b30 #2146 Num Flooded PV: Add MOBPV to RiaDefines 2017-11-16 10:50:55 +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
Jacob Støren
259ea5b0e7 #2126, #2139 Simplified PLT sources IO field update. Remove obsolete code 2017-11-15 16:18:36 +01:00
Magne Sjaastad
762a21d940 #2093 Cross Plot : Add push button to select curve address 2017-11-15 15:20:47 +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
Magne Sjaastad
c0d26a1d4e #2091 Cross Plot : Update UI text for x axis address 2017-11-15 13:53:32 +01:00
Jacob Støren
42ee25d29e #2126, #2139 Improve timestep filtering in PLT plot 2017-11-15 11:32:25 +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
65e076ab31 #2092 Cross Plot : Load and show cross plot when project is loaded 2017-11-14 14:01:19 +01:00
Magne Sjaastad
57d9ab83a2 #2092 Cross Plot : Update bottom axis based on cross plot values 2017-11-14 13:55:50 +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
1376727386 #2092 Cross Plot : Add RimSummaryCrossPlot 2017-11-14 12:58:28 +01:00
Magne Sjaastad
df9e0de39c #2092 Cross Plot : Rename to RimSummaryAxisProperties 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
Magne Sjaastad
eb28f5a865 #2090 Cross Plot : Use axis config object to control bottom axis - WIP 2017-11-14 12:58:28 +01:00
Magne Sjaastad
90317d861f #2091 Cross Plot : Add support for custom x-axis 2017-11-14 12:58:28 +01:00
Magne Sjaastad
b05a99c763 #2091 Cross Plot : Add fields used to specify address for x-axis 2017-11-14 12:58:28 +01:00
Magne Sjaastad
99124759ed #2091 Cross Plot : Move RimSummaryAddress to separate file and rename 2017-11-14 12:58:28 +01:00
Rebecca Cox
65af210304 #2121 Intersections: Add option to the "Direction" menu: Azimuth, Dip 2017-11-14 12:49:14 +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
Bjørn Erik Jensen
dc11cbd4c5 WellPathCollection. Fix crash 2017-11-14 11:37:22 +01:00
Magne Sjaastad
018549d15a #2143 Import of NNC : Move import of dynamic NNC data to RifEclipseOutputFileTools 2017-11-14 10:43:14 +01:00
Magne Sjaastad
1c0d8c0dd0 #2143 Guard agains access of null pointer when reading NNC 2017-11-14 10:35:18 +01:00
Bjørn Erik Jensen
e729ae02da #2111 LAS import. Standard default flow to 'Standard' 2017-11-14 09:43:05 +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
560dd4025a #2124 Curve calculator: Change default variable names to match expressions in context menu 2017-11-13 15:56:49 +01:00
Rebecca Cox
7aada0a1dc #2124 Curve calc: Remove useless functions and rearrange context menu 2017-11-13 15:37:07 +01:00
Rebecca Cox
8f0a7ced36 #1929 Curve Filter: Remove context menu option from summary curve 2017-11-13 15:37:07 +01:00
Jacob Støren
c670878b33 #2139, #2126 Add available times convenience access in RftReader, Rename enum in RifEclipseRftAddress 2017-11-13 15:23:38 +01:00
Jacob Støren
8bea278d20 #2139, #2126 Add convenience access in RifDataSourceForRftPlt 2017-11-13 15:23:38 +01:00
Jacob Støren
a172f0ccfe #2133 Rft cases only returned if they actually contain the well.
Simplified gridCasesForWell code as well.
2017-11-13 15:23:38 +01:00
Jacob Støren
10e1f0f8ab Rename RimRftAddress to RimDataSourceForRftPlt 2017-11-13 15:23:38 +01:00
Jacob Støren
c02538b8bd Rename of RifWellRftAddress to RifDataSourceForRftPlt 2017-11-13 15:23:38 +01:00
Jacob Støren
9853c15ec6 Code adjustments 2017-11-13 15:23:38 +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
4f4635181d #2107 RFT PLT Plot: Hide all children 2017-11-13 10:21:24 +01:00
Rebecca Cox
da7c817023 #2129 Rft/Plt plot: Show formations on default, and not always 2017-11-13 08:56:22 +01:00
Rebecca Cox
a4484579e2 Select last imported wellPath on import, not last wellPath in collection 2017-11-13 07:55:22 +01:00
Rebecca Cox
3e40331c5b #2129 Rft/Plt plot: Show formations on default 2017-11-13 07:55:22 +01:00
Rebecca Cox
7e6b45c626 Avoid crash if simWellName is "None" 2017-11-13 07:55:22 +01:00
Rebecca Cox
45ef3a1f00 #2087 Summary: Reload summary case eclipse case reload 2017-11-13 07:55:22 +01:00
Rebecca Cox
75c506e257 #2109 Remove automatic color on well labels on background change 2017-11-13 07:55:22 +01:00
Jacob Støren
cc4041b09b #2135 Rewrote obfuscated less operator and sort OBSERVED PLT sources first 2017-11-12 23:53:59 +01:00
Jacob Støren
5efd60c227 #2135 Fix broken drawing order of WellFlowRateCurves. Add group awareness to the drawing order. Higher groupids are drawn on top. 2017-11-12 23:51:08 +01:00
Jacob Støren
efa48c2cf5 #2114 Remove code causing timesteps to be unchecked 2017-11-12 23:46:12 +01:00
Jacob Støren
49c6fd9ac4 #2134 Rewrite the wellLogFilesContainingFlow to fix observed data always available bug 2017-11-12 16:18:48 +01:00
Jacob Støren
fadc9d12ff #2130 Avoid resetting zoom when last curve is removed 2017-11-12 15:46:32 +01:00
Jacob Støren
645421fa60 #2130 RFT And PLT plot: Show formation names also when no timesteps are visible. Do not overwrite the users case setting unless none are chosen. 2017-11-12 14:45:06 +01:00
Jacob Støren
fcf5093fb9 #2130 Zoom all when adding or removing curves.
WellLogTrack will not zoomAll but respect the visible-window setting to avoid overwriting the set zoom on project reload.
2017-11-12 13:45:01 +01:00
Jacob Støren
7f038e98ab #2130 Rewrite the wellLogFilesContainingPressure to fix observed data ways available bug 2017-11-12 12:38:12 +01:00
Jacob Støren
324d6d72e3 #2112 Avoid updating legend for each curve. Generalize and roll out the solution found for summary curves 2017-11-11 23:15:13 +01:00
Magne Sjaastad
59c51d7e5e Remove test accessing local file path 2017-11-10 16:14:39 +01:00
Jacob Støren
c5e4773a58 Fix RFT plot after change of well name meaning 2017-11-10 15:44:35 +01:00
Magne Sjaastad
5fe44fe943 #2097 Reservoir Phase Detection : Compute SGAS for non-oil simulations 2017-11-10 10:36:43 +01:00
Magne Sjaastad
5db08c7b76 #2097 Reservoir Phase Detection : Find available phases from result files 2017-11-10 09:43:51 +01:00
Bjørn Erik Jensen
f8a2250f3c RFT plot. Fix invisible grid curves bug 2017-11-09 15:50:32 +01:00
Bjørn Erik Jensen
290458b77a PLT plot. Fix crash when stacking curves containing NULL sample values 2017-11-09 15:34:31 +01:00
Bjørn Erik Jensen
4ad6198d42 PLT plot. Update plot after synced curves from ui selection change 2017-11-09 15:34:31 +01:00
Jacob Støren
1fba5e13c4 #2119 Support total reservoir flow from Grid wells in PLT plot 2017-11-09 15:20:15 +01:00
Jacob Støren
dfa0ade9fe #2116 Convert the PLT plot gas rate from RFT file to oil equivalents 2017-11-09 15:20:15 +01:00
Magne Sjaastad
161690d9c8 Fix signed/unsigned compare 2017-11-09 14:25:42 +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
Magne Sjaastad
7a10087c01 #2118 Fracture : Improve detection of Stimplan cell intersected by well path 2017-11-09 14:15:05 +01:00
Bjørn Erik Jensen
d277a08d29 #2100 PLT plot. Remove branch index field 2017-11-09 13:36:14 +01:00
Bjørn Erik Jensen
f131f1274a #2101 PLT plot. Support for regex matching when comparing flow channels 2017-11-09 13:11:44 +01:00
Bjørn Erik Jensen
d3d5a89979 #2100 PLT plot. Refactoring. Use RimWellPlotTools methods 2017-11-09 11:18:57 +01:00
Bjørn Erik Jensen
89e5c04aef #2100 RFT plot. Add RftPltCurveDefinition. Use that in RFT plot 2017-11-09 10:04:17 +01:00
Bjørn Erik Jensen
a46c5af1f8 RFT plot. Refactoring. Move several static methods to RimWellPlotTools class 2017-11-09 10:04:17 +01:00
Bjørn Erik Jensen
cf069aaf5c RFT plot. Fix list of wells (display well path name when possible) 2017-11-09 10:04:17 +01:00
Jacob Støren
5a075493f2 Add assert when formation names branch index is wrong in WellLogTrack 2017-11-08 23:02:44 +01:00
Bjørn Erik Jensen
444ad2ff90 PLT plot. Fix observed-data-even-if-no-selected-well issue 2017-11-08 17:01:18 +01:00
Bjørn Erik Jensen
95a5085ba0 #2099 #2101 (partly) PLT plot. Well path/well name matching issues. Display only wells with well path 2017-11-08 16:37:19 +01:00
Rebecca Cox
1321b0d754 In RimWellLogPlot: Keep custom zoom factors on load and update 2017-11-08 16:11:53 +01:00
Rebecca Cox
52c1f27ad2 #1972 Toggle grid collection off when creating an intersection 2017-11-08 15:19:35 +01:00
Rebecca Cox
b8ec896464 Change grid icon in tree view 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
Jacob Støren
aa45dd5fcd #2035 Fix crash when bottom of well path ends after last well cell
Add symbols to curves
2017-11-08 11:59:38 +01:00
Jacob Støren
014dd9497a #2035 Add color and legend text to the PLT curves 2017-11-08 11:59:38 +01:00
Magne Sjaastad
9ce06a9084 #2098 Add optional display of tooltip in preferences 2017-11-08 11:29:41 +01:00
Rebecca Cox
c49db44909 #1490 Simulation well: Remove well head if it does not have perforations 2017-11-08 11:22:51 +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
Magne Sjaastad
c19bc103c2 Observed Data : Use reserve instead of wrong use of resize 2017-11-08 08:58:57 +01:00
Bjørn Erik Jensen
bfa1a1cb67 #2051 Curve calc. Edit calculation command 2017-11-08 08:47:17 +01:00
Magne Sjaastad
ea87c84d8c Observed Data : Improve performance when accessing curve values 2017-11-08 07:44:06 +01:00
Magne Sjaastad
0502b95d86 #2091 Cross Plot : Improve interface of RiuLineSegmentQwtPlotCurve
Remove duplicate code
2017-11-08 07:38:25 +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
7104064937 #2089 Cross Plot : Add cross plot collection 2017-11-07 20:40:45 +01:00
Jacob Støren
994313fcc9 #2035 Fix some bugs in the PLT plot use of wellFlowAccumulator, and in the new constructor of the wellFlowAccumulator. Renamed to m_pipeBranchesWellResultPoints (instead of misleading "CellIds") 2017-11-07 18:35:56 +01:00
Rebecca Cox
765f752c96 Add include (for linux) 2017-11-07 15:19:54 +01:00
Rebecca Cox
f3b7f0abd6 #1392 Improve Dark 3D-View background support 2017-11-07 15:08:32 +01:00
Jacob Støren
a920f16def #2035 Add Simulation well and *.RFT file curves to PLT plot. Work In progress. Does not quite work. 2017-11-07 14:41:20 +01:00
Jacob Støren
93d449bc6e Switched QString compare to == 2017-11-07 14:41:20 +01:00
Magne Sjaastad
e9a938ce78 #2003 Observed Data : Compare first time step when merging 2017-11-07 12:33:22 +01:00
Magne Sjaastad
b022492bc1 #2003 Observed Data : Improve detection of scientific number 2017-11-07 11:16:33 +01:00
Magne Sjaastad
c8e5fb7513 #2003 Observed data : Replace tabs with spaces 2017-11-07 11:16:33 +01:00
Magne Sjaastad
82721cb6fa #2003 Observed Data : Improve error display 2017-11-07 11:16:33 +01:00
Magne Sjaastad
179c15ef5c #2003 Observed Data : Adjust minimum required headers based on presence of units and scaling 2017-11-07 11:16:33 +01:00
Magne Sjaastad
d45ca19af4 #2003 Observed Data : Use epoch as start date when no date is present 2017-11-07 11:16:33 +01:00
Magne Sjaastad
222bf38d58 #2066 Observed Data : Detect scaling 2017-11-07 11:16:33 +01:00
Magne Sjaastad
45d3fe5eaa Skip empty tokens 2017-11-07 11:16:33 +01:00
Magne Sjaastad
5ab56bb2fb #2066 Observed Data : Improve detection of required header lines 2017-11-07 11:16:33 +01:00
Magne Sjaastad
6444b9f32e #2066 Observed Data : Split string by delimiter 2017-11-07 11:16:33 +01:00
Magne Sjaastad
9d06ef857e #2003 Observed Data : Use time with highest available resolution 2017-11-07 11:16:33 +01:00
Magne Sjaastad
97d67f2d49 #2003 Observed Data : Refactor creation of time steps 2017-11-07 11:16:33 +01:00
Magne Sjaastad
d7f70f5c9f Remove duplicate function 2017-11-07 11:16:33 +01:00
Magne Sjaastad
6b18493599 #2003 Observed Data : Collect detection of string types 2017-11-07 11:16:33 +01:00
Rebecca Cox
8a8234fd66 Rename function 2017-11-07 10:38:05 +01:00
Rebecca Cox
630dbd0ffc Tab -> spaces 2017-11-07 10:02:43 +01:00
Rebecca Cox
a4d658423d #2039 Update editor on toggling "Show formation" 2017-11-07 10:00:10 +01:00
Rebecca Cox
4120aecdc2 RFT Plot: Make extractor on correct path type 2017-11-07 10:00:10 +01:00
Rebecca Cox
726adcacf3 PLT Plot: Move settings and hide track and plot 2017-11-07 10:00:10 +01:00
Rebecca Cox
99f6d21e68 #2039 PLT Plot: Move formation logic from track to plot 2017-11-07 10:00:10 +01:00
Rebecca Cox
e0b0fb1c13 #2077 Well Allocation Plot: Move formation logic from track to plot 2017-11-07 10:00:10 +01:00
Rebecca Cox
bac2d2b4b2 #2037 RFT Plot: Set formation case from plot 2017-11-07 10:00:10 +01:00
Rebecca Cox
1e943e1607 #2038 RFT Plot: move formation logic from track to rft plot 2017-11-07 10:00:10 +01:00
Rebecca Cox
2fc796ac27 Update pdm-field names to include "formation" 2017-11-07 10:00:10 +01:00
Rebecca Cox
3919b3012b Remove "uiConfigName" from uiOrdering-functions 2017-11-07 10:00:10 +01:00
Rebecca Cox
de093fda4c Formation names: Change color of annotations 2017-11-07 10:00:10 +01:00
Rebecca Cox
61067cbc24 Remove ternary operator (for Linux build) 2017-11-07 10:00:10 +01:00
Rebecca Cox
ecc1df5424 Fix crash when RFT plot does not exist 2017-11-07 10:00:10 +01:00
Rebecca Cox
5feee83706 #2077 Well Allocation Plot: Formation names for pseudo length 2017-11-07 10:00:10 +01:00
Rebecca Cox
bf00807aee #2077 Well Allocation Plot: Set default formation name values 2017-11-07 10:00:10 +01:00
Rebecca Cox
ae372a4a79 #2039 #2035 RFT/PLT Plot: Set default values for formation names 2017-11-07 10:00:10 +01:00
Rebecca Cox
7e707f131c #2039 PLT Plot: Add branch index getter 2017-11-07 10:00:10 +01:00
Jacob Støren
7f3ec2ad84 #2035 Add accumulated PLT plot curves from *.RFT file. (Not yet available due to missing calculate value options) 2017-11-06 22:24:57 +01:00
Jacob Støren
b708bb0ac3 #2035 Add MD to the intesection struct available from the WellLogExtractors 2017-11-06 22:24:57 +01:00
Jacob Støren
1089060539 #2035 Remove the unused Pseudo Length calculator 2017-11-06 22:24:57 +01:00
Jacob Støren
94c6bc763d #2035 Commit unused Pseudo length calculation files, for reference. 2017-11-06 22:24:57 +01:00
Bjørn Erik Jensen
95d9e1b722 RFT plot. Add None to wells drop down if no wells are loaded 2017-11-06 14:22:21 +01:00
Bjørn Erik Jensen
32e9a06ec3 PLT plot. Add None to wells drop down if no wells are loaded 2017-11-06 14:20:43 +01:00
Bjørn Erik Jensen
1a5db83046 RFT plot. Made some methods static 2017-11-06 14:14:55 +01:00
Bjørn Erik Jensen
936568b22b Curve calc. Reorganized context menus 2017-11-06 13:52:54 +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
ca4562d853 #2052 Curve calc. Add user defined unit field 2017-11-06 13:26:32 +01:00
Bjørn Erik Jensen
71bb26a292 Column based user data parser. Fix Linux warning 2017-11-06 12:37:23 +01:00
Bjørn Erik Jensen
0c8067f022 Well center line calc. Fix Linux warnings 2017-11-06 12:11:51 +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
Magne Sjaastad
f53acbdce2 #2003 Observed Data : Handle STEPTYPE with potentially missing text for first row 2017-11-06 10:53:46 +01:00
Magne Sjaastad
296bacf7f6 #2003 Observed Data : Merge tables if DATE is present and size is equal 2017-11-03 17:44:48 +01:00
Magne Sjaastad
7d3a547ad6 #2003 Observed Data : If YEARX is present, use this as basis for the time step 2017-11-03 17:42:16 +01:00
Magne Sjaastad
f50760bb35 #2003 Observed Data : Add basic support for fixed width in parser 2017-11-03 17:42:16 +01:00
Magne Sjaastad
50b2717ed2 #2003 Move conversion from string to double into RiaStdStringTools 2017-11-03 17:42:16 +01:00
Magne Sjaastad
713998fb38 #2003 Move conversion from string to integer into RiaStdStringTools 2017-11-03 17:42:16 +01:00
Magne Sjaastad
265c0ebb70 #2003 Observed Data : Add file parsing of fixed column width 2017-11-03 17:42:16 +01:00
Magne Sjaastad
f844c6fdb9 Fix invalid assert 2017-11-03 17:42:16 +01:00
Magne Sjaastad
3fa48d175f #2003 Observed Data : Add RiaStdStringTools 2017-11-03 17:42:16 +01:00
Jacob Støren
bf8e4ed4ed #2035 Add constructor for singel branch data with MD to well flow accumulator 2017-11-03 17:13:37 +01:00
Rebecca Cox
c5fd04f3f6 Avoid showing extraction curve name if no fields are set 2017-11-03 15:31:52 +01:00
Rebecca Cox
c638d63dfe #2038 RFT Plot: Do not set form. case when toggliging show Formation off 2017-11-03 15:15:03 +01:00
Rebecca Cox
c8b05fe9ce #2038 RFT Plot: Set default values for formation names 2017-11-03 14:53:00 +01:00
Rebecca Cox
fc4ceeda95 Add branch index accessor 2017-11-03 14:52:15 +01:00
Rebecca Cox
46aa029717 Hide branch field when untoggling "show formations" 2017-11-03 14:14:07 +01:00
Rebecca Cox
312004446b #2002 RFT Plot: Update rftPlot editor on change of track/plot-settings 2017-11-03 13:47:51 +01:00
Rebecca Cox
771c9d62ed #2002 RFT Plot: Move settings and hide track and plot 2017-11-03 13:23:06 +01:00
Rebecca Cox
cac5fa42a5 Fix crash on plot deletion 2017-11-03 13:23:06 +01:00
Rebecca Cox
95f7f40b15 #2002 RFT Plot: Add visible x range and new logic for formations 2017-11-03 13:23:06 +01:00
Rebecca Cox
40b7f99de3 #2002 RFT Plot: Add formation name properties 2017-11-03 13:23:06 +01:00
Rebecca Cox
4da066c2d4 #2002 RFT Plot: Add setters for members used in formation names function 2017-11-03 13:23:06 +01:00
Bjørn Erik Jensen
189a1478eb #2041 Curve calc. Parse expression automatically after creating new calculation 2017-11-03 11:51:51 +01:00
Bjørn Erik Jensen
abcbe963eb #2074 LAS import. Fix LAS file read error on Linux 2017-11-03 11:34:03 +01:00
Jacob Støren
374c6e7b34 #2046 Disable the new advanced branch detection, as it is not always better. Needs some more work. 2017-11-03 09:15:09 +01:00
Jacob Støren
5fcc0432e8 #2046 Partial experimental fix for one-cell-branches 2017-11-03 09:15:09 +01:00
Jacob Støren
7e1831bfa0 #2046 Whitespace cleanup 2017-11-03 09:15:09 +01:00
Jacob Støren
2443199bfd #2046 Clean up 2017-11-03 09:15:09 +01:00
Jacob Støren
20b262043e #2046 Prefer K-negative, K-positive faces when expanding the branchlines.
Add previous cell on stem to start of branch, and use the midface point of the shared face between this and the branching cell as start point for the branch
2017-11-03 09:15:09 +01:00
Jacob Støren
0762a2f08f #2046 Ignore neighbours with small area overlap 2017-11-03 09:15:09 +01:00
Jacob Støren
daeb7c3bdc #2046 Add line from well head to new branches. Handle branch lines with only one cell 2017-11-03 09:15:09 +01:00
Jacob Støren
956b73c0c9 #2046 First nearly working more advanced branch detection 2017-11-03 09:15:09 +01:00
Jacob Støren
f21e27e25b Remove unneccesary code 2017-11-03 09:15:09 +01:00
Bjørn Erik Jensen
383a5c36f6 #2041 Curve calc. Set initial variable name consitently 2017-11-03 08:37:37 +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
Magne Sjaastad
ea53018f54 #2016 Observed Data : Remove well override from reader interface 2017-11-03 07:40:18 +01:00
Magne Sjaastad
7fbc1d23fd #2016 Observed Data : Hide identifier override fields 2017-11-02 19:54:24 +01:00
Magne Sjaastad
b58fd08c8f Unit Tests : Use size_t to avoid warning on Linux 2017-11-02 19:41:20 +01:00
Magne Sjaastad
fee00918e9 #2066 Observed Data : Major rewrite of varying column width parsing
Add TableInfo to hold a table with several ColumnInfo objects
Improved detection of RifEclipseSummaryAddress from all variants
2017-11-02 19:00:27 +01:00
Magne Sjaastad
02cd42aa54 #2066 Add std::string to date parser 2017-11-02 18:56:58 +01:00
Rebecca Cox
8853021403 #2073 WLP: Add PL (Pseudo Length) to depth axis if a simulation well is used as extraction curve or rft curve 2017-11-02 12:32:54 +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
dc93767683 #2076 RFT Plot. Support PRES_FORM las channel name 2017-11-02 11:05:39 +01:00
Bjørn Erik Jensen
5a0bab86a8 #2078 LAS files. Add import las/path to more objects in the tree 2017-11-02 10:24:36 +01:00
Bjørn Erik Jensen
d4c0e98c64 RimWellPath. Minor fix 2017-11-02 10:23:24 +01:00
Bjørn Erik Jensen
3955f29ce3 #2081 LAS import. Display dialog box when reading LAS file with missing or invalid date 2017-11-02 09:30:30 +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
Rebecca Cox
af34f5618e #2079 WLP: Add text "RFT" in legend 2017-11-01 16:19:18 +01:00
Rebecca Cox
99e2fc3570 #2080 WLP: Add text "LAS" in legend 2017-11-01 16:13:39 +01:00
Rebecca Cox
2a8cd9f499 #2080 WLP: Improve Las - file curve legend text 2017-11-01 15:59:27 +01:00
Rebecca Cox
0edbb600e4 Add override keyword 2017-11-01 15:11:14 +01:00
Rebecca Cox
94ecb3a084 Extraction curve: Use QStringList to build curve name 2017-11-01 14:35:53 +01:00
Rebecca Cox
6e3cdb6a77 RFT curve: Change name format to match extraction curve 2017-11-01 14:35:53 +01:00
Rebecca Cox
d645ecbfa4 RFT curve: Detach curve if depth values are invalid 2017-11-01 14:35:53 +01:00
Rebecca Cox
8d388bbd0e Rft curve: Fix first depth value 2017-11-01 14:35:53 +01:00
Rebecca Cox
e40d41fe68 #1845 RFT/PLT Plot: Avoid crash when formation names does not exist 2017-11-01 14:35:53 +01:00
Rebecca Cox
80ee785e5e Extractor: Fix crash when well path does not intersect any cells 2017-11-01 14:35:53 +01:00
Rebecca Cox
35d9935f88 #2038 RFT Plot: make fields readOnly when "Show Formations" is untoggled 2017-11-01 14:35:53 +01:00
Bjørn Erik Jensen
593633cd6e #2071 LAS file. User can set date when LAS file date is invalid or missing 2017-11-01 10:29:03 +01:00
Bjørn Erik Jensen
073225e954 #2021 LAS file. Disable IO for proxy field 2017-11-01 09:32:13 +01:00
Bjørn Erik Jensen
297dfa5b5f #2021 LAS file. Minor improvements 2017-11-01 09:05:36 +01:00
Bjørn Erik Jensen
23536c1dec #2021 LAS file. Drop down for selecting well flow condition. Display date as well 2017-10-31 20:50:53 +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