Magne Sjaastad
e845ae1ed8
Merge remote-tracking branch 'refs/remotes/origin/dev'
...
Conflicts:
ApplicationCode/CMakeLists.txt
ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
ApplicationCode/ProjectDataModel/RimEclipseWell.h
ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake
2017-01-24 15:23:02 +01:00
Magne Sjaastad
cebe5428be
#1107 Moved showWindow field to RimViewWindow and removed showWindow field from derived classes
2017-01-20 16:25:05 +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
9cd17ec508
Merge dev into pre-proto
...
Conflicts:
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
ApplicationCode/ProjectDataModel/RimEclipseView.h
2017-01-10 10:09:44 +01:00
Magne Sjaastad
50b9fe0ece
#1068 Removed obsolete include of RigCaseData
2017-01-10 09:20:03 +01:00
astridkbjorke
3f052976f5
#1040 - pre-proto - Converting facture coordinates to display coordinates for visualization. Fractures not yet shown at correct possition.
2017-01-06 15:55:53 +01:00
Magne Sjaastad
ebf5b01234
#1018 Force update of display model for scheduled updates before taking snapshot
2016-12-22 08:45:50 +01:00
Magne Sjaastad
9c9bfebbe7
Update grid box data when z-scale is updated
2016-11-24 14:05:51 +01:00
Magne Sjaastad
70fb105ced
#850 Summary : Added snapshot of all well log plots and summary plots to file
2016-10-27 11:03:13 +02:00
Magne Sjaastad
3dd0829efa
#927 Intersection box: 3D manipulator not updated when changing scale
2016-10-25 09:50:33 +02:00
Magne Sjaastad
e732d5c373
#922 Use setValueWithFieldChanged instead of setValueFromUi
2016-10-19 15:30:52 +02:00
Magne Sjaastad
d7a69bdae8
Merged intersection box interactive manipulation
2016-09-30 10:01:17 +02:00
Magne Sjaastad
593d72d63b
( #884 ) Refactor and cleanup
2016-09-30 09:34:45 +02:00
Jacob Støren
1349cf0104
#900 Merged Intersection Boxes into Intersections folder
2016-09-30 08:40:46 +02:00
Jacob Støren
f734bf595b
#815 Renamed RimCrossSectionCollection -> RimIntersectionCollection
2016-09-21 10:52:16 +02:00
Magne Sjaastad
45952e59d3
#814 New project tree items Intersection Boxes and Intersection Box. Support for add, toggle and delete
2016-09-20 12:03:26 +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
Magne Sjaastad
a83e797e63
Fixed missing grid box geometry when a hidden view was activated
2016-09-02 14:19:20 +02:00
Magne Sjaastad
0128baddff
#279 Use frame buffer objects for snapshots when available, otherwise use grabFrameBuffer()
2016-08-31 17:34:31 +02:00
Jacob Støren
4eddcc859a
#168 Save and restore of parallel projection
2016-08-16 14:34:37 +02:00
Jacob Støren
5cdf307d4e
WIP: Improved support for parallel projection. #168
...
Near plane negative to show everything
ZoomAlongRay now works for parallel projection (only implemented in
ceetron Plus)
2016-08-15 08:55:28 +02:00
Magne Sjaastad
b8615f0ebc
#792 Added Window zoom and Zoom All
2016-07-05 10:47:03 +02:00
Magne Sjaastad
0680e830b4
Added CopyViewToClipboard feature
2016-06-29 14:41:13 +02:00
Jacob Støren
ae615901b8
#739 Moved windowsGeometry data to the RimViewWindow base class
...
Introduced an interface for setting and getting mdiWindow Geometry
Changed file keywords from GraphPlot etc to SummaryPlot
Added a summary plot QwtPlot descendant
Added handling of delete of the MDI window
2016-05-26 13:17:26 +02:00
Jacob Støren
009f1d157a
( #168 ) Giving up to get parallel projection production ready for 1.6.0
...
Hide the parallel projection field.
2015-12-10 09:40:02 +01:00
Jacob Støren
bbb0a5e993
( #168 ) Wip: Parallel projection. Basics in place
2015-12-10 09:33:58 +01:00
Magne Sjaastad
47bb20368a
System : Fixed memory leaks
2015-12-09 13:52:25 +01:00
Magne Sjaastad
dc6a50ec3c
Renamed from setCurrentObjectInTreeView to selectAsCurrentItem
2015-12-07 10:07:51 +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
5d81209b72
Fixed memory leak for cross section collection
2015-12-03 08:26:38 +01:00
Magne Sjaastad
f33a3174ee
( #667 ) Make Grids toggle follow toggle button in toolbar
...
Renamed toolbar text to "Hide Grid Cells"
2015-11-27 13:47:02 +01:00
Magne Sjaastad
a42b0d2c8e
( #667 ) Added Grids to project tree below Info Box
...
Fixed update issue related to missing time step texts in animation
toolbar
2015-11-27 13:47:01 +01:00
Magne Sjaastad
f8d3b85047
( #669 ) Grid Box: When creating a new view, enable grid box by default
2015-11-27 10:47:12 +01:00
Jacob Støren
c4aed9c487
( #166 ) Geomech cross sections in place. Refactor of frame/scene/model usage on top level.
2015-11-23 11:25:47 +01:00
Magne Sjaastad
dc1a66d2cc
( #660 ) Use Intersection to be aligned with concept naming in other tools
2015-11-23 09:07:35 +01:00
Magne Sjaastad
9c2b1b44a6
( #657 ) Wired up UI to viz model generation for cross sections
2015-11-19 11:41:16 +01:00
Magne Sjaastad
6ca980385c
( #657 ) Created command feature for adding cross section from simulation well
2015-11-18 15:55:25 +01:00
Magne Sjaastad
f2e8062410
( #657 ) Added cross section and cross section collection
2015-11-18 15:55:22 +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
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
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
bca5720968
( #266 ) Added interface for all/activeCellsBoundingBox and displayModelOffset
2015-11-17 13:18:05 +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
7b65cb91ce
( #625 ) Added access to the generalized propertyFilterCollection in the view
2015-11-12 10:48: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
b6d91f5063
( #623 ) Keep view position when toggle on/off
2015-10-29 11:55:21 +01:00