Commit Graph

189 Commits

Author SHA1 Message Date
astridkbjorke
22ee6250bd (#1137) - pre-proto - Adding delete/new command for stimplan fracture templates. Removing RimStimPlanFractureDefinition, functionality moved into RimStimPlanFractureTemplate. Renaming RimFractureDefinitionCollection to RimFractureTemplateCollection. 2017-02-10 09:54:37 +01:00
astridkbjorke
d52cfc0f0b (#1136, #1137) - pre-proto - Adding base class RimFractureTemplte, and classes for stimPlan fractureTemplate and data structures. Also adding features for creating new stimPlan Fracture templates. 2017-02-10 09:52:18 +01:00
Magne Sjaastad
e845ae1ed8 Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
	ApplicationCode/CMakeLists.txt
	ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
	ApplicationCode/ProjectDataModel/RimEclipseWell.h
	ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake
2017-01-24 15:23:02 +01:00
Jacob Støren
43249f7af8 Refactor related to #1106, #1107, #1109, #1113. Refactored the MDI control
of windows. This might introduce problems.
2017-01-19 17:54:01 +01:00
Magne Sjaastad
36bcdab426 Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
	ApplicationCode/ModelVisualization/RivPipeGeometryGenerator.h
	ApplicationCode/ProjectDataModel/RimEclipseWell.cpp
	ApplicationCode/ProjectDataModel/RimEclipseWell.h
	ApplicationCode/UserInterface/RiuViewerCommands.cpp
2017-01-18 12:19:07 +01:00
Magne Sjaastad
fcd2a09f83 #1105 Created new folder for flow project files 2017-01-12 15:00:23 +01:00
astridkbjorke
ba2362ffce pre-proto - Update cmake file after rename (forgotten in last commit) 2017-01-12 13:31:33 +01:00
astridkbjorke
44aefe6ed7 pre-proto - Rename RimFractureDefinition to RimFractureEllipseDefinition 2017-01-12 10:33:33 +01:00
astridkbjorke
9bba00999e #1092 - pre-proto - Added feature for exporting fracture data to file. File is written, but not with any useful information yet. 2017-01-11 14:32:42 +01:00
Magne Sjaastad
db3f7d6650 #1069 : pre-proto - Added empty files related to RigFracture 2017-01-02 14:13:34 +01:00
astridkbjorke
b6053147df #1037 - pre-proto - Changed RimFracture to RimWellPathFracture (and same for FractureCollection and commands to create / delete fractures) 2017-01-02 11:59:30 +01:00
astridkbjorke
e6ef4fee42 #1037 - pre-proto - added classes RimSimWellFracture and RimSimWellFractureCollection, and functions for creating new / deleting. 2017-01-02 11:10:25 +01:00
astridkbjorke
5806dc24ab #1036 - pre-proto - Added RimFractureDefinitionCollection 2016-12-16 14:38:27 +01:00
astridkbjorke
be23a2ee84 #1037 - pre-proto - Added RimFracture and RimFractureCollection 2016-12-16 14:05:11 +01:00
astridkbjorke
2df403245e #1036 - pre-proto - Added fracture definition for storing description of simple fractures 2016-12-16 10:15:23 +01:00
Jacob Støren
8f65bd3fee #1028 Flow Diag Solution object. #1029 Flow Diag Result type in Result Definition along with some refactoring. 2016-12-14 09:50:30 +01:00
Magne Sjaastad
242dbd3693 #1018 Snapshot : Added RimMultiSnapshotDefinition 2016-12-09 10:01:50 +01:00
Magne Sjaastad
b38c1986aa #864 Moved summary files into separate folder 2016-11-05 13:31:14 +01:00
Magne Sjaastad
62411301da (#840) Summary : Added properties for time axis 2016-10-12 10:14:48 +02:00
Magne Sjaastad
c07f13d407 (#869) Summary : Right axis WIP 2016-10-12 10:08:08 +02:00
Magne Sjaastad
63ed368b5c (#857) Summary : Added properties for left and right Y-axis 2016-10-12 10:08:08 +02:00
Jacob Støren
1349cf0104 #900 Merged Intersection Boxes into Intersections folder 2016-09-30 08:40:46 +02:00
Jacob Støren
f734bf595b #815 Renamed RimCrossSectionCollection -> RimIntersectionCollection 2016-09-21 10:52:16 +02:00
Jacob Støren
08baa5ccc9 #815 Renamed RimCrossSection -> RimIntersection 2016-09-21 10:48:25 +02:00
Magne Sjaastad
45952e59d3 #814 New project tree items Intersection Boxes and Intersection Box. Support for add, toggle and delete 2016-09-20 12:03:26 +02:00
Jacob Støren
b46c6ebcf8 #809 Created Formation Names project items.
#819 Added delete command to Formation names
#808 Added an import Formation Names command
2016-08-24 08:30:12 +02:00
Jacob Støren
23bfb46c4c #780 Made Gui and a crude auto assignment of appearance.
Renamed
2016-08-09 11:35:48 +02:00
Jacob Støren
10d5da6ef5 #780 A major step towards a flexible assignment of curve appearance based on the properties of the curve data 2016-08-08 15:16:08 +02:00
Magne Sjaastad
830db2c6ec (#743) Added import of Input Case using opm-parser 2016-06-23 14:36:33 +02:00
Jacob Støren
ce2112fbc6 #756 Refactoring the filter data into a separate object as a PdmChild 2016-06-16 16:55:02 +02:00
Jacob Støren
3167f97394 #756 WIP: Added class stubs for the CurveFilter 2016-06-16 16:55:02 +02:00
Jacob Støren
40388b308b #739 Added summary case classes. Use those from the summary curves. Made save/restore work again for the summary plots. File format for Summary stuff are changed. 2016-05-31 13:48:22 +02:00
Jacob Støren
c32bad52ff #739 Added a common base class to represent and handle ViewWindows 2016-05-24 11:06:42 +02:00
Jacob Støren
c98f9af4dc #739 Moved the new RimPlotCurve class to a separate set of files 2016-05-23 17:33:44 +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
a42b0d2c8e (#667) Added Grids to project tree below Info Box
Fixed update issue related to missing time step texts in animation
toolbar
2015-11-27 13:47:01 +01:00
Magne Sjaastad
fec5061212 Moved context command builder into separate file 2015-11-18 15:55:22 +01:00
Magne Sjaastad
f2e8062410 (#657) Added cross section and cross section collection 2015-11-18 15:55:22 +01:00
Jacob Støren
8b8fd51862 Created baseclass for PropertyFilterCollections 2015-11-12 10:24:21 +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
Pål Hagen
956beba118 Moved remaining code from RimWellLogCurveImpl to RigWellLogCurveData
Removed class RimWellLogCurveImpl.
RigWellLogCurveData::calculateValidPointsIntervals() needs to be
harmonized with new way of extracting depths from well paths.
2015-10-15 13:29:45 +02:00
Magne Sjaastad
67a62f4f02 Renamed RimViewLink to RimViewController 2015-10-13 10:24:39 +02:00
Pål Hagen
fac6252d01 Renamed impl class/files 2015-10-12 15:04:21 +02:00
Magne Sjaastad
f4cfc51de2 (#561) Moved static methods to separate file 2015-10-05 13:29:30 +02:00
Pål Hagen
479b2083ef (#486) Renamed "trace" to "track" 2015-09-18 12:29:23 +02:00
Pål Hagen
58609ac9de Renamed class/flies 2015-09-18 09:16:59 +02:00
Pål Hagen
6d41aa0b18 (#436) Renamed some classes/files, methods and variables 2015-09-16 16:06:06 +02:00
Pål Hagen
e4212a1135 (#436) Added feature that creates a plot with a given LAS file log 2015-09-15 15:23:25 +02:00
Pål Hagen
03e4b89508 (#435) Renamed class 2015-09-15 13:21:30 +02:00
Pål Hagen
095d974e38 (#435) WIP - Reading metadata from LAS files 2015-09-14 16:33:28 +02:00
Jacob Støren
8b26726672 Renamed file LinkedView->ViewLink 2015-09-11 14:17:21 +02:00
Magne Sjaastad
5ce0f6988d (#417) Added togglebutton controls to View group 2015-09-08 10:17:50 +02:00
Magne Sjaastad
f16b2af600 Rename of class names and files related to linked views 2015-09-07 14:35:26 +02:00
Jacob Støren
3844c0958d Moved RimWellLeogExtractionCurve to a separate file 2015-09-02 12:34:12 +02:00
Magne Sjaastad
7969e22364 (#395) Moved managed views from RimView to RimProject 2015-09-01 17:34:03 +02:00
Pål Hagen
af9bbfdede Added collection class for well log plots 2015-08-28 10:42:57 +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
Magne Sjaastad
f6ac177ff2 Added ManagedViews and sync of camera, time step and cell result 2015-08-26 15:42:31 +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
bb2eda3e73 (#379)(#377) Moved store/restore of tree view state to new tree
Also refactored slotCreateCommandObject
2015-08-17 09:38:27 +02:00
Pål Hagen
7917a89c65 Renamed source files according to new class names 2015-06-26 10:00:45 +02:00
Pål Hagen
fd03a02645 Renamed source files according to new class names 2015-06-26 10:00:44 +02:00
Pål Hagen
cd662dc7d1 Renamed source files according to new class names 2015-06-26 10:00:43 +02:00
Pål Hagen
29f4b6eb31 Renamed source files according to new class names 2015-06-26 10:00:42 +02:00
Pål Hagen
c2561eb287 Renamed source files according to new class names 2015-06-26 10:00:42 +02:00
Pål Hagen
2f34b03135 Renamed source files according to new class names 2015-06-26 10:00:41 +02:00
Pål Hagen
6191422103 Property filters for geo mech (#314)
Added GUI objects for property filters for geo mech models.
2015-06-22 15:27:37 +02:00
Jacob Støren
2c7a741805 Renamed the files of RimReservoirView to RimEclipseView 2015-05-21 10:34:38 +02:00
Jacob Støren
969a181897 RimCase reintroduced as baseclass for all cases
Refactored to handle cases generically in  a lot of places.
Mostly complete regarding all these issues, but not tested yet:
Assigning caseId
Update relative path to the case data
RimProject::createDisplayModelAndRedrawAllViews
RimProject::computeUtmAreaOfInterest
Load case data on project open
save snapshots for all views
RegressionTest viewer size
Finding case based on caseId
Giving case information to octave
2015-05-15 18:51:49 +02:00
Jacob Støren
b111a26f21 Renamed Files: RimCase to RimEclipseCase 2015-05-15 09:16:33 +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
27c2c040fe Added the 3D view to the geomech stuff 2015-04-20 16:56:26 +02:00
Jacob Støren
27f6bd9eb5 Start of geomech support
Possible GUI-tree layout
2015-04-20 09:02:33 +02:00
Magne Sjaastad
03df28282c Show NNCs with no common area in folder below Faults 2014-08-22 09:28:25 +02:00
Magne Sjaastad
b5d1c63966 Renamed to RimFaultResultSlot 2014-08-14 10:56:09 +02:00
Magne Sjaastad
cdbc5829ab Fault result : Renamed file and improved interface 2014-08-14 10:56:01 +02:00
Magne Sjaastad
d8f412017e Faults: Added fault result mapping management 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
7c6ff0c533 Added ternary legend config
Included user defined ranges for SOIL, SGAS, SWAT
2014-05-06 22:39:53 +02:00
Magne Sjaastad
03516a8336 Added mock model settings 2014-04-22 13:17:27 +02:00
Magne Sjaastad
12918ec107 Faults: Reading from Eclipse text files and basic visualization
Added reading of faults directly from Eclipse text files
Added named faults in project tree
Added fault geompetry parts
Added test data
2013-12-03 20:30:32 +01:00
Magne Sjaastad
40092b0d62 SSIHUB: Update file paths for and well path cache
Consolidated cache creation in RimTools
2013-10-24 09:50:21 +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
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
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
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