Commit Graph

2331 Commits

Author SHA1 Message Date
Jacob Støren
9946df4071 (#166) WIP: Added cell border line code. 2015-11-18 15:29:10 +01:00
Jacob Støren
4f40b3de1f (#166) Test code commented out of EclipseView 2015-11-18 11:52:31 +01:00
Jacob Støren
40713a3c84 (#166) Added clipping of the clipped cells, with fixes of errors. 2015-11-18 11:52:27 +01:00
Jacob Støren
5840f165ea Added an interface to retreive the simulation well centerline 2015-11-18 11:52:23 +01:00
Jacob Støren
57f7c1229a (#166) WIP: First visible section with hacks 2015-11-18 11:52:19 +01:00
Jacob Støren
7845d9bd3c (#166) WIP: Preliminary cross section geometry builder ready for testing 2015-11-18 11:52:16 +01:00
Jacob Støren
cfefddac09 (#166) WIP: Preliminary geometry functions starting to get in place 2015-11-18 11:52:12 +01:00
Jacob Støren
4b9312ff74 Adjusted comment 2015-11-18 11:52:08 +01:00
Magne Sjaastad
ecba44d7c8 Use correct type in loop 2015-11-17 17:04:49 +01:00
Magne Sjaastad
cf38d1e6fe (#266) Use application font for performance 2015-11-17 17:00:12 +01:00
Magne Sjaastad
3c1b549064 (#266) Fixed issue for labels disappearing for white background
DrawableText::labelAnchorVisible hides all labels if the background is
set to white
2015-11-17 16:58:37 +01:00
Magne Sjaastad
08c04f5052 (#656) Added text effect to effect generator 2015-11-17 16:26:07 +01:00
Magne Sjaastad
4469d32a2d Fixed Linux issues 2015-11-17 05:00:35 -08:00
Magne Sjaastad
031ca38a53 (#266) No depth test for legend lines 2015-11-17 13:19:28 +01:00
Magne Sjaastad
518ce2d2a7 (#266) Default no grid box 2015-11-17 13:19:23 +01:00
Magne Sjaastad
9a672eccad (#266) Use static model interface for static geometry 2015-11-17 13:19:19 +01:00
Magne Sjaastad
96acc1e75d (#266) Improved label display 2015-11-17 13:19:12 +01:00
Magne Sjaastad
d9044e2e7b (#266) Expand bounding box to get some space between model and grid box 2015-11-17 13:19:07 +01:00
Magne Sjaastad
401cfe81a1 (#266) Refactoring
Limit usage of RivGridBoxGenerator to only RiuViewer
Update colors of grid box based on background color
Use dark gray instead of pure black
2015-11-17 13:19:04 +01:00
Magne Sjaastad
a7656e2367 (#266) Added edge visibility calculation for when to show legend 2015-11-17 13:18:59 +01:00
Magne Sjaastad
2c1b960251 (#266) Update grid box model in optimizeClippingPlanes 2015-11-17 13:18:54 +01:00
Magne Sjaastad
019c35540d (#266) Added showGridBox to RimView 2015-11-17 13:18:49 +01:00
Magne Sjaastad
3bc7b88ca7 (#266) Create parts from selection in derived classes of RimView 2015-11-17 13:18:45 +01:00
Magne Sjaastad
d72861f929 (#266) Show highlight viz models in overlay rendering 2015-11-17 13:18:39 +01:00
Magne Sjaastad
121ee80295 (#266) Cleaned up access to boundingBox 2015-11-17 13:18:27 +01:00
Magne Sjaastad
bca5720968 (#266) Added interface for all/activeCellsBoundingBox and displayModelOffset 2015-11-17 13:18:05 +01:00
Magne Sjaastad
7ff7f42adc (#266) Added geometry for grid box faces
Added legend lines and text
2015-11-17 13:11:54 +01:00
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
d8ea2816c3 (#647) Made the width of 3dinfo box minimum 275 wide 2015-11-11 17:42:30 +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
6f4a4e16c6 (#638) Changed title to "Result Plot" and renamed files 2015-11-11 14:07:21 +01:00
Magne Sjaastad
6063ca1b54 (#646) Show selected cells in geo mech view 2015-11-11 13:38:54 +01:00
Magne Sjaastad
a13376a8bf (#632) Update application items when selection changes using a separate class
Added RiuSelectionChangedHandler
Moved code from ViewerCommands into SelectionChangedHandler
2015-11-11 11:41:11 +01:00
Magne Sjaastad
ff6ea6cf0b Fixed include Linux 2015-11-10 11:32:52 +01:00
Magne Sjaastad
a584bcfdf6 Removed unused functions and variables 2015-11-10 11:11:13 +01:00
Magne Sjaastad
e64f943e4c Fixed includes on Linux 2015-11-10 01:53:24 -08:00
Magne Sjaastad
17493070ac (#632) Improved colors used for selection and time history curves 2015-11-10 09:43:56 +01:00
Magne Sjaastad
2f70abb90d (#632) Minimum widget size of time history plot is set to zero 2015-11-10 09:06:44 +01:00
Magne Sjaastad
f05385129b (#632) Single click on cell gives single cell selection for curves, CTRL + click appends 2015-11-10 08:58:17 +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
Magne Sjaastad
963220dd37 (#632) Added support for creation of mesh part from a single cell 2015-11-09 19:05:31 +01:00
Magne Sjaastad
516c120313 (#632) Added selection manager for items in 3D view 2015-11-09 19:05:30 +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
67abe959db (#606) Made each node-result count only once 2015-11-06 13:24:45 +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
2adb9279ce (#612) Added grid to QwtPlot 2015-11-06 10:19:18 +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
Magne Sjaastad
cef31b2c4a (#612) Make sure time step dates are taken from scalar dataset with highest time step count 2015-11-05 14:12:49 +01:00
Magne Sjaastad
e3d76be0aa (#612) Improved user interaction for adding/deleting curves
When time hist plot is visible,
CTRL + mouse click on a cell adds curve to plot
Mouse click outside clears curve plot
2015-11-05 13:48:10 +01:00
Magne Sjaastad
ff6e2755aa Added time history plot for geo mech models 2015-11-05 13:48:10 +01:00
Magne Sjaastad
b30604edd1 Rename 2015-11-05 13:48:09 +01:00
Magne Sjaastad
7db6835075 (#612) Append new curves on cell click, clear when no cell is hit 2015-11-05 13:48:09 +01:00
Magne Sjaastad
0011f090de (#612) Time history result accessor and display of curve from selection 2015-11-05 13:48:08 +01:00
Magne Sjaastad
30adb2661e (#612) Added time history plot as a dockwidget 2015-11-05 13:48:07 +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
b64d34c791 Rename of StatCalc classes 2015-11-04 15:53:21 +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
Jacob Støren
5c9e263195 Updated license information. Added Qwt and NRLib 2015-11-03 11:29:57 +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
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