OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-12 16:32:12 -05:00
Code Issues Packages Projects Releases Wiki Activity
8,230 Commits 59 Branches 85 Tags
14a5fd40099cf71d933670241fffe26915fdf09c
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Gaute Lindkvist 14a5fd4009 #2959 Fix crash when loading ODB file without overburden. 2018-05-25 09:36:46 +02:00
Gaute Lindkvist 4c6a56bb52 #2873 Do only one updateAllRequiredEditors when closing cases 
* Instead of one for every case that is being closed.
 2018-05-23 14:38:26 +02:00
Gaute Lindkvist 743993718c #2873 New AsyncPointerVectorDeleter-classes to handle memory deletion in separate thread. 2018-05-23 14:38:25 +02:00
Gaute Lindkvist 660b6a6430 #2944 Hide auto scale toggles for well log plots. 2018-05-23 11:35:24 +02:00
Gaute Lindkvist 208313f672 #2944 Stop auto-zooming on load of Well Log Curves. 2018-05-23 11:29:16 +02:00
Gaute Lindkvist 772e7ec7e6 Revert "#2873 Delegate deletion of summary cases to separate thread." 
This reverts commit 0089e0c218.

Didn't intend this to go into dev now
 2018-05-22 09:22:12 +02:00
Gaute Lindkvist 0089e0c218 #2873 Delegate deletion of summary cases to separate thread. 2018-05-22 09:21:40 +02:00
Gaute Lindkvist bef7535eff #2941 3d well log curves: Fix crash if the draw surface width becomes larger than well path length 2018-05-18 14:26:52 +02:00
Gaute Lindkvist 9e665d5ab1 3d Well Log Plots: Remove curve filled code 2018-05-18 14:26:52 +02:00
Gaute Lindkvist 68dd0ba13e Switch calculation of extra curve vertices to double precision 2018-05-18 14:26:52 +02:00
Gaute Lindkvist 3119ab24cb #2934 Delete all selected cases, not just the first one when right clicking and choosing close. 2018-05-18 14:02:49 +02:00
Gaute Lindkvist 79928702bf #2920 Save window state for main window when closing plot window last (and vice versa). 2018-05-16 08:55:34 +02:00
Gaute Lindkvist 66e548ac04 #2924 3D well Log curves: Implement variable name for geomech result 2018-05-15 18:04:27 +02:00
Gaute Lindkvist 5aa6ebbd76 #2922 Change curve min/max when updating case and timestep. 2018-05-15 17:54:20 +02:00
Gaute Lindkvist 1b6d6e714c #2923 Show sensible curve segments to range limits when points are outside range 2018-05-15 17:16:43 +02:00
Gaute Lindkvist 79a8af0e11 #2921 Hide name config in tree view 2018-05-15 17:14:59 +02:00
Gaute Lindkvist 461d22b2b5 #1908 Stop creating new summary cases when opening a project file. 2018-05-15 16:20:25 +02:00
Gaute Lindkvist d1a706de55 #2913 Make sure only one grid summary case is created per egrid loaded. 
* If you open two of the same eclipse case, you will still have two grid summary cases
* But if you open multiple summary cases of the same eclipse case the additional summary cases are file summary cases.
 2018-05-15 16:12:12 +02:00
Gaute Lindkvist 0c9470fdf0 #2913 Improve coupling between egrid and summary cases 
* Convert RimGridSummaryCase to RimFileSummaryCase when closing grid.
 2018-05-15 15:43:21 +02:00
Gaute Lindkvist 2e0cd60fc4 #2466 Fix the one occurence of non-guarded activeReservoirView access found. 2018-05-15 11:31:23 +02:00
Gaute Lindkvist 76f8b9ac90 #1909 Fix assertation failure in RimSummaryCurveAppearanceCalculator 2018-05-15 11:31:23 +02:00
Gaute Lindkvist 77dd3cbc43 #2690 Update all summary curves, not just visible when changing the vector for the whole collection 
* Also make sure the curve names take into account all curves in the project tree and in the legend text.
* Make sure plot name is updated when a curve is deleted.
 2018-05-15 08:43:50 +02:00
Gaute Lindkvist 956d221c48 #2878 Use correct keyword for solvent data (SSOL not SSOLVENT) 2018-05-14 10:41:23 +02:00
Gaute Lindkvist 090a79cf90 #2854 UNRST and EGRID file matching confused by . in basename 
* Need to send in QFileInfo::completeBaseName() rather than just baseName()
* The change will cause libECL to match only files where the base name is everything except what is after the LAST  dot.
 2018-05-14 09:32:19 +02:00
Gaute Lindkvist 7e54eb055c #2897 Make Export Completion only show up if the user has selected a well path collection or a descendant. 2018-05-11 16:01:25 +02:00
Gaute Lindkvist 3360973e87 Use SSOLVENT in calculating SOIL if present 2018-05-11 15:45:31 +02:00
Gaute Lindkvist 4ca9313366 #2756 Remove pseudo length as depth type. 
* That also means there's only option left for PLT-plots: Measured Depth, so may as well
   remove the drop down list from the UI.
 2018-05-11 15:45:31 +02:00
Gaute Lindkvist f0be8214b0 #2448 Summary plot: Retain auto zoom for axes you haven't modified the range for. 2018-05-11 14:03:26 +02:00
Gaute Lindkvist c959db73a1 #2887 Tidy up 3D well log curve configuration to more obvious documentation. 2018-05-09 15:56:24 +02:00
Gaute Lindkvist b9cbd7c503 #2881 Continue exporting other completions if one has a unit mismatch. 
* Report an error and continue rather than abort.
 2018-05-09 15:56:24 +02:00
Gaute Lindkvist 5310d28433 #2880 export completions if the the well path name is explictly provided even if unchecked 2018-05-09 15:56:24 +02:00
Gaute Lindkvist 15c2b19f59 Slightly improve naming of epsilon/tolerance variable in plane triangle intersection. 2018-05-09 11:34:04 +02:00
Gaute Lindkvist 923fc9815a #2713 Implement viewName parameter for RicfExportSimWellFractureCompletions. 
* View names are not unique!
* This change will export fracture completions for *all* views that matches the view name.
 2018-05-09 10:44:29 +02:00
Gaute Lindkvist 9da54a115b Fix crash in cafHexGridIntersectionTools when exporting fracture completions. 
* Account for two new triangle plane intersection cases where one vertex is touching the plane.
 2018-05-09 10:44:29 +02:00
Gaute Lindkvist 47ed8dac74 Fix crash due to wrong closest index comparison in RigSimulationWellCoordsAndMD 2018-05-09 10:44:29 +02:00
Gaute Lindkvist f24fb4aaec Fix crash due to global/local grid index mixup when creating fractures on SimWellPaths. 
* Introduces a convenience method on the main grid
* Also converts some callers to use the convenience method.
 2018-05-09 10:44:29 +02:00
Gaute Lindkvist 043eaf7db6 Make new vertex creation more robust 
* Require that the length of the new segment is shorter than the *current*
  distance to the end of the original segment, rather than the length of the
  complete original segment.
 2018-05-08 09:09:36 +02:00
Gaute Lindkvist 0d8a034886 Fix Linux build by replacing a HUGE_VAL with std::numeric_limits::infinity 
* This build problem was introduced when fixing a crash issue that came from
  replacing HUGE_VAL with std::numeric_limits::max
 2018-05-07 19:34:22 +02:00
Gaute Lindkvist 9125619c41 3D Well Log Curves: Fix crash bug due to wrong value used to force invalid values. 2018-05-07 16:07:13 +02:00
Gaute Lindkvist c7bf6172f3 #2828 Allow setting curve domain range outside the range of the curve values. 
* Note that this implementation simply removes vertices that are outside the range.
* It would look far better to insert vertices at the boundary when a segment is heading
   out of range. This is more complicated.
 2018-05-07 14:47:24 +02:00
Gaute Lindkvist 57b3ad82a8 #2791 Fix tensor vector colors so principal to has a single color. 2018-05-07 11:17:51 +02:00
Gaute Lindkvist 88cc6ea3f5 Fix wrong assert in cvfScalarMapperRangeBased::setLevelsFromValues 
* Old code always causes assert failure when calling this method.
 2018-05-07 11:17:51 +02:00
Gaute Lindkvist 78326bb19c #2703 An initial implementation of filled drawing style with problems remaining. 
* New vertices are successfully created in the intersections between the
  curve and draw surface triangles
* New vertices are also inserted along the bottom edge of the filled curve.
* However, new vertices will still need to be inserted in the lines connecting the
  top of the curve and the bottom where they intersect with the triangles.
* The option for filled curves remain hidden in the GUI. See #2860.

# Please enter the commit message for your changes. Lines starting
 2018-05-07 11:14:25 +02:00
Gaute Lindkvist fba437f595 #2791 Rename misspelled "principalNumber" in TensorResultPartMgr 2018-05-07 10:13:17 +02:00
Gaute Lindkvist a22f8ed032 Remove superfluous updateConnectedEditor for rim3dWellLogCurves. 
* Already happens in resetMinMaxValuesAndUpdateUI
 2018-05-03 13:39:39 +02:00
Gaute Lindkvist 23c90bd6eb #2846 Fix bad curve projection 
* Project existing points onto triangles first and make sure we choose the right triangle by
   sorting possible projections by distance.
 * Also allow some tolerance for the inside check.
 * Create the new vertices by projecting the curve segment vector onto each triangle plane
   before looking for intersections with the triangle edges.
 2018-05-03 13:39:39 +02:00
Gaute Lindkvist a165172723 #2847 Add a fall back dominant direction (0, -1, 0) if the path does not extrude in z-direction. 
* This direction means Left will cause it to go -x and Right +x so that the directions are correct with respect to "Left" and "Right" when you look "North".
 2018-05-03 13:39:39 +02:00
Gaute Lindkvist f6cbf0f34f #2824 Geomech 3d Well Log Curves: update UI and 3d view when user changes settings 2018-05-03 13:39:39 +02:00
Gaute Lindkvist 944baee00e Fix comment in DrawSurfaceGenerator 2018-05-03 13:39:39 +02:00
Gaute Lindkvist 26975e3ce3 Fix unit tests by removing assert in RimWellLogCurveNameConfig 2018-05-02 14:22:49 +02:00
Gaute Lindkvist ffccb078e8 #2841 Fix bad result when z-clipping is applied. 2018-05-02 14:01:50 +02:00
Gaute Lindkvist 98af9e00ab Fix build issue on Linux 2018-05-02 12:11:15 +02:00
Gaute Lindkvist a37957824a Clean up 3D well log generator code. Renamed Grid -> DrawSurface and fixed spelling. 2018-05-02 12:10:05 +02:00
Gaute Lindkvist 6e3d989b2f #2825 Fix curve stitching issues against 3dwell log curve background. 2018-05-02 11:51:36 +02:00
Gaute Lindkvist 1f44ea1ea3 Make draw plane selection for curves be unrelated to 3d Track (somewhat related to #2825). 
* Makes more sense user wise and makes for better code.
* Helps refactor code to relate grids to curves so the curves can have access to the grid
   it is being drawn on.
* This will help fix #2825 by being able to project curve points onto the exact triangle geometry.
 2018-05-02 11:51:22 +02:00
Gaute Lindkvist 7307b97466 #2823 Switching curve plane does not work 
* The previous drawable and geometry was kept if switching to a result type without
  valid points.
* The drawable is then stuck in position until switching back to a result
  type that has valid points.
* This commit fixes this by clearing the geometry every time you draw.
* TODO: cache values when it is possible to do so.
 2018-05-02 10:22:37 +02:00
Gaute Lindkvist 04f793c19d #2782 Auto name for 3d Well Log Curves 2018-05-02 10:22:36 +02:00
Gaute Lindkvist f61512ef94 Add Copyright headers to cafTitledOverlayFrame.h|cpp 2018-04-25 14:38:17 +02:00
Gaute Lindkvist 029369d187 #2677 Show curve value when clicking the curve 
This change will show the following:
   - Curve name
   - Well path name
   - Measured depth
   - name of variable
   - value
 2018-04-25 14:13:12 +02:00
Gaute Lindkvist 3a670d94a2 #2801 Fix Cotire build. 2018-04-25 14:13:12 +02:00
Gaute Lindkvist a7c72b549b #2790 Progress bar when importing summary cases. 2018-04-25 09:26:12 +02:00
Gaute Lindkvist c5e4bf93a6 Summary Case Import cleanup (#2795) 2018-04-25 09:25:35 +02:00
Gaute Lindkvist e953d6800c #2795 Summary Case Import: When importing grids keep going even if summary file import fails. 2018-04-24 15:55:51 +02:00
Gaute Lindkvist f456911c80 #2794 Summary Case Import: Improve error reporting. 
* When an error is found with one summary case file, continue importing all the files that worked.
* Report an error in the log window and a message box afterwards about the case that failed.
* Fix crash when loading .EGRID file without a summary case.
 2018-04-24 14:19:08 +02:00
Gaute Lindkvist 51fb8a6935 #2787 Import summary case does not work on linux 
* Make sure summary files are added to class member in getFilesToImportUsingPrefs.
* The code used to return a vector of summary files, now just a boolean and the files
   are meant to be added to the vector for later retrieval.
 2018-04-23 14:50:12 +02:00
Gaute Lindkvist 517a557efe Legends (#2786): Fix Debug-build of Resinsight. 2018-04-23 13:08:35 +02:00
Gaute Lindkvist 765b170efd 3d Well Log Curves (#2784): call createDisplayModelAndRedraw...() when adding LAS and RFT curves. 
* Causes the parts to be created and added to the model.
* This is already done when adding extraction curves.
 2018-04-23 11:35:55 +02:00
Gaute Lindkvist c5e58df751 3d Well Log Curves (#2783): Enable picking with the track background switched off. 
* Add part to the model, but set the color mask false, depth test/write off.
* Result is an invisible part that is present for picking.
 2018-04-23 11:35:55 +02:00
Gaute Lindkvist 803b6b8179 3D Well Log Curves(#2676): Enable pick selection of the 3D Tracks and curves 2018-04-23 08:01:32 +02:00
Gaute Lindkvist 53d5c809ac 3D Well Log Curves (#2764): Rim3dWellLogFileCurve does not react to draw plane changes 2018-04-19 13:53:57 +02:00
Gaute Lindkvist bf5d95d873 3D Well Log Curves (#2672): Max and min value control for each curve. 2018-04-19 13:43:12 +02:00
Gaute Lindkvist 5d89ad3a6d 3D Well Log Curves (#2674): Show what the value axis direction is 2018-04-19 13:43:12 +02:00
Gaute Lindkvist 4dc9d1ba8a 3D Well Log Curve (#2747): Add "Add new curve" command to 3D track and other curves. 2018-04-19 13:43:12 +02:00
Gaute Lindkvist 916fb59bee 3D Well Log Curves (#2673): Simplify draw plane text 
* Above, Below, Left, Right, Vertical, Horizontal
 2018-04-18 11:33:04 +02:00
Gaute Lindkvist 01a1f660e7 3D Well Log Curves (#2746): Handle set scale. 
* Transform to display coordinates *before* calculating normals and generating curves.
 2018-04-18 11:33:04 +02:00
Gaute Lindkvist 3303350193 Rename member variable in RivWellPathsPartManager to get rid of spelling error. 2018-04-18 11:33:04 +02:00
Gaute Lindkvist 53cf8a80cd Stop building docs as part of "ALL". 2018-04-18 11:33:04 +02:00
Gaute Lindkvist d7204363a0 3D Well Log Curves (#2673): Consolidate the draw plane position control. 2018-04-18 08:38:15 +02:00
Gaute Lindkvist 56dd1b3eb9 Legends (#2749): Clean up enable/showLegend option 
* Make public field private ...
* Make the option invisible from within the property panel.
 2018-04-18 08:37:30 +02:00
Gaute Lindkvist 9da3f09782 3D Well Log Curves (#2668): Implement Draw-plane width control 
* Apply a factor between 0.25 and 2.5 times the characteristic cell size
* Make the offset from the pipe scale with the plane width up to a maximum offset.
* Organise the CurveCollection settings into two groups.
 2018-04-17 13:44:03 +02:00
Gaute Lindkvist 36b1dcf85f 3D Well Log Curves(#2678): Remove camera aligned draw plane 2018-04-17 13:44:03 +02:00
Gaute Lindkvist 290d58e7fd 3D Well Log Curves(#2678): Remove curve drawing options that aren't yet implemented. 
* drawing style (i.e. filled)
* coloring style (i.e. color by curve value)
 2018-04-17 13:44:03 +02:00
Gaute Lindkvist 1180c199b4 3D Well Log Curves (#2669): Implement control of single color. 
* Set a cycled default whenever a curve is added to a collection.
 2018-04-17 13:44:03 +02:00
Gaute Lindkvist 501e80b1ad 3D Well Log Curves(#2671): Make curve draw plane background optional 2018-04-17 13:44:03 +02:00
Gaute Lindkvist 092624799e 3D Well Log Curves: Renaming of the term normals in curve/grid-generation 
* Make it more obvious we are talking about the normals to the 3D well log curve.
 2018-04-17 13:44:03 +02:00
Gaute Lindkvist 5e6613d428 3D Well Log Curves (#2671): Apply white background to curve draw plane. 2018-04-17 13:44:02 +02:00
Gaute Lindkvist edf23b5265 Remove epsilon guard in setAutomaticRanges for RimLegendConfig. 2018-04-13 15:33:37 +02:00
Gaute Lindkvist 4c5b90f363 Add get methods for drawStyle and coloringStyle for Rim3dWellLogCurve 2018-04-13 15:33:37 +02:00
Gaute Lindkvist fd63ae7531 3D Well path plots: clean up some indentation and remove an unnecessary epsilon 2018-04-13 15:33:37 +02:00
Gaute Lindkvist b48adbbaa9 3D Well log curves: Use the new generalized interpolation for normals 
* Don't have to perform the normal generation again for grid points.
 2018-04-13 14:56:19 +02:00
Gaute Lindkvist 1bb1b3004e Generalize the interpolation in RigWellPath 
* Make it possible to interpolate any vector along the well path,
  not just the well path points. This way it can be used for normals.
* The interpolation line needs to be a weighted sum of vectors from
  the two closest points rather than the previous point + a segment,
  which only works for points.
* If used for normals, the end result *has to be normalized*
 2018-04-13 14:56:18 +02:00
Gaute Lindkvist e8b006d068 3D Well Log Curves (#2671): Split normals, border and surface into several drawables. 
* Also create a closed LINES_LOOP out of the mesh border.
  * This will facilitate using different effects on the different parts.
    i.e. solid border and white surface background.
 2018-04-13 14:55:44 +02:00
Gaute Lindkvist 6e0b7e2305 Improve 3D Well path plots 
* Always generate in up-direction and rotate to left/right/down
* Generate a "dominant direction" by interrogating the whole curve, not
  just the first and last item.
* Improve maths:
  - Generate a projection plane spanned by UP and the dominant direction.
  - Project the tangent onto this projection plane.
  - Generate normal as the cross product between the projected tangent and
    the normal to the projection plane.
  - Rotate the normal into left/right/down if required.
 2018-04-13 14:55:44 +02:00
Gaute Lindkvist 2cc93fb09d 3D Well Log Curves: Command to Delete curve #2667 
* Add delete command with explicit delete feature class.
 2018-04-10 10:57:04 +02:00
Gaute Lindkvist a73526f85b Remove compile warning for OverlayScalarMapperLegend 
* apply explicit unsigned int -> float cast.
 2018-04-10 08:36:20 +02:00
Gaute Lindkvist dd38543dd2 Fix Ubuntu build (#2696) 
* std::ceil -> cvf::Math::ceil to avoid header issues.
 2018-04-10 08:31:03 +02:00
Gaute Lindkvist ab736ab46b #2693. Fix overlap of category legend with other legends. 
* CategoryLegend should not use the matchedWidth. They have their own columns.
  * Change shifts to using minimumWidth instead.
 2018-04-09 14:30:21 +02:00
Gaute Lindkvist b488d99f81 #2696 Fix ubuntu build after Legend updates. 
* Was missing <cmath> to get std::ceil, but cvf::Math also has ceil, so switch
   to that.
 2018-04-09 14:19:43 +02:00
Gaute Lindkvist 3116a4a223 Shifted pure virtual updateLegends to RiuViewerToViewInterface 2018-04-09 13:14:19 +02:00
Gaute Lindkvist b6fb60115a Refactored after review 2018-04-09 13:14:19 +02:00