Commit Graph

78 Commits

Author SHA1 Message Date
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
Jacob Støren
b0b24edeb9 Range/Property/Well Toggle fixes
* Well cells are now toggled along with pipe geometry by the Well toggle in the tree view.
* TP# 4156 Range filter collection toggle does not work
This last one was really a huge error on several places in the overall logig of what is shown when.
p4#: 22337
2013-09-06 15:45:21 +02:00
Jacob Støren
79c016b6b6 Wells: Improved output in Result info window when picking a well-cell
p4#: 22241
2013-08-28 15:36:29 +02:00
Jacob Støren
dbb72475e5 MswRollUp: Final commit: Reapplying changes and bugfixes from trunk in conflicting files.
The changes are from changelist numbers: 22190, 22189, 22154, 22151, 22141, 22124, 22010
Now It is supposed to compile again.
p4#: 22231
2013-08-26 21:56:40 +02:00
Jacob Støren
f392f4457d MswRollUp: Splitted normal well and MSW handling. Got the Normal path to work fairly well. Some strangeties at the end of the pipes though
This is an intermediate commit and does not compile
p4#: 22214
2013-08-26 14:03:01 +02:00
Jacob Støren
b63f51921d MswRollUp: Updated Ert to experimental MSW branch. Updated ResInsight code to handle API changes
067fa99faa
This is an intermediate commit and does not compile
p4#: 22212
2013-08-26 13:56:42 +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
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
Magne Sjaastad
5ea531783a Missed file in last checkin
p4#: 21975
2013-06-24 14:07:49 +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
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
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
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
0021e2f861 Improved logarithmic color legends for zero and negative values
p4#: 21804
2013-06-03 13:08:11 +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
CeetronResInsight
cb1c276e01 Fixed missing include (only needed for RHEL6)
p4#: 21591
2013-05-10 11:10:41 +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
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
fad4761bc4 Update well information when creating a 3D window on a case
p4#: 21468
2013-04-29 11:08:31 +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
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
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
586908b9be Refresh animation toolbar using createDisplayModelAndRedraw()
p4#: 21394
2013-04-24 07:57:31 +02:00
Magne Sjaastad
d825b0654c Check for valid pointer before accessing cell result data
p4#: 21359
2013-04-22 13:25:32 +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
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
78dac434d9 Rename
p4#: 21331
2013-04-18 07:41:00 +02:00
Jacob Støren
d65ce7957b Added viewer background color to preferences
p4#: 21284
2013-04-15 13:13:41 +02: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
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
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
21065176f2 Rename of functions in RigActiveCellInfo
p4#: 21045
2013-03-22 09:32:42 +01:00
Jacob Støren
75fc89e67a Rename of ...ResultsCacher to ...ResultsStorage. Hide Cacher from UI tree
p4#: 20963
2013-03-19 10:29:34 +01:00
Jacob Støren
f7248f3999 Results Storage: A huge refactorisation to make way for storing generated properties to an internal file.
This does not yet compile due to a unfortunate mix of perforce, cmake setup and unit_test project shortcomings.
Need to move RigStatistics into ProjectDataModel and rename it before this is running again.
p4#: 20945
2013-03-18 14:34:29 +01:00
Jacob Støren
8a604aca24 Refactored RigActiveCellinfo to only have one set of information.
Fracture and Matrix separated information thus needs two such obejcts.
There still needs to remove some out-commented code
p4#: 20877
2013-03-13 11:50:31 +01:00
Jacob Støren
705bb185e0 Fixed assert regarding wrong clamping of current timestep
p4#: 20802
2013-03-07 09:42:34 +01:00
Magne Sjaastad
4c955ece4a Improved statistical data infrastructure
p4#: 20694
2013-03-02 15:32:38 +01:00