Commit Graph
100 Commits
Author SHA1 Message Date
Jacob Støren 1dc03c87fa Rename in RiuDragDrop 2015-10-23 14:32:27 +02:00
Jacob Støren 469c7fa09a WLP: Moved Curve color to the top of "Curve Appearance" 2015-10-23 14:32:22 +02:00
Jacob Støren 36a0a4a948 (#576) Use timestep also when creating WL extraction curves 2015-10-22 17:14:52 +02:00
Jacob Støren b18ae1a14a Fixed crash introduced by b15b23b856 2015-10-22 16:46:58 +02:00
Jacob Støren b15b23b856 (#540) Removed the Visible Cells Sync from Gui.
Moved UpateOverrides from init afterRead to OpenProject
2015-10-22 16:02:28 +02:00
Jacob Støren 44d1aaa3f1 (#540) Range filter matching: Prioritize cell matches with collapsed eclipse cells less.
To make better matches when one or more corner of the range is in a
collapsed cells area
2015-10-22 15:34:51 +02:00
Jacob Støren 9d106ec76b (#540) Improved handling range filter endpoints in none match cells 2015-10-22 15:34:46 +02:00
Jacob Støren e094ca8e91 (#540) Guarding against crash when opening project with range filter override. 2015-10-22 15:34:41 +02:00
Jacob Støren 065a688c19 Fixed crash on every case loaded 2015-10-21 12:21:08 +02:00
Jacob Støren 00b56b7440 (#540) Range filter mapping now works fem->ecl and opposite.
We need to test more, but now it is getting there.
2015-10-21 10:04:00 +02:00
Jacob Støren 53826f4966 (#540) Wip: Preparing to Extract range endpoint calculation
We neeed to clamp fem range to the extents of the ecl grid within the
fem grid before trying to map fem to ecl. So we need to refactor a bit.
2015-10-21 08:21:16 +02:00
Jacob Støren 58363dbcf9 (#540) Wip: Range filter mapping alive! Needs more adjustments.
Fem to Ecl is not perfect.
2015-10-20 17:41:36 +02:00
Jacob Støren 32d49e4ba3 (#574) Fixed assert when creating eclipse curve 2015-10-20 12:19:41 +02:00
Jacob Storen b5bb62ed0a Linux compile fixes 2015-10-20 02:48:07 -07:00
Jacob Støren 8b894d8515 (#540) Override range filter update system improved
Rename of forgotten viewLink ->viewController
Remember to update group of linked views before adding a new dependent view.
2015-10-20 11:15:30 +02:00
Jacob Støren 4fc0553451 (#540) Added interface for fem to ecl range filter mapping as well. 2015-10-20 11:15:26 +02:00
Jacob Støren a5ef83a2ee (#540) WIP: Split the rangefilter mapping code into files
Preparing for assembling it all.
2015-10-20 11:15:21 +02:00
Jacob Støren c023bc9b2a (#540) WIP: Implemented use of arbitrary exact match diagonal in range filter mapping.
Now we are ready to start testing.
2015-10-20 11:15:16 +02:00
Jacob Støren db4e637e76 Constified some methods in FemPart. WIP range filter mapping first untested code. 2015-10-20 11:15:12 +02:00
Jacob Støren 08d1031f7f Fixed Missing rename after merge 2015-10-15 23:29:30 +02:00
Jacob Støren 5d642719b7 (#557, #560, #561) WLP: Massive renaming in WellLogCurveData. Fixed undiscovered bug.
Curves plotted by TVD was not correctly splitted where well path went out in free air.
2015-10-15 23:21:31 +02:00
Jacob Støren 707ddf15d7 (#540) Started to make single-cell best-match 2015-10-15 13:41:51 +02:00
Jacob Støren 36339f1001 (#522) Changed the Import Well Log Curve icon 2015-10-15 13:41:47 +02:00
Jacob Støren fa375381d1 WLP: Added spaces to curve-auto-names to make them more readable 2015-10-15 13:41:43 +02:00
Jacob Støren a11d82d57e (#522) Added a Las-File Icon in the tree 2015-10-15 13:41:39 +02:00
Jacob Støren 1782fac724 (#521, #522) New icons on Plot related stuff.
The curve icon does not show up for some reason.
2015-10-15 13:41:34 +02:00
Jacob Støren ee96d1b2ee (#521, #522) Added new icon files 2015-10-15 13:41:30 +02:00
Jacob Storen 10046eed4a Linux fixes 2015-10-14 07:13:45 -07:00
Jacob Storen 021de1444d Linux compile fix 2015-10-14 06:57:11 -07:00
Jacob Støren b2f4f64aca Well Log extraction: Cleaning up a bit 2015-10-14 15:20:50 +02:00
Jacob Støren 21b313f945 (#557, #560, #561) WLP: Guaranteed Pairwise ordering of intersections
and endpoint handling.  Now discarding out-of-pair points.
Added well name and case in error message.
2015-10-14 15:20:46 +02:00
Jacob Støren d004d14acc (#557, #560, #561) WLP: Rename of map keys 2015-10-14 15:20:42 +02:00
Jacob Støren a0cccc93cb (#557, #560, #561) WLP: POR results are now undefined in C3D8 elements 2015-10-14 15:20:38 +02:00
Jacob Støren 33aed754d9 (#557, #560, #561) WLP: White space cleanup 2015-10-14 15:20:34 +02:00
Jacob Støren 9fa2395fdc (#557, #560, #561) WLP: Aligned intresection map insertion code Geom/Eclipse 2015-10-14 15:20:31 +02:00
Jacob Støren 8d2fee9bf4 #557, #560, #561) WLP: Allign WL-extraction code Geom-Eclipse 2015-10-14 15:20:27 +02:00
Jacob Støren 4c73b31919 (#557, #560, #561) WLP: Using same code in Geomech WL-extraction 2015-10-14 15:20:23 +02:00
Jacob Støren 0bc4ed9b06 (#557, #560, #561) WLP: Moved intersection cleanup code to baseclass 2015-10-14 15:20:19 +02:00
Jacob Støren fdaa25a286 (#557, #560, #561) WLP: Added scoping to make ready for a separate function 2015-10-14 15:20:16 +02:00
Jacob Støren 6014312056 (#557, #560, #561) WLP: Started to return a cleaner intersection list from the extractor.
Created a common baseclass to be able to use same intersection cleanup code.
2015-10-14 15:20:12 +02:00
Jacob Støren 36d2bb224c (#542) Fixed several project-open crashes related to missing files.
Added errormessage on missing wellpath file
2015-10-12 12:41:02 +02:00
Jacob Støren 5619e14cbe Adjusted VisibleCells Calculation Tolerance
Now better matching the synt_small_c2 case
2015-09-28 21:09:28 +02:00
Jacob Støren e74098d7ca (#553) Fixed. Now the CreatDisplayModel sets timestep without firing signals
from the AnimationController.
2015-09-28 20:43:55 +02:00
Jacob Støren 5d04655d6a (#520)(#503) Made sure the Overridden cells actually overrides always. 2015-09-28 10:05:20 +02:00
Jacob Støren 30f3796bab Slight progress-bar improvement 2015-09-28 08:21:51 +02:00
Jacob Støren 5677665dba (#331) Properly shown POR values by checking for element type.
We are calculating and using an elmNode POR result to correctly
respect the element type.
2015-09-28 07:39:57 +02:00
Jacob Støren 56dae7f71a (#550) Fixed by reverting commit ca0fd4d9fe
The simplified check for results present was not good enough.
As we no longer do processEvents during progressbar, it should be ok to
reintroduce the assertResultsLoaded test.
2015-09-27 19:32:55 +02:00
Jacob Støren 07d101353c (#405) Gamma calculation test POR < threshold needed the threshold to be in bar as well. 2015-09-26 10:22:39 +02:00
Jacob Støren 43dd883f63 Fixed Crash when selecting SE witout any component. 2015-09-26 10:08:58 +02:00
Jacob Støren cd13fc5aee (#405) Added [Bar] to legend title when showing SE, ST and POR 2015-09-26 10:00:03 +02:00
Jacob Støren 276addc713 (#405) Convert POR, SE, and ST to Bar. Fixed issues regarding property filters.
Result fields without component had an extra space in the option value string
that made the search for the option in the option list fail.
2015-09-26 09:38:29 +02:00
Jacob Støren 3295c032b1 (#549) Geomech Property Filter: Fixed missing update when adding a filter 2015-09-26 09:32:43 +02:00
Jacob Støren da893744a5 (#513) Use element type to distinguish when to use the POR values 2015-09-25 20:20:46 +02:00
Jacob Støren 5097082f09 (#513) Added a HEX8P element type to distinguish C3D8 and C3D8P 2015-09-25 19:33:34 +02:00
Jacob Støren 5b9bf3bcd2 (#518) Removed link visible views from 3DView context menu
Modified the command enabled state to be enabled only when it is sensible to run it.
(Unlinked views is present.)
2015-09-25 15:24:32 +02:00
Jacob Støren ecc69e7a1a Linked Views: Validation and changes on update system for ViewController 2015-09-25 15:24:29 +02:00
Jacob Støren c370c7cb02 View Linker: Remove child array entry after deletion to have a valid datastructure through destruction. 2015-09-25 15:24:27 +02:00
Jacob Støren c065d625e2 (#483) Linked Views: Acknowledge visible cells override when disabling tree items
(Filter items)
2015-09-25 15:24:24 +02:00
Jacob Støren 49ab79219e Fixed crashes regarding general handling of NULL pointers in Child Arrays 2015-09-25 15:24:21 +02:00
Jacob Støren 03c788db6a Linked Views: isActive() as access method. doSync methots renamed to update
and changed the meaning accordingly.
2015-09-25 15:24:19 +02:00
Jacob Støren c79a01f3b9 Linked Views: created access methods for viewController settings
The access methods now respects the active settings on both the ViewController
and the Toplevel.
2015-09-25 09:39:42 +02:00
Jacob Støren 8c63f4963b (#513) Minor rename 2015-09-25 09:16:14 +02:00
Jacob Støren 9711f5d891 (#513) POR now ignored in ST calculation where not all elmnodes have POR 2015-09-24 22:37:57 +02:00
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