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
Magne Sjaastad
2998ad3bed #4825 Summary Plot Stepping : Key events are not routed correctly 2019-10-04 13:20:15 +02:00
Magne Sjaastad
a6733ae776
Merge pull request #4818 from OPM/improve-ensemble-stepping 
Improve ensemble stepping
 2019-10-04 11:43:06 +02:00
Gaute Lindkvist
10e55d3e5f Fix legend update and remove Qt warnings 2019-10-04 10:27:15 +02:00
Magne Sjaastad
c111b0d4c3 #4811 Source Stepping : Show ensemble stepping when plot is selected 2019-10-04 09:54:57 +02:00
Gaute Lindkvist
09388b22c8 Avoid plot title dictating the plot width. 2019-10-04 08:50:35 +02:00
Gaute Lindkvist
45d6acadaa Fix Well Log Plot depth axis label 2019-10-03 15:45:20 +02:00
Gaute Lindkvist
1309db884d Simplify Well Log Plot events and updating 2019-10-03 15:32:35 +02:00
Gaute Lindkvist
f5b10b4d70
#4800 WBS: Add parameter track which is off by default (#4816) 
* Initial WIP

* Identical results with spreadsheet

* Improved and more robust smoothing by filtering points first

* Improved smoothing and more GUI

* Include mixed-label for smoothing threshold

* Implement WBS parameters track

* Much better alignment of tracks without flickering

* Don't replace user description when dragging and dropping tracks

* Fix missing OBG and SH curves

* Fix curve and track D&D

* Make sure parameter curves aren't WBS curves
 2019-10-03 14:41:37 +02:00
Magne Sjaastad
7ce7211187 Merge remote-tracking branch 'origin/dev' into summary-template-adjustments 2019-09-30 19:43:08 +02:00
Magne Sjaastad
64e617562d #4796 Summary Plot Template : Add context menu of summary cases 2019-09-30 07:50:51 +02:00
Magne Sjaastad
a6609c6e06 #4795 Summary Plot : Add updateConnectedEditors() 
Recent changes in logic requires more updateConnectedEditors
 2019-09-28 17:40:40 +02:00
Gaute Lindkvist
7625da7a21 #4790 Make sure window maximation state is restored after project load + tiling fixes 2019-09-27 15:29:24 +02:00
Magne Sjaastad
1ab58449bd #4793 Summary Plot Templates : Help accessible from About menu 2019-09-27 15:15:09 +02:00
Gaute Lindkvist
f3dfba7a81 Fixup after review 2019-09-27 11:02:03 +02:00
Gaute Lindkvist
4852f729ff #4781 Make sure horizontal well log plot legends expand vertically if needed. 2019-09-27 10:22:07 +02:00
Gaute Lindkvist
4709bb1402 #4769 Remove stepping toolbar for Ensemble RFT. 
* It doesn't work right and the usefulness is limited.
 2019-09-26 09:18:55 +02:00
Gaute Lindkvist
2a20f84f1f
#4732 Support error bars for observed RFT data (#4760) 
* #4732 Fix missing refresh for ensemble RFT

* WIP

* #4732 Fix missing refresh for ensemble RFT

* WIP

* Make sure Observed RFT data is loaded on startup

* Make error bars work for RFT plots

* #4761 Add labels with formation and value/error to observed data points

* Changes after review
 2019-09-25 17:48:19 +02:00
Jacob Støren
931e7dc42d #4767 Fix selection of view subitems jumps to view 2019-09-25 15:58:28 +02:00
Gaute Lindkvist
3f7fde5227
#4695 Add color shading annotation for WBS parameters, similarly to formations (#4757) 
* First wbs parameter shading
* Fix wrong Grid->grid rename in GRPC CMakeLists.cmake
* Support color shading of Well Log Tracks based on WBS parameters
* Further improvements to shading for WBS
* #4696 Set RIG_NODEL Por-Bar as default Well log extraction curve parameter for GeoMech
* Fix canvas alignment issue for new WBS plots
 2019-09-25 11:59:31 +02:00
Magne Sjaastad
611e1f24d3 #4753 Fix selection of plot subitems jumps to parent plot 2019-09-24 12:35:03 +02:00
Gaute Lindkvist
a2bad82391
#4736 System python command refactor (#4743) 
* Move case loading commands from Commands to project and case
* Major refactor
* Fix problems with Python examples
* Add ability to export snapshot from just one view + fixup
* Case comments and black
* Make all modules pass pylint test
 2019-09-23 11:50:33 +02:00
Magne Sjaastad
a7c92a43e5 #4741 Summary Plot Editor : Add first item in intermediate selection when summary vector is selected 2019-09-20 12:08:57 +02:00
Magne Sjaastad
a9080e14c3 #4722 AppFwk: Rename 2019-09-20 09:54:10 +02:00
Magne Sjaastad
b92618ebd3 #4722 Summary Plot Editor : Set the current category to the first selected category 2019-09-20 09:45:15 +02:00
Magne Sjaastad
f2ac170b66 #4733 Summary Template : Add reload of templates 
Adjust save and load of templates
Add save path to preferences
 2019-09-19 11:39:32 +02:00
Magne Sjaastad
8e3e16c7e6 #4709 Summary Plot Editor : Avoid default selection of field vectors 2019-09-13 19:16:06 +02:00
Magne Sjaastad
33cd6bb0c8 Clang-format after merge 2019-09-13 16:51:21 +02:00
Magne Sjaastad
36303aa7bd #4710 Qt5 : Use QString() instead of QString::null 2019-09-13 10:02:52 +02:00
Magne Sjaastad
0939b41120 Summary : Make sure field vectors are displayed 2019-09-11 10:54:41 +02:00
Magne Sjaastad
fe4fe36ee9 Refactor : Split calculateValueOptions to separate helper functions 2019-09-11 09:40:25 +02:00
Gaute Lindkvist
baa266f0f9 Improve lines and shading 2019-09-10 16:52:32 +02:00
Gaute Lindkvist
0305399c26 Shift Well Log tracks when deleting a track 2019-09-10 15:21:43 +02:00
Gaute Lindkvist
06cea12447 #4666 Support color fill for formations in Well Log Tracks 2019-09-10 13:23:29 +02:00
Gaute Lindkvist
a96d959d16
Merge pull request #4686 from OPM/system-refactor-welllogplot 
#4665 System refactor welllogplot
 2019-09-10 08:26:32 +02:00
Gaute Lindkvist
edbe4f5a35 Align scrollbar with tracks 2019-09-09 16:00:52 +02:00
Gaute Lindkvist
5cfd840025 Fix track widths and canvas top alignment 2019-09-09 14:38:36 +02:00
Gaute Lindkvist
71c4642f13 Make Well Allocation Plots work well again 2019-09-09 11:00:11 +02:00
Gaute Lindkvist
9fe021c6ca Use layouts for tracks in Well Log Plot 2019-09-06 15:52:45 +02:00
Magne Sjaastad
98e6ff189b System : Avoid extremely large construction statement 
Roll out initialization to multiple insert() instead of one large initialization statement. The previous solution causes trouble/warnings on some compilers.
 2019-09-06 14:11:22 +02:00
Gaute Lindkvist
ff42e8b1be Merge branch 'dev' into system-refactor-welllogplot 2019-09-06 13:44:20 +02:00
Gaute Lindkvist
de8a5a59f3 Clang-format changed files 2019-09-06 13:17:36 +02:00
Gaute Lindkvist
acc9fe316e Reduce spacing around Well Log Plot Title 2019-09-06 12:54:03 +02:00
Magne Sjaastad
c2b4e6b6ca clang-format on all files in ApplicationCode, run two 2019-09-06 10:57:31 +02:00
Magne Sjaastad
fe9e567825 #4683 clang-format on all files in ApplicationCode 2019-09-06 10:57:22 +02:00
Magne Sjaastad
ef80f5b629 #4683 System : Remove obsolete include of cvfBase.h 2019-09-06 10:52:54 +02:00
Gaute Lindkvist
e6a92cc3be Fix crash in plot picker 2019-09-04 20:25:41 +02:00
Gaute Lindkvist
42f494be5f Make the refactored RFT and PLT plots work 2019-09-04 20:19:15 +02:00
Gaute Lindkvist
a03435b2fe Refactor WellLogPlot, RftPlot, PlotPlot and WellAllocationPlot 2019-09-04 20:18:59 +02:00
Gaute Lindkvist
2c5ca4ce46 Import and plot of FMU RFT data works 2019-08-26 12:52:07 +02:00
Gaute Lindkvist
71da659506 #4580 Import Eclipse RFT data as part of ensemble import 2019-08-26 11:56:36 +02:00
Magne Sjaastad
94a967cea4 #4624 Customization of date format: Make sure time is reported above date 2019-08-23 16:23:07 +02:00
Gaute Lindkvist
7951899717 #4624 Allow customization of date/time components in labels 2019-08-23 14:28:11 +02:00
Magne Sjaastad
d86a53f732 #4599 Add "Collapse Others Views/Plots" to context menu of views and plots 2019-08-20 10:39:23 +02:00
Magne Sjaastad
97c795cda4 Remove duplicate function hiding base class implementation 2019-08-19 21:07:35 +02:00
Magne Sjaastad
17876c76ae #4562 Summary : Group LGR categories at bottom of list 2019-08-19 10:10:45 +02:00
Gaute Lindkvist
e58da136e3
#2082 Support custom date time format (#4594) 
* #2082 Support custom date time format

* Clang-format
 2019-08-19 09:37:42 +02:00
Magne Sjaastad
c78b435864 #4574 Summary Plot: Do not modify highlight curve change when zooming 2019-08-16 14:02:16 +02:00
Magne Sjaastad
0dde46e4fe #4575 Summary Plot: Increase minimum zoom window before accepting zoom action 2019-08-16 12:54:24 +02:00
Magne Sjaastad
10e3180332 #4565 Highlight Curves : Clicking on curve causes access violation 
Create a copy of the item list before the loop to avoid invalidated iterators when iterating the list plotCurve->setZ() causes the ordering of items in the list to change
 2019-08-13 12:58:04 +02:00
Gaute Lindkvist
1417fc2be7 #4542 Bring highlighted curve to the top and stop altering color of selected curve 2019-08-06 11:39:09 +02:00
Gaute Lindkvist
25f13122a2 #4517 Implement highlighting function for plot curves 2019-08-02 13:13:23 +02:00
Gaute Lindkvist
086ee60d8c #4530 Wait until after Save Project has been asked to hide dock windows. 2019-07-30 12:50:08 +02:00
Gaute Lindkvist
000ce6db52 #4509 Guard access to gui application code in import and well path code to avoid crashes in console mode 2019-07-25 15:54:20 +02:00
Magne Sjaastad
7879fe186d #4136 Export of Flow Characteristics : Create text for export and add context menu 2019-06-23 15:18:17 +02:00
Magne Sjaastad
512ecfdf74 #4502 Flow Characteristics Plot : Add legend titles 2019-06-21 22:34:31 +02:00
Magne Sjaastad
03c1311d58 #692 SSIhub: add Sub Items On/Off/Toggle to well list 2019-06-17 09:11:38 +02:00
Magne Sjaastad
e2686b28e6 #4385 Well Allocation: Fix missing x-axis units 2019-06-07 15:19:31 +02:00
Magne Sjaastad
464f3b9d83 #4441 Advanced snapshot export : Remember output path between multiple sessions 2019-06-06 13:35:29 +02:00
Gaute Lindkvist
2c30f846f0 Make MDI Window icon different from main application icon 2019-05-31 11:00:32 +02:00
Magne Sjaastad
a52afd7b34 #4410 Dock Window State : Set default visibility of dock widgets 2019-05-15 13:37:23 +02:00
Magne Sjaastad
699870c8c7 #4410 Dock Window State : Use hideAllDockWidgets() in base class 2019-05-15 12:31:27 +02:00
Magne Sjaastad
95124adca6 #4410 Dock Window State : Add features for default dock widget visibility 2019-05-15 11:27:36 +02:00
Magne Sjaastad
6830d79de7 #4410 Dock Window State : Move plot widget names to DockWidgetTools 2019-05-15 10:52:27 +02:00
Magne Sjaastad
f43edf3c7d #4410 Dock Window State : Create static functions instead of singleton 2019-05-15 10:47:30 +02:00
Magne Sjaastad
11433241fd #4410 Dock Window State : Remove obsolete code 2019-05-15 10:31:56 +02:00
Magne Sjaastad
bf6b5652b3 #4410 Dock Window State : Give dock widgets unique names 2019-05-15 09:45:44 +02:00
Magne Sjaastad
1a67773ace #4410 Dock Window State : Remove obsolete functions 2019-05-15 07:35:53 +02:00
Magne Sjaastad
ac8ea73c36 #4395 Robustness : Guard array out of bounds access 2019-05-07 07:24:13 +02:00
Jacob Støren
f1d4de2090 Remove calls to setUiField that are unneccessary because of changes in AppFwk 2019-05-06 11:58:06 +02:00
Gaute Lindkvist
57b33b0d4c
First implementation of Headless (#4392) 
* Revert "#4377 Octave : Use RiaLogging for error messages instead of QErrorMessage "

This reverts commit f758a8edb2.

* Revert "#4380 Preferences : Changing scene font size when geo mech view is open causes crash"

This reverts commit df62a41397.

* Revert "#4379 Documentation : Update command line parser for import of summary files"

This reverts commit d0b5357ed4.

* Unfinished WIP

* Builds but crashes

* Refactored code now builds and runs

* ResInsight can now run the unittests headless

* Can run some command files successfully

* Build on Linux

* Extra headless hack header

* Moved PdmUiItem hack to cpp file

* Fix headless crash in RimWellAllocationPlot

* Handle error gracefully if ExportSnapshots command is executed from console

* Add caf::QIconProvider and remove some hacks

* Also made the greying out of disabled icons work for a couple of cases where it didn't.

* Linux build fix

* #4380 Reimplement fix df62a41397 by @magnesj on top of Headless code changes

* #4379 Reintroduce kode from d0b5357ed4 by @magnesj

* #4377 Restore f758a8edb2 in new Headless code
 2019-05-06 10:36:05 +02:00
Magne Sjaastad
8ce9f63487 #4328 Stimulation wells in 3D-view: Render well head using pipe color 
If well head is a real connection, render as normal connection. If dummy connection, render as pipe color
 2019-04-26 13:30:29 +02:00
Magne Sjaastad
60153b20ec
Merge pull request #4350 from OPM/cpp-check-cleanup 
Cpp check cleanup
 2019-04-24 09:09:18 +02:00
Magne Sjaastad
6dd3b36f86 Regression Test : Allow execution of tests starting at filter folder 2019-04-24 08:06:13 +02:00
Magne Sjaastad
5123d5d0c5 #4351 Regression test : Guard null pointer access 2019-04-24 07:46:51 +02:00
Gaute Lindkvist
2e13e53b3c Make the preference dialog slightly narrower 2019-04-23 08:38:49 +02:00
Gaute Lindkvist
0861a79dfa #4320 Add create valve to 3d context menu when clicking on perforation 2019-04-23 08:25:39 +02:00
Gaute Lindkvist
1caed321b0 #4323 Avoid time step legend showing up unexpectedly in grid cross plots 2019-04-23 08:23:38 +02:00
Magne Sjaastad
8cefcbb562 #4348 System , cppcheck : Remove unused variables 2019-04-20 15:11:21 +02:00
Magne Sjaastad
25d5120190 #4153 Process Monitor : Avoid setting special font in process monitor 2019-04-20 13:13:27 +02:00
Gaute Lindkvist
e0bbda85d9 #4312 Move handleMdiWindowClosed call from widget destructors to MdiSubWindow closeEvent 
* This way the mdi window still exists at the time of removal and we can handle the removal orderly
 2019-04-16 12:14:54 +02:00
Gaute Lindkvist
e41f8ec149 #4312 Force new current sub window in MDI area to be maximized if closing a sub-window that was maximized 2019-04-15 15:33:31 +02:00
Gaute Lindkvist
edf46496b7 #4341 Make docked plots follow font size preferences (but subtract 1 in point size) 
* The docked plots have much less space available than most plots
 2019-04-15 15:08:15 +02:00
Gaute Lindkvist
f9e3db6aa6 #4336 Fix deletion of grid cross plot legends 2019-04-15 10:38:29 +02:00
Gaute Lindkvist
6f7a75f5c2 Add a margin of 4 pixels around every plot to avoid text going all the way to the edge 2019-04-15 09:58:08 +02:00
Gaute Lindkvist
9d06b59357 #4255 Read default plot font sizes from preferences and apply 2019-04-12 14:47:21 +02:00
Gaute Lindkvist
798e3ff19e #4256 Update fonts in Project and views when changing preferences 2019-04-12 14:47:21 +02:00
Gaute Lindkvist
35e1d5d455 More Qt4 compile issues 2019-04-09 08:20:18 +02:00
Gaute Lindkvist
08b996405f Fix Linux compile warning with CDE 2019-04-09 08:18:34 +02:00
Gaute Lindkvist
4e10aa8ffa #4262 Tidy up well path menus 2019-04-08 14:24:43 +02:00
Gaute Lindkvist
dbac2d71c8 Remove CDE style from progress bar for Qt4. Just use style sheets. 2019-04-08 14:24:43 +02:00
Gaute Lindkvist
8e720f7077 Fix frame on Histogram 2019-04-08 14:24:43 +02:00
Gaute Lindkvist
7f926a5a4d Unify look of frames in 3d View using stylesheets 2019-04-08 14:24:43 +02:00
Gaute Lindkvist
22880d511b #4280 Improve animation progress bar 2019-04-08 14:24:43 +02:00
Gaute Lindkvist
94a8c35311 #4282 Move new Grid Layout creation inside form layout object editor 2019-04-05 13:28:23 +02:00
Gaute Lindkvist
9c2ed5ad92 Block changes to selection during resize and tiling 2019-04-04 19:23:52 +02:00
Gaute Lindkvist
000b6713b1 #4283 Improve window tiling during resize 2019-04-04 19:23:43 +02:00
Gaute Lindkvist
038d7a7676 #4097 Implement stretch factors for editors 2019-04-04 11:19:35 +02:00
Gaute Lindkvist
209146ebae #4260 Support changing IJK bounding box in sector model and remodel UI 2019-04-02 09:51:58 +02:00
Gaute Lindkvist
59229b89b7 #4258 Rename Grid Cross Plot "Curve Sets" to "Data Sets". Also renamed code 
* Kept XML-strings to avoid breaking compatibility
 2019-04-02 08:20:10 +02:00
Gaute Lindkvist
421c374fde #4265 Remove minimize button from MDI windows. It serves no real purpose. 2019-03-29 12:47:35 +01:00
Gaute Lindkvist
5695b8ada7 #4263 Fix saving of MDI window geometry without unmaximizing the window before saving 2019-03-29 12:47:35 +01:00
Magne Sjaastad
8c1c4ea767 #4240 Project Tree : Make sure setActiveReservoirView is called 2019-03-29 12:36:00 +01:00
Magne Sjaastad
16540f6607 Refactor : Use range based for and rename 2019-03-29 11:30:37 +01:00
Magne Sjaastad
de7c05f5cb Refactoring : Use range based for 2019-03-29 11:26:12 +01:00
Magne Sjaastad
b26c61b7bf #4240 Project Tree : Keep selection when clicking on cells 
When current selection in project tree is part of a 3D view, update the selection accordingly. If an item unrelated to 3D view is selected, do nothing when clicking in the 3D view.
 2019-03-29 11:23:46 +01:00
Magne Sjaastad
c4b0bf5890 #4221 MDI window : Move MDI handling to RiuMainWindowBase 2019-03-29 08:26:34 +01:00
Gaute Lindkvist
75b0905e26 #4243 Grid Cross Plot: Make legend icons black & white when grouping is enabled and set size from font size 2019-03-29 07:53:54 +01:00
Gaute Lindkvist
47a559b3a8 #4247 Minor improvements to export sector model UI 2019-03-28 22:41:03 +01:00
Gaute Lindkvist
d4f3701da6 #4245 Add export sector model to regular export menu 2019-03-28 20:42:13 +01:00
Gaute Lindkvist
337345a887 #4222 Add axis labels to Grid Cross Plot pick info 2019-03-27 15:17:52 +01:00
Gaute Lindkvist
a168f8a206 #4238 Increase the size of grid cross plot legends if window has been decreased and then increased again 2019-03-27 15:02:12 +01:00
Gaute Lindkvist
b08504fe05 #4236 Partial revert of fixes for #4221 
* The line in RiuPlotMainWindow from  ef182da8a9 is set back to before
 2019-03-27 14:20:39 +01:00
Gaute Lindkvist
e8efe81796 #4176 Add keyboard shortcuts to Zoom all (Ctrl+Alt+A) and view directions (Ctrl+Alt+N/W/S/etc) 2019-03-27 13:18:19 +01:00
Gaute Lindkvist
3d3868e29d Fix up keyboard shorcut on < Qt 5.10 2019-03-27 12:01:49 +01:00
Gaute Lindkvist
9306961df4 #4176 Enable Del keyboard shortcut for delete commands 2019-03-27 11:03:10 +01:00
Gaute Lindkvist
c3d4914997 #4077 Separate icons for different GeoMech import 2019-03-26 17:23:12 +01:00
Magne Sjaastad
9f7be1489d Whitespace 2019-03-26 16:21:28 +01:00
Magne Sjaastad
507973688e #4221 Window Management : Make sure restore of windows works from file 2019-03-26 16:19:56 +01:00
Gaute Lindkvist
009dcb5f19 #4226 Add polyline measurement mode 2019-03-26 14:19:02 +01:00
Gaute Lindkvist
5b7bf99b82 #4222 Implement picking to display point value in Grid Cross Plot 2019-03-26 14:17:35 +01:00
Gaute Lindkvist
97d71acaf8 #4220 Make sure we pass enterEvent of RiuViewer on to caf::Viewer 2019-03-26 11:34:14 +01:00
Magne Sjaastad
92578211b4 Rename to RimAdvancedSnapshotExportDefinition 2019-03-26 09:10:29 +01:00
Magne Sjaastad
8832a0a7c6 Rename to RiuAdvancedSnapshotExportWidget 2019-03-26 09:10:29 +01:00
Magne Sjaastad
3d33126dac Rename to RicAdvancedSnapshotExportFeature 2019-03-26 09:10:29 +01:00
Gaute Lindkvist
aa32caae33 #4158 Implement info box for grid cross plots and improve plot overlay legends 2019-03-25 15:15:21 +01:00
Gaute Lindkvist
44f3882ecb #4220 Apply picking cursor only when over a 3d View 2019-03-25 15:15:20 +01:00
Magne Sjaastad
ef182da8a9 #4221 Window Management : When a view or plot is maximized, show following views as maximize 2019-03-25 07:57:35 +01:00
Magne Sjaastad
0dd5d40199 #4219 Contact Pressure plots : Add color to annotation lines 2019-03-22 16:19:23 +01:00
Gaute Lindkvist
8c06d06e54 #4207 Make grid cross plot symbols smaller and enable concave symbols. 2019-03-20 13:42:01 +01:00
Magne Sjaastad
a07f375daf #4200 Grid Cross Plot : Adjustments for Linux 2019-03-19 15:39:49 +01:00
Magne Sjaastad
15f2a76ee1 #4195 Grid Cross Plot: Add annotation item to axis 2019-03-12 16:05:58 +01:00
Gaute Lindkvist
117731a24a #4192 Add swap axis and update property editor 2019-03-12 14:34:22 +01:00
Gaute Lindkvist
e72f57072c #4185 Implement data export for Grid Cross Plot 2019-03-12 09:19:01 +01:00
Gaute Lindkvist
8382b5cfdd #4144 Remove grid import buttons from plot window and add ensemble import 2019-03-08 10:41:32 +01:00
Gaute Lindkvist
b22ca46dc5 #4187 Make WindowCloseButtonHint part of the default dialog flags 
* Dialogs on the Qt5 build has the close button disabled and this fixes that.
 2019-03-08 10:23:18 +01:00
Gaute Lindkvist
e00f983360 #4166 Add feature for swapping cross plot axes + tweaks to legend 
* Also put x and y property side by side in property editor
 2019-03-08 09:59:38 +01:00
Gaute Lindkvist
6f1ed595b5 #4184 Resize legend if it becomes larger than plot area. 2019-03-07 19:00:38 +01:00
Gaute Lindkvist
d2393cb8a5 #4156 Simplify curve naming code 2019-03-07 14:20:28 +01:00
Magne Sjaastad
102d1c75a7 #4173 Remove obsolete code 2019-03-07 10:25:14 +01:00
Gaute Lindkvist
e9e21cf30d #4171 Work around assert failure when closing main window last 2019-03-07 09:13:56 +01:00
Gaute Lindkvist
fd01871202 #4173 Fix problems with saving state when closing 3d Window before closing plot window 2019-03-07 09:13:56 +01:00
Gaute Lindkvist
0dbd3e8ad4 #4170 Add Qt version string to ResInsight registry folder 
* Qt version has an impact on whether the strings are compatible.
 2019-03-07 09:13:56 +01:00
Gaute Lindkvist
8845c456bc Grid Cross Plot: Use the term Grouping instead of Categorization 2019-03-05 13:35:35 +01:00
Gaute Lindkvist
ac7eccee88 #4157 Grid Cross Plot: Make categorisation legend more like ensemble legend 2019-03-05 10:41:41 +01:00
Gaute Lindkvist
be95eefd69 Repository wide spelling correction overly -> overlay 
* Impacts CAF and ResInsight
 2019-03-05 10:41:41 +01:00
Gaute Lindkvist
3d145464c1 #4145 #4146 Add Create Grid Cross plot command to view and rename filter view 2019-03-01 15:49:02 +01:00
Gaute Lindkvist
4c026952a1 #4134 #4124 Refactor RiuSummaryQwtPlot on top of a base RiuQwtPlot class and use this for Cross Plots 
* Get a lot of functionality included: zoom, panning, etc.
 2019-02-26 11:44:26 +01:00
Gaute Lindkvist
2582e98961 #4135 Fix oversized legend icon for the first cross plot entry 2019-02-25 08:32:01 +01:00
Magne Sjaastad
415a8bba94 #4131 Qt5: Use showNormal() instead of show() 2019-02-22 13:18:53 +01:00
Gaute Lindkvist
760fcaef43 #4130 3D Cross Plot: Improve window management 2019-02-21 15:42:40 +01:00
Gaute Lindkvist
7e57ec39ea 3D Cross Plot: Improve colors and symbols in legend 2019-02-21 15:42:40 +01:00
Gaute Lindkvist
a010fc03d7
3d Cross Plot: First implementation (#4127) 
* First cross plot commit

* Made cross plot deal with "all time steps" and categorise curves based on time step

* Support STATIC vs DYNAMIC plotting

* #4115 Avoid updating plots in RimEclipseCase::computeCachedData()

* Make sure loading of Cross plot from file works

* Show Legend in Cross Plot

* Uncheck / Check curves to disable/enable

* Axis titles and checkable data set

* Name config and setting of common plot look

* Fix category indentation in GeoMech results

* Support name configuration for Grid Cross Plot

* Support adding new curve sets

* Improve colors and symbols with better cycling

* Moved GridCrossPlot files to sub directory in ProjectDataModel and Commands

* #4111 3D calculations : Always show difference options

* Whitespace

* #4111 Move resultDefinition field to private

* Whitespace

* #4087 Ensemble : When importing and ensemble, show by default an ensemble plot

* #4085 3D view: Improve overlay item colors

* #4106 Crash on Linux

Temporary workaround to avoid crash

* #4106 Stop trying to do recursive setting tab order widget

* The double pointer was handled wrongly and shift-tab order isn't working anyway.

* #4114 Regression Test : Remove cached pointer to eclipse case

* Revert "#4114 Regression Test : Remove cached pointer to eclipse case"

This reverts commit f2146c6007.

* #4114 Regression Test : Missing data for flow diag property filter

* #4085 3D view: Add check box for version info text

* Whtespace

* Improve labelling of static results

* Fix update of result property when changing type
 2019-02-21 12:52:23 +01:00
Magne Sjaastad
eb28bb8520 #4085 3D view: Add check box for version info text 2019-02-20 14:40:25 +01:00
Magne Sjaastad
9c4afc52fd #4085 3D view: Improve overlay item colors 2019-02-18 21:01:37 +01:00
Magne Sjaastad
cdbb13f9f4 System : Set object name of toolbar to be able to serialize toolbar state 2019-02-15 09:04:55 +01:00
Gaute Lindkvist
d9da9a7752 #4053 Add ensemble input to import toolbar + geomech import toolbar 2019-02-12 17:00:55 +01:00
Magne Sjaastad
67a960dae5 #4068 System : Add forward declare 2019-02-12 14:49:37 +01:00
Gaute Lindkvist
8c130bbc6e #4070 Add pick cursor to measurements 2019-02-12 08:21:01 +01:00
Magne Sjaastad
1717a5bf30 #3995 Completions : Reorder items in context menu 2019-02-07 07:26:25 +01:00
Gaute Lindkvist
dbe21b7809 Renames in RicPickEventHandler hierarchy 2019-02-06 09:45:30 +01:00
Gaute Lindkvist
8400e4ea02 Renames in RicPickEvent 2019-02-06 08:21:14 +01:00
Magne Sjaastad
9fbb14d6e3 #4008 Summary Plots: Cases/Plots should always be expanded by default 2019-02-05 08:42:23 +01:00
Magne Sjaastad
987c38ec38 Whitespace 2019-02-05 08:41:25 +01:00
Gaute Lindkvist
107a4b9b60 #4012 Always place well target points in real cell geometry 2019-02-01 07:56:05 +01:00
Gaute Lindkvist
69b20a2aa9
#4007 Create new combined import button and move the others to an opt… (#4021) 
* #4007 Create new combined import button and move the others to an optional "Import"-toolbar

* #4007 Make sure we check that fileName vector isn't empty before accessing it
 2019-01-31 09:02:09 +01:00
Jacob Støren
58ac488929 #3958 Refactoring : RigResultAccessorFactory simplification 
To make the result address including basetimestep info reach the CellResultsData class.
 2019-01-30 15:25:29 +01:00
Jacob Støren
dbb2a564a2 #3958 Refactoring: RigCaseCellResultsData: Remove the final result index based interface 2019-01-28 16:18:28 +01:00
Jacob Støren
3e3d3871ed #3958 Refactoring: Remove scalarResultIndex from RigEclipseResultAddress 
and real external use (outside CaseCellResultsData)
Regression tests OK.
 2019-01-25 16:19:15 +01:00
Jacob Støren
98f2b50180 #3958 Refactoring: Remove more direct use of scalarResultIndex related to CellEdge 2019-01-25 16:19:15 +01:00
Jacob Støren
d8eded7d49 #3958 Refactoring: Removed result index from NNC data 2019-01-25 16:19:15 +01:00
Jacob Støren
09011862cd #3958 Refactoreing: Rename 2019-01-25 16:19:14 +01:00
Jacob Støren
42afa063d5 #3958 Refactoring: Rename to findOrLoadKnownScalarResult 
to make it clear that it does not add a result name to the internal structures.
 2019-01-25 16:19:14 +01:00
Jacob Støren
ccfee8f34a #3958 Starting refactoring of eclipse results addressing 
Preparations for time diff results
 2019-01-25 16:19:13 +01:00
Magne Sjaastad
84b0a23512 System : Avoid creating unused variable 2019-01-17 07:37:09 +01:00
Magne Sjaastad
aed0de8a2b #3968 Ensemble : Not possible to plot two ensembles at the same time 
Due to wrong usage of cached number of curves, curves will not be added in some cases. Multiple checking of check boxes will work as a workaround.
 2019-01-16 13:51:13 +01:00
Magne Sjaastad
9bb4cb3e1a Measurements : Move setCheckable into feature 2019-01-15 12:13:00 +01:00
Magne Sjaastad
32f780f558 #3949 Summary : Hide snapshot toolbar by default 2019-01-14 09:49:10 +01:00
Magne Sjaastad
22e8eb485f #3810 HoloLens : Tool bar button and scheduler for auto sent to server 2019-01-14 08:42:54 +01:00
Magne Sjaastad
af0c169bca #3952 Summary : Always show FOPT for new plots 2019-01-14 07:08:05 +01:00
Magne Sjaastad
240e146a1b #3951 Summary : Improve Windows menu 2019-01-14 07:08:05 +01:00
Gaute Lindkvist
f3c188ef56 #3807 Rename RimContourMapView to RimEclipseContourMapView 2019-01-11 16:06:53 +01:00
Magne Sjaastad
6cc2740a74 #3960 Measurements : Add feature activation from context menu, and write Esc as shortcut 2019-01-11 15:49:30 +01:00
Magne Sjaastad
d460d3d77d #3944 clang-tidy : Apply modernize-deprecated-headers 2019-01-11 08:14:53 +01:00
Magne Sjaastad
6db80f40b9 #3856 Update copyright headers 2019-01-09 15:29:24 +01:00
Magne Sjaastad
20f9bf4318 #3935 Measurements : Add Esc button to abort measurement mode 2019-01-08 14:55:44 +01:00
Gaute Lindkvist
7a275be335 #3876 Implement rotated labels on contour maps 2019-01-08 11:07:37 +01:00
Magne Sjaastad
3543ba7cf3 #3924 Measurements : Remove double mouse click event handling 2019-01-03 07:33:54 +01:00
Magne Sjaastad
7f24edaebf #3924 Measurements : Set object name for toolbar 2019-01-03 07:06:11 +01:00
Magne Sjaastad
8709734697 Whitespace 2019-01-02 14:41:17 +01:00
Magne Sjaastad
fe75265053 Annotations : Remove check on priority 
For performance reasons, priority was checked before dyncast. This does not work now for unknown reasons.
 2019-01-02 14:39:39 +01:00
Magne Sjaastad
c5dc9da4bd #3924 Measurement : Clean up includes 2019-01-02 14:37:59 +01:00
Magne Sjaastad
218472fe2c Merge branch 'dev' into measurement 2019-01-02 14:32:17 +01:00
Magne Sjaastad
4e6d7d3c40 #3922 Scale bar : Update legend layout when dependent data changes 2019-01-02 11:22:25 +01:00
Magne Sjaastad
98c0406926 Whitespace 2019-01-02 09:45:48 +01:00
Magne Sjaastad
a9c7773ef7 CppCheck : Fix various minor issues 2018-12-21 12:32:57 +01:00
Gaute Lindkvist
128208d35a Fix type in RiaColorTools contrastColor 2018-12-21 10:12:58 +01:00
Bjørn Erik Jensen
5976298267 Merge branch 'dev' into measurement 2018-12-21 10:08:41 +01:00
Bjørn Erik Jensen
21403f4161 #3805 Measurement. Double click in view to reset measurement 2018-12-21 09:23:53 +01:00
Magne Sjaastad
6f3097dd5f Merge remote-tracking branch 'origin/2018.11.01-patch' into dev 2018-12-21 08:46:27 +01:00
Bjørn Erik Jensen
d6f4962ed7 #3806 Measurement. Display text label at last clicked position 2018-12-20 12:34:17 +01:00
Magne Sjaastad
bc86158ff6 #3914 Source Stepping : Add checkbox for include of ensemble cases 2018-12-20 08:36:35 +01:00
Bjørn Erik Jensen
deec4c16e9 #3804 Measurement. Set checkable toolbutton (still changing icon) 2018-12-19 14:49:35 +01:00
Bjørn Erik Jensen
849a623379 #3804 #3805 Measurement. Add toolbar button and interactive picking 2018-12-19 14:41:17 +01:00
Magne Sjaastad
6a340c5b99 #3905 Summary Stepping : Avoid updateUI when not required 2018-12-19 11:21:18 +01:00
Magne Sjaastad
0d1a4cf0a6 #3842 Summary : Update source stepping based on selection 2018-12-17 16:14:32 +01:00
Magne Sjaastad
b3c3631cc4 #3842 : Update toolbar based on selection 2018-12-17 16:05:23 +01:00
Magne Sjaastad
5e466ed5a9 #3841 Summary : Update stepping toolbar when curve is deleted 2018-12-17 07:56:19 +01:00
Magne Sjaastad
19df293f12 #3841 Summary : Update stepping toolbar when curve is deleted 2018-12-17 07:25:25 +01:00
Bjørn Erik Jensen
d482d3a4ca #3826 Summary curves. Draw error bars in front of all curves except from observed data curves 2018-12-13 16:14:13 +01:00
Bjørn Erik Jensen
01249ace3a #3860 Z scale label. Do not show in contour map 2018-12-13 13:20:49 +01:00
Magne Sjaastad
e58941a423 Remove duplicate line 2018-12-12 10:45:11 +01:00
Gaute Lindkvist
914daded6b #3794 Improve wheel zooming 2018-12-12 08:01:13 +01:00
Gaute Lindkvist
cd75be6671 #3848 Fix crash with text picking by guarding pointer to scene. 2018-12-11 15:33:47 +01:00
Gaute Lindkvist
2e8c2e28a8 #3780 Get rid of debug output from painter 
* don't really need the boundingRect override for RiuQwtSymbol
* And it needs a painter
* Just get rid of it and pass in the painter for the labelBoundingRect
 2018-12-11 13:18:01 +01:00
Bjørn Erik Jensen
488798c3d8 #3790 Z scale label. Display in upper left corner 2018-12-10 13:04:07 +01:00
Gaute Lindkvist
1bab754b26 Reintroduce CDEStyle to progress bar in 3D view 
* Only works for Qt4
 2018-12-05 15:47:16 +01:00
Bjørn Erik Jensen
6a2484c40e #3826 Summary curves. Draw error bars in front of all curves except from observed data curves 2018-12-05 09:35:05 +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
Gaute Lindkvist
c60e6b8140 #3780 Get rid of debug output from painter 
* don't really need the boundingRect override for RiuQwtSymbol
* And it needs a painter
* Just get rid of it and pass in the painter for the labelBoundingRect
 2018-11-30 14:01:29 +01:00
Gaute Lindkvist
f2c7f2ce80 Fix display problems on Linux 2018-11-30 09:47:53 +01:00
Gaute Lindkvist
6f9cac7201 Fix Progress bar alignment on Qt5 2018-11-30 09:47:53 +01:00
Gaute Lindkvist
afbe84997e Fix MDI window placement after Qt5 upgrade 2018-11-30 09:47:53 +01:00
Gaute Lindkvist
5c66b901c3 #3752 ResInsight code changes to build on both Qt4 and Qt5 2018-11-30 09:47:53 +01:00
Bjørn Erik Jensen
4685d5981d Merge branch 'dev' into dev-deeper 2018-11-28 07:10:56 +01:00
Gaute Lindkvist
d743602b81 #2396 Set better fixed y-axis range for logarithmic scaling 2018-11-27 11:29:55 +01:00
Gaute Lindkvist
49b5b60352 #2396 Add support for locking axes in Cell RelPerm plot 
* Also put curves in a grid layout and
shortened logarithmic label to fit better
 2018-11-27 10:53:14 +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
fb93ad7ca7 AppFwk: Make PdmUiSelection3dEditorVisualizer generic, ready to be moved to a separate file 2018-11-26 21:50:46 +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
Bjørn Erik Jensen
2912059922 #3730 Plot Editor. Sort numeric identifiers by numeric value and not alphabetically 2018-11-21 12:31:57 +01:00
Bjørn Erik Jensen
e98b1728f1 #3717 Plot editor. Never plot a default vector 2018-11-21 09:31:52 +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
d8a466a9ef #3698 Scale bar. Take 1. Only vertical variant implemented so far 2018-11-16 13:52:05 +01:00
Gaute Lindkvist
387741d0c1 #3530 Support picking on 2d Maps. 2018-11-14 13:43:55 +01:00
Magne Sjaastad
4117e266ed #3686 Completion Export : Use map based on size_t instead of RigCompletionDataGridCell 
Using RigCompletionDataGridCell as key in a map causes cells with identical local IJK to be treated as same global cell. Use reservoir grid cell index (size_t) as key to be able to handle cells correctly.
 2018-11-14 11:40:23 +01:00
Gaute Lindkvist
53fad80e89 2d Maps: Renames to make classes and variables more consistent. 
* Everything is now named something related to ContourMap:
  - Rim2dEclipseView -> RimContourMapView
  - Rim2dGridProjection -> RimContourMapProjection
  ....
 2018-11-09 09:11:29 +01:00
Gaute Lindkvist
78d81d2630 #3573 Draw axis lines across the whole view for 2d Contour Maps. 2018-10-31 12:13:04 +01:00