Magne Sjaastad 1753449772 Merge remote-tracking branch 'refs/remotes/origin/dev' ...

Conflicts:
	ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
	ApplicationCode/UserInterface/RiuViewerCommands.cpp

2017-02-22 09:42:51 +01:00

..

ApplicationCommands

#1002 System : Improve restore of main windows from minimized state

2016-11-24 14:47:20 +01:00

CrossSectionCommands

Rename

2017-01-03 09:58:49 +01:00

EclipseCommands

#1183 Property Filter: Context command : Apply As Cell Result - GeoMech

2017-02-21 15:37:56 +01:00

FlowCommands

Select and expand stored well alloc plot

2017-02-21 12:52:33 +01:00

IntersectionBoxCommands

#884 Intersection collection is responsible for adding box manipulator geometry to model used in 3D viewer

2016-10-03 14:26:46 +02:00

OctaveScriptCommands

#988 Copy, Paste, Erase icons, and turned on icons for some other commands as well.

2016-11-18 11:45:09 +01:00

OperationsUsingObjReferences

Merge remote-tracking branch 'refs/remotes/origin/dev'

2017-02-08 07:35:20 +01:00

SummaryPlotCommands

#1180 Use RiaColorTables for several features (well log, summary, flow rates)

2017-02-10 08:39:25 +01:00

ToggleCommands

#922 Use setValueWithFieldChanged instead of setValueFromUi

2016-10-19 15:30:52 +02:00

ViewLink

#1107 Moved showWindow field to RimViewWindow and removed showWindow field from derived classes

2017-01-20 16:25:05 +01:00

WellLogCommands

#1180 Use RiaColorTables for several features (well log, summary, flow rates)

2017-02-10 08:39:25 +01:00

WellPathCommands

#1159 Fixed inaccurate position of new fracture when clicking in 3D view

2017-02-02 07:36:22 +01:00

CMakeLists_files.cmake

#1234 - pre-proto - Adding commands for converting units for all ellipse fracture templates (metric <--> field)

2017-02-20 09:13:44 +01:00

RicCloseCaseFeature.cpp

#988 Copy, Paste, Erase icons, and turned on icons for some other commands as well.

2016-11-18 11:45:09 +01:00

RicCloseCaseFeature.h

(#372) Drag Drop Move implemented.

2015-08-20 10:43:49 +02:00

RicConvertAllFractureTemplatesToFieldFeature.cpp

#1234 - pre-proto - Adding commands for converting units for all ellipse fracture templates (metric <--> field)

2017-02-20 09:13:44 +01:00

RicConvertAllFractureTemplatesToFieldFeature.h

#1234 - pre-proto - Adding commands for converting units for all ellipse fracture templates (metric <--> field)

2017-02-20 09:13:44 +01:00

RicConvertAllFractureTemplatesToMetricFeature.cpp

#1234 - pre-proto - Adding commands for converting units for all ellipse fracture templates (metric <--> field)

2017-02-20 09:13:44 +01:00

RicConvertAllFractureTemplatesToMetricFeature.h

#1234 - pre-proto - Adding commands for converting units for all ellipse fracture templates (metric <--> field)

2017-02-20 09:13:44 +01:00

RicConvertFractureTemplateUnitFeature.cpp

#1087 - pre-proto - Moving enum for unit system to RimDefines, and establishing default unit system for fracture template collection (used when creating new templates).

2017-02-17 10:11:32 +01:00

RicConvertFractureTemplateUnitFeature.h

#1087 - pre-proto - Adding units to fracture template and adding command feature for converting length values in ellipseFractureDefinition.

2017-02-14 09:49:14 +01:00

RicDeleteItemExec.cpp

#1040 - pre-proto - Calling scheduleCreateDisplayModelAndRedraw when creating / deleting fractures

2017-01-06 15:55:53 +01:00

RicDeleteItemExec.h

(#446) Update project tree view when deleting a linked view

2015-09-15 16:33:39 +02:00

RicDeleteItemExecData.cpp

Fixing wrong headers on new files

2015-08-14 09:45:57 +02:00

RicDeleteItemExecData.h

Fixing wrong headers on new files

2015-08-14 09:45:57 +02:00

RicDeleteItemFeature.cpp

Merge remote-tracking branch 'refs/remotes/origin/dev'

2017-02-22 09:42:51 +01:00

RicDeleteItemFeature.h

Fixing wrong headers on new files

2015-08-14 09:45:57 +02:00

RicExportFaultsFeature.cpp

#1068 Renamed to RigEclipseCaseData

2017-01-10 09:51:39 +01:00

RicExportFaultsFeature.h

#890 Export faults feature created

2016-11-25 15:57:51 +01:00

RicExportMultipleSnapshotsFeature.cpp

#1152 Replace space in filenames with underscore

2017-01-31 09:58:11 +01:00

RicExportMultipleSnapshotsFeature.h

#1080 Snapshot : Show parameter and case as default

2017-01-17 10:40:38 +01:00

RicExportSelectedSimWellFractureWellCompletionFeature.cpp

Fixed compile issue on Linux

2017-02-03 10:13:08 +01:00

RicExportSelectedSimWellFractureWellCompletionFeature.h

#1145 - pre-proto - Adding command feature for export of fractures only from selected wells. So far only fractures from one well can be exported each time.

2017-01-31 09:56:49 +01:00

RicExportSelectedWellPathFractureWellCompletionFeature.cpp

#1145 - pre-proto - Export of fracture data for selected wells (either SimWells or WellPaths)

2017-02-02 11:38:55 +01:00

RicExportSelectedWellPathFractureWellCompletionFeature.h

#1145 - pre-proto - Export of fracture data for selected wells (either SimWells or WellPaths)

2017-02-02 11:38:55 +01:00

RicExportSimWellFractureWellCompletionFeature.cpp

#1157 - pre-proto - Updating how the eclipseCase is handled for transmissibility calculation. Should now avoid segfault when calculating transmissibilities for well path fractures.

2017-02-02 08:50:54 +01:00

RicExportSimWellFractureWellCompletionFeature.h

#1092 - pre-proto - Renaming RicExportFractureWellCompletionFeature to RicExportSimWellFractureWellCompletionFeature

2017-01-11 14:32:42 +01:00

RicExportToLasFileFeature.cpp

#1190 Make sure well log features are disabled for well allocation objects

2017-02-07 09:34:11 +01:00

RicExportToLasFileFeature.h

#1032 WLP : Moved function to CurveFeatureImpl

2016-12-17 16:29:36 +01:00

RicExportToLasFileResampleUi.cpp

#906 Linux fix

2016-10-26 07:53:59 +02:00

RicExportToLasFileResampleUi.h

#906 No export of TVDRKB if diff field is empty

2016-10-26 07:32:19 +02:00

RicExportWellPathFractureWellCompletionFeature.cpp

#1145 - pre-proto - Export of fracture data for selected wells (either SimWells or WellPaths)

2017-02-02 11:38:55 +01:00

RicExportWellPathFractureWellCompletionFeature.h

#1092 - pre-proto - Adding feature for exporting COMPDAT file for well path fractures.

2017-01-11 14:32:42 +01:00

RicFractureDefinitionsDeleteAllFeature.cpp

(#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

RicFractureDefinitionsDeleteAllFeature.h

#1037 - pre-proto - Added commands for Delete All for Fractures and Fracture Definitions

2017-01-02 10:12:43 +01:00

RicFracturesDeleteAllFeature.cpp

#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

RicGeoMechPropertyFilterFeatureImpl.cpp

#924 Cleaned up includes and use RimGeoMechResultDefinition instead of RimGeoMechCellColors

2016-10-18 07:31:02 +02:00

RicGeoMechPropertyFilterFeatureImpl.h

(#578) Disable menu commands in tree view when range/property is overridden

2015-11-02 09:50:42 +01:00

RicGeoMechPropertyFilterInsertExec.cpp

(#366) Renamed command classes and files

2015-08-17 15:00:45 +02:00

RicGeoMechPropertyFilterInsertExec.h

Added "new" and "insert" commands for geomech property filters

2015-08-11 15:33:17 +02:00

RicGeoMechPropertyFilterInsertFeature.cpp

(#578) Disable menu commands in tree view when range/property is overridden

2015-11-02 09:50:42 +01:00

RicGeoMechPropertyFilterInsertFeature.h

(#366) Renamed command classes and files

2015-08-17 13:32:50 +02:00

RicGeoMechPropertyFilterNewExec.cpp

(#366) Renamed command classes and files

2015-08-17 15:00:45 +02:00

RicGeoMechPropertyFilterNewExec.h

Added "new" and "insert" commands for geomech property filters

2015-08-11 15:33:17 +02:00

RicGeoMechPropertyFilterNewFeature.cpp

(#578) Disable menu commands in tree view when range/property is overridden

2015-11-02 09:50:42 +01:00

RicGeoMechPropertyFilterNewFeature.h

(#366) Renamed command classes and files

2015-08-17 13:32:50 +02:00

RicImportFormationNamesFeature.cpp

#882 RiaApplication : Renamed to lastUsedDialogDirectory and added currentProjectPath. Use project path as fallback path for LAS export

2016-09-21 09:46:17 +02:00

RicImportFormationNamesFeature.h

#809 Created Formation Names project items.

2016-08-24 08:30:12 +02:00

RicImportGeoMechCaseFeature.cpp

#846 Created ImportGeoMechCaseFeature

2016-10-05 14:23:31 +02:00

RicImportGeoMechCaseFeature.h

#846 Created ImportGeoMechCaseFeature

2016-10-05 14:23:31 +02:00

RicImportSummaryCaseFeature.cpp

#916 If possible, hide plots when importing 3D case, and hide 3D windows when importing summary case

2016-10-24 16:01:19 +02:00

RicImportSummaryCaseFeature.h

#849 Added import summary case command

2016-10-06 15:02:11 +02:00

RicNewEllipseFractureTemplateFeature.cpp

#1087 - pre-proto - Moving enum for unit system to RimDefines, and establishing default unit system for fracture template collection (used when creating new templates).

2017-02-17 10:11:32 +01:00

RicNewEllipseFractureTemplateFeature.h

(#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

RicNewSimWellFractureAtPosFeature.cpp

pre-proto - Setting azimuth angle correctly when new fractures are created.

2017-02-20 14:44:03 +01:00

RicNewSimWellFractureAtPosFeature.h

#1044 - pre-proto - Started adding feature for making new simulation well fracture in 3D view, but not finished due to missing infrastructure

2016-12-20 13:10:03 +01:00

RicNewSimWellFractureFeature.cpp

pre-proto - Setting azimuth angle correctly when new fractures are created.

2017-02-20 14:44:03 +01:00

RicNewSimWellFractureFeature.h

#1043 - pre-proto - Added command feature for adding a new fracture definition

2016-12-19 11:23:02 +01:00

RicNewStimPlanFractureTemplateFeature.cpp

(#1139) - pre-proto - Reading in stimplan XMLfile. Not tested for multiple properties / timesteps. (Also some code clean-up)

2017-02-10 10:03:46 +01:00

RicNewStimPlanFractureTemplateFeature.h

(#1139) - pre-proto - Reading in stimplan XMLfile. Not tested for multiple properties / timesteps. (Also some code clean-up)

2017-02-10 10:03:46 +01:00

RicNewViewFeature.cpp

#988 Copy, Paste, Erase icons, and turned on icons for some other commands as well.

2016-11-18 11:45:09 +01:00

RicNewViewFeature.h

#723 Make sure a view is created if no view is present for a statistics case

2016-08-11 08:51:32 +02:00

RicNewWellPathFractureAtPosFeature.cpp

pre-proto - Setting azimuth angle correctly when new fractures are created.

2017-02-20 14:44:03 +01:00

RicNewWellPathFractureAtPosFeature.h

#1038 - pre-proto - Renaming feature for creating new well path fracture

2017-01-03 09:37:59 +01:00

RicNewWellPathFractureFeature.cpp

pre-proto - Setting azimuth angle correctly when new fractures are created.

2017-02-20 14:44:03 +01:00

RicNewWellPathFractureFeature.h

#1038 - pre-proto - Renaming feature for creating new well path fracture

2017-01-03 09:37:59 +01:00

RicRangeFilterExecImpl.cpp

(#339) Fixed default names of new range filters

2015-08-24 16:27:58 +02:00

RicRangeFilterExecImpl.h

Apply command data on range filter after default values has been set

2015-08-23 17:40:00 +02:00

RicRangeFilterFeatureImpl.cpp

AppFwk : Fixed typo of firstAncestorOrThisOfType

2016-09-21 13:59:41 +02:00

RicRangeFilterFeatureImpl.h

(#385) Implemented feature RicRangeFilterInsertFeature

2015-08-20 18:15:58 +02:00

RicRangeFilterInsertExec.cpp

Renamed from setCurrentObjectInTreeView to selectAsCurrentItem

2015-12-07 10:07:51 +01:00

RicRangeFilterInsertExec.h

(#385) Implemented feature RicRangeFilterInsertFeature

2015-08-20 18:15:58 +02:00

RicRangeFilterInsertFeature.cpp

(#578) Disable menu commands in tree view when range/property is overridden

2015-11-02 09:50:42 +01:00

RicRangeFilterInsertFeature.h

(#385) Implemented feature RicRangeFilterInsertFeature

2015-08-20 18:15:58 +02:00

RicRangeFilterNewExec.cpp

Renamed from setCurrentObjectInTreeView to selectAsCurrentItem

2015-12-07 10:07:51 +01:00

RicRangeFilterNewExec.h

(#385) Implemented feature RicRangeFilterInsertFeature

2015-08-20 18:15:58 +02:00

RicRangeFilterNewFeature.cpp

(#366) Made sure that feature names correspond to the class names

2015-08-17 15:09:01 +02:00

RicRangeFilterNewFeature.h

(#366) Renamed command classes and files

2015-08-17 13:32:50 +02:00

RicRangeFilterNewSliceIFeature.cpp

(#366) Made sure that feature names correspond to the class names

2015-08-17 15:09:01 +02:00

RicRangeFilterNewSliceIFeature.h

(#366) Renamed command classes and files

2015-08-17 13:32:50 +02:00

RicRangeFilterNewSliceJFeature.cpp

(#366) Made sure that feature names correspond to the class names

2015-08-17 15:09:01 +02:00

RicRangeFilterNewSliceJFeature.h

(#366) Renamed command classes and files

2015-08-17 13:32:50 +02:00

RicRangeFilterNewSliceKFeature.cpp

(#366) Made sure that feature names correspond to the class names

2015-08-17 15:09:01 +02:00

RicRangeFilterNewSliceKFeature.h

(#366) Renamed command classes and files

2015-08-17 13:32:50 +02:00

RicReloadFormationNamesFeature.cpp

#988 Copy, Paste, Erase icons, and turned on icons for some other commands as well.

2016-11-18 11:45:09 +01:00

RicReloadFormationNamesFeature.h

#819 Added reload formation names command

2016-08-26 16:12:55 +02:00

RicSimWellFracturesDeleteAllFeature.cpp

#1040 - pre-proto - Converting facture coordinates to display coordinates for visualization. Fractures not yet shown at correct possition.

2017-01-06 15:55:53 +01:00

RicSimWellFracturesDeleteAllFeature.h

#1037 - pre-proto - added classes RimSimWellFracture and RimSimWellFractureCollection, and functions for creating new / deleting.

2017-01-02 11:10:25 +01:00

RicSnapshotViewToClipboardFeature.cpp

#1214 Generalized export of snapshot images for all plot window types

2017-02-14 15:03:54 +01:00

RicSnapshotViewToClipboardFeature.h

#1214 Generalized export of snapshot images for all plot window types

2017-02-14 15:03:54 +01:00

RicTogglePerspectiveViewFeature.cpp

#973 Linked views : Propagate change of parallell/perspective flag

2016-11-24 12:19:05 +01:00

RicTogglePerspectiveViewFeature.h

#168 Added Perspective/parallel view tool button

2016-08-16 22:43:22 +02:00

RicViewerEventInterface.h

#949 Intersection : Convert coordinates using DisplayCoordTransform

2016-11-02 14:44:51 +01:00

RicWellPathFracturesDeleteAllFeature.cpp

Fixed missing regeneration of geometry when deleting all well path fractures

2017-02-02 07:48:58 +01:00

RicWellPathFracturesDeleteAllFeature.h

#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