OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity
3,927 Commits 27 Branches 61 Tags 309 MiB
cd3b6da47f
Commit Graph

1550 Commits

Author SHA1 Message Date
Magne Sjaastad
5302655dc0 #906 Computed datum elevation if measured depth is close to zero 2016-10-26 07:32:18 +02:00
Magne Sjaastad
9eb6ae88ff #906 If present, show datum elevation in property editor for a well path 2016-10-26 07:32:18 +02:00
Magne Sjaastad
c418650546 #932 Intersection box : Added xy step size and depth step size 2016-10-25 13:12:43 +02:00
Magne Sjaastad
442fb04a97 #927 Rename from cross section to intersection 2016-10-25 10:03:55 +02:00
Magne Sjaastad
3dd0829efa #927 Intersection box: 3D manipulator not updated when changing scale 2016-10-25 09:50:33 +02:00
Magne Sjaastad
422fb90df2 #857 Added title to time axis 2016-10-24 12:51:52 +02:00
Jacob Støren
593fe93244 #930, #925, #914 
* Formation names format changed to allow no space around k-layer numbers. Also added possibility to use one number as k-layer count for the name. Based on  previous names last layer
* Deleted geomech cache of formation name result when updating the formation names
* Added TNH TNQV THQV to plane transformed stresses.
 2016-10-21 14:31:31 +02:00
Magne Sjaastad
bc82a0e45c #760 Include cleanup 2016-10-21 14:02:06 +02:00
Magne Sjaastad
7c69ae434e #760 Input Property rename does not update dependent fields 2016-10-21 13:57:15 +02:00
Magne Sjaastad
1fd5ffb522 #928 Refactoring and simplification of code 2016-10-21 08:48:33 +02:00
Magne Sjaastad
1fbd179167 #724 Reordered items in property editor 2016-10-21 07:47:28 +02:00
Jacob Støren
26accc9e9a Merged with dev 2016-10-20 16:19:30 +02:00
Magne Sjaastad
1106bd4381 #923 Use general polylines instead of always use user defined polyline 2016-10-20 11:27:07 +02:00
Magne Sjaastad
82bb1af97a #922 Replace use of setValueFromUi 2016-10-20 11:25:22 +02:00
Jacob Støren
d8247c2ac6 #914 Added calculation of element face aligned stress 2016-10-20 10:50:29 +02:00
Magne Sjaastad
e732d5c373 #922 Use setValueWithFieldChanged instead of setValueFromUi 2016-10-19 15:30:52 +02:00
Magne Sjaastad
522ae9998f #923 Intersections : Added viz for extrusion direction by two points 2016-10-18 14:25:31 +02:00
Magne Sjaastad
c3816acfbf #923 Picking of points affects only one list of points 2016-10-18 12:04:08 +02:00
Magne Sjaastad
8c3f707758 #923 Intersections: Input points by clicking in 3D view 2016-10-18 11:57:05 +02:00
Magne Sjaastad
6bb0c3b87e #923 Moved extrusion computation to RimIntersection 2016-10-18 10:22:20 +02:00
Magne Sjaastad
2ca40025f2 #924 Removed obsolete code 2016-10-18 09:09:44 +02:00
Magne Sjaastad
649c11efcb #924 Cleaned up includes and use RimGeoMechResultDefinition instead of RimGeoMechCellColors 2016-10-18 07:31:02 +02:00
Magne Sjaastad
6da4d7bb60 #920 Fixed how user-defined values are handled for intersection planes 2016-10-17 13:15:27 +02:00
Magne Sjaastad
9a7138ddcd #842 Added plot title 2016-10-14 15:38:21 +02:00
Magne Sjaastad
d5213b2a43 #862 Added scale picker to select axis 2016-10-14 15:06:21 +02:00
Magne Sjaastad
71f1966c1c #906 Las Export: Fixed issue with TVDRKB export and improved UI 2016-10-14 13:30:04 +02:00
Magne Sjaastad
169944641f Guard against accessing null pointer 2016-10-14 11:52:09 +02:00
Jacob Støren
c3eb692afe Merge with branch 'dev' 2016-10-13 12:44:44 +02:00
Jacob Støren
f4fde3cc1c #912 Fixed the custom option menue based on the new standard from caf. Added an "experimental" color range for angular results. 2016-10-13 12:13:32 +02:00
Magne Sjaastad
30bef2bb17 #853 Support zooming when two y-axis are present 2016-10-13 09:33:50 +02:00
Magne Sjaastad
a816454494 #855 Update font size for time axis 2016-10-12 13:58:47 +02:00
Magne Sjaastad
ae1eea4ac6 #779 Added support for filtering of zero and negative values in setSamplesFromDateAndValues 2016-10-12 13:49:57 +02:00
Magne Sjaastad
ee367487de #779 Summary : Added display and axis control of log scale 2016-10-12 12:20:49 +02:00
Magne Sjaastad
7a591a3cc1 #840 Use Qwt to convert QDateTime objects, as toMSecsSinceEpoch was introduced in Qt 4.7 2016-10-12 10:32:56 +02:00
Magne Sjaastad
62411301da (#840) Summary : Added properties for time axis 2016-10-12 10:14:48 +02:00
Magne Sjaastad
3f97640e7a (#869) Datastructures for right y-axis 2016-10-12 10:08:08 +02:00
Magne Sjaastad
8ae75b5f27 AppFwk : Added concept of isUiTreeHidden and isUiTreeChildrenHidden 2016-10-12 10:08:08 +02:00
Magne Sjaastad
c07f13d407 (#869) Summary : Right axis WIP 2016-10-12 10:08:08 +02:00
Magne Sjaastad
6a8801e179 (#857) Summary : Support for custom axis title 2016-10-12 10:08:08 +02:00
Magne Sjaastad
63ed368b5c (#857) Summary : Added properties for left and right Y-axis 2016-10-12 10:08:08 +02:00
Jacob Støren
faddabadba #912 Deviatoric Stress added 2016-10-11 14:54:42 +02:00
Jacob Støren
b61cd434cf Fixed misplaced value list in range filter 2016-10-11 14:41:52 +02:00
Jacob Støren
ca2689dd19 #912 Added Effective Mean Stress (SEM) 2016-10-11 13:17:12 +02:00
Jacob Støren
1a920338cc #912 Added Mean Stress (SM) 2016-10-11 12:13:23 +02:00
Magne Sjaastad
aa6cc5a861 Linux fix 2016-10-11 09:35:23 +02:00
Jacob Støren
1ef3b65636 #885 Organized the Gui with these options at the bottom with more (?) sensible labels. Made sure the variable was deselected when switching the time lapse options. 2016-10-10 17:32:47 +02:00
Jacob Støren
97625a4cea #885 Modified Gui texts to show the time lapse state "_DN" 2016-10-10 16:37:13 +02:00
Jacob Støren
d0c70f1653 #885 Time lapse derived results. Works, but needs polish and testing 2016-10-10 16:09:54 +02:00
Jacob Støren
fd71ea3aa6 #849 Icon brushup due to new SummaryCaseIcon 2016-10-07 15:48:17 +02:00
Jacob Støren
fd97183a9e #852 Improved auto assigning of appearance, including better default colors, and stable startup colors 2016-10-07 11:34:52 +02:00
Magne Sjaastad
834e3aae7b Moved implementation to source file to avoid compile issues 2016-10-06 15:41:31 +02:00
Magne Sjaastad
39356c2b2a #849 Added Import Summary Case command 2016-10-06 15:02:11 +02:00
Magne Sjaastad
b4d6e40247 #849 Added import summary case command 2016-10-06 15:02:11 +02:00
Jacob Støren
a9509c0212 #903 Fixed formation names file name presentation in UI. Use filename wo/path 2016-10-05 15:43:27 +02:00
Jacob Støren
0ca0179c5a #866 Hide appearance settings in curve filter when auto is on 2016-10-05 14:22:45 +02:00
Jacob Støren
c7a1bdd88a #865 Short name -> Display Name, Auto off, Use Case Name as default display name. 2016-10-05 14:15:55 +02:00
Jacob Støren
b2728b070b #871 Keep new zoom settings when toggling the curves/curve filter 2016-10-05 13:56:27 +02:00
Jacob Støren
b3657bcf43 #871 Curve Filter toggle added 2016-10-05 12:02:15 +02:00
Magne Sjaastad
cbdc313cf3 #846 Do not force display of plot main window from well log plots and track 2016-10-05 11:55:54 +02:00
Magne Sjaastad
98643a7b84 #846 Make sure plots widgets are updated when the plot main window is created 2016-10-05 10:04:41 +02:00
Magne Sjaastad
2d5295cf74 #846 Store window state for mainwindows in project and moved features into ApplicationCommands 2016-10-05 08:54:39 +02:00
Jacob Støren
8e95fda144 #846 Plot Window and 3D Window icons 2016-10-04 14:36:49 +02:00
Magne Sjaastad
8277080c2e #846 If plot window is hidden, do not open plot window when loading case with summary data 2016-10-04 13:14:39 +02:00
Jacob Støren
0fc1d9cbf8 #814 Intersection Box: Adjusted UI a bit 2016-10-04 10:10:06 +02:00
Magne Sjaastad
7659f58fd6 #884 Intersection collection is responsible for adding box manipulator geometry to model used in 3D viewer 2016-10-03 14:26:46 +02:00
Magne Sjaastad
bdf880d1ab #884 Update manipulator box when single plane state changes 2016-10-03 10:15:14 +02:00
Jacob Støren
8d5240aca5 #889 Added different icons to the intersection box tree items as well 2016-09-30 13:10:49 +02:00
Magne Sjaastad
1537b8c0d1 #884 RimIntersectionBox now manages the box manipulator object 2016-09-30 12:33:32 +02:00
Magne Sjaastad
465a28dfe9 #884 Fixed change from z-coord to depth 2016-09-30 10:28:43 +02:00
Magne Sjaastad
d7a69bdae8 Merged intersection box interactive manipulation 2016-09-30 10:01:17 +02:00
Magne Sjaastad
593d72d63b (#884) Refactor and cleanup 2016-09-30 09:34:45 +02:00
Jacob Støren
1349cf0104 #900 Merged Intersection Boxes into Intersections folder 2016-09-30 08:40:46 +02:00
Jacob Støren
cede61dd9a Minor cleanups 2016-09-29 15:41:49 +02:00
Jacob Støren
865d1e1d9c #898 Include inactive cells in box intersections 2016-09-29 14:57:27 +02:00
Jacob Støren
2fa72385ea #897 Use Depth instead of Z 2016-09-29 14:21:22 +02:00
Jacob Støren
a89c5bf320 #896 Reorganized labels in Intersection Box, to make more room for the sliders 2016-09-29 13:32:33 +02:00
Jacob Støren
585eeef726 #894 Fixed intersection box collapse transitions 2016-09-29 10:02:12 +02:00
Jacob Støren
3bca03a722 Fix of missing changes from previous merge commits. Missing rename of anchestor to ancestor 2016-09-28 14:35:57 +02:00
Jacob Støren
cbb626aa31 Merged intersection-box into dev 2016-09-28 14:27:17 +02:00
Jacob Støren
fa6a6b4f08 #817 #815 Improved commands for xyz - slices intersection boxes. 2016-09-28 12:39:43 +02:00
Jacob Støren
3ca53b6103 Fixed some missing update guards on intersections/intersection box 2016-09-28 09:04:21 +02:00
Jacob Støren
db57bc5b28 #817 Single plane visualization (Avoid creating the other planes) 2016-09-27 11:28:39 +02:00
Magne Sjaastad
d87aa6a466 #818 Update visibility of fields for slice intersection boxes 2016-09-23 16:17:53 +02:00
Magne Sjaastad
5c4b92f9b8 #818 Intersection Box: Added XYZ slices to context menu in 3D view 2016-09-23 16:12:19 +02:00
Magne Sjaastad
bb81009b33 #817 New intersection box is created at center of active cells with half the size of active cells bounding box. Grid cell is hidden. 2016-09-23 13:38:08 +02:00
Magne Sjaastad
633b0a136a Guard for null pointer 2016-09-23 13:10:54 +02:00
Magne Sjaastad
c16daff875 #814 Clamp values and added support for collapse to single plane 2016-09-23 11:37:33 +02:00
Magne Sjaastad
8514664d06 #880 LAS: Export of TVDRKB 2016-09-23 10:07:15 +02:00
Magne Sjaastad
d9c383f7d3 #815 Rebuild geometry when min/max values for intersection box changes 2016-09-22 14:54:46 +02:00
Magne Sjaastad
61b7a6c57d #815 Initialize intersection boxes after loading of case 2016-09-22 10:38:57 +02:00
Magne Sjaastad
e3cec5bfec #815 Wired up infrastructure for intersection box from view to geometry generators 2016-09-22 10:09:03 +02:00
Magne Sjaastad
e789694780 #815 : Intersection Box : Added PartManager and SourceInfo 2016-09-21 14:47:02 +02:00
Jacob Støren
33296e4424 #815 Preliminary box calculations lacking some clipping 2016-09-21 14:21:45 +02:00
Magne Sjaastad
531aaaa445 AppFwk : Fixed typo of firstAncestorOrThisOfType 2016-09-21 13:59:41 +02:00
Magne Sjaastad
86dcc29bce #882 Enable export LAS command for Tracks, Plots and Well Logs Folder 2016-09-21 13:04:34 +02:00
Jacob Støren
a9d1f52005 #815 More renaming CrossSection -> Intersection 2016-09-21 11:44:28 +02:00
Jacob Støren
d549f45ad0 #815 More renaming CrossSection -> Intersection 2016-09-21 11:38:37 +02:00
Jacob Støren
73057cdcdc #815 More renaming CrossSection -> Intersection 2016-09-21 11:09:37 +02:00
Jacob Støren
f734bf595b #815 Renamed RimCrossSectionCollection -> RimIntersectionCollection 2016-09-21 10:52:16 +02:00
Jacob Støren
08baa5ccc9 #815 Renamed RimCrossSection -> RimIntersection 2016-09-21 10:48:25 +02:00
Jacob Støren
0083fb068f #815 More renaming CrossSection -> Intersection 2016-09-21 10:32:29 +02:00
Magne Sjaastad
45952e59d3 #814 New project tree items Intersection Boxes and Intersection Box. Support for add, toggle and delete 2016-09-20 12:03:26 +02:00
Magne Sjaastad
cb6d9d714b #821 Added RigLasFileExporter. Export one LAS file for same case, well and date. 2016-09-16 12:47:27 +02:00
Jacob Støren
0dfb68babf #838 Turned "Undefined Grid Faults With Inactive" off by default 2016-09-16 12:04:20 +02:00
Jacob Støren
4d005bdfc8 #836 Fixed missing data load when toggling on a curve 
This bug would also cause wrong data to be displayed, if a curve had been toggled off, then changed, and toggled on again.
 2016-09-15 08:19:37 +02:00
Magne Sjaastad
91476b43c8 #837 Rename 2016-09-13 14:07:45 +02:00
Magne Sjaastad
b3f036fb0e #837 GeoMech: Added formation property filter. Moved some functionality to RimCellFilter 2016-09-13 13:43:27 +02:00
Magne Sjaastad
384a8cc8e7 #837 Formation Names: Show layer names in property filter (Eclipse) 2016-09-13 13:43:27 +02:00
Jacob Støren
9041e4a582 #836 Fixed missing/wrong zoom update for well log plots when opening project. 
Refactored the zoom update method names
 2016-09-13 09:59:34 +02:00
Jacob Støren
2ea167337f #820 Export of TVD along with MD to LAS file 
Now the tvd data is always put into the RigWellLogCurveData
Existing tvd data is written to LAS file.
 2016-09-12 16:43:31 +02:00
Jacob Støren
a4fb6a37ae #829 Improved category colors slightly 2016-09-12 14:29:00 +02:00
Jacob Støren
0b4a0fef4c #852 Set default summary curve line thickness to 2 2016-09-12 13:15:39 +02:00
Jacob Støren
88af194702 #829 Update display and pick information when reloading / selecting a formation names file 2016-09-12 13:15:39 +02:00
Magne Sjaastad
e360c55e16 #272 Rename 2016-09-12 11:24:15 +02:00
Jacob Støren
25d5a500f0 #829 improved category palette 2016-09-09 14:59:20 +02:00
Jacob Støren
38c0b29b84 #829 Ordered the legend for formation names in the natural top to bottom order 2016-09-09 12:11:00 +02:00
Magne Sjaastad
077351cd04 #272 Use combo box to switch between predefined and custom cell edge result 2016-09-09 11:47:00 +02:00
Jacob Støren
39d82a28f4 #829 Use interpolated colors in category legend by default 2016-09-09 11:17:08 +02:00
Jacob Støren
c360040213 #829 Added a comment on link to color info 2016-09-09 09:59:35 +02:00
Jacob Støren
f057f684b1 #829 Sorted category colors by hue 2016-09-08 08:19:26 +02:00
Jacob Støren
1209c908e5 Fixed clip plane related assert on linux. Hopefully the final fix of trouble related to : ca6e650a72 and 80985785 and 0128baddff 
The fundamental problem was that the quad rendering was included in the boundingbox.
 2016-09-07 12:52:40 +02:00
Magne Sjaastad
cf8190cbf1 #829 Eclipse: Set default legend mapping and color range when selecting a category result 2016-09-07 11:41:02 +02:00
Magne Sjaastad
f404299702 (#829) Moved RimLegendConfig as a private field to be able to switch between standard and single var result color 2016-09-07 11:12:45 +02:00
Magne Sjaastad
f1c214c1d7 (#829) Use std::vector instead of std::set for categories. Added categoryNames to RimLegendConfig 2016-09-07 11:12:31 +02:00
Magne Sjaastad
3e40db6ef0 #827 Refactored CategoryMapper function names and added comments 2016-09-07 08:52:32 +02:00
Jacob Støren
e4e3c37f89 #811 Setting default legend type for category results 2016-09-06 14:03:02 +02:00
Jacob Støren
3e8873c870 #812 and related to #272 Formation and Category for Cell edge 2016-09-06 12:17:02 +02:00
Jacob Støren
c903e87dfd #811, #812 WIP, Formation names coloring of cells. First shot. Works but needs refinment. 2016-09-06 10:27:30 +02:00
Magne Sjaastad
a83e797e63 Fixed missing grid box geometry when a hidden view was activated 2016-09-02 14:19:20 +02:00
Magne Sjaastad
c9be561937 #722 Grid Case Group Statistics: Include in-active cells for ACTNUM statistics 2016-09-01 18:34:59 +02:00
Magne Sjaastad
f1451a1126 #724 Grid Case Group Statistics: Add option to include in-active cell value as zero 2016-09-01 18:08:51 +02:00
Magne Sjaastad
0128baddff #279 Use frame buffer objects for snapshots when available, otherwise use grabFrameBuffer() 2016-08-31 17:34:31 +02:00
Jacob Støren
f3e4a6edea #819 Added reload formation names command 2016-08-26 16:12:55 +02:00
Jacob Støren
f03e6de1f2 #810, #813, #808 Display formation name when picking 2016-08-24 15:19:39 +02:00
Jacob Støren
b46c6ebcf8 #809 Created Formation Names project items. 
#819 Added delete command to Formation names
#808 Added an import Formation Names command
 2016-08-24 08:30:12 +02:00
Jacob Støren
cf93a67b5e #273 Undefined grid faults between cells where one or both are inactive is now sorted into a seaparate predefined fault section. 2016-08-22 13:24:46 +02:00
Jacob Støren
5d0c0cdc67 Fixed assert due to two fields in uiordering in GeoMechPropertyFilter 2016-08-22 10:39:44 +02:00
Jacob Støren
fbcf9fca11 #168 Merged in parallel projection 2016-08-16 23:20:33 +02:00
Jacob Støren
4eddcc859a #168 Save and restore of parallel projection 2016-08-16 14:34:37 +02:00
Jacob Støren
5cdf307d4e WIP: Improved support for parallel projection. #168 
Near plane negative to show everything
ZoomAlongRay now works for parallel projection (only implemented in
ceetron Plus)
 2016-08-15 08:55:28 +02:00
Magne Sjaastad
cb4aa45cd3 Merged in changes from maintenance branch 2016-08-11 10:29:14 +02:00
Magne Sjaastad
6d95261410 Removed obsolete includes to cafPdmUiTreeView 2016-08-11 09:10:56 +02:00
Magne Sjaastad
0b8285d333 #723 Make sure a view is created if no view is present for a statistics case 2016-08-11 08:51:32 +02:00
Magne Sjaastad
74cc58e5f2 #723 Added sum to statistical output 2016-08-09 15:32:43 +02:00
Magne Sjaastad
3d27e57991 #725 Resize result vector before accessing results 2016-08-09 15:10:16 +02:00
Jacob Støren
23bfb46c4c #780 Made Gui and a crude auto assignment of appearance. 
Renamed
 2016-08-09 11:35:48 +02:00
Jacob Støren
43a1f4dbbe Linux compile fixes 2016-08-09 07:41:08 +02:00
Jacob Støren
1e9e6d8541 #780 Cleanup and alignment 2016-08-08 15:33:20 +02:00
Jacob Støren
10d5da6ef5 #780 A major step towards a flexible assignment of curve appearance based on the properties of the curve data 2016-08-08 15:16:08 +02:00
Magne Sjaastad
d9973743ee #272 Improved meta data for custom cell edge results 2016-08-06 08:47:56 +02:00