OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-08 07:03:25 -06:00
Code Issues Packages Projects Releases Wiki Activity
10,271 Commits 27 Branches 60 Tags 289 MiB
44f3882ecb
Commit Graph

882 Commits

Author SHA1 Message Date
Magne Sjaastad
98da255772 System : Remove TR1 warnings from gtest 2019-01-07 14:32:29 +01:00
Magne Sjaastad
f09fa727fa #3928 Coordinate transform : Add convert of vector of points 2019-01-03 13:16:26 +01:00
Magne Sjaastad
f42aa8bcda Test : Remove file from Qt MOC 2019-01-02 09:34:06 +01:00
Gaute Lindkvist
b1b278fffc #3876 Add reference to Shoelace formula for counter clockwise polygon test. 2018-12-21 09:48:57 +01:00
Magne Sjaastad
6f3097dd5f Merge remote-tracking branch 'origin/2018.11.01-patch' into dev 2018-12-21 08:46:27 +01:00
Gaute Lindkvist
10da90350f #3876 Create Counter Clockwise closed polygons out of the contour line segments 2018-12-20 09:47:25 +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
Magne Sjaastad
902473a4a5 #3886 AppFwk ToolBarEditor : Call calculateValueOptions for existing editors 2018-12-17 07:55:25 +01:00
Magne Sjaastad
b383df4ccc #3886 AppFwk ToolBarEditor : Call calculateValueOptions for existing editors 2018-12-14 12:25:21 +01:00
Gaute Lindkvist
4b1feb842d #3885 Include "Cached" memory in available virtual memory on Linux. 
* Cached memory is easily available to processes if needed.
 2018-12-14 10:47:33 +01:00
Gaute Lindkvist
b43ef3dc0b #3885 Include "Cached" memory in available virtual memory on Linux. 
* Cached memory is easily available to processes if needed.
 2018-12-14 10:33:51 +01:00
Gaute Lindkvist
914daded6b #3794 Improve wheel zooming 2018-12-12 08:01:13 +01:00
Bjørn Erik Jensen
06b58a2462 #3799 Scale legend. Add minor ticks in first major interval 2018-12-11 15:17:00 +01:00
Gaute Lindkvist
734d76f74a Revert "#3751 Fix keyboard selection in Summary Plot Editor" 
This reverts commit ab0fa2fb19.

* This change should never have been merged back into the repo.
 2018-12-11 13:12:24 +01:00
Gaute Lindkvist
17e12a92a0 Update CMake to only look for Qt5 if RESINSIGHT_BUILD_WITH_QT5 is set 2018-12-10 15:10:46 +01:00
Magne Sjaastad
020146bead Cotire : Move macro definition to avoid duplicate symbols 2018-12-10 09:31:10 +01:00
Gaute Lindkvist
c51b938d03 Switch to more robust check for Qt5 for cafUserInterface. This should be applied to other projects 2018-12-07 12:58:03 +01:00
Bjørn Erik Jensen
c0b7b5d87e caf. Make method const 2018-12-07 12:42:42 +01:00
Bjørn Erik Jensen
b4482d20b0 #3723 Annotations. User editable polyline, both in in view and in property editor 2018-12-07 09:11:19 +01:00
Gaute Lindkvist
29c3e10617 #3779 Implement AICD ui and settings 2018-12-05 15:47:16 +01:00
Gaute Lindkvist
2ed41d3158 CMake fixes to cafTestApp 2018-12-05 15:47:16 +01:00
Magne Sjaastad
aa19715c40 #3822 AppFwk : Improve resolve of PtrField, unit test 2018-12-04 14:10:54 +01:00
Magne Sjaastad
90550fe561 #3822 AppFwk : Improve resolve of PtrField 2018-12-04 14:10:18 +01:00
Gaute Lindkvist
b06097862f Fix Linux build of caf unit tests 2018-12-03 15:00:53 +01:00
Gaute Lindkvist
8cd2d37b92 Quieten Qt5 check in caf unittests 2018-12-03 15:00:53 +01:00
Magne Sjaastad
4d25cd0c71 #3792 Add font size 10 and 14 2018-12-03 14:19:49 +01:00
Gaute Lindkvist
7128c58b6c Quiet Qt5 check for cafAppFwk 2018-12-03 14:18:38 +01:00
Gaute Lindkvist
b097c8c9b7 Fix TRUE/true in cafAboutDialog 2018-11-30 09:47:53 +01:00
Gaute Lindkvist
ddb546d877 #3754 Upgrade CAF CMake-system to support both Qt4 and Qt5 2018-11-30 09:47:53 +01:00
Gaute Lindkvist
cc7269c717 #3752 CAF code changes to build on both Qt4 and Qt5 2018-11-30 09:47:53 +01:00
Gaute Lindkvist
398a59d0a6 Add some more checks to the SILENCE_TR1 warnings for Ceevis unittests/gtest 2018-11-30 09:47:53 +01:00
Gaute Lindkvist
a7e76679e1 #3754 Support both Qt4 and Qt5 in Ceevis build. 2018-11-30 09:47:53 +01:00
Gaute Lindkvist
237623ef21 #3752 CVF Code changes to build on Qt4 and Qt5 2018-11-30 09:47:53 +01:00
Gaute Lindkvist
100aabd332 CVF Code changes to hide std::tr1 warnings so unit tests build. 2018-11-30 09:47:51 +01:00
Gaute Lindkvist
7fd3dac2ef Revert "#3751 Fix keyboard selection in Summary Plot Editor" 
This reverts commit ab0fa2fb19.

* This change should never have been merged back into the repo.
 2018-11-30 09:45:50 +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
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
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
Gaute Lindkvist
8b7b110440 Merge branch 'dev' into dev-deeper 2018-11-26 09:21:33 +01:00
Gaute Lindkvist
40f466fb0c #3751 Fix keyboard selection by overriding keyPressEvent and emitting clicked() 2018-11-26 08:01:54 +01:00
Gaute Lindkvist
ab0fa2fb19 #3751 Fix keyboard selection in Summary Plot Editor 2018-11-23 15:36:33 +01:00
Gaute Lindkvist
2cf5357a47 #3738 Active correct item when clicking in Summary Plot Editor 2018-11-23 15:11:23 +01:00
Bjørn Erik Jensen
15a6bc358b Merge branch 'dev' into dev-deeper 2018-11-22 14:21:00 +01:00
Gaute Lindkvist
d69153c013 #3489 Fix legend text for flow diagnostics. 2018-11-22 13:39:07 +01:00
Bjørn Erik Jensen
d287a2fb64 #3721, #3707 Scale legend. Do not add duplicate overlay items. Fix scale bar transparency and show/hide 2018-11-21 15:11:11 +01:00
Bjørn Erik Jensen
67ba01f835 #3722 Scale legend. Descrease size 2018-11-21 14:58:47 +01:00
Bjørn Erik Jensen
5e769b337f Merge branch 'dev' into dev-deeper 2018-11-21 14:00:46 +01:00
Magne Sjaastad
11de63a5ef Fix Linux build 2018-11-21 10:55:57 +01:00
Gaute Lindkvist
9145e6011d #3697 Fix zoom issues with ortographic views 2018-11-20 13:49:19 +01:00
Bjørn Erik Jensen
75c923d102 #3698 Scale bar. Support for both horizontal and vertical orientation 2018-11-16 13:52:05 +01:00
Bjørn Erik Jensen
05e04bb588 #3698 Scale bar. Fixed axis length 2018-11-16 13:52:05 +01:00
Bjørn Erik Jensen
d8a466a9ef #3698 Scale bar. Take 1. Only vertical variant implemented so far 2018-11-16 13:52:05 +01:00
Magne Sjaastad
9b41685035 #3662 AppFwk : Allow interaction in second main window 2018-11-12 09:49:35 +01:00
Magne Sjaastad
cfbbcacc23 #3634 Regression Test : Use flag to control OpenMP when building geometry 2018-11-12 07:33:08 +01:00
Gaute Lindkvist
937dacd7df Assert on contourLevel range not being empty for cafContourLines 2018-11-05 14:41:12 +01:00
Gaute Lindkvist
1422403b71 #3596 Add new aggregation for Oil / Water / HC columns and improve speed and reliability. 
* Avoid calculating results many times for each change.
* Avoid drawing spurious contour lines when results are undefined.
* Add aggregation type to legend header (#3594).
 2018-11-05 14:31:23 +01:00
Magne Sjaastad
2143673aa7 #3583 Property Editor : Set unused grid cells to stretch 0 2018-11-02 14:58:08 +01:00
Magne Sjaastad
a3aeb424b3 Revert "#3564 System : Recreate QGridLayout for each property editor" 
This reverts commit f6c92a15a6.
 2018-11-02 14:04:29 +01:00
Magne Sjaastad
78505bb44d System : Fix name collision of macro expansion 
The macro CAF_PDM_UI_FIELD_EDITOR_SOURCE_INIT expands to a variable name colliding with an identical variable name in a different file. Cotire put the two files into same file, and this causes compilation issues.

Fixed by removing some empty lines in one file, to make sure the two statements are defined at different lines.
 2018-11-01 19:56:55 +01:00
Gaute Lindkvist
ee388ca4b0 #3591 Improve edges on contour map. 2018-10-31 16:17:09 +01:00
Gaute Lindkvist
e9de865c1f Rebase conrec code off the Paul D. Bourke C-code and fix copyright. 
* Rebased to the C-code by Bourke himself to avoid the sneaky little requirement
added by Nicholas Yue that only allows redistribution with explicit permission.
 2018-10-31 11:31:02 +01:00
Gaute Lindkvist
0d3b205dac #3589 Fix regression in column width for table in well path creation. 2018-10-31 09:32:10 +01:00
Gaute Lindkvist
69d079f942 #3505 First go at contour lines 2018-10-30 16:25:33 +01:00
Magne Sjaastad
f6c92a15a6 #3564 System : Recreate QGridLayout for each property editor 
If the layout is reused, the rows grow over time. This causes the Cell Result to not fill all available space.
 2018-10-26 11:39:58 +02:00
Gaute Lindkvist
f80472ffa6 #3540 Create seperate 2d view with parallel, look down and linked views 2018-10-24 15:21:53 +02:00
Magne Sjaastad
758598df0e clang-tidy : Use nullptr 2018-10-18 16:36:11 +02:00
Magne Sjaastad
764fb65e8e clang-tidy : Remove redundant 'virtual' and add 'override' 
clang-tidy : Remove redundant 'virtual' and add 'override'
 2018-10-18 16:35:51 +02:00
Gaute Lindkvist
71a1bd98ab #3441 Improve table view to work better with more attribute types. 2018-10-05 15:35:15 +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
Gaute Lindkvist
fcda0b9755 Remove padding to the left in TreeSelectionEditor if the tree doesn't have grand children. 2018-10-02 08:46:24 +02:00
Gaute Lindkvist
33a171fbcf #3419 Implement buttons to add communicating tracers to the selected injectors or producers. 2018-09-28 15:46:08 +02:00
Gaute Lindkvist
e91bdece9c Ui Form Layout, simplify comment for label content margin shift. 2018-09-28 15:46:08 +02:00
Magne Sjaastad
b584ab905c AppFwk : Activate more warnings 2018-09-27 21:36:52 +02:00
Gaute Lindkvist
8c5e538f01 Implement a way for editors to fit the label to the field. 2018-09-27 16:07:35 +02:00
Magne Sjaastad
a3d8fc1fb3 #3421 Text File Export : Open file as text file when required 2018-09-27 12:42:28 +02:00
Gaute Lindkvist
15a61f88e0 Fix row stretch issue. 2018-09-26 14:45:56 +02:00
Gaute Lindkvist
e8a1d30f2d #3404 Side by side editors, first implementation. 2018-09-26 14:30:50 +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
3cd9c6123c Remove compiler warning 2018-09-19 10:25:57 +02:00
Gaute Lindkvist
a3f6a8dd3d #3373 Initialize variable so that selection events updates selection manager for table view editor 2018-09-17 13:23:23 +02:00
Magne Sjaastad
deff3ed41b #3365 AppFwk Integer slider editor : Block signals in configureAndUpdate 2018-09-14 09:45:53 +02:00
Magne Sjaastad
6aa234cc9b AppFwk : Fix several warnings 2018-09-13 09:01:05 +02:00
Magne Sjaastad
2d1d9fed95 AppFwk : Fix signed/unsigned issue 2018-09-13 08:55:02 +02:00
Magne Sjaastad
16d3e67de0 AppFwk : Set warning level to W4 for Visual Studio 2018-09-13 08:54:40 +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
Magne Sjaastad
cb218965c5 #3340 Do not use same variable name twice 2018-09-10 10:27:54 +02:00
Gaute Lindkvist
8eda5bcbb9 #3313 Implement weighted average of WBS data. 2018-09-07 10:49:00 +02:00
Gaute Lindkvist
ac8a11c813 Make caf::PdmPtrField inherit caf::PdmValueField and make it support QVariant. 2018-09-05 11:03:41 +02:00
Gaute Lindkvist
4c84bbb8a3 #3014 and #3022 Well Bore Stability: LAS and element table input and cleaned up extraction code. 2018-09-04 12:01:07 +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
Magne Sjaastad
1104c336aa #3294 Selection Manager : Clear selection when editor is activated 2018-08-30 10:42:25 +02:00
Gaute Lindkvist
8e73f132cf #3285 Make context menu on table views work correctly with multiple contexts. 2018-08-30 09:32:28 +02:00
Jacob Støren
015bb1719a #3290 caf: Add force column resize attribute 2018-08-29 17:07:36 +02:00