(#486) Renamed "trace" to "track"

ApplicationCode/CMakeLists.txt

@@ -83,8 +83,8 @@ set( USER_INTERFACE_FILES
 	UserInterface/RiuWellLogPlot.h
 	UserInterface/RiuWellLogPlotCurve.cpp
 	UserInterface/RiuWellLogPlotCurve.h
-	UserInterface/RiuWellLogTracePlot.cpp
+	UserInterface/RiuWellLogTrackPlot.cpp
-	UserInterface/RiuWellLogTracePlot.h
+	UserInterface/RiuWellLogTrackPlot.h
 	UserInterface/RiuProjectPropertyView.h
 	UserInterface/RiuProjectPropertyView.cpp
 )
@@ -172,7 +172,7 @@ set ( QT_MOC_HEADERS
     UserInterface/RiuViewerCommands.h
 	UserInterface/RiuTreeViewEventFilter.h
 	UserInterface/RiuWellLogPlot.h
-	UserInterface/RiuWellLogTracePlot.h
+	UserInterface/RiuWellLogTrackPlot.h
 )
 
 qt4_wrap_cpp( MOC_FILES_CPP ${QT_MOC_HEADERS} )

ApplicationCode/Commands/RicDeleteItemExec.cpp

@@ -29,7 +29,7 @@
 #include "RimViewLinkerCollection.h"
 #include "RimWellLogPlot.h"
 #include "RimWellLogPlotCollection.h"
-#include "RimWellLogPlotTrace.h"
+#include "RimWellLogPlotTrack.h"
 #include "RimWellPathCollection.h"
 
 #include "cafNotificationCenter.h"
@@ -117,11 +117,11 @@ void RicDeleteItemExec::redo()
             wellLogPlot->updateAvailableDepthRange();
         }
 
-        RimWellLogPlotTrace* wellLogPlotTrace;
+        RimWellLogPlotTrack* wellLogPlotTrack;
-        parentObj->firstAnchestorOrThisOfType(wellLogPlotTrace);
+        parentObj->firstAnchestorOrThisOfType(wellLogPlotTrack);
-        if (wellLogPlotTrace)
+        if (wellLogPlotTrack)
         {
-            wellLogPlotTrace->updateAxisRangesAndReplot();
+            wellLogPlotTrack->updateAxisRangesAndReplot();
         }
 
         RimWellLogPlotCollection* wellLogPlotCollection = NULL;

ApplicationCode/Commands/RicDeleteItemFeature.cpp

@@ -22,7 +22,7 @@
 #include "RicDeleteItemExecData.h"
 
 #include "RimWellLogPlot.h"
-#include "RimWellLogPlotTrace.h"
+#include "RimWellLogPlotTrack.h"
 
 #include "cafCmdExecCommandManager.h"
 #include "cafCmdSelectionHelper.h"
@@ -49,14 +49,14 @@ bool RicDeleteItemFeature::isCommandEnabled()
     caf::PdmChildArrayFieldHandle* childArrayFieldHandle = dynamic_cast<caf::PdmChildArrayFieldHandle*>(currentPdmObject->parentField());
     if (!childArrayFieldHandle) return false;
 
-    if (dynamic_cast<RimWellLogPlotTrace*>(currentPdmObject))
+    if (dynamic_cast<RimWellLogPlotTrack*>(currentPdmObject))
     {
-        RimWellLogPlotTrace* plotTrace = dynamic_cast<RimWellLogPlotTrace*>(currentPdmObject);
+        RimWellLogPlotTrack* plotTrack = dynamic_cast<RimWellLogPlotTrack*>(currentPdmObject);
         RimWellLogPlot* wellLogPlot;
-        plotTrace->firstAnchestorOrThisOfType(wellLogPlot);
+        plotTrack->firstAnchestorOrThisOfType(wellLogPlot);
         if (wellLogPlot)
         {
-            if (wellLogPlot->traceCount() < 2)
+            if (wellLogPlot->trackCount() < 2)
             {
                 return false;
             }

ApplicationCode/Commands/WellLogCommands/CMakeLists_files.cmake

@@ -10,7 +10,7 @@ ${CEE_CURRENT_LIST_DIR}RicNewWellLogCurveExtractionFeature.h
 ${CEE_CURRENT_LIST_DIR}RicNewWellLogCurveLasFeature.h
 ${CEE_CURRENT_LIST_DIR}RicNewWellLogPlotFeature.h
 ${CEE_CURRENT_LIST_DIR}RicNewWellLogPlotFeatureImpl.h
-${CEE_CURRENT_LIST_DIR}RicNewWellLogPlotTraceFeature.h
+${CEE_CURRENT_LIST_DIR}RicNewWellLogPlotTrackFeature.h
 ${CEE_CURRENT_LIST_DIR}RicWellLogPlotCurveFeatureImpl.h
 ${CEE_CURRENT_LIST_DIR}RicWellLogsImportFileFeature.h
 )
@@ -21,7 +21,7 @@ ${CEE_CURRENT_LIST_DIR}RicNewWellLogCurveExtractionFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicNewWellLogCurveLasFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicNewWellLogPlotFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicNewWellLogPlotFeatureImpl.cpp
-${CEE_CURRENT_LIST_DIR}RicNewWellLogPlotTraceFeature.cpp
+${CEE_CURRENT_LIST_DIR}RicNewWellLogPlotTrackFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicWellLogPlotCurveFeatureImpl.cpp
 ${CEE_CURRENT_LIST_DIR}RicWellLogsImportFileFeature.cpp
 )

ApplicationCode/Commands/WellLogCommands/RicAddWellLogToPlotFeature.cpp

@@ -25,7 +25,7 @@
 #include "RimWellLogFile.h"
 #include "RimWellLogFileChannel.h"
 #include "RimWellLogPlot.h"
-#include "RimWellLogPlotTrace.h"
+#include "RimWellLogPlotTrack.h"
 #include "RimWellLogFileCurve.h"
 #include "RimProject.h"
 #include "RimMainPlotCollection.h"
@@ -37,7 +37,7 @@
 
 #include "RiaApplication.h"
 #include "RiuMainWindow.h"
-#include "RiuWellLogTracePlot.h"
+#include "RiuWellLogTrackPlot.h"
 
 #include "cafSelectionManager.h"
 #include "cafPdmUiTreeView.h"
@@ -68,8 +68,8 @@ void RicAddWellLogToPlotFeature::onActionTriggered(bool isChecked)
     
     RimWellLogPlot* plot = RicNewWellLogPlotFeatureImpl::createWellLogPlot();
 
-    RimWellLogPlotTrace* plotTrace = new RimWellLogPlotTrace();
+    RimWellLogPlotTrack* plotTrack = new RimWellLogPlotTrack();
-    plot->addTrace(plotTrace);
+    plot->addTrack(plotTrack);
 
     plot->loadDataAndUpdate();
 
