OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity
9,493 Commits 27 Branches 61 Tags 309 MiB
15a6bc358b
Commit Graph

143 Commits

Author SHA1 Message Date
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
Jacob Støren
b74364087a Refactored IJKslot commands 
Preparations to create IJK slice commands in 3Dview
 2015-06-05 09:58:29 +02:00
Jacob Støren
2c7a741805 Renamed the files of RimReservoirView to RimEclipseView 2015-05-21 10:34:38 +02:00
Jacob Støren
ed74116376 Rename of RimReservoirView to RimEclipseView 
To make the separation to geomech clearer, and alligning it to the
RigCaseNaming
 2015-05-21 10:05:33 +02:00
Jacob Støren
b111a26f21 Renamed Files: RimCase to RimEclipseCase 2015-05-15 09:16:33 +02:00
Jacob Støren
3dac8807c7 Refactoring more general stuff into RimView 
updateViewerWidget
scheduleUpdateDisplayModelAndRedraw
 2015-04-30 10:34:15 +02:00
Jacob Støren
c0217a68a4 First odb file read and displayed 2015-04-27 14:06:42 +02:00
Jacob Støren
1f2bea106f Small guard RiuViewer 2015-04-21 08:37:32 +02:00
Magne Sjaastad
cff0313519 Bugfix: Do not change mesh mode when adding a range filter 2014-10-29 08:13:37 +01:00
Magne Sjaastad
b4df5419b1 Updated file header for modified files 2014-09-23 15:04:57 +02:00
Magne Sjaastad
e2a5c449ce Impoved result info text presentation 
Display Cell result, Fault result, NNC result, and Cell edge result as a
section with a linefeed above
Always show value for intersection point at top with details below.
 2014-09-08 07:35:23 +02:00
Magne Sjaastad
473a701bf5 Result info : Improved display of text 2014-08-26 13:41:34 +02:00
Magne Sjaastad
0d6c6f2785 Improved management of multiple legend overlay items 2014-08-14 10:55:57 +02:00
Magne Sjaastad
23d44a0747 Make sure grid view is active after a range filter is added 2014-08-14 10:55:55 +02:00
Magne Sjaastad
9925556579 Added hide fault to context menu in 3D view 2014-08-14 10:55:54 +02:00
Magne Sjaastad
f259f21b32 Renamed file to match class name for RimReservoirCellResultStorage 2014-08-14 10:55:51 +02:00
Jacob Støren
710395bb85 Created StructGrid...ToCellFaceMapper 
Done to start refactoring to pave way for many new combined result
properties
 2014-08-14 10:55:42 +02:00
Magne Sjaastad
0e92bc5d3f Added ternary saturation overlay item 2014-04-22 11:22:16 +02:00
Magne Sjaastad
f8254075cd Result Info: Show fault name only when picking on fault 2014-01-23 08:19:37 +01:00
Magne Sjaastad
49a43a036e Pick info and result info: Added face type 2014-01-03 14:59:52 +01:00
Magne Sjaastad
9c7c8f1969 NNC: Use smaller depth distance for pick threshold 2013-12-20 14:53:48 +01:00
Magne Sjaastad
e8137ff78a NNC: Show IJK values in Result Info 2013-12-20 14:29:08 +01:00
Magne Sjaastad
1c80a9dbe8 NNC: Prioritize NNC parts when picking in 3D scene 2013-12-20 10:57:53 +01:00
Magne Sjaastad
75225b7519 NNC: Picking and result mapping 
Show NNC info in Result Info
Show NNC result mapping for combined transmissibility
 2013-12-19 09:24:35 +01:00
Jacob Støren
a2dd688df1 Fixed cell coordinate debug output 2013-12-18 15:35:23 +01:00
Magne Sjaastad
0a87811263 Show fault name in ResultInfo when picking 2013-12-10 08:26:49 +01:00
sigurdp
fbfbdfca84 Integrate Fwk updates from ResInsight/Perforce 
Integrated Fwk updates in Resinsight branch up to changelist 173.
Summary of changes:
* Rewrite of cvf::OverlayItem to allow fixed user controlled positioning
of the items.
* Removed pure virtual functions OverlayItem::maximumSize() and
OverlayItem::minimumSize().
* Use caf::AboutDialog instead of modified cvfqt::BasicAboutDialog.
* Removed lapack from link line due to fail on Ubuntu 12.04 when lapack
isn't installed.
* Fix in OpenGLContext::saveOpenGLState() to avoid application
corruption when running on RedHat with VMWare.
* Removed unused font manager.
* Console assert handler only calls __debugbreak() if debugger is
present. Otherwise, calls abort(). Done after trouble running gtest
death tests.
* Made component access functions in Color3f, Color3ub, Color4f,
Color4ub inline.
* Added conversion functions between TextureImage and QImage to
cvfqt::Utils class.
* Optimized TextureImage::setPixel() - relies on new inlined
component-wise access functions for Color4ub.
* Added TextureImage::clear() and non-const version of
TextureImage::ptr().
 2013-10-31 14:57:52 +01:00
Jacob Støren
172c2d8b21 Fixed context menu blocking Ceetron navigation on linux. 
p4#: 21981
 2013-06-24 22:23:33 +02:00
Jacob Støren
cf664210bf Major cleanup/change in the way things are included. 
Needs a Linux compile check.
p4#: 21545
 2013-05-06 10:55:00 +02:00
Magne Sjaastad
d3fa2d5af5 Added creation of IJK-slices from context menu in 3D scene. 
p4#: 21367
 2013-04-23 07:29:37 +02:00
Magne Sjaastad
b5b9a736e2 As creation of a font is time consuming, create one application font instance 
p4#: 21338
 2013-04-19 08:02:36 +02:00
Jacob Støren
ff1dcd8c8d Overlay info: Adjusted colors and transparency 
To reclaim the transparent feeling lost, and to increase readability
p4#: 21225
 2013-04-10 14:24:35 +02:00
Jacob Støren
e10bd73658 Renamed the final filenames for this time: 
RICursors		RiuCursors
RIMainWindow	RiuMainWindow
RIPreferencesDialog	RiuPreferencesDialog
RIProcessMonitor	RiuProcessMonitor
RIResultInfoPanel	RiuResultInfoPanel
RIViewer		RiuViewer
p4#: 21072
 2013-03-22 17:30:50 +01:00