Commit Graph

17414 Commits

Author SHA1 Message Date
Magne Sjaastad
346db45afc Added default Z scale factor and default gridlines on/off when creating a new view
p4#: 19177
2012-10-12 15:05:42 +02:00
Magne Sjaastad
e8da3510ec Compute SOIL if one or none of SGAS or SWAT is present
p4#: 19173
2012-10-12 14:27:43 +02:00
Magne Sjaastad
b4ae324d9b Added script folder to Octave function search path. This makes it possible to recursively call other functions from an Octave script.
p4#: 19164
2012-10-12 12:08:38 +02:00
Magne Sjaastad
fc5dda4957 Use static_cast
p4#: 19154
2012-10-12 10:14:45 +02:00
Magne Sjaastad
0df00dc2fa Removed stop button from animation toolbar
p4#: 19121
2012-10-11 07:10:53 +02:00
Magne Sjaastad
5f9de8644e Use slider for property filter range
p4#: 19096
2012-10-09 16:19:49 +02:00
Magne Sjaastad
a4ff9bd41c Added slider editor for double values
p4#: 19089
2012-10-09 11:26:50 +02:00
Magne Sjaastad
65acad250c Reduced loading time of Eclipse Ascii files by storing filepos for keywords
QFile is used directly due to a bug with QTextStream fixed in 4.8.0
p4#: 19079
2012-10-08 19:44:10 +02:00
Magne Sjaastad
03ede069c1 Avoid initializing progress bar if called from unit test framework
p4#: 19042
2012-10-05 15:58:06 +02:00
Magne Sjaastad
831d60cb34 Merge pull request #9 from OPM/internal
Internal
2012-10-04 05:22:35 -07:00
Magne Sjaastad
f144134701 Use simplified compile of Octave plugins on non-Windows
p4#: 19012
2012-10-04 12:28:31 +02:00
Magne Sjaastad
1622df540b When compiling 64-bit Windows, establish 32-bit Visual Studio 2010 environment and compile Octave plugin using this environment.
p4#: 19011
2012-10-04 12:12:58 +02:00
Magne Sjaastad
2e9f842072 Use CMAKE to change working directory to Octave binary directory before compiling Octave plugins. This way dependent libraries are found without manipulating path.
p4#: 19006
2012-10-03 14:53:51 +02:00
Magne Sjaastad
9c1ce7591e Upgraded visualization libraries
Major refactoring of color legend framework
Added discrete log color legend
p4#: 18989
2012-10-02 10:17:52 +02:00
Magne Sjaastad
082560b2a5 Updated README 2012-10-02 10:04:42 +02:00
Joakim Hove
c002720509 Added CACHE settings to the ERT_ROOT_PATH variable 2012-09-22 15:59:15 +02:00
Magne Sjaastad
c4e5d9e842 Do not include Octave plugin for Windows 64-bit, as no precompiled Octave 64-bit is available.
p4#: 18838
2012-09-20 15:15:43 +02:00
Magne Sjaastad
738d6cc8dc Use CMAKE_CL_64 to check if we are compiling Windows x64
p4#: 18835
2012-09-20 08:33:42 +02:00
Jacob Støren
7c63cccc8d ResInsight: Linux compile fixes
p4#: 18783
2012-09-18 15:34:50 +02:00
Jacob Støren
e679ba07a5 ResInsight: Integrated from Caf trunc. Multi variable fields (multiselect) with option values now handled. Improved PdmUi layout. Improved Viewer widget size behaviour, Xml keyword check.
p4#: 18777
2012-09-18 15:21:04 +02:00
Magne Sjaastad
01ee943155 Improved integer slider editor
Use sliders for cell range filter
2012-09-14 15:48:49 +02:00
Magne Sjaastad
03fc06e6a4 Changed keyword name as an Xml attribute is not allowed to start with a digit 2012-09-13 15:17:59 +02:00
Magne Sjaastad
18a5501601 Get Qt DLLs from bin instead of lib. Do not include Linux shell script for Windows packaging. 2012-09-13 13:14:07 +02:00
Magne Sjaastad
8a8fd5a0d0 Fixed default location for ERT lib files for Windows 2012-09-13 11:51:03 +02:00
Magne Sjaastad
bf8a006c0e Updated ERT to SVN revision 4077 for Windows 32/x64 2012-09-13 11:41:48 +02:00
Magne Sjaastad
5b136d9822 Updated ERT to SVN revision 4077. Use new folder structure for ThirdParty/Ert, one folder for libs and one folder for includes. Minor application changes to be compatible with API changes in ERT. 2012-09-13 11:12:11 +02:00
Magne Sjaastad
0467923143 Remove .a to include binaries from ERT 2012-09-13 12:12:14 +03:00
Magne Sjaastad
748f061a55 Updated ERT to SVN revision 4077. Use new folder structure for ThirdParty/Ert, one folder for libs and one folder for includes. Minor application changes to be compatible with API changes in ERT. 2012-09-13 10:56:39 +02:00
CeetronResInsight
3f96c61c72 Change 18625 on 2012/09/11 by magne@ResInsight_magne_RHE5
Decorate package name with either el5 or el6 when compiled on RHEL5/RHEL6
2012-09-11 15:10:28 +02:00
CeetronResInsight
76cfde5ba6 Change 18611 on 2012/09/11 by magne@ResInsight_magne_RHE5
Removed requirement for MAPAXES when reading an Eclipse Ascii file
2012-09-11 13:04:24 +02:00
CeetronResInsight
ad95533d2f Change 18604 on 2012/09/11 by magne@magne_at_MAGNE
Added check for NULL pointer
2012-09-11 10:16:39 +02:00
CeetronResInsight
b3c142cc9a Change 18603 on 2012/09/11 by fredrik@fredrik_MBP-BootCamp
Added glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, GL_LOWER_LEFT); to get proper orientation of textures on point sprites
2012-09-11 09:22:36 +02:00
Magne Sjaastad
2bbd48588e Fixes for Visual Studio 2012-09-10 11:34:11 +02:00
Joakim Hove
e1d669ec65 Linking to wrong util name 2012-09-09 12:14:12 +02:00
Joakim Hove
282e6b9115 Minor typo 2012-09-09 12:11:38 +02:00
Joakim Hove
d8a5f2cf7e Updated FileInterface_UnitTests/CMakeLists.txt to support ERT in arbitrary locations 2012-09-09 12:09:50 +02:00
Joakim Hove
ada6d0b488 Have added CMAKE configuration options for where the ERT distribution is located. 2012-09-09 11:25:59 +02:00
Alf Birger Rustad
1ef02299c1 Merge pull request #7 from Ivarun/build_fixes
Build fixes
2012-09-01 10:37:08 -07:00
Alf Birger Rustad
a5a1dc3a3b Merge pull request #6 from rolk/clean-status
Ignore files generated by Qt resource compiler
2012-09-01 10:35:05 -07:00
Magne Sjaastad
27d8808c5c Version 0.8.6 2012-08-31 19:12:47 +02:00
Ivar Ursin Nikolaisen
94d00b4870 Replace tabs with spaces in conformance with style 2012-08-31 13:16:47 +02:00
Ivar Ursin Nikolaisen
047ca6d380 Add libpthread link to ReservoirDataModel_UnitTests 2012-08-27 15:28:35 +02:00
Ivar Ursin Nikolaisen
bfb2a75a56 Add libz to unit test that requires it. 2012-08-27 15:25:03 +02:00
Ivar Ursin Nikolaisen
85c96b5567 Add libpthread link to unit tests that require it. 2012-08-27 15:22:03 +02:00
Ivar Ursin Nikolaisen
543dce2ff0 Add link to librt in VisualizationModules/LibCore
This is needed at least on openSUSE 12.1 and 12.2.
2012-08-27 14:03:59 +02:00
Ivar Ursin Nikolaisen
b0c60f0e4a Fix libQtCore link failure because of missing libz
libQtCore often, but not always includes the required functionality from
libz. This is needed for example on openSUSE 12.1 and 12.2.
2012-08-27 13:34:00 +02:00
Roland Kaufmann
111e2860f7 Ignore files generated by CMake for Qt resources 2012-07-20 13:26:22 +02:00
Alf Birger Rustad
651d908709 Merge pull request #4 from rolk/clean-status
Enable builds in the development tree without cluttering Git's status
2012-07-06 06:05:56 -07:00
Roland Kaufmann
127abb9532 Remove object files which is generated from source 2012-07-06 14:57:16 +02:00
Roland Kaufmann
692082df96 Ignore build artifacts
Ignore any files that stems from building in the development tree itself,
which can be useful e.g. for letting the debugger easily pick up the
source files.
2012-07-06 14:57:16 +02:00