Commit Graph

534 Commits

Author SHA1 Message Date
Magne Sjaastad
96acc1e75d (#266) Improved label display 2015-11-17 13:19:12 +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
2c1b960251 (#266) Update grid box model in optimizeClippingPlanes 2015-11-17 13:18:54 +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
7b65cb91ce (#625) Added access to the generalized propertyFilterCollection in the view 2015-11-12 10:48:13 +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
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
a584bcfdf6 Removed unused functions and variables 2015-11-10 11:11:13 +01: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
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
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
Magne Sjaastad
61665dc7c9 Use updateConnectedEditors instead of a resize 2015-11-02 09:50:45 +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
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
1148c1167c (#570) Aligning of track top implemented.
Now using manual layout and external legend.
2015-10-30 21:39:27 +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
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
f004752aea Remove obsolete includes 2015-10-29 13:13:38 +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
Jacob Støren
0a45354bd9 Tried to improve readability by renaming in the plot classes. 2015-10-28 10:08:28 +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
f3f2cf1590 System : Removed unused functions 2015-10-26 10:18:59 +01: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
1dc03c87fa Rename in RiuDragDrop 2015-10-23 14:32:27 +02:00
Magne Sjaastad
5a1e244b2a System : Renamed classes and function names relaed to drag and drop 2015-10-23 11:03:23 +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
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
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
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
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
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
2893b29bbc (#467) Implemented drag & drop for moving tracks between plots 2015-10-19 13:57:41 +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
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
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
Magne Sjaastad
67a62f4f02 Renamed RimViewLink to RimViewController 2015-10-13 10:24:39 +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
Pål Hagen
9830522745 (#546) Check if they should be enabled before adding well path related context menu items 2015-09-25 17:10:17 +02:00
Magne Sjaastad
061288f1c3 (#495) Removed use of StdInclude 2015-09-25 15:57:50 +02:00
Jacob Støren
5b9bf3bcd2 (#518) Removed link visible views from 3DView context menu
Modified the command enabled state to be enabled only when it is sensible to run it.
(Unlinked views is present.)
2015-09-25 15:24:32 +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
b151200ffc (#466) A curve must be selected no further than 20 pixels away
If the selection point is more than 20 pixels away from any curve's
points, the track is selected instead.
2015-09-25 10:25:44 +02:00
Magne Sjaastad
cc62e93d45 (#452) Fixed switching of MDI windows 2015-09-24 17:17:28 +02:00
Pål Hagen
dc898d92f9 (#466) Curve selection on LMB released instead of pressed 2015-09-24 15:27:33 +02:00
Pål Hagen
1e5b489133 (#466) Selection of curve only on LMB pressed
Made sure that the selection is not done on both left mouse button
pressed and released.
2015-09-24 15:09:19 +02:00
Magne Sjaastad
af75f513f9 Several minor refactoring and cleanup 2015-09-23 12:50:06 +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
Magne Sjaastad
9d03120afa (#512) Fixed missing time step texts for geomech case
Bug introduced in 06e8bc2ec5
2015-09-22 16:00:56 +02:00
Pål Hagen
759302b370 (#446) Added "Link Visible Views" to 3D context menu 2015-09-22 14:26:23 +02:00
Pål Hagen
ae1cc96979 (#501) "Link view" context menu items only visible when clicking the background 2015-09-22 13:34:43 +02:00
Pål Hagen
ff1f7b24b5 (#468) Showing well log plot context menu items only when a well path is picked 2015-09-22 13:14:08 +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
Pål Hagen
75dc7376ad (#404) Selecting well path in the tree view when picked in the 3D view
Added method for setting selection based on the picked part.
2015-09-22 10:30:11 +02:00
Pål Hagen
be29a06883 (#501) Always displaying well log curve creation commands in the context menu
The command feature system handles enabled/disabled state.
2015-09-22 10:02:03 +02:00
Magne Sjaastad
ef87f63b63 (#502) Reduce size of plot window when track is deleted 2015-09-22 09:50:29 +02:00
Pål Hagen
0daaba58a4 (#501) Made sure that "link view" items in the context menu don't need hit info in the view 2015-09-22 09:40:44 +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
Magne Sjaastad
4d42fd37f5 (#485) Grow plot size when adding tracks 2015-09-21 15:01:11 +02:00
Pål Hagen
5e58cb141e (#468) Added context menu item in 3D view for plotting of well log extraction curves 2015-09-21 14:24:29 +02:00
Pål Hagen
8667b6baa0 (#468) Added context menu item in 3D view for plotting of logs from LAS files 2015-09-21 14:02:33 +02:00
Magne Sjaastad
e7866cbdfd (#484) If current window is mazimized, show new window in maximized state 2015-09-21 13:25:38 +02:00
Magne Sjaastad
06e8bc2ec5 Moved building of time step names for UI to case 2015-09-21 11:22:03 +02:00
Pål Hagen
c32f4cabfe (#493) Correct handling of MDI sub window activation.
Setting bool member variable that blocks sub window activation slot
temporarily at the correct places - the main window methods that sets
active viewer and removes a viewer.
2015-09-21 11:01:00 +02:00
Magne Sjaastad
18bb056b78 Apply appendClassNameToUiText when creating project tree 2015-09-18 19:39:47 +02:00
Pål Hagen
e3e574fb90 (#493) Blocking MDI window activation handler when toggling off well log plot 2015-09-18 17:06:26 +02:00
Pål Hagen
479b2083ef (#486) Renamed "trace" to "track" 2015-09-18 12:29:23 +02:00
Pål Hagen
324f05e74e Linux compilation fix 2015-09-18 10:27:55 +02:00
Pål Hagen
d3f2df8b6b (#487) Stopped using focus events for selection in project tree
Already handled by sub window activation in main window.
2015-09-18 09:41:42 +02:00
Magne Sjaastad
0f5fed1768 (#492) Created folder for well log commands, added "New Well Log LAS Curve" feature 2015-09-18 09:07:38 +02:00
Magne Sjaastad
598575602c (#484) Fixed issue with invalid MDI maximized state 2015-09-18 08:04:14 +02:00
Pål Hagen
ffbc4f13e7 (#459) Added support for plotting of discontinuous curves 2015-09-17 18:42:35 +02:00
Magne Sjaastad
c8751bebe0 (#439) Improved positioning and default size of widgets in MDI area 2015-09-17 14:27:21 +02:00
Magne Sjaastad
490a823fb0 (#440) Minimum height and width of plot set to 0 2015-09-17 14:27:20 +02:00
Pål Hagen
08adcd5df7 (#466) Made sure that selecting plots and plot tracks both work
Both widgets accept focus events and select the corresponding items in
the project tree view. Focus is cleared immediately in the focus event
handlers, so that plot tracks won't steal focus from the plots in
subsequent selections of plots.
2015-09-17 12:02:37 +02:00
Pål Hagen
71b4ce9221 Linux compilation fix 2015-09-17 11:40:05 +02:00
Pål Hagen
ca375d90ea (#466) Clicking a plot curve selects the item in the project tree view 2015-09-17 11:34:03 +02:00
Pål Hagen
ce6c33fa09 (#466) Clicking a plot track selects the item in the project tree view 2015-09-17 10:53:37 +02:00
Magne Sjaastad
c6caea2869 (#481) Restore window maximized state 2015-09-17 09:04:15 +02:00
Magne Sjaastad
f1233e485a Improved state handling of toolbar actions 2015-09-17 08:25:45 +02:00
Magne Sjaastad
4c9b25a85d (#480) Added toolbutton for tiling of windows as a command feature 2015-09-17 08:25:44 +02:00
Magne Sjaastad
f1e11780ce (#446) Added feature "Set master view" to context menu in 3D and in project tree 2015-09-16 15:13:56 +02:00
Magne Sjaastad
66333e0367 (#475) Make sure MDI window pos and size is restored 2015-09-16 12:56:48 +02:00
Magne Sjaastad
d99c5daee1 Added icons to context menu in 3D view 2015-09-15 16:33:41 +02:00
Magne Sjaastad
708e34045d (#446) Added link view commands to context menu in 3D view 2015-09-15 16:33:41 +02:00
Magne Sjaastad
08e266c2f3 (#449) Minor fixes related to isActive 2015-09-15 10:45:39 +02:00
Pål Hagen
095d974e38 (#435) WIP - Reading metadata from LAS files 2015-09-14 16:33:28 +02:00
Jacob Støren
69019115a2 Made MD/Tvd font smaller 2015-09-11 14:35:12 +02:00
Pål Hagen
7901c3c4bd (#438) Showing "MD" or "TVD" on top of Y-axis according to depth type 2015-09-11 12:35:59 +02:00
Pål Hagen
d3909c5d27 (#437) Using MD or TVD depth values for well log extraction curves
Also renamed some methods for clarity, and fixed a bug in
RimWellLogPlot::updateViewerWidget(). Using this method instead of
loadDataAndUpdate() when toggling visibility of the plot.
2015-09-11 10:44:10 +02:00
Jacob Støren
8b801bac50 (#442) Permanent fix. Needed to handle the new plot views properly 2015-09-10 08:14:28 +02:00
Jacob Støren
f753593380 (#442) Temporar fix.
Why this code creates the crash is beyond my understanding.
Must be investigated.
For now, get rid of the crash that blocks testing etc...
2015-09-09 14:30:12 +02:00
Pål Hagen
77c22e4562 (#431) Handling viewer deletion by upper right X in window gracefully 2015-09-08 11:11:42 +02:00
Pål Hagen
1000c96c3e (#431) Turning toggle field off when removing well log plot viewer widget 2015-09-08 10:21:33 +02:00
Pål Hagen
c1d2a32f6e (#428) Selecting well log plot in tree view when its viewer is activated 2015-09-07 19:22:11 +02:00
Pål Hagen
613f028779 (#427) Fixed selection of well log plots so that the viewer is set active
Switching between well log plots and 3D views, both are MDI windows,
should now work fine.
2015-09-07 18:27:23 +02:00
Pål Hagen
eda2ce27d6 (#396) Fixed updating of plot traces when adding curves
Made sure that plot traces are updated as expected when adding curves to
plot traces with index > 0.
2015-09-07 18:00:04 +02:00
Pål Hagen
6eaef49996 (#404) Using well path pointer instead of index for source info for picking 2015-09-07 16:17:40 +02:00
Magne Sjaastad
f16b2af600 Rename of class names and files related to linked views 2015-09-07 14:35:26 +02:00
Pål Hagen
4d4ed88041 (#404) Displaying well path name when a well path is picked
TODO: Display depth and additional well data
2015-09-07 12:21:22 +02:00
Magne Sjaastad
4618f50e9e (#407) Disable "Add property filter" for per-cell face color results 2015-09-07 10:12:59 +02:00
Pål Hagen
520f1fc60d (#410) Using a smaller font size for numbers on axes 2015-09-04 17:11:16 +02:00
Pål Hagen
752c4071b9 (#412) Improved scroll wheel zooming (zoom around mouse Y position)
Moved scroll wheel handling to well log trace plot viewer, using event
filter for the plot canvas to get the mouse Y position, which is
transformed to the corresponding plot depth value and used as center for
zooming.
2015-09-04 15:57:34 +02:00
Pål Hagen
d7872971d3 (#412) Faster zooming and panning of well log plots
Could consider to use for instance Shift or Alt as extra modifiers for
speeding up/slowing down zooming/panning.
2015-09-04 14:23:13 +02:00
Pål Hagen
a1d95f2b8a (#396) Reset the zoom to show the entire depth range only when the first curve is added
Additional additions or changed parameters (by the user) will not change
the visible depth settings. Did some code cleanup.
2015-09-04 14:14:56 +02:00
Jacob Støren
7b308e514c Wip: Separated cretion of Qwt classes from Rim construction
This needs to be done because MDI window close window deletes the widgets.
We need to be able to recreate all the widgets/qwt objects when needed.
The QwtPlotCurves still crashes on window close/open
2015-09-03 14:26:49 +02:00
Jacob Støren
959abe7930 Set initial well plot axis ranges to something "pretty" 2015-09-03 11:55:24 +02:00
Jacob Støren
2a8533bad0 (#396) Save/Restore of WellLog plots partly in place.
Cleaned up ownership in WellLog plot classes
initAfterRead() is implemented
moved code related to command features from the WellLog classes
Still plots are not redrawn/reloaded when opening a project file.
2015-09-03 08:22:01 +02:00
Jacob Støren
30e2495849 Remove duplicate add/remove/setActive viewer methods from MainWindow.
(#408) Added Save Load of WellLog Plot window geometry also
2015-09-03 08:21:57 +02:00
Magne Sjaastad
e3c11f11e9 Added Close All Windows 2015-09-02 17:18:26 +02:00
Magne Sjaastad
a012049693 Make sure icon is updated when viewer is closed 2015-09-02 17:18:25 +02:00
Pål Hagen
a44e548f93 (#396) Align the canvas with the actual min and max values of the curves 2015-09-02 16:41:12 +02:00
Pål Hagen
8d7bbb85a9 (#396) Scroll wheel now pans the plot in the depth direction 2015-09-02 16:30:37 +02:00
Pål Hagen
fd3df6492b (#396) Made sure that Ctrl is needed for scroll wheel zoom 2015-09-02 15:58:54 +02:00
Magne Sjaastad
b29ad69673 (#408) Save and restore MDI window size and position 2015-09-01 22:11:39 +02:00