Commit Graph

182 Commits

Author SHA1 Message Date
Jacob Støren
3957027b4b #2657 Final cleanup and refactoring of legends size system 2018-04-20 16:59:10 +02:00
Jacob Støren
1f8d4437bf Remove the unused, unnecessary "position" from several methods and the overlay layout struct 2018-04-20 16:59:10 +02:00
Gaute Lindkvist
b6fb60115a Refactored after review 2018-04-09 13:14:19 +02:00
Gaute Lindkvist
e93f79790e Make sure Ternary legends also expand and renamed width method. 2018-04-09 13:14:19 +02:00
Gaute Lindkvist
38aa447dcd Unify the width of all visible legends.
* Calculate the minimum width to fit the content before the render pass.
  * Set the actual width of all the legends to the largest of the minimum widths.
  * This resizes the legends to always be the same size and reduces the size of you remove
     the widest legend.
2018-04-09 13:14:19 +02:00
Gaute Lindkvist
63ffade452 Set background and frame color from the view plus update frame margins. 2018-04-09 13:14:19 +02:00
Gaute Lindkvist
507229f84b Fixed background color setting for legends and refactored Legend class hierarchy
* Added a new cafTitledOverlayFrame as a base-class for all ResInsight legend classes
  * Inherits cvf::OverlayItem