@@ -86,10 +86,10 @@ void RicAddWellLogToPlotFeature::onActionTriggered(bool isChecked)
         wellLog->firstAnchestorOrThisOfType(wellLogFile);
         if (wellLogFile)
         {
-            size_t curveIdx = plotTrace->curveCount();
+            size_t curveIdx = plotTrack->curveCount();
 
             RimWellLogFileCurve* curve = new RimWellLogFileCurve;
-            plotTrace->addCurve(curve);
+            plotTrack->addCurve(curve);
 
             cvf::Color3f curveColor = RicWellLogPlotCurveFeatureImpl::curveColorFromIndex(curveIdx);
             curve->setColor(curveColor);
@@ -108,8 +108,8 @@ void RicAddWellLogToPlotFeature::onActionTriggered(bool isChecked)
 
     plot->updateAvailableDepthRange();
     plot->setVisibleDepthRangeFromContents();
-    plotTrace->updateXAxisRangeFromCurves();
+    plotTrack->updateXAxisRangeFromCurves();
-    plotTrace->viewer()->replot();
+    plotTrack->viewer()->replot();
 
     RiaApplication::instance()->project()->updateConnectedEditors();
 

ApplicationCode/Commands/WellLogCommands/RicNewWellLogCurveExtractionFeature.cpp

@@ -21,7 +21,7 @@
 
 #include "RicWellLogPlotCurveFeatureImpl.h"
 
-#include "RimWellLogPlotTrace.h"
+#include "RimWellLogPlotTrack.h"
 #include "RimWellLogExtractionCurve.h"
 
 #include "RiuMainWindow.h"
@@ -40,7 +40,7 @@ CAF_CMD_SOURCE_INIT(RicNewWellLogCurveExtractionFeature, "RicNewWellLogCurveExtr
 //--------------------------------------------------------------------------------------------------
 bool RicNewWellLogCurveExtractionFeature::isCommandEnabled()
 {
-    return selectedWellLogPlotTrace() != NULL;
+    return selectedWellLogPlotTrack() != NULL;
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -48,10 +48,10 @@ bool RicNewWellLogCurveExtractionFeature::isCommandEnabled()
 //--------------------------------------------------------------------------------------------------
 void RicNewWellLogCurveExtractionFeature::onActionTriggered(bool isChecked)
 {
-    RimWellLogPlotTrace* wellLogPlotTrace = selectedWellLogPlotTrace();
+    RimWellLogPlotTrack* wellLogPlotTrack = selectedWellLogPlotTrack();
-    if (wellLogPlotTrace)
+    if (wellLogPlotTrack)
     {
-        addCurve(wellLogPlotTrace);
+        addCurve(wellLogPlotTrack);
     }
 }
 
@@ -66,9 +66,9 @@ void RicNewWellLogCurveExtractionFeature::setupActionLook(QAction* actionToSetup
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimWellLogPlotTrace* RicNewWellLogCurveExtractionFeature::selectedWellLogPlotTrace()
+RimWellLogPlotTrack* RicNewWellLogCurveExtractionFeature::selectedWellLogPlotTrack()
 {
-    std::vector<RimWellLogPlotTrace*> selection;
+    std::vector<RimWellLogPlotTrack*> selection;
     caf::SelectionManager::instance()->objectsByType(&selection);
     return selection.size() > 0 ? selection[0] : NULL;
 }
@@ -76,20 +76,20 @@ RimWellLogPlotTrace* RicNewWellLogCurveExtractionFeature::selectedWellLogPlotTra
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RicNewWellLogCurveExtractionFeature::addCurve(RimWellLogPlotTrace* plotTrace)
+void RicNewWellLogCurveExtractionFeature::addCurve(RimWellLogPlotTrack* plotTrack)
 {
-    CVF_ASSERT(plotTrace);
+    CVF_ASSERT(plotTrack);
 
-    size_t curveIndex = plotTrace->curveCount();
+    size_t curveIndex = plotTrack->curveCount();
 
     RimWellLogPlotCurve* curve = new RimWellLogExtractionCurve();
-    plotTrace->addCurve(curve);
+    plotTrack->addCurve(curve);
 
     cvf::Color3f curveColor = RicWellLogPlotCurveFeatureImpl::curveColorFromIndex(curveIndex);
     curve->setColor(curveColor);
 
-    curve->setDescription(QString("Curve %1").arg(plotTrace->curveCount()));
+    curve->setDescription(QString("Curve %1").arg(plotTrack->curveCount()));
 
-    plotTrace->updateConnectedEditors();
+    plotTrack->updateConnectedEditors();
     RiuMainWindow::instance()->setCurrentObjectInTreeView(curve);
 }

ApplicationCode/Commands/WellLogCommands/RicNewWellLogCurveExtractionFeature.h

@@ -21,7 +21,7 @@
 
 #include "cafCmdFeature.h"
 
-class RimWellLogPlotTrace;
+class RimWellLogPlotTrack;
 
 //==================================================================================================
 /// 
@@ -31,7 +31,7 @@ class RicNewWellLogCurveExtractionFeature : public caf::CmdFeature
     CAF_CMD_HEADER_INIT;
 
 public:
-    static void addCurve(RimWellLogPlotTrace* plotTrace);
+    static void addCurve(RimWellLogPlotTrack* plotTrack);
 
 
 protected:
@@ -41,5 +41,5 @@ protected:
     virtual void setupActionLook( QAction* actionToSetup );
 
 private:
-   RimWellLogPlotTrace* selectedWellLogPlotTrace();
+   RimWellLogPlotTrack* selectedWellLogPlotTrack();
 };

ApplicationCode/Commands/WellLogCommands/RicNewWellLogCurveLasFeature.cpp

@@ -22,7 +22,7 @@
 #include "RicWellLogPlotCurveFeatureImpl.h"
 
 #include "RimWellLogFileCurve.h"
-#include "RimWellLogPlotTrace.h"
+#include "RimWellLogPlotTrack.h"
 
 #include "RiuMainWindow.h"
 
@@ -40,7 +40,7 @@ CAF_CMD_SOURCE_INIT(RicNewWellLogCurveLasFeature, "RicNewWellLogCurveLasFeature"
 //--------------------------------------------------------------------------------------------------
 bool RicNewWellLogCurveLasFeature::isCommandEnabled()
 {
-    return selectedWellLogPlotTrace() != NULL;
+    return selectedWellLogPlotTrack() != NULL;
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -48,10 +48,10 @@ bool RicNewWellLogCurveLasFeature::isCommandEnabled()
 //--------------------------------------------------------------------------------------------------
 void RicNewWellLogCurveLasFeature::onActionTriggered(bool isChecked)
 {
-    RimWellLogPlotTrace* wellLogPlotTrace = selectedWellLogPlotTrace();
+    RimWellLogPlotTrack* wellLogPlotTrack = selectedWellLogPlotTrack();
-    if (wellLogPlotTrace)
+    if (wellLogPlotTrack)
     {
-        addCurve(wellLogPlotTrace);
+        addCurve(wellLogPlotTrack);
     }
 }
 
@@ -66,9 +66,9 @@ void RicNewWellLogCurveLasFeature::setupActionLook(QAction* actionToSetup)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimWellLogPlotTrace* RicNewWellLogCurveLasFeature::selectedWellLogPlotTrace()
+RimWellLogPlotTrack* RicNewWellLogCurveLasFeature::selectedWellLogPlotTrack()
 {
-    std::vector<RimWellLogPlotTrace*> selection;
+    std::vector<RimWellLogPlotTrack*> selection;
     caf::SelectionManager::instance()->objectsByType(&selection);
     return selection.size() > 0 ? selection[0] : NULL;
 }
@@ -76,20 +76,20 @@ RimWellLogPlotTrace* RicNewWellLogCurveLasFeature::selectedWellLogPlotTrace()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RicNewWellLogCurveLasFeature::addCurve(RimWellLogPlotTrace* plotTrace)
+void RicNewWellLogCurveLasFeature::addCurve(RimWellLogPlotTrack* plotTrack)
 {
-    CVF_ASSERT(plotTrace);
+    CVF_ASSERT(plotTrack);
 
-    size_t curveIndex = plotTrace->curveCount();
+    size_t curveIndex = plotTrack->curveCount();
 
     RimWellLogPlotCurve* curve = new RimWellLogFileCurve();
-    plotTrace->addCurve(curve);
+    plotTrack->addCurve(curve);
 
     cvf::Color3f curveColor = RicWellLogPlotCurveFeatureImpl::curveColorFromIndex(curveIndex);
     curve->setColor(curveColor);
 
-    curve->setDescription(QString("Curve %1").arg(plotTrace->curveCount()));
+    curve->setDescription(QString("Curve %1").arg(plotTrack->curveCount()));
 
-    plotTrace->updateConnectedEditors();
+    plotTrack->updateConnectedEditors();
     RiuMainWindow::instance()->setCurrentObjectInTreeView(curve);
 }

ApplicationCode/Commands/WellLogCommands/RicNewWellLogCurveLasFeature.h

@@ -21,7 +21,7 @@
 
 #include "cafCmdFeature.h"
 
-class RimWellLogPlotTrace;
+class RimWellLogPlotTrack;
 
 //==================================================================================================
 /// 
@@ -31,7 +31,7 @@ class RicNewWellLogCurveLasFeature : public caf::CmdFeature
     CAF_CMD_HEADER_INIT;
 
 public:
-    static void addCurve(RimWellLogPlotTrace* plotTrace);
+    static void addCurve(RimWellLogPlotTrack* plotTrack);
 
 
 protected:
@@ -41,5 +41,5 @@ protected:
     virtual void setupActionLook( QAction* actionToSetup );
 
 private:
-   RimWellLogPlotTrace* selectedWellLogPlotTrace();
+   RimWellLogPlotTrack* selectedWellLogPlotTrack();
 };

ApplicationCode/Commands/WellLogCommands/RicNewWellLogPlotFeature.cpp

@@ -23,7 +23,7 @@
 
 #include "RimProject.h"
 #include "RimWellLogPlot.h"
-#include "RimWellLogPlotTrace.h"
+#include "RimWellLogPlotTrack.h"
 #include "RicNewWellLogCurveExtractionFeature.h"
 #include "RiaApplication.h"
 
@@ -49,15 +49,15 @@ void RicNewWellLogPlotFeature::onActionTriggered(bool isChecked)
 {
     RimWellLogPlot* plot = RicNewWellLogPlotFeatureImpl::createWellLogPlot();
 
-    RimWellLogPlotTrace* plotTrace = new RimWellLogPlotTrace();
+    RimWellLogPlotTrack* plotTrack = new RimWellLogPlotTrack();
-    plot->addTrace(plotTrace);
+    plot->addTrack(plotTrack);
-    plotTrace->setDescription(QString("Track %1").arg(plot->traceCount()));
+    plotTrack->setDescription(QString("Track %1").arg(plot->trackCount()));
 
     plot->loadDataAndUpdate();
     plot->updateConnectedEditors();
     RiaApplication::instance()->project()->updateConnectedEditors();
 
-    RicNewWellLogCurveExtractionFeature::addCurve(plotTrace);
+    RicNewWellLogCurveExtractionFeature::addCurve(plotTrack);
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/Commands/WellLogCommands/RicNewWellLogPlotTrackFeature.cpp

@@ -17,10 +17,10 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RicNewWellLogPlotTraceFeature.h"
+#include "RicNewWellLogPlotTrackFeature.h"
 
 #include "RimWellLogPlot.h"
-#include "RimWellLogPlotTrace.h"
+#include "RimWellLogPlotTrack.h"
 
 #include "RiuMainWindow.h"
 
@@ -31,12 +31,12 @@
 #include <QAction>
 
 
-CAF_CMD_SOURCE_INIT(RicNewWellLogPlotTraceFeature, "RicNewWellLogPlotTraceFeature");
+CAF_CMD_SOURCE_INIT(RicNewWellLogPlotTrackFeature, "RicNewWellLogPlotTrackFeature");
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-bool RicNewWellLogPlotTraceFeature::isCommandEnabled()
+bool RicNewWellLogPlotTrackFeature::isCommandEnabled()
 {
     return selectedWellLogPlot() != NULL;
 }
@@ -44,32 +44,32 @@ bool RicNewWellLogPlotTraceFeature::isCommandEnabled()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RicNewWellLogPlotTraceFeature::onActionTriggered(bool isChecked)
+void RicNewWellLogPlotTrackFeature::onActionTriggered(bool isChecked)
 {
     RimWellLogPlot* wellLogPlot = selectedWellLogPlot();
     if (wellLogPlot)
     {
-         RimWellLogPlotTrace* plotTrace = new RimWellLogPlotTrace;
+         RimWellLogPlotTrack* plotTrack = new RimWellLogPlotTrack;
-         wellLogPlot->addTrace(plotTrace);
+         wellLogPlot->addTrack(plotTrack);
-         plotTrace->setDescription(QString("Track %1").arg(wellLogPlot->traceCount()));
+         plotTrack->setDescription(QString("Track %1").arg(wellLogPlot->trackCount()));
 
          wellLogPlot->updateConnectedEditors();
-         RicNewWellLogCurveExtractionFeature::addCurve(plotTrace);
+         RicNewWellLogCurveExtractionFeature::addCurve(plotTrack);
     }
 }
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RicNewWellLogPlotTraceFeature::setupActionLook(QAction* actionToSetup)
+void RicNewWellLogPlotTrackFeature::setupActionLook(QAction* actionToSetup)
 {
-    actionToSetup->setText("New Trace");
+    actionToSetup->setText("New Track");
 }
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimWellLogPlot* RicNewWellLogPlotTraceFeature::selectedWellLogPlot()
+RimWellLogPlot* RicNewWellLogPlotTrackFeature::selectedWellLogPlot()
 {
     std::vector<RimWellLogPlot*> selection;
     caf::SelectionManager::instance()->objectsByType(&selection);

ApplicationCode/Commands/WellLogCommands/RicNewWellLogPlotTrackFeature.h

@@ -26,7 +26,7 @@ class RimWellLogPlot;
 //==================================================================================================
 /// 
 //==================================================================================================
-class RicNewWellLogPlotTraceFeature : public caf::CmdFeature
+class RicNewWellLogPlotTrackFeature : public caf::CmdFeature
 {
     CAF_CMD_HEADER_INIT;
 

ApplicationCode/ProjectDataModel/CMakeLists_files.cmake

@@ -63,7 +63,7 @@ ${CEE_CURRENT_LIST_DIR}RimViewLink.h
 ${CEE_CURRENT_LIST_DIR}RimMainPlotCollection.h
 ${CEE_CURRENT_LIST_DIR}RimWellLogPlotCollection.h
 ${CEE_CURRENT_LIST_DIR}RimWellLogPlot.h
-${CEE_CURRENT_LIST_DIR}RimWellLogPlotTrace.h
+${CEE_CURRENT_LIST_DIR}RimWellLogPlotTrack.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}RimViewLink.cpp
 ${CEE_CURRENT_LIST_DIR}RimMainPlotCollection.cpp
 ${CEE_CURRENT_LIST_DIR}RimWellLogPlotCollection.cpp
 ${CEE_CURRENT_LIST_DIR}RimWellLogPlot.cpp
-${CEE_CURRENT_LIST_DIR}RimWellLogPlotTrace.cpp
+${CEE_CURRENT_LIST_DIR}RimWellLogPlotTrack.cpp
 ${CEE_CURRENT_LIST_DIR}RimWellLogPlotCurve.cpp
 ${CEE_CURRENT_LIST_DIR}RimViewLinker.cpp
 ${CEE_CURRENT_LIST_DIR}RimViewLinkerCollection.cpp

ApplicationCode/ProjectDataModel/RimProject.cpp

@@ -625,7 +625,7 @@ void RimProject::computeUtmAreaOfInterest()
 #include "RimEclipseCellColors.h"
 #include "RimEclipseFaultColors.h"
 #include "RimWellLogPlot.h"
-#include "RimWellLogPlotTrace.h"
+#include "RimWellLogPlotTrack.h"
 #include "RimWellLogPlotCurve.h"
 #include "RimWellLogFileChannel.h"
 #include <QMenu>
@@ -815,10 +815,10 @@ void RimProject::actionsBasedOnSelection(QMenu& contextMenu)
         }
         else if (dynamic_cast<RimWellLogPlot*>(uiItem))
         {
-            commandIds << "RicNewWellLogPlotTraceFeature";
+            commandIds << "RicNewWellLogPlotTrackFeature";
             commandIds << "RicDeleteItemFeature";
         }
-        else if (dynamic_cast<RimWellLogPlotTrace*>(uiItem))
+        else if (dynamic_cast<RimWellLogPlotTrack*>(uiItem))
         {
             commandIds << "RicNewWellLogCurveExtractionFeature";
             commandIds << "RicNewWellLogCurveLasFeature";

ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp

@@ -33,9 +33,9 @@
 #include "RigCaseData.h"
 #include "RimWellLogPlotCurve.h"
 #include "RimWellLogPlot.h"
-#include "RimWellLogPlotTrace.h"
+#include "RimWellLogPlotTrack.h"
 
-#include "RiuWellLogTracePlot.h"
+#include "RiuWellLogTrackPlot.h"
 #include "RiuWellLogPlotCurve.h"
 
 #include "RimWellLogPlotCollection.h"
@@ -190,18 +190,18 @@ void RimWellLogExtractionCurve::updatePlotData()
 
         if (filteredValues.size())
         {
-            RimWellLogPlotTrace* plotTrace;
+            RimWellLogPlotTrack* plotTrack;
-            firstAnchestorOrThisOfType(plotTrace);
+            firstAnchestorOrThisOfType(plotTrack);
 
-            if (plotTrace)
+            if (plotTrack)
             {
-                plotTrace->updateXAxisRangeFromCurves();
+                plotTrack->updateXAxisRangeFromCurves();
             }
 
             RimWellLogPlot* wellLogPlot;
             firstAnchestorOrThisOfType(wellLogPlot);
 
-            if (wellLogPlot && plotTrace)
+            if (wellLogPlot && plotTrack)
             {
                 bool setDepthRange = !wellLogPlot->hasAvailableDepthRange();
                 wellLogPlot->updateAvailableDepthRange();
@@ -210,9 +210,9 @@ void RimWellLogExtractionCurve::updatePlotData()
                 {
                     wellLogPlot->setVisibleDepthRangeFromContents();
                 }
-                else if (plotTrace->curveCount() == 1)
+                else if (plotTrack->curveCount() == 1)
                 {
-                    plotTrace->updateAxisRangesAndReplot();
+                    plotTrack->updateAxisRangesAndReplot();
                 }
             }
         }

ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp

@@ -25,10 +25,10 @@
 #include "RimWellPath.h"
 #include "RimWellLogFileChannel.h"
 #include "RimWellLogFile.h"
-#include "RimWellLogPlotTrace.h"
+#include "RimWellLogPlotTrack.h"
 #include "RimWellLogPlot.h"
 
-#include "RiuWellLogTracePlot.h"
+#include "RiuWellLogTrackPlot.h"
 #include "RiuWellLogPlotCurve.h"
 
 #include "RiaApplication.h"
@@ -122,8 +122,8 @@ void RimWellLogFileCurve::fieldChangedByUi(const caf::PdmFieldHandle* changedFie
     RimWellLogPlot* wellLoglot;
     firstAnchestorOrThisOfType(wellLoglot);
 
-    RimWellLogPlotTrace* wellLoglotTrace;
+    RimWellLogPlotTrack* wellLoglotTrack;
-    firstAnchestorOrThisOfType(wellLoglotTrace);
+    firstAnchestorOrThisOfType(wellLoglotTrack);
 
     if (changedField == &m_wellPath)
     {
@@ -135,9 +135,9 @@ void RimWellLogFileCurve::fieldChangedByUi(const caf::PdmFieldHandle* changedFie
             wellLoglot->setVisibleDepthRangeFromContents();
         }
 
-        if (wellLoglotTrace)
+        if (wellLoglotTrack)
         {
-            wellLoglotTrace->updateXAxisRangeFromCurves();
+            wellLoglotTrack->updateXAxisRangeFromCurves();
         }
     }
     else if (changedField == &m_wellLogChannnelName)
@@ -157,9 +157,9 @@ void RimWellLogFileCurve::fieldChangedByUi(const caf::PdmFieldHandle* changedFie
                 wellLoglot->setVisibleDepthRangeFromContents();
             }
 
-            if (wellLoglotTrace)
+            if (wellLoglotTrack)
             {
-                wellLoglotTrace->updateXAxisRangeFromCurves();
+                wellLoglotTrack->updateXAxisRangeFromCurves();
             }
         }
     }

ApplicationCode/ProjectDataModel/RimWellLogPlot.cpp

@@ -19,10 +19,10 @@
 
 #include "RimWellLogPlot.h"
 
-#include "RimWellLogPlotTrace.h"
+#include "RimWellLogPlotTrack.h"
 
 #include "RiuWellLogPlot.h"
-#include "RiuWellLogTracePlot.h"
+#include "RiuWellLogTrackPlot.h"
 #include "RiuMainWindow.h"
 
 #include "cafPdmUiTreeView.h"
@@ -69,8 +69,8 @@ RimWellLogPlot::RimWellLogPlot()
     CAF_PDM_InitField(&m_minimumVisibleDepth, "MinimumDepth", 0.0, "Min", "", "", "");
     CAF_PDM_InitField(&m_maximumVisibleDepth, "MaximumDepth", 1000.0, "Max", "", "", "");    
 
-    CAF_PDM_InitFieldNoDefault(&traces, "Traces", "",  "", "", "");
+    CAF_PDM_InitFieldNoDefault(&tracks, "Tracks", "",  "", "", "");
-    traces.uiCapability()->setUiHidden(true);
+    tracks.uiCapability()->setUiHidden(true);
 
     CAF_PDM_InitFieldNoDefault(&windowGeometry, "WindowGeometry", "", "", "", "");
     windowGeometry.uiCapability()->setUiHidden(true);
@@ -100,7 +100,7 @@ void RimWellLogPlot::updateViewerWidget()
         {
             m_viewer = new RiuWellLogPlot(this, RiuMainWindow::instance());
 
-            recreateTracePlots();
+            recreateTrackPlots();
 
             RiuMainWindow::instance()->addViewer(m_viewer, windowGeometry());
             RiuMainWindow::instance()->setActiveViewer(m_viewer);
@@ -149,7 +149,7 @@ void RimWellLogPlot::fieldChangedByUi(const caf::PdmFieldHandle* changedField, c
     }
     if (changedField == &m_depthType)
     {
-        updateTraces();
+        updateTracks();
     }
 }
 
@@ -164,13 +164,13 @@ caf::PdmFieldHandle* RimWellLogPlot::objectToggleField()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimWellLogPlot::addTrace(RimWellLogPlotTrace* trace)
+void RimWellLogPlot::addTrack(RimWellLogPlotTrack* track)
 {
-    traces.push_back(trace);
+    tracks.push_back(track);
     if(m_viewer)
     {
-        trace->recreateViewer();
+        track->recreateViewer();
-        m_viewer->insertTracePlot(trace->viewer());
+        m_viewer->insertTrackPlot(track->viewer());
     }
 }
 
@@ -224,21 +224,21 @@ void RimWellLogPlot::updateAvailableDepthRange()
     double minDepth = HUGE_VAL;
     double maxDepth = -HUGE_VAL;
 
-    for (size_t tIdx = 0; tIdx < traces.size(); tIdx++)
+    for (size_t tIdx = 0; tIdx < tracks.size(); tIdx++)
     {
-        double minTraceDepth = HUGE_VAL;
+        double minTrackDepth = HUGE_VAL;
-        double maxTraceDepth = -HUGE_VAL;
+        double maxTrackDepth = -HUGE_VAL;
 
-        if (traces[tIdx]->availableDepthRange(&minTraceDepth, &maxTraceDepth))
+        if (tracks[tIdx]->availableDepthRange(&minTrackDepth, &maxTrackDepth))
         {
-            if (minTraceDepth < minDepth)
+            if (minTrackDepth < minDepth)
             {
-                minDepth = minTraceDepth;
+                minDepth = minTrackDepth;
             }
 
-            if (maxTraceDepth > maxDepth)
+            if (maxTrackDepth > maxDepth)
             {
-                maxDepth = maxTraceDepth;
+                maxDepth = maxTrackDepth;
             }
         }
     }
@@ -315,19 +315,19 @@ void RimWellLogPlot::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
 void RimWellLogPlot::loadDataAndUpdate()
 {
     updateViewerWidget();
-    updateTraces();
+    updateTracks();
 }
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimWellLogPlot::updateTraces()
+void RimWellLogPlot::updateTracks()
 {
     if (m_showWindow)
     {
-        for (size_t tIdx = 0; tIdx < traces.size(); ++tIdx)
+        for (size_t tIdx = 0; tIdx < tracks.size(); ++tIdx)
         {
-            traces[tIdx]->loadDataAndUpdate();
+            tracks[tIdx]->loadDataAndUpdate();
         }
 
         updateAvailableDepthRange();
@@ -369,14 +369,14 @@ void RimWellLogPlot::setVisibleDepthRangeFromContents()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimWellLogPlot::recreateTracePlots()
+void RimWellLogPlot::recreateTrackPlots()
 {
     CVF_ASSERT(m_viewer);
 
-    for (size_t tIdx = 0; tIdx < traces.size(); ++tIdx)
+    for (size_t tIdx = 0; tIdx < tracks.size(); ++tIdx)
     {
-        traces[tIdx]->recreateViewer();
+        tracks[tIdx]->recreateViewer();
-        m_viewer->insertTracePlot(traces[tIdx]->viewer());
+        m_viewer->insertTrackPlot(tracks[tIdx]->viewer());
     }
 }
 
@@ -385,9 +385,9 @@ void RimWellLogPlot::recreateTracePlots()
 //--------------------------------------------------------------------------------------------------
 void RimWellLogPlot::detachAllCurves()
 {
-    for (size_t tIdx = 0; tIdx < traces.size(); ++tIdx)
+    for (size_t tIdx = 0; tIdx < tracks.size(); ++tIdx)
     {
-       traces[tIdx]->detachAllCurves();
+       tracks[tIdx]->detachAllCurves();
     }
 }
 

ApplicationCode/ProjectDataModel/RimWellLogPlot.h

@@ -27,7 +27,7 @@
 #include <QPointer>
 
 class RiuWellLogPlot;
-class RimWellLogPlotTrace;
+class RimWellLogPlotTrack;
 
 
 //==================================================================================================
@@ -52,11 +52,11 @@ public:
     void setDescription(const QString& description);
     void updateViewerWidgetWindowTitle();
 
-    void    addTrace(RimWellLogPlotTrace* trace);
+    void    addTrack(RimWellLogPlotTrack* track);
-    size_t  traceCount() { return traces.size();}
+    size_t  trackCount() { return tracks.size();}
 
     void loadDataAndUpdate();
-    void updateTraces();
+    void updateTracks();
 
     RiuWellLogPlot* viewer();
 
@@ -89,7 +89,7 @@ protected:
 
 private:
     void updateViewerWidget();
-    void recreateTracePlots();
+    void recreateTrackPlots();
     void detachAllCurves();
     void handleViewerDeletion();
 
@@ -102,7 +102,7 @@ private:
     
     caf::PdmField<bool>                 m_showWindow;
 
-    caf::PdmChildArrayField<RimWellLogPlotTrace*> traces;
+    caf::PdmChildArrayField<RimWellLogPlotTrack*> tracks;
     
     caf::PdmField<QString>                          m_userName;
     caf::PdmField< caf::AppEnum< DepthTypeEnum > >  m_depthType;

ApplicationCode/ProjectDataModel/RimWellLogPlotCurve.cpp

@@ -21,7 +21,7 @@
 
 #include "RimWellLogPlot.h"
 
-#include "RiuWellLogTracePlot.h"
+#include "RiuWellLogTrackPlot.h"
 #include "RiuWellLogPlotCurve.h"
 
 #include "cvfAssert.h"
@@ -122,7 +122,7 @@ void RimWellLogPlotCurve::updatePlotData()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimWellLogPlotCurve::setPlot(RiuWellLogTracePlot* plot)
+void RimWellLogPlotCurve::setPlot(RiuWellLogTrackPlot* plot)
 {
     m_plot = plot;
     if (m_showCurve)

ApplicationCode/ProjectDataModel/RimWellLogPlotCurve.h

@@ -25,7 +25,7 @@
 
 #include <vector>
 
-class RiuWellLogTracePlot;
+class RiuWellLogTrackPlot;
 class RiuWellLogPlotCurve;
 class QwtPlotCurve;
 class QString;
@@ -47,7 +47,7 @@ public:
     bool    depthRange(double* minimumDepth, double* maximumDepth) const;
     bool    valueRange(double* minimumValue, double* maximumValue) const;
     
-    void    setPlot(RiuWellLogTracePlot* plot);
+    void    setPlot(RiuWellLogTrackPlot* plot);
     void    detachCurve();
 
     QwtPlotCurve* plotCurve() const;
@@ -69,6 +69,6 @@ protected:
     // caf::PdmField<Linestyle> m_lineStyle;
     // caf::PdmField<int>       m_lineWidth;
 
-    RiuWellLogTracePlot*    m_plot;
+    RiuWellLogTrackPlot*    m_plot;
     RiuWellLogPlotCurve*    m_plotCurve;
 };

ApplicationCode/ProjectDataModel/RimWellLogPlotTrack.cpp

@@ -17,12 +17,12 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RimWellLogPlotTrace.h"
+#include "RimWellLogPlotTrack.h"
 
 #include "RimWellLogPlot.h"
 #include "RimWellLogPlotCurve.h"
 
-#include "RiuWellLogTracePlot.h"
+#include "RiuWellLogTrackPlot.h"
 #include "RiuWellLogPlot.h"
 #include "RiuMainWindow.h"
 
@@ -31,36 +31,36 @@
 
 #include <math.h>
 
-#define RI_LOGPLOTTRACE_MINX_DEFAULT    -10.0
+#define RI_LOGPLOTTRACK_MINX_DEFAULT    -10.0
-#define RI_LOGPLOTTRACE_MAXX_DEFAULT    100.0
+#define RI_LOGPLOTTRACK_MAXX_DEFAULT    100.0
 
 
-CAF_PDM_SOURCE_INIT(RimWellLogPlotTrace, "WellLogPlotTrace");
+CAF_PDM_SOURCE_INIT(RimWellLogPlotTrack, "WellLogPlotTrack");
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimWellLogPlotTrace::RimWellLogPlotTrace()
+RimWellLogPlotTrack::RimWellLogPlotTrack()
 {
-    CAF_PDM_InitObject("Trace", "", "", "");
+    CAF_PDM_InitObject("Track", "", "", "");
 
     CAF_PDM_InitFieldNoDefault(&m_userName, "TrackDescription", "Name", "", "", "");
     m_userName.uiCapability()->setUiReadOnly(true);
 
-    CAF_PDM_InitField(&m_show, "Show", true, "Show trace", "", "", "");
+    CAF_PDM_InitField(&m_show, "Show", true, "Show track", "", "", "");
     m_show.uiCapability()->setUiHidden(true);
 
     CAF_PDM_InitFieldNoDefault(&curves, "Curves", "",  "", "", "");
     curves.uiCapability()->setUiHidden(true);
 
-    CAF_PDM_InitField(&m_visibleXRangeMin, "VisibleXRangeMin", RI_LOGPLOTTRACE_MINX_DEFAULT, "Min", "", "", "");
+    CAF_PDM_InitField(&m_visibleXRangeMin, "VisibleXRangeMin", RI_LOGPLOTTRACK_MINX_DEFAULT, "Min", "", "", "");
-    CAF_PDM_InitField(&m_visibleXRangeMax, "VisibleXRangeMax", RI_LOGPLOTTRACE_MAXX_DEFAULT, "Max", "", "", "");   
+    CAF_PDM_InitField(&m_visibleXRangeMax, "VisibleXRangeMax", RI_LOGPLOTTRACK_MAXX_DEFAULT, "Max", "", "", "");   
 }
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimWellLogPlotTrace::~RimWellLogPlotTrace()
+RimWellLogPlotTrack::~RimWellLogPlotTrack()
 {
     delete m_viewer;
 }
@@ -68,7 +68,7 @@ RimWellLogPlotTrace::~RimWellLogPlotTrace()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimWellLogPlotTrace::setDescription(const QString& description)
+void RimWellLogPlotTrack::setDescription(const QString& description)
 {
     m_userName = description;
 }
@@ -76,7 +76,7 @@ void RimWellLogPlotTrace::setDescription(const QString& description)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimWellLogPlotTrace::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
+void RimWellLogPlotTrack::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
 {
     if (changedField == &m_show)
     {
@@ -92,7 +92,7 @@ void RimWellLogPlotTrace::fieldChangedByUi(const caf::PdmFieldHandle* changedFie
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-caf::PdmFieldHandle* RimWellLogPlotTrace::objectToggleField()
+caf::PdmFieldHandle* RimWellLogPlotTrack::objectToggleField()
 {
     return &m_show;
 }
@@ -100,7 +100,7 @@ caf::PdmFieldHandle* RimWellLogPlotTrace::objectToggleField()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-caf::PdmFieldHandle* RimWellLogPlotTrace::userDescriptionField()
+caf::PdmFieldHandle* RimWellLogPlotTrack::userDescriptionField()
 {
     return &m_userName;
 }
@@ -108,7 +108,7 @@ caf::PdmFieldHandle* RimWellLogPlotTrace::userDescriptionField()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimWellLogPlotTrace::addCurve(RimWellLogPlotCurve* curve)
+void RimWellLogPlotTrack::addCurve(RimWellLogPlotCurve* curve)
 {
     curves.push_back(curve);
 
@@ -122,7 +122,7 @@ void RimWellLogPlotTrace::addCurve(RimWellLogPlotCurve* curve)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RiuWellLogTracePlot* RimWellLogPlotTrace::viewer()
+RiuWellLogTrackPlot* RimWellLogPlotTrack::viewer()
 {
     return m_viewer;
 }
@@ -130,7 +130,7 @@ RiuWellLogTracePlot* RimWellLogPlotTrace::viewer()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-bool RimWellLogPlotTrace::availableDepthRange(double* minimumDepth, double* maximumDepth)
+bool RimWellLogPlotTrack::availableDepthRange(double* minimumDepth, double* maximumDepth)
 {
     double minDepth = HUGE_VAL;
     double maxDepth = -HUGE_VAL;
@@ -176,7 +176,7 @@ bool RimWellLogPlotTrace::availableDepthRange(double* minimumDepth, double* maxi
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimWellLogPlotTrace::loadDataAndUpdate()
+void RimWellLogPlotTrack::loadDataAndUpdate()
 {
     CVF_ASSERT(m_viewer);
 
@@ -198,11 +198,11 @@ void RimWellLogPlotTrace::loadDataAndUpdate()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimWellLogPlotTrace::recreateViewer()
+void RimWellLogPlotTrack::recreateViewer()
 {
     CVF_ASSERT(m_viewer == NULL);
 
-    m_viewer = new RiuWellLogTracePlot(this);
+    m_viewer = new RiuWellLogTrackPlot(this);
     for (size_t cIdx = 0; cIdx < curves.size(); ++cIdx)
     {
         curves[cIdx]->setPlot(this->m_viewer);
@@ -212,7 +212,7 @@ void RimWellLogPlotTrace::recreateViewer()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimWellLogPlotTrace::detachAllCurves()
+void RimWellLogPlotTrack::detachAllCurves()
 {
     for (size_t cIdx = 0; cIdx < curves.size(); ++cIdx)
     {
@@ -223,7 +223,7 @@ void RimWellLogPlotTrace::detachAllCurves()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimWellLogPlotTrace::updateAxisRangesAndReplot()
+void RimWellLogPlotTrack::updateAxisRangesAndReplot()
 {
     bool rangesChanged = false;
 
@@ -243,7 +243,7 @@ void RimWellLogPlotTrace::updateAxisRangesAndReplot()
         // Assume auto-scaling on X-axis as long as curves exist, reset to default if not
         if (curves.size() < 1)
         {
-            m_viewer->setAxisScale(QwtPlot::xTop, RI_LOGPLOTTRACE_MINX_DEFAULT, RI_LOGPLOTTRACE_MAXX_DEFAULT);
+            m_viewer->setAxisScale(QwtPlot::xTop, RI_LOGPLOTTRACK_MINX_DEFAULT, RI_LOGPLOTTRACK_MAXX_DEFAULT);
             rangesChanged = true;
         }
 
@@ -257,7 +257,7 @@ void RimWellLogPlotTrace::updateAxisRangesAndReplot()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimWellLogPlotTrace::updateXAxisRangeFromCurves()
+void RimWellLogPlotTrack::updateXAxisRangeFromCurves()
 {
     double minValue = HUGE_VAL;
     double maxValue = -HUGE_VAL;
@@ -300,7 +300,7 @@ void RimWellLogPlotTrace::updateXAxisRangeFromCurves()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimWellLogPlotCurve* RimWellLogPlotTrace::curveDefinitionFromCurve(const QwtPlotCurve* curve) const
+RimWellLogPlotCurve* RimWellLogPlotTrack::curveDefinitionFromCurve(const QwtPlotCurve* curve) const
 {
     for (size_t idx = 0; idx < curves.size(); idx++)
     {
@@ -316,7 +316,7 @@ RimWellLogPlotCurve* RimWellLogPlotTrace::curveDefinitionFromCurve(const QwtPlot
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimWellLogPlotTrace::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
+void RimWellLogPlotTrack::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
 {
     uiOrdering.add(&m_userName);
 

ApplicationCode/ProjectDataModel/RimWellLogPlotTrack.h

@@ -28,7 +28,7 @@
 #include <vector>
 
 class RimWellLogPlotCurve;
-class RiuWellLogTracePlot;
+class RiuWellLogTrackPlot;
 
 class QwtPlotCurve;
 
@@ -36,12 +36,12 @@ class QwtPlotCurve;
 ///  
 ///  
 //==================================================================================================
-class RimWellLogPlotTrace : public caf::PdmObject
+class RimWellLogPlotTrack : public caf::PdmObject
 {
     CAF_PDM_HEADER_INIT;
 public:
-    RimWellLogPlotTrace();
+    RimWellLogPlotTrack();
-    virtual ~RimWellLogPlotTrace();
+    virtual ~RimWellLogPlotTrack();
 
     void setDescription(const QString& description);
 
@@ -57,7 +57,7 @@ public:
     void updateAxisRangesAndReplot();
     void updateXAxisRangeFromCurves();
 
-    RiuWellLogTracePlot* viewer();
+    RiuWellLogTrackPlot* viewer();
     
     RimWellLogPlotCurve* curveDefinitionFromCurve(const QwtPlotCurve* curve) const;
 
@@ -76,5 +76,5 @@ private:
     caf::PdmField<double> m_visibleXRangeMin;
     caf::PdmField<double> m_visibleXRangeMax;
 
-    QPointer<RiuWellLogTracePlot> m_viewer;
+    QPointer<RiuWellLogTrackPlot> m_viewer;
 };

ApplicationCode/UserInterface/RiuWellLogPlot.cpp

@@ -19,11 +19,11 @@
 
 #include "RiuWellLogPlot.h"
 
-#include "RiuWellLogTracePlot.h"
+#include "RiuWellLogTrackPlot.h"
 #include "RiuMainWindow.h"
 
 #include "RimWellLogPlot.h"
-#include "RimWellLogPlotTrace.h"
+#include "RimWellLogPlotTrack.h"
 
 #include "cafPdmUiTreeView.h"
 #include "cvfAssert.h"
@@ -69,11 +69,11 @@ RiuWellLogPlot::~RiuWellLogPlot()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RiuWellLogPlot::insertTracePlot(RiuWellLogTracePlot* tracePlot)
+void RiuWellLogPlot::insertTrackPlot(RiuWellLogTrackPlot* trackPlot)
 {
     // Insert the plot to the left of the scroll bar
-    m_layout->insertWidget(m_layout->count() - 1, tracePlot);
+    m_layout->insertWidget(m_layout->count() - 1, trackPlot);
-    m_tracePlots.append(tracePlot);  
+    m_trackPlots.append(trackPlot);  
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -81,10 +81,10 @@ void RiuWellLogPlot::insertTracePlot(RiuWellLogTracePlot* tracePlot)
 //--------------------------------------------------------------------------------------------------
 void RiuWellLogPlot::setDepthRangeAndReplot(double minDepth, double maxDepth)
 {
-    for (int tpIdx = 0; tpIdx < m_tracePlots.count(); tpIdx++)
+    for (int tpIdx = 0; tpIdx < m_trackPlots.count(); tpIdx++)
     {
-        m_tracePlots[tpIdx]->setDepthRange(minDepth, maxDepth);
+        m_trackPlots[tpIdx]->setDepthRange(minDepth, maxDepth);
-        m_tracePlots[tpIdx]->replot();
+        m_trackPlots[tpIdx]->replot();
     }
 
     updateScrollBar(minDepth, maxDepth);

ApplicationCode/UserInterface/RiuWellLogPlot.h

@@ -24,7 +24,7 @@
 #include "cafPdmPointer.h"
 
 class RimWellLogPlot;
-class RiuWellLogTracePlot;
+class RiuWellLogTrackPlot;
 
 class QHBoxLayout;
 class QScrollBar;
@@ -45,7 +45,7 @@ public:
 
     RimWellLogPlot* ownerPlotDefinition();
 
-    void insertTracePlot(RiuWellLogTracePlot* tracePlot);
+    void insertTrackPlot(RiuWellLogTrackPlot* trackPlot);
 
     void setDepthRangeAndReplot(double minDepth, double maxDepth);
 
@@ -58,7 +58,7 @@ private slots:
 private:
     QHBoxLayout*                    m_layout;
     QScrollBar*                     m_scrollBar;
-    QList<RiuWellLogTracePlot*>     m_tracePlots;
+    QList<RiuWellLogTrackPlot*>     m_trackPlots;
     caf::PdmPointer<RimWellLogPlot> m_plotDefinition;
 };
 

ApplicationCode/UserInterface/RiuWellLogTrackPlot.cpp

@@ -17,10 +17,10 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiuWellLogTracePlot.h"
+#include "RiuWellLogTrackPlot.h"
 
 #include "RimWellLogPlot.h"
-#include "RimWellLogPlotTrace.h"
+#include "RimWellLogPlotTrack.h"
 #include "RimWellLogPlotCurve.h"
 
 #include "RiuMainWindow.h"
@@ -47,11 +47,11 @@
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RiuWellLogTracePlot::RiuWellLogTracePlot(RimWellLogPlotTrace* plotTraceDefinition, QWidget* parent)
+RiuWellLogTrackPlot::RiuWellLogTrackPlot(RimWellLogPlotTrack* plotTrackDefinition, QWidget* parent)
     : QwtPlot(parent)
 {
-    Q_ASSERT(plotTraceDefinition);
+    Q_ASSERT(plotTrackDefinition);
-    m_plotTraceDefinition = plotTraceDefinition;
+    m_plotTrackDefinition = plotTrackDefinition;
 
     m_grid = new QwtPlotGrid();
     m_grid->attach(this);
@@ -66,7 +66,7 @@ RiuWellLogTracePlot::RiuWellLogTracePlot(RimWellLogPlotTrace* plotTraceDefinitio
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RiuWellLogTracePlot::~RiuWellLogTracePlot()
+RiuWellLogTrackPlot::~RiuWellLogTrackPlot()
 {
     m_grid->detach();
     delete m_grid;
@@ -75,7 +75,7 @@ RiuWellLogTracePlot::~RiuWellLogTracePlot()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RiuWellLogTracePlot::setDefaults()
+void RiuWellLogTrackPlot::setDefaults()
 {
     QPalette newPalette(palette());
     newPalette.setColor(QPalette::Background, Qt::white);
@@ -134,7 +134,7 @@ void RiuWellLogTracePlot::setDefaults()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RiuWellLogTracePlot::setDepthRange(double minDepth, double maxDepth)
+void RiuWellLogTrackPlot::setDepthRange(double minDepth, double maxDepth)
 {
     // Note: Y-axis is inverted
     setAxisScale(QwtPlot::yLeft, maxDepth, minDepth);
@@ -144,7 +144,7 @@ void RiuWellLogTracePlot::setDepthRange(double minDepth, double maxDepth)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RiuWellLogTracePlot::setDepthTitle(const QString& title)
+void RiuWellLogTrackPlot::setDepthTitle(const QString& title)
 {
     QwtText axisTitleY = axisTitle(QwtPlot::yLeft);
     axisTitleY.setText(title);
@@ -154,20 +154,20 @@ void RiuWellLogTracePlot::setDepthTitle(const QString& title)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-bool RiuWellLogTracePlot::eventFilter(QObject* watched, QEvent* event)
+bool RiuWellLogTrackPlot::eventFilter(QObject* watched, QEvent* event)
 {
     if (watched == canvas())
     {
         QWheelEvent* wheelEvent = dynamic_cast<QWheelEvent*>(event);
         if (wheelEvent)
         {
-            if (!m_plotTraceDefinition)
+            if (!m_plotTrackDefinition)
             {
                 return QwtPlot::eventFilter(watched, event);
             }
 
             RimWellLogPlot* plotDefinition;
-            m_plotTraceDefinition->firstAnchestorOrThisOfType(plotDefinition);
+            m_plotTrackDefinition->firstAnchestorOrThisOfType(plotDefinition);
             if (!plotDefinition)
             {
                 return QwtPlot::eventFilter(watched, event);
@@ -214,11 +214,11 @@ bool RiuWellLogTracePlot::eventFilter(QObject* watched, QEvent* event)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RiuWellLogTracePlot::focusInEvent(QFocusEvent* event)
+void RiuWellLogTrackPlot::focusInEvent(QFocusEvent* event)
 {
-    if (m_plotTraceDefinition)
+    if (m_plotTrackDefinition)
     {
-        RiuMainWindow::instance()->projectTreeView()->selectAsCurrentItem(m_plotTraceDefinition);
+        RiuMainWindow::instance()->projectTreeView()->selectAsCurrentItem(m_plotTrackDefinition);
         clearFocus();
     }
 }
@@ -226,7 +226,7 @@ void RiuWellLogTracePlot::focusInEvent(QFocusEvent* event)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RiuWellLogTracePlot::selectClosestCurve(const QPoint& pos)
+void RiuWellLogTrackPlot::selectClosestCurve(const QPoint& pos)
 {
     QwtPlotCurve* closestCurve = NULL;
     double distMin = DBL_MAX;
@@ -249,7 +249,7 @@ void RiuWellLogTracePlot::selectClosestCurve(const QPoint& pos)
 
     if (closestCurve)
     {
-        RimWellLogPlotCurve* selectedCurve = m_plotTraceDefinition->curveDefinitionFromCurve(closestCurve);
+        RimWellLogPlotCurve* selectedCurve = m_plotTrackDefinition->curveDefinitionFromCurve(closestCurve);
         if (selectedCurve)
         {
             RiuMainWindow::instance()->projectTreeView()->selectAsCurrentItem(selectedCurve);
@@ -260,7 +260,7 @@ void RiuWellLogTracePlot::selectClosestCurve(const QPoint& pos)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-QSize RiuWellLogTracePlot::sizeHint() const
+QSize RiuWellLogTrackPlot::sizeHint() const
 {
     return QSize(0, 0);
 }
@@ -268,7 +268,7 @@ QSize RiuWellLogTracePlot::sizeHint() const
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-QSize RiuWellLogTracePlot::minimumSizeHint() const
+QSize RiuWellLogTrackPlot::minimumSizeHint() const
 {
     return QSize(0, 0);
 }

ApplicationCode/UserInterface/RiuWellLogTrackPlot.h

@@ -21,7 +21,7 @@
 
 #include "qwt_plot.h"
 
-class RimWellLogPlotTrace;
+class RimWellLogPlotTrack;
 class QwtPlotGrid;
 class QwtLegend;
 
@@ -29,16 +29,16 @@ class QEvent;
 
 //==================================================================================================
 //
-// RiuWellLogTracePlot
+//
 //
 //==================================================================================================
-class RiuWellLogTracePlot : public QwtPlot
+class RiuWellLogTrackPlot : public QwtPlot
 {
     Q_OBJECT
 
 public:
-    RiuWellLogTracePlot(RimWellLogPlotTrace* plotTraceDefinition, QWidget* parent = NULL);
+    RiuWellLogTrackPlot(RimWellLogPlotTrack* plotTrackDefinition, QWidget* parent = NULL);
-    virtual ~RiuWellLogTracePlot();
+    virtual ~RiuWellLogTrackPlot();
 
     void setDepthRange(double minDepth, double maxDepth);
     void setDepthTitle(const QString& title);
@@ -54,7 +54,7 @@ private:
     void selectClosestCurve(const QPoint& pos);
 
 private:
-    RimWellLogPlotTrace*    m_plotTraceDefinition;
+    RimWellLogPlotTrack*    m_plotTrackDefinition;
     QwtPlotGrid*            m_grid;
     QwtLegend*              m_legend;
 };