Commit Graph

731 Commits

Author SHA1 Message Date
Magne Sjaastad
39dc1421c4 Fault visibility : Restructured code 2014-08-14 10:56:08 +02:00
Magne Sjaastad
79fbe65686 Fault result: Moved fault result up one level in tree view 2014-08-14 10:56:06 +02:00
Magne Sjaastad
b2f80c7ef9 Fault result : Use checkbox to enable custom fault visualization
When checkbox is disabled, faults are visualized using current cell
visualization. When checkbox is activated, fault colors or custom fault
result is active
2014-08-14 10:56:05 +02:00
Magne Sjaastad
09f7868eb5 Preferences : Updated default values 2014-08-14 10:56:04 +02:00
Magne Sjaastad
51d4bd6023 Fault result : Moved config from FaultCollection to FaultResultSettings 2014-08-14 10:56:03 +02:00
Magne Sjaastad
cdbc5829ab Fault result : Renamed file and improved interface 2014-08-14 10:56:01 +02:00
Magne Sjaastad
11967c5161 Preferences : Added support for pdm objects recursively 2014-08-14 10:55:59 +02:00
Magne Sjaastad
0d14436b97 Fault result: Added fault result legend 2014-08-14 10:55:59 +02:00
Magne Sjaastad
710b9392ec Fault result: Added custom result to fault result project model 2014-08-14 10:55:58 +02:00
Magne Sjaastad
032a263685 Performance: Control how much data to import from file
User can control if faults, NNCs and simulation wells are to be imported
from file.
2014-08-14 10:55:56 +02:00
Magne Sjaastad
f259f21b32 Renamed file to match class name for RimReservoirCellResultStorage 2014-08-14 10:55:51 +02:00
Magne Sjaastad
d21e532c61 Cleaned up includes for ProjectDataModel 2014-08-14 10:55:49 +02:00
Magne Sjaastad
31274dbb00 Aggregated common Octave argument list 2014-08-14 10:55:47 +02:00
Magne Sjaastad
329ec921e8 Preferences : Control if info text from Octave is displayed before executing scripts 2014-08-14 10:55:46 +02:00
Magne Sjaastad
f68aa1908d Show help message if positional parameters is present 2014-06-05 07:34:34 +02:00
Magne Sjaastad
e5712e9809 Cleanup after merge 2014-04-22 14:39:09 +02:00
Magne Sjaastad
e5248683f0 Added block write to socket tools 2014-04-22 13:17:43 +02:00
Magne Sjaastad
7a07b2926e Added flag to control how to do IO with sockets 2014-04-22 13:17:42 +02:00
Magne Sjaastad
7b68c3cb6b Fix after merge conflicts take two 2014-04-14 10:24:15 +02:00
Magne Sjaastad
ce33c00219 Files fixed after merge conflicts 2014-04-14 09:25:27 +02:00
Magne Sjaastad
039ba48bed Added block write to socket tools 2014-04-14 09:18:21 +02:00
Magne Sjaastad
3ec22a9221 Added flag to control how to do IO with sockets 2014-04-14 09:18:20 +02:00
Magne Sjaastad
ae9f72912e Added customized mock model to user interface 2014-04-14 09:16:03 +02:00
Magne Sjaastad
3e8a206f13 Moved mock model identicators to RimDefines 2014-04-14 09:06:46 +02:00
Magne Sjaastad
4ab5e28cf7 Added block write to socket tools 2014-04-01 15:31:13 +02:00
Magne Sjaastad
af6d92d64e Added flag to control how to do IO with sockets 2014-04-01 13:02:52 +02:00
Magne Sjaastad
dc040d673a RegressionTest: Improved application configuration
Disable read of faults (preferences)
Disable faults outside filters
Enable result mapping on faults
2014-01-23 13:17:49 +01:00
Magne Sjaastad
e0b093d78d Replace space with underline in snapshot generated filenames 2014-01-23 09:25:22 +01:00
Magne Sjaastad
183203344b Option: Read fault data 2014-01-02 15:10:33 +01:00
Magne Sjaastad
de7dddc25e Add a folder to global path for Octave environment on Windows 2014-01-02 14:31:10 +01:00
Magne Sjaastad
8abfbd3730 Faults: Hide labels by default, set fault collection selected 2013-12-20 14:34:38 +01:00
Magne Sjaastad
b7141dde50 Preferences: Read faults on import and fault default visibility 2013-12-20 08:48:54 +01:00
Magne Sjaastad
d165d6ce38 Fixed rename on Linux 2013-12-19 11:07:33 +01:00
Magne Sjaastad
f13f91d74d Show updated help text from menu Help -> Command line help 2013-12-19 10:45:15 +01:00
sigurdp
f0c0df2efa Cleaned op help text for command line options.
Also semoved old argument arsing implementation
2013-12-19 10:07:19 +01:00
sigurdp
368af75bf2 Refactored ProgramOptions class 2013-12-04 14:56:04 +01: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
93ba02c7db Added customized mock model to user interface 2013-10-28 10:32:24 +01:00
Magne Sjaastad
797e9df01d Moved mock model identicators to RimDefines 2013-10-28 07:30:00 +01:00
Magne Sjaastad
7318780122 Renamed label in Regression Test dialog
Updated doc for regression test and new dialog image
2013-10-24 13:40:29 +02:00
Magne Sjaastad
e2663d7db6 Removed obsolete command line parameter 2013-10-21 14:41:42 +02:00
Jacob Støren
9eb4b19384 Use the improved Ceetron Navigation 2013-10-20 00:42:14 +02:00
Magne Sjaastad
74f6b544ce Renaming related to import actions 2013-10-18 16:23:31 +02:00
Magne Sjaastad
3f7bdbb5ec Use filename from file containing the grid as InputCase case description. Fixed Input Case Mock model. 2013-10-08 14:30:42 +02:00
Magne Sjaastad
08b970d084 Normalize line endings 2013-10-07 09:07:27 +02:00
Magne Sjaastad
cf439fbf96 RegressionTest: Fixes to regression testing system to make it run
correctly on Ubuntu 12.04 - fixed size of grabbed image. Side effect is
that the default window size for ResInsight is increased slightly.
Removed parameter to image comparison tool to allow running regression
tests on RedHat 5
2013-10-04 10:22:17 +02:00
Magne Sjaastad
483b1a0fd9 RegressionTests: Open HTML report in browser 2013-10-04 08:11:22 +02:00
Jacob Støren
77285785fb Default file open dir on linux set to cwd 2013-10-01 12:04:36 +02:00
Jacob Støren
a8f9851896 Well Label Color: Preferences for new views and color setting on well
collection.
2013-10-01 11:13:23 +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
Jacob Støren
3f2fb1aadc Fixed Empty Environment Bug for Subprocesses
QProcessEnvironment was used wrong
2013-09-26 15:34:40 +02:00
Magne Sjaastad
5e6af679ba Changed project file extension to RSP 2013-09-25 09:36:01 +02:00
Magne Sjaastad
91adbe79bf Added support for asyncronous commands
Implemented command to issue a recompute of statistics for a statistics case on project loading
p4#: 22417
2013-09-16 07:42:30 +02:00
Jacob Støren
39178578de Octave Interface: Setting LD_LIBRARY_PATH on the octave process to make the oct files find the (possibly) embedded Qt libraries
This should be the final adjustment to get rid of the resinsight startupscript
p4#: 22415
2013-09-15 10:53:36 +02:00
Magne Sjaastad
4329d6de0f Process events to make active view set before executing Octave scripts
p4#: 22404
2013-09-13 11:01:29 +02:00
Magne Sjaastad
92408c7ec8 Make sure onProjectOpenedOrClosed() to set active view as Octave scripts depend on active view
p4#: 22403
2013-09-13 10:43:25 +02:00
Magne Sjaastad
74b6b858d3 Use a mutex to make sure all command objects have completed before issuing snapshots in the regression tests.
p4#: 22400
2013-09-13 09:23:33 +02:00
Magne Sjaastad
1c2e2f86c5 Restore window layout when regression tests have completed
p4#: 22390
2013-09-12 09:07:29 +02:00
Magne Sjaastad
5cfd4bfe01 Only set preferences variables affecting the production of snapshots
p4#: 22389
2013-09-12 08:56:38 +02:00
Magne Sjaastad
c3adfb7cb0 Prototyped command object infrastructure to be used in regression tests of Octave scripts
p4#: 22387
2013-09-12 08:11:56 +02:00
Jacob Støren
f0ddf37301 Started to use Update-display-model-And-Redraw scheduling system.
First mainly for object toggle fields on well related objects, to avoid recreating the displaymode for each object toggeled by a multiselect command.
p4#: 22355
2013-09-08 22:59:46 +02:00
Magne Sjaastad
f9112c458c Store username/password in session cache
Compute UTM region before import wizard is displayed
p4#: 22351
2013-09-08 10:53:25 +02:00
Jacob Støren
bb2af8269e Sceduled Update-display-model-And-Redraw system
p4#: 22343
2013-09-07 10:27:22 +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
Jacob Støren
094d4dc6c4 Made "Ceetron Navigation" the default navigation type
p4#: 22000
2013-06-26 09:01:43 +02:00
Jacob Støren
fa410ba8a5 Fixed Animation Control problem on project open
TP#4088
p4#: 21934
2013-06-14 13:53:52 +02:00
Jacob Støren
03ad142261 Removed debug output
p4#: 21887
2013-06-12 10:52:46 +02:00
Jacob Støren
6ac8c4365f Project tree: Fixed several issues after the reconfiguration
Missing Icon and text on the Grid Models folder
New cases and Grid Case Groups ended up outside the Grid Model Folder
Old Project files did not show up properly
p4#: 21854
2013-06-07 14:54:02 +02:00
Vidar Lundberg
6340c4a4a8 Established new PDM structure with RimProject owning RimOilFields owning RimAnalysisModels.
Moved wellPathCollection into new class RimOilFields.
Moved cases (previously called reservoirs) and caseGroups from RimProject into new class RimAnalysisGroups.
Added support for old project files, move cases and caseGroups from RimProject to RimAnalysisModels. (Do not handle WellPaths for old project files in a similar way, since almost no users have used this functionality yet.)
p4#: 21846
2013-06-06 15:07:31 +02:00
Magne Sjaastad
ada9819870 Added ssihubInterface library and framework files
p4#: 21763
2013-05-29 12:59:08 +02:00
Magne Sjaastad
fa161607a1 Added context menu used to execute a script for multiple cases
For all selected cases, set current case and launch an external Octave process using this current case
p4#: 21742
2013-05-27 15:38:03 +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
Jacob Støren
cad25bcd59 Caf:PdmUiTree: Rewrote rebuildUiSubTree to become updateUiSubTree
Now the UI state is preserved when refreshing the tree, making it suitable
to use this method more extensively. This paves the way to make changes to the Pdm data structure without considering the ui at all, until a  call to updateUiSubTree gets the ui gracefully into sync.
p4#: 21599
2013-05-13 12:00:52 +02:00
Magne Sjaastad
eecd069b0a Introduced caseId to RimCase. Project keeps track of largest used ID, and is responsible for assigning ID to cases.
p4#: 21576
2013-05-08 10:41:56 +02:00
Jacob Støren
cf664210bf Major cleanup/change in the way things are included.
Needs a Linux compile check.
p4#: 21545
2013-05-06 10:55:00 +02:00
Magne Sjaastad
8ef10316d8 Make sure grabbed buffer is GL_FRONT
p4#: 21534
2013-05-03 10:07:53 +02:00
Jacob Støren
60f86cfc3f Result Selection: Result is not changed before user actively selects in the list.
Changig type or porosity model only changes what variables are shown as accessible.
This is also applied to property filters.
Dual porosity support is also added to property filtered. Forgotten before.
p4#: 21499
2013-04-30 13:41:53 +02:00
Magne Sjaastad
37ff2b2b73 When loading a project, also read source cases from a grid case group with one or more attached view(s)
p4#: 21467
2013-04-29 11:07:57 +02:00
Magne Sjaastad
b00f455e94 Select statistics case after creating a grid case group
p4#: 21464
2013-04-26 19:19:33 +02:00
Magne Sjaastad
b3c30c1b21 Added support for setting multiple script directories
p4#: 21393
2013-04-24 07:35:31 +02:00
Magne Sjaastad
de5542976c Avoid to rebuild the complete project tree view when importing a grid case group
Set cell results as current item in tree view when importing a case
p4#: 21368
2013-04-23 08:11:52 +02:00
Magne Sjaastad
8c28e8ff6c Create UI tree items and insert in parent when opening new cases from file. Avoid building the complete tree using onProjectOpenedOrClosed()
p4#: 21357
2013-04-22 11:54:41 +02:00
Magne Sjaastad
b5b9a736e2 As creation of a font is time consuming, create one application font instance
p4#: 21338
2013-04-19 08:02:36 +02:00
Jacob Støren
d65ce7957b Added viewer background color to preferences
p4#: 21284
2013-04-15 13:13:41 +02:00
Jacob Støren
337e0c3226 Added mesh color as preference, and resetting of preferences before doing regression tests
p4#: 21263
2013-04-12 13:15:41 +02:00
Magne Sjaastad
48d2a6c598 Use model index at drop position when asking user for confirm of drop event causing statistics to be deleted
p4#: 21242
2013-04-11 12:06:38 +02:00
Magne Sjaastad
de56495c13 Always select SOIL as default result
p4#: 21219
2013-04-10 11:21:41 +02:00
Jacob Støren
09810bf586 Fixed error in path update logic
p4#: 21209
2013-04-09 15:38:37 +02:00
Magne Sjaastad
bd563df02e Use setter instead of overloaded constructor
p4#: 21177
2013-04-08 14:29:43 +02:00
Jacob Støren
fd67c9dc18 Statistics ui: Replaced status and unlock button with a Calculate/Edit button.
Made Summary description complete and more compact
p4#: 21176
2013-04-08 14:17:39 +02:00
Jacob Støren
1c65fe7e2c Statistics case User interface and behaviour working.
p4#: 21171
2013-04-08 12:16:38 +02:00
Magne Sjaastad
64899f62c2 Detect when project path has changed, and do a explicit update of file path for RimCases.
Do not use initAfterRead
p4#: 21165
2013-04-08 12:01:40 +02:00
Magne Sjaastad
b9ed45af2c If project is moved on disk, execute initAfterRead() to propagate project file name changes to underlying objects
p4#: 21159
2013-04-08 08:36:34 +02:00
Magne Sjaastad
95d1c98bee Read grid dimensions and verify equality before adding a result case
Harmonized and refactored creation of RimResultCases
p4#: 21156
2013-04-07 17:27:45 +02: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
c8da0f4179 Aligning prefix of class names with standard:
RICursors		RiuCursors
RIMainWindow	RiuMainWindow
RIPreferencesDialog	RiuPreferencesDialog
RIProcessMonitor	RiuProcessMonitor
RIResultInfoPanel	RiuResultInfoPanel
RIViewer		RiuViewer
p4#: 21071
2013-03-22 17:17:56 +01:00
Jacob Støren
f0174a02fa More file renaming:
RigEclipseCase		RigCaseData
RigReservoirCellResults	RigCaseCellResultsData
RigWellResults		RigSingleWellResultsData
RigGridCollection	RigGridManager
p4#: 21070
2013-03-22 16:58:44 +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
949084784e More class renaming. File names not done yet.
RIApplication	RiaApplication
RIPreferences	RiaPreferences
p4#: 21065
2013-03-22 15:50:44 +01:00
Jacob Støren
e493db37d0 Major renaming of classes. Filenames not done yet.
RimReservoir		RimCase
RimResultReservoir	RimResultCase
RimInputReservoir	RimInputCase
RigEclipseCase		RigCaseData
RigReservoirCellResults	RigCaseCellResultsData
RigWellResults		RigSingleWellResultsData
RigGridCollection	RigGridManager
p4#: 21064
2013-03-22 15:43:42 +01:00
Magne Sjaastad
d1cc482355 Use same collection type for source cases and statistics cases in RimIdenticalGridCaseGroup
p4#: 21053
2013-03-22 11:47:46 +01:00
Magne Sjaastad
6c8d5ff631 Rename of statistics related classes and method names
p4#: 21047
2013-03-22 10:03:51 +01:00
Jacob Støren
326cd79754 Result Storage: Finally things have come together, and seems to behave.
Refactored the loadProject system to make loading of statistical cases work as they should.
Got the update of references regarding grid and unionActive cells work
Introduced a bool to keep track of what cell results to store.
Introduced a clear method in ActiveCellInfo.
Renamed a bit
p4#: 21036
2013-03-21 15:31:47 +01:00
Jacob Støren
92bd95d683 Added explicit load of data for StatisticsCases.
Still trouble but this removed one obstacle
p4#: 21014
2013-03-20 16:35:36 +01:00
Magne Sjaastad
469c5a9657 Added initAfterRead for case group
p4#: 20904
2013-03-14 09:28:49 +01:00
Jacob Støren
aab18ba0a0 Set root as default start directory for grid case group import
p4#: 20811
2013-03-07 12:25:27 +01:00
Jacob Støren
fcdf14c0fa Improved progress information when reading large projects
p4#: 20803
2013-03-07 09:43:25 +01:00
Magne Sjaastad
e94264a39f Added support for building of metadata from existing time steps
Improved statistics calculation for opening single time step files
Close all dynamic access files when a time step statistics is complete
p4#: 20756
2013-03-05 13:10:26 +01:00
Magne Sjaastad
3dbc8a9d57 Improved multi case initial reading
When creating a multi case group from multiple files, read grid from first file.
The main grid from the first case is reused for the other cases.
NOTE: Metadata and well information is not read for the other cases
p4#: 20655
2013-02-27 15:27:33 +01:00
Magne Sjaastad
f00152823f Consolidated cache data computations
Removed automatic insertion of grids into identical grid groups
p4#: 20607
2013-02-22 10:12:06 +01:00
Magne Sjaastad
49236839a3 Added menu item for multiple case import
Find EGRID files recursively in subfolders
p4#: 20603
2013-02-21 16:46:34 +01:00
Magne Sjaastad
a09dba2670 File rename from RigReservoir to RigEclipseCase
p4#: 20503
2013-02-13 13:33:35 +01:00
Magne Sjaastad
ec8817e207 Renamed RigReservoir to RigEclipseCase
p4#: 20500
2013-02-13 13:24:39 +01:00
Magne Sjaastad
e343dc73b4 Added hide all dockwidgets, used before executing regression tests
p4#: 20442
2013-02-11 11:47:45 +01:00
Jacob Støren
4155bd821f Regression test help text now uses the names in the RegTestNames namespace
p4#: 20441
2013-02-11 11:29:55 +01:00
Jacob Støren
cdd5997f76 Updated regressiontest help text
p4#: 20435
2013-02-08 17:15:29 +01:00
Jacob Støren
9b00d3ce9f Linnux compile fixes
p4#: 20434
2013-02-08 17:08:37 +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
4f44afdac1 Added command line parameter to save snapshots for all views. Closes down the application after writing images to file.
p4#: 20390
2013-02-06 13:23:46 +01:00
Magne Sjaastad
7648a63f02 Added functions used to create 2D images from 3D views
p4#: 20385
2013-02-06 11:43:26 +01:00
Magne Sjaastad
ddc555d590 Compute DEPTH, DX, DY, DZ, TOP and BOTTOM if not present. Added flag in Preferences to control if ResInsight automatically computes these values. Improved statistical computations by skipping HUGE_VAL.
p4#: 19287
2012-10-24 10:52:44 +02:00
CeetronResInsight
59afd98167 Added missing initialization
p4#: 19276
2012-10-23 13:36:48 +02:00
Jacob Støren
875d7b7d12 Resinsight: Made Home path the default path for file dialog browsing, and added remembering of the last opened path.
Added -startdir command line argument to override the default file browse path
p4#: 19263
2012-10-23 09:59:57 +02:00
Magne Sjaastad
618fdb1377 Debug info box in 3D view set to default off
p4#: 19261
2012-10-23 08:27:49 +02:00
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
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
27d8808c5c Version 0.8.6 2012-08-31 19:12:47 +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