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
2,650 Commits 59 Branches 85 Tags
8404ccd38b9423944a46fb5481fe89433bcd6c27
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jacob Støren 8404ccd38b RigFemPart: Renamed mispelled member 2015-09-24 22:15:01 +02:00
Jacob Støren efe5951222 Linked Views: Refactoring ViewController 
Consolidating update responsibilities.
Renaming
 2015-09-24 17:43:14 +02:00
Jacob Støren d83d9e967b Linked Views: Refactored and cleaned up more. Refactored some features. 2015-09-24 17:43:12 +02:00
Jacob Støren 5e0505dfe8 Renaming and cleanup in ViewLinker and friends 2015-09-24 17:43:09 +02:00
Jacob Støren 3b98d77324 (#517) Fixed crash due to direct call to CreateDisplayModelAndUpdate 
But there are ore ...
 2015-09-22 21:00:50 +02:00
Jacob Støren a0dabca6ed (#401) Updated sensitivity and GUI of ViewLink to reflect the visible cells possibilities 2015-09-21 18:54:41 +02:00
Jacob Støren 7cf61eb636 Added update of icon when changing master view 2015-09-21 18:54:39 +02:00
Jacob Støren eb3cf20263 Avoid repeatedly resetting the view 2015-09-21 18:54:37 +02:00
Jacob Støren 644a4529d3 Experimental: Avoid QProcessEvent during progress dialog. 
By having a non modal progress dialog and calling repaint directly.
 2015-09-21 18:54:35 +02:00
Jacob Støren 31b5b2e568 Moved setting of default view to after we know the geometry is generated. 2015-09-21 18:54:33 +02:00
Jacob Støren a2dc6628ad (#401) Fixed result coloring of cells/fault geometry part of cells. 
And visibility of fault part of overridden visible cells
 2015-09-21 18:54:31 +02:00
Jacob Støren bc13971fec Clear the views to regenerate when finished regenerating 
This inefficiency has been there forever ...
 2015-09-21 18:54:29 +02:00
Jacob Støren 7abfd51b91 Fix: Schedule Property filter regen. and not Range filtered. 
when asked to do Property filter.
 2015-09-21 18:54:27 +02:00
Jacob Støren fa5be6a5e4 Guard against updating geomech legend when no data is loaded. 2015-09-21 18:54:24 +02:00
Jacob Støren 22d033669d (#401) Result colors now updated on "Visible cells"-overridden Eclipse cases 2015-09-21 09:10:50 +02:00
Jacob Støren 2604e01ddc (#401) Fixed missing update (Inactive cells) 2015-09-21 08:37:49 +02:00
Jacob Støren 95047ae89e (#401) Sync visible cells GeoMech to Eclipse grid now works 
But there are bugs regarding faults and cell result color.
 2015-09-18 17:08:58 +02:00
Jacob Støren b55beb7e13 (#401) Update dependent views after independent ones 
The dependent views needs the visibility from their masters
 2015-09-18 17:08:57 +02:00
Jacob Støren 8ca874006c (#401) Changed main mapping to loop over Eclipse grid 
To avoid creating the geomech version of the eclipse cell many times
 2015-09-18 15:01:20 +02:00
Jacob Støren a3cbe99dd4 (#401) Cell comparison now simplified. Assumes topological rotation is equal 2015-09-18 15:00:42 +02:00
Jacob Støren 13d1876a16 (#401) Cell Topol. rotation separated 2015-09-18 15:00:41 +02:00
Jacob Støren a9a8c94625 (#491) Continue insolation of topol. rotation code for elm 2015-09-18 15:00:39 +02:00
Jacob Støren 3d2a64b3d6 (#401) Starting to insolate topological rotation code for elm 2015-09-18 15:00:38 +02:00
Jacob Støren 39a9677a44 Comments and whitespace 2015-09-18 15:00:36 +02:00
Jacob Støren eea05e7820 (#401) More Simlification of topological rotation of elements 2015-09-18 15:00:35 +02:00
Jacob Støren 7ee1d2eb95 (#401) Simplified code of topological rotation 2015-09-18 15:00:33 +02:00
Jacob Støren 255f2e496b RigFemTypes Hex definition: Added a clarifying comment 2015-09-18 15:00:32 +02:00
Jacob Støren 66172ea852 (#401) Sync Visible Cells: Preparing to rewrite the main loop 2015-09-18 15:00:30 +02:00
Jacob Støren 35c6316d9c (#401) Sync Visible Cells: More refactoring 2015-09-18 15:00:28 +02:00
Jacob Støren 577c0c4578 (#401) Cleaning up code in the sync visual cells code 2015-09-18 15:00:27 +02:00
Jacob Støren acb4717e9c Linux compile fix 2015-09-18 10:10:33 +02:00
Jacob Støren d40ab88cd9 Made interface in RigFemPartGrid clearer regarding what it provides, and not. 2015-09-18 10:10:31 +02:00
Jacob Støren 3d09ceb92b (#401) Finally got the basic comparison to work and thus Ecl->geomech mapping 
Now weed to clean up, make it fast, include other mappings
Geom/geom Ecl/ecl etc..
and handle inserted/removed layers
 2015-09-17 16:13:27 +02:00
Jacob Støren bf84d7d261 Fixed error in geomCell geometry calculation + Quad rotation 
Also renamed a bit
 2015-09-17 16:13:26 +02:00
Jacob Støren b0caa7f952 (#401) WIP: Implemented averaging to create a geomech equivalent cell 
to compare with the real geomech cells.
Creating mapping based on this, but there are bugs or weaknesses yet,
so it does not work properly.
 2015-09-17 16:13:25 +02:00
Jacob Støren 14b740c8ab Fixed crash when opening project file with a hidden well log plot 2015-09-17 16:13:24 +02:00
Jacob Støren 7a6c7149e1 (#401) WIP: First cell filtering Eclipse Geomec grid visible. 
Not working very well. BB matching is not good enough.
 2015-09-17 16:13:22 +02:00
Jacob Støren 36bc2f8f69 (#401) WIP: Activated the visibility calculation code. 
Started on mapping calculation.
 2015-09-17 16:13:21 +02:00
Jacob Støren f092c4daef (#401) WIP: CaseToCase mapper creation. 
Now only the mapping generation is missing
 2015-09-17 16:13:20 +02:00
Jacob Støren 57ff5becbc (#401) WIP: Added skeleton class for cell mapping 2015-09-17 16:13:19 +02:00
Jacob Støren b6fb85e0a4 (#401) WIP: Prototyped total cell visibility calculation and 
calculation of overridden cell visibility.
 2015-09-17 16:13:17 +02:00
Jacob Støren 7296be4dde Tempoarily hide the SyncVisibleCells options for pushing to dev 2015-09-14 09:53:39 +02:00
Jacob Støren 1e232c23c5 (#477) Fixed missing updates after toggle or delete of ViewLinker 
Fixed missing delete of ViewLinker child objects
 2015-09-14 09:53:33 +02:00
Jacob Støren f81cf98580 (#401) WIP: Refactoring Linked views update system. 
Preparing for linking of visible Cells.
 2015-09-14 09:53:28 +02:00
Jacob Støren 665d233c38 Guard against not having geomMechData 2015-09-14 09:53:22 +02:00
Jacob Støren 238c783b26 More renaming LikedView -> ViewLink 2015-09-14 09:53:16 +02:00
Jacob Støren 984656cbfa (#401) Added access to the ViewLinker from the main view 2015-09-14 09:53:10 +02:00
Jacob Støren 187ebf114d Added A SyncVisibleCells field 2015-09-14 09:53:05 +02:00
Jacob Støren 69019115a2 Made MD/Tvd font smaller 2015-09-11 14:35:12 +02:00
Jacob Støren 379cce41f4 (#443) Linked views default is to not link the result color 
Did some cosmetics as well.
 2015-09-11 14:17:27 +02:00
Jacob Støren 8b26726672 Renamed file LinkedView->ViewLink 2015-09-11 14:17:21 +02:00
Jacob Støren 733b3603db Rename of LinkedView -> ViewLink 2015-09-11 14:17:16 +02:00
Jacob Støren f8dc3b4b81 This fixes a cutpaste error in the Geomech IJK assignment. 
It might fix (#309)
 2015-09-10 12:14:00 +02:00
Jacob Støren 8b801bac50 (#442) Permanent fix. Needed to handle the new plot views properly 2015-09-10 08:14:28 +02:00
Jacob Støren f753593380 (#442) Temporar fix. 
Why this code creates the crash is beyond my understanding.
Must be investigated.
For now, get rid of the crash that blocks testing etc...
 2015-09-09 14:30:12 +02:00
Jacob Støren f26fa65d98 (#430) Added name to GeoMech WellLog curves in the form of Field.Component 2015-09-08 10:04:02 +02:00
Jacob Støren 3c87243dd5 Fixed bug in Eclipse well log extractor. Missing intersections. 2015-09-07 18:18:15 +02:00
Jacob Støren 1b9977239d (#415) Used AABB tree to search for elements 
to find close elements to the wellpath for Geom Well Log extraction
 2015-09-07 16:47:40 +02:00
Jacob Støren 3468160d8f (#415) Use AABB tree for searching after cells 
close to line segment for Eclipse cases
Fixed crash when well path geometry is empty
 2015-09-07 16:24:45 +02:00
Jacob Støren 6440215d21 (#399) WellLog extraction from GeoMech cases works. 
Needs more testing, and performance must be fixed see (#415)
 2015-09-07 16:24:40 +02:00
Jacob Støren 8d57bbe77b (#399) WIP: First commit of experimental geomech WellLog extractor 
Not yet enabled in any way
 2015-09-04 15:35:20 +02:00
Jacob Støren ef4b0fa0d3 Reorganized wellLogExtraction code, preparing for GeoMech variant. 2015-09-04 15:35:15 +02:00
Jacob Støren 8547370b4d Removed children of curve that should not be visible in the tree. 2015-09-03 20:54:15 +02:00
Jacob Støren 1e6baed1dc Placed WellLogExtractors in the RimWellLogPlotCollection and cached them 2015-09-03 20:13:08 +02:00
Jacob Støren e15a95f8b4 Filtered away all undefined numbers before sending to Qwt, as it did not handle them. 
This fixes autoscaling of X-axis
 2015-09-03 19:07:26 +02:00
Jacob Støren 11e57b663c Detaching all curves before the plot is deleted. Qwt needed it. 2015-09-03 15:10:45 +02:00
Jacob Støren 7b308e514c Wip: Separated cretion of Qwt classes from Rim construction 
This needs to be done because MDI window close window deletes the widgets.
We need to be able to recreate all the widgets/qwt objects when needed.
The QwtPlotCurves still crashes on window close/open
 2015-09-03 14:26:49 +02:00
Jacob Støren 959abe7930 Set initial well plot axis ranges to something "pretty" 2015-09-03 11:55:24 +02:00
Jacob Støren 5dd726129c (#396) Fixed updatePlotData system. Set curve name from result variable 2015-09-03 11:39:12 +02:00
Jacob Støren 2288130f6a (#396) Several fixes regarding Project with plots. 
Plots loads the curve data on project open
Plots are removed on project close
Still missing some updates (curve names ...)
 2015-09-03 08:22:06 +02:00
Jacob Støren 2a8533bad0 (#396) Save/Restore of WellLog plots partly in place. 
Cleaned up ownership in WellLog plot classes
initAfterRead() is implemented
moved code related to command features from the WellLog classes
Still plots are not redrawn/reloaded when opening a project file.
 2015-09-03 08:22:01 +02:00
Jacob Støren 30e2495849 Remove duplicate add/remove/setActive viewer methods from MainWindow. 
(#408) Added Save Load of WellLog Plot window geometry also
 2015-09-03 08:21:57 +02:00
Jacob Støren 3844c0958d Moved RimWellLeogExtractionCurve to a separate file 2015-09-02 12:34:12 +02:00
Jacob Støren 1ba3978a4e Renamed to RimWellLogExtractionCurve 2015-09-02 12:13:38 +02:00
Jacob Støren 5a265b66a6 (#396)(#397)(#398) WIP: First real Well Log extracted data visible 2015-09-02 12:08:38 +02:00
Jacob Støren 7e676ddfed (#396) Replot on data update 2015-09-02 10:52:12 +02:00
Jacob Støren e44a78cf57 (#396) Added the data (with gui) to curves to define the well log extraction 2015-09-02 09:26:16 +02:00
Jacob Støren 52281633d6 (#396) untangled Geomech Result Definition from the use of GeoMechView 
In order to reuse the RimGeoMechResultDefinition in the curve data.
 2015-09-01 17:19:09 +02:00
Jacob Støren c35e3fceaf Fixed assert on open old projectfiles 
The cause was that a case was inserted into a field without removing it from the old obsolete field first.
 2015-09-01 17:19:05 +02:00
Jacob Støren 8b5ea1aeb3 Excluded user input events from progressbar process events. 
They are not needed, and might cause problems.
 2015-09-01 17:19:01 +02:00
Jacob Støren ca0fd4d9fe Fix of obscure crash due to results beeing loaded while results are beeing loaded. 
Load GeomResults->progressbar->processEvent->slotActiveViewChanged->
refreshAnimActions->hasResult->loadResults->progressbar->assert ...
 2015-09-01 17:18:57 +02:00
Jacob Støren 9df1e48543 (#396) Disconnected EclipseResultDefiniton from EclipseView 
So that it can be used in WellLogCurves
 2015-09-01 17:18:53 +02:00
Jacob Støren c9887c26c6 Fixed crash when toggling separate fault result 
when no faultresult had been selected.
Crashed due to missing legend definition
 2015-09-01 17:18:49 +02:00
Jacob Støren 26eada49e2 (#396) Wip: Adding an Eclipse WellLog Curve with the pointers to the needed data. 2015-09-01 17:18:45 +02:00
Jacob Støren 8485e76bf5 Added dummy curve data to correct place. Added curve description field. 2015-09-01 09:32:44 +02:00
Jacob Støren 57d195d9d8 Cleaned away dummy data and moved curve creation logic to the command feature 2015-09-01 09:06:02 +02:00
Jacob Støren 3a7959ff13 (#397) Implemented line - Hex intersection 2015-09-01 08:53:29 +02:00
Jacob Støren 75a0035fe5 (#398) WIP: First outline of well log result extractor 2015-09-01 08:53:25 +02:00
Jacob Støren ba467ac52d Forgot some resultAccessor updates 2015-09-01 08:53:21 +02:00
Jacob Støren 62bc5963ff (#397) Added line triangle intersection direction to intersection method 
Preparing for Well Log Extraction
 2015-09-01 08:53:18 +02:00
Jacob Støren 7794a66b04 (#397) (#398) Added globalGridCellIndex access to the ResultAccessors 
To prepare for well log extraction
 2015-09-01 08:53:14 +02:00
Jacob Støren 371902378e (#397) Added geometry methods to be used for well log data extraction 2015-09-01 08:53:10 +02:00
Jacob Støren 627b3c2292 Merge branch 'dev' into modularization-prototype 
Set version to 1.3.101-dev
 2015-08-24 16:54:15 +02:00
Jacob Støren 39c50b4f8d Linux Compile Fix 2015-08-24 16:05:39 +02:00
Jacob Støren ac37cd8049 Version number set to 1.4.0 for release 2015-08-21 10:05:23 +02:00
Jacob Støren f0c09a49a6 Upped to 1.3.8-dev 2015-08-20 18:02:33 +02:00
Jacob Støren bbde32af26 (#374) Fixed property filter not working when no color results was active 2015-08-20 17:50:07 +02:00
Jacob Støren 2e1a542749 Some context menu cleanup 2015-08-20 17:19:38 +02:00
Jacob Støren a6c59f4160 (#384) Fixed Script tree in the new project tree 2015-08-20 15:48:37 +02:00
Jacob Støren f174615098 Replaced use of capability template with convenience 2015-08-20 15:24:49 +02:00