2018-04-09 13:14:19 +02:00
Bjørn Erik Jensen
28830d3a1b #2480 2d intersection view. Adjusted category legends position 2018-03-13 13:26:41 +01:00
Jacob Støren
0bdde36aa3 Merge #51 Legend background and #2478 Edge axis top into dev 2018-03-08 16:22:13 +01:00
Jacob Støren
c258528dc5 #51 Add background to standard legends. Needed a separate legend implementation, now in caf. Cleaned up CategoryLegend to make it ready for the new background. 2018-03-08 11:20:27 +01:00
Magne Sjaastad
4f7291c95d #2583 System : Move regression test framework to separate class 2018-03-08 10:15:51 +01:00
Jacob Støren
df0a356a0a #2478 Add top edge axis (intersection View) and repositioned info box and legends to follow. 2018-03-07 12:47:48 +01:00
Rebecca Cox
063802130c Fix window edge axis crash 2018-02-12 09:05:58 +01:00
Jacob Støren
d86b6f690e #2337 Place legends aware of the possible edge axis border and enable the border by default in Intersection views 2018-02-09 14:10:26 +01:00
Jacob Støren
911571e267 #2337 Window Edge axis overlay item working. 2018-02-09 14:08:55 +01:00
Jacob Støren
5640f91b68 #2412 2D Navigation only for Intersectino Views 2018-01-26 14:33:32 +01:00
Jacob Støren
0debeafd68 #2331 Move RimGridView to separate files 2018-01-16 09:37:08 +01:00
Jacob Støren
b092565a61 #2331 Introduce new intermediate class RimGridView 2018-01-15 14:53:48 +01:00
Jacob Støren
5644684606 #2331 Refactor the viewer-view communication to pave way for 2dIntersection Views 2018-01-12 12:01:04 +01:00
Jacob Støren
cb6d49a611 #2331 Renamed RimView to Rim3dView 2018-01-09 10:11:28 +01:00
Rebecca Cox
4e66cb9b17 Remove unused function 2017-11-29 14:57:04 +01:00
Rebecca Cox
75c506e257 #2109 Remove automatic color on well labels on background change 2017-11-13 07:55:22 +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
Rebecca Cox
f3b7f0abd6 #1392 Improve Dark 3D-View background support 2017-11-07 15:08:32 +01:00
Jacob Støren
a914e38d53 #1380 Wip: Started to allign all the view widgets, preparing to avoid duplicated code when mdi window to RimViewWindow translation. 2017-03-31 15:13:50 +02:00
Jacob Støren
bd688f7ce8 #1292 Fixed CppCheck Issues in UserInterface 2017-03-06 11:20:28 +01:00
Jacob Støren
f15d698342 #1174 Made 3D main window pop up, and set wether to show Max Fractrion Injectors or Producers. Set timestep in 3D view to match plot. 2017-03-02 16:10:18 +01:00
Jacob Støren
c025c2a3d7 Renaming in the aftermath of the MDI window control refactorization. Aligned fieldChangedByUi in that respact as well. 2017-01-20 11:38:18 +01:00
Jacob Støren
43249f7af8 Refactor related to #1106, #1107, #1109, #1113. Refactored the MDI control
of windows. This might introduce problems.
2017-01-19 17:54:01 +01:00
Magne Sjaastad
b934ae3f26 Merged branch maintenance-enhancements into dev 2016-12-19 15:12:26 +01:00
Magne Sjaastad
d32ce739c7 #552 Linked views : Hide cursor in dependent views when view receives leave event 2016-12-16 14:53:19 +01:00
Magne Sjaastad
27df0a20cf #552 : Linked Views: Cleanup 2016-12-15 19:00:36 +01:00
Magne Sjaastad
4583dbf3b1 #552 Linked Views : Draw a cross hair marker 2016-12-15 18:45:10 +01:00
Magne Sjaastad
90a2d384d3 #552 Linked Views : Prototype - show label at cursor position in dependant views 2016-12-15 18:20:43 +01:00
Magne Sjaastad
0fc23c5610 System : Manipulation of time step is now only available from RiuViewer 2016-12-14 10:35:28 +01:00
Magne Sjaastad
ec3e05e87f #973 Linked views : Update parallel projection settings in linked views 2016-11-24 14:01:47 +01:00
Magne Sjaastad
f03e2431f9 #911 Fixed picking on category legend 2016-10-17 11:51:25 +02:00
Magne Sjaastad
d7a69bdae8 Merged intersection box interactive manipulation 2016-09-30 10:01:17 +02:00
Magne Sjaastad
d4bdbcb7c8 (#884) Added prototype of event handler for interaction with box 2016-09-30 09:34:39 +02:00
Jacob Støren
cbb626aa31 Merged intersection-box into dev 2016-09-28 14:27:17 +02:00
Magne Sjaastad
5c4b92f9b8 #818 Intersection Box: Added XYZ slices to context menu in 3D view 2016-09-23 16:12:19 +02:00
Magne Sjaastad
120cc8b6dc #887 Category Legend: Limit legend height when having few categories 2016-09-22 15:31:21 +02:00
Magne Sjaastad
0fc911e50b #837 Set category legend width to 150 px 2016-09-14 08:27:04 +02:00
Magne Sjaastad
7306950d9d #831 Category legend use full height to be able to show as many category names as possible 2016-09-12 11:11:25 +02:00
Jacob Støren
78b29fc3a0 Fixed zoom all bounding box issue related to 1209c908e5
Used explicit mainRendering instead of renderSequence->firstRendering()
2016-09-07 15:54:12 +02:00
Jacob Støren
1209c908e5 Fixed clip plane related assert on linux. Hopefully the final fix of trouble related to : ca6e650a72 and 80985785 and 0128baddff
The fundamental problem was that the quad rendering was included in the boundingbox.
2016-09-07 12:52:40 +02:00
Jacob Støren
4eddcc859a #168 Save and restore of parallel projection 2016-08-16 14:34:37 +02:00
Magne Sjaastad
1101db5787 (#805) Added category legend and mapper 2016-08-05 17:23:50 +02:00
Jacob Støren
1d9481f09b (#695) Unintentional picking fixed.
Fixed in viewer, keeping the concept of the navigation policies to not flag the
the events as handled.
Made this clearer by adding an interface to turn event consumption on or off on the
navigation policies.
2015-12-10 09:39:55 +01:00
Magne Sjaastad
a2bfc12c57 (#674) Clicking on items in 3D view selects corresponding item in tree view/property panel
Clicking on 3D Info box and legends for cell result, separate fault
result and cell edge selects corresponding items in tree view
2015-12-07 09:59:19 +01:00
Magne Sjaastad
a0775fc6ec (#688) Update bounding box for grid box model when camera changes 2015-12-03 14:02:36 +01:00
Magne Sjaastad
3eade62961 (#641) Use checkable button for point input from viewer 2015-12-01 12:34:30 +01:00
Magne Sjaastad
bd2a65acb4 (#641) Create user defined polyline by clicking on reservoir cells 2015-11-27 17:18:51 +01:00
Magne Sjaastad
ca9b1cf683 (#51) Use contrast color for overlay item text and grid colors 2015-11-23 13:31:29 +01:00
Magne Sjaastad
95e22b581c (#639) Updated axis cross texts 2015-11-23 07:24:50 +01:00
Magne Sjaastad
b26d199815 (#639) Show E (x,1) on axis label
As the space is limited, the text is compressed to "E-x1", "N-y2", "Z-3"
2015-11-20 09:12:07 +01:00
Magne Sjaastad
08c04f5052 (#656) Added text effect to effect generator 2015-11-17 16:26:07 +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
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
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
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
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
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
Magne Sjaastad
67a62f4f02 Renamed RimViewLink to RimViewController 2015-10-13 10:24:39 +02:00
Magne Sjaastad
4424c110be Transformed static functions from ViewLinker to dynamic functions in RimView 2015-09-25 11:17:51 +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
08e266c2f3 (#449) Minor fixes related to isActive 2015-09-15 10:45:39 +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
Magne Sjaastad
f16b2af600 Rename of class names and files related to linked views 2015-09-07 14:35:26 +02:00
Magne Sjaastad
a012049693 Make sure icon is updated when viewer is closed 2015-09-02 17:18:25 +02:00
Magne Sjaastad
379cf6b228 (#395) Moved code from RiuViewer to RimView and cleaned up includes 2015-09-01 18:21:20 +02:00
Magne Sjaastad
4730e10319 Created navigationPolicyUpdate to be used from navigation policies 2015-09-01 18:04:35 +02:00
Magne Sjaastad
7969e22364 (#395) Moved managed views from RimView to RimProject 2015-09-01 17:34:03 +02:00
Magne Sjaastad
444500f6cc (#395) Make sure the update() virtual function is called from camera related functions 2015-09-01 11:31:31 +02:00
Magne Sjaastad
3f09c1bc66 Added LinkVisibleViewsFeature, and added action to draw toolbar 2015-08-30 13:30:46 +02:00
Magne Sjaastad
e5d5543cd9 Ovveride update() and find all linked views to be updated 2015-08-28 21:32:51 +02:00
Magne Sjaastad
f6ac177ff2 Added ManagedViews and sync of camera, time step and cell result 2015-08-26 15:42:31 +02:00
Pål Hagen
0c8600c6dd (#355) Got rid of all RimUiTreeModelPdm includes 2015-08-24 17:42:42 +02:00
Pål Hagen
22c0c812af (#80) Refactored navigation mode related code
Made sure that navigation policies are created only one place, in the
new member function RiuViewer::updateNavigationPolicy().
2015-07-02 14:53:35 +02:00
Pål Hagen
7a3d43d29d Setting specific font size in the overlay items during regression tests
Made sure that we always use the same bitmap size for the fonts of the
overlay items when running regression tests, to avoid differences from
reference runs.
2015-06-26 13:47:33 +02:00
Pål Hagen
7917a89c65 Renamed source files according to new class names 2015-06-26 10:00:45 +02:00
Pål Hagen
fd03a02645 Renamed source files according to new class names 2015-06-26 10:00:44 +02:00
Pål Hagen
cd662dc7d1 Renamed source files according to new class names 2015-06-26 10:00:43 +02:00
Pål Hagen
2f34b03135 Renamed source files according to new class names 2015-06-26 10:00:41 +02:00
Pål Hagen
38b40423d8 Added version info label in the lower right corner 2015-06-24 13:45:39 +02:00
Jacob Støren
4f77afe43c Implemented #310 Result info when picking
This included some refactorization to remove the command stuff out of
RiuViewer,
and to communicate the grid index via the source info struct, and not as
a cvfPart::id
2015-06-11 11:38:51 +02:00
Jacob Storen
dc28fd81b9 Linux compile fixes 2015-06-05 06:47:30 -07:00
Jacob Støren
0130a01ca2 IJK-Slice context menu commands for GeoMech
#306
Added picking source data to the viz model
Generalized the picking methods in RiuViewer, but there is more serious
refactoring needed.
2015-06-05 15:17:02 +02:00