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

Conflicts:
	ApplicationCode/ProjectDataModel/RimEclipseWellCollection.cpp
	ApplicationCode/Resources/ResInsight.qrc

2017-02-16 10:18:39 +01:00

..

CMakeLists_files.cmake

#1180 Use RiaColorTables for selection colors in 3D view

2017-02-10 08:27:20 +01:00

RiuCadNavigation.cpp

#168 Finalized. Zoom along ray is now updated to cope with parallel projection. The code in the different navigations are cleaned up a bit, and alligned

2016-08-17 10:54:15 +02:00

RiuCadNavigation.h

#168 Finalized. Zoom along ray is now updated to cope with parallel projection. The code in the different navigations are cleaned up a bit, and alligned

2016-08-17 10:54:15 +02:00

RiuCursors.cpp

System : Replaced tab with four spaces in ApplicationCode and subfolders

2015-10-23 15:46:25 +02:00

RiuCursors.h

System : Replaced tab with four spaces in ApplicationCode and subfolders

2015-10-23 15:46:25 +02:00

RiuDragDrop.cpp

#1190 Disabled drrop of items into well allocation objects

2017-02-07 09:39:40 +01:00

RiuDragDrop.h

Renamed PlotCurve -> Curve

2015-11-04 16:19:38 +01:00

RiuExportMultipleSnapshotsWidget.cpp

#1084 Snapshot : Removed header above table

2017-01-17 13:11:09 +01:00

RiuExportMultipleSnapshotsWidget.h

#1082 Snapshot : Added four empty rows

2017-01-16 23:21:28 +01:00

RiuFemResultTextBuilder.cpp

#933 Fixed the closes result for intersections also. Display the tensor data from the closest element node transformed onto the plane.

2016-10-26 17:14:33 +02:00

RiuFemResultTextBuilder.h

#933 Fixed the closes result for intersections also. Display the tensor data from the closest element node transformed onto the plane.

2016-10-26 17:14:33 +02:00

RiuFemTimeHistoryResultAccessor.cpp

#933 Moved and renamed TimeHistory calculator to the user interface module

2016-10-26 17:14:33 +02:00

RiuFemTimeHistoryResultAccessor.h

#933 Moved and renamed TimeHistory calculator to the user interface module

2016-10-26 17:14:33 +02:00

RiuGeoMechXfTensorResultAccessor.cpp

#960 Change names on TNH and THQV to TPH and TPQV

2016-11-04 15:27:24 +01:00

RiuGeoMechXfTensorResultAccessor.h

#941 Added TP, FAULTMOB, PCRIT, TPinc as transformed stress results

2016-11-01 09:29:52 +01:00

RiuGeoQuestNavigation.cpp

#168 Finalized. Zoom along ray is now updated to cope with parallel projection. The code in the different navigations are cleaned up a bit, and alligned

2016-08-17 10:54:15 +02:00

RiuGeoQuestNavigation.h

