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
12,096 Commits 53 Branches 83 Tags
89c306cb5ade84a7a196609f64dce3b3872424f0
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jacob Støren cd0edd084d #5285 Fix missing calculation of normals on reservoir surfaces 2020-01-09 08:59:11 +01:00
Jacob Støren 1a1706d2fa Compile error fix for gcc on ubuntu 16.04 2020-01-09 08:48:05 +01:00
Jacob Støren e6d96316d4 #5285 Visualization and update of Surfaces 2020-01-08 12:11:10 +01:00
Jacob Støren e9086005d4 #5310 Fix wrong use of new path id. 
Used last used instead of first unused
 2020-01-08 12:09:51 +01:00
Jacob Støren 45a3225ec8 #5285 Surface Import command. SurfaceInView tree-items. Delete. 
Ready to start on visualization code
 2020-01-08 12:09:51 +01:00
Jacob Støren 3488280c69 #5285 Add icons to the Surface items 2020-01-08 12:09:51 +01:00
Jacob Støren 26db8d7351 #5285 Surface import command Items and parsing infrastructure 2020-01-08 12:09:50 +01:00
Jacob Støren 765978d0e9 Merge pull request #5286 from OPM/bugfix-#5283-#5284-allen-diagram 
#5283 Fixed Allen diagram error NNC's with same formation on both sides.
 2020-01-06 09:15:13 +01:00
Jacob Støren 84dab9eccb #5283 Fixed error in Allen diagram for NNC's with same formation on both sides. 2020-01-03 14:25:34 +01:00
Jacob Støren b066703529 Merge pull request #5275 from OPM/feature-allen-result-info 
#5269 Cycle cell selection when clicking an NNC
 2020-01-02 14:21:19 +01:00
Jacob Støren d074964901 #5274 Add text to Result Info panel for Allen diagram data 
Rename result variables to prepare for more Allen results
Rename methods to clarify meaning
 2020-01-02 12:46:38 +01:00
Jacob Støren a42d5e9bc8 Rename to clarify meaning of gridLocalCellIndex 2020-01-02 12:45:01 +01:00
Jacob Støren f1cee7ab36 #5269 Cycle cell selection when clicking an NNC 2020-01-02 12:39:14 +01:00
Jacob Støren bbb5e89fe7 Merge pull request #5266 from OPM/feature-allen-diagram-results-on-faults 
Feature allen diagram results on faults
 2020-01-02 10:33:00 +01:00
Jacob Støren 0d6b139891 #5200 Enable only category legend when allen diagram is selected 2020-01-02 08:56:45 +01:00
Jacob Støren 5dee4e7478 Missing include Compile fix 2019-12-20 14:33:03 +01:00
Jacob Støren 1d97f376fb #5200 New allen result type, and working full and binary allen diagrams for formations 2019-12-20 13:55:56 +01:00
Jacob Støren 12e49656df #5200 Allen results as separate results type only visible for faults 2019-12-20 13:55:56 +01:00
Jacob Støren b01c4409f1 Merge pull request #5246 from OPM/feature-external-file-reference-list-in-project-file 
Feature: #5147 External file reference list in project file
 2019-12-18 15:47:50 +01:00
Jacob Støren 6f97dca264 #5252 Fixed crash and missing statistics with combined IJK results for visible cells only 2019-12-18 15:47:13 +01:00
Jacob Støren c9270cdbca #5252 Fixed crash and missing statistics with combined IJK results for visible cells only 2019-12-18 15:45:07 +01:00
Jacob Støren 1575705835 Fix whitespace difference 2019-12-18 09:05:39 +01:00
Jacob Støren c35938e449 #5242 Fix intersection views visible in comparison view drop-down 2019-12-17 14:53:16 +01:00
Jacob Støren b6252c9d59 #5240 Avoid duplicate entries when opening summary-, and gridcases 2019-12-17 14:53:08 +01:00
Jacob Støren 43e8311207 #5242 Fix intersection views visible in comparison view drop-down 2019-12-17 14:37:57 +01:00
Jacob Støren 1e67540b92 #5240 Avoid duplicate entries when opening summary-, and gridcases 2019-12-17 14:28:51 +01:00
Jacob Støren 2ca3345a20 Add save() as a command to the python interface 
Fix export_snapshot issue
 2019-12-17 13:27:02 +01:00
