Commit Graph

3186 Commits

Author SHA1 Message Date
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
Jacob Støren
d34b3a7c74 #2331 Add 2d Intersection View collection with automatic views. The create command is adjusted into a "Show" command. 2018-01-23 14:37:52 +01:00
Magne Sjaastad
bc5139257f #2141 Fracture : Remove Stimplan from UI text 2018-01-22 15:10:49 +01:00
Magne Sjaastad
348b492cc1 RiaColorTables : Add and use undefinedCellColor() 2018-01-22 11:55:27 +01:00
Magne Sjaastad
5c1f5326a0 #1544 Fracture : Show perforation length for along well path fractures 2018-01-19 15:08:31 +01:00
Magne Sjaastad
53418179ba #1544 Fracture : Add function used to compute perforation length coords 2018-01-19 15:08:31 +01:00
Magne Sjaastad
c7d61ed7f4 #1544 : Move well path radius to RimWellPath 2018-01-19 15:08:31 +01:00
Magne Sjaastad
0674eaefbf #2141 Fracture Legend : Update model when ellipse conductivity changes 2018-01-19 15:08:31 +01:00
Magne Sjaastad
04a91b92f4 Remove unused function 2018-01-19 15:08:31 +01:00
Magne Sjaastad
2da5f8cf54 #2141 Use accumulators to compute min/max used to configure legend 2018-01-19 15:08:31 +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
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
Magne Sjaastad
03de2aba5b #2332 2D Intersection View: Command to create view 2018-01-17 11:05:31 +01:00
Jacob Støren
d616548cd0 #2331 Shell of 2dIntersectionView shell added. Fixed access to views on a case including the intersection views also. 2018-01-17 08:10:05 +01:00
Jacob Støren
d283f2c733 Fix linux compile issue 2018-01-16 11:22:48 +01:00
Rebecca Cox
305e2aee38 #2372 Elm Props: Add unit [GPA] to Modulus 2018-01-16 10:56:41 +01:00
Jacob Støren
c3c2f3b75a Fix missing include 2018-01-16 10:36:41 +01:00
Jacob Støren
0debeafd68 #2331 Move RimGridView to separate files 2018-01-16 09:37:08 +01:00
Jacob Støren
b1cf7f6674 #2331 Cleaned up whitespace. Made crossectionCollection protected 2018-01-16 08:44:37 +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
Jacob Støren
b092565a61 #2331 Introduce new intermediate class RimGridView 2018-01-15 14:53:48 +01:00
Jacob Støren
1bbd3ade7b #2331 WIP: Creating new RimGridView base class 2018-01-15 14:53:48 +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
Bjørn Erik Jensen
ac59050824 #2358 Ellipse fracture template. Extracted conductivity method 2018-01-15 13:32:47 +01:00
Magne Sjaastad
523c623d39 #2152 Fracture : Rename UI text 2018-01-15 09:41:00 +01:00
Magne Sjaastad
b2e0f3df31 #2371 Fracture : Update views after change of stimplan xml file name 2018-01-15 09:16:44 +01:00
Magne Sjaastad
85ead20ec9 #2371 Fracture : Guard for null pointer access 2018-01-15 08:58:56 +01:00
Magne Sjaastad
9820cb45e4 #2371 Fracture Template : Avoid crash when StimPlan xml fails to load 2018-01-15 08:58:56 +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
27901f426c #2369 Elm Props: Close selected files 2018-01-12 16:18:54 +01:00
Magne Sjaastad
5e3bc0e5ee #2152 Fracture : Add color interpolation mode 2018-01-12 14:56:05 +01:00
Rebecca Cox
a97dd087d6 #2349 Elm Props: Use caf::FilePath instead of QString 2018-01-12 14:39:49 +01:00
Rebecca Cox
6aa2d99587 #2349 Elm Props: Only add files which are not already added 2018-01-12 12:43:39 +01:00
Magne Sjaastad
fe17d0edd4 Remove unused function 2018-01-12 12:12:03 +01:00
Jacob Støren
0bba60f22f Remove RimView.cpp due to some git strangeness 2018-01-12 12:01:04 +01:00
Jacob Støren
4b26354b30 #2331 Moved redraw scheduling and completion type recalc out of RiaApplication 2018-01-12 12:01:04 +01:00
Jacob Støren
591b72901f #2331 Reordered Rim3dView header to pave way for Rim2dIntersectionView 2018-01-12 12:01:04 +01:00
Jacob Støren
5644684606 #2331 Refactor the viewer-view communication to pave way for 2dIntersection Views 2018-01-12 12:01:04 +01:00