(#168) (#695) Wip: Refactoring the ResInsight nav policies to make bugfixing simpler

2015-12-10 09:39:42 +01:00

RiuLineSegmentQwtPlotCurve.cpp

#859 Added time from start of simulation option

2016-11-22 11:14:02 +01:00

RiuLineSegmentQwtPlotCurve.h

#859 Added time from start of simulation option

2016-11-22 11:14:02 +01:00

RiuMainPlotWindow.cpp

Refactor related to #1106, #1107, #1109, #1113. Refactored the MDI control

2017-01-19 17:54:01 +01:00

RiuMainPlotWindow.h

Refactor related to #1106, #1107, #1109, #1113. Refactored the MDI control

2017-01-19 17:54:01 +01:00

RiuMainWindow.cpp

#1148 Use tristate for well cell visibility

2017-02-02 09:59:26 +01:00

RiuMainWindow.h

#1078 Improved well cells and well cell fence settings

2017-01-26 17:41:34 +01:00

RiuMainWindowBase.cpp

#803 Added version number to dock/toolbar layout registry settings

2016-08-03 14:05:55 +02:00

RiuMainWindowBase.h

Refactor related to #1106, #1107, #1109, #1113. Refactored the MDI control

2017-01-19 17:54:01 +01:00

RiuMdiSubWindow.cpp

Removed obsolete code related to actions, menus and dock widgets

2016-06-29 14:40:20 +02:00

RiuMdiSubWindow.h

Established RiuMainPlotWindow

2016-06-29 14:37:41 +02:00

RiuMultiCaseImportDialog.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

RiuMultiCaseImportDialog.h

Added a multi case import dialog

2013-03-05 13:26:28 +01:00

RiuMultiCaseImportDialog.ui

Fixed several compiler warning on Linux

2013-09-10 08:47:28 +02:00

RiuNightchartsWidget.cpp

#1173 Made the legend a separate hide/show entity, and changed the overall layout of the well allocation plot

2017-02-13 08:44:29 +01:00

RiuNightchartsWidget.h

#1173 Made the legend a separate hide/show entity, and changed the overall layout of the well allocation plot

2017-02-13 08:44:29 +01:00

RiuProcessMonitor.cpp

(#495) Removed use of StdInclude

2015-09-25 15:57:50 +02:00

RiuProcessMonitor.h

Socket Interface: Comments and debug message possibilities

2013-10-04 14:36:26 +02:00

RiuProjectPropertyView.cpp

System : Replaced tab with four spaces in ApplicationCode and subfolders

2015-10-23 15:46:25 +02:00

RiuProjectPropertyView.h

(#406) Created a combined docking widget for additional project trees and property views

2015-08-31 07:53:52 +02:00

RiuPropertyViewTabWidget.cpp

#569 Added custom font for labels in 3D scene and added font size to preferences

2016-08-09 13:43:13 +02:00

RiuPropertyViewTabWidget.h

(#806) Improved layout of items in preferences

2016-08-09 13:45:08 +02:00

RiuQwtScalePicker.cpp

#862 Added scale picker to select axis

2016-10-14 15:06:21 +02:00

RiuQwtScalePicker.h

#862 Added scale picker to select axis

2016-10-14 15:06:21 +02:00

RiuRecentFileActionProvider.cpp

System : Improved handling of missing files

2016-11-24 10:51:20 +01:00

RiuRecentFileActionProvider.h

#846 Moved recent file management to RiaApplication

2016-10-05 08:54:40 +02:00

RiuResultInfoPanel.cpp

System : Replaced tab with four spaces in ApplicationCode and subfolders

2015-10-23 15:46:25 +02:00

RiuResultInfoPanel.h

System : Replaced tab with four spaces in ApplicationCode and subfolders

2015-10-23 15:46:25 +02:00

RiuResultQwtPlot.cpp

#779 Added support for filtering of zero and negative values in setSamplesFromDateAndValues

2016-10-12 13:49:57 +02:00

RiuResultQwtPlot.h

(#638) Changed title to "Result Plot" and renamed files

2015-11-11 14:07:21 +01:00

RiuResultTextBuilder.cpp

#1208 Removed duplicate text generation for one grid cell

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

RiuResultTextBuilder.h

#1068 Renamed to RigEclipseCaseData

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

RiuRmsNavigation.cpp

#168 Finalized. Zoom along ray is now updated to cope with parallel projection. The code in the different navigations are cleaned up a bit, and alligned

2016-08-17 10:54:15 +02:00

RiuRmsNavigation.h

(#168) (#695) Wip: Refactoring the ResInsight nav policies to make bugfixing simpler

2015-12-10 09:39:42 +01:00

RiuSelectionChangedHandler.cpp

Restored previous behaviour related to result accessor creation

2017-01-19 10:39:08 +01:00

RiuSelectionChangedHandler.h

(#632) Update application items when selection changes using a separate class

2015-11-11 11:41:11 +01:00

RiuSelectionManager.cpp

#1135 Compute accumulated length along sim well and added slider

2017-01-30 14:28:41 +01:00

RiuSelectionManager.h

#1135 Compute accumulated length along sim well and added slider

2017-01-30 14:28:41 +01:00

RiuSimpleHistogramWidget.cpp

Fixed issued reported by CppDepends

2015-12-07 12:53:36 +01:00

RiuSimpleHistogramWidget.h

Added missing pragma once

2016-06-06 07:13:53 +02:00

RiuSummaryQwtPlot.cpp

#1226 Show the complete text in the summary plot tooltip text

2017-02-15 12:29:58 +01:00

RiuSummaryQwtPlot.h

#999 Summary : Set minimum window size as small as possible

2016-11-23 13:29:26 +01:00

RiuToolTipMenu.cpp

Established RiuMainPlotWindow

2016-06-29 14:37:41 +02:00

RiuToolTipMenu.h

Established RiuMainPlotWindow

2016-06-29 14:37:41 +02:00

RiuTreeViewEventFilter.cpp

#1000 System : Prepare for handling of copy/paste actions

2016-11-24 08:21:59 +01:00

RiuTreeViewEventFilter.h

(#381) Handle key press events in new tree view

2015-08-20 11:16:19 +02:00

RiuViewer.cpp

Renaming in the aftermath of the MDI window control refactorization. Aligned fieldChangedByUi in that respact as well.

2017-01-20 11:38:18 +01:00

RiuViewer.h

#552 Linked views : Hide cursor in dependent views when view receives leave event

2016-12-16 14:53:19 +01:00

RiuViewerCommands.cpp

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

2017-02-16 10:18:39 +01:00

RiuViewerCommands.h

#949 Intersection : Convert coordinates using DisplayCoordTransform

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

RiuWellAllocationPlot.cpp

#1172 Well Alloc plot: Sorted the tracers according to contribution.

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

RiuWellAllocationPlot.h

#1174 Added context menu to WellAllocationPlot and added feature

2017-02-13 13:29:31 +01:00

RiuWellLogPlot.cpp

#1173 Made the legend a separate hide/show entity, and changed the overall layout of the well allocation plot

2017-02-13 08:44:29 +01:00

RiuWellLogPlot.h

#1173 Made the legend a separate hide/show entity, and changed the overall layout of the well allocation plot

2017-02-13 08:44:29 +01:00

RiuWellLogTrack.cpp

Whitespace

2017-02-13 08:44:29 +01:00

RiuWellLogTrack.h

Whitespace

2017-02-13 08:44:29 +01:00