Jacob Støren 7f393f5ad8 #5147 Use "PathId_000" as base for the path ids 2019-12-17 13:24:37 +01:00
Jacob Støren c551baf409 #5235 fix python: project.export_snapshot 2019-12-17 10:56:00 +01:00
Jacob Støren 2d195c93c6 #5235 fix python: project.export_snapshot 2019-12-17 09:43:49 +01:00
Jacob Støren 0bd9ef925a #5147 RimEclipseResultCase::m_sourSimFileName ->FilePath 2019-12-13 10:27:38 +01:00
Jacob Støren b7db416652 #5147 Avoid using RimFormationNames::m_formationNamesFileName in initAfterRead 
The path is not valid during initAfterRead Traversal
 2019-12-12 16:19:50 +01:00
Jacob Støren 1c6c82af85 #5147 Fix RimFileWellPath::setupBeforeSave addressing the filePath 
Needs to copy the cached wellpaths on save.
Split the cached filePath and the uncached filePath to only list the external well paths in the global path list, and to be able to copy the cached files on save.
 2019-12-12 16:15:24 +01:00
Jacob Støren e4eea67a4e Fix error in cafFilePath QVariant isEqual operator 2019-12-12 16:09:20 +01:00
Jacob Støren 298b40d6ef Refactor: Centralized generation of path to storage of wellpaths from SSIHUB 2019-12-11 11:39:02 +01:00
Jacob Støren 0f9b667c55 Guard against missing well path geometry data 2019-12-11 10:27:49 +01:00
Jacob Støren 37b32c4e8a #5147 RimFormationNames::m_formationNamesFileName -> FilePath 2019-12-11 09:31:13 +01:00
Jacob Støren b1942e0844 #5147 RimWellLogFile::m_fileName ->FilePath 2019-12-11 08:38:31 +01:00
Jacob Støren 7f1ccc0169 #5147 RimStimPlanFractureTemplate::m_stimPlanFileName -> FilePath 2019-12-11 08:30:32 +01:00
Jacob Støren eb421db040 #5147 RimWellPath::m_wellPathFormationFilePath ->FilePath 
RimFileWellPath::m_filepath ->FilePath
 2019-12-11 08:23:37 +01:00
Jacob Støren 059288ef97 #5147 RimEclipseInputProperty::fileName -> caf::FilePath 2019-12-10 16:58:07 +01:00
Jacob Støren 11807029a5 #5147 RimEclipseInputCase::m_gridFileName -> FilePath 2019-12-10 16:43:12 +01:00
Jacob Støren 723caaaf79 #5147 RimEclipseCase::m_filesContainingFaults -> vector<FilePath> 2019-12-10 16:36:07 +01:00
Jacob Støren d19c87c23a #5147 RimEclipseResultCase::caseFileName -> PdmField<caf::FilePath> 2019-12-10 16:19:39 +01:00
Jacob Støren 18cf59530f #5147 RimSummaryCase::m_summaryHeaderFilename -> PdmField<caf::FilePath> 2019-12-10 16:12:21 +01:00
Jacob Støren a9d089df6d #5147 PdmField<caf::FilePath> now uses a reference list in the start of the project file to store the paths. 2019-12-10 14:58:47 +01:00
Jacob Støren f3fc7351d4 #5011 Add icon to Replace Case commands 2019-12-02 10:26:11 +01:00
Jacob Støren 59114d9624 #5145 Fix strange zigzag lines in summary curves 2019-12-02 10:21:12 +01:00
Jacob Støren de35b6d76b #5145 Fix strange zigzag lines in summary curves 2019-11-29 16:01:28 +01:00
Jacob Støren 4026e859d2 #5011 Add icon to Replace Case commands 2019-11-29 13:37:38 +01:00
Jacob Støren d736419fd4 Merge pull request #5130 from OPM/feature-polish-separate-intersection-results 
Polish separate intersection results
 2019-11-29 11:21:12 +01:00
