OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity
1,110 Commits 27 Branches 61 Tags 309 MiB
04ccadd2f1
Commit Graph

737 Commits

Author SHA1 Message Date
Magne Sjaastad
ee4e6aeed4 Use data access object for access to data structures in ResInsight 
p4#: 22144
 2013-08-12 10:04:30 +02:00
Magne Sjaastad
ff45f6885e Simplified file selection filter for well path import 
p4#: 22142
 2013-08-08 17:23:31 +02:00
Magne Sjaastad
562dfb0135 Do not show well cells when wells are turned off 
Renaming
p4#: 22141
 2013-08-08 17:15:17 +02:00
Magne Sjaastad
e747804ef4 Well head arrow is starting at well cell located at top of the K column the well head exists in. 
This way all well heads are visible all the time, even when inactive cells are visible
p4#: 22140
 2013-08-08 17:03:17 +02:00
Magne Sjaastad
a8b7662d2f Rename 
p4#: 22138
 2013-08-08 15:19:16 +02:00
Magne Sjaastad
8f4e6da98b Include well cells in cell range region evaluation 
p4#: 22131
 2013-08-08 11:26:00 +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
ffb3d3e235 Rebuild inactive geometry when invalid state changes 
Show inactive/invalid cells also when using property filter, relevant for exclude filters
p4#: 22124
 2013-08-08 08:57:23 +02:00
Magne Sjaastad
008842a1ee Renamed cell filter field from active to isActive 
Removed the special handling of range filters when only exclude filters are active
p4#: 22123
 2013-08-08 08:49:29 +02:00
Magne Sjaastad
fea95940bf Fixed missing min/max value range for property filters when loading from project file 
p4#: 22105
 2013-08-07 09:00:09 +02:00
Magne Sjaastad
9910480538 Added *.dev and *.* to file filter for well path import 
p4#: 22099
 2013-08-06 11:56:07 +02:00
Magne Sjaastad
3f61c26f0b Updated file paths in regression tests 
p4#: 22097
 2013-08-06 09:52:01 +02:00
Magne Sjaastad
f2be4dedaf Fix for range filter exclude behaviour 
Use active cells as range include filter when there are range exclude filters present and no include filters
p4#: 22095
 2013-08-05 12:48:11 +02:00
Magne Sjaastad
ffbb0b6a46 Use a special flag to indicate hidden children of a field. 
Added new method in PdmUiItem called isUiHideChildren()
p4#: 22093
 2013-08-02 13:49:16 +02:00
Magne Sjaastad
50777b3e3f Fixed issue related to missing legend config 
Must hide legend config collection. Revisit when a more robust tree building strategy is in place.
p4#: 22092
 2013-08-02 13:04:25 +02:00
Jacob Støren
7112589e33 Statistics calculation : Paralellized and avoided some memory reallocation 
p4#: 22012
 2013-06-27 00:45:50 +02:00
Jacob Støren
4f7b3e703c Fixed Memory bug regarding statistics calcualtion 
The results memory on each timestep was not freed resulting in all the data from all the cases for all timesteps in memory at the same time ...
In addition, the data was read accidentaly before the timeloop for all the source cases for all timesteps.
So, should perform better now, but there still are some memory allocated in the start, that i cant quite account for.
p4#: 22011
 2013-06-26 23:34:03 +02:00
Jacob Støren
cff0437343 Some comments and indentation 
p4#: 22010
 2013-06-26 23:26:01 +02:00
Magne Sjaastad
390abe0f81 Use compare() because endsWith() does not work as expected on Windows 
p4#: 22005
 2013-06-26 12:01:53 +02:00
Jacob Støren
b5688c5cd9 Hack: Well label now rendered "under" transparent cells to workaround random behaviour (on certain hw ?) 
p4#: 22004
 2013-06-26 10:30:48 +02:00
Jacob Støren
524e8d8375 Added a left margin in the property window. 
p4#: 22002
 2013-06-26 09:02:37 +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
4be58edf78 MSW code reverted. Regrettfully the work has to be reconsidered. 
Both ERT and the resinsight code is rolled back to before MSW was introduced as refined.
p4#: 21999
 2013-06-25 15:53:19 +02:00
Jacob Støren
172c2d8b21 Fixed context menu blocking Ceetron navigation on linux. 
p4#: 21981
 2013-06-24 22:23:33 +02:00
Jacob Støren
1ea5a49471 WellPaths: Added support for mulitple paths in one ascii file. 
p4#: 21980
 2013-06-24 22:04:52 +02:00
Magne Sjaastad
636fd39c2f Use branch ID to identify a branch on import 
p4#: 21979
 2013-06-24 16:41:01 +02:00
Jacob Støren
b59ac41509 Test of fix of MSW assert 
p4#: 21978
 2013-06-24 15:15:46 +02:00
Magne Sjaastad
5ea531783a Missed file in last checkin 
p4#: 21975
 2013-06-24 14:07:49 +02:00
Magne Sjaastad
f02d4b160e Use branch index and branch cell index to identify branch head 
Removed obsolete code
p4#: 21974
 2013-06-24 14:02:01 +02:00
Magne Sjaastad
12a0040473 Added well branch number and segment number to result info view 
p4#: 21968
 2013-06-21 16:20:11 +02:00
Jacob Støren
cd6d60d896 Ascii Well path import: Works for one path in one file 
p4#: 21966
 2013-06-21 15:59:04 +02:00
CeetronResInsight
139c80dfa0 Fixed missing newline at end of file 
p4#: 21958
 2013-06-18 13:26:38 +02:00
Magne Sjaastad
c8a537e180 Check for valid index before accessing data 
p4#: 21957
 2013-06-18 12:55:49 +02:00
Jacob Støren
5db88f4e03 Ascii import of Well Paths 
p4#: 21956
 2013-06-18 11:56:51 +02:00
Magne Sjaastad
2a2102837a Fixed missing last coordinate for filetered coords 
p4#: 21955
 2013-06-18 11:26:52 +02:00
Magne Sjaastad
16cd7a04ae Multi Segment Wells: Read in connection between a well branch and the branch head. 
Compute intersection point between branch top well cell and branch head in the main branch.
p4#: 21954
 2013-06-18 09:41:02 +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
29afd9cc8a Cleaned up a bit 
p4#: 21924
 2013-06-14 12:08:05 +02:00
Jacob Støren
edcba5a471 Animation (and other commands) refreshed on selection in the tree view 
p4#: 21923
 2013-06-14 11:59:56 +02:00
Magne Sjaastad
7a24b2664e Updated ERT to handle multi segment wells 
Updated input code in ResInsight accordingly

ERT version on GitHub
067fa99faa
p4#: 21920
 2013-06-13 22:12:02 +02:00
Jacob Støren
6f04f70ade Fixed missing update of the 3D view after deleting statistic results 
p4#: 21894
 2013-06-12 13:42:36 +02:00
Jacob Støren
03ad142261 Removed debug output 
p4#: 21887
 2013-06-12 10:52:46 +02:00
Jacob Støren
a9d2baf117 Project/OilField: Made sure one and always one oilfield exists in a project. 
p4#: 21884
 2013-06-12 09:36:50 +02:00
Magne Sjaastad
12f1400733 Added missing Qt dependencies 
p4#: 21882
 2013-06-12 09:10:42 +02:00
Magne Sjaastad
68edafe5f4 Added checkbox to control import of survey and plan 
p4#: 21863
 2013-06-10 10:10:56 +02:00
Jacob Støren
a2aa9f3e7d Grid Models: Used the "Cases" icon 
p4#: 21855
 2013-06-07 15:01:47 +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
Jacob Støren
080fc4c094 Fixed some compiler warnings. 
p4#: 21853
 2013-06-07 14:15:13 +02:00
Vidar Lundberg
5cd4b13716 Add temporary icon for Grid Models in PDM, should create proper icon later. 
p4#: 21850
 2013-06-07 09:32:32 +02:00
Vidar Lundberg
cd08fc0356 Add temporary icon for Grid Models in PDM, should create proper icon later. 
p4#: 21850
 2013-06-07 09:32:06 +02:00
Vidar Lundberg
c3cd40d7eb Minor changes, changed logging to standard output when switching frame, e.g. fixed so that current frame number is shown correctly. 
p4#: 21848
 2013-06-06 16:37:35 +02:00
Vidar Lundberg
ceb5dd8470 Minor changes, adjusted so that well paths become thinner and clip well paths only 100 meters above reservoir. 
p4#: 21847
 2013-06-06 16:36:37 +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
Vidar Lundberg
691f24e7a7 Added include files because of known include problems related to PDM. 
p4#: 21845
 2013-06-06 15:02:35 +02:00
Magne Sjaastad
ec98af4354 Extract well path links from reply from request wells. 
Major code refactoring and cleanup
p4#: 21833
 2013-06-06 08:38:43 +02:00
Magne Sjaastad
1c02a392cd Hide characters from password field 
p4#: 21827
 2013-06-04 14:22:45 +02:00
Magne Sjaastad
0021e2f861 Improved logarithmic color legends for zero and negative values 
p4#: 21804
 2013-06-03 13:08:11 +02:00
Jacob Støren
1d3d13c927 Icons: New App icon based on picture sent from Statoil 
Scaled vertically a bit to work better as an icon.
Still using the old AppIcon as Case Icon, and updated the InputCase icon to match the Case Icon.
p4#: 21793
 2013-06-01 01:29:05 +02:00
Magne Sjaastad
724d283565 Added prototype of UTM area filtering 
p4#: 21788
 2013-05-31 15:37:52 +02:00
Magne Sjaastad
d371c58772 Missing include on Linux 
p4#: 21778
 2013-05-31 14:02:48 +02:00
Magne Sjaastad
ea4491e987 Added framework used to handle utm area of interest 
p4#: 21775
 2013-05-31 13:57:16 +02:00
Magne Sjaastad
ead2eac08b Read and display name when reading well paths 
p4#: 21770
 2013-05-31 08:47:03 +02:00
Magne Sjaastad
261301ad4a Added ssihub test application 
Improved ssihub dialog and tested authentication
p4#: 21768
 2013-05-30 15:33:12 +02:00
Magne Sjaastad
73f1b4052b Fix invalid case 
p4#: 21765
 2013-05-29 14:51:34 +02:00
Magne Sjaastad
5e3bb1f6a9 Added Qt example HttpWindow for network access 
Added import of well paths to File->Import
p4#: 21764
 2013-05-29 14:49:04 +02:00
Magne Sjaastad
ada9819870 Added ssihubInterface library and framework files 
p4#: 21763
 2013-05-29 12:59:08 +02:00
Magne Sjaastad
1519ad0ad1 Fix for correct handling of pending socket connection requests 
p4#: 21759
 2013-05-29 10:07:35 +02:00
Magne Sjaastad
389247c17e Read command header in interpretCommand() 
p4#: 21756
 2013-05-28 16:02:00 +02:00
Magne Sjaastad
408795c0fc Test for ijk dimention match before reading data 
Whitespace fixup
p4#: 21749
 2013-05-28 11:11:32 +02:00
Magne Sjaastad
5bca9b28c1 Added riSetGridProperty 
Some known issues related to parsing of the Octave arguments
p4#: 21747
 2013-05-28 10:43:32 +02:00
Magne Sjaastad
1cfdb0ddb1 Write all double values in one go. Fixed argument parsing. 
p4#: 21746
 2013-05-28 09:20:09 +02:00
Magne Sjaastad
a7c49c0a31 Use ECLIPSE corner ordering 
p4#: 21743
 2013-05-27 15:38:33 +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
Jacob Støren
fe8c155b44 Octave interface: Compiling complete, but completely untested GetGridProperty. 
p4#: 21740
 2013-05-27 12:22:05 +02:00
Magne Sjaastad
2afca2bd5d Added current case to socket server. 
Fixed includes on Windows
p4#: 21725
 2013-05-26 21:55:05 +02:00
Jacob Støren
fbc02e79b0 Octave Interface: SetActiveCellProperty: Prettifying 
p4#: 21724
 2013-05-26 12:16:32 +02:00
Jacob Støren
1aa8857f4d Octave interface: SetActiveCellProperty: Now working according to spec. 
Not tested for Coarce Cells yet.
p4#: 21723
 2013-05-26 12:07:42 +02:00
Jacob Støren
f509e1803f Active CellInfo: Added concept of Cell Result Count 
p4#: 21721
 2013-05-26 11:59:59 +02:00
Jacob Støren
33bfb287d6 Octave Interface: Cleaned up code, and moved SetActiveCellProperties to the correct file 
p4#: 21716
 2013-05-24 12:02:52 +02:00
Jacob Støren
767c1d2409 Octave interface: Rebuilt the riSetActiveCellProperties command. 
Accept the new arguments, refactored to new framework, improved error handling.
Still needs to support specified timesteps and Grid Coarsening
p4#: 21713
 2013-05-24 11:36:59 +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
Magne Sjaastad
d9750b2dd4 Produce geometry for all cells, not per grid 
p4#: 21710
 2013-05-24 09:54:32 +02:00
Magne Sjaastad
5d2249aaea Produce geometry for all cells, not per grid 
p4#: 21710
 2013-05-24 09:54:00 +02:00
Magne Sjaastad
e5b1921bdf Reorganized data so ijk are the first three indexes in the receiving Octave arrays. 
Fixed a typo
p4#: 21708
 2013-05-24 08:48:36 +02:00
Magne Sjaastad
f556171bec Use read/write functions of the stream to increase performance 
p4#: 21699
 2013-05-23 11:55:33 +02:00
Magne Sjaastad
511ea74d4e Use read/write functions of the stream to increase performance 
p4#: 21698
 2013-05-23 11:29:34 +02:00
Magne Sjaastad
d5fd09f658 Added riGetCellCorners/riGetActiveCellCorners 
Updated how matrix is allocated in Octave for riGetCellCenters
p4#: 21697
 2013-05-23 11:02:10 +02:00
Magne Sjaastad
e4bc6c9339 Added riGetActiveCellCenters 
p4#: 21691
 2013-05-22 09:54:39 +02:00
Jacob Støren
90e61c254b Octave Interface: Rolled out use of common constant for DataStreamVersion 
p4#: 21689
 2013-05-22 09:18:57 +02:00
Magne Sjaastad
4b7ff209f6 Added getCellCenters 
p4#: 21688
 2013-05-22 08:11:39 +02:00
Magne Sjaastad
8a6234690c Added GetCoarseningInfo 
Added coarse cells to mock model with results
p4#: 21686
 2013-05-21 21:03:05 +02:00
Magne Sjaastad
9df895ddc7 FIxed missing return statement 
p4#: 21685
 2013-05-21 20:43:03 +02:00
Magne Sjaastad
1d2e1dcce1 Cleanup of includes 
p4#: 21684
 2013-05-21 15:27:42 +02:00
Jacob Støren
d947f68f83 Octave Interface: GetActiveCellProperty now handles coarsening 
p4#: 21683
 2013-05-21 14:35:47 +02:00
Jacob Støren
2009838b04 Octave: Updated GetActiveCellProperty to the new specification. 
Still missing handling of coarse grids
p4#: 21677
 2013-05-21 11:18:28 +02:00
Magne Sjaastad
eff924c630 Store coarsening boxes in RigGridBase 
Assign index to coarse cells back to coarse box they are a part of
p4#: 21675
 2013-05-21 11:10:59 +02:00
Magne Sjaastad
d6560d017e Added riGetGridDimensions 
p4#: 21664
 2013-05-16 15:16:51 +02:00
Magne Sjaastad
db18a855db Added GetTimeStepDays 
p4#: 21662
 2013-05-16 14:44:34 +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
Vidar Lundberg
704facc1c1 Added some includes to get well path changes to compile, this is related to PDM include problems. 
p4#: 21657
 2013-05-16 14:02:59 +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
Jacob Støren
bb0c4c37c1 SocketServer: Moved GetProperty command to new regime. 
p4#: 21654
 2013-05-16 13:29:38 +02:00
Vidar Lundberg
86a53980a4 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.
p4#: 21652
 2013-05-16 13:06:00 +02:00
Vidar Lundberg
939c6ad156 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.
p4#: 21651
 2013-05-16 12:59:35 +02:00
Vidar Lundberg
4a0c3d7ca9 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.
p4#: 21651
 2013-05-16 12:59:01 +02:00
Jacob Støren
6173381652 SocketServer: GetActiveCellInfo moved to new regime 
p4#: 21649
 2013-05-16 12:44:43 +02:00
Jacob Støren
a63b2caae5 SocketServer: Converted GetMainGridDims to new regime 
p4#: 21648
 2013-05-16 11:47:42 +02:00
Jacob Støren
db168909d7 Fixed Windows compile issue 
p4#: 21647
 2013-05-16 11:27:34 +02:00
Jacob Støren
36d7c46e57 Socket Server: Rolled in separate command handler classes created by factory. 
Translated several commands to the new regime.
p4#: 21645
 2013-05-16 11:15:34 +02:00
Vidar Lundberg
ac832866e6 Add Json parser based on code example found on: 
http://stackoverflow.com/questions/4169988/easiest-way-to-parse-json-in-qt-4-7
p4#: 21634
 2013-05-15 16:00:36 +02:00
Magne Sjaastad
6d8f6307f6 Find case based on caseId instead of case name/case index 
Updated calculateMatrixModelActiveCellInfo()  to include coarse box index and use 1-based index for IJK values
p4#: 21629
 2013-05-15 14:37:03 +02:00
Magne Sjaastad
97c3a330f6 Updated riGetSelectedCases to use a string as type name 
Improved how to get currently selected cases
p4#: 21625
 2013-05-15 12:03:36 +02:00
Magne Sjaastad
667a4e6995 Updated riGetCurrentCase with case type 
p4#: 21619
 2013-05-15 11:08:42 +02:00
Magne Sjaastad
b3a15268f6 Added riGetCases 
p4#: 21618
 2013-05-15 10:51:41 +02:00
Magne Sjaastad
22d45bc28f Added riGetSelectedCases based on currently selected cases in the main tree view 
p4#: 21604
 2013-05-13 22:32:01 +02:00
Magne Sjaastad
10b49efae9 Completed riGetCurrentCase 
p4#: 21603
 2013-05-13 21:41:45 +02:00
Magne Sjaastad
65710a8e08 Added riGetCaseGroups 
Added Qt DataStream version to riSettings
VisualStudio: Copy generated *.oct files into Application folder
VisualStudio: ResInsight is dependent on octave_plugin
p4#: 21602
 2013-05-13 21:15:38 +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
06d32ae97e Added groupId to case groups 
p4#: 21594
 2013-05-10 15:35:33 +02:00
Magne Sjaastad
b63306099e Added riGetCurrentCase used to get caseId from current rimCase in ResInsight 
p4#: 21593
 2013-05-10 14:43:03 +02:00
CeetronResInsight
cb1c276e01 Fixed missing include (only needed for RHEL6) 
p4#: 21591
 2013-05-10 11:10:41 +02:00
Jacob Støren
6784a8e596 Fixed Well pipe "peaks". The centerline filtering tolerance was too small. 
p4#: 21580
 2013-05-08 13:14:33 +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
Magne Sjaastad
269f66b0bd Removed obsolete function 
p4#: 21551
 2013-05-06 13:09:47 +02:00
Jacob Støren
5c0e55e7c1 Linux compile fixes 
p4#: 21550
 2013-05-06 12:02:32 +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
e83fe8a471 CellEdge : Added options to turn off specific directions 
p4#: 21510
 2013-04-30 15:55:12 +02:00
Magne Sjaastad
3ee26b20ea Fixed shader program 
p4#: 21506
 2013-04-30 15:07:38 +02:00
Jacob Støren
1db5d3f03d Set default WellPipe visibility mode to "Visible Cells Filtered" 
p4#: 21505
 2013-04-30 14:55:59 +02:00
Jacob Støren
be0a2ec728 Legend: Added tick number formatting control 
Auto, Fixed and Scientific. Fixed and Scientific respects the precision set.
p4#: 21504
 2013-04-30 14:48: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
445b6edfbd Fixed bug for missing result value during picking for static results 
p4#: 21498
 2013-04-30 13:34:49 +02:00
Magne Sjaastad
71187d5bbc Unit test for interpolation 
p4#: 21496
 2013-04-30 13:08:04 +02:00
Magne Sjaastad
6ef5205343 Added interpolation of observed values to statistics computation 
p4#: 21492
 2013-04-30 11:36:50 +02:00
CeetronResInsight
35759e081d Regression test: Fix for window size 
p4#: 21479
 2013-04-29 13:34:36 +02:00
Magne Sjaastad
ca856f7603 Updated ERT to 315ceeee250808ea6a6530233dd5125f9f76f06c 
Support of reading LGR dimensions
Close file handles between access to files, keep ERT file-related cache to speed up reading of many files multiple times
p4#: 21477
 2013-04-29 13:13:42 +02:00
Magne Sjaastad
fad4761bc4 Update well information when creating a 3D window on a case 
p4#: 21468
 2013-04-29 11:08:31 +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
9367a3cb65 Context menu and selection toggle actions 
Add toggle menu when all selected items are checkable
p4#: 21466
 2013-04-29 08:52:43 +02:00
Magne Sjaastad
3ef803af01 Check for NULL before using pointer 
p4#: 21465
 2013-04-29 08:32:59 +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
ab8dfb4aad In RimProject, encode/decode into a string the currentIndex from QTreeView. 
This will also make sure the active view is restored when opening a project
p4#: 21463
 2013-04-26 19:05:35 +02:00
Jacob Støren
3806ff9baf Well cell transparency: Turned off well cell transparency when no well pipe is visible. 
For results visulaization, cell edge and faults faces.
Not yet done for visualization without result colors.
p4#: 21462
 2013-04-26 16:46:38 +02:00
Magne Sjaastad
2e2212d7ea Add and delete of script directory from context menu 
p4#: 21461
 2013-04-26 16:17:36 +02:00
Magne Sjaastad
0b2e19926d Added updateUiIconFromState() in cafPdmUiItem to create disabled icons based on object state 
Use updateUiIconFromState() from collection objects
p4#: 21459
 2013-04-26 14:47:34 +02:00
Magne Sjaastad
4b8e30e649 Added flip X/Y-axis on RimCase, will invert the sign of coordinates for the given flip axis. 
p4#: 21453
 2013-04-26 13:19:34 +02:00
Magne Sjaastad
8ccd89d3d1 Added scale to toolbar 
p4#: 21452
 2013-04-26 11:49:37 +02:00
Jacob Støren
b14b138dae Range Filter: Added option to not propagate rangefilter onto the subgrids 
p4#: 21445
 2013-04-26 08:53:40 +02:00
Jacob Støren
4ca363cde5 Fixed bug: Missing well cells in lgr when range filtering 
p4#: 21442
 2013-04-25 14:56:46 +02:00
Magne Sjaastad
5c88935a88 Hide console window in release config on Windows 
p4#: 21433
 2013-04-25 12:00:58 +02:00
Magne Sjaastad
a5b3c233d2 Update icon state for well collection when toggled off 
p4#: 21430
 2013-04-25 11:09:34 +02:00
Magne Sjaastad
47eb6c7589 Added toggle state to property filter collection 
p4#: 21429
 2013-04-25 10:57:52 +02:00
Magne Sjaastad
7b2ec05383 Added toggle option for range filter collection 
p4#: 21428
 2013-04-25 10:48:44 +02:00
Magne Sjaastad
f730707448 Update animation toolbar when changing well data source case 
p4#: 21424
 2013-04-25 09:54:41 +02:00
Magne Sjaastad
8fc9d06edb Toggle on off visibility of wells in well collection 
p4#: 21419
 2013-04-25 09:07:29 +02:00
Magne Sjaastad
c0bfc9bbe1 Call display update once after setting toggle state for a selection of wells 
p4#: 21417
 2013-04-25 08:47:01 +02:00
Magne Sjaastad
884dd46551 Moved well label into well head group 
p4#: 21415
 2013-04-25 06:33:37 +02:00
Jacob Støren
10e6fbc5bd Range filter: Add grid type drop-down list to enable LGR-grid range filtering 
TP#3995
p4#: 21408
 2013-04-24 12:00:45 +02:00
Magne Sjaastad
4ad0a05822 Improved ordering and grouping of parameters for wells and well collection 
p4#: 21404
 2013-04-24 10:38:50 +02:00
Magne Sjaastad
586908b9be Refresh animation toolbar using createDisplayModelAndRedraw() 
p4#: 21394
 2013-04-24 07:57:31 +02:00
Magne Sjaastad
b3c30c1b21 Added support for setting multiple script directories 
p4#: 21393
 2013-04-24 07:35:31 +02:00
Magne Sjaastad
fc405f0fb8 Implemented copy of view using context menu and keyboard shortcuts 
p4#: 21377
 2013-04-23 11:24:54 +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
d3fa2d5af5 Added creation of IJK-slices from context menu in 3D scene. 
p4#: 21367
 2013-04-23 07:29:37 +02:00
Magne Sjaastad
0d4ad83f6b Fixed bug related to EGRID and INIT-file, no restart file 
p4#: 21364
 2013-04-22 14:51:47 +02:00
Magne Sjaastad
290f8d4e58 Removed obsolete code 
p4#: 21363
 2013-04-22 14:44:43 +02:00
Magne Sjaastad
b20be8ad25 Check if directory is readable before creating a script collection item 
p4#: 21362
 2013-04-22 14:37:33 +02:00
Magne Sjaastad
d825b0654c Check for valid pointer before accessing cell result data 
p4#: 21359
 2013-04-22 13:25:32 +02:00
Magne Sjaastad
ea45e6f072 Improved robustness in file reader 
p4#: 21358
 2013-04-22 13:24:49 +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
a326fac204 Renaming related to tree item root 
p4#: 21355
 2013-04-22 10:49:31 +02:00
Jacob Støren
d034717460 Removed unused code 
p4#: 21354
 2013-04-22 10:11:37 +02:00
Magne Sjaastad
79e7d3604c Expand up to root when creating a view. Removed use of expandAll() 
p4#: 21353
 2013-04-22 10:04:37 +02:00
Magne Sjaastad
a9e0554635 Use semicolon as string list separator. Fixed bug in tree view state parameter passing. 
p4#: 21350
 2013-04-22 09:20:57 +02:00
Jacob Støren
6cac031fff Added well pipe visibility filter based on cell visibility. 
Only show pipes with wells with open connections in visible cells
p4#: 21349
 2013-04-22 09:13:37 +02:00
Magne Sjaastad
638e82d24c Store tree view state in project file 
p4#: 21342
 2013-04-19 13:20:46 +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
Magne Sjaastad
fc84fce67f Hide active field from property view as this is now handled by checkbox in tree view 
p4#: 21337
 2013-04-19 07:50:49 +02:00
Magne Sjaastad
acbe59d9c1 Use showWindow as objectToggleField for reservoir views 
p4#: 21336
 2013-04-19 07:43:37 +02:00
Jacob Støren
cd24e77557 Drawstyle and Faults control Toolbuttons 
p4#: 21335
 2013-04-18 15:10:57 +02:00
Magne Sjaastad
759a17337b Show checkbox in treeview for range and property filters 
p4#: 21332
 2013-04-18 08:29:41 +02:00
Magne Sjaastad
78dac434d9 Rename 
p4#: 21331
 2013-04-18 07:41:00 +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
f23c9d7b4d Removed obsolete code 
p4#: 21328
 2013-04-17 11:48:32 +02:00
Magne Sjaastad
5a79a41da8 Toggle on/off multiple selection using keyboard (space, enter, return) 
p4#: 21327
 2013-04-17 11:06:47 +02:00
Jacob Støren
2280a8cbfa Toolbar and menu refinements 
Added Snapshot actions to a new toolbar.
Moved the snapshot file actions from debug menu to File->Export
Moved the Snapshot to Clip board to Edit menu.
Moved create new Project tree and Property editor action to Windows menu
Added a separator in the Windwsmenu after the "fixed Docks"
Set unique names on the additional Prop and Project doc windows
p4#: 21326
 2013-04-17 10:59:34 +02:00
Magne Sjaastad
ec2754ce30 Added checkbox for wells in treeview 
p4#: 21325
 2013-04-17 08:25:32 +02:00
Jacob Støren
df533d0afe Alligning 
p4#: 21321
 2013-04-17 07:41:48 +02:00
Jacob Støren
b38d4313d7 Octave Server: Fix on getting active cellinfo 
p4#: 21318
 2013-04-16 12:08:45 +02:00
Magne Sjaastad
9f07daefad Moved MimeData into RimMimeData 
p4#: 21317
 2013-04-16 11:19:37 +02:00
Jacob Støren
427bf5a2dd Linux compile warning fix 
p4#: 21316
 2013-04-16 10:46:29 +02:00
Magne Sjaastad
da82770e5f Moved file list from ApplicationCode to ProjectDataModel 
p4#: 21315
 2013-04-16 10:27:36 +02:00
Magne Sjaastad
8750bfde81 Whitespace 
p4#: 21309
 2013-04-16 09:53:31 +02:00
Jacob Støren
66f0310d55 Added new icons to resource file 
p4#: 21306
 2013-04-16 09:44:31 +02:00
Jacob Støren
99ad86b984 Added Z-Scale to the 3D overlay info text 
p4#: 21303
 2013-04-16 09:03:40 +02:00
Jacob Støren
d89ea1e385 Legend default number precision set to 2 
p4#: 21301
 2013-04-16 08:50:31 +02:00
Magne Sjaastad
e9743257ea Check if file pointer is present before creating a new file pointer 
p4#: 21295
 2013-04-16 08:25:43 +02:00
Jacob Støren
9e588e38c3 Established new base images for regressiontest. Small models. 
p4#: 21290
 2013-04-16 07:34:50 +02:00
Magne Sjaastad
8ed9cee99e Use small font when drawing well head labels 
p4#: 21285
 2013-04-15 13:36:37 +02:00
Jacob Støren
d65ce7957b Added viewer background color to preferences 
p4#: 21284
 2013-04-15 13:13:41 +02:00
Magne Sjaastad
e0654c9891 Added progress info when reading well data for statistics case 
p4#: 21274
 2013-04-12 15:53:37 +02:00
Magne Sjaastad
e2f02d111f Merge pull request #24 from OPM/dev 
Update internal as prepare of harmonizing pull requests
 2013-04-12 06:25:35 -07: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
e5b7bbc5af Merge pull request #22 from OPM/internal 
Internal
 2013-04-12 04:06:49 -07:00
Magne Sjaastad
9b0378f8e0 Added support for selected well data in a statistics case 
Now possible to show well data from selected source case for a statistics case
Added state to RimResultCase to monitor data actually read from disk
p4#: 21258
 2013-04-12 12:03:04 +02:00
Magne Sjaastad
aea13e1810 Whitespace 
p4#: 21256
 2013-04-12 11:12:53 +02:00
Jacob Støren
432106c9c5 External file references: Fixed the relocation in the advanced cases 
p4#: 21253
 2013-04-12 09:43:40 +02:00
Magne Sjaastad
e5f9b41c0f Moved font creation into RivReservoirPipesPartMgr 
Added clearGeometryCache
p4#: 21252
 2013-04-12 09:20:40 +02:00
Jacob Støren
462bc16ace Rewrite of the searchpath system for external file references 
The Relocation code is not yet completely working for the advanced cases
p4#: 21251
 2013-04-12 08:31:59 +02:00
Magne Sjaastad
464565f1bf List all grid case groups where statistics data will be deleted based on a drop action 
p4#: 21247
 2013-04-11 14:14:52 +02:00
Magne Sjaastad
67535b648c Add default name/number to new grid cases 
p4#: 21246
 2013-04-11 14:08:06 +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
db1dd5dd0d Do not create statistics case in constructor 
p4#: 21237
 2013-04-11 11:18:40 +02:00
Magne Sjaastad
94a4d83885 Made adding of grid group more robust 
p4#: 21236
 2013-04-11 11:03:52 +02:00
Magne Sjaastad
e70615d02a Check for valid pointer 
p4#: 21235
 2013-04-11 10:42:35 +02:00
Magne Sjaastad
dbc9869f61 Fix missing display of wells in tree view 
p4#: 21234
 2013-04-11 10:35:33 +02:00
Magne Sjaastad
04a987d99b Show context menu when selection is empty 
p4#: 21233
 2013-04-11 10:11:57 +02:00
Magne Sjaastad
807c6de823 Moved adding of one statistics case to contstructor to make sure the statistics case UI is displayed when creating a new grid case group 
p4#: 21232
 2013-04-11 08:45:56 +02:00
Magne Sjaastad
665c2ace8b Handle when it is not possible to read cases from disk in a grid group 
p4#: 21230
 2013-04-10 15:33:34 +02:00
Magne Sjaastad
a20640f25f Only enable animation control when there are more than one time step string available 
p4#: 21229
 2013-04-10 15:09:41 +02:00
Magne Sjaastad
687bc8aecf Return true when a dynamic result has only one time step 
p4#: 21226
 2013-04-10 14:55:50 +02:00
Jacob Støren
ff1dcd8c8d Overlay info: Adjusted colors and transparency 
To reclaim the transparent feeling lost, and to increase readability
p4#: 21225
 2013-04-10 14:24:35 +02:00
Magne Sjaastad
33729d5ed4 Removed invalid assert 
p4#: 21222
 2013-04-10 13:22:43 +02:00
Magne Sjaastad
be8b627e69 Added application icon on Windows 
p4#: 21221
 2013-04-10 12:01:38 +02:00
Magne Sjaastad
927fa6c5e7 Fixed issue related to computation of SOIL. Mark metadata for derived SOIL with mustBeCalculated. 
p4#: 21220
 2013-04-10 11:37:34 +02:00
Magne Sjaastad
de56495c13 Always select SOIL as default result 
p4#: 21219
 2013-04-10 11:21:41 +02:00
Jacob Støren
a246e288ba Renamed some methods and variables in the eclipse result file access system 
To make things more readable and understandable
p4#: 21218
 2013-04-10 11:02:10 +02:00
Jacob Støren
09810bf586 Fixed error in path update logic 
p4#: 21209
 2013-04-09 15:38:37 +02:00
Jacob Støren
d0eebb92a8 Removed PERMY as default statistics property 
p4#: 21204
 2013-04-09 14:36:38 +02:00
CeetronResInsight
1cfd103f30 Linux compile warning fixes 
p4#: 21189
 2013-04-09 07:59:41 +02:00
Magne Sjaastad
812aee9be4 Text changes 
p4#: 21187
 2013-04-09 07:52:34 +02:00
Jacob Støren
2a6fce1d64 Added missing include (discovered on Ubuntu 12 build server) 
p4#: 21186
 2013-04-09 07:27:55 +02:00
Jacob Støren
12294ca853 Statistics Ui: Added default selected properties 
p4#: 21185
 2013-04-08 17:02:07 +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
775b9e5bee Update file paths if project file is moved on disk 
p4#: 21162
 2013-04-08 09:57:40 +02:00
Magne Sjaastad
4ae9182fc6 Extract path from document file name in RimProject 
p4#: 21160
 2013-04-08 08:44:33 +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
e89b88e47e Added NULL pointer guarding 
p4#: 21157
 2013-04-08 08:23:06 +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
Magne Sjaastad
da8480a91b Added constructor with three parameters 
Added reading of grid dimensions
p4#: 21155
 2013-04-07 17:20:58 +02:00
Magne Sjaastad
6c9f5d1978 Added reading of grid dimensions 
p4#: 21154
 2013-04-07 16:33:45 +02:00
Magne Sjaastad
c7d83893e0 Fixed bug causing function to always return true 
p4#: 21149
 2013-04-05 14:46:35 +02:00
Magne Sjaastad
ae812a2bbf Implemented check for any results of statistics cases 
p4#: 21148
 2013-04-05 14:39:34 +02:00
Magne Sjaastad
593a53a5a6 Added delete of a case not part of a case group 
p4#: 21144
 2013-04-05 14:18:34 +02:00
Jacob Støren
d07783ebaa Start of calculation status/unlocking of Statistics results 
p4#: 21143
 2013-04-05 13:29:47 +02:00
Magne Sjaastad
700f18391b Added GUI for asking user to confirm change for grid case group 
p4#: 21142
 2013-04-05 13:22:36 +02:00