 Magne Sjaastad
|
3d67946976
|
Merge remote-tracking branch 'origin/dev' into pre-proto
|
2017-03-15 10:10:43 +01:00 |
|
|
Magne Sjaastad
|
647b4348eb
|
Renamed to eclipseCaseData
|
2017-03-15 09:10:16 +01:00 |
|
|
Magne Sjaastad
|
78e6c6a8fc
|
Renamed to m_eclipseCase
|
2017-03-15 08:45:08 +01:00 |
|
|
Magne Sjaastad
|
6bcc385da5
|
#1297 Use firstAncestorOrThisOfTypeAsserted, comments and whitespace
|
2017-03-15 08:43:06 +01:00 |
|
|
Magne Sjaastad
|
a22a58dd5b
|
#1297 Property Filter : Update ranges when time step changes
|
2017-03-14 17:26:40 +01:00 |
|
|
Magne Sjaastad
|
7db6dc2259
|
#1297 Fixed invalid initialization of min/max values
|
2017-03-14 17:07:27 +01:00 |
|
|
Magne Sjaastad
|
f875824eaf
|
#1297 Fixed missing update of min variable
|
2017-03-14 17:06:41 +01:00 |
|
|
Magne Sjaastad
|
ceef7f20f4
|
Removed duplicate code
|
2017-03-14 16:20:59 +01:00 |
|
|
Magne Sjaastad
|
a8f225a749
|
#1297 Added text label to display range type
|
2017-03-14 16:13:40 +01:00 |
|
|
Magne Sjaastad
|
239e9259f5
|
#1286 Subtract depth value to make TVD behave more nicely
|
2017-03-14 14:41:39 +01:00 |
|
|
Magne Sjaastad
|
1f1c82e45e
|
#1286 Show negative depth values to TVD/pseudo plots
|
2017-03-14 13:15:45 +01:00 |
|
|
Magne Sjaastad
|
4498e353df
|
#1263 ShowWellAllocationPlot must be available when well is selected
|
2017-03-14 13:15:00 +01:00 |
|
|
Magne Sjaastad
|
2b7927e5a6
|
#1286 Rename
|
2017-03-14 13:11:08 +01:00 |
|
|
Magne Sjaastad
|
5e79ed594a
|
#1285 Use "Accumulated" and "Inflow Rates"
|
2017-03-14 09:24:51 +01:00 |
|
|
Magne Sjaastad
|
f5c03e7518
|
AppFwk : Added field used to test multi selection
|
2017-03-13 07:39:36 +01:00 |
|
|
Magne Sjaastad
|
866350756c
|
#1260 Fixed typo in AppFwk
|
2017-03-13 06:59:42 +01:00 |
|
|
Magne Sjaastad
|
4a66feae26
|
#1288 Use view icon instead of case icon when selecting view
|
2017-03-12 13:17:02 +01:00 |
|
|
Magne Sjaastad
|
1e1c5b0398
|
#1288 Do not show command if no flow solution is available
|
2017-03-10 14:45:07 +01:00 |
|
|
Magne Sjaastad
|
a87ad2e56e
|
Avoid use of CAF_ASSERT in application code
|
2017-03-10 14:44:00 +01:00 |
|
|
Magne Sjaastad
|
c3bf064661
|
#1260 Use std::abort instead of assert for release asserts
|
2017-03-10 14:28:22 +01:00 |
|
|
Magne Sjaastad
|
db56dd4bc9
|
#1288 Show view selection dialog also from 3D view
|
2017-03-10 13:13:31 +01:00 |
|
|
Magne Sjaastad
|
ecfd61ce68
|
#1288 Moved copy of camera properties to RimViewManipulator
|
2017-03-10 13:13:31 +01:00 |
|
|
Magne Sjaastad
|
b60139c558
|
#1288 Remember last view modified by this command
|
2017-03-10 10:27:36 +01:00 |
|
|
Magne Sjaastad
|
2ed5ff7fb7
|
#1288 Added RicSelectViewUI and harmonized features
|
2017-03-09 23:01:58 +01:00 |
|
|
Magne Sjaastad
|
40a5f8dc02
|
#1288 Added defaultFlowDiagSolution to RimEclipseResultCase
|
2017-03-09 23:01:58 +01:00 |
|
|
Magne Sjaastad
|
7e4906fced
|
#1288 Show contributing wells from 3D view without using well alloc plot
|
2017-03-09 23:01:58 +01:00 |
|
|
Magne Sjaastad
|
6e69bdb81d
|
Added const and cleaned up includes and whitespace
|
2017-03-09 10:03:52 +01:00 |
|
|
Magne Sjaastad
|
fc5a44bf3a
|
#1305 Removed excess function
|
2017-03-09 08:11:01 +01:00 |
|
|
Magne Sjaastad
|
1309c25058
|
#1305 Update filter UI fields when address is set on filter
|
2017-03-09 08:04:02 +01:00 |
|
|
Magne Sjaastad
|
deb62d8198
|
#1305 Removed use of unique_pointer
|
2017-03-09 07:08:42 +01:00 |
|
|
Magne Sjaastad
|
6c6049a317
|
#1282 Mesh lines : Use LEQUAL for depth test to make sure highest pri is visible
|
2017-03-08 14:27:02 +01:00 |
|
|
Magne Sjaastad
|
84f76e5242
|
#1306 Use general delete sub items for well path collection
|
2017-03-08 12:20:35 +01:00 |
|
|
Magne Sjaastad
|
d547079847
|
#1306 Added general "Delete Sub Items" feature
|
2017-03-08 12:06:05 +01:00 |
|
|
Magne Sjaastad
|
a81980c235
|
#1185 Added "Plot Production Rates" for sim well in 3D and project tree
|
2017-03-08 11:42:08 +01:00 |
|
|
Magne Sjaastad
|
6791600d03
|
#1260 Replaced assert() with CAF_ASSERT() in AppFwk
|
2017-03-08 08:19:51 +01:00 |
|
|
Magne Sjaastad
|
a16a0a3bb5
|
#1260 Added assert that will display message in release (in addition to debug)
|
2017-03-07 15:45:34 +01:00 |
|
|
Magne Sjaastad
|
914b1fcab6
|
Replaced tab with four spaces
|
2017-03-07 15:43:29 +01:00 |
|
|
Magne Sjaastad
|
6a3f3e3670
|
Revert "#1292 Fixed CppCheck Issues in ProjectDataModel : Added assert"
This reverts commit cff588f166.
|
2017-03-07 12:24:35 +01:00 |
|
|
Magne Sjaastad
|
cff588f166
|
#1292 Fixed CppCheck Issues in ProjectDataModel : Added assert
Access the variable to silence CppCheck
|
2017-03-07 12:09:26 +01:00 |
|
|
Magne Sjaastad
|
811f63219c
|
#1292 Fixed CppCheck Issues in AppFwk : Use QPointer
|
2017-03-07 11:36:29 +01:00 |
|
|
Magne Sjaastad
|
b365834923
|
#1292 Fixed CppCheck Issues in AppFwk : Removed assign/copy operators
|
2017-03-07 11:14:29 +01:00 |
|
|
Magne Sjaastad
|
d3faf4ef96
|
Fixed #1289 Well Alloc Plot: Rename command to "Plot Well Allocation"
|
2017-03-06 20:08:25 +01:00 |
|
|
Magne Sjaastad
|
b2e9d3fe11
|
#1292 Fixed CppCheck Issues in AppFwk viewer/vizExtensions/CommonCode
|
2017-03-06 19:22:32 +01:00 |
|
|
Magne Sjaastad
|
749ce8e8af
|
#1292 Fixed CppCheck Issues in AppFwk/cafUserInterface
|
2017-03-06 19:15:33 +01:00 |
|
|
Magne Sjaastad
|
63baebc698
|
#1292 Fixed CppCheck Issues in AppFwk/cafProjectDataModel
|
2017-03-06 19:03:31 +01:00 |
|
|
Magne Sjaastad
|
9179ae2a14
|
#1292 Fixed CppCheck Issues in AppFwk/cafCommands
|
2017-03-06 18:33:03 +01:00 |
|
|
Magne Sjaastad
|
a5ed533c00
|
Improved unit test so they run correctly in debug
|
2017-03-06 18:33:03 +01:00 |
|
|
Magne Sjaastad
|
0bccc883ff
|
#1292 Fixed CppCheck Issues in ReservoirDataModel
|
2017-03-06 11:58:07 +01:00 |
|
|
Magne Sjaastad
|
3a1991d37d
|
#1292 Fixed bug reported by CppCheck
|
2017-03-06 11:52:32 +01:00 |
|
|
Magne Sjaastad
|
b19fe2bc4b
|
#1292 Fixed several style issues reported by CppCheck
|
2017-03-06 09:27:42 +01:00 |
|
|
Magne Sjaastad
|
e7b920fab8
|
Removed unused files
|
2017-03-03 14:12:03 +01:00 |
|
|
Magne Sjaastad
|
2b029cbc11
|
#1280 Use nullptr instead of NULL
|
2017-03-02 18:30:33 +01:00 |
|
|
Magne Sjaastad
|
3089abc83d
|
#1280 Added firstAncestorOrThisOfTypeAsserted
|
2017-03-02 18:30:33 +01:00 |
|
|
Magne Sjaastad
|
f7521ad12f
|
Merged branch pre-proto into pre-proto
|
2017-03-02 11:48:35 +01:00 |
|
|
Magne Sjaastad
|
914a2d9016
|
Upped to pre-proto.10
|
2017-03-02 11:47:26 +01:00 |
|
|
Magne Sjaastad
|
ac9f405c96
|
Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
ResInsightVersion.cmake
|
2017-03-02 11:46:25 +01:00 |
|
|
Magne Sjaastad
|
68ff093c61
|
#1266 If not computed, compute staticWellCellPath when needed
|
2017-03-01 14:23:01 +01:00 |
|
|
Magne Sjaastad
|
da416409aa
|
#1266 Assign visible grid parts before appendStaticGeometryPartsToModel()
|
2017-03-01 14:20:27 +01:00 |
|
|
Magne Sjaastad
|
4559b9f31a
|
#1263 Flow : Command : Show Contributing Wells command present when applicable
|
2017-03-01 13:23:16 +01:00 |
|
|
Magne Sjaastad
|
e29c6474bd
|
Minor refactoring
|
2017-02-28 19:17:36 +01:00 |
|
|
Magne Sjaastad
|
e41979563b
|
#1243 AppFwk : Added line width to mesh line effect
|
2017-02-28 19:00:26 +01:00 |
|
|
Magne Sjaastad
|
a2e2c99167
|
#1243 AppFwk : Fixed typo in mesh line effect
|
2017-02-28 18:48:33 +01:00 |
|
|
Magne Sjaastad
|
be6a2e0d39
|
#1243 Improved how enclosing polygon is visualized
|
2017-02-28 18:41:58 +01:00 |
|
|
Magne Sjaastad
|
61f94d90d9
|
#1243 AppFwk : Added line width to mesh line effect
|
2017-02-28 18:41:16 +01:00 |
|
|
Magne Sjaastad
|
8ce430cb25
|
#1242 Hide opacity level and discard transparent fragments
|
2017-02-27 22:21:37 +01:00 |
|
|
Magne Sjaastad
|
28b87a1700
|
#1242 AppFwk : Effect Generator : Discard transparent fragments
|
2017-02-27 22:20:06 +01:00 |
|
|
Magne Sjaastad
|
1b01e98c0e
|
Merged branch dev into pre-proto
|
2017-02-27 14:03:33 +01:00 |
|
|
Magne Sjaastad
|
48599f7a94
|
#1257 More null pointer guards based on CppCheck
|
2017-02-27 14:01:18 +01:00 |
|
|
Magne Sjaastad
|
bf1f8fcbaa
|
#1254 Use static methods instead of macros
|
2017-02-27 13:17:32 +01:00 |
|
|
Magne Sjaastad
|
97d7e5b809
|
Added RimSummaryCase
|
2017-02-27 12:01:23 +01:00 |
|
|
Magne Sjaastad
|
10f14aee8e
|
Merge remote-tracking branch 'refs/remotes/origin/dev'
|
2017-02-27 07:13:06 +01:00 |
|
|
Magne Sjaastad
|
83a1d97f33
|
#1257 More null pointer guards based on CppCheck
|
2017-02-24 16:16:58 +01:00 |
|
|
Magne Sjaastad
|
a29f6abc32
|
#1257 Added null pointer guarding based on reports from CppCheck
|
2017-02-24 16:00:56 +01:00 |
|
|
Magne Sjaastad
|
85228ee39c
|
#1255 Removed includes from RimWellPath
|
2017-02-24 14:31:06 +01:00 |
|
|
Magne Sjaastad
|
1af3df6c6c
|
#1255 Removed includes from RimWellLogCurve
|
2017-02-24 14:14:29 +01:00 |
|
|
Magne Sjaastad
|
ff99d56ea3
|
#1255 Removed includes from RimFaultCollection
|
2017-02-24 14:02:03 +01:00 |
|
|
Magne Sjaastad
|
1991a3c32d
|
#1255 Removed includes from RimCellRangeFilterCollection
|
2017-02-24 14:01:42 +01:00 |
|
|
Magne Sjaastad
|
7349d608bd
|
#1255 Removed includes from RimSummary classes
|
2017-02-24 13:56:46 +01:00 |
|
|
Magne Sjaastad
|
1792290ef0
|
#1255 Removed includes from RivReservoirWellSpheresPartMgr
|
2017-02-24 13:48:19 +01:00 |
|
|
Magne Sjaastad
|
6e960e74c3
|
#1255 Removed includes in Riv classes
|
2017-02-24 13:34:25 +01:00 |
|
|
Magne Sjaastad
|
63135a7c79
|
#1255 Removed include to RimOilRegion
|
2017-02-24 13:32:25 +01:00 |
|
|
Magne Sjaastad
|
6ec3e28a21
|
#1255 Removed includes from RimEclipseWell
|
2017-02-24 13:18:27 +01:00 |
|
|
Magne Sjaastad
|
aac42831cf
|
Whitespace
|
2017-02-24 12:41:09 +01:00 |
|
|
Magne Sjaastad
|
4ace557892
|
Added class diagram for rim and rig relationships
|
2017-02-24 12:41:00 +01:00 |
|
|
Magne Sjaastad
|
2b4d1e1fac
|
Updated class diagram for view classes
|
2017-02-24 12:40:34 +01:00 |
|
|
Magne Sjaastad
|
5c20bff5d1
|
#1255 Remove includes from header files
|
2017-02-24 11:07:26 +01:00 |
|
|
Magne Sjaastad
|
3a98e17163
|
#1254 Infrastructure for logging including Messages dock widget
|
2017-02-23 15:02:55 +01:00 |
|
|
Magne Sjaastad
|
2ce28ffff0
|
#1251 Use RivObjectSourceInfo for fractures
|
2017-02-23 11:53:26 +01:00 |
|
|
Magne Sjaastad
|
555ecba8b3
|
#1251 Added RivObjectSourceInfo for selecting any pdmObject
|
2017-02-23 11:52:56 +01:00 |
|
|
Magne Sjaastad
|
f59c4b4b9e
|
#1242 Do not use transparency on ellipse, default transparency set to 1.0
|
2017-02-23 11:25:21 +01:00 |
|
|
Magne Sjaastad
|
7f75f7e509
|
#1252 Add and use transparent color for both ellipse and stim plan objects
|
2017-02-23 10:15:56 +01:00 |
|
|
Magne Sjaastad
|
5ccde99cb3
|
Guard null pointer access
|
2017-02-23 10:14:28 +01:00 |
|
|
Magne Sjaastad
|
7717bf925f
|
Rename and moved azimuth updates to RimFracture
|
2017-02-23 09:47:30 +01:00 |
|
|
Magne Sjaastad
|
855960287d
|
#1240 Use last stimplan time step as default, improved UI updates
|
2017-02-23 09:22:19 +01:00 |
|
|
Magne Sjaastad
|
36b4238f13
|
Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
|
2017-02-23 08:44:53 +01:00 |
|
|
Magne Sjaastad
|
dc886b7e9c
|
Well path delete command supports multi selection
|
2017-02-23 08:42:27 +01:00 |
|
|
Magne Sjaastad
|
47f207998a
|
#1240 Adjustments to icons and command texts
|
2017-02-23 08:21:45 +01:00 |
|
|
Magne Sjaastad
|
c8cc667fa1
|
#1240 Use fracture icon for StimPlan colors
|
2017-02-23 07:07:57 +01:00 |
|
|
Magne Sjaastad
|
139590760f
|
#1240 Added checbox to StimPlan Colors
|
2017-02-22 15:32:19 +01:00 |
|
|
Magne Sjaastad
|
5ba0a37f34
|
Added missing include
|
2017-02-22 15:08:26 +01:00 |
|