Commit Graph

54 Commits

Author SHA1 Message Date
Magne Sjaastad
1adba2caf7 #1724 Removed unused code 2017-08-04 10:21:07 +02:00
Jacob Støren
cbb0a58673 #1648 Remove dependency on active view from color generation.
Separate the fracture geometry generation methods from the wellpath methods. Use eclipse View as argument.
Fixed some constness stuff in View
2017-06-25 10:42:53 +02:00
Magne Sjaastad
3d67946976 Merge remote-tracking branch 'origin/dev' into pre-proto 2017-03-15 10:10:43 +01:00
Magne Sjaastad
78e6c6a8fc Renamed to m_eclipseCase 2017-03-15 08:45:08 +01:00
Jacob Støren
4c8e1e2bcd #1114 WIP: Refactor: Removed RivReservoirWellSpheresPartMgr 2017-03-13 11:35:49 +01:00
Jacob Støren
d34b4e3c05 #1114 WIP: Added field in Sim Well Collection, renamed a bit as preparations 2017-03-13 11:05:46 +01:00
Magne Sjaastad
10f14aee8e Merge remote-tracking branch 'refs/remotes/origin/dev' 2017-02-27 07:13:06 +01:00
Magne Sjaastad
5c20bff5d1 #1255 Remove includes from header files 2017-02-24 11:07:26 +01:00
Magne Sjaastad
b7aebbb392 #1230 Created StimPlan colors and show lenged in 3D view 2017-02-20 09:31:24 +01:00
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
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
74fc8458ed Refactored visualization : One part manager for each fracture 2017-01-19 07:28:04 +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
45b581dc74 #1068 Added mainGrid() to RimEclipseView 2017-01-09 10:37:07 +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
astridkbjorke
600f3da30a #1025 Established geometry for all well cell centers 2016-12-07 12:06:24 +01:00
Magne Sjaastad
7d52242285 #945 Use visible grid parts to force watertight faults 2016-11-21 13:13:53 +01:00
Magne Sjaastad
3ba7ade88e #945 Rename 2016-11-18 10:49:06 +01:00
Jacob Støren
0083fb068f #815 More renaming CrossSection -> Intersection 2016-09-21 10:32:29 +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
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
95e22b581c (#639) Updated axis cross texts 2015-11-23 07:24:50 +01:00
Magne Sjaastad
9c2b1b44a6 (#657) Wired up UI to viz model generation for cross sections 2015-11-19 11:41:16 +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
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
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
adc777083d (#642) Date in animation progress.
Not removed from Info text yet
2015-11-11 16:22:44 +01: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
71e74599ff (#483) Gray out overridden range and property collections 2015-09-23 14:35:35 +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
b6fb85e0a4 (#401) WIP: Prototyped total cell visibility calculation and
calculation of overridden cell visibility.
2015-09-17 16:13:17 +02:00
Magne Sjaastad
81ce665883 (#395) Added sync of Eclipse property filters 2015-08-28 10:02:03 +02:00
Magne Sjaastad
737936d846 Major modularization adjustments
Use uiField() when issuing setUi....() commands
Use PdmChildArrayField instead of PdmPointersFielc
Use PdmChildField instead of PdmField to pdm pointer objects
Use PdmChildArrayField instead of PdmField< std::list< caf::PdmPointer<
type > > >
Use PdmObjectHandle instead of PdmObject
Replaced parentFields(std::vector)  with parentField()
Use PdmUiPropertyViewDialog instead of PdmUiPropertyDialog
2015-07-31 18:58:23 +02:00
Pål Hagen
dccfe9afb3 Bugfix: Correct handling of deletion of geo mech property filters 2015-07-01 12:07:01 +02:00
Pål Hagen
68a7993105 (#342) Added "Add property filter" to the 3D view's context menu 2015-06-30 15:37:53 +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
8e994914f5 Renamed class "RimCellEdgeResultSlot" to "RimCellEdgeColors" 2015-06-26 10:00:44 +02:00
Pål Hagen
f6ab965ea1 Renamed class RimWellCollection to RimEclipseWellCollection 2015-06-26 10:00:40 +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
1883116c59 Renamed class RimCellPropertyFilter to RimEclipsePropertyFilter 2015-06-26 10:00:32 +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