Commit Graph

227 Commits

Author SHA1 Message Date
Magne Sjaastad
9b6e422d0c #742 Integrated opm-parser and added basic unit test 2016-06-01 15:53:21 +02:00
Magne Sjaastad
2892653298 #742 Added custom-opm-parser, compiles on Windows 2016-06-01 15:53:21 +02:00
Magne Sjaastad
758b4a452b #742 Added custom-opm-common to ThirdParty 2016-06-01 15:53:21 +02:00
Magne Sjaastad
54c98ca9f8 #742 NRLib now uses Boost from CMake 2016-06-01 15:53:21 +02:00
Magne Sjaastad
e3fd05145f #734 Fixed issue on Linux when compiling in-source ERT 2016-05-26 21:40:19 +02:00
Magne Sjaastad
31cb06089d #734 Added support for linking with both custom and system installed external ERT library 2016-05-26 21:23:16 +02:00
Magne Sjaastad
1929798532 Moved include_directory from main to ApplicationCode. Include of Eclipse hearder files must now be prefixed with ert/<module_name> 2016-05-26 14:55:59 +02:00
Jacob Støren
ae615901b8 #739 Moved windowsGeometry data to the RimViewWindow base class
Introduced an interface for setting and getting mdiWindow Geometry
Changed file keywords from GraphPlot etc to SummaryPlot
Added a summary plot QwtPlot descendant
Added handling of delete of the MDI window
2016-05-26 13:17:26 +02:00
Jacob Støren
24edb0501e WIP: Started to create the summary plot Rim data structures. 2016-05-09 12:16:55 +02:00
Magne Sjaastad
f00ecd9a5a System : Include runtime dlls on Windows
msvcp/msvcr/vcomp is now included in the install package on Windows
2015-12-22 15:00:27 +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
97b95216e9 (#687) Moved unit tests to ApplicationCode/UnitTests 2015-12-03 10:33:13 +01:00
Magne Sjaastad
f20dca0e78 (#657) Created append cross section feature 2015-11-18 15:55:23 +01:00
Magne Sjaastad
7ff7f42adc (#266) Added geometry for grid box faces
Added legend lines and text
2015-11-17 13:11:54 +01:00
Magne Sjaastad
6f4a4e16c6 (#638) Changed title to "Result Plot" and renamed files 2015-11-11 14:07:21 +01:00
Magne Sjaastad
a13376a8bf (#632) Update application items when selection changes using a separate class
Added RiuSelectionChangedHandler
Moved code from ViewerCommands into SelectionChangedHandler
2015-11-11 11:41:11 +01:00
Magne Sjaastad
17493070ac (#632) Improved colors used for selection and time history curves 2015-11-10 09:43:56 +01:00
Magne Sjaastad
963220dd37 (#632) Added support for creation of mesh part from a single cell 2015-11-09 19:05:31 +01:00
Magne Sjaastad
ab3c5c029a Refactored RiuLineSegmnetQwtPlotCurve
Removed domain specific code
Created RigCurveDataTools
Use symbol to draw single values
2015-11-06 10:08:35 +01:00
Magne Sjaastad
30adb2661e (#612) Added time history plot as a dockwidget 2015-11-05 13:48:07 +01:00
Jacob Støren
4388f39175 Renamed files PlotCurve->Curve 2015-11-04 16:22:53 +01:00
Jacob Støren
10582750ab Renamed files PlotTrack/TrackPlot -> Track 2015-11-04 16:14:42 +01:00
Magne Sjaastad
ad6e17a5d9 (#596) Refactored name matching for Ascii well path files (dev-files)
Supported well names are
Well name in quotes
name myWellName
WELLNAME: myWellName
2015-10-28 11:32:47 +01:00
Magne Sjaastad
4a12eecd0c Moved well path commands into separate folder 2015-10-28 10:02:09 +01: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
Magne Sjaastad
061288f1c3 (#495) Removed use of StdInclude 2015-09-25 15:57:50 +02:00
Pål Hagen
479b2083ef (#486) Renamed "trace" to "track" 2015-09-18 12:29:23 +02:00
Magne Sjaastad
0f5fed1768 (#492) Created folder for well log commands, added "New Well Log LAS Curve" feature 2015-09-18 09:07:38 +02:00
Pål Hagen
ffbc4f13e7 (#459) Added support for plotting of discontinuous curves 2015-09-17 18:42:35 +02:00
Magne Sjaastad
0fd5638c6b Moved ViewLink commands into separate folder 2015-09-15 16:33:40 +02:00
Pål Hagen
68662d2968 (#434) Building and linking NRLib with ResInsight 2015-09-11 17:03:11 +02:00
Jacob Støren
8d57bbe77b (#399) WIP: First commit of experimental geomech WellLog extractor
Not yet enabled in any way
2015-09-04 15:35:20 +02:00
Magne Sjaastad
c065b8350c (#406) Created a combined docking widget for additional project trees and property views 2015-08-31 07:53:52 +02:00
Pål Hagen
4e83cff8a2 Well log plots now contain one plot per trace 2015-08-28 14:25:14 +02:00
Pål Hagen
4e6bb1ded3 WIP - added project data model files for well log plots
Added command feature for adding new well log plots (right-click "Plots"
in the project tree view). Will create dummy Qwt widget added as an MDI
window.
TODO: Complete the relations between the entities, and add
properties/property editors. Create more advanced viewer widget for
plotting of multiple traces with multiple curves. Harmonize MDI stuff
with 3D viewers.
2015-08-27 16:13:49 +02:00
Pål Hagen
2b87c8c7d6 Added Qwt library and basic classes for well log viewer 2015-08-26 12:27:29 +02:00
Pål Hagen
db9e6b0912 Moved Octave script command features to a separate sub folder 2015-08-24 15:33:04 +02:00
Pål Hagen
42656c45ad (#355) Removed old project tree view
RimUiTreeView and RimUiTreeModelPdm are no longer part of the solution.
TODO: Get rid of the source code files when all testing is done
successfully.
2015-08-24 14:56:09 +02:00
Jacob Støren
c75d09e3df (#381) Handle key press events in new tree view 2015-08-20 11:16:19 +02:00
Jacob Støren
6786894adb Fixed Cmake generation error.
wrap_qt cant be run in an included sub-cmake-file
2015-08-20 09:57:09 +02:00
Jacob Støren
302f46b61b (#372) First step in Reimplemented drag and drop support 2015-08-18 11:23:53 +02:00
Jacob Støren
eadf1ca300 (#361) Refactored "On" as a start on the toggle commands 2015-08-18 10:52:18 +02:00
Jacob Storen
f3810640ca Fixed Linux compile issues 2015-08-14 06:42:12 -07:00
Magne Sjaastad
a1ecc50605 Added CopyReferencesToClipboardFeature 2015-08-14 10:17:31 +02:00
Magne Sjaastad
f748b68e0c Prototyped commands for new treeview 2015-08-06 11:00:21 +02:00
Magne Sjaastad
d56cde087f Added missing include 2015-07-31 18:49:33 +02:00
Magne Sjaastad
57b005cdf2 Build system changes to be able to build using modularization fwk 2015-07-29 14:20:15 +02:00
Pål Hagen
c863d087f0 (#80) Added navigation modes
New navigation modes: GeoQuest and RMS. In addition, right mouse button
can now be used for panning in CAD navigation mode.
2015-07-02 14:53:34 +02:00
Pål Hagen
d43c5d4dae Adding ODB dll files to the distribution zip file on Windows 2015-06-25 11:27:11 +02:00
Jacob Støren
ff79f1a8ba Added calculation of S1, S2 and S3 of Geomechanical stress tensor
See #320
2015-06-17 13:07:48 +02:00
Jacob Støren
4f77afe43c Implemented #310 Result info when picking
This included some refactorization to remove the command stuff out of
RiuViewer,
and to communicate the grid index via the source info struct, and not as
a cvfPart::id
2015-06-11 11:38:51 +02:00
Jacob Støren
85f3c86814 Added hard rpath to odb libraries position 2015-05-19 21:27:33 +02:00
Stein Dale
85f62ec1d4 Moved code to new library: ResultStatisticsCache
Moved  RigStatisticsCalculator.h/.cpp, RigStatisticsDataCache.h/.cpp,
RigStatisticsMath.h/.cpp to new library ResultStatisticsCache.
ResInsight and some unit tests now link with this new library.
2015-05-11 13:25:05 +02:00
Jacob Støren
d6643d9d35 RimView etc: More aligning GeoMech/Eclipse
Now Animation drawstyle works fairly well.
2015-05-08 14:13:26 +02:00
Jacob Støren
41b0847041 GeoMechData lib needs USE_ODB_API define 2015-05-07 10:12:46 +02:00
Jacob Støren
4a21bb4a30 Added RimView, and sorted the libs in folders 2015-04-29 10:50:25 +02:00
Jacob Støren
a7e38bcda1 Now handling compilation both with and without ODB api 2015-04-29 09:26:29 +02:00
Jacob Støren
936d6553cf Improved CMakeSetup for OdbTest app
Cleaned away the hardcoded paths. Made options instead.
2015-04-28 10:45:00 +02:00
Jacob Støren
0f3d9ffa60 Now reading Odb-file and creating display model
Nothing shows up yet, but we're getting there
2015-04-27 13:51:22 +02:00
Jacob Støren
c3ec79d6e1 Working ResInsight with Odb linked, hacklish 2015-04-25 08:54:08 +02:00
Jacob Støren
a538be1775 GeoMech with OdbReader Included in ResInsight Build
Preliminary, first shot.
Added first iteration on basic visualization code.
2015-04-24 16:04:12 +02:00
Roland Kaufmann
4378f4886a Add application icon into the executable bundle 2015-01-01 19:46:25 +01:00
Roland Kaufmann
9fb9f84a7a Build resulting executable as a bundle on MacOS X
This will allow us to launch it from the Finder and add it to the dock
2015-01-01 19:46:25 +01:00
Magne Sjaastad
787d44e446 Added class used to build text strings from picked objects in 3D scene 2014-09-05 08:25:38 +02:00
Magne Sjaastad
32bfb65a9d Added socket data transfer
Added one common class used to transfer data using socket. This class is
used both from the Octave plugins and from the socket server code in
ResInsight
2014-04-22 13:17:52 +02:00
Magne Sjaastad
0fbcc57473 Use caf property dialog and removed obsolete riuPreferencesDialog 2014-04-22 13:16:31 +02:00
sigurdp
0656b5254f First cut, command line options for batch processing
First cut implementation of command line oprions for batch proccessing.
Added support for the follwoing new command line options:
size, replacecase, replaceSourceCase and multiCaseSnapshots
Reworked the entire command line processing code.
2013-12-04 12:04:42 +01:00
Magne Sjaastad
4459fe0c71 Added ResInsightVersion.cmake to list of files. Removed redundant
includes.
2013-10-09 08:54:51 +02:00
Magne Sjaastad
b0761d0612 Added dialog for configuration and execution of regression test from
Debug->Regression Test Dialog
Generalized read/write of pdm object fields using QSettings
2013-09-27 10:04:10 +02:00
Magne Sjaastad
55337bd1b1 Updated link order to fix compile issues on Linuz
p4#: 22339
2013-09-06 16:07:09 +02:00
Magne Sjaastad
86f5e6017d Integrated well import wizard in project file
p4#: 22331
2013-09-06 13:06:39 +02:00
Magne Sjaastad
3ee6d0838f Renamed to WellPathImportSsihub, and updated folder names
p4#: 22329
2013-09-06 11:34:24 +02:00
Jacob Støren
cac9d9d3f9 Octave Interface: Added riGetWellStatus
p4#: 22301
2013-09-04 08:03:11 +02:00
Jacob Støren
1e7c4a385a Buildsystem: Prefixed the resinsight vars to make them groupend and more accessible from the cmake gui.
Also introduced an option to turn openmp on and off
p4#: 22257
2013-08-30 15:37:29 +02:00
Magne Sjaastad
b31953eb4c Hide console window on Windows using a workaround described here
http://public.kitware.com/Bug/view.php?id=14326
p4#: 22191
2013-08-22 08:03:27 +02:00
Magne Sjaastad
69f3f98f5a Hide console on Windows
Show command line help text in dialog, accessible from About menu
Show command line help dialog instead of console output on Windows
p4#: 22130
2013-08-08 11:09:18 +02:00
Magne Sjaastad
ada9819870 Added ssihubInterface library and framework files
p4#: 21763
2013-05-29 12:59:08 +02:00
Magne Sjaastad
7ba9cef84b Moved socket commands into files grouped by case info, geometry, project info and property data
p4#: 21712
2013-05-24 11:07:59 +02:00
Vidar Lundberg
163ce74052 Added visualization of Well Paths in reservoir views.
Added PDM objects for a list of well paths (RimWellPathCollection) and for individual well paths (RimWellPath).
RimWellPathCollection uses RivWellPathCollectionPartMgr to generate visualization parts for each well path in the collection.
RimWellPath handles geometry defined in RigWellPath, and RivWellPathPartMgr is used to generate visualization parts. The well path visualization parts are generated by reusing RivPipeGeometryGenerator (also used for well pipes).
Added features:
- Select Open Well Paths in File menu to open one or more well path files, file format supported is Statoil JSON format.
- Each well path has a label showing the name, and the PDM window will show additional info (Id, Source System, UTM Zone, Update Date and User, Survey Type, File Path).
- Possible to turn on / off visibility, set thickness, set color for individual well paths.
- List of well paths including specified parameters/settings will be stored in project file.
- Possible to clip all well paths at a specified distance to the reservoir as this is the relevant area to see, and if showing whole well path it may be problematic for auto zoom etc.
Known problems:
- Well paths are not shown in some types of reservoir views, for instance reservoir views showing well pipes. Will look into this later.
p4#: 21658
2013-05-16 14:10:22 +02:00
Magne Sjaastad
2303f30200 Added RiaSocketCommands as placeholder for new commands
Moved declaration to RiaSocketServer.h to be able to create new commands in other files
Added riGetTimeStepDates
p4#: 21655
2013-05-16 13:43:37 +02:00
Magne Sjaastad
f9985af7e9 Added source groups in CMake to improve file organization in generated projects
p4#: 21330
2013-04-18 07:33:45 +02:00
Magne Sjaastad
9f07daefad Moved MimeData into RimMimeData
p4#: 21317
2013-04-16 11:19:37 +02:00
Magne Sjaastad
da82770e5f Moved file list from ApplicationCode to ProjectDataModel
p4#: 21315
2013-04-16 10:27:36 +02:00
Magne Sjaastad
e5b7bbc5af Merge pull request #22 from OPM/internal
Internal
2013-04-12 04:06:49 -07:00
Magne Sjaastad
be8b627e69 Added application icon on Windows
p4#: 21221
2013-04-10 12:01:38 +02:00
JacobStoren
3c08fd8abf Merge pull request #20 from OPM/internal
Update dev branch to latest
2013-04-02 06:14:26 -07:00
Roland Kaufmann
20f00f4a3a Put launcher for ResInsight in desktop environment 2013-03-27 00:43:13 +01:00
Roland Kaufmann
e7613fe9ee Optionally enable system installation of binaries
If the option PRIVATE_INSTALL is set to OFF, LSB-compliant paths are
used for the `install' target.
2013-03-27 00:43:01 +01:00
Roland Kaufmann
3fcd05e838 Refactor variable containing filenames for license
These will be used in several scenarios later.
2013-03-27 00:39:06 +01:00
Roland Kaufmann
e63c609111 Use $ORIGIN to load libs from program directory
The RPATH attribute won't expand relative directories (such as ".")
neither can it be a semi-colon separated list; the old way of setting
it was wrong and would lead to libraries being loaded from system
directories instead.
2013-03-27 00:38:59 +01:00
Jacob Støren
e10bd73658 Renamed the final filenames for this time:
RICursors		RiuCursors
RIMainWindow	RiuMainWindow
RIPreferencesDialog	RiuPreferencesDialog
RIProcessMonitor	RiuProcessMonitor
RIResultInfoPanel	RiuResultInfoPanel
RIViewer		RiuViewer
p4#: 21072
2013-03-22 17:30:50 +01:00
Jacob Støren
6a2cbbcf07 Renamed files:
RimReservoir		RimCase
RimResultReservoir	RimResultCase
RimInputReservoir	RimInputCase
p4#: 21069
2013-03-22 16:40:41 +01:00
Jacob Støren
b903c7f8c2 Renamed files:
RIApplication	RiaApplication
RIPreferences	RiaPreferences
p4#: 21068
2013-03-22 16:24:42 +01:00
Jacob Støren
27647248ea Rename of files:
RIBaseDefs	RiaBaseDefs
RIVersionInfo	RiaVersionInfo
RIMain	RiaMain
RIStdInclude	RiaStdInclude
p4#: 21067
2013-03-22 16:12:00 +01:00
Jacob Støren
6d24c6b541 Renamed files corresponding to the already renamed statistics related classes
p4#: 21060
2013-03-22 14:24:41 +01:00
Jacob Støren
9da6b0a10b Results Storage: Fixed the Previous build error by moving the RigStatistics class.
Cleaned up a bit in the ApplicationCode/CMakeList.txt
p4#: 20946
2013-03-18 14:51:31 +01:00
Magne Sjaastad
62e4cac4b0 Added inherited object of MimeData to carry model index list
p4#: 20926
2013-03-18 11:40:39 +01:00
Jacob Støren
e0688008ca Added a multi case import dialog
p4#: 20758
2013-03-05 13:26:28 +01:00
Magne Sjaastad
0dc492da75 Added casecollection in grid case group
p4#: 20602
2013-02-21 15:37:51 +01:00
Magne Sjaastad
4a3bde5baa Moved statistical cases into statistics case collection
p4#: 20599
2013-02-21 12:00:49 +01:00
Magne Sjaastad
b6abc0c6ea Added CMakeLists_files.cmake in FileInterface folder
p4#: 20590
2013-02-21 08:46:09 +01:00
Magne Sjaastad
67cab9448e Added statistical calculation framework
p4#: 20521
2013-02-14 15:27:35 +01:00
Magne Sjaastad
3490d07dd1 Added IdenticalGridCaseGroup, now displayed in tree view
p4#: 20518
2013-02-14 14:30:01 +01:00
Magne Sjaastad
b8e663da03 Added list of files in CMakeLists_files.cmake
Do not use precompiled headers for ReservoirDataModel files
p4#: 20506
2013-02-13 14:50:37 +01:00
Magne Sjaastad
a09dba2670 File rename from RigReservoir to RigEclipseCase
p4#: 20503
2013-02-13 13:33:35 +01:00
Magne Sjaastad
8fd8a31aec Added RigActiveCellInfo
Started refactoring aiming for extracting all active cell information into RigActiveCellInfo.
p4#: 20445
2013-02-11 15:12:53 +01:00
Jacob Støren
0c437a0121 Added a regression test system to ResInsight.
Based on image comparison. Command line invocation.
p4#: 20433
2013-02-08 17:04:35 +01:00
Magne Sjaastad
01f3fb8e94 Moved result interface from struct grid to struct grid scalar data access
Use this concept to configure result data values to use for vizualization. Created data access object for RegGrid.
p4#: 20334
2013-02-01 12:25:34 +01:00
Jacob Støren
b33dd15372 Ert: Updated to 3f8166c4739fdfe654d3992920a36bf0a6981b4d
Had to remove a krsj.txt file that caused trouble (again)
p4#: 20320
2013-01-31 15:55:49 +01:00
Magne Sjaastad
2cf0e32d4b Updated ERT to GIT version a39d4b4a9e597532b2dbf845751a70ffe1de3805
p4#: 20194
2013-01-18 08:53:37 +01:00
Jacob Støren
c74619e79a Fixed cmakelist for Reservoirdatamodel test project
p4#: 20190
2013-01-17 21:26:12 +01:00
Magne Sjaastad
04006370ac Added ERT as source code based on https://github.com/Ensembles/ert/ and commit 7b53b5f61f5b47e8169b72098b562071df394bc3
This is SVN commit 4117
Updated ResInsight cmakelists to build ERT and link directly
Removed precompiled ERT binaries
p4#: 20183
2013-01-17 13:33:59 +01: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
Joakim Hove
c002720509 Added CACHE settings to the ERT_ROOT_PATH variable 2012-09-22 15:59:15 +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
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
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
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
282e6b9115 Minor typo 2012-09-09 12:11:38 +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
Ivar Ursin Nikolaisen
94d00b4870 Replace tabs with spaces in conformance with style 2012-08-31 13:16:47 +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
unknown
2c9695e594 Updated to version 0.8.0 2012-06-26 16:10:41 +02:00
Alf B. Rustad
dfe97efb1b Initial commit of ResInsight version 0.4.8 2012-05-18 09:45:23 +02:00