Commit Graph
100 Commits
Author SHA1 Message Date
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
Jacob Støren ad24409b91 #3287 Add update of connected curves when the well path changes 2018-08-29 17:33:58 +02:00
Jacob Støren 6168ac95ab #3290 Always resize columnwidths when adding targets 2018-08-29 17:08:03 +02:00
Jacob Støren 015bb1719a #3290 caf: Add force column resize attribute 2018-08-29 17:07:36 +02:00
Jacob Støren 9fe5631fe2 #3262 Set target dogleg default to 3.0 2018-08-29 16:59:59 +02:00
Jacob Støren dc432e976b #3249 Well path target point picking operational.
Still work to do, however.
2018-08-29 16:08:34 +02:00
Jacob Støren 9cd9173000 #3249 Add possibility to add and remove pickEventHandlers 2018-08-29 16:04:08 +02:00
Jacob Støren 99bdece40e #3249 caf: Add isSelected method to selection manager 2018-08-29 16:04:08 +02:00
Jacob Støren ed518a94a6 #3249 caf: Add background color control to table view 2018-08-29 16:04:08 +02:00
Jacob Støren d07b7d1456 #3248 Refactoring: Rename of 3d object editor class. 2018-08-27 16:25:26 +02:00
Jacob Støren 8fca7475e9 caf: Renamed the WidgetBasedObjectEditor to FormLayoutObjectEditor 2018-08-27 16:25:26 +02:00
Jacob Støren 0a2b68348f #3249 Refactoring: Rename of classes to PickEventHandler 2018-08-27 16:25:26 +02:00
Jacob Støren cbb7f4b0c9 #3249 Refactoring: Cleaned up displayContextMenu and handlePickAction in ViewerCommands 2018-08-27 16:25:26 +02:00
Jacob Støren 58617b7510 #3249 Refactoring: Rename of ViewerEvent to PickEvent 2018-08-27 16:25:26 +02:00
Jacob Støren ad9864240c #3249 Refactoring: Remove the old extractintersectionData.
Replace it with a separate find method.
Use RiuPickItemInfo in the RicViewerEventObject
2018-08-27 16:25:26 +02:00
Jacob Støren 714ba1e605 #3249 Refactoring: RiuPickItemInfo into separate file 2018-08-27 16:25:26 +02:00
Jacob Støren 9ce814a3b2 #3249 Refactoring pick event handling as preparations 2018-08-27 16:25:25 +02:00
Jacob Støren a73fbff5bb Upped to version 2018.05.01-dev.05 2018-08-22 15:55:06 +02:00
Jacob Støren 2284d98bcc #2607 Add vertical dragging to well targets 2018-08-21 16:44:20 +02:00
Jacob Støren 37cb3e0ab7 caf: Removed obsolete SelectionManager includes 2018-08-21 16:44:20 +02:00
Jacob Støren 287fa3cd80 #2607 Add horizontal dragging 2018-08-21 16:44:19 +02:00
Jacob Støren 296854d749 caf: Rename of SelectionRole to SelectionLevel and
CURRENT to FIRST_LEVEL
Replace use of SelectionLevel enum as argument with int
2018-08-21 16:44:19 +02:00
Jacob Støren 0e92c1d594 caf: Replace selection role with selectionLevel.
Use std::map for storage of the different selections
Started to remove the SelectionRole Enum
2018-08-21 16:44:19 +02:00
Jacob Støren e10754cffb #2607 caf: Add selection level to the "notify selection changed" system 2018-08-21 16:44:19 +02:00
Jacob Støren 74d3f08448 #2607 Transparent handles with correct priority 2018-08-20 12:59:58 +02:00
Jacob Støren 67d4df69b2 #2607 Adjust handle size to follow characteristic cell size. Add vertical axis handle. 2018-08-17 12:32:40 +02:00
Jacob Støren 2ed84c9df2 #2607 WIP: Outline of dragger system based on editors. First visible dragger geometry 2018-08-17 12:32:40 +02:00
Jacob Støren 096536a341 caf: Use caf::Factory macro for factory registration in field editors. Removed obsolete code 2018-08-17 12:32:40 +02:00
Jacob Støren e862ef873a #3221 caf: Avoid selectionChanged and updateConnectedEditors when TableView is built (configureAndUpdateUi) 2018-08-16 11:55:28 +02:00
Jacob Støren 7254a58887 Remove unused include 2018-08-16 11:55:28 +02:00
Jacob Støren 1d4fef5a8b #3208 Improve read only settings in well path target list 2018-08-14 14:23:55 +02:00