Magne Sjaastad
aedf184d14
Merge remote-tracking branch 'refs/remotes/origin/dev'
...
Conflicts:
ApplicationCode/ProjectDataModel/RimEclipseWell.cpp
2017-01-26 14:30:13 +01:00
Magne Sjaastad
f9a9040ed5
#1078 Added show pipe and show spheres to well collection
2017-01-26 10:27:23 +01:00
Magne Sjaastad
8304cb0393
#1078 Added showWellsIntersectingVisibleCells
...
Obsoleted wellPipeVisibility and removed wellSphereVisibility
2017-01-26 08:12:28 +01:00
Magne Sjaastad
c4d4d03cee
#1078 Added well head control to RimEclipseWell plus rename and reorder
2017-01-26 07:23:18 +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
0d7da9788a
#1112 Made conveninece methods to calculate well pipe centerline, and added possibility to do it pr timestep.
2017-01-20 17:20:09 +01:00
Jacob Støren
06b9f13e41
#1112 Well centerline with cell centers improved, and moved to centerline calculator
2017-01-20 15:57:04 +01:00
Magne Sjaastad
07b9eba3a8
Fixed missing include
2017-01-18 13:38:34 +01:00
Magne Sjaastad
36bcdab426
Merge remote-tracking branch 'refs/remotes/origin/dev'
...
Conflicts:
ApplicationCode/ModelVisualization/RivPipeGeometryGenerator.h
ApplicationCode/ProjectDataModel/RimEclipseWell.cpp
ApplicationCode/ProjectDataModel/RimEclipseWell.h
ApplicationCode/UserInterface/RiuViewerCommands.cpp
2017-01-18 12:19:07 +01:00
Magne Sjaastad
539db3cc52
#1128m Cleaned up includes
2017-01-18 09:56:42 +01:00
astridkbjorke
e6ef4fee42
#1037 - pre-proto - added classes RimSimWellFracture and RimSimWellFractureCollection, and functions for creating new / deleting.
2017-01-02 11:10:25 +01:00
astridkbjorke
ab6e12eb3a
#1038 - pre-proto - Added command feature for creating new well log collection fracture from context menu in project tree
2016-12-20 09:53:19 +01:00
Magne Sjaastad
860b51931c
#1025 Removed unsused code and renamed to isWellPipe/SpheresVisible
2016-12-14 07:15:44 +01:00
Magne Sjaastad
5aeb737795
#1025 Refactored visibility to handle both well cell pipes and well cell spheres
2016-12-13 09:35:01 +01:00
astridkbjorke
277cdf79b6
#1025 Added check for valid input for visibleCellsIntersetcsWell-function.
2016-12-12 11:35:44 +01:00
astridkbjorke
21a8acdb76
#1025 Replaced check-box with enum for showing cell center spheres
2016-12-12 11:03:37 +01:00
astridkbjorke
829c775f63
#1025 Added Show well spheres check-box option for each well
2016-12-12 11:03:37 +01:00
Magne Sjaastad
442fb04a97
#927 Rename from cross section to intersection
2016-10-25 10:03:55 +02:00
Jacob Støren
f734bf595b
#815 Renamed RimCrossSectionCollection -> RimIntersectionCollection
2016-09-21 10:52:16 +02:00
Magne Sjaastad
a7d0c0c83e
#751 : Well pipes for intersections based on Simulation Wells disappears when a Range Filter is applied
2016-07-27 08:05:44 +02:00
Jacob Støren
2a98f5b116
( #707 ) Renamed to make the use of resultWellIndex more clear
2015-12-11 17:45:09 +01:00
Jacob Støren
d01367a932
( #707 ) Fixed regression regarding well pipe and well cells
...
Introduced in 707e8c6 and not quite fixed in 179f0c9
2015-12-11 17:34:52 +01:00
Magne Sjaastad
77d66f59af
( #657 ) Added option items for well path and simulation wells
2015-11-18 15:55:24 +01:00
Magne Sjaastad
6e0c6b89b1
( #565 ) Fixed invalid guarding of index when calculating well pipe visibility
...
Reverts two previous commits cfc8c72137
and 7c8fe47683
2015-10-22 10:39:36 +02:00
Magne Sjaastad
cfc8c72137
Completed more robust check for commit 7c8fe47683
2015-09-15 16:33:40 +02:00
Magne Sjaastad
7c8fe47683
Made cell visibility check more robust
2015-09-15 12:17:10 +02:00
Magne Sjaastad
90762d0f0f
Use uiCapability/xmlCapability instead of capability<caf::PdmUiFieldHandle>()(capability<caf::PdmXmlFieldHandle>()
2015-08-05 13:27:36 +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
fd03a02645
Renamed source files according to new class names
2015-06-26 10:00:44 +02:00