Magne Sjaastad
4a9fec49bf
#1056 Added cell edge picking text info
2017-01-11 21:07:03 +01:00
Magne Sjaastad
f16228ecc5
#1056 Added support for flow data for cell edge in 3D view
2017-01-11 15:03:39 +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
8970d93a4d
#1068 Renamed to RigEclipseCaseData
2017-01-10 09:51:39 +01:00
Magne Sjaastad
93032a23eb
#1068 Avoid include of RigActiveCellInfo.h in RigCaseData.h
2017-01-10 09:20:03 +01:00
Magne Sjaastad
ccd4cb24c9
#1068 Avoid include of RigMainGrid.h in RigCaseData.h
2017-01-10 09:20:03 +01:00
Magne Sjaastad
9cacf0db6c
#1068 Access mainGrid directly from RimEclipseView
2017-01-10 09:20:03 +01:00
Magne Sjaastad
45b581dc74
#1068 Added mainGrid() to RimEclipseView
2017-01-09 10:37:07 +01:00
Jacob Støren
ebddaa31e6
#1054 Added sensible information to the Result Info window when picking Flow Diag results.
...
Also rolled out the use of resultVariableUiName() to places that should use it.
2017-01-04 13:13:06 +01:00
astridkbjorke
fe9ac8f908
#1044 - pre-proto - Updates in infrastructure for finding i,j,k for simulation well
2017-01-04 09:28:10 +01:00
Magne Sjaastad
d1bf189154
#1040 Established basis for fracture visualization
2017-01-04 08:10:02 +01:00
Jacob Støren
5aed8ea939
#1053 Disabled the All Timesteps option in Legend range selection
2017-01-03 14:58:34 +01:00
Jacob Støren
22143969c1
#1048 Added derived result: Tracer with max fraction
2017-01-03 09:27:25 +01:00
Jacob Støren
003271ff54
#1035 Connected the Flow Diag solver, and added the statistics needed for legend. Now many things work .
2016-12-20 11:41:05 +01:00
Jacob Støren
7222d50645
#1035 Top level systems now access the Flow Diag data. There are none yet, so rendered gray.
2016-12-16 14:53:56 +01:00
Jacob Støren
8562d0e98b
Merge with Flow Gui additions
2016-12-14 11:16:08 +01:00
Magne Sjaastad
0fc23c5610
System : Manipulation of time step is now only available from RiuViewer
2016-12-14 10:35:28 +01:00
Jacob Støren
afa381b4b9
#1029 Refactored to prepare for more Flow Diag. Removed use of specific field visibility methods
2016-12-14 10:27:46 +01:00
Magne Sjaastad
860b51931c
#1025 Removed unsused code and renamed to isWellPipe/SpheresVisible
2016-12-14 07:15:44 +01:00
astridkbjorke
8e81c53520
#1025 Code cean-up. Removed obsolete scaletransform for cell center spheres.
2016-12-12 11:03:37 +01:00
Magne Sjaastad
f04c56df01
#559 Linked views : Removed obsolete storage of RimView
2016-12-09 21:17:06 +01:00
astridkbjorke
600f3da30a
#1025 Established geometry for all well cell centers
2016-12-07 12:06:24 +01:00
Magne Sjaastad
af7dae6374
#945 Improved display of fault labels
2016-11-21 13:13:53 +01:00
Magne Sjaastad
7d52242285
#945 Use visible grid parts to force watertight faults
2016-11-21 13:13:53 +01:00
Magne Sjaastad
50c5ff8da4
#945 Reverted forceWatertightGeometryOn and visibleFaultGeometryTypes to commit 3ba7ade8
2016-11-21 13:13:53 +01:00
Magne Sjaastad
e89b73d64c
#945 Removed flag as watertight flag was always set true
2016-11-18 14:05:50 +01:00
Magne Sjaastad
8344617ba9
#945 Improved handling of visible fault geometry when showing faults outside filters
2016-11-18 13:57:01 +01:00
Magne Sjaastad
c52e1809ab
#992 Fixed invalid access of nullpointer for property filtered geometry
2016-11-18 10:49:06 +01:00
Magne Sjaastad
3ba7ade88e
#945 Rename
2016-11-18 10:49:06 +01:00
Jacob Støren
2c6e6f4a80
#950 Improved the updates, but there is still work to be done.
2016-11-04 08:08:55 +01:00
Jacob Støren
8e95fda144
#846 Plot Window and 3D Window icons
2016-10-04 14:36:49 +02:00
Jacob Støren
1349cf0104
#900 Merged Intersection Boxes into Intersections folder
2016-09-30 08:40:46 +02:00
Jacob Støren
fa6a6b4f08
#817 #815 Improved commands for xyz - slices intersection boxes.
2016-09-28 12:39:43 +02:00
Magne Sjaastad
61b7a6c57d
#815 Initialize intersection boxes after loading of case
2016-09-22 10:38:57 +02:00
Magne Sjaastad
e3cec5bfec
#815 Wired up infrastructure for intersection box from view to geometry generators
2016-09-22 10:09:03 +02:00
Jacob Støren
f734bf595b
#815 Renamed RimCrossSectionCollection -> RimIntersectionCollection
2016-09-21 10:52:16 +02:00
Jacob Støren
08baa5ccc9
#815 Renamed RimCrossSection -> RimIntersection
2016-09-21 10:48:25 +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
88af194702
#829 Update display and pick information when reloading / selecting a formation names file
2016-09-12 13:15:39 +02:00
Jacob Støren
38c0b29b84
#829 Ordered the legend for formation names in the natural top to bottom order
2016-09-09 12:11:00 +02:00
Magne Sjaastad
f404299702
( #829 ) Moved RimLegendConfig as a private field to be able to switch between standard and single var result color
2016-09-07 11:12:45 +02:00
Magne Sjaastad
f1c214c1d7
( #829 ) Use std::vector instead of std::set for categories. Added categoryNames to RimLegendConfig
2016-09-07 11:12:31 +02:00
Jacob Støren
3e8873c870
#812 and related to #272 Formation and Category for Cell edge
2016-09-06 12:17:02 +02:00
Jacob Støren
c903e87dfd
#811 , #812 WIP, Formation names coloring of cells. First shot. Works but needs refinment.
2016-09-06 10:27:30 +02:00
Magne Sjaastad
cb4aa45cd3
Merged in changes from maintenance branch
2016-08-11 10:29:14 +02:00
Magne Sjaastad
d9973743ee
#272 Improved meta data for custom cell edge results
2016-08-06 08:47:56 +02:00
Magne Sjaastad
5c3f74b833
( #272 ) Added visualization for custom cell edge results
2016-08-06 08:47:27 +02:00
Magne Sjaastad
1101db5787
( #805 ) Added category legend and mapper
2016-08-05 17:23:50 +02:00
Magne Sjaastad
23bd3c9b0c
( #805 ) Cleaned up includes and generalized access to overlayItemLegend
2016-08-05 17:19:49 +02:00
Magne Sjaastad
4bfef4ead0
Merged in changes from maintenance branch
2016-08-04 11:12:53 +02:00
Magne Sjaastad
68c0d906fb
#590 Fault labels are not shown outside filters when faults are
2016-07-16 16:09:03 +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
d01367a932
( #707 ) Fixed regression regarding well pipe and well cells
...
Introduced in 707e8c6179f0c9
2015-12-11 17:34:52 +01:00
Jacob Støren
179f0c906b
Fixed simulation well pipe visibility error introduced in 707e8c68ab
2015-12-10 14:11:07 +01:00
Jacob Støren
707e8c68ab
( #163 ) Sort simulation wells by name
2015-11-30 14:04:03 +01:00
Magne Sjaastad
39ae89b07b
( #667 ) Move intersections above range filters in tree view
2015-11-27 13:47:03 +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
9429458d32
Rename from cells to globalCellArray
2015-11-24 14:21:02 +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
11b317dd1b
( #639 ) Use lower case for x and y
2015-11-23 09:57:41 +01:00
Magne Sjaastad
95e22b581c
( #639 ) Updated axis cross texts
2015-11-23 07:24:50 +01:00
Jacob Støren
f8fa6787e9
( #166 ) WIP: Starting to get geomech cross sections in place
2015-11-20 15:54:22 +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
bb8475b0e1
[System] Reduced scope of variables
2015-11-19 07:57:44 +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
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
57f7c1229a
( #166 ) WIP: First visible section with hacks
2015-11-18 11:52: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
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
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
Magne Sjaastad
6063ca1b54
( #646 ) Show selected cells in geo mech view
2015-11-11 13:38:54 +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
73489780bf
( #483 ) Improved how filters and filter collections are grayed out
2015-11-02 09:50:44 +01:00
Jacob Støren
b6d91f5063
( #623 ) Keep view position when toggle on/off
2015-10-29 11:55:21 +01:00
Magne Sjaastad
01224dd5e6
System : Removed unused variables
2015-10-26 10:18:57 +01:00
Magne Sjaastad
0405584bb6
System : Replaced tab with four spaces in ApplicationCode and subfolders
2015-10-23 15:46:25 +02:00
Magne Sjaastad
ab0e3819a1
( #539 ) Added framework for update of range filter based on master
...
Propagate pointer to a range filter if only a single filter is modified
Moved lifetime management of range filter collection to RimView
2015-10-19 12:10:28 +02:00
Magne Sjaastad
67a62f4f02
Renamed RimViewLink to RimViewController
2015-10-13 10:24:39 +02:00
Jacob Støren
e74098d7ca
( #553 ) Fixed. Now the CreatDisplayModel sets timestep without firing signals
...
from the AnimationController.
2015-09-28 20:43:55 +02:00
Jacob Støren
5d04655d6a
( #520 )( #503 ) Made sure the Overridden cells actually overrides always.
2015-09-28 10:05:20 +02:00
Jacob Støren
03c788db6a
Linked Views: isActive() as access method. doSync methots renamed to update
...
and changed the meaning accordingly.
2015-09-25 15:24:19 +02:00
Magne Sjaastad
4424c110be
Transformed static functions from ViewLinker to dynamic functions in RimView
2015-09-25 11:17:51 +02:00
Jacob Støren
c79a01f3b9
Linked Views: created access methods for viewController settings
...
The access methods now respects the active settings on both the ViewController
and the Toplevel.
2015-09-25 09:39:42 +02:00
Magne Sjaastad
71e74599ff
( #483 ) Gray out overridden range and property collections
2015-09-23 14:35:35 +02:00
Magne Sjaastad
c8944d8801
Refactored funtions used to find viewLinker and viewLink
2015-09-23 11:01:46 +02:00
Jacob Støren
31b5b2e568
Moved setting of default view to after we know the geometry is generated.
2015-09-21 18:54:33 +02:00
Jacob Støren
a2dc6628ad
( #401 ) Fixed result coloring of cells/fault geometry part of cells.
...
And visibility of fault part of overridden visible cells
2015-09-21 18:54:31 +02:00
Jacob Støren
22d033669d
( #401 ) Result colors now updated on "Visible cells"-overridden Eclipse cases
2015-09-21 09:10:50 +02:00
Jacob Støren
2604e01ddc
( #401 ) Fixed missing update (Inactive cells)
2015-09-21 08:37:49 +02:00
Jacob Støren
7a6c7149e1
( #401 ) WIP: First cell filtering Eclipse Geomec grid visible.
...
Not working very well. BB matching is not good enough.
2015-09-17 16:13:22 +02:00
Jacob Støren
b6fb85e0a4
( #401 ) WIP: Prototyped total cell visibility calculation and
...
calculation of overridden cell visibility.
2015-09-17 16:13:17 +02:00
Jacob Støren
f81cf98580
( #401 ) WIP: Refactoring Linked views update system.
...
Preparing for linking of visible Cells.
2015-09-14 09:53:28 +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
4730e10319
Created navigationPolicyUpdate to be used from navigation policies
2015-09-01 18:04:35 +02:00
Jacob Støren
9df1e48543
( #396 ) Disconnected EclipseResultDefiniton from EclipseView
...
So that it can be used in WellLogCurves
2015-09-01 17:18:53 +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
81ce665883
( #395 ) Added sync of Eclipse property filters
2015-08-28 10:02:03 +02:00
Magne Sjaastad
eaa5cc90a8
( #395 ) Removed obsolete code from property filter collection
2015-08-28 10:02:02 +02:00
Magne Sjaastad
e5f0bdfaab
Managed views can use range filters from master view
...
RangeFilterCollection is now a private field in RimView
2015-08-27 13:44:27 +02:00
Magne Sjaastad
5610bf5a10
Fixed visibility and rebuild of child items for filters
2015-08-10 23:23:41 +02:00
Magne Sjaastad
8fe6831355
Fixed visibility of even more items in tree view
2015-08-10 08:00:16 +02:00
Magne Sjaastad
65d372dd70
Fixed visibility of more items in tree view
2015-08-09 14:12:09 +02:00
Jacob Støren
78323e2299
Fixed crash due to missing LegendConfig
2015-08-07 11:09:05 +02:00
Magne Sjaastad
cb6564e381
Removed unused function setPosition. Access legendConfig as pointer instead of field
2015-08-06 08:08:16 +02:00
Pål Hagen
7315dd5318
Renamed variables according to newly renamed class names
...
"Result slot" -> "Result colors"
2015-06-26 10:00:46 +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
8e994914f5
Renamed class "RimCellEdgeResultSlot" to "RimCellEdgeColors"
2015-06-26 10:00:44 +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
f6ab965ea1
Renamed class RimWellCollection to RimEclipseWellCollection
2015-06-26 10:00:40 +02:00
Pål Hagen
7f516172cf
Renamed class RimWell to RimEclipseWell
2015-06-26 10:00:39 +02:00
Pål Hagen
b8d425a010
Renamed class RimFaultResultSlot to RimEclipseFaultColors
2015-06-26 10:00:39 +02:00
Pål Hagen
87744fb8c4
Renamed class RimResultSlot to RimEclipseCellColors
2015-06-26 10:00:38 +02:00
Pål Hagen
9458c818b4
Renamed class RimCellPropertyFilterCollection to RimEclipsePropertyFilterCollection
2015-06-26 10:00:33 +02:00
Pål Hagen
355cef2ea4
Fix for setting the current frame when generating the display model
...
Made sure that current frame is set when animation/multiple frames has
been requested. The old conditions for this were not sufficient.
2015-06-24 10:07:27 +02:00
Jacob Støren
8f2090eccf
Refactored GeoMechView createDisplayModel
...
Made adding well paths less obfuscated
Preparing for #314 Property Filter
2015-06-22 14:04:36 +02:00
Jacob Støren
74efc8da1a
Use the new RigCellSetEnum instead of unsigned char
...
Preparing for property filter
2015-06-22 08:18:42 +02:00
Jacob Støren
cfb0bfeb55
Moved RivCellSetEnum to a separate file.
...
Preparations for property filtering
2015-06-18 14:17:03 +02:00
Jacob Støren
8bf90ec27c
Renamed enum type for Cell Sets (previously called ReservoirGeometryType)
2015-06-18 14:16:58 +02:00
Stein Dale
f55b6d2519
Removed ui update code that is not needed ( #311 )
2015-06-18 13:22:13 +02:00
Stein Dale
8bdb957c8c
Handling new field "Disable Lighting" in the view ( #311 )
2015-06-18 12:23:27 +02:00
Jacob Støren
b5cfa8ab53
Renaming and improved some readability around well paths
2015-06-12 09:25:09 +02:00
Stein Dale
b59695f352
Refactored addition of well path models
...
Well path models can now be added to geo mech models. Moved code that
adds well path models to a scene from RimEclipseView to
RimView::addWellPathsToScene(). This new function is now used by both
RimEclipseView and RimGeoMechView. Made sure that it is not needed to
load a result before well paths appear. TODO: Compute characteristic hex
element size for geo mech models.
2015-06-11 13:44:21 +02:00
Jacob Støren
30fcbebc8e
Deep fix of #316 and also implements #317
...
#316 Do not show wrong results ...
#317 Avoid stopping animation when switching results
This commit cleans up some of the inconsistencies etc in the top of the
display model generation logic.
2015-06-09 16:18:11 +02:00
Jacob Støren
2c7a741805
Renamed the files of RimReservoirView to RimEclipseView
2015-05-21 10:34:38 +02:00