Jacob Støren 6ac18d52ff #5117 Sep Inter Res: Fix missing use of cathegory legend 2019-11-29 10:27:43 +01:00
Jacob Støren f446d58b60 #5124, #5123 Fix irratic collapse of property group 
Fix missing timestep menu
 2019-11-29 10:27:43 +01:00
Jacob Støren 021af085a7 #5119, #5120 Default case for intersection result 
Fixed missing intersection colors when cellresults are turned off
 2019-11-29 10:27:43 +01:00
Jacob Støren 95ba482f54 Merge pull request #5118 from OPM/feature-fix-intersection-with-sep-results-picking 
Fix picking on intersections with separate results
 2019-11-28 15:27:48 +01:00
Jacob Støren ad25bb89c2 #5112 Add cell highlight on intersections with separate intersection result 2019-11-28 14:09:53 +01:00
Jacob Støren 14d7fa3780 #5112 Sep Inter Res: Fixed result info text for gomech 2019-11-28 14:09:52 +01:00
Jacob Støren 2a3c43bcc3 #5112 Fixed result info text for eclipse 
Needs more testing
 2019-11-28 14:09:52 +01:00
Jacob Støren 5556d2d9eb #5112 Make selected result definition available through 3ditem selection system 
Make PVT, Relperm, Mohr and rResult plot aware
 2019-11-28 14:09:52 +01:00
Jacob Støren 8cc2194764 (#5112) Move cell and nnc picking code to a separate pick event handler 2019-11-28 14:09:52 +01:00
Jacob Støren e4a4b40a3c Merge pull request #5096 from OPM/feature-rename-RimIntersection 
Rename RimIntersection
 2019-11-26 15:28:23 +01:00
Jacob Støren 191419b6b4 clang-format after intersection rename 2019-11-26 13:56:02 +01:00
Jacob Støren 06596673dc Rename RimIntersectionHandle to RimIntersection 2019-11-26 13:26:37 +01:00
Jacob Støren 0a358941fb Rename RivIntersectionBoxGeometryGenerator to RivBoxIntersectionGeometryGenerator 
Rename RivIntersectionBoxSourceInfo to RivBoxIntersectionSourceInfo
 2019-11-26 13:20:16 +01:00
Jacob Støren 4672528a4d Rename RimintersectionBox to RimBoxIntersection 
Rename RivIntersectionBoxPartMgr to RimBoxIntersectionPartManager
 2019-11-26 13:14:55 +01:00
Jacob Støren 0e14c63f07 Rename crossSection to intersection in general code 2019-11-26 12:45:08 +01:00
Jacob Støren 54c96581f1 Rename RivIntersectionSourceInfo to RivExtrudedCurveIntersectionSourceInfo 2019-11-26 11:56:05 +01:00
Jacob Støren 0617b56850 Rename RivIntersectionGeometryGenerator to RivExtrudedCurveIntersectionGeometryGenerator 
and RivIntersectionPartMgr to RivExtrudedCurveIntersectionPartMgr
 2019-11-26 11:51:54 +01:00
Jacob Støren 152d2bde17 Rename RimIntersection to RimExtrudedCurveIntersection 2019-11-26 11:35:21 +01:00
Jacob Støren bf8ed71641 Method rename 2019-11-26 10:35:45 +01:00
Jacob Støren 5593fb198c Merge pull request #5094 from OPM/feature-#5019-separate-intersection-results 
Feature #5019 separate intersection results
 2019-11-26 10:15:30 +01:00
Jacob Støren 15aa4d6e0b Merge dev and feature-#5019-separate-intersection-results branch 2019-11-25 15:50:29 +01:00
Jacob Støren c2717f9bb9 #5019 Preliminary fix crash when picking intersections using sep results 2019-11-25 15:36:35 +01:00
Jacob Støren 6e99a43247 #5019 Add/Delete Separate Intersection Result commands 2019-11-25 15:34:36 +01:00
Jacob Støren 7aec88de3c #5019 Fix wrong use of explicit scalar mappers for intersections 
Only 2d intersection view is supposed to use them
 2019-11-25 15:33:42 +01:00
Jacob Støren baedf02ba9 #5019 Fix crash when case is not set in Separate intersection Result 2019-11-25 15:27:25 +01:00
Jacob Støren 919f035a48 #5019 Add an enable separate results button to each intersection 2019-11-25 13:31:21 +01:00
Jacob Støren 4bafefa225 #5019 2D Intersection views based on separate intersection results now respects the animation toolbar 2019-11-25 13:02:35 +01:00
Jacob Støren eed9f6abad #5019 Update 2dIntersection views when toggling sparate intersection results 2019-11-25 11:42:46 +01:00
Jacob Støren 9bfe51b205 #5019 Support separate intersection results for 2Dintersection views 2019-11-25 11:40:57 +01:00
Jacob Støren 1ab815e673 #5019 Use same code for separate intersection legend setup in eclipse and geomech 2019-11-22 13:31:35 +01:00
Jacob Støren b5e39519c5 #5019 Separate intersection legends in place in ordinary views 
Needs some cleanup and not working in 2dintersection views
 2019-11-22 12:36:39 +01:00
Jacob Støren f3b458dfbc Fix regressions for intersection views. 
Introduced by cd08185678
Wrong scalar mappers used when coloring.
Wrong timestep used
 2019-11-21 15:14:17 +01:00
Jacob Støren c1df283369 Fix crash in intersection coloring wne geometry is missing 2019-11-21 12:43:26 +01:00
Jacob Støren 10257e3bfb Fix missing rebuild of intersections in geomech view 
Fix missing ternary legend reset
Fix missing regular legend reset in geomech view
 2019-11-21 10:05:56 +01:00
Jacob Støren 53f2c94763 #5019 Sep Intersection Res: Fix missing use of user range when loading from project file 2019-11-21 09:24:24 +01:00
Jacob Støren 5d03ecb115 Add some const to GeoMechResultDefinition 
To prepare for separate legend update code needed bu #5019
 2019-11-21 08:30:04 +01:00
Jacob Støren 31a698243d #5019 Update display model on separate intersection settings change 2019-11-21 08:28:00 +01:00
Jacob Støren a181e0c11d #5019 Refactoring Move IntersectionResultsColoringTool to a separate file 
Also moved the implementation code
 2019-11-20 13:59:16 +01:00
Jacob Støren cd08185678 #5019 Use the static methods to color intersections as well 
Move all the color/texture  generation methods into a separate tools class.
(Only scope wise)
 2019-11-20 13:01:25 +01:00
Jacob Støren 46f335ad0b #5019 Refactor the color generation in the boxintersection into static methods 
These methods are to be used from the normal intersections as well.
 2019-11-20 12:00:43 +01:00
Jacob Støren c8053284d1 #5019 Add relevant access to IntersectionResultDefinition 
Implement initAfterRead to populate the resultDefinitions with correct case
 2019-11-20 10:39:48 +01:00
Jacob Støren c79de08c40 Improve const-ness somewhat on some results color related methods 2019-11-20 10:39:48 +01:00
Jacob Støren 6e96570995 #5019 Position the separate source box/intersections correctly acc to displayOffset 2019-11-20 10:39:48 +01:00
Jacob Støren 439071dddf Fix crash when copying the intersection. 
Updating of the default is handled later, so is not neccesary when doint initAfterRead after deserialization.
 2019-11-20 10:39:48 +01:00
Jacob Støren dcb32c285f Unification of color texturing code in Intersection and -Box 2019-11-20 10:39:48 +01:00
Jacob Støren 57dfd3b67a Intersection color texturing: Remove dependency on view and RimEclipseResultColor 
Also start to harmonize intersection and intersection box texturing
 2019-11-20 10:39:48 +01:00
Jacob Støren db0bbb96c4 #5019 Use hex grid interface creation from data source for all intersections 2019-11-20 10:39:48 +01:00
Jacob Støren 612332cbbc #5019 Move RimIntersectionHandle to separate files Use in RimIntersectionBox 2019-11-20 10:39:48 +01:00
Jacob Støren 9ed3d8babc #5019 WIP: Made fields in IntersectionHandle protected 2019-11-20 10:39:48 +01:00