Commit Graph
100 Commits
Author SHA1 Message Date
Jacob Støren 61e9a2a696 #3958 First shot on time difference implementation 2019-01-30 16:46:16 +01:00
Jacob Støren 1d60bd9843 Simple rename variables 2019-01-30 15:28:45 +01:00
Jacob Støren 58ac488929 #3958 Refactoring : RigResultAccessorFactory simplification
To make the result address including basetimestep info reach the CellResultsData class.
2019-01-30 15:25:29 +01:00
Jacob Støren 8a5cbf60fd #3958 Refactoring CaseCellResultsData to propagate result address with timelapse info all the way. 2019-01-29 12:44:23 +01:00
Jacob Støren 5fe4a057ce #3958 Fix warning and error from refactoring 2019-01-29 08:35:42 +01:00
Jacob Støren a3660cd496 #3958 Refactoring: Rename modifiable result access to make it easier to track in the code. The existing overloads made things harder to read. 2019-01-29 08:35:42 +01:00
Jacob Støren fe53380a36 #3958 Refactoring: RigCaseCellResultsData: Reorder headerfile
to group the methods sensibly
2019-01-28 16:31:57 +01:00
Jacob Støren dbb2a564a2 #3958 Refactoring: RigCaseCellResultsData: Remove the final result index based interface 2019-01-28 16:18:28 +01:00
Jacob Støren c159dfb763 #3958 Refactor: Simple renaming 2019-01-25 16:19:15 +01:00
Jacob Støren 3e3d3871ed #3958 Refactoring: Remove scalarResultIndex from RigEclipseResultAddress
and real external use (outside CaseCellResultsData)
Regression tests OK.
2019-01-25 16:19:15 +01:00
Jacob Støren 98f2b50180 #3958 Refactoring: Remove more direct use of scalarResultIndex related to CellEdge 2019-01-25 16:19:15 +01:00
Jacob Støren d8eded7d49 #3958 Refactoring: Removed result index from NNC data 2019-01-25 16:19:15 +01:00
Jacob Støren 09011862cd #3958 Refactoreing: Rename 2019-01-25 16:19:14 +01:00
Jacob Støren 8ee1d1491f #3958 Refactoring: EclipseResultAddress can now be used with type and variable in addition to index (which is to be removed) 2019-01-25 16:19:14 +01:00
Jacob Støren 726f5ee596 Remove compiler warnings 2019-01-25 16:19:14 +01:00
Jacob Støren 1d8e31fe91 #3958 Refactoring: Fix after update from dev 2019-01-25 16:19:14 +01:00
Jacob Støren 42afa063d5 #3958 Refactoring: Rename to findOrLoadKnownScalarResult
to make it clear that it does not add a result name to the internal structures.
2019-01-25 16:19:14 +01:00
Jacob Støren d0792d80c3 #3958 Refactoring : Moved formation names calculation into CaseCellResultsData.
Made one more method private.
2019-01-25 16:19:14 +01:00
Jacob Støren 70fc63056f #3958 Refactoring: Privatized and renamed findTransmissibilityResults()
Narrower identification in header of methods needing refactoring attention
2019-01-25 16:19:14 +01:00
Jacob Støren 5a01fdb88e #3958 Refactoring: Replaced result info based lookups with result address.
Replaced access of resultInfo as vector with single access based on address.
Moved RigEclipseResultAddress to a separate new file.
2019-01-25 16:19:13 +01:00
Jacob Støren accc0768a1 #3958 Refactoring: Reordered the headerfile to outline the index-based methods needing refactorization 2019-01-25 16:19:13 +01:00
Jacob Støren e21a0da543 #3958 Refactoring: Remove resultIndex in maxTimeStepResult 2019-01-25 16:19:13 +01:00
Jacob Støren 8e16d3ff20 #3958 Refactoring: Moved code into CaseCellResultsData.
Made methods private
2019-01-25 16:19:13 +01:00
Jacob Støren ccfee8f34a #3958 Starting refactoring of eclipse results addressing
Preparations for time diff results
2019-01-25 16:19:13 +01:00
Jacob Støren b329f3acc7 #3992 Fixed memory overwrite (and arbitrary crashes) due to missing critical section.
The critical section is needed when doing geometry transfer from libecl in paralell.
Caused arbitrary crashes in completely unrelated code when compiled in release on a 32-core machine on windows
2019-01-25 12:27:43 +01:00
Jacob Støren 190b88547e #3963 Simplify Plot Window toolbar icon 2019-01-16 10:15:49 +01:00
Jacob Støren 49292cd2ef #3956 Improve ruler icon 2019-01-16 09:32:59 +01:00
Jacob Støren d158a3c3bb #3946 Improve HoloLens icons 2019-01-15 18:23:25 +01:00
Jacob Støren 07f8221676 #3898, #3899, #3900 Better source stepping command icons. Combine curve and stepping icons. Improved Clear source curve command enabling 2018-12-18 17:15:54 +01:00
Jacob Støren db78e07fcf #3797 Use custom icons for up and down stepping of comboboxes 2018-12-18 15:56:46 +01:00
Jacob Støren c4cc33b624 #3639 Add map projection icon for Contour maps 2018-12-04 15:13:19 +01:00
Jacob Støren 918efd3a27 #3757 Enable Z-buffer testing for text annotations 2018-12-03 11:05:12 +01:00
Jacob Støren f3c0345d3a #3757 Improve position of labels when creating them in 3D view 2018-12-03 11:05:12 +01:00
Jacob Støren a13201e42e #3757 Add selection of text annotations by picking 2018-12-03 11:05:12 +01:00
Jacob Støren a9a5eaf604 #3757 New feature to add a text annotation in the 3D view 2018-11-30 14:30:34 +01:00
Jacob Støren 92a45e959e #3757 Rename RiuSelectionManager to Riu3dSelectionManager 2018-11-30 14:30:34 +01:00
Jacob Støren c2206abca5 #3757 Wip: Add draggers to text annotation points when text is selected 2018-11-30 14:30:34 +01:00
Jacob Støren 3cc8ff82d1 #3764 Add annotation related icons 2018-11-28 15:40:28 +01:00
Jacob Støren 0148fc2279 #3724 Reload and recreate visualization when changing file 2018-11-28 14:36:17 +01:00
Jacob Støren 04754d394f #3776 Add toggle to text and reach circles annotations 2018-11-28 14:36:17 +01:00
Jacob Støren 0f384cf4f7 #3724 Split the line annotation classes into separate files. Cleaned up includes 2018-11-28 12:10:08 +01:00
Jacob Støren 29e6e08779 #3724 Added cycling default color to polyline import. Set default line thickness to 2.
Refactored away unneccesary complexity. loadAndUpdate when opening project file. Toggle now working
2018-11-27 17:54:42 +01:00
Jacob Støren 08de39f15a AppFwk: Update some plantuml docs 2018-11-27 14:59:30 +01:00
Jacob Støren 7a0fcaa2ec AppFwk: Remove obsolete plantuml documentation stuff 2018-11-27 14:59:30 +01:00
Jacob Støren 8873cdb1f7 #3757, #3723 Merge cleanup of 3d editor support 2018-11-27 11:45:46 +01:00
Jacob Støren 733324634b #3757, #3723 Split the RicPointTangentManipulator file into the different classes actually contained therein 2018-11-27 11:29:20 +01:00
Jacob Støren 3c32595e25 AppFwk: Moved PdmUi3dObjectEditorHandle and PdmUiSelection3dEditorVisualizer into correct place in PdmUiCore 2018-11-27 10:31:54 +01:00
Jacob Støren 318cd76b64 AppFwk: Split PdmUiObjectEditorHandle into PdmUiWidgetObjectEditorHandle
making PdmUiObjectEditorHandle  a cleaner interface for PdmUi3dObjectEditorHandle
2018-11-27 09:31:33 +01:00
Jacob Støren b9b1646576 AppFwk: 3D editor system: Replace pointer to caf::Viewer with generic QWidget, as it is not neccessary to know the viewer explicitly. 2018-11-26 22:37:25 +01:00
Jacob Støren b4572fd9a2 AppFwk: Remove som unused code 2018-11-26 21:51:05 +01:00
Jacob Støren fb93ad7ca7 AppFwk: Make PdmUiSelection3dEditorVisualizer generic, ready to be moved to a separate file 2018-11-26 21:50:46 +01:00
Jacob Støren 9297c5888c #3724, #3723 Several polyline annotation updates
Renamed from polyline to polylines.
Split into PolylinesFromFile and UserDefinedPolylines
Add import of polylines from file
2018-11-26 14:10:20 +01:00
Jacob Støren bb95daee97 #3724 Fix missing drawing of more than one polyline 2018-11-26 14:08:14 +01:00
Jacob Støren bfee1dfa64 #3646 Add icons for MainGrid LGR/Temp LGR's, Export Completions, sub items on/off/toggle 2018-11-13 15:43:36 +01:00
Jacob Støren 0b1bc21d0d Use "Save" icon for export. Changed a misleading Fishbones icon with the correct completions icon 2018-10-31 09:48:37 +01:00
Jacob Støren 6374708520 Set default background color of contour maps to off-white 2018-10-31 09:48:36 +01:00
Jacob Støren a1705c5e39 #3487 Use icons for the different MSW valves 2018-10-31 09:48:36 +01:00
Jacob Støren 68d34d7000 #3577, #3537, #3487 New icons created, and some put into place. 2018-10-30 17:26:30 +01:00
Jacob Støren d25d8a3fe4 #3506 Move well path geometry classes to a separate folder 2018-10-16 09:53:00 +02:00
Jacob Støren 5bf5e6c99d #3382 Remove libslvs from the code base, including some cleanup. 2018-10-16 09:20:44 +02:00
Jacob Støren bd79bd89c1 #3449 Improve checkbox column size hint, alignment and "hit" rectanngle 2018-10-03 08:40:28 +02:00
Jacob Støren 979882da03 AppFwk: Read only checkboxes in table view, now is rendered disabled 2018-10-02 16:52:56 +02:00
Jacob Støren e3c7b4ffa4 #3426 Fix missing update of well targets when view is scaled 2018-10-02 16:29:58 +02:00
Jacob Støren d9e8537974 #3447, #3207, #3448 Polished the target table. Improved insert target commands, Add icons to editable wellpaths and target list. 2018-10-02 15:55:56 +02:00
Jacob Støren 1dfad4f01d #3444 Hide inactive targets from the 3D view.
Also: Fix crash from missing ray
2018-10-02 15:55:56 +02:00
Jacob Støren 1ece11b7c4 #3393 handle 0 dogleg/ inf radius in J Curve calculator 2018-09-28 15:17:23 +02:00
Jacob Støren f4761b55ab #3393 Continous sensible tangent calculation for targets wo tangent constraint.
Using abs(90 -inclination) and inverse distance as weights.
Moved well path calculations into a separate class
2018-09-28 15:15:38 +02:00
Jacob Støren 71c36208c3 #3422 Handle straight well paths better 2018-09-28 15:09:46 +02:00
Jacob Støren 478160fdfe #3387 Add "Show Well Plan" command 2018-09-26 12:40:15 +02:00
Jacob Støren 4170a57bf2 #3387 Add additional output from the ArcCurveCalculator 2018-09-26 12:40:15 +02:00
Jacob Støren 170da81287 #3387 Add epsilon to handle singularities in OffshoreSphericalCoords 2018-09-26 12:40:15 +02:00
Jacob Støren 5a9a5ba803 #3407 Default color palette for new well paths 2018-09-24 16:41:57 +02:00
Jacob Støren d5d18bde09 #3353 Use ArcCurveCalculator instead of ad-hoch function 2018-09-24 15:50:57 +02:00
Jacob Støren 41b24a8de2 #3353 Improve error messages from arc based geometry calculators.
Color dogleg text red if the constaint is not satisfied
2018-09-24 15:49:16 +02:00
Jacob Støren e55fc4990d #3353 AppFwk: TableViewEditor: Support pr cell tooltip.
Use ForegroundRole text color for highlighted cells also.
Use PdmUiItem::uiContentTextColor as ForegroundRoleText
2018-09-24 15:49:16 +02:00
Jacob Støren 10b031fa6d #3353 AppFwk: Add contentTextColor to PdmUiItem 2018-09-24 15:49:16 +02:00
Jacob Støren 7e78c77b90 Remove compiler warning 2018-09-20 14:53:54 +02:00
Jacob Støren 2368722d23 Upped to version 2018.05.01-dev.07 2018-09-19 21:39:50 +02:00
Jacob Støren 3cd9c6123c Remove compiler warning 2018-09-19 10:25:57 +02:00
Jacob Støren 0259eb6402 #3252 Add solver and curve status enums to communicate more fine grained
how the S-curve result is.
Adjusted tests. Enabled two configs now reporting and solving correctly.
Disabled three that now cant converge
2018-09-19 10:23:23 +02:00
Jacob Støren e49712fd50 #3252 Cleanup. Disabled experiments. Trying the simple solution. 2018-09-19 10:23:23 +02:00
Jacob Støren 944ba7cfd8 #3252 Tried updating jacobi. Not quite sccessful 2018-09-19 10:23:22 +02:00
Jacob Støren fdbfd30d31 #3252 WIP: Internal iterative solver in place. Needs improvement. 2018-09-19 10:23:21 +02:00
Jacob Støren 007149b544 #3252 WIP: Home brewn iteration loop to find correct Q1Q2 points giving requested R1 and R2 2018-09-19 10:23:20 +02:00
Jacob Støren 50a579c136 Remove compiler warning + whitespace 2018-09-19 10:23:20 +02:00
Jacob Støren fce3d586ca #3358 Fix missing update of 2D intersection views when completion type is recalculated 2018-09-12 14:20:43 +02:00
Jacob Støren 0431540073 #3312 Well Path Creation: Update intersections, completion type result and fractures when moving the wellpath 2018-09-12 14:20:43 +02:00
Jacob Støren 50b10d6078 #3357 Appfwk: Table View Editor : Use deleteLater to avoid crash
due to delegates beeing deleted before the actual widgets. Qt needs the delegates to redraw stuff on the way to the event loop
2018-09-12 14:20:43 +02:00
Jacob Støren 3d752995d2 #3312 Well Path Creation update preparations. Rename of method 2018-09-12 14:20:43 +02:00
Jacob Støren 5e779de956 #3321 Place "Create Well Path" command in sensible context menu places 2018-09-11 10:41:58 +02:00
Jacob Støren 6ce075d341 #3321 Well Path Creation: Gui text adjustments 2018-09-11 09:41:47 +02:00
Jacob Støren b9a2a382b1 #3322 Well Path Creation: Use positive depth in UTM reference point
Obsoleted the original field to facilitate conversion in a transition period. Should be removed before release.
Also removed output of unused fields.
2018-09-11 09:32:22 +02:00
Jacob Støren be75fbc2c1 #3286 A simple default tangent calculation/adjustment when creating targets
Use distance weighted average of line segments
2018-09-11 08:36:14 +02:00
Jacob Støren 01673f31cb Remove uninitialized variable used compiler warning 2018-09-11 08:36:00 +02:00
Jacob Støren dd4c359f6e Build System: Supress MSVC warning C4505 2018-09-11 07:54:15 +02:00
Jacob Støren 8b509d2f5a #3351 Well Path: Show calculated tangent, and use as default 2018-09-10 16:33:09 +02:00
Jacob Støren 26b3065974 #3296 caf: Table View: Force redraw when QSelection changes (Qt bug)
Guard against doing anything if table is hidden
2018-08-31 16:13:46 +02:00
Jacob Støren e26a57011d #3296 caf::SelectionManager: Refactoring to avoid sending multiple selection changes
Must be considered if using the CmdSelectionGangeExec
2018-08-31 16:13:46 +02:00
Jacob Støren e93a07b43b Fix missing blocking of selection manager update when updating table selection
Caused crash in the Well Path editing (dragging targets)
2018-08-30 15:43:55 +02:00
Jacob Støren bddaf9d602 #3291 Fix by differensiating between dynamic and default pickEventHandlers 2018-08-30 15:43:55 +02:00