OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-12 00:16:10 -06:00
Code Issues Packages Projects Releases Wiki Activity
2,991 Commits 29 Branches 61 Tags 290 MiB
4971304bf9
Commit Graph

2263 Commits

Author SHA1 Message Date
Magne Sjaastad
7d83c5a06a Fixed missing update of icons during removeOverrides() 2015-11-02 14:07:05 +01:00
Jacob Støren
562c6ad8ac Adjusted Well Log plots icons to a more soft tone 2015-11-02 13:10:55 +01:00
Magne Sjaastad
c8ffce4491 Renamed UI to "Cell Color Result" 2015-11-02 11:34:03 +01:00
Magne Sjaastad
61665dc7c9 Use updateConnectedEditors instead of a resize 2015-11-02 09:50:45 +01:00
Magne Sjaastad
d61c1ecb93 (#483) Do not show toggle actions for range/property filters 2015-11-02 09:50:45 +01:00
Magne Sjaastad
73489780bf (#483) Improved how filters and filter collections are grayed out 2015-11-02 09:50:44 +01:00
Magne Sjaastad
b10fedb997 (#483) Improved disabled state (gray icon) for range filters/filtercollection 2015-11-02 09:50:43 +01:00
Magne Sjaastad
d9523dbd74 (#578) Disable menu commands in tree view when range/property is overridden 2015-11-02 09:50:42 +01:00
Magne Sjaastad
cb1723494c (578) Disable commands in 3D view if range/property is overridden 2015-11-02 09:50:42 +01:00
Jacob Støren
765c659c7f (#563) Added integration point number in result info text for Geom Cases. 
Also added node coordinates of associated nodes.
 2015-11-02 07:57:33 +01:00
Jacob Støren
f7ebf80e0d (#582) (#488) Cycling all the colors in the default color table, using dark colors first. 
will make equal colors more seldom in a project.
And use a bit less "hard" colors first.
 2015-10-31 23:35:18 +01:00
Jacob Støren
27271c7988 Increased default plot width a bit, to better handle the long curve names 2015-10-31 22:47:37 +01:00
Jacob Støren
4e25673937 Improved code regarding extraction curve creation 2015-10-30 21:39:33 +01:00
Jacob Støren
1148c1167c (#570) Aligning of track top implemented. 
Now using manual layout and external legend.
 2015-10-30 21:39:27 +01:00
Magne Sjaastad
f12684964e Show class names only in Debug configuration 2015-10-30 11:45:55 +01:00
Magne Sjaastad
6c864c5bed (#622) Show warning when hiding LAS curves in TVD plots 
This warning can be disabled from preferences
 2015-10-30 11:42:11 +01:00
Jacob Støren
1b419f3098 Wlp: Removed spacing between plots and the scrollbar 2015-10-30 09:24:04 +01:00
Jacob Støren
1f312f3763 (#616) Reduced scrollbar problem (#570) Only one column of legends. 2015-10-30 09:23:57 +01:00
Magne Sjaastad
07f369f2dd (#595) Fixed invalid behaviour introduced in 4a6e156a68 2015-10-29 14:36:56 +01:00
Jacob Støren
59617a3c43 (#570) Fixed grid alignment 
Is this due to a qwt-bug ?
 2015-10-29 14:15:36 +01:00
Magne Sjaastad
1156da7f03 (#605) Fixed delete of well path to avoid reuse of old data 2015-10-29 13:13:38 +01:00
Magne Sjaastad
f004752aea Remove obsolete includes 2015-10-29 13:13:38 +01:00
Jacob Støren
b6d91f5063 (#623) Keep view position when toggle on/off 2015-10-29 11:55:21 +01:00
Jacob Støren
1fa3c58a2c (#620) Made rangefilter linking always possible. Using mapping when applicable. 
If the mapping is not applicable, we just use the numbers as is.
If the ecl case is inside the geom case, we use the mapping.
Removed initAfterRead on ViewController
 2015-10-29 11:21:08 +01:00
Jacob Støren
21b1e6c6e6 (#592) Fixed autoscale for track move delete toggle 
Also avoid to always do updateConnectedEditors on project when deleting a curve
 2015-10-29 10:29:48 +01:00
Jacob Støren
669bacb2a5 (#621) Fixed crash when toggling a curve in a hidden plot. 
Added missing guard of the Qt pointer
 2015-10-29 09:06:48 +01:00
Jacob Støren
0d41d15fe9 (#592) Refactored and renamed to make ready to fix for Track operations 2015-10-28 17:28:00 +01:00
Jacob Støren
07916f55ce (#592) Plots and tracks are now autoscaled on curve drag, drop, delete, toggled 2015-10-28 16:51:18 +01:00
Magne Sjaastad
bc85ecd6ab Make sure all project windows are closed down as part of closeProject() 2015-10-28 15:30:20 +01:00
Magne Sjaastad
4a6e156a68 (#595) Do not perform value filtering for LAS curves 2015-10-28 15:18:53 +01:00
Magne Sjaastad
09a2579c49 Update icon state for range filters as part of loading project, not from initAfterRead 2015-10-28 12:23:24 +01:00
Magne Sjaastad
ad6e17a5d9 (#596) Refactored name matching for Ascii well path files (dev-files) 
Supported well names are
Well name in quotes
name myWellName
WELLNAME: myWellName
 2015-10-28 11:32:47 +01:00
Magne Sjaastad
56e6fd1f6b (#596) Trim whitespace as first step to fix this issue 2015-10-28 10:28:52 +01:00
Jacob Støren
44463f3a41 Fixed (#583) and improved (#585) and (#592) 
Also a renamed typo allign -> align
 2015-10-28 10:08:34 +01:00
Jacob Støren
0a45354bd9 Tried to improve readability by renaming in the plot classes. 2015-10-28 10:08:28 +01:00
Magne Sjaastad
4a12eecd0c Moved well path commands into separate folder 2015-10-28 10:02:09 +01:00
Magne Sjaastad
331f401b42 Removed usage of obsolete tree model 2015-10-26 11:25:03 +01:00
Magne Sjaastad
7a6c4c06b9 System : Removed unused variables 2015-10-26 11:09:57 +01:00
Magne Sjaastad
04d6933c90 System : Removed unused variable 2015-10-26 10:36:50 +01:00
Magne Sjaastad
ba032020ec System : Assign value directly 2015-10-26 10:29:57 +01:00
Magne Sjaastad
1e9f77274a Minor refactor 2015-10-26 10:18:59 +01:00
Magne Sjaastad
f3f2cf1590 System : Removed unused functions 2015-10-26 10:18:59 +01:00
Magne Sjaastad
bbdb730372 Removed dead code, RimCaseCollection was handled twice 2015-10-26 10:18:58 +01:00
Magne Sjaastad
7d02c794b7 System : Removed elements after unique has been called 2015-10-26 10:18:58 +01:00
Magne Sjaastad
930209f527 System : Added asserts and initialized pointer before calling firstAnchestorOrThisOfType() 2015-10-26 10:18:57 +01:00
Magne Sjaastad
01224dd5e6 System : Removed unused variables 2015-10-26 10:18:57 +01:00
Jacob Støren
14dedf5d4a (591) Only possible to link property filter between same-case-views 2015-10-24 12:27:39 +02:00
Jacob Støren
658849eefc (#584) Linked Views: Use Range filter mapping only when ecl bbox is inside geom bbox 
Set range and propfilter linking default off
 2015-10-24 12:27:34 +02:00
Magne Sjaastad
0405584bb6 System : Replaced tab with four spaces in ApplicationCode and subfolders 2015-10-23 15:46:25 +02:00
Jacob Støren
4de95c2092 (#578) Controlled views: Disabled the range filter commands in the treeview 2015-10-23 14:32:38 +02:00
Jacob Støren
f50f5e3253 (#589) Guarding when dropping a track at a disabled plot 2015-10-23 14:32:33 +02:00
Jacob Støren
1dc03c87fa Rename in RiuDragDrop 2015-10-23 14:32:27 +02:00
Jacob Støren
469c7fa09a WLP: Moved Curve color to the top of "Curve Appearance" 2015-10-23 14:32:22 +02:00
Magne Sjaastad
d022f70248 System : Improved robustness for regression tests 
Clear list of reservoir views to be updated when closing project
Guard for null pointer when evaluating reservoir views for update
 2015-10-23 14:13:14 +02:00
Magne Sjaastad
5a1e244b2a System : Renamed classes and function names relaed to drag and drop 2015-10-23 11:03:23 +02:00
Magne Sjaastad
5b99439ed8 (#573) Added new copy method for PdmObjects 
Added copy method to XmlObjectHandle, and use this method from
PasteEclipseCases
 2015-10-23 09:00:17 +02:00
Jacob Støren
36a0a4a948 (#576) Use timestep also when creating WL extraction curves 2015-10-22 17:14:52 +02:00
Pål Hagen
e9f94fc959 (#467) Moving curves onto a track inserts them in front of existing curves 
Dragging and dropping curves onto a curve appends curves after the given
curve.
 2015-10-22 16:56:10 +02:00
Jacob Støren
b18ae1a14a Fixed crash introduced by b15b23b856 2015-10-22 16:46:58 +02:00
Jacob Støren
b15b23b856 (#540) Removed the Visible Cells Sync from Gui. 
Moved UpateOverrides from init afterRead to OpenProject
 2015-10-22 16:02:28 +02:00
Jacob Støren
44d1aaa3f1 (#540) Range filter matching: Prioritize cell matches with collapsed eclipse cells less. 
To make better matches when one or more corner of the range is in a
collapsed cells area
 2015-10-22 15:34:51 +02:00
Jacob Støren
9d106ec76b (#540) Improved handling range filter endpoints in none match cells 2015-10-22 15:34:46 +02:00
Jacob Støren
e094ca8e91 (#540) Guarding against crash when opening project with range filter override. 2015-10-22 15:34:41 +02:00
Pål Hagen
e32b76b2af (#467) Made sure that track names are updated in source plot after moving tracks 2015-10-22 15:21:44 +02:00
Pål Hagen
e748e25ae1 (#467) Moving tracks onto a plot means insertion in front of existing tracks 2015-10-22 15:17:40 +02:00
Pål Hagen
1c1ceb267b (#467) Drag & drop improvements 
Getting drag items from selection when the drag is started (when the
interface asks for supported drop actions). Using proposed the drop
action along with the drag items to determine if the drag item can be
dropped onto a given target in the flags() method.
 2015-10-22 14:47:51 +02:00
Pål Hagen
52f1e47576 (#579) Removing well log extractors with case references in case destructors 2015-10-22 14:26:54 +02:00
Magne Sjaastad
eb9f909fb1 (#577) Delete assosiated link data when view is deleted 
When a link master view is deleted, all linked view data is deleted
 2015-10-22 11:41:36 +02:00
Pål Hagen
272c328da3 (#579) Removing cached well log extractors when deleting cases and well paths 
Cached well log extractors with references to well paths or cases to be
deleted are removed before deletion.
 2015-10-22 11:31:34 +02:00
Magne Sjaastad
6e0c6b89b1 (#565) Fixed invalid guarding of index when calculating well pipe visibility 
Reverts two previous commits cfc8c72137
and 7c8fe47683
 2015-10-22 10:39:36 +02:00
Pål Hagen
6747fe5976 (#467) Drag & drop improvements. Keeping track of the items being dragged. 2015-10-21 17:21:56 +02:00
Magne Sjaastad
b046ca0769 Minor compilation issues cleanup 2015-10-21 14:49:20 +02:00
Magne Sjaastad
ff1a1576a0 (#539) Make range filters readonly if an override range filter collection is active 2015-10-21 14:22:51 +02:00
Magne Sjaastad
dbd6ce09c5 (#539) Check for NULL pointer when deciding what kind of range filter collection to use 
As the management of override range filter collection is handled
independenly from scheduleRedraw, we must check for a valid pointer when
trying to access the override range filter
 2015-10-21 13:32:10 +02:00
Magne Sjaastad
4b95f2b807 (#539) Prevent context menu events to be propagated to parent 
When a context menu is created in the viewer is, and the action
triggered is displaying a dialog,
the context menu of QMainWindow is displayed after the action has
finished
Setting this policy will make sure the handling is not deferred to the
widget's parent,
which solves the problem - Qt::PreventContextMenu
 2015-10-21 13:16:09 +02:00
Magne Sjaastad
8de8100c3e (#539) When view is unlinked, ask user to keep either override or original range filter collection 2015-10-21 13:16:09 +02:00
Jacob Støren
065a688c19 Fixed crash on every case loaded 2015-10-21 12:21:08 +02:00
Jacob Støren
00b56b7440 (#540) Range filter mapping now works fem->ecl and opposite. 
We need to test more, but now it is getting there.
 2015-10-21 10:04:00 +02:00
Jacob Støren
53826f4966 (#540) Wip: Preparing to Extract range endpoint calculation 
We neeed to clamp fem range to the extents of the ecl grid within the
fem grid before trying to map fem to ecl. So we need to refactor a bit.
 2015-10-21 08:21:16 +02:00
Jacob Støren
58363dbcf9 (#540) Wip: Range filter mapping alive! Needs more adjustments. 
Fem to Ecl is not perfect.
 2015-10-20 17:41:36 +02:00
Pål Hagen
8e3e3dd547 Removed out-commented code 2015-10-20 15:27:27 +02:00
Pål Hagen
e2eaf5f1a3 (#467) Implemented drag & drop for moving tracks after drop target track 2015-10-20 12:25:18 +02:00
Jacob Støren
32d49e4ba3 (#574) Fixed assert when creating eclipse curve 2015-10-20 12:19:41 +02:00
Jacob Storen
b5bb62ed0a Linux compile fixes 2015-10-20 02:48:07 -07:00
Jacob Støren
8b894d8515 (#540) Override range filter update system improved 
Rename of forgotten viewLink ->viewController
Remember to update group of linked views before adding a new dependent view.
 2015-10-20 11:15:30 +02:00
Jacob Støren
4fc0553451 (#540) Added interface for fem to ecl range filter mapping as well. 2015-10-20 11:15:26 +02:00
Jacob Støren
a5ef83a2ee (#540) WIP: Split the rangefilter mapping code into files 
Preparing for assembling it all.
 2015-10-20 11:15:21 +02:00
Jacob Støren
c023bc9b2a (#540) WIP: Implemented use of arbitrary exact match diagonal in range filter mapping. 
Now we are ready to start testing.
 2015-10-20 11:15:16 +02:00
Jacob Støren
db4e637e76 Constified some methods in FemPart. WIP range filter mapping first untested code. 2015-10-20 11:15:12 +02:00
Pål Hagen
20b7ee9aa5 (#505) Changed context menu text 
"Add To New Plot" instead of "Add To Plot"
 2015-10-19 15:25:16 +02:00
Pål Hagen
31a70b669d (#467) Made sure that only move, not copy, is handled for curves and tracks 2015-10-19 14:55:52 +02:00
Pål Hagen
7e1ef99146 Using const ref parameter 2015-10-19 14:50:01 +02:00
Pål Hagen
344e7679d7 Refactored code that moves cases to a grid case group by drag & drop 2015-10-19 14:48:03 +02:00
Pål Hagen
8a3c2c4c38 (#467) Refactoring - added helper class to simplify the drag & drop code 2015-10-19 14:29:28 +02:00
Pål Hagen
36f2229b5b (#467) Postponing updates until all tracks have been moved to a plot 2015-10-19 14:07:06 +02:00
Pål Hagen
b2e04b47d9 (#467) Performing updates of track after all curves have been moved 2015-10-19 14:02:39 +02:00
Pål Hagen
2893b29bbc (#467) Implemented drag & drop for moving tracks between plots 2015-10-19 13:57:41 +02:00
Magne Sjaastad
ab0e3819a1 (#539) Added framework for update of range filter based on master 
Propagate pointer to a range filter if only a single filter is modified
Moved lifetime management of range filter collection to RimView
 2015-10-19 12:10:28 +02:00
Pål Hagen
1c3e9d8751 (#467) Implemented drag & drop for moving curves between tracks 2015-10-19 12:07:17 +02:00
Pål Hagen
3a01fe0782 (#467) Implemented tree view drag & drop of LAS file well log channels to plot tracks 
Did some refactoring/cleanup of existing drag & drop code to make it
easier to add drag & drop for other item types.
 2015-10-16 16:58:49 +02:00
Pål Hagen
8e682926c6 Removed comments 2015-10-16 14:05:12 +02:00
Pål Hagen
1dc0da7a37 (#541) Using common value for absent values (-999.25, -9999.25, etc.) 2015-10-16 13:57:34 +02:00
Pål Hagen
aa1493fcb9 (#541) Exporting date to LAS file 2015-10-16 13:37:31 +02:00
Pål Hagen
0a7e971577 Added access method for the timestep string (date) 2015-10-16 13:33:35 +02:00
Pål Hagen
3ecd6d8da7 (#541) Exporting well name as part of well info to LAS file 2015-10-16 11:15:04 +02:00
Pål Hagen
7b14306b5b (#541) Use "Depth in meters" as parameter description for DEPTH 2015-10-16 10:07:56 +02:00
Pål Hagen
27a6775e3c (#541) Change multiple "_" in default export file name to one 2015-10-16 10:06:45 +02:00
Magne Sjaastad
a7b3950c6b Make sure the view linker is expanded after a link operation 2015-10-16 09:20:41 +02:00
Jacob Støren
08d1031f7f Fixed Missing rename after merge 2015-10-15 23:29:30 +02:00
Jacob Støren
5d642719b7 (#557, #560, #561) WLP: Massive renaming in WellLogCurveData. Fixed undiscovered bug. 
Curves plotted by TVD was not correctly splitted where well path went out in free air.
 2015-10-15 23:21:31 +02:00
Pål Hagen
3683dc95cd (#541) Setting depth range for export from the curve's raw data, not the plot curve's data 2015-10-15 16:31:11 +02:00
Pål Hagen
2dd1e98f81 (#541) Setting version info, start and stop depths, and depth unit, when exporting to LAS 2015-10-15 16:12:22 +02:00
Pål Hagen
68ad675a45 (#541) Using curve name as default file name for LAS in file save dialog 2015-10-15 14:39:53 +02:00
Pål Hagen
f8c725e2b8 (#541) Using result name as well log channel name when exporting to LAS 2015-10-15 14:37:57 +02:00
Jacob Støren
707ddf15d7 (#540) Started to make single-cell best-match 2015-10-15 13:41:51 +02:00
Jacob Støren
36339f1001 (#522) Changed the Import Well Log Curve icon 2015-10-15 13:41:47 +02:00
Jacob Støren
fa375381d1 WLP: Added spaces to curve-auto-names to make them more readable 2015-10-15 13:41:43 +02:00
Jacob Støren
a11d82d57e (#522) Added a Las-File Icon in the tree 2015-10-15 13:41:39 +02:00
Jacob Støren
1782fac724 (#521, #522) New icons on Plot related stuff. 
The curve icon does not show up for some reason.
 2015-10-15 13:41:34 +02:00
Jacob Støren
ee96d1b2ee (#521, #522) Added new icon files 2015-10-15 13:41:30 +02:00
Pål Hagen
956beba118 Moved remaining code from RimWellLogCurveImpl to RigWellLogCurveData 
Removed class RimWellLogCurveImpl.
RigWellLogCurveData::calculateValidPointsIntervals() needs to be
harmonized with new way of extracting depths from well paths.
 2015-10-15 13:29:45 +02:00
Pål Hagen
c2577391c2 Linux compilation fix. 
friend -> friend class
 2015-10-15 12:53:20 +02:00
Pål Hagen
10c5b37122 Updated unit tests 
Using RigWellLogCurveData instead of RimWellLogCurveImpl. Added test
interface which has access to private methods in RigWellLogCurveData.
RimWellLogCurveImpl should probably be removed when correct filtering of
curve segments based on depths is up & running.
 2015-10-15 12:41:12 +02:00
Pål Hagen
d74b4333f2 (#541) Renamed some methods and variables 2015-10-15 12:01:47 +02:00
Pål Hagen
a173694542 Linux compilation fix. 2015-10-15 11:32:09 +02:00
Pål Hagen
08573be64b (#541) Added feature for export of well log plot curves to a LAS file 
Did some refactoring/improvements by introducing new class
RigWellLogCurveData.
 2015-10-15 11:27:12 +02:00
Jacob Storen
10046eed4a Linux fixes 2015-10-14 07:13:45 -07:00
Jacob Storen
021de1444d Linux compile fix 2015-10-14 06:57:11 -07:00
Jacob Støren
b2f4f64aca Well Log extraction: Cleaning up a bit 2015-10-14 15:20:50 +02:00
Jacob Støren
21b313f945 (#557, #560, #561) WLP: Guaranteed Pairwise ordering of intersections 
and endpoint handling.  Now discarding out-of-pair points.
Added well name and case in error message.
 2015-10-14 15:20:46 +02:00
Jacob Støren
d004d14acc (#557, #560, #561) WLP: Rename of map keys 2015-10-14 15:20:42 +02:00
Jacob Støren
a0cccc93cb (#557, #560, #561) WLP: POR results are now undefined in C3D8 elements 2015-10-14 15:20:38 +02:00
Jacob Støren
33aed754d9 (#557, #560, #561) WLP: White space cleanup 2015-10-14 15:20:34 +02:00
Jacob Støren
9fa2395fdc (#557, #560, #561) WLP: Aligned intresection map insertion code Geom/Eclipse 2015-10-14 15:20:31 +02:00
Jacob Støren
8d2fee9bf4 #557, #560, #561) WLP: Allign WL-extraction code Geom-Eclipse 2015-10-14 15:20:27 +02:00
Jacob Støren
4c73b31919 (#557, #560, #561) WLP: Using same code in Geomech WL-extraction 2015-10-14 15:20:23 +02:00
Jacob Støren
0bc4ed9b06 (#557, #560, #561) WLP: Moved intersection cleanup code to baseclass 2015-10-14 15:20:19 +02:00
Jacob Støren
fdaa25a286 (#557, #560, #561) WLP: Added scoping to make ready for a separate function 2015-10-14 15:20:16 +02:00
Jacob Støren
6014312056 (#557, #560, #561) WLP: Started to return a cleaner intersection list from the extractor. 
Created a common baseclass to be able to use same intersection cleanup code.
 2015-10-14 15:20:12 +02:00
Magne Sjaastad
59027a1f2e (#566) Do not write or read "no common area NNCs" as they are always computed 2015-10-14 13:23:54 +02:00
Pål Hagen
1253247481 (#567) Made sure that WLP auto curve name works for geo mech models too 2015-10-13 16:16:14 +02:00
Magne Sjaastad
67a62f4f02 Renamed RimViewLink to RimViewController 2015-10-13 10:24:39 +02:00
Pål Hagen
fac6252d01 Renamed impl class/files 2015-10-12 15:04:21 +02:00
Pål Hagen
ba879f0c34 Renamed method 2015-10-12 15:00:40 +02:00
Pål Hagen
507c30b93f (#545) Handling "NULL"/absent values in LAS files 
Converting to absent values to HUGE_VAL when reading from LAS file.
Splitting into multiple curves when plotting.
 2015-10-12 14:50:32 +02:00
Jacob Støren
36d2bb224c (#542) Fixed several project-open crashes related to missing files. 
Added errormessage on missing wellpath file
 2015-10-12 12:41:02 +02:00
Pål Hagen
6b8e51ca87 (#558) Made sure that TVD values are positive for geo mech models 2015-10-12 10:33:36 +02:00
Pål Hagen
1132a0db5e (#558) Added support for TVD/MD switch for curve data extracted from geo mech models 
This was handled just for Eclipse models.
 2015-10-12 10:31:17 +02:00
Magne Sjaastad
6e67c61f28 Linux fix 2015-10-05 18:41:22 +02:00
Magne Sjaastad
c8ec321caf (#561) Do not remove duplicate depth values 
Filtering of depth values does not work as expected, disabled for now.
 2015-10-05 18:37:58 +02:00