Commit Graph

367 Commits

Author SHA1 Message Date
Magne Sjaastad
9ce06a9084 #2098 Add optional display of tooltip in preferences 2017-11-08 11:29:41 +01:00
Magne Sjaastad
7104064937 #2089 Cross Plot : Add cross plot collection 2017-11-07 20:40:45 +01:00
Bjørn Erik Jensen
a35329555b #1948 PLT plot. Initial version, RFT plot copy 2017-10-25 14:36:18 +02:00
Magne Sjaastad
58cd4d112a RegTest : Add support for execution of a subset of tests 2017-10-20 15:48:12 +02:00
Rebecca Cox
53912c4152 #2027 Select well log on well log import 2017-10-20 14:05:42 +02:00
Rebecca Cox
9bd556a1b9 #1996 Remane RimFieldCollection -> RimFaultInViewCollection 2017-10-17 09:52:31 +02:00
Bjørn Erik Jensen
1a5c63af39 #1842 RFT Plot. Handle selections 2017-10-05 16:26:39 +02:00
Magne Sjaastad
b36fcb5f09 #1954 Observed Data : Display imported variables as text in property editor 2017-10-03 15:31:45 +02:00
Magne Sjaastad
6ca1ef6653 Reorganized includes 2017-10-03 14:50:06 +02:00
Magne Sjaastad
eb744f381d #1816 : Observed Data : Add mock data to RifReaderObservedData 2017-09-22 15:02:15 +02:00
Bjørn Erik Jensen
00fc2a2eaa #1853 Summary curve filter. Remove unused includes and friend declarations 2017-09-21 15:18:28 +02:00
Rebecca Cox
e1263888b4 #1813 Observed data: Observed data folder as an oilfield child 2017-09-19 14:19:44 +02:00
Magne Sjaastad
e634ff664e #1866 AppFwk : Rename to QTreeViewStateSerializer 2017-09-07 09:34:06 +02:00
Rebecca Cox
dd845e3dc7 #1751 Rename RimSummaryCaseCollection to RimSummaryCaseMainCollection 2017-09-06 16:32:52 +02:00
Bjørnar Grip Fjær
869f4c8b75 #1793 Add looping of list of case filenames when executing command file 2017-08-29 09:39:53 +02:00
Magne Sjaastad
cb506cf86d #1769 Add time step filtering when importing model
Move import code from RiaApplication to command feature
Show time step selection UI when importing Eclipse data
Support time step reading of HDF data
2017-08-25 06:51:56 +02:00
Magne Sjaastad
86365357f4 #1794 Add missing #ifdefs for USE_PROTOTYPE_FEATURE_FRACTURES 2017-08-22 11:38:31 +02:00
Magne Sjaastad
56a04de2ff Merge remote-tracking branch 'origin/dev' into pre-proto 2017-08-22 09:36:05 +02:00
Magne Sjaastad
553b3bf63e #1794 Add flag RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES 2017-08-21 15:24:20 +02:00
Bjørnar Grip Fjær
6c0f4fa0c0 #1806 Ensure time steps are calculated when opening project with saved flow characteristics plot 2017-08-21 13:09:06 +02:00
Magne Sjaastad
51c30448e9 Merge remote-tracking branch 'origin/dev' into pre-proto 2017-08-21 10:42:11 +02:00
Magne Sjaastad
7dfcfde1d1 #1744 Load and update data for fractures when loading project file 2017-08-14 22:16:03 +02:00
Magne Sjaastad
5eb4eafb6e Merge branch 'dev' into hdf-prototype 2017-08-14 10:47:44 +02:00
Magne Sjaastad
0ba1746755 Merge branch 'dev' into pre-proto 2017-08-11 16:14:00 +02:00
Magne Sjaastad
c4aa625d33 #1755 Move porosity model enum to separate file 2017-08-11 14:27:56 +02:00
Bjørnar Grip Fjær
eee4a65497 Merge remote-tracking branch 'origin/dev' into pre-proto 2017-08-08 14:24:42 +02:00
Bjørnar Grip Fjær
37456bfa9b #1730 Include more information in snapshot filenames 2017-08-04 11:25:42 +02:00
Magne Sjaastad
c481a275ee Merge branch 'dev' into pre-proto 2017-08-04 10:37:35 +02:00
Bjørnar Grip Fjær
a59735de87 #1730 Move snapshot features to separate files 2017-08-03 16:22:02 +02:00
Magne Sjaastad
9cd7dcdd91 #1665 Add processEvents() when waiting for external octave process 2017-08-03 11:31:15 +02:00
Bjørnar Grip Fjær
7179aaeac9 Merge branch 'dev' into pre-proto 2017-08-01 12:44:11 +02:00
Bjørnar Grip Fjær
3dad356d7d #1710 Use usleep on Linux and Sleep on windows 2017-07-31 11:26:21 +02:00
Bjørnar Grip Fjær
48401d5a85 #1710 #1665 Wait for octave process to finish when executing through command file interface 2017-07-31 11:10:43 +02:00
Bjørnar Grip Fjær
bbb4c80b1b #1665 Add setStartDir command to command file interface 2017-07-26 16:57:43 +02:00
Bjørnar Grip Fjær
bf23529b55 #1665 Add parameter and basic framework for executing command file 2017-07-26 16:41:17 +02:00
Magne Sjaastad
d265f79242 #1670 Fix wrong include path 2017-06-29 22:41:34 +02:00
Bjørnar Grip Fjær
6dac618af0 #1642 Batch : Replace folder for input files 2017-06-28 20:36:11 +02:00
Bjørnar Grip Fjær
a9d64edd57 #1643 Allow filename including extension for --case command line parameter 2017-06-27 14:49:33 +02:00
Bjørnar Grip Fjær
17593fba92 #1602 Include sim well fractures when calculating completion type results 2017-06-21 11:06:38 +02:00
Bjørnar Grip Fjær
78c948ea89 #1623 Schedule invalidation of completion type results instead of immediate calculation 2017-06-20 16:40:50 +02:00
Bjørnar Grip Fjær
7c99a2573a Merge branch 'dev' into pre-proto 2017-06-20 13:26:52 +02:00
Jacob Støren
bd3d060c96 #1567 Fix on patch branch 2017-06-16 17:03:25 +02:00
Magne Sjaastad
a8b8e061d7 #1596 Merge dev into pre-proto 2017-06-14 07:25:34 +02:00
Magne Sjaastad
cf859e7c16 #1596 Rename from RimDefines to RiaDefines 2017-06-13 15:41:52 +02:00
Magne Sjaastad
dd912b4f97 Merge branch 'dev' into pre-proto 2017-06-08 14:09:03 +02:00
Magne Sjaastad
ce6acaf20e #1567 Fix issue for command line option '--case' 2017-06-07 07:18:44 +02:00
Magne Sjaastad
a45aee0cc2 Merge branch 'fishbones' into pre-proto 2017-05-23 10:28:42 +02:00
Magne Sjaastad
84b922ba82 #1476 Include isFile() when checking if a file exists 2017-05-11 09:23:13 +02:00
Bjørnar Grip Fjær
a08dbc91ba #1446 Ensure batch execution does not crash when closing ResInsight 2017-05-04 14:28:32 +02:00
Magne Sjaastad
63b07b1152 #1430 When closing top level windows, do not close project if other is visible 2017-04-25 15:01:31 +02:00
Magne Sjaastad
7efe0a996a #1384 Add missing population of view windows 2017-04-24 21:40:46 +02:00
Magne Sjaastad
c23ac3c8ae #1384 Regression test : Add resize of plot windows 2017-04-24 09:39:54 +02:00
Magne Sjaastad
117126bce2 #1384 Regression Test : Add static method for default widget size 2017-04-24 09:23:32 +02:00
Magne Sjaastad
ed2010c0b7 Regression tests : Add basic timing with reporting by logging 2017-04-20 22:34:15 +02:00
Magne Sjaastad
9d5fcaf5a1 Regression tests : Add support for 'rsp' project file extension 2017-04-20 21:21:19 +02:00
Magne Sjaastad
c35e79c3b5 Merge branch 'dev' into pre-proto 2017-04-20 13:40:56 +02:00
Magne Sjaastad
4ec6dc3796 #1401 Move serialization of tree view state to a single location 2017-04-20 11:02:05 +02:00
Magne Sjaastad
d7d80bc53e #1401 Ask user to save modified project before project close 2017-04-20 10:02:25 +02:00
Magne Sjaastad
8255a3aaa3 Merge branch 'dev' into pre-proto 2017-04-03 07:34:56 +02:00
Jacob Støren
442d9d2e41 #1380 Major refactor of the management of views to fix the active view problem. Expect some trouble following this. 2017-03-31 15:13:50 +02:00
Jacob Støren
960e6833c4 #1321 Made zoom all and snapshot work 2017-03-28 23:36:56 +02:00
Magne Sjaastad
3d67946976 Merge remote-tracking branch 'origin/dev' into pre-proto 2017-03-15 10:10:43 +01:00
Magne Sjaastad
647b4348eb Renamed to eclipseCaseData 2017-03-15 09:10:16 +01:00
Jacob Støren
2aa6389796 Fixed assert from progress system when loading plots 2017-03-07 12:27:49 +01:00
Magne Sjaastad
1b01e98c0e Merged branch dev into pre-proto 2017-02-27 14:03:33 +01:00
Magne Sjaastad
bf1f8fcbaa #1254 Use static methods instead of macros 2017-02-27 13:17:32 +01:00
Magne Sjaastad
10f14aee8e Merge remote-tracking branch 'refs/remotes/origin/dev' 2017-02-27 07:13:06 +01:00
Magne Sjaastad
a29f6abc32 #1257 Added null pointer guarding based on reports from CppCheck 2017-02-24 16:00:56 +01:00
Magne Sjaastad
3a98e17163 #1254 Infrastructure for logging including Messages dock widget 2017-02-23 15:02:55 +01:00
astridkbjorke
1a3d695763 #1087 - pre-proto - Setting default unit system for fracture templates when reading in a new case. 2017-02-22 09:31:10 +01:00
Magne Sjaastad
81c92d2781 #1230 Added infrastructure for loadAndUpdate of StimPlan data 2017-02-17 09:29:46 +01:00
Magne Sjaastad
758ac9ef8c #1214 Generalized export of snapshot images for all plot window types 2017-02-14 15:03:54 +01:00
Magne Sjaastad
fa0e0d32ef #1214 Use last imported grid file location as fallback path 2017-02-14 14:59:08 +01:00
Jacob Støren
a25bfd4513 #1213 Well allocation plot is now only created when requested.
Also made the fields in FlowPlotCollection private.
2017-02-14 08:10:39 +01:00
Magne Sjaastad
92f4abe7c2 #1214 Implemented snapshot of well allocation plot 2017-02-13 15:47:24 +01:00
Magne Sjaastad
9aa98a3895 #1078 Assign default colors when a new well is created 2017-02-13 13:26:05 +01:00
Magne Sjaastad
d24bf527bf Assign default colors to wells when importing case from file 2017-02-02 10:35:15 +01:00
Jacob Støren
6fad753c4d #1131 Added update of the plot treeview when changing preferences 2017-01-19 17:58:04 +01:00
Jacob Støren
43249f7af8 Refactor related to #1106, #1107, #1109, #1113. Refactored the MDI control
of windows. This might introduce problems.
2017-01-19 17:54:01 +01:00
Magne Sjaastad
723e0f9286 #1107 #1111 Added update of well allocation plot from 3D view 2017-01-13 13:32:17 +01:00
Magne Sjaastad
ccb88c6520 Rename 2017-01-13 13:32:17 +01:00
Jacob Støren
03cf09d90a System: Created a general basename cleanup function, and applied that when creating filenames from userdescription etc. Related to #1054 preparations 2017-01-04 10:45:04 +01:00
Magne Sjaastad
22d09c0517 #1013 System : Regression tests for plot images 2016-11-29 15:18:55 +01:00
Magne Sjaastad
ea43cda989 System : Improved description of command line system commands 2016-11-28 09:03:36 +01:00
Magne Sjaastad
71d632dbc7 System : Improved description of command line system commands 2016-11-28 08:59:20 +01:00
Magne Sjaastad
b5f7da628d Eclipse Input Data : Added input case to recent files list 2016-11-28 07:25:04 +01:00
Magne Sjaastad
29f766edc7 #963 Batch : Parse multiple entries of replaceCase and replaceSourceCases 2016-11-25 14:21:50 +01:00
Magne Sjaastad
44b5eab736 #1002 System : Improve restore of main windows from minimized state 2016-11-24 14:47:20 +01:00
Magne Sjaastad
e0d7849576 System : Improved handling of missing files 2016-11-24 10:51:20 +01:00
Magne Sjaastad
73e4174fe7 Summary : Make sure loading of plot data is only done once 2016-11-10 09:26:53 +01:00
Magne Sjaastad
f14b4ab4d0 #878 Command Line : Added support for snapshot of plots 2016-11-09 12:22:07 +01:00
Magne Sjaastad
cb468f0c48 #908 Replace file summary case with Eclipse summary case when grid is imported 2016-11-07 15:57:21 +01:00
Magne Sjaastad
67894ecef0 #279 Activate riuMainWindow before taking snapshots during regression tests 2016-11-01 11:50:38 +01:00
Magne Sjaastad
5a63b841b8 #850 Removed obsolete code 2016-10-27 08:35:57 +02:00
Magne Sjaastad
b091333daa #916 If possible, hide plots when importing 3D case, and hide 3D windows when importing summary case 2016-10-24 16:01:19 +02:00
Magne Sjaastad
81686707ec #916 Summary : Preferences - Autogenerate plot if summary is found, and default vector filter 2016-10-24 13:54:35 +02:00
Magne Sjaastad
e87788d138 #849 Hide main window instead of close to avoid rebuild of contained project 2016-10-06 15:02:11 +02:00
Magne Sjaastad
b4d6e40247 #849 Added import summary case command 2016-10-06 15:02:11 +02:00
Magne Sjaastad
d719491a33 #846 Added Open Last Used Project feature 2016-10-05 10:42:08 +02:00
Magne Sjaastad
98643a7b84 #846 Make sure plots widgets are updated when the plot main window is created 2016-10-05 10:04:41 +02:00
Magne Sjaastad
c8b73dad68 #846 Moved recent file management to RiaApplication 2016-10-05 08:54:40 +02:00
Magne Sjaastad
2d5295cf74 #846 Store window state for mainwindows in project and moved features into ApplicationCommands 2016-10-05 08:54:39 +02:00
Magne Sjaastad
8277080c2e #846 If plot window is hidden, do not open plot window when loading case with summary data 2016-10-04 13:14:39 +02:00
Magne Sjaastad
16f8fc186e #846 Removed obsolete flag to closeProject and make sure project is closed when last main window is closed 2016-10-04 11:03:54 +02:00
Magne Sjaastad
3a2454cba0 #851 Added "Open 3D Window" tool button in plot window. Raise mainWindow when activated from toolbar 2016-10-04 11:03:53 +02:00
Magne Sjaastad
33abbed1fd #882 RiaApplication : Renamed to lastUsedDialogDirectory and added currentProjectPath. Use project path as fallback path for LAS export 2016-09-21 09:46:17 +02:00
Magne Sjaastad
1b38326d83 #279 Include cleanup 2016-09-01 13:01:17 +02:00
Magne Sjaastad
0128baddff #279 Use frame buffer objects for snapshots when available, otherwise use grabFrameBuffer() 2016-08-31 17:34:31 +02:00
Jacob Støren
b46c6ebcf8 #809 Created Formation Names project items.
#819 Added delete command to Formation names
#808 Added an import Formation Names command
2016-08-24 08:30:12 +02:00
Magne Sjaastad
58047a6509 #569 Added custom font for labels in 3D scene and added font size to preferences 2016-08-09 13:43:13 +02:00
Magne Sjaastad
4bfef4ead0 Merged in changes from maintenance branch 2016-08-04 11:12:53 +02:00
Magne Sjaastad
2c96599327 #744 Error message for snapshots in Batch mode 2016-07-15 10:55:20 +02:00
Magne Sjaastad
7584e03883 Added context menu NewSummaryPlot for summary cases 2016-07-01 11:34:37 +02:00
Magne Sjaastad
7e89fb4b49 (#777) Show default summary curves when importing an Eclipse case with summary data 2016-06-30 14:01:50 +02:00
Magne Sjaastad
ac5402ca5a Added updateViewerWidgetWindowTitle for summary plots 2016-06-29 14:41:17 +02:00
Magne Sjaastad
cac86dcec9 Fixed mouse interaction with well log plots and tracks 2016-06-29 14:41:14 +02:00
Magne Sjaastad
3b55f98dbd Added ShowPlotWindow feature 2016-06-29 14:40:37 +02:00
Magne Sjaastad
119881dc7d Removed obsolete code related to actions, menus and dock widgets 2016-06-29 14:40:20 +02:00
Magne Sjaastad
bbf1574feb Wired up application logic related to new RiuMainPlotWindow 2016-06-29 14:38:11 +02:00
Magne Sjaastad
e92624a862 Moved setting for main windows geometry and toolbar state to RiuMainWindowBase 2016-06-29 14:38:06 +02:00
Magne Sjaastad
aef466087d Established RiuMainPlotWindow 2016-06-29 14:37:41 +02:00
Jacob Støren
40388b308b #739 Added summary case classes. Use those from the summary curves. Made save/restore work again for the summary plots. File format for Summary stuff are changed. 2016-05-31 13:48:22 +02:00
Jacob Støren
38c15f57f2 #739 Show sum plot on creation. Load when opening project. Delete on close project 2016-05-25 14:05:31 +02:00
Magne Sjaastad
21f8b722b1 Redirect stdout and stderr to console using freopen_s
Previous redirection code does not work on VS2015, this commit works on
both VS2010 and VS2015
2016-05-04 15:11:42 +02:00
Magne Sjaastad
5fb04e9526 [System] Added support for display of regression images on top of each other in regression report
Use a slider concept (using CSS) to switch between generated and base
image
2016-01-11 08:00:05 +01:00
Magne Sjaastad
9c8a75a237 Do not modify fault settings when preparing for regression test 2015-12-11 10:45:48 +01:00
Jacob Støren
d84db62ebb System: Do not change the preferences when running regression tests.
We need the flexibility in the tests.
2015-12-10 12:21:01 +01:00
Magne Sjaastad
dc6a50ec3c Renamed from setCurrentObjectInTreeView to selectAsCurrentItem 2015-12-07 10:07:51 +01:00
Magne Sjaastad
de41755320 (#687) Added option RESINSIGHT_INCLUDE_APPLICATION_UNIT_TESTS to enable unit tests 2015-12-03 11:38:59 +01:00
Magne Sjaastad
d2537a207f (#687) Improved launch of unit tests from command line 2015-12-03 10:33:38 +01:00
Jacob Støren
ee11d4fde7 (#672) Refactoring and Fix of side effects introduced by 704f4fa 2015-12-01 12:27:19 +01:00
Jacob Støren
7b9f2b41ed CppCheck fixes, Errors Warnings and performance 2015-11-27 16:37:26 +01:00
Magne Sjaastad
ac714ca2ea (#630) Give warning if user tries to save project to a read only file
Add saved file to recent file list
2015-11-20 10:50:23 +01:00
Magne Sjaastad
7cd2cd0f50 (#632) Add Eclipse cell to selection and show in 3D view and time history plot
Consolidated remove of model based on name in RimView
Cleanup selection and time history plot when project is closed
2015-11-09 19:05:31 +01:00
Magne Sjaastad
bc85ecd6ab Make sure all project windows are closed down as part of closeProject() 2015-10-28 15:30:20 +01:00
Magne Sjaastad
09a2579c49 Update icon state for range filters as part of loading project, not from initAfterRead 2015-10-28 12:23:24 +01:00
Magne Sjaastad
01224dd5e6 System : Removed unused variables 2015-10-26 10:18:57 +01:00
Magne Sjaastad
0405584bb6 System : Replaced tab with four spaces in ApplicationCode and subfolders 2015-10-23 15:46:25 +02:00
Magne Sjaastad
d022f70248 System : Improved robustness for regression tests
Clear list of reservoir views to be updated when closing project
Guard for null pointer when evaluating reservoir views for update
2015-10-23 14:13:14 +02:00
Jacob Støren
b18ae1a14a Fixed crash introduced by b15b23b856 2015-10-22 16:46:58 +02:00
Jacob Støren
b15b23b856 (#540) Removed the Visible Cells Sync from Gui.
Moved UpateOverrides from init afterRead to OpenProject
2015-10-22 16:02:28 +02:00
Magne Sjaastad
63d401b6e6 Added unit test to Testing menu
Launch of unit tests (gtests) is also possible from command line
parameter "unittest"
2015-10-05 16:09:51 +02:00
Jacob Støren
30f3796bab Slight progress-bar improvement 2015-09-28 08:21:51 +02:00
Magne Sjaastad
061288f1c3 (#495) Removed use of StdInclude 2015-09-25 15:57:50 +02:00
Magne Sjaastad
4424c110be Transformed static functions from ViewLinker to dynamic functions in RimView 2015-09-25 11:17:51 +02:00
Jacob Støren
bc13971fec Clear the views to regenerate when finished regenerating
This inefficiency has been there forever ...
2015-09-21 18:54:29 +02:00
Magne Sjaastad
a4b57a11a4 Added display of class names to preferences
Use flag in pdmUiTreeViewEditor to control display of class names
2015-09-18 19:24:02 +02:00
Magne Sjaastad
d9b070c0ef Use current project name as suggested project file Save As name 2015-09-18 18:49:53 +02:00
Jacob Støren
b55beb7e13 (#401) Update dependent views after independent ones
The dependent views needs the visibility from their masters
2015-09-18 17:08:57 +02:00
Pål Hagen
095d974e38 (#435) WIP - Reading metadata from LAS files 2015-09-14 16:33:28 +02:00