From 10582750ab170fc87707e38d86ee7a0abe933fad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Wed, 4 Nov 2015 16:14:42 +0100 Subject: [PATCH] Renamed files PlotTrack/TrackPlot -> Track --- ApplicationCode/CMakeLists.txt | 6 +++--- ApplicationCode/Commands/RicDeleteItemExec.cpp | 2 +- ApplicationCode/Commands/RicDeleteItemFeature.cpp | 2 +- .../Commands/WellLogCommands/RicAddWellLogToPlotFeature.cpp | 4 ++-- .../WellLogCommands/RicDeleteWellLogPlotTrackFeature.cpp | 2 +- .../WellLogCommands/RicNewWellLogCurveExtractionFeature.cpp | 2 +- .../WellLogCommands/RicNewWellLogFileCurveFeature.cpp | 2 +- .../Commands/WellLogCommands/RicNewWellLogPlotFeature.cpp | 2 +- .../WellLogCommands/RicNewWellLogPlotFeatureImpl.cpp | 2 +- .../WellLogCommands/RicNewWellLogPlotTrackFeature.cpp | 2 +- .../WellLogCommands/RicWellLogPlotTrackFeatureImpl.cpp | 2 +- ApplicationCode/ProjectDataModel/CMakeLists_files.cmake | 4 ++-- ApplicationCode/ProjectDataModel/RimProject.cpp | 2 +- .../ProjectDataModel/RimWellLogExtractionCurve.cpp | 4 ++-- ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp | 4 ++-- ApplicationCode/ProjectDataModel/RimWellLogPlot.cpp | 4 ++-- ApplicationCode/ProjectDataModel/RimWellLogPlotCurve.cpp | 4 ++-- .../{RimWellLogPlotTrack.cpp => RimWellLogTrack.cpp} | 4 ++-- .../{RimWellLogPlotTrack.h => RimWellLogTrack.h} | 0 ApplicationCode/UserInterface/RiuDragDrop.cpp | 4 ++-- ApplicationCode/UserInterface/RiuWellLogPlot.cpp | 4 ++-- .../{RiuWellLogTrackPlot.cpp => RiuWellLogTrack.cpp} | 4 ++-- .../{RiuWellLogTrackPlot.h => RiuWellLogTrack.h} | 0 23 files changed, 33 insertions(+), 33 deletions(-) rename ApplicationCode/ProjectDataModel/{RimWellLogPlotTrack.cpp => RimWellLogTrack.cpp} (99%) rename ApplicationCode/ProjectDataModel/{RimWellLogPlotTrack.h => RimWellLogTrack.h} (100%) rename ApplicationCode/UserInterface/{RiuWellLogTrackPlot.cpp => RiuWellLogTrack.cpp} (99%) rename ApplicationCode/UserInterface/{RiuWellLogTrackPlot.h => RiuWellLogTrack.h} (100%) diff --git a/ApplicationCode/CMakeLists.txt b/ApplicationCode/CMakeLists.txt index 46be7f3dce..e1a80d6e3f 100644 --- a/ApplicationCode/CMakeLists.txt +++ b/ApplicationCode/CMakeLists.txt @@ -86,8 +86,8 @@ set( USER_INTERFACE_FILES UserInterface/RiuWellLogPlot.h UserInterface/RiuWellLogPlotCurve.cpp UserInterface/RiuWellLogPlotCurve.h - UserInterface/RiuWellLogTrackPlot.cpp - UserInterface/RiuWellLogTrackPlot.h + UserInterface/RiuWellLogTrack.cpp + UserInterface/RiuWellLogTrack.h UserInterface/RiuProjectPropertyView.h UserInterface/RiuProjectPropertyView.cpp ) @@ -182,7 +182,7 @@ set ( QT_MOC_HEADERS UserInterface/RiuViewerCommands.h UserInterface/RiuTreeViewEventFilter.h UserInterface/RiuWellLogPlot.h - UserInterface/RiuWellLogTrackPlot.h + UserInterface/RiuWellLogTrack.h ) qt4_wrap_cpp( MOC_FILES_CPP ${QT_MOC_HEADERS} ) diff --git a/ApplicationCode/Commands/RicDeleteItemExec.cpp b/ApplicationCode/Commands/RicDeleteItemExec.cpp index 85ae9a4c80..6b335c716c 100644 --- a/ApplicationCode/Commands/RicDeleteItemExec.cpp +++ b/ApplicationCode/Commands/RicDeleteItemExec.cpp @@ -29,7 +29,7 @@ #include "RimViewLinkerCollection.h" #include "RimWellLogPlot.h" #include "RimWellLogPlotCollection.h" -#include "RimWellLogPlotTrack.h" +#include "RimWellLogTrack.h" #include "RimWellPathCollection.h" #include "cafNotificationCenter.h" diff --git a/ApplicationCode/Commands/RicDeleteItemFeature.cpp b/ApplicationCode/Commands/RicDeleteItemFeature.cpp index 6e9a9fe65b..387fc7be26 100644 --- a/ApplicationCode/Commands/RicDeleteItemFeature.cpp +++ b/ApplicationCode/Commands/RicDeleteItemFeature.cpp @@ -22,7 +22,7 @@ #include "RicDeleteItemExecData.h" #include "RimWellLogPlot.h" -#include "RimWellLogPlotTrack.h" +#include "RimWellLogTrack.h" #include "cafCmdExecCommandManager.h" #include "cafCmdSelectionHelper.h" diff --git a/ApplicationCode/Commands/WellLogCommands/RicAddWellLogToPlotFeature.cpp b/ApplicationCode/Commands/WellLogCommands/RicAddWellLogToPlotFeature.cpp index 9d70eec660..2ae4694c36 100644 --- a/ApplicationCode/Commands/WellLogCommands/RicAddWellLogToPlotFeature.cpp +++ b/ApplicationCode/Commands/WellLogCommands/RicAddWellLogToPlotFeature.cpp @@ -25,7 +25,7 @@ #include "RimWellLogFile.h" #include "RimWellLogFileChannel.h" #include "RimWellLogPlot.h" -#include "RimWellLogPlotTrack.h" +#include "RimWellLogTrack.h" #include "RimWellLogFileCurve.h" #include "RimProject.h" #include "RimMainPlotCollection.h" @@ -37,7 +37,7 @@ #include "RiaApplication.h" #include "RiuMainWindow.h" -#include "RiuWellLogTrackPlot.h" +#include "RiuWellLogTrack.h" #include "cafSelectionManager.h" #include "cafPdmUiTreeView.h" diff --git a/ApplicationCode/Commands/WellLogCommands/RicDeleteWellLogPlotTrackFeature.cpp b/ApplicationCode/Commands/WellLogCommands/RicDeleteWellLogPlotTrackFeature.cpp index 12bca0e1e7..b5a89d10ce 100644 --- a/ApplicationCode/Commands/WellLogCommands/RicDeleteWellLogPlotTrackFeature.cpp +++ b/ApplicationCode/Commands/WellLogCommands/RicDeleteWellLogPlotTrackFeature.cpp @@ -19,7 +19,7 @@ #include "RicDeleteWellLogPlotTrackFeature.h" -#include "RimWellLogPlotTrack.h" +#include "RimWellLogTrack.h" #include "RimWellLogPlot.h" #include "cafSelectionManager.h" diff --git a/ApplicationCode/Commands/WellLogCommands/RicNewWellLogCurveExtractionFeature.cpp b/ApplicationCode/Commands/WellLogCommands/RicNewWellLogCurveExtractionFeature.cpp index e4cbdfb00a..4241d7f526 100644 --- a/ApplicationCode/Commands/WellLogCommands/RicNewWellLogCurveExtractionFeature.cpp +++ b/ApplicationCode/Commands/WellLogCommands/RicNewWellLogCurveExtractionFeature.cpp @@ -22,7 +22,7 @@ #include "RicWellLogPlotCurveFeatureImpl.h" #include "RicNewWellLogPlotFeatureImpl.h" -#include "RimWellLogPlotTrack.h" +#include "RimWellLogTrack.h" #include "RimWellLogExtractionCurve.h" #include "RimWellPath.h" #include "RimWellPathCollection.h" diff --git a/ApplicationCode/Commands/WellLogCommands/RicNewWellLogFileCurveFeature.cpp b/ApplicationCode/Commands/WellLogCommands/RicNewWellLogFileCurveFeature.cpp index c75ba4ab8f..96855dfde5 100644 --- a/ApplicationCode/Commands/WellLogCommands/RicNewWellLogFileCurveFeature.cpp +++ b/ApplicationCode/Commands/WellLogCommands/RicNewWellLogFileCurveFeature.cpp @@ -23,7 +23,7 @@ #include "RicNewWellLogPlotFeatureImpl.h" #include "RimWellLogFileCurve.h" -#include "RimWellLogPlotTrack.h" +#include "RimWellLogTrack.h" #include "RimWellLogFile.h" #include "RimWellLogFileChannel.h" #include "RimWellPath.h" diff --git a/ApplicationCode/Commands/WellLogCommands/RicNewWellLogPlotFeature.cpp b/ApplicationCode/Commands/WellLogCommands/RicNewWellLogPlotFeature.cpp index e456116c1e..4888ce4d2a 100644 --- a/ApplicationCode/Commands/WellLogCommands/RicNewWellLogPlotFeature.cpp +++ b/ApplicationCode/Commands/WellLogCommands/RicNewWellLogPlotFeature.cpp @@ -25,7 +25,7 @@ #include "RimProject.h" #include "RimWellLogPlot.h" -#include "RimWellLogPlotTrack.h" +#include "RimWellLogTrack.h" #include "RimWellLogPlotCurve.h" #include "RiaApplication.h" diff --git a/ApplicationCode/Commands/WellLogCommands/RicNewWellLogPlotFeatureImpl.cpp b/ApplicationCode/Commands/WellLogCommands/RicNewWellLogPlotFeatureImpl.cpp index 7e7671ddf0..f993a6b376 100644 --- a/ApplicationCode/Commands/WellLogCommands/RicNewWellLogPlotFeatureImpl.cpp +++ b/ApplicationCode/Commands/WellLogCommands/RicNewWellLogPlotFeatureImpl.cpp @@ -23,7 +23,7 @@ #include "RimMainPlotCollection.h" #include "RimWellLogPlotCollection.h" #include "RimWellLogPlot.h" -#include "RimWellLogPlotTrack.h" +#include "RimWellLogTrack.h" #include "RiaApplication.h" diff --git a/ApplicationCode/Commands/WellLogCommands/RicNewWellLogPlotTrackFeature.cpp b/ApplicationCode/Commands/WellLogCommands/RicNewWellLogPlotTrackFeature.cpp index 446798da8b..56fc5b51a7 100644 --- a/ApplicationCode/Commands/WellLogCommands/RicNewWellLogPlotTrackFeature.cpp +++ b/ApplicationCode/Commands/WellLogCommands/RicNewWellLogPlotTrackFeature.cpp @@ -20,7 +20,7 @@ #include "RicNewWellLogPlotTrackFeature.h" #include "RimWellLogPlot.h" -#include "RimWellLogPlotTrack.h" +#include "RimWellLogTrack.h" #include "RiuMainWindow.h" diff --git a/ApplicationCode/Commands/WellLogCommands/RicWellLogPlotTrackFeatureImpl.cpp b/ApplicationCode/Commands/WellLogCommands/RicWellLogPlotTrackFeatureImpl.cpp index 24dad36f64..db45f26819 100644 --- a/ApplicationCode/Commands/WellLogCommands/RicWellLogPlotTrackFeatureImpl.cpp +++ b/ApplicationCode/Commands/WellLogCommands/RicWellLogPlotTrackFeatureImpl.cpp @@ -20,7 +20,7 @@ #include "RicWellLogPlotTrackFeatureImpl.h" #include "RimWellLogPlot.h" -#include "RimWellLogPlotTrack.h" +#include "RimWellLogTrack.h" #include "RimWellLogPlotCurve.h" #include "RiuMainWindow.h" diff --git a/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake b/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake index 1e61fa84d9..b7cf593110 100644 --- a/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake +++ b/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake @@ -63,7 +63,7 @@ ${CEE_CURRENT_LIST_DIR}RimViewController.h ${CEE_CURRENT_LIST_DIR}RimMainPlotCollection.h ${CEE_CURRENT_LIST_DIR}RimWellLogPlotCollection.h ${CEE_CURRENT_LIST_DIR}RimWellLogPlot.h -${CEE_CURRENT_LIST_DIR}RimWellLogPlotTrack.h +${CEE_CURRENT_LIST_DIR}RimWellLogTrack.h ${CEE_CURRENT_LIST_DIR}RimWellLogPlotCurve.h ${CEE_CURRENT_LIST_DIR}RimViewLinker.h ${CEE_CURRENT_LIST_DIR}RimViewLinkerCollection.h @@ -132,7 +132,7 @@ ${CEE_CURRENT_LIST_DIR}RimViewController.cpp ${CEE_CURRENT_LIST_DIR}RimMainPlotCollection.cpp ${CEE_CURRENT_LIST_DIR}RimWellLogPlotCollection.cpp ${CEE_CURRENT_LIST_DIR}RimWellLogPlot.cpp -${CEE_CURRENT_LIST_DIR}RimWellLogPlotTrack.cpp +${CEE_CURRENT_LIST_DIR}RimWellLogTrack.cpp ${CEE_CURRENT_LIST_DIR}RimWellLogPlotCurve.cpp ${CEE_CURRENT_LIST_DIR}RimViewLinker.cpp ${CEE_CURRENT_LIST_DIR}RimViewLinkerCollection.cpp diff --git a/ApplicationCode/ProjectDataModel/RimProject.cpp b/ApplicationCode/ProjectDataModel/RimProject.cpp index 045bb8adff..802a8e765f 100644 --- a/ApplicationCode/ProjectDataModel/RimProject.cpp +++ b/ApplicationCode/ProjectDataModel/RimProject.cpp @@ -625,7 +625,7 @@ void RimProject::computeUtmAreaOfInterest() #include "RimEclipseCellColors.h" #include "RimEclipseFaultColors.h" #include "RimWellLogPlot.h" -#include "RimWellLogPlotTrack.h" +#include "RimWellLogTrack.h" #include "RimWellLogPlotCurve.h" #include "RimWellLogFileChannel.h" #include diff --git a/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp b/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp index 647da20dec..c742c926b0 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp @@ -38,7 +38,7 @@ #include "RimWellLogPlot.h" #include "RimWellLogPlotCollection.h" #include "RimWellLogPlotCurve.h" -#include "RimWellLogPlotTrack.h" +#include "RimWellLogTrack.h" #include "RimWellPath.h" #include "RimWellPathCollection.h" #include "RimEclipseView.h" @@ -47,7 +47,7 @@ #include "RimGeoMechCellColors.h" #include "RiuWellLogPlotCurve.h" -#include "RiuWellLogTrackPlot.h" +#include "RiuWellLogTrack.h" #include "cafPdmUiTreeOrdering.h" diff --git a/ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp b/ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp index b648aa9ba5..b42536c63a 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp @@ -25,10 +25,10 @@ #include "RimWellPath.h" #include "RimWellLogFileChannel.h" #include "RimWellLogFile.h" -#include "RimWellLogPlotTrack.h" +#include "RimWellLogTrack.h" #include "RimWellLogPlot.h" -#include "RiuWellLogTrackPlot.h" +#include "RiuWellLogTrack.h" #include "RiuWellLogPlotCurve.h" #include "RiaApplication.h" diff --git a/ApplicationCode/ProjectDataModel/RimWellLogPlot.cpp b/ApplicationCode/ProjectDataModel/RimWellLogPlot.cpp index be6dbb6727..b2627f34b4 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogPlot.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellLogPlot.cpp @@ -19,10 +19,10 @@ #include "RimWellLogPlot.h" -#include "RimWellLogPlotTrack.h" +#include "RimWellLogTrack.h" #include "RiuWellLogPlot.h" -#include "RiuWellLogTrackPlot.h" +#include "RiuWellLogTrack.h" #include "RiuMainWindow.h" #include "cafPdmUiTreeView.h" diff --git a/ApplicationCode/ProjectDataModel/RimWellLogPlotCurve.cpp b/ApplicationCode/ProjectDataModel/RimWellLogPlotCurve.cpp index 203059d253..1e5998da57 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogPlotCurve.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellLogPlotCurve.cpp @@ -21,10 +21,10 @@ #include "RimWellLogPlot.h" -#include "RimWellLogPlotTrack.h" +#include "RimWellLogTrack.h" #include "RiuWellLogPlotCurve.h" -#include "RiuWellLogTrackPlot.h" +#include "RiuWellLogTrack.h" #include "cvfAssert.h" diff --git a/ApplicationCode/ProjectDataModel/RimWellLogPlotTrack.cpp b/ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp similarity index 99% rename from ApplicationCode/ProjectDataModel/RimWellLogPlotTrack.cpp rename to ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp index 6cd3ed2441..b55600b5b4 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogPlotTrack.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp @@ -17,12 +17,12 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RimWellLogPlotTrack.h" +#include "RimWellLogTrack.h" #include "RimWellLogPlot.h" #include "RimWellLogPlotCurve.h" -#include "RiuWellLogTrackPlot.h" +#include "RiuWellLogTrack.h" #include "RiuWellLogPlot.h" #include "RiuMainWindow.h" diff --git a/ApplicationCode/ProjectDataModel/RimWellLogPlotTrack.h b/ApplicationCode/ProjectDataModel/RimWellLogTrack.h similarity index 100% rename from ApplicationCode/ProjectDataModel/RimWellLogPlotTrack.h rename to ApplicationCode/ProjectDataModel/RimWellLogTrack.h diff --git a/ApplicationCode/UserInterface/RiuDragDrop.cpp b/ApplicationCode/UserInterface/RiuDragDrop.cpp index 070cce6287..e4598bc0fb 100644 --- a/ApplicationCode/UserInterface/RiuDragDrop.cpp +++ b/ApplicationCode/UserInterface/RiuDragDrop.cpp @@ -30,11 +30,11 @@ #include "RimIdenticalGridCaseGroup.h" #include "RimMimeData.h" #include "RimWellLogFileChannel.h" -#include "RimWellLogPlotTrack.h" +#include "RimWellLogTrack.h" #include "RimWellLogPlotCurve.h" #include "RimWellLogPlot.h" -#include "RimWellLogPlotTrack.h" +#include "RimWellLogTrack.h" #include "RiuMainWindow.h" #include "cafPdmUiTreeView.h" diff --git a/ApplicationCode/UserInterface/RiuWellLogPlot.cpp b/ApplicationCode/UserInterface/RiuWellLogPlot.cpp index 8bf2e048ef..d3e88d8720 100644 --- a/ApplicationCode/UserInterface/RiuWellLogPlot.cpp +++ b/ApplicationCode/UserInterface/RiuWellLogPlot.cpp @@ -19,11 +19,11 @@ #include "RiuWellLogPlot.h" -#include "RiuWellLogTrackPlot.h" +#include "RiuWellLogTrack.h" #include "RiuMainWindow.h" #include "RimWellLogPlot.h" -#include "RimWellLogPlotTrack.h" +#include "RimWellLogTrack.h" #include "cafPdmUiTreeView.h" #include "cvfAssert.h" diff --git a/ApplicationCode/UserInterface/RiuWellLogTrackPlot.cpp b/ApplicationCode/UserInterface/RiuWellLogTrack.cpp similarity index 99% rename from ApplicationCode/UserInterface/RiuWellLogTrackPlot.cpp rename to ApplicationCode/UserInterface/RiuWellLogTrack.cpp index 99ac238534..32b276ec27 100644 --- a/ApplicationCode/UserInterface/RiuWellLogTrackPlot.cpp +++ b/ApplicationCode/UserInterface/RiuWellLogTrack.cpp @@ -17,10 +17,10 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RiuWellLogTrackPlot.h" +#include "RiuWellLogTrack.h" #include "RimWellLogPlot.h" -#include "RimWellLogPlotTrack.h" +#include "RimWellLogTrack.h" #include "RimWellLogPlotCurve.h" #include "RiuMainWindow.h" diff --git a/ApplicationCode/UserInterface/RiuWellLogTrackPlot.h b/ApplicationCode/UserInterface/RiuWellLogTrack.h similarity index 100% rename from ApplicationCode/UserInterface/RiuWellLogTrackPlot.h rename to ApplicationCode/UserInterface/RiuWellLogTrack.h