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
12,422 Commits 27 Branches 61 Tags 309 MiB
8167d9f700
Commit Graph

1735 Commits

Author SHA1 Message Date
Gaute Lindkvist
9ffbd97f8c Multi page plot works 2020-01-07 14:26:46 +01:00
Gaute Lindkvist
27788b1abd Change from QPainter to QPaintDevice in the API for PDF rendering 
* This is to be able to use QPagedPaintDevice::nextPage in the Multi plot rendering.
 2020-01-07 14:26:46 +01:00
Magne Sjaastad
65f4a5e089 Fix signed/unsigned compare 2020-01-07 13:09:44 +01:00
Magne Sjaastad
4811cfb28f
Merge pull request #5301 from OPM/bugfix-summary-selection-5278 
#5278 Fix selection of calculated curves in summary selction dialog
 2020-01-07 11:21:33 +01:00
Kristian Bendiksen
f3d03fe653 #5278 Fix selection of calculated curves in summary selction dialog 
The INPUT_ID was not set correctly, and has been removed. The calculation id is
now appended to the vector name, and extracted again when selecting an item.
 2020-01-06 19:57:24 +01:00
Magne Sjaastad
a7366fbebf Guard null pointer access 2020-01-06 11:22:39 +01:00
Magne Sjaastad
576dfa80ac Make it possible to store project file without global path section 
If you have a project file with an alias section, this project is not possible to open in previous versions. Add a menu entry in the Testing menu to allow storage without alias.
 2020-01-03 12:51:40 +01:00
Magne Sjaastad
afc9ace33e #5279 Formations : Add const and simplify access 2020-01-03 09:59:38 +01:00
Magne Sjaastad
dffef1cf54 #5276 Ensemble : Guard null pointer access causing crash 2020-01-03 07:09:35 +01:00
Jacob Støren
d074964901 #5274 Add text to Result Info panel for Allen diagram data 
Rename result variables to prepare for more Allen results
Rename methods to clarify meaning
 2020-01-02 12:46:38 +01:00
Jacob Støren
a42d5e9bc8 Rename to clarify meaning of gridLocalCellIndex 2020-01-02 12:45:01 +01:00
Jacob Støren
f1cee7ab36 #5269 Cycle cell selection when clicking an NNC 2020-01-02 12:39:14 +01:00
Magne Sjaastad
582720f74e #5261 System : Allow export of field and object keywords from test menu 2019-12-20 11:22:29 +01:00
Magne Sjaastad
4ccbd274b8 clang-format : Apply clang-fomat on ApplicationCode 2019-12-19 11:11:33 +01:00
Gaute Lindkvist
47b93dc0d1
Implement pdf rendering (#5250) 
* First PDF creation support

* Reimplement info box

* Set title and make overlay frame margins more unified

* Remove a style sheet that was never meant to be applied to Project Tree

* Update RiuDraggableOverlayFrame when changing content

* Default page layout in Preferences

* undo removal of elision

* Remove friend class assignment in cafCategoryMapper

* the required methods have been made public

* Fix up after review

* Remove spurious const on by-value return

* Fix compile errors on Linux

* Fix size adjustment of legends with plot resizing
 2019-12-18 12:25:19 +01:00
Magne Sjaastad
91e8b1a839 #5224 Avoid unicode in description of Summary Address 2019-12-13 15:52:28 +01:00
Magne Sjaastad
5d96ce738c #5131 Minor calculation curve adjustments 2019-12-13 15:41:34 +01:00
Magne Sjaastad
dd5ebe494a
Merge pull request #5210 from OPM/fix-show-plot-on-calculated-curves-5140 
Fix show plot on calculated curves 5140
 2019-12-13 11:05:25 +01:00
Magne Sjaastad
8a88208f65 #5207 Curve Calculator : Move dialog to RiuPlotMainWindow 2019-12-11 09:29:41 +01:00
Kristian Bendiksen
35df3cc9d3 #5131 Update calculation curves when summary case is replaced. 2019-12-11 09:29:35 +01:00
Gaute Lindkvist
e199182e2f #5178 Fix axis rounding on plots other than Well Log Plots 2019-12-06 09:21:07 +01:00
Gaute Lindkvist
7fd4aa1ce9 #5002 Ensemble RFT curve sets with parameter coloring and separate legends 2019-12-06 08:13:31 +01:00
Gaute Lindkvist
f56a34843a Refactored ensemble parameter legends 2019-12-06 08:13:31 +01:00
Magne Sjaastad
2f2a2188fe #5100 Regression Test : Move summary dialog to main plot window 2019-12-05 14:21:35 +01:00
Magne Sjaastad
d6bdc53ee5 #5185 Regression Test : Always set regression image size on snapshot commands 2019-12-05 11:56:10 +01:00
Gaute Lindkvist
1d62d3534c Remove use of QFontMetrics width 2019-12-04 15:09:04 +01:00
Gaute Lindkvist
3c29ffbfab Revert "Always hide drop target for Grid Plots in release-2019.11" 
* This commit was never meant to go into dev

This reverts commit 62655e17c6.
 2019-12-04 14:17:28 +01:00
Gaute Lindkvist
3903d08b7a Always hide drop target for Grid Plots in release-2019.11 2019-12-04 12:37:18 +01:00
Gaute Lindkvist
9599b309bc Replace all occurences of QPalette::Background with QPalette::Window 
QPalette::Background is deprecated and gives warning in Qt 5.13
 2019-12-04 12:34:17 +01:00
Gaute Lindkvist
5139f1cadb #5174 Paint non-filled plot symbols with curve color rather than edge color 2019-12-04 12:34:17 +01:00
Gaute Lindkvist
cd5b432267 #5171 Fix legend updates by getting rid of the show/hideEvent crash fix 
* The crash is instead fixed by getting rid of deleteLater()
 2019-12-04 12:34:17 +01:00
Magne Sjaastad
04162059b7 #5169 Observed Data : Do not repeat curve name twice 2019-12-04 08:05:46 +01:00
Gaute Lindkvist
e894453f49 #5167 Fix wrong update of plot axis range 
* The order of arguments passed to setAxisScale was wrong
 2019-12-03 14:36:14 +01:00
Magne Sjaastad
ce94b6ff9e #5157 Regression Test : Some images get wrong size 2019-12-03 10:40:43 +01:00
Jacob Støren
59114d9624 #5145 Fix strange zigzag lines in summary curves 2019-12-02 10:21:12 +01:00
Gaute Lindkvist
4870071b8e #5150 Improve wheel zoom with logarithmic axes 
* Limit the amount to scroll at one time and set a fixed minimum
 2019-12-02 08:01:38 +01:00
Gaute Lindkvist
fa72835dd8 Fix Qt warning in Qt 5.13. QPalette::Background ->Window 2019-11-29 09:07:20 +01:00
Gaute Lindkvist
5eaef4390c Further improvements to well log plot legends 2019-11-28 20:43:35 +01:00
Gaute Lindkvist
c6bb4414c5 More robust legend rendering in Well Log Plots 2019-11-28 18:23:57 +01:00
Jacob Støren
95ba482f54
Merge pull request #5118 from OPM/feature-fix-intersection-with-sep-results-picking 
Fix picking on intersections with separate results
 2019-11-28 15:27:48 +01:00
Gaute Lindkvist
08a75603f3 Fix legend disappearing after hiding and showing plots 2019-11-28 15:05:38 +01:00
Jacob Støren
14d7fa3780 #5112 Sep Inter Res: Fixed result info text for gomech 2019-11-28 14:09:52 +01:00
Jacob Støren
2a3c43bcc3 #5112 Fixed result info text for eclipse 
Needs more testing
 2019-11-28 14:09:52 +01:00
Jacob Støren
5556d2d9eb #5112 Make selected result definition available through 3ditem selection system 
Make PVT, Relperm, Mohr and rResult plot aware
 2019-11-28 14:09:52 +01:00
Jacob Støren
8cc2194764 (#5112) Move cell and nnc picking code to a separate pick event handler 2019-11-28 14:09:52 +01:00
Gaute Lindkvist
7a2a0d3f2f Implement stylesheets in caf instead of ResInsight 2019-11-28 08:03:59 +01:00
Gaute Lindkvist
cf190b05c1 #5051 Do not auto zoom when adding/removing curves in plot 2019-11-27 14:17:23 +01:00
Gaute Lindkvist
62817054c4 Improve canvas top alignment in well log plots 2019-11-27 13:22:23 +01:00
Gaute Lindkvist
4fd9562b4b #5051 Fix Well Log Plot zoom with scrolling with scrollbar 2019-11-27 13:22:23 +01:00
Gaute Lindkvist
fa80a437ce Make sure legend items don't disappear when area gets smaller 2019-11-27 10:14:15 +01:00
Jacob Støren
191419b6b4 clang-format after intersection rename 2019-11-26 13:56:02 +01:00
Jacob Støren
0a358941fb Rename RivIntersectionBoxGeometryGenerator to RivBoxIntersectionGeometryGenerator 
Rename RivIntersectionBoxSourceInfo to RivBoxIntersectionSourceInfo
 2019-11-26 13:20:16 +01:00
Jacob Støren
4672528a4d Rename RimintersectionBox to RimBoxIntersection 
Rename RivIntersectionBoxPartMgr to RimBoxIntersectionPartManager
 2019-11-26 13:14:55 +01:00
Jacob Støren
0e14c63f07 Rename crossSection to intersection in general code 2019-11-26 12:45:08 +01:00
Jacob Støren
54c96581f1 Rename RivIntersectionSourceInfo to RivExtrudedCurveIntersectionSourceInfo 2019-11-26 11:56:05 +01:00
Jacob Støren
0617b56850 Rename RivIntersectionGeometryGenerator to RivExtrudedCurveIntersectionGeometryGenerator 
and RivIntersectionPartMgr to RivExtrudedCurveIntersectionPartMgr
 2019-11-26 11:51:54 +01:00
Jacob Støren
152d2bde17 Rename RimIntersection to RimExtrudedCurveIntersection 2019-11-26 11:35:21 +01:00
Jacob Støren
15aa4d6e0b Merge dev and feature-#5019-separate-intersection-results branch 2019-11-25 15:50:29 +01:00
Jacob Støren
c2717f9bb9 #5019 Preliminary fix crash when picking intersections using sep results 2019-11-25 15:36:35 +01:00
Magne Sjaastad
71ad9e0da2 Merge pull request #5081 from OPM/move-error-bar-curve 
Curve Error Bars : Move to RimPlotCurve
 2019-11-25 14:08:12 +01:00
Magne Sjaastad
62357672e3 Revert "Janitor : Fix memory leak" 
This reverts commit 88d961e516.
 2019-11-25 14:03:09 +01:00
Magne Sjaastad
72a5c6cfef Merge pull request #5071 from OPM/memory-fixes 
Release of memory
 2019-11-25 13:58:55 +01:00
Gaute Lindkvist
293290827b Fix crash when closing and reopening plots 2019-11-25 08:32:30 +01:00
Gaute Lindkvist
f2be9dd3b8 Fix typo in RiuQwtPlotWidget::closeEvent 2019-11-20 14:26:15 +01:00
Gaute Lindkvist
8f6e875ea4 Fix curves not showing up after moving plots to multi plot 2019-11-20 14:04:22 +01:00
Gaute Lindkvist
85d683634c Further refactoring 2019-11-20 13:14:45 +01:00
Gaute Lindkvist
d9043db5e0 Refactor RimPlotWindow and RimPlotInterface 2019-11-20 13:14:45 +01:00
Gaute Lindkvist
4dd0651dae Remove width scaling factors 2019-11-20 13:14:45 +01:00
Gaute Lindkvist
8252ab8808 Rename GridPlot to MultiPlot throughout 2019-11-20 13:14:45 +01:00
Gaute Lindkvist
a73c7a4b97 Rename Plot Report and Combination Plot to Multi Plot 2019-11-20 13:14:45 +01:00
Gaute Lindkvist
81db22586d Remove description-field from RimPlotWindow 
* Leave it to sub-classes to deal with this
 2019-11-20 13:14:45 +01:00
Gaute Lindkvist
60b09d7bfd #5061 WAP: fix update of well allocation data when changing depth type 2019-11-19 13:19:56 +01:00
Gaute Lindkvist
aa40816f49 #5026 Fix summary plot closing crash 2019-11-13 14:41:17 +01:00
Magne Sjaastad
aa11e3601b #5020 Flow Diag : Avoid creating plots in constructor to make pytest work 2019-11-11 09:47:01 +01:00
Magne Sjaastad
cb89823474 #5020 Flow Diag : Improve default initialization of plots 2019-11-08 14:20:11 +01:00
Jacob Støren
e78b0d4204 #4994 Make ComparisonView mode for InfoBox and animation progress 2019-11-08 10:40:37 +01:00
Jacob Støren
0f6a4c0934 Fix opengl errors when resizing comparison view to invalid size 
Clamp to min 0.0 width
 2019-11-08 10:40:37 +01:00
Jacob Støren
a9dc07ddc9 #4995 Place legends from comparison view to the right. 
Adjust the axiscross to follow the legends
 2019-11-08 10:40:37 +01:00
Jacob Støren
331361e2b2 Cleanup of add legend code in RiuViewer 
Preparations
 2019-11-08 10:40:37 +01:00
Magne Sjaastad
0caaaf7159 clang-format : Fixes related to bug in clang-format plugin 
The LLVM/clang plugin to visual studio has a bug related to single space formatting changes. This commit fixes invalid formatting related to these issues.
 2019-11-07 07:37:50 +01:00
Gaute Lindkvist
3203881418 More improvements to column/rowspan system 2019-11-06 08:24:57 +01:00
Jacob Støren
58c1734334
Merge pull request #4985 from OPM/feature-fix-point-manipulators-in-comparison-view 
#4981 Fix well target manipulators not responding
 2019-11-05 15:42:02 +01:00
Gaute Lindkvist
c1dfe193d7 #4990 Column and row span 2019-11-05 15:34:36 +01:00
Gaute Lindkvist
03ff43237d Add a view id tag to project tree and tooltip 
* Remove it from property editor
 2019-11-05 11:09:18 +01:00
Gaute Lindkvist
f222f73718 #4984 Grid Cross Plot: Make sure pick point information is on top of highlighted curve 2019-11-05 11:09:18 +01:00
Gaute Lindkvist
c7b5957571 #4983 Fix drag zoom on Summary and Grid cross plots 2019-11-05 11:09:18 +01:00
Jacob Støren
3c3c207bbc #4981 Fix well target manipulators not responding 
Moved z scale change notification to method setting zscale for label
Was always done, and recreated target manipulators at first mousemove
Avoid updating cached values in scene on repeated calls to show gridbox
 2019-11-05 09:30:58 +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
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
Magne Sjaastad
cd054f2170 Janitor : Use const ref when possible (2) 2019-11-03 14:08:21 +01:00
Magne Sjaastad
4ff56c7751 Janitor : Set copy constructor and assignment operator deleted 2019-11-03 11:14:48 +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
e85cd1b456 #4880 Further renaming of methods in Rim3dView 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
99fb39bd68 Rename SubWindowActivated blocking methods 
to clarify their differences
 2019-11-01 15:57:03 +01:00
Magne Sjaastad
a5aa49c705 #4961 Summary : Fix description of some vectors 2019-10-31 18:54:27 +01:00
Gaute Lindkvist
39cefcd0bb Enable drag and drop of all plots in tree view 2019-10-31 15:34:16 +01:00