3173 Commits

Author	SHA1	Message	Date
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
Magne Sjaastad	ded9cc6708	#2322 Check define before using stimPlanColors	2018-01-12 11:56:33 +01:00
Jacob Støren	67bc555d49	#2367 Fix crash in completion type calculation for wellpaths without geometry	2018-01-12 11:36:41 +01:00
Magne Sjaastad	7511e8a243	#2322 New View : Improve default values when creating view	2018-01-12 10:55:00 +01:00
Magne Sjaastad	d25f9d4b67	Use const reference	2018-01-12 10:25:16 +01:00
Magne Sjaastad	9a2eebe8f5	Fracture : Move public fields to protected, and make RimFractureTemplate friend	2018-01-12 10:21:10 +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
Bjørn Erik Jensen	65d85b82f7	#2272 fracture. Disable IO for anchor position	2018-01-10 14:43:01 +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	e22ceb5cc2	add override keyword	2018-01-10 10:33:33 +01:00
Magne Sjaastad	30cbd8018f	#2359 Move fields to private, whitespace cleanup	2018-01-10 07:44:53 +01:00
Magne Sjaastad	49eebd0c28	#2359 Fracture : Adjust default parameters for ellipse fracture	2018-01-10 07:44:53 +01:00