 Rebecca Cox
|
5d840368b1
|
#2390 Intersections: Move paste command to the top in the context menus
|
2018-01-24 13:10:17 +01:00 |
|
|
Rebecca Cox
|
8b4a1f05bc
|
#2390 Intersections: Add Copy/Paste
|
2018-01-24 11:44:20 +01:00 |
|
|
Rebecca Cox
|
140b75df88
|
#2390 Intersections: Add noUpdate-version of appendIntersection and appendIntersectionBox
|
2018-01-24 11:30:39 +01:00 |
|
|
Rebecca Cox
|
97aab5bda5
|
Merge remote-tracking branch 'origin/2018.01.01-patch' into dev
|
2018-01-24 10:56:10 +01:00 |
|
|
Rebecca Cox
|
650fc2147d
|
#2404 Intersection: Update 3d view when creating new Intersection Box
|
2018-01-24 10:48:23 +01:00 |
|
|
Rebecca Cox
|
e68f0e2be8
|
Merge branch '2018.01.01-patch' into dev
|
2018-01-24 08:33:47 +01:00 |
|
|
Rebecca Cox
|
9617481406
|
#2327 Formation RFT Plot: Read tvdss from well pick files
|
2018-01-24 08:21:22 +01:00 |
|
|
Rebecca Cox
|
fbb6f56bd3
|
#2382 Elm props: Update Result Info to show relevant Element Result info
|
2018-01-19 13:36:51 +01:00 |
|
|
Rebecca Cox
|
7726ed1610
|
#2366 AppFwk: Use caf::FilePath for odb-file
|
2018-01-19 12:53:37 +01:00 |
|
|
Rebecca Cox
|
56188c8f3f
|
#2380 AppFwk: Move fieldsByType to RimProject
|
2018-01-19 12:52:50 +01:00 |
|
|
Rebecca Cox
|
ed930da11d
|
#2380 AppFwk: Take vector<T*>* as argument, not vector<PdmField<T*>>*
|
2018-01-19 08:02:09 +01:00 |
|
|
Rebecca Cox
|
b84812616f
|
Merged from patch-branch to dev-branch
|
2018-01-18 15:43:27 +01:00 |
|
|
Rebecca Cox
|
79539c1c99
|
#2378 Fractures: Hide "Fracture Colors" in Project tree when not in use
|
2018-01-18 15:04:04 +01:00 |
|
|
Rebecca Cox
|
39cf8e8b0d
|
#2378 Fractures: Hide "Fracture Colors" in Project tree when not in use
|
2018-01-18 11:42:29 +01:00 |
|
|
Rebecca Cox
|
bbda7f30a2
|
NULL -> nullptr
|
2018-01-18 08:11:26 +01:00 |
|
|
Rebecca Cox
|
548c065290
|
Fix cotire build
|
2018-01-16 16:24:29 +01:00 |
|
|
Rebecca Cox
|
4adec8d2bf
|
#2380 AppFwk: Make template function to find all PdmFields of a type
|
2018-01-16 16:01:42 +01:00 |
|
|
Rebecca Cox
|
dcff8c1536
|
#2372 Elm Props: Scale Modulus by a factor of 1e-9
|
2018-01-16 10:56:41 +01:00 |
|
|
Rebecca Cox
|
305e2aee38
|
#2372 Elm Props: Add unit [GPA] to Modulus
|
2018-01-16 10:56:41 +01:00 |
|
|
Rebecca Cox
|
96bff27519
|
#2372 Elm props: Map modulus and ratio ui names
|
2018-01-15 17:40:39 +01:00 |
|
|
Rebecca Cox
|
58123f4a49
|
#2369 Elm props: Only delete results from the closed files
|
2018-01-15 16:09:52 +01:00 |
|
|
Rebecca Cox
|
4bf8de2787
|
#2369 Elm props: Clear cell results on deletion
|
2018-01-15 14:48:05 +01:00 |
|
|
Rebecca Cox
|
277bd496f1
|
Add override keyword
|
2018-01-15 14:48:05 +01:00 |
|
|
Rebecca Cox
|
47e154bf53
|
#2370 Elm props: Update prop filters + intersections on reload
|
2018-01-15 08:52:00 +01:00 |
|
|
Rebecca Cox
|
673ad12dee
|
#2370 Elm Props: Reload selected files. Prop filters etc not updated
|
2018-01-14 09:10:23 +01:00 |
|
|
Rebecca Cox
|
a8039b8569
|
#2369 Elm Props: Remove deleted field results from cache
|
2018-01-13 12:38:08 +01:00 |
|
|
Rebecca Cox
|
27901f426c
|
#2369 Elm Props: Close selected files
|
2018-01-12 16:18:54 +01:00 |
|
|
Rebecca Cox
|
3b46849c79
|
Fix warning
|
2018-01-12 16:14:30 +01:00 |
|
|
Rebecca Cox
|
a97dd087d6
|
#2349 Elm Props: Use caf::FilePath instead of QString
|
2018-01-12 14:39:49 +01:00 |
|
|
Rebecca Cox
|
efaaab1dc6
|
#2360 Elm Props: Make sure either elementIdxToId or elementIdToIdx is larger than elementIdsFromFile
|
2018-01-12 14:08:11 +01:00 |
|
|
Rebecca Cox
|
27f7f07ffd
|
Replace auto
|
2018-01-12 12:43:39 +01:00 |
|
|
Rebecca Cox
|
b08e382dae
|
#2360 Elm Props: Use correct index to id map
|
2018-01-12 12:43:39 +01:00 |
|
|
Rebecca Cox
|
6aa2d99587
|
#2349 Elm Props: Only add files which are not already added
|
2018-01-12 12:43:39 +01:00 |
|
|
Rebecca Cox
|
3786adc9b7
|
#2347 Elm Props: Evaluate result type ELEMENT for WellLogExtractor
|
2018-01-11 11:35:31 +01:00 |
|
|
Rebecca Cox
|
e4e160cdd4
|
#2347 Elm Props: Evaluate result type ELEMENT for Intersections
|
2018-01-11 11:35:08 +01:00 |
|
|
Rebecca Cox
|
e0d91f90ae
|
#2360 Elm Props: Correct text in result info
|
2018-01-11 10:58:52 +01:00 |
|
|
Rebecca Cox
|
de95ee0a9a
|
#2347 Elm props: Traverse result type ELEMENT in stat calc
|
2018-01-11 10:58:24 +01:00 |
|
|
Rebecca Cox
|
cede66c8c0
|
#2360 Elm Props: Correct UI text in 3d overlay info
|
2018-01-11 10:19:22 +01:00 |
|
|
Rebecca Cox
|
81a7fb204d
|
#2360 Elm Props: Correct UI text
|
2018-01-10 16:32:59 +01:00 |
|
|
Rebecca Cox
|
5751acf2b9
|
#2347 Elm props: Evaluate result type ELEMENT in property visibility
|
2018-01-10 15:23:00 +01:00 |
|
|
Rebecca Cox
|
2ce7e2c3d2
|
#2360 Elm props: Use element index in closest result intex calc
|
2018-01-10 15:20:21 +01:00 |
|
|
Rebecca Cox
|
118980d568
|
#2360 Elm Props: read metadata on project load
|
2018-01-10 12:55:36 +01:00 |
|
|
Rebecca Cox
|
2cd006882f
|
#2360 Elm Props: Wire up reading of elm prop data into data structures
|
2018-01-10 10:43:33 +01:00 |
|
|
Rebecca Cox
|
0dc0533501
|
#2350 Elm props: Fix crash when table has only one data column
|
2018-01-10 10:33:33 +01:00 |
|
|
Rebecca Cox
|
e22ceb5cc2
|
add override keyword
|
2018-01-10 10:33:33 +01:00 |
|
|
Rebecca Cox
|
57ae195372
|
#2349 Elm Props: Create list of imported files in Geomech Case prop pan
|
2018-01-09 09:50:13 +01:00 |
|
|
Rebecca Cox
|
9513cb61d5
|
#2348 Elm prop: Add ELEMENT to set of valid resultPosTypes
|
2018-01-09 08:46:52 +01:00 |
|
|
Rebecca Cox
|
ab67ddfecb
|
#2348 Elm Props: Import command on case
|
2018-01-09 08:45:47 +01:00 |
|
|
Rebecca Cox
|
0dff5fc1a5
|
Merge branch '2018.01.01-patch' into dev
|
2018-01-09 07:37:40 +01:00 |
|
|
Rebecca Cox
|
397168df17
|
#2347 Elm Props: Create new Result Position entry called Element
|
2018-01-09 07:37:07 +01:00 |
|
|
Rebecca Cox
|
cd4b930d77
|
#2352 Geomech: Geo mech: Fix crash when choosing invalid Result Variable
|
2018-01-08 16:34:41 +01:00 |
|
|
Rebecca Cox
|
ab35d30ff5
|
#2348 Elm Props: "Import Element Property Table" command
|
2018-01-08 14:48:00 +01:00 |
|
|
Rebecca Cox
|
9a41e1c134
|
#2321 Avoid crash when opening a project file with a PLT/RFT plot and where main plot window was closed before saving
|
2018-01-05 11:11:27 +01:00 |
|
|
Rebecca Cox
|
074a8fc546
|
#2303 Formations: Remove well pick filter when depth type is PL
|
2018-01-05 08:36:59 +01:00 |
|
|
Rebecca Cox
|
cf12e5ae36
|
#2303 Formations: Update well path only when formation source changes
|
2018-01-05 08:36:59 +01:00 |
|
|
Rebecca Cox
|
fc2e638ba2
|
#2303 Formation: Make formations for RFT and PLT work
|
2018-01-05 08:36:59 +01:00 |
|
|
Rebecca Cox
|
50776f5819
|
Fix typo
|
2018-01-03 15:30:27 +01:00 |
|
|
Rebecca Cox
|
cffca0f3fb
|
#2310 Add a variety of version numbers
|
2018-01-03 13:54:00 +01:00 |
|
|
Rebecca Cox
|
7d4bb47cc8
|
#2307 Update licence info
|
2018-01-03 08:58:57 +01:00 |
|
|
Rebecca Cox
|
8ed0393863
|
Remove grid index from cell reference text if grid is main grid
|
2017-12-18 11:27:59 +01:00 |
|
|
Rebecca Cox
|
d5b12a8b23
|
Summary header parsing: Add summary region2region mnemonic
|
2017-12-15 13:48:20 +01:00 |
|
|
Rebecca Cox
|
0788cfe3db
|
Remove *inc file format.
|
2017-12-14 14:26:10 +01:00 |
|
|
Rebecca Cox
|
d777a4a873
|
#2246 Vector descriptions: Align code
|
2017-12-14 11:34:22 +01:00 |
|
|
Rebecca Cox
|
170c00c88a
|
#2210 Add "Export Visible Cells as FLUXNUM/MULTNUM" to file->export
|
2017-12-13 15:24:40 +01:00 |
|
|
Rebecca Cox
|
2b0305fcc4
|
#2247 Add export FLIXNUM/MULTNUM to context menu on Cell Result item in tree view
|
2017-12-12 16:07:02 +01:00 |
|
|
Rebecca Cox
|
5a03783328
|
#2209 Use correct view in cmd "Export Visible Cells as FLUXNUM/MULTNUM"
|
2017-12-12 15:38:24 +01:00 |
|
|
Rebecca Cox
|
17ece26929
|
Don't set activeReservoirView if selected RimView doesn't have RiuViewer
|
2017-12-12 14:26:14 +01:00 |
|
|
Rebecca Cox
|
6e4449960f
|
#2227 Well formatins: Clear well path if it does not have well picks
|
2017-12-12 08:38:04 +01:00 |
|
|
Rebecca Cox
|
3e5209d1a7
|
#2227 Well formations: Remove fluids from Level type
|
2017-12-11 16:07:15 +01:00 |
|
|
Rebecca Cox
|
fb876f8fdc
|
#2227 Well formations: Remove fluid annotation duplicates
|
2017-12-11 15:12:12 +01:00 |
|
|
Rebecca Cox
|
03b03cd438
|
Update plots on well pick import
|
2017-12-11 15:12:12 +01:00 |
|
|
Rebecca Cox
|
864b9466d5
|
#2227 Well formations: Handle "+" in formation name file input
|
2017-12-11 15:12:12 +01:00 |
|
|
Rebecca Cox
|
c3cd0a650e
|
#2227 Well formations: update ui. remove level from RigWellPathFormation
|
2017-12-11 15:12:12 +01:00 |
|
|
Rebecca Cox
|
406c371682
|
#2227 Well formation: Make level filter dynamic
|
2017-12-11 15:12:12 +01:00 |
|
|
Rebecca Cox
|
fa3d9c4fc2
|
#2227 Well Formation: Add filter. Filter options not dynamic
|
2017-12-11 15:12:12 +01:00 |
|
|
Rebecca Cox
|
a2d2879bab
|
#2227 Well formations: New Rig data stucture with top+base MD and level
|
2017-12-08 09:27:37 +01:00 |
|
|
Rebecca Cox
|
4856c5ee30
|
#2202 Geomech: Avoid visibility calculation for unvalid property filters
|
2017-12-07 10:18:46 +01:00 |
|
|
Rebecca Cox
|
23844e3b78
|
Fix compile warning
|
2017-12-07 09:31:13 +01:00 |
|
|
Rebecca Cox
|
48f9769eb7
|
#2221 Well Path Formation names: Improve user feedback on import
|
2017-12-07 08:34:12 +01:00 |
|
|
Rebecca Cox
|
9a4eab2569
|
#2232 Well formations: Read new file format
|
2017-12-07 08:28:20 +01:00 |
|
|
Rebecca Cox
|
8608e00b35
|
#2224 Well Formations: Make Reloading the csv file work
|
2017-12-06 12:01:33 +01:00 |
|
|
Rebecca Cox
|
6198ec4284
|
#2225 Well formations: Make header checking easier
|
2017-12-06 08:40:47 +01:00 |
|
|
Rebecca Cox
|
1675c17314
|
#2225 Well formations: Support extra headerlines within the csv file
|
2017-12-06 08:40:47 +01:00 |
|
|
Rebecca Cox
|
0a38806a4e
|
System: Allow one line ifs in clang format
|
2017-12-06 08:19:42 +01:00 |
|
|
Rebecca Cox
|
bef764bf5b
|
#2225 Well formations: Handle tabs in well path formations reader
|
2017-12-06 08:19:42 +01:00 |
|
|
Rebecca Cox
|
5145d3f8a5
|
#2223 Well Formations: Rename to Well Picks where sensible
|
2017-12-05 14:14:53 +01:00 |
|
|
Rebecca Cox
|
899a226a38
|
#2226 Well Formations: Avoid adding "Top" to the formation names
|
2017-12-05 12:56:21 +01:00 |
|
|
Rebecca Cox
|
bc026da2f6
|
#2221 Well Path Formation names: Add logging on import and well creation/matching
|
2017-12-05 08:58:51 +01:00 |
|
|
Rebecca Cox
|
860458eb28
|
#2123 Formation/Well Path: Code clean up
|
2017-12-04 15:47:35 +01:00 |
|
|
Rebecca Cox
|
c90715d038
|
Fix linux error
|
2017-12-04 12:08:29 +01:00 |
|
|
Rebecca Cox
|
8ab70887c3
|
#2219 Intersections: Fix max height of intersection bug
|
2017-12-04 10:56:57 +01:00 |
|
|
Rebecca Cox
|
99dd255ee8
|
Formations: Change group name
|
2017-12-04 10:26:34 +01:00 |
|
|
Rebecca Cox
|
32c1fa25d5
|
Guard for if eclipseCaseData is null
|
2017-12-01 15:39:54 +01:00 |
|
|
Rebecca Cox
|
a5300032e9
|
#2213 Formations: Select formation on a case, only if a single file is imported
|
2017-12-01 15:39:54 +01:00 |
|
|
Rebecca Cox
|
a2a7155d1c
|
#2213 Formations: On import, set formation on active case
|
2017-12-01 13:31:12 +01:00 |
|
|
Rebecca Cox
|
917b824177
|
#2144 Context menu: New uiText on menus
|
2017-12-01 13:31:12 +01:00 |
|
|
Rebecca Cox
|
1c628fcf3e
|
Change color in statistics dialog
|
2017-12-01 13:31:12 +01:00 |
|
|
Rebecca Cox
|
8d7a578d6f
|
#2137 Formation Names: Update all plots necessary when changing formation names on case
|
2017-12-01 10:26:32 +01:00 |
|
|
Rebecca Cox
|
86e348a9f8
|
#2182 RFT: Make path creation of RFT files more robust
|
2017-12-01 10:19:03 +01:00 |
|
|
Rebecca Cox
|
c86161a0a6
|
#2144 Context menu: Add icons to sub menus
|
2017-12-01 09:11:11 +01:00 |
|