Commit Graph

247 Commits

Author SHA1 Message Date
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