Commit Graph

59 Commits

Author SHA1 Message Date
Magne Sjaastad
c35e79c3b5 Merge branch 'dev' into pre-proto 2017-04-20 13:40:56 +02:00
Bjørnar Grip Fjær
b2d3a84862 #171 Add support for absolute UNIX paths for fault include files on Windows 2017-04-18 11:32:31 +02:00
Jacob Støren
2edbffdba5 #1399 QA of Eclipse Well Property panel. Aligned to the Overall Well Settings 2017-04-07 08:52:42 +02:00
Jacob Støren
3b0e2957f6 #1399 Finalized SimulationWells property panel based on input. 2017-04-07 08:40:54 +02:00
Jacob Støren
26b85dedfc #1402 Fixed Well Alloc plot case switching, and removed dependency on active view 2017-04-06 14:15:12 +02:00
Magne Sjaastad
8255a3aaa3 Merge branch 'dev' into pre-proto 2017-04-03 07:34:56 +02:00
Magne Sjaastad
bfedfe9c30 Fixed #1316 2017-03-15 14:08:41 +01:00
Magne Sjaastad
3d67946976 Merge remote-tracking branch 'origin/dev' into pre-proto 2017-03-15 10:10:43 +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
6ec3e28a21 #1255 Removed includes from RimEclipseWell 2017-02-24 13:18:27 +01:00
Magne Sjaastad
f9d8ab8bad Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
	ApplicationCode/ProjectDataModel/RimEclipseWellCollection.cpp
	ApplicationCode/Resources/ResInsight.qrc
2017-02-16 10:18:39 +01:00
Magne Sjaastad
9a7f187765 #1222 Interpolate category colors and assign well color based on sorted order 2017-02-15 13:26:59 +01:00
Magne Sjaastad
d1743be8e7 #1178 Update well allocation plots when well color changes 2017-02-10 19:12:21 +01:00
Magne Sjaastad
652df8854d #1180 Use RiaColorTables for several features (well log, summary, flow rates) 2017-02-10 08:39:25 +01:00
Magne Sjaastad
c197f22013 #1189 Improved text in UI and reorganized color buttons 2017-02-08 14:00:06 +01:00
Magne Sjaastad
93954fece0 Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
	ApplicationCode/Commands/RicDeleteItemFeature.cpp
2017-02-08 07:35:20 +01:00
Magne Sjaastad
011fd30d08 #1189 Use text "Hide Wells Not Intersecting Filtered Cells" 2017-02-07 18:16:19 +01:00
Magne Sjaastad
2404cf1582 #1189 Visibility of well cells now follow visible range filtered cells 2017-02-07 15:33:04 +01:00
Magne Sjaastad
0061067aa7 #1189 Do not consider well cells when controlling pipe/sphere visibilities 2017-02-07 15:33:04 +01:00
Magne Sjaastad
c28ed7f206 Default state is to show all wells 2017-02-06 11:09:02 +01:00
Magne Sjaastad
f186d77136 When entering "Show well cells" state, do not hide wells not intersecting visible cells 2017-02-06 11:07:35 +01:00
Magne Sjaastad
7738b7f74b Fixed merge issue 2017-02-03 10:52:22 +01:00
Magne Sjaastad
6dc0a7ff59 Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
	ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
	ApplicationCode/ProjectDataModel/RimEclipseWell.cpp
	ApplicationCode/ProjectDataModel/RimEclipseWellCollection.cpp
	ResInsightVersion.cmake
2017-02-03 10:51:46 +01:00
Magne Sjaastad
7abdc38d92 #1148 Fixed issue causing well cells to always be enabled 2017-02-02 11:27:55 +01:00
Magne Sjaastad
b90b2fbc04 Use ordering of RigSingleWellResultsData when assigning well colors 2017-02-02 10:34:32 +01:00
Magne Sjaastad
c4d9c1d780 #1148 Made tristate of well cell fence 2017-02-02 09:59:26 +01:00
Magne Sjaastad
53bccf3d0f #1148 Improved obsolete field behaviour for well head, label and well cells 2017-02-02 09:59:26 +01:00
Magne Sjaastad
fad0974b3f #1148 Use tristate for well cell visibility 2017-02-02 09:59:26 +01:00
Magne Sjaastad
a4ce5f532d #1148 Use tristate to indicate visibility of simulation well geometry 2017-02-01 09:52:01 +01:00
Magne Sjaastad
9aa273e3a2 #1148 Rename and reorder of items in panel 2017-01-30 14:53:20 +01:00
Magne Sjaastad
b13ca8bb1c #1135 Compute accumulated length along sim well and added slider 2017-01-30 14:28:41 +01:00
Magne Sjaastad
bd14f97a2b #1094 Use range based for 2017-01-27 15:48:56 +01:00
Magne Sjaastad
1e20a61d4c #1078 Updated enabled state of well cells and well cell fence 2017-01-26 18:01:08 +01:00
Magne Sjaastad
8f4fa4592a #1078 Improved well cells and well cell fence settings 2017-01-26 17:41:34 +01:00
Magne Sjaastad
d0f613520e #1078 Added possibility to show/hide connection status colors 2017-01-26 14:25:34 +01:00
Magne Sjaastad
1f9ef0d942 #1078 Added color control to sim well collection 2017-01-26 12:25:45 +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
f5000766c4 #1077 Added option to draw simulation well pipes from center to center 2017-01-18 08:06:03 +01:00
Magne Sjaastad
860b51931c #1025 Removed unsused code and renamed to isWellPipe/SpheresVisible 2016-12-14 07:15:44 +01:00
Magne Sjaastad
89278dc6c8 #1025 Include well sphere visibility to show time animation control 2016-12-13 10:02:46 +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
Magne Sjaastad
4e54c8c5ef #1025 Well spheres set to default off 2016-12-13 08:45:39 +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
astridkbjorke
cd6494cc0c #1025 Created well cell center spheres group box and added sphere radius controls 2016-12-08 09:59:45 +01:00
astridkbjorke
916ab51df4 #1025 Only showing cell center sphere if well is visible 2016-12-08 09:59:45 +01:00
astridkbjorke
600f3da30a #1025 Established geometry for all well cell centers 2016-12-07 12:06:24 +01:00