Commit Graph

1212 Commits

Author SHA1 Message Date
Jacob Støren
83d1c0c411 (#648) Fixed missing update of total cell visibility 2015-11-12 12:24:05 +01:00
Jacob Støren
8283f6665b (#625) Guard against All Timesteps Visible cells statistics when using dyn prop filter 2015-11-12 11:53:22 +01:00
Jacob Støren
7b65cb91ce (#625) Added access to the generalized propertyFilterCollection in the view 2015-11-12 10:48:13 +01:00
Jacob Støren
8b8fd51862 Created baseclass for PropertyFilterCollections 2015-11-12 10:24:21 +01:00
Jacob Støren
a57b27b6c0 (#643) (#642) Overhauled the 3D info panel. New option. Better layout. 2015-11-11 17:44:00 +01:00
Jacob Støren
adc777083d (#642) Date in animation progress.
Not removed from Info text yet
2015-11-11 16:22:44 +01:00
Magne Sjaastad
6063ca1b54 (#646) Show selected cells in geo mech view 2015-11-11 13:38:54 +01:00
Magne Sjaastad
a584bcfdf6 Removed unused functions and variables 2015-11-10 11:11:13 +01:00
Magne Sjaastad
7cd2cd0f50 (#632) Add Eclipse cell to selection and show in 3D view and time history plot
Consolidated remove of model based on name in RimView
Cleanup selection and time history plot when project is closed
2015-11-09 19:05:31 +01:00
Jacob Støren
4f05c0d6b9 (#606) (#607) Added eclipse stats for visible cells 2015-11-06 13:24:48 +01:00
Jacob Støren
0bd4f4a8f9 (#606) (#607) Calculate visible cells statistics for geomech
Refactored some in 3D info regarding geomech cases.
2015-11-06 13:24:43 +01:00
Magne Sjaastad
ab3c5c029a Refactored RiuLineSegmnetQwtPlotCurve
Removed domain specific code
Created RigCurveDataTools
Use symbol to draw single values
2015-11-06 10:08:35 +01:00
Magne Sjaastad
3c00a8394d Refactored and renamed to RuiLineSegmentQwtPlotCurve 2015-11-06 08:32:58 +01:00
Jacob Støren
4388f39175 Renamed files PlotCurve->Curve 2015-11-04 16:22:53 +01:00
Jacob Støren
7b7ecf2f26 Renamed PlotCurve -> Curve 2015-11-04 16:19:38 +01:00
Jacob Støren
10582750ab Renamed files PlotTrack/TrackPlot -> Track 2015-11-04 16:14:42 +01:00
Jacob Støren
f77a92a77b Rename TrackPlot/PlotTrack classes to Track 2015-11-04 15:57:06 +01:00
Jacob Støren
a4d7e369eb (#606)(#607) Added option to show 3D-info statistics pr. time step. 2015-11-04 15:44:09 +01:00
Jacob Støren
738af9c88e (#606)(#607) Added gui for the statistics control. Started refactoring
Refactoring to access pr timestep data from the statistics calculation.
2015-11-04 12:51:55 +01:00
Magne Sjaastad
764f26c20c Improved text when unlinking range filters 2015-11-03 09:55:28 +01:00
Magne Sjaastad
7d83c5a06a Fixed missing update of icons during removeOverrides() 2015-11-02 14:07:05 +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
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
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
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
Magne Sjaastad
1156da7f03 (#605) Fixed delete of well path to avoid reuse of old data 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
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
ba032020ec System : Assign value directly 2015-10-26 10:29:57 +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
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
f50f5e3253 (#589) Guarding when dropping a track at a disabled plot 2015-10-23 14:32:33 +02:00
Jacob Støren
469c7fa09a WLP: Moved Curve color to the top of "Curve Appearance" 2015-10-23 14:32:22 +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
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
e094ca8e91 (#540) Guarding against crash when opening project with range filter override. 2015-10-22 15:34:41 +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
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
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
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
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
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
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
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
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
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
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
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
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 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
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
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
Magne Sjaastad
05a71b79c9 Linux fixes 2015-10-05 17:36:19 +02:00
Magne Sjaastad
63d401b6e6 Added unit test to Testing menu
Launch of unit tests (gtests) is also possible from command line
parameter "unittest"
2015-10-05 16:09:51 +02:00
Magne Sjaastad
f4cfc51de2 (#561) Moved static methods to separate file 2015-10-05 13:29:30 +02:00
Jacob Støren
e74098d7ca (#553) Fixed. Now the CreatDisplayModel sets timestep without firing signals
from the AnimationController.
2015-09-28 20:43:55 +02:00
Jacob Støren
5d04655d6a (#520)(#503) Made sure the Overridden cells actually overrides always. 2015-09-28 10:05:20 +02:00
Jacob Støren
56dae7f71a (#550) Fixed by reverting commit ca0fd4d9fe
The simplified check for results present was not good enough.
As we no longer do processEvents during progressbar, it should be ok to
reintroduce the assertResultsLoaded test.
2015-09-27 19:32:55 +02:00
Jacob Støren
cd13fc5aee (#405) Added [Bar] to legend title when showing SE, ST and POR 2015-09-26 10:00:03 +02:00
Jacob Støren
276addc713 (#405) Convert POR, SE, and ST to Bar. Fixed issues regarding property filters.
Result fields without component had an extra space in the option value string
that made the search for the option in the option list fail.
2015-09-26 09:38:29 +02:00
Pål Hagen
aa36a3f5e6 Moved static method to the class where it belongs (more than it did). 2015-09-25 18:14:25 +02:00
Pål Hagen
803cc4328d (#548) Adding only well paths with LAS files to property editor for curves 2015-09-25 18:04:10 +02:00
Pål Hagen
4a53b318f7 (#506) Updating view name in view linker in project tree view when a view's name is changed 2015-09-25 16:39:19 +02:00
Magne Sjaastad
061288f1c3 (#495) Removed use of StdInclude 2015-09-25 15:57:50 +02:00
Jacob Støren
ecc69e7a1a Linked Views: Validation and changes on update system for ViewController 2015-09-25 15:24:29 +02:00
Jacob Støren
c370c7cb02 View Linker: Remove child array entry after deletion to have a valid datastructure through destruction. 2015-09-25 15:24:27 +02:00
Jacob Støren
c065d625e2 (#483) Linked Views: Acknowledge visible cells override when disabling tree items
(Filter items)
2015-09-25 15:24:24 +02:00
Jacob Støren
03c788db6a Linked Views: isActive() as access method. doSync methots renamed to update
and changed the meaning accordingly.
2015-09-25 15:24:19 +02:00
Magne Sjaastad
1933bbeb84 (#496) Use system macro for init of abstract PDM classes
Removed project specific macro
2015-09-25 15:09:34 +02:00
Pål Hagen
d8acb9d1bc (#528) Using case and current result from active view when adding new curve 2015-09-25 14:35:30 +02:00
Pål Hagen
4e3f51909b (#537) Handling LAS file names no matter what case the extension has
.las, .LAS, .Las, .laS, etc. should now all work.
2015-09-25 11:56:14 +02:00
Magne Sjaastad
4424c110be Transformed static functions from ViewLinker to dynamic functions in RimView 2015-09-25 11:17:51 +02:00
Pål Hagen
034a78ae0c (#534) Made sure that curve name options are ordered correctly
Same order as they appear in the generated curve name.
2015-09-25 10:50:44 +02:00
Pål Hagen
285cd6ccea (#535) Added field for toggling of date in curve name
Date is on by default, time step is off.
2015-09-25 10:44:35 +02:00
Jacob Støren
c79a01f3b9 Linked Views: created access methods for viewController settings
The access methods now respects the active settings on both the ViewController
and the Toplevel.
2015-09-25 09:39:42 +02:00
Jacob Støren
8c63f4963b (#513) Minor rename 2015-09-25 09:16:14 +02:00
Jacob Støren
efe5951222 Linked Views: Refactoring ViewController
Consolidating update responsibilities.
Renaming
2015-09-24 17:43:14 +02:00
Jacob Støren
d83d9e967b Linked Views: Refactored and cleaned up more. Refactored some features. 2015-09-24 17:43:12 +02:00
Jacob Støren
5e0505dfe8 Renaming and cleanup in ViewLinker and friends 2015-09-24 17:43:09 +02:00
Pål Hagen
ae42845f35 (#533) Using "," instead of "|" as separator in curve names 2015-09-24 16:19:32 +02:00
Pål Hagen
1a6aa58711 (#524) God rid of "Copy" for multiple selections in the project tree view
Copy used to be always available for multiple selections, for some
reason.
2015-09-24 15:36:36 +02:00
Pål Hagen
895a16f43f (#526) Additional fix for filtering of infinite values in extraction curves 2015-09-24 14:04:08 +02:00
Pål Hagen
ff073f50fa (#526) Fixed problem with finding intervals for extraction curves
Infinite values from well log curve extraction should never appear for
points that are filtered for plotting. Did some refactoring/code
cleanup.
2015-09-24 13:36:38 +02:00
Pål Hagen
529b68e073 (#537) (#515) Showing error messages from LAS file open exceptions 2015-09-24 10:08:45 +02:00
Pål Hagen
5d18209e26 (#537) Showing error message box if opening a LAS file fails 2015-09-24 09:37:26 +02:00
Magne Sjaastad
71e74599ff (#483) Gray out overridden range and property collections 2015-09-23 14:35:35 +02:00
Magne Sjaastad
4ee8929d91 (#483) Gray out icon for overridden cell results 2015-09-23 13:48:25 +02:00
Magne Sjaastad
af75f513f9 Several minor refactoring and cleanup 2015-09-23 12:50:06 +02:00
Magne Sjaastad
9a840b9243 (#509) Added missing create display model 2015-09-23 12:49:09 +02:00
Magne Sjaastad
942c0a20b7 Moved camera update from RimView to RimViewLinker 2015-09-23 12:23:21 +02:00
Magne Sjaastad
c8944d8801 Refactored funtions used to find viewLinker and viewLink 2015-09-23 11:01:46 +02:00
Jacob Støren
3b98d77324 (#517) Fixed crash due to direct call to CreateDisplayModelAndUpdate
But there are ore ...
2015-09-22 21:00:50 +02:00
Pål Hagen
3938e65c7b (#511) Updating well log plot icon when toggling visibility 2015-09-22 16:09:25 +02:00
Pål Hagen
f745e483c7 (#507) Updating curve name only if "auto name" is set 2015-09-22 15:45:58 +02:00
Magne Sjaastad
2c8ac1541d (#500) Use space to indent auto name properties 2015-09-22 15:36:14 +02:00
Magne Sjaastad
b481699cc2 (#500) Improved curve data property panel
Show curve data group first
Hide auto name properties when custom name is defined
2015-09-22 15:24:11 +02:00
Pål Hagen
81b973a74c (#507) Picking unit name from LAS file in curve's update method 2015-09-22 15:12:33 +02:00
Pål Hagen
239d682956 (#514) Added missing "view link" command features to context menu in project tree view 2015-09-22 14:34:26 +02:00
Pål Hagen
430ea86962 (#505) Added context menu item for creation of well log extraction curve 2015-09-22 12:29:14 +02:00
Magne Sjaastad
b45e571888 (#504) Do not use autoscale for x-axis - simplified track/plot update code 2015-09-22 11:55:21 +02:00
Magne Sjaastad
7ded798055 (#504) Move common code to base class 2015-09-22 11:55:21 +02:00
Pål Hagen
f49c7fc983 (#505) Added context menu item for creation of cure from LAS data for well paths 2015-09-22 10:52:28 +02:00
Jacob Støren
a0dabca6ed (#401) Updated sensitivity and GUI of ViewLink to reflect the visible cells possibilities 2015-09-21 18:54:41 +02:00
Jacob Støren
7cf61eb636 Added update of icon when changing master view 2015-09-21 18:54:39 +02:00
Jacob Støren
eb3cf20263 Avoid repeatedly resetting the view 2015-09-21 18:54:37 +02:00
Jacob Støren
31b5b2e568 Moved setting of default view to after we know the geometry is generated. 2015-09-21 18:54:33 +02:00
Jacob Støren
a2dc6628ad (#401) Fixed result coloring of cells/fault geometry part of cells.
And visibility of fault part of overridden visible cells
2015-09-21 18:54:31 +02:00
Jacob Støren
7abfd51b91 Fix: Schedule Property filter regen. and not Range filtered.
when asked to do Property filter.
2015-09-21 18:54:27 +02:00
Jacob Støren
fa5be6a5e4 Guard against updating geomech legend when no data is loaded. 2015-09-21 18:54:24 +02:00
Magne Sjaastad
2b7d7be3f1 (#499) Added a custom track delete feature
Added infrastructure needed to delete track from plot and plot
collection
2015-09-21 15:55:55 +02:00