OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-08-02 09:39:37 -05:00
Code Issues Packages Projects Releases Wiki Activity
11,881 Commits 51 Branches 82 Tags
a9d089df6d9e1b70c0abea065a3811fade7214cb
Commit Graph
5126 Commits
Author SHA1 Message Date
Kristian Bendiksen 7d817d0277 Merge pull request #4967 from OPM/improve-export-filedialog-behaviour 
Improve export filedialog behaviour
 2019-11-05 10:39:50 +01:00
Magne Sjaastad 57cab2457e clang-format : Set PenaltyBreakAssignment to 130 2019-11-04 15:08:09 +01:00
Magne Sjaastad 7c8cf60dba clang-format : Set AllowAllParametersOfDeclarationOnNextLine to false 2019-11-04 14:35:41 +01:00
Magne Sjaastad 96a26662fc Janitor : Apply clang-format fixes on codebase in ApplicationCode 2019-11-04 11:34:34 +01:00
Magne Sjaastad e8cdf1a8ef Janitor : Remove boolean function always returning true 2019-11-04 10:16:29 +01:00
Magne Sjaastad 9ae07c838a #4919 Summary Plot : Improve colors of history curve symbols 2019-11-04 10:15:57 +01:00
Jacob Støren 5044784201 Merge pull request #4968 from OPM/feaure-fix-point-picking-in-comparison-view 
Fixes several issues from #4857
#4956 Fix List editor background setting
#4880 Fix annotations missing in comparison view
 2019-11-04 09:44:56 +01:00
Jacob Støren 52177994bd Improve readability of 3dView measurement in comparison view fix 2019-11-04 09:09:03 +01:00
Magne Sjaastad a950852559 #4972 Summary : Add placeholder text to combo box editor 2019-11-03 14:49:08 +01:00
Magne Sjaastad 93f6bc8c72 Janitor : Remove invalid conditionals 2019-11-03 11:43:46 +01:00
Magne Sjaastad 67e7bb0cf3 Fixes detected by cppcheck (#4974) 
* Janitor : Remove obsolete pointer to dialog

* Janitor : Remove unused functions

* Janitor : Remove unused functions

* Janitor : Add explicit to constructors

* Janitor : Remove unused variables

* Janitor : Remove unused functions related to summary plot templates

* clang-tidy : Use nullptr instead of 0

* clang-tidy : Fix usage of virtual and override

* Upped to version 2019.08.2-dev.05

* Janitor : Remove unused variables

* Janitor : Clean up several cppcheck issues

* Janitor : Add cppcheck config files

* Janitor : Use const when possible
 2019-11-03 08:37:03 +01:00
Jacob Støren 6220225cfa #4970 Fix measurement text not visible in comparison view 2019-11-01 16:42:42 +01:00
Jacob Støren f7fb4caa69 #4880 Fix annotations missing in comparison view 2019-11-01 15:57:04 +01:00
Jacob Støren 8bdb05447c Reordered Rim3dView.h 2019-11-01 15:57:04 +01:00
Jacob Støren e85cd1b456 #4880 Further renaming of methods in Rim3dView 2019-11-01 15:57:04 +01:00
Jacob Støren c9af22cf91 #4880 Refactoring in Rim3dView: De-virtualize updateCurrentTimeStepAndRedraw 2019-11-01 15:57:04 +01:00
Jacob Støren b51e054ffd Renaming of more methods in Rim3dView. 
Removed virtual method from RiuViewerToViewInterface as it was not used from the interface.
 2019-11-01 15:57:03 +01:00
Jacob Støren 7f3f6419ac Rename virtual methods in Rim3dView 
To make it more clear that they are virtual methods to be distinguished from implementations in the base class. Also make their meaning somewhat more expressed.
 2019-11-01 15:57:03 +01:00
Jacob Støren 1ef4d49f14 #4857 Fix Intersection Box 3d manipulator interaction in comparison views 2019-11-01 15:57:03 +01:00
Kristian Bendiksen 60ac760254 Add txt suffix file pattern to make windows dialog behave better on windows. 2019-11-01 15:07:08 +01:00
Gaute Lindkvist 5f72c03d52 Fix warning in RImSummaryCurvesCalculator 2019-10-31 15:37:30 +01:00
Gaute Lindkvist e8c745d704 Implement creation of combination plots from selected plots 2019-10-31 15:12:54 +01:00
Gaute Lindkvist 30db19a1d0 Create Grid plot collection and allow creation of new combination plots 2019-10-31 14:09:50 +01:00
Magne Sjaastad 1d88f4d48a Guard null pointer access 2019-10-31 09:38:44 +01:00
Magne Sjaastad 45cc94abd2 Janitor : apply clang-format 2019-10-31 09:35:48 +01:00
Magne Sjaastad 856580699c Merge pull request #4955 from OPM/summary-adjustments 
Summary adjustments
 2019-10-30 14:40:20 +01:00
Gaute Lindkvist a925c0f29e Partial revert of 38e0b150 2019-10-30 12:54:51 +01:00
Gaute Lindkvist 38e0b150ac Allow deleting of the last sub plot and have nice visible drop targets 2019-10-30 11:56:22 +01:00
Gaute Lindkvist 089ca3d39d #4931 Add available diameters to casing design and split casing and liner. 2019-10-30 11:53:02 +01:00
Gaute Lindkvist f741c878db Update depth axis grid when changing grid line setting 2019-10-30 11:53:02 +01:00
Magne Sjaastad e4fd536d21 Merge pull request #4950 from OPM/summary-curve-filter-recently-used-to-registry 
Summary curve filter recently used
 2019-10-30 11:12:59 +01:00
Magne Sjaastad d6b7aa301c #4951 Summary Plot Template : Hide template collection in project tree 2019-10-30 10:48:23 +01:00
Magne Sjaastad 2dfa6b9d9f #4951 Summary Plot Template : Remove obsolete template pointer 2019-10-30 10:45:15 +01:00
Jacob Støren f7f3e72700 Fix crash when closing project due to virtual call inside destructor. 
isScaleZEditable called inside destructor of Rim3dView when the deleted view is the active view
 2019-10-30 09:26:41 +01:00
Magne Sjaastad bcb4150ae4 #4951 Summary Plot Template : Hide context menu to select template 2019-10-30 09:26:41 +01:00
Magne Sjaastad 18c52b0e18 Janitor : Avoid using .. when referencing include files 2019-10-30 09:12:13 +01:00
Magne Sjaastad facfd062dc #4949 Summary Curve Filter Toolbar : Store recently used strings to registry 2019-10-29 14:17:24 +01:00
Magne Sjaastad ba89a60e8d #4946 Ensemble Colors : Show color control in curve filter property editor 2019-10-29 13:40:57 +01:00
Jacob Støren 1774d123cc #4892 Simplified Unlink View command. Works on pprimary view as well. 2019-10-29 12:48:38 +01:00
Jacob Støren b2f8c56a0d Fixed crash on project close introduced by update of MDI window title with Primary/Controlled 2019-10-29 12:47:01 +01:00
Jacob Støren b729ce7228 #4892 Add (Primary) and (Controlled) labels to view window titles 2019-10-29 12:47:01 +01:00
Jacob Støren 3710b4ba58 #4892 Avoid comparison view accidentally added when linking views 2019-10-29 12:47:01 +01:00
Jacob Støren d5a39ab3aa #4892 Improved names and added improved icons to linked views commands 2019-10-29 12:47:01 +01:00
Jacob Støren 6af4356f36 #4892 Add Comparison view drop-down to linked view master. 
Works as shadow of the views comparison view setting.
Make it follow the dependent viewcontrollers managed view.
Comparison view dropdown moved to "Viewer" group in view panel.
Avoid infinite recursion loops when comparison views are set up in circle
 2019-10-29 12:47:01 +01:00
Jacob Støren 27d65af027 Fix crashes when scene in one view is empty 2019-10-29 12:47:01 +01:00
Jacob Støren c76699cdb8 Merge pull request #4943 from OPM/feature-picking-in-comparison-view-fixes 
Picking in comparison view fixes
 2019-10-29 12:41:14 +01:00
Kristian Bendiksen 2c3b51ad3f #4857 Fix measurement picking in comparison view. 2019-10-29 10:52:04 +01:00
Magne Sjaastad 1bf8341ba7 #4944 Ensemble RFT : Add missing initialization 2019-10-29 09:29:15 +01:00
Kristian Bendiksen 6e43fee396 #4857 Fix RicNewWellPathIntersectionFeature picking. 
Also avoid confusing active view change.
 2019-10-29 09:01:11 +01:00
Magne Sjaastad 23e8db65c2 Merge remote-tracking branch 'origin/dev' into summary-text-edit-in-toolbar 2019-10-28 20:49:29 +01:00