Commit Graph

1068 Commits

Author SHA1 Message Date
Gaute Lindkvist
4c3c01a661 #4210 Fix crash when creating contour map 2019-03-22 09:28:47 +01:00
Gaute Lindkvist
1536645e7c #4132 Temporarily fix contour map crash by commenting out processEvents 2019-02-22 09:06:51 +01:00
Magne Sjaastad
3acd426ead Whitespace 2019-02-18 11:15:34 +01:00
Magne Sjaastad
7fe0b92839 #4111 Move resultDefinition field to private 2019-02-18 11:07:54 +01:00
Gaute Lindkvist
d70e94ca85 #3996 Shift Measurement text box to not overlap with current segment
* Check if line is tending left or tending right and shift box if it is tending left.
2019-02-04 15:29:07 +01:00
Gaute Lindkvist
f15d6dd385 #3997 Use AppEnum for font size in preferences as well so it is more easily shared. 2019-02-04 15:20:56 +01:00
Jacob Støren
58ac488929 #3958 Refactoring : RigResultAccessorFactory simplification
To make the result address including basetimestep info reach the CellResultsData class.
2019-01-30 15:25:29 +01:00
Jacob Støren
dbb2a564a2 #3958 Refactoring: RigCaseCellResultsData: Remove the final result index based interface 2019-01-28 16:18:28 +01:00
Jacob Støren
d8eded7d49 #3958 Refactoring: Removed result index from NNC data 2019-01-25 16:19:15 +01:00
Jacob Støren
09011862cd #3958 Refactoreing: Rename 2019-01-25 16:19:14 +01:00
Jacob Støren
726f5ee596 Remove compiler warnings 2019-01-25 16:19:14 +01:00
Jacob Støren
ccfee8f34a #3958 Starting refactoring of eclipse results addressing
Preparations for time diff results
2019-01-25 16:19:13 +01:00
Gaute Lindkvist
7ede074386 #3970 Contour Maps: Remove a wrong false && that was added to test performance but caused the fix not to be effective. 2019-01-18 08:55:13 +01:00
Gaute Lindkvist
b1ad93f4b9 #3970 Contour Maps: improve edge look
* Remove excess tiny triangles around edges
* Remove labels from contour lines that overlap inner contour lines
2019-01-17 20:18:15 +01:00
Magne Sjaastad
64395e8aa3 Remove unused file 2019-01-17 10:01:56 +01:00
Magne Sjaastad
dd004c7051 #3948 HoloLens : Skip labels for annotations and measurements
No line visualization is present in HoloLens, so for now we skip labels connected by lines
2019-01-17 09:58:53 +01:00
Gaute Lindkvist
0b9b7e8eb7 #3971 Contour maps: add a label candidate for every segment but use bounding boxes and minimum curve distance to skip. 2019-01-16 14:09:28 +01:00
Gaute Lindkvist
1f754f2b63 #3807 Initial implementation of GeoMech contour maps. 2019-01-16 14:09:28 +01:00
Magne Sjaastad
a32ebe4dff #3948 HoloLens : Add labels 2019-01-15 14:07:41 +01:00
Magne Sjaastad
5222950476 #3948 HoloLens labels : Add text label source info 2019-01-15 11:51:21 +01:00
Gaute Lindkvist
f3c188ef56 #3807 Rename RimContourMapView to RimEclipseContourMapView 2019-01-11 16:06:53 +01:00
Gaute Lindkvist
31c67e29e4 #3807 Rename RimContourMapProjection to RimEclipseContourMapProjection 2019-01-11 16:06:53 +01:00
Gaute Lindkvist
d1a457bf07 #3943 Stop regenerating map geometry when altering other geometry.
* Do this by caching results and clearing the cache in three stages with each dependent on the previous stages:
  1. Grid Mapping
  2. Results
  3. Geometry
* Clearing grid mapping clears results and clearing results clears geometry.
* Some operations require only geometry changes, while others require a full change to grid mapping and consequently everything else.
2019-01-11 10:48:28 +01:00
Magne Sjaastad
d460d3d77d #3944 clang-tidy : Apply modernize-deprecated-headers 2019-01-11 08:14:53 +01:00
Magne Sjaastad
6db80f40b9 #3856 Update copyright headers 2019-01-09 15:29:24 +01:00
Gaute Lindkvist
a024a772a8 Cache cvf::Effect for text labels locally in RivContourMapProjectionPartMgr 2019-01-09 09:08:46 +01:00
Gaute Lindkvist
c8f9505d1e Fix crash in text rendering 2019-01-08 20:07:55 +01:00
Gaute Lindkvist
8de9a46c6a Rename RimContourMapProjection::generateTriangles to generateTrianglesWithVertexValues
Signed-off-by: Gaute Lindkvist <lindkvis@gmail.com>
2019-01-08 11:07:37 +01:00
Gaute Lindkvist
7a275be335 #3876 Implement rotated labels on contour maps 2019-01-08 11:07:37 +01:00
Gaute Lindkvist
71cacc550f #3881 Smooth outer contour line and clip geometry 2019-01-08 11:07:37 +01:00
Magne Sjaastad
f09fa727fa #3928 Coordinate transform : Add convert of vector of points 2019-01-03 13:16:26 +01:00
Magne Sjaastad
8f85e49849 #3924 Measurements : Rename, fix issues with points in multiple views 2019-01-03 07:18:22 +01:00
Magne Sjaastad
218472fe2c Merge branch 'dev' into measurement 2019-01-02 14:32:17 +01:00
Gaute Lindkvist
128208d35a Fix type in RiaColorTools contrastColor 2018-12-21 10:12:58 +01:00
Bjørn Erik Jensen
5976298267 Merge branch 'dev' into measurement 2018-12-21 10:08:41 +01:00
Gaute Lindkvist
9fdec77c94 #3919 Contrast colors for contour lines 2018-12-21 09:48:57 +01:00
Gaute Lindkvist
22f054c6b9 #3919 Apply contrast colours to contour lines as well. 2018-12-21 09:48:57 +01:00
Gaute Lindkvist
6754f837d4 #3876 First label implementation. Not rotated yet. 2018-12-21 09:48:56 +01:00
Bjørn Erik Jensen
21403f4161 #3805 Measurement. Double click in view to reset measurement 2018-12-21 09:23:53 +01:00
Gaute Lindkvist
d259f8f33a Move display transforms from contour map 2018-12-20 14:10:20 +01:00
Bjørn Erik Jensen
d6f4962ed7 #3806 Measurement. Display text label at last clicked position 2018-12-20 12:34:17 +01:00
Gaute Lindkvist
10da90350f #3876 Create Counter Clockwise closed polygons out of the contour line segments 2018-12-20 09:47:25 +01:00
Bjørn Erik Jensen
849a623379 #3804 #3805 Measurement. Add toolbar button and interactive picking 2018-12-19 14:41:17 +01:00
Bjørn Erik Jensen
4873381176 #3868 Annotations. Fix polyline visualization and property editor 2018-12-18 12:50:21 +01:00
Bjørn Erik Jensen
c575e1d29e #3868 Annotations. Remove commented code 2018-12-14 15:34:18 +01:00
Bjørn Erik Jensen
8401e3d9f0 #3868 Annotations. Draw spheres on polylines + toggles conotrolling visibility 2018-12-14 15:32:32 +01:00
Bjørn Erik Jensen
9c750c5287 #3869 Annotations. Closing polyline support 2018-12-13 15:58:32 +01:00
Bjørn Erik Jensen
b4482d20b0 #3723 Annotations. User editable polyline, both in in view and in property editor 2018-12-07 09:11:19 +01:00
Bjørn Erik Jensen
00d767f67c #3789 Annotations. Text appearance settings. New FontCache class 2018-12-05 14:39:07 +01:00
Bjørn Erik Jensen
e56090dc92 #3788 Annotations. Set texts and icons 2018-12-03 15:29:23 +01:00