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

..

CMakeLists_files.cmake

Established new PDM structure with RimProject owning RimOilFields owning RimAnalysisModels.

2013-06-06 15:07:31 +02:00

Rim3dOverlayInfoConfig.cpp

Major cleanup/change in the way things are included.

2013-05-06 10:55:00 +02:00

Rim3dOverlayInfoConfig.h

Linux compile fixes

2013-05-06 12:02:32 +02:00

RimAnalysisModels.cpp

Grid Models: Used the "Cases" icon

2013-06-07 15:01:47 +02:00

RimAnalysisModels.h

Add temporary icon for Grid Models in PDM, should create proper icon later.

2013-06-07 09:32:06 +02:00

RimBinaryExportSettings.cpp

Rename of files:

2013-03-22 16:12:00 +01:00

RimBinaryExportSettings.h

Updated to version 0.8.0

2012-06-26 16:10:41 +02:00

RimCalcScript.cpp

Removed obsolete code

2013-04-22 14:44:43 +02:00

RimCalcScript.h

Removed obsolete code

2013-04-22 14:44:43 +02:00

RimCase.cpp

Added include files because of known include problems related to PDM.

2013-06-06 15:02:35 +02:00

RimCase.h

Introduced caseId to RimCase. Project keeps track of largest used ID, and is responsible for assigning ID to cases.

2013-05-08 10:41:56 +02:00

RimCaseCollection.cpp

Major cleanup/change in the way things are included.

2013-05-06 10:55:00 +02:00

RimCaseCollection.h

Major cleanup/change in the way things are included.

2013-05-06 10:55:00 +02:00

RimCellEdgeResultSlot.cpp

Improved logarithmic color legends for zero and negative values

2013-06-03 13:08:11 +02:00

RimCellEdgeResultSlot.h

Improved logarithmic color legends for zero and negative values

2013-06-03 13:08:11 +02:00

RimCellFilter.cpp

Renamed cell filter field from active to isActive

2013-08-08 08:49:29 +02:00

RimCellFilter.h

Renamed cell filter field from active to isActive

2013-08-08 08:49:29 +02:00

RimCellPropertyFilter.cpp

Renamed cell filter field from active to isActive

2013-08-08 08:49:29 +02:00

RimCellPropertyFilter.h

Fixed missing min/max value range for property filters when loading from project file

2013-08-07 09:00:09 +02:00

RimCellPropertyFilterCollection.cpp

Renamed cell filter field from active to isActive

2013-08-08 08:49:29 +02:00

RimCellPropertyFilterCollection.h

Added updateUiIconFromState() in cafPdmUiItem to create disabled icons based on object state

2013-04-26 14:47:34 +02:00

RimCellRangeFilter.cpp

Linux compile fixes

2013-05-06 12:02:32 +02:00

RimCellRangeFilter.h

Range Filter: Added option to not propagate rangefilter onto the subgrids

2013-04-26 08:53:40 +02:00

RimCellRangeFilterCollection.cpp

Renamed cell filter field from active to isActive

2013-08-08 08:49:29 +02:00

RimCellRangeFilterCollection.h

Renamed cell filter field from active to isActive

2013-08-08 08:49:29 +02:00

RimDefines.cpp

Rename of files:

2013-03-22 16:12:00 +01:00

RimDefines.h

Added porosity model to ResultDefinition

2013-02-01 14:39:32 +01:00

RimExportInputPropertySettings.cpp

Rename of files:

2013-03-22 16:12:00 +01:00

RimExportInputPropertySettings.h

Updated to version 0.8.0

2012-06-26 16:10:41 +02:00

RimIdenticalGridCaseGroup.cpp

Added groupId to case groups

2013-05-10 15:35:33 +02:00

RimIdenticalGridCaseGroup.h

Added groupId to case groups

2013-05-10 15:35:33 +02:00

RimInputCase.cpp

Major cleanup/change in the way things are included.

2013-05-06 10:55:00 +02:00

RimInputCase.h

Major cleanup/change in the way things are included.

2013-05-06 10:55:00 +02:00

RimInputProperty.cpp

Rename of files:

2013-03-22 16:12:00 +01:00

RimInputProperty.h

Updated to version 0.8.0

2012-06-26 16:10:41 +02:00

RimInputPropertyCollection.cpp

Rename of files:

2013-03-22 16:12:00 +01:00

RimInputPropertyCollection.h

Updated to version 0.8.0

2012-06-26 16:10:41 +02:00

RimLegendConfig.cpp

Improved logarithmic color legends for zero and negative values

2013-06-03 13:08:11 +02:00

RimLegendConfig.h

Improved logarithmic color legends for zero and negative values

2013-06-03 13:08:11 +02:00

RimMimeData.cpp

Moved MimeData into RimMimeData

2013-04-16 11:19:37 +02:00

RimMimeData.h

Moved MimeData into RimMimeData

2013-04-16 11:19:37 +02:00

RimOilField.cpp

Project/OilField: Made sure one and always one oilfield exists in a project.

2013-06-12 09:36:50 +02:00

RimOilField.h

Project/OilField: Made sure one and always one oilfield exists in a project.

2013-06-12 09:36:50 +02:00

RimProject.cpp

Removed debug output

2013-06-12 10:52:46 +02:00

RimProject.h

Established new PDM structure with RimProject owning RimOilFields owning RimAnalysisModels.

2013-06-06 15:07:31 +02:00

RimReservoirCellResultsCacher.cpp

Added include files because of known include problems related to PDM.

2013-06-06 15:02:35 +02:00

RimReservoirCellResultsCacher.h

Some comments and indentation

2013-06-26 23:26:01 +02:00

RimReservoirView.cpp

MswRollUp: Final commit: Reapplying changes and bugfixes from trunk in conflicting files.

2013-08-26 21:56:40 +02:00

RimReservoirView.h

Added visualization of Well Paths in reservoir views.

2013-05-16 14:10:22 +02:00

RimResultCase.cpp

Added a left margin in the property window.

2013-06-26 09:02:37 +02:00

RimResultCase.h

Added a left margin in the property window.

2013-06-26 09:02:37 +02:00

RimResultDefinition.cpp

Fixed missing update of the 3D view after deleting statistic results

2013-06-12 13:42:36 +02:00

RimResultDefinition.h

Fixed missing update of the 3D view after deleting statistic results

2013-06-12 13:42:36 +02:00

RimResultSlot.cpp

Rename

2013-08-08 15:19:16 +02:00

RimResultSlot.h

Initial commit of ResInsight version 0.4.8

2012-05-18 09:45:23 +02:00

RimScriptCollection.cpp

Caf:PdmUiTree: Rewrote rebuildUiSubTree to become updateUiSubTree

2013-05-13 12:00:52 +02:00

RimScriptCollection.h

Updated to version 0.8.0

2012-06-26 16:10:41 +02:00

RimStatisticsCase.cpp

Fixed missing update of the 3D view after deleting statistic results

2013-06-12 13:42:36 +02:00

RimStatisticsCase.h

Major cleanup/change in the way things are included.

2013-05-06 10:55:00 +02:00

RimStatisticsCaseCollection.cpp

Major cleanup/change in the way things are included.

2013-05-06 10:55:00 +02:00

RimStatisticsCaseCollection.h

Renamed files corresponding to the already renamed statistics related classes

2013-03-22 14:24:41 +01:00

RimStatisticsCaseEvaluator.cpp

Statistics calculation : Paralellized and avoided some memory reallocation

2013-06-27 00:45:50 +02:00

RimStatisticsCaseEvaluator.h

Added interpolation of observed values to statistics computation

2013-04-30 11:36:50 +02:00

RimUiTreeModelPdm.cpp

Renamed cell filter field from active to isActive

2013-08-08 08:49:29 +02:00

RimUiTreeModelPdm.h

Call display update once after setting toggle state for a selection of wells

2013-04-25 08:47:01 +02:00

RimUiTreeView.cpp

Added include files because of known include problems related to PDM.

2013-06-06 15:02:35 +02:00

RimUiTreeView.h

Added context menu used to execute a script for multiple cases

2013-05-27 15:38:03 +02:00

RimWell.cpp

MswRollUp: Final commit: Reapplying changes and bugfixes from trunk in conflicting files.

2013-08-26 21:56:40 +02:00

RimWell.h

Well cell transparency: Turned off well cell transparency when no well pipe is visible.

2013-04-26 16:46:38 +02:00

RimWellCollection.cpp

MswRollUp: Final commit: Reapplying changes and bugfixes from trunk in conflicting files.

2013-08-26 21:56:40 +02:00

RimWellCollection.h

Wellcollection can control if well head label is positioned at top active cell for IJ column or top Z of active cells bounding box

2013-08-22 07:55:21 +02:00

RimWellPath.cpp

Use compare() because endsWith() does not work as expected on Windows

2013-06-26 12:01:53 +02:00

RimWellPath.h

WellPaths: Added support for mulitple paths in one ascii file.

2013-06-24 22:04:52 +02:00

RimWellPathCollection.cpp

Add keyword Name as identifier for a well in addition to well name given in quotes

2013-08-19 09:46:31 +02:00

RimWellPathCollection.h

WellPaths: Added support for mulitple paths in one ascii file.

2013-06-24 22:04:52 +02:00