OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-09-03 20:53:13 -05:00
Code Issues Packages Projects Releases Wiki Activity
8,030 Commits 53 Branches 83 Tags
2f80e99abc5fca2ad84f3aff8a9a9d0668ebca04
Commit Graph
58 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Gaute Lindkvist fe56375be6 Added toggle option for legends. 2018-04-09 13:14:19 +02:00
Gaute Lindkvist e93f79790e Make sure Ternary legends also expand and renamed width method. 2018-04-09 13:14:19 +02:00
Gaute Lindkvist 38aa447dcd Unify the width of all visible legends. 
* Calculate the minimum width to fit the content before the render pass.
  * Set the actual width of all the legends to the largest of the minimum widths.
  * This resizes the legends to always be the same size and reduces the size of you remove
     the widest legend.
 2018-04-09 13:14:19 +02:00
Gaute Lindkvist 63ffade452 Set background and frame color from the view plus update frame margins. 2018-04-09 13:14:19 +02:00
Gaute Lindkvist 507229f84b Fixed background color setting for legends and refactored Legend class hierarchy 
* Added a new cafTitledOverlayFrame as a base-class for all ResInsight legend classes
  * Inherits cvf::OverlayItem
 2018-04-09 13:14:19 +02:00
Gaute Lindkvist 054263b94a Apply guard to additional MohrsCirclePlot use 2018-04-04 11:19:59 +02:00
Gaute Lindkvist 8b3f980079 Fix crash on selection when there's no MohrsCirclePlot 
* Check if the pointer is valid before dereferencing
 2018-04-02 10:17:09 +02:00