OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity
11,647 Commits 27 Branches 61 Tags 309 MiB
9d061e2a5a
Commit Graph

11647 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Magne Sjaastad
23e8db65c2 Merge remote-tracking branch 'origin/dev' into summary-text-edit-in-toolbar 2019-10-28 20:49:29 +01:00
Magne Sjaastad
0af6a1d95d #4775 Summary : Use combo box with history to edit text based curve creation 2019-10-28 20:41:15 +01:00
Magne Sjaastad
7a470587ac #4924 AppFwk ComboBox: Add minimum width 2019-10-28 20:39:01 +01:00
Magne Sjaastad
022d03a287 #4924 AppFwk ComboBox: Add tooltip 2019-10-28 20:37:27 +01:00
Gaute Lindkvist
3a1f21093e Implement style sheet class for more robush CSS management 2019-10-28 13:22:56 +01:00
Gaute Lindkvist
c0df30f855 Fix plot axis extents to remove lots of whitespace 2019-10-28 13:16:21 +01:00
Gaute Lindkvist
625feaf36c #4929 Fix legend fonts in Summary plot 2019-10-28 13:16:00 +01:00
Gaute Lindkvist
4bce02c375 Add simple fix for Grid Cross plot as well 
* TODO:  make sure the methods in RimSummaryPlot and RimGridCrossPlot are called when using the generic virtual method in RimPlotInterface.
* This requires a bit of thought, since they have parameters which the generic version does not have
 2019-10-28 10:18:24 +01:00
Gaute Lindkvist
c200ea0687 Fix asciiDataForPlotExport compile warnings 2019-10-28 10:18:24 +01:00
Gaute Lindkvist
edead9e3af Made RiuQwtPlotWidget axis operations much more general 2019-10-28 10:18:03 +01:00
Gaute Lindkvist
0e9cda8e84 Fix update of fonts in summary and grid cross plot axes 2019-10-28 10:18:03 +01:00
Magne Sjaastad
a4c78cb7c3
Merge pull request #4936 from OPM/emsemble-parsing 
Improve detection of numbers when parsing std string
 2019-10-28 07:53:06 +01:00
Magne Sjaastad
2454ff1805
Merge pull request #4935 from OPM/fix-storage-of-preferences 
Preferences : More robust storing of data to registry
 2019-10-25 16:41:44 +02:00
Magne Sjaastad
12478a6eef #4918 Improve detection of numbers when parsing std string 2019-10-25 16:38:08 +02:00
Magne Sjaastad
72e3ddc35e #4934 Preferences : More robust storing of data to registry 2019-10-25 15:55:27 +02:00
Magne Sjaastad
2f3fcf7eec
Merge pull request #4932 from OPM/summary-adjustments 
Summary Adjustments
 2019-10-25 15:17:40 +02:00
Magne Sjaastad
5183fbd5db #4926 Summary Plot : Add "Plot Preview" to plot editor 2019-10-25 14:27:22 +02:00
Magne Sjaastad
6110748192 #4926 Summary Plot : Add push button to edit plot 2019-10-25 13:53:51 +02:00
Magne Sjaastad
cea853b94f #4926 Summary Templates : Improve placeholder text 2019-10-25 13:33:27 +02:00
Magne Sjaastad
0657155d86 #4926 Summary Templates : Move curve text edit group to top, collapse others 2019-10-25 13:29:32 +02:00
Magne Sjaastad
f2fad7a975 #4926 Summary Templates : Set curve as selected object when case is imported 2019-10-25 13:15:02 +02:00
Kristian Bendiksen
9e1f50f198
Merge pull request #4921 from OPM/fix-contour-map-export-filename-4920 
#4920 Fix second contour map export file name suggestion.
 2019-10-25 12:52:41 +02:00
Magne Sjaastad
29c3ce0d06 #4903 Use helper function for action shortcut everywhere 2019-10-25 12:48:17 +02:00
Magne Sjaastad
f2d5adca60 #4926 Summary Templates : Avoid creation of one extra duplicate curve 2019-10-25 11:57:30 +02:00
Gaute Lindkvist
785f039a1d #4925 Add guard on view missing after d8a8a615 to RImViewLinker::findNameAndIconFromView 2019-10-25 11:48:51 +02:00
Magne Sjaastad
e21e4f5008 Documentation : Updates for Python documentation 2019-10-25 11:20:27 +02:00
Kristian Bendiksen
1e8d1dbe8e Make "export contour map" dialog modal relative to 3D main window. 2019-10-24 21:58:50 +02:00
Kristian Bendiksen
5ecda9d4be #4920 Fix second contour map export file name suggestion. 2019-10-24 21:58:50 +02:00
Magne Sjaastad
76d196a91a
Merge pull request #4902 from OPM/summary-text-edit-in-toolbar 
Summary text editor in toolbar
 2019-10-24 21:44:33 +02:00
Magne Sjaastad
32128f0bf3 #4924 AppFwk : Add support for editable combo box 2019-10-24 21:03:17 +02:00
Gaute Lindkvist
6687b6ad94 Fix delete of tracks by adding virtual plot interface destructor 2019-10-24 14:59:16 +02:00
Gaute Lindkvist
b343aa1ae9 Fix update of track names following DnD 2019-10-24 14:59:16 +02:00
Gaute Lindkvist
88a80c1b71 Renames of WelLLogTrack::Widths in create WBS feature 2019-10-24 14:59:16 +02:00
Magne Sjaastad
f68eb93ac6 #4851 Ensemble RFT : Make sure colors are created correctly 
Lindkvist: Fixed commit to work with new Grid Plot code
 2019-10-24 14:59:16 +02:00
Magne Sjaastad
e2da391371 #4851 Ensemble RFT : Fix update of color of ensemble curves on project load 
Lindkvist: updated to work with new Grid Plot code
 2019-10-24 14:59:16 +02:00
Gaute Lindkvist
a48f4903ea Disable common data source in well allocation plots 
(they have common data selection explicitly)
 2019-10-24 14:59:16 +02:00
Gaute Lindkvist
aef0e0a70f More precise view id 2019-10-24 14:59:16 +02:00
Gaute Lindkvist
c578a43b53 Introduce RimGridPlotWindow and RiuQwtPlotWidget 2019-10-24 14:59:16 +02:00
Gaute Lindkvist
2857a13e7c Columns in well log plots 2019-10-24 14:59:16 +02:00
Gaute Lindkvist
cf02211713 Introduce a new RiaPlotWindowRedrawScheduler 
* Also fix order in RiaViewRedrawScheduler.cpp file to match header
 2019-10-24 14:59:16 +02:00
Gaute Lindkvist
dfe9390c30 Revert "#4851 Ensemble RFT : Fix update of color of ensemble curves on project load " 
This reverts commit 328cf44d94.
 2019-10-24 14:59:16 +02:00
Gaute Lindkvist
771d12c563 Revert "clang-format fixes" 
This reverts commit 86c75ca678.
 2019-10-24 14:59:16 +02:00
Gaute Lindkvist
edc4486de7 Revert " #4851 Ensemble RFT : Make sure colors are created correctly" 
This reverts commit cb5195bac2.
 2019-10-24 14:59:16 +02:00
Gaute Lindkvist
7e5d358fa1 Simplified code following further review 2019-10-24 14:13:19 +02:00
Gaute Lindkvist
7bbe505d39 #4762 Fix ecl_grid_reset_actnum in the libecl-team suggested way 2019-10-24 14:13:19 +02:00
Gaute Lindkvist
1255c877d7 Revert "#4762 Fix reset_actnum libecl crash on load" 
We will check in a different fix on recommendation by libecl team

This reverts commit 047136e8b8.
 2019-10-24 14:13:19 +02:00
Magne Sjaastad
580d826922 Clear line edit when content do not match 2019-10-24 10:04:42 +02:00
Magne Sjaastad
1935451242 AppFwk : Add placeholder text to line edit 2019-10-24 09:44:51 +02:00
Gaute Lindkvist
0fd7f40e46 Stop reselecting on activation in plot view if a child is already selected 2019-10-24 09:10:34 +02:00
Gaute Lindkvist
3422f1b609 Fix view id in well allocation plots 2019-10-24 09:08:04 +02:00