Commit Graph

244 Commits

Author SHA1 Message Date
Magne Sjaastad
3d67946976 Merge remote-tracking branch 'origin/dev' into pre-proto 2017-03-15 10:10:43 +01:00
Magne Sjaastad
647b4348eb Renamed to eclipseCaseData 2017-03-15 09:10:16 +01:00
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
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
0cbdcd587d #1105 Stripped down basic infrastructure code 2017-01-13 13:32:17 +01:00
Magne Sjaastad
9cd17ec508 Merge dev into pre-proto
Conflicts:
	ApplicationCode/ProjectDataModel/RimEclipseView.cpp
	ApplicationCode/ProjectDataModel/RimEclipseView.h
2017-01-10 10:09:44 +01:00
Magne Sjaastad
8970d93a4d #1068 Renamed to RigEclipseCaseData 2017-01-10 09:51:39 +01:00
Magne Sjaastad
f70806e056 #1068 Avoid include of RigCell.h and RigSingleWellResultsData in RigCaseData.h 2017-01-10 09:20:03 +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
f6221340b1 Merge branch 'dev' 2016-12-21 08:38:52 +01:00
Magne Sjaastad
455e99d9cd #1018 Delete multiSnapshotDefinitions on project close 2016-12-21 07:14:15 +01:00
astridkbjorke
ab6e12eb3a #1038 - pre-proto - Added command feature for creating new well log collection fracture from context menu in project tree 2016-12-20 09:53:19 +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
Magne Sjaastad
331456e619 #1018 : Snapshot : Added table editor to export dialog 2016-12-09 11:11:16 +01:00
Magne Sjaastad
242dbd3693 #1018 Snapshot : Added RimMultiSnapshotDefinition 2016-12-09 10:01:50 +01:00
Magne Sjaastad
0fc0b8170c #908 Summary : Show grid filename for summary files loaded from grid files 2016-11-16 09:21:27 +01:00
Magne Sjaastad
8ae75b5f27 AppFwk : Added concept of isUiTreeHidden and isUiTreeChildrenHidden 2016-10-12 10:08:08 +02:00
Magne Sjaastad
39356c2b2a #849 Added Import Summary Case command 2016-10-06 15:02:11 +02:00
Magne Sjaastad
2d5295cf74 #846 Store window state for mainwindows in project and moved features into ApplicationCommands 2016-10-05 08:54:39 +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
Magne Sjaastad
e730e5bf9f (#791) Update well path filename if project file is relocated 2016-06-30 11:20:41 +02:00
Magne Sjaastad
bbf1574feb Wired up application logic related to new RiuMainPlotWindow 2016-06-29 14:38:11 +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
38c15f57f2 #739 Show sum plot on creation. Load when opening project. Delete on close project 2016-05-25 14:05:31 +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
ac2a28f139 (#538) Initialize new plot with depth unit
Removed obsolete functions
2015-12-02 15:07:29 +01:00
Jacob Støren
ee11d4fde7 (#672) Refactoring and Fix of side effects introduced by 704f4fa 2015-12-01 12:27:19 +01:00
Jacob Støren
704f4fa42b (#672) Avoid deleting and hiding WellLogPlot and Wells folders when they have no children 2015-11-30 15:07:54 +01:00
Magne Sjaastad
fec5061212 Moved context command builder into separate file 2015-11-18 15:55:22 +01:00
Jacob Støren
4388f39175 Renamed files PlotCurve->Curve 2015-11-04 16:22:53 +01:00
Jacob Støren
7b7ecf2f26 Renamed PlotCurve -> Curve 2015-11-04 16:19:38 +01:00
Jacob Støren
10582750ab Renamed files PlotTrack/TrackPlot -> Track 2015-11-04 16:14:42 +01:00
Jacob Støren
f77a92a77b Rename TrackPlot/PlotTrack classes to Track 2015-11-04 15:57:06 +01:00
Magne Sjaastad
1156da7f03 (#605) Fixed delete of well path to avoid reuse of old data 2015-10-29 13:13:38 +01:00
Magne Sjaastad
bbdb730372 Removed dead code, RimCaseCollection was handled twice 2015-10-26 10:18:58 +01:00
Magne Sjaastad
0405584bb6 System : Replaced tab with four spaces in ApplicationCode and subfolders 2015-10-23 15:46:25 +02:00
Jacob Støren
1782fac724 (#521, #522) New icons on Plot related stuff.
The curve icon does not show up for some reason.
2015-10-15 13:41:34 +02:00
Pål Hagen
08573be64b (#541) Added feature for export of well log plot curves to a LAS file
Did some refactoring/improvements by introducing new class
RigWellLogCurveData.
2015-10-15 11:27:12 +02:00
Magne Sjaastad
67a62f4f02 Renamed RimViewLink to RimViewController 2015-10-13 10:24:39 +02:00
Magne Sjaastad
4424c110be Transformed static functions from ViewLinker to dynamic functions in RimView 2015-09-25 11:17:51 +02:00
Jacob Støren
5e0505dfe8 Renaming and cleanup in ViewLinker and friends 2015-09-24 17:43:09 +02:00
Pål Hagen
1a6aa58711 (#524) God rid of "Copy" for multiple selections in the project tree view
Copy used to be always available for multiple selections, for some
reason.
2015-09-24 15:36:36 +02:00
Magne Sjaastad
c8944d8801 Refactored funtions used to find viewLinker and viewLink 2015-09-23 11:01:46 +02:00
Pål Hagen
239d682956 (#514) Added missing "view link" command features to context menu in project tree view 2015-09-22 14:34:26 +02:00
Pål Hagen
430ea86962 (#505) Added context menu item for creation of well log extraction curve 2015-09-22 12:29:14 +02:00
Pål Hagen
f49c7fc983 (#505) Added context menu item for creation of cure from LAS data for well paths 2015-09-22 10:52:28 +02:00
Magne Sjaastad
2b7d7be3f1 (#499) Added a custom track delete feature
Added infrastructure needed to delete track from plot and plot
collection
2015-09-21 15:55:55 +02:00
Pål Hagen
fef1d93a9e (#436) Renamed class/files 2015-09-18 17:29:17 +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
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
06f73bc359 (#436) Enabled addition of multiple well log curves to plot 2015-09-16 16:16:02 +02:00
Magne Sjaastad
f1e11780ce (#446) Added feature "Set master view" to context menu in 3D and in project tree 2015-09-16 15:13:56 +02:00
Magne Sjaastad
4c781b12be (#446) Added feature "Delete all linked views" 2015-09-16 14:40:50 +02:00
Magne Sjaastad
36f5f628f3 (#446) Changed from list of ViewLinkers to one single ViewLinker 2015-09-16 14:26:25 +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
095d974e38 (#435) WIP - Reading metadata from LAS files 2015-09-14 16:33:28 +02:00
Jacob Støren
238c783b26 More renaming LikedView -> ViewLink 2015-09-14 09:53:16 +02:00
Jacob Støren
8b26726672 Renamed file LinkedView->ViewLink 2015-09-11 14:17:21 +02:00
Jacob Støren
733b3603db Rename of LinkedView -> ViewLink 2015-09-11 14:17:16 +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
Pål Hagen
7d73d9fcf1 (#421) Showing linked views first in the tree view, if any 2015-09-07 14:01:26 +02:00
Magne Sjaastad
a884d79aff (#419) Removed the inapplicable views from the view drop down 2015-09-07 13:51:51 +02:00
Pål Hagen
8acab71742 (#422) Moved well log plots before scripts and after wells in the tree view 2015-09-07 13:07:10 +02:00
Pål Hagen
27f8f34538 (#396) Create main plot collection and well log plot collection if needed
Reading old project files may give projects without main plot collection
and well plot collection. Those are now created in the command feature
for adding a new well log plot, if needed.
2015-09-07 10:44:48 +02:00
Magne Sjaastad
c86dc45fd6 Delete linked views when project is closed 2015-09-04 11:22:44 +02:00
Jacob Støren
1e6baed1dc Placed WellLogExtractors in the RimWellLogPlotCollection and cached them 2015-09-03 20:13:08 +02:00
Jacob Støren
2288130f6a (#396) Several fixes regarding Project with plots.
Plots loads the curve data on project open
Plots are removed on project close
Still missing some updates (curve names ...)
2015-09-03 08:22:06 +02:00
Magne Sjaastad
d80e64d81d (#395) Added Show All Linked Views as context menu feature of linked views 2015-09-02 17:18:26 +02:00
Magne Sjaastad
7969e22364 (#395) Moved managed views from RimView to RimProject 2015-09-01 17:34:03 +02:00
Jacob Støren
c35e3fceaf Fixed assert on open old projectfiles
The cause was that a case was inserted into a field without removing it from the old obsolete field first.
2015-09-01 17:19:05 +02:00
Magne Sjaastad
444500f6cc (#395) Make sure the update() virtual function is called from camera related functions 2015-09-01 11:31:31 +02:00
Pål Hagen
5e18afd44c (#396) Implemented deletion of well log plots 2015-08-31 11:05:55 +02:00
Pål Hagen
9d4f9d617f Basic well log plot functionality with dummy data up & running
Traces can be added to and deleted from well log plots, and curves with
dummy data can be added and deleted. TODO: Replace dummy data with real
well log data and data extracted from the model.
2015-08-31 02:06:37 +02:00
Magne Sjaastad
3f09c1bc66 Added LinkVisibleViewsFeature, and added action to draw toolbar 2015-08-30 13:30:46 +02:00
Pål Hagen
7401160677 Added command feature to the context menu for well path collection 2015-08-28 12:25:48 +02:00
Pål Hagen
46a941348b Hide the main plot collection level in the project tree
"Well Log Plots" will be visible on the top level if there are plots.
2015-08-28 12:10:36 +02:00
Pål Hagen
7081e140fd Added command feature for addition of a new curve to a well log plot trace 2015-08-28 11:45:18 +02:00
Pål Hagen
0fdf5292d0 Added command feature for addition of a new trace to a well log plot 2015-08-28 11:32:25 +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
5614f6d33a (#339) Fixed well path related context menu
Made sure that the order of the items in the context menu is the same as
it used to be in the old project tree view. Removed separator.
2015-08-24 16:33:54 +02:00
Jacob Støren
39c50b4f8d Linux Compile Fix 2015-08-24 16:05:39 +02:00
Pål Hagen
5785031697 Added "Delete" to the context menu for input property items 2015-08-24 10:45:43 +02:00
Pål Hagen
7044f3c627 (#383) Added RicAddEclipseInputPropertyFeature 2015-08-24 10:40:47 +02:00
Pål Hagen
28547513c6 (#383) Added RicSaveEclipseInputPropertyFeature 2015-08-24 10:03:21 +02:00
Pål Hagen
756e793519 (#386) Added "Delete" to the grid case group context menu
Note: Used to be "Close" in the old tree view. Using existing feature
for deletion, for now.
2015-08-21 15:44:12 +02:00
Pål Hagen
89ee164c8a Added "Paste" to the context menu of "Derived Statistics" 2015-08-21 15:08:07 +02:00
Pål Hagen
762083a5b6 (#388) Added RicComputeStatisticsFeature 2015-08-21 14:53:45 +02:00
Pål Hagen
afe596aa2a (#388) Added RicNewStatisticsCaseFeature 2015-08-21 11:47:59 +02:00
Jacob Støren
2e1a542749 Some context menu cleanup 2015-08-20 17:19:38 +02:00
Jacob Støren
a6c59f4160 (#384) Fixed Script tree in the new project tree 2015-08-20 15:48:37 +02:00
Pål Hagen
c5606a46aa (#339) Added "New Grid Case Group" to the context menu of "Grid Models" 2015-08-20 14:20:13 +02:00
Pål Hagen
fb6baee197 (#339) Added RicCreateGridCaseGroupFeature 2015-08-20 14:11:21 +02:00
Pål Hagen
6e48e036c1 (#339) Added RicImportEclipseCaseFeature 2015-08-20 13:54:20 +02:00
Pål Hagen
cd1e04d6e8 (#339) Added RicImportEclipseCaseFeature 2015-08-20 13:44:45 +02:00