Renamed PlotCurve -> Curve

ApplicationCode/Commands/RicExportToLasFileFeature.cpp

@@ -46,7 +46,7 @@ bool RicExportToLasFileFeature::isCommandEnabled()
 //--------------------------------------------------------------------------------------------------
 void RicExportToLasFileFeature::onActionTriggered(bool isChecked)
 {
-    RimWellLogPlotCurve* curve = selectedWellLogPlotCurve();
+    RimWellLogCurve* curve = selectedWellLogPlotCurve();
     if (curve)
     {
         QString defaultDir = RiaApplication::instance()->defaultFileDialogDirectory("WELL_LOGS_DIR");
@@ -77,9 +77,9 @@ void RicExportToLasFileFeature::setupActionLook(QAction* actionToSetup)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimWellLogPlotCurve* RicExportToLasFileFeature::selectedWellLogPlotCurve() const
+RimWellLogCurve* RicExportToLasFileFeature::selectedWellLogPlotCurve() const
 {
-    std::vector<RimWellLogPlotCurve*> selection;
+    std::vector<RimWellLogCurve*> selection;
     caf::SelectionManager::instance()->objectsByType(&selection);
 
     if (selection.size() > 0)

ApplicationCode/Commands/RicExportToLasFileFeature.h

@@ -23,7 +23,7 @@
 
 #include <vector>
 
-class RimWellLogPlotCurve;
+class RimWellLogCurve;
 
 //==================================================================================================
 /// 
@@ -39,7 +39,7 @@ protected:
     virtual void setupActionLook( QAction* actionToSetup );
 
 private:
-    RimWellLogPlotCurve* selectedWellLogPlotCurve() const;
+    RimWellLogCurve* selectedWellLogPlotCurve() const;
 };
 
 

ApplicationCode/Commands/WellLogCommands/RicWellLogPlotTrackFeatureImpl.cpp

@@ -31,8 +31,8 @@
 /// 
 //--------------------------------------------------------------------------------------------------
 void RicWellLogPlotTrackFeatureImpl::moveCurvesToWellLogPlotTrack(RimWellLogTrack* destTrack, 
-                                                                  const std::vector<RimWellLogPlotCurve*>& curves, 
+                                                                  const std::vector<RimWellLogCurve*>& curves, 
-                                                                  RimWellLogPlotCurve* curveToInsertAfter)
+                                                                  RimWellLogCurve* curveToInsertAfter)
 {
     CVF_ASSERT(destTrack );
 
@@ -41,7 +41,7 @@ void RicWellLogPlotTrackFeatureImpl::moveCurvesToWellLogPlotTrack(RimWellLogTrac
 
     for (size_t cIdx = 0; cIdx < curves.size(); cIdx++)
     {
-        RimWellLogPlotCurve* curve = curves[cIdx];
+        RimWellLogCurve* curve = curves[cIdx];
 
         RimWellLogTrack* wellLogPlotTrack;
         curve->firstAnchestorOrThisOfType(wellLogPlotTrack);

ApplicationCode/Commands/WellLogCommands/RicWellLogPlotTrackFeatureImpl.h

@@ -23,7 +23,7 @@
 
 class RimWellLogPlot;
 class RimWellLogTrack;
-class RimWellLogPlotCurve;
+class RimWellLogCurve;
 
 //==================================================================================================
 /// 
@@ -33,8 +33,8 @@ class RicWellLogPlotTrackFeatureImpl
 public:
 
     static void moveCurvesToWellLogPlotTrack(RimWellLogTrack* dstTrack, 
-                                             const std::vector<RimWellLogPlotCurve*>& curves, 
+                                             const std::vector<RimWellLogCurve*>& curves, 
-                                             RimWellLogPlotCurve* insertAfterCurve);
+                                             RimWellLogCurve* insertAfterCurve);
     static void moveTracksToWellLogPlot(RimWellLogPlot* wellLogPlot, 
                                         const std::vector<RimWellLogTrack*>& tracks,
                                         RimWellLogTrack* trackToInsertAfter);

ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp

@@ -128,7 +128,7 @@ void RimEclipseResultDefinition::fieldChangedByUi(const caf::PdmFieldHandle* cha
     RimEclipsePropertyFilter* propFilter = dynamic_cast<RimEclipsePropertyFilter*>(this->parentField()->ownerObject());
     RimView* view = NULL;
     this->firstAnchestorOrThisOfType(view);
-    RimWellLogPlotCurve* curve = NULL;
+    RimWellLogCurve* curve = NULL;
     this->firstAnchestorOrThisOfType(curve);
 
     if (&m_resultVariableUiField == changedField)
@@ -194,7 +194,7 @@ QList<caf::PdmOptionItemInfo> RimEclipseResultDefinition::calculateValueOptions(
 {
     QList<caf::PdmOptionItemInfo> optionItems = calculateValueOptionsForSpecifiedDerivedListPosition(false, fieldNeedingOptions, useOptionsOnly);
 
-    RimWellLogPlotCurve* curve = NULL;
+    RimWellLogCurve* curve = NULL;
     this->firstAnchestorOrThisOfType(curve);
 
     RimEclipsePropertyFilter* propFilter = dynamic_cast<RimEclipsePropertyFilter*>(this->parentField()->ownerObject());

ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp

@@ -150,7 +150,7 @@ void RimGeoMechResultDefinition::fieldChangedByUi(const caf::PdmFieldHandle* cha
     RimGeoMechPropertyFilter* propFilter = dynamic_cast<RimGeoMechPropertyFilter*>(this->parentField()->ownerObject());
     RimView* view = NULL;
     this->firstAnchestorOrThisOfType(view);
-    RimWellLogPlotCurve* curve = NULL;
+    RimWellLogCurve* curve = NULL;
     this->firstAnchestorOrThisOfType(curve);
 
 

ApplicationCode/ProjectDataModel/RimProject.cpp

@@ -820,7 +820,7 @@ void RimProject::actionsBasedOnSelection(QMenu& contextMenu)
             commandIds << "RicNewWellLogFileCurveFeature";
             commandIds << "RicDeleteWellLogPlotTrackFeature";
         }
-        else if (dynamic_cast<RimWellLogPlotCurve*>(uiItem))
+        else if (dynamic_cast<RimWellLogCurve*>(uiItem))
         {
             commandIds << "RicExportToLasFileFeature";
             commandIds << "RicDeleteItemFeature";

ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp

@@ -145,7 +145,7 @@ void RimWellLogExtractionCurve::setPropertiesFromView(RimView* view)
 //--------------------------------------------------------------------------------------------------
 void RimWellLogExtractionCurve::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
 {
-    RimWellLogPlotCurve::fieldChangedByUi(changedField, oldValue, newValue);
+    RimWellLogCurve::fieldChangedByUi(changedField, oldValue, newValue);
 
     if (changedField == &m_case)
     {
@@ -177,7 +177,7 @@ void RimWellLogExtractionCurve::fieldChangedByUi(const caf::PdmFieldHandle* chan
 //--------------------------------------------------------------------------------------------------
 void RimWellLogExtractionCurve::updatePlotData()
 {
-    RimWellLogPlotCurve::updatePlotConfiguration();
+    RimWellLogCurve::updatePlotConfiguration();
 
     if (isCurveVisible())
     {
@@ -378,7 +378,7 @@ void RimWellLogExtractionCurve::defineUiOrdering(QString uiConfigName, caf::PdmU
 //--------------------------------------------------------------------------------------------------
 void RimWellLogExtractionCurve::initAfterRead()
 {
-    RimWellLogPlotCurve::initAfterRead();
+    RimWellLogCurve::initAfterRead();
 
     RimGeoMechCase* geomCase = dynamic_cast<RimGeoMechCase*>(m_case.value());
     RimEclipseCase* eclipseCase = dynamic_cast<RimEclipseCase*>(m_case.value());

ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.h

@@ -34,7 +34,7 @@ class RimView;
 ///  
 ///  
 //==================================================================================================
-class RimWellLogExtractionCurve : public RimWellLogPlotCurve
+class RimWellLogExtractionCurve : public RimWellLogCurve
 {
     CAF_PDM_HEADER_INIT;
 public:

ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp

@@ -70,7 +70,7 @@ RimWellLogFileCurve::~RimWellLogFileCurve()
 //--------------------------------------------------------------------------------------------------
 void RimWellLogFileCurve::updatePlotData()
 {
-    RimWellLogPlotCurve::updatePlotConfiguration();
+    RimWellLogCurve::updatePlotConfiguration();
 
     if (isCurveVisible())
     {
@@ -143,7 +143,7 @@ void RimWellLogFileCurve::setWellLogChannelName(const QString& name)
 //--------------------------------------------------------------------------------------------------
 void RimWellLogFileCurve::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
 {
-    RimWellLogPlotCurve::fieldChangedByUi(changedField, oldValue, newValue);
+    RimWellLogCurve::fieldChangedByUi(changedField, oldValue, newValue);
 
     if (changedField == &m_wellPath)
     {

ApplicationCode/ProjectDataModel/RimWellLogFileCurve.h

@@ -33,7 +33,7 @@ class RimWellLogFileChannel;
 ///  
 ///  
 //==================================================================================================
-class RimWellLogFileCurve : public RimWellLogPlotCurve
+class RimWellLogFileCurve : public RimWellLogCurve
 {
     CAF_PDM_HEADER_INIT;
 

ApplicationCode/ProjectDataModel/RimWellLogPlotCurve.cpp

@@ -29,12 +29,12 @@
 #include "cvfAssert.h"
 
 // NB! Special macro for pure virtual class
-CAF_PDM_XML_ABSTRACT_SOURCE_INIT(RimWellLogPlotCurve, "WellLogPlotCurve");
+CAF_PDM_XML_ABSTRACT_SOURCE_INIT(RimWellLogCurve, "WellLogPlotCurve");
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimWellLogPlotCurve::RimWellLogPlotCurve()
+RimWellLogCurve::RimWellLogCurve()
 {
     CAF_PDM_InitObject("Curve", ":/WellLogCurve16x16.png", "", "");
 
@@ -49,7 +49,7 @@ RimWellLogPlotCurve::RimWellLogPlotCurve()
 
     CAF_PDM_InitField(&m_curveColor, "Color", cvf::Color3f(cvf::Color3::BLACK), "Color", "", "", "");
 
-    m_qwtPlotCurve = new RiuWellLogPlotCurve;
+    m_qwtPlotCurve = new RiuWellLogCurve;
     m_qwtPlotCurve->setXAxis(QwtPlot::xTop);
     m_qwtPlotCurve->setYAxis(QwtPlot::yLeft);
 
@@ -59,7 +59,7 @@ RimWellLogPlotCurve::RimWellLogPlotCurve()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimWellLogPlotCurve::~RimWellLogPlotCurve()
+RimWellLogCurve::~RimWellLogCurve()
 {
     m_qwtPlotCurve->detach();    
     delete m_qwtPlotCurve;
@@ -73,7 +73,7 @@ RimWellLogPlotCurve::~RimWellLogPlotCurve()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimWellLogPlotCurve::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
+void RimWellLogCurve::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
 {
     if (changedField == &m_showCurve)
     {
@@ -106,7 +106,7 @@ void RimWellLogPlotCurve::fieldChangedByUi(const caf::PdmFieldHandle* changedFie
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-caf::PdmFieldHandle* RimWellLogPlotCurve::objectToggleField()
+caf::PdmFieldHandle* RimWellLogCurve::objectToggleField()
 {
     return &m_showCurve;
 }
@@ -114,7 +114,7 @@ caf::PdmFieldHandle* RimWellLogPlotCurve::objectToggleField()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimWellLogPlotCurve::updateCurveVisibility()
+void RimWellLogCurve::updateCurveVisibility()
 {
     if (m_showCurve() && m_ownerQwtTrack)
     {
@@ -144,7 +144,7 @@ void RimWellLogPlotCurve::updateCurveVisibility()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimWellLogPlotCurve::updatePlotConfiguration()
+void RimWellLogCurve::updatePlotConfiguration()
 {
     this->updateCurveVisibility();
     this->updateCurveName();
@@ -157,7 +157,7 @@ void RimWellLogPlotCurve::updatePlotConfiguration()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimWellLogPlotCurve::setQwtTrack(RiuWellLogTrack* plot)
+void RimWellLogCurve::setQwtTrack(RiuWellLogTrack* plot)
 {
     m_ownerQwtTrack = plot;
     if (m_showCurve)
@@ -170,7 +170,7 @@ void RimWellLogPlotCurve::setQwtTrack(RiuWellLogTrack* plot)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-caf::PdmFieldHandle* RimWellLogPlotCurve::userDescriptionField()
+caf::PdmFieldHandle* RimWellLogCurve::userDescriptionField()
 {
     return &m_curveName;
 }
@@ -178,7 +178,7 @@ caf::PdmFieldHandle* RimWellLogPlotCurve::userDescriptionField()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-bool RimWellLogPlotCurve::depthRange(double* minimumDepth, double* maximumDepth) const
+bool RimWellLogCurve::depthRange(double* minimumDepth, double* maximumDepth) const
 {
     CVF_ASSERT(minimumDepth && maximumDepth);
     CVF_ASSERT(m_qwtPlotCurve);
@@ -197,7 +197,7 @@ bool RimWellLogPlotCurve::depthRange(double* minimumDepth, double* maximumDepth)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-bool RimWellLogPlotCurve::valueRange(double* minimumValue, double* maximumValue) const
+bool RimWellLogCurve::valueRange(double* minimumValue, double* maximumValue) const
 {
     CVF_ASSERT(minimumValue && maximumValue);
     CVF_ASSERT(m_qwtPlotCurve);
@@ -216,7 +216,7 @@ bool RimWellLogPlotCurve::valueRange(double* minimumValue, double* maximumValue)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimWellLogPlotCurve::setColor(const cvf::Color3f& color)
+void RimWellLogCurve::setColor(const cvf::Color3f& color)
 {
     m_curveColor = color;
 }
@@ -224,7 +224,7 @@ void RimWellLogPlotCurve::setColor(const cvf::Color3f& color)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimWellLogPlotCurve::detachQwtCurve()
+void RimWellLogCurve::detachQwtCurve()
 {
     m_qwtPlotCurve->detach();
 }
@@ -232,7 +232,7 @@ void RimWellLogPlotCurve::detachQwtCurve()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-QwtPlotCurve* RimWellLogPlotCurve::plotCurve() const
+QwtPlotCurve* RimWellLogCurve::plotCurve() const
 {
     return m_qwtPlotCurve;
 }
@@ -240,7 +240,7 @@ QwtPlotCurve* RimWellLogPlotCurve::plotCurve() const
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimWellLogPlotCurve::updatePlotTitle()
+void RimWellLogCurve::updatePlotTitle()
 {
     m_qwtPlotCurve->setTitle(m_curveName);
 }
@@ -248,7 +248,7 @@ void RimWellLogPlotCurve::updatePlotTitle()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-bool RimWellLogPlotCurve::isCurveVisible() const
+bool RimWellLogCurve::isCurveVisible() const
 {
     return m_showCurve;
 }
@@ -256,7 +256,7 @@ bool RimWellLogPlotCurve::isCurveVisible() const
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimWellLogPlotCurve::initAfterRead()
+void RimWellLogCurve::initAfterRead()
 {
     updateOptionSensitivity();
 }
@@ -264,7 +264,7 @@ void RimWellLogPlotCurve::initAfterRead()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimWellLogPlotCurve::zoomAllOwnerTrackAndPlot()
+void RimWellLogCurve::zoomAllOwnerTrackAndPlot()
 {
     RimWellLogPlot* wellLogPlot;
     firstAnchestorOrThisOfType(wellLogPlot);
@@ -285,7 +285,7 @@ void RimWellLogPlotCurve::zoomAllOwnerTrackAndPlot()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimWellLogPlotCurve::updateCurveName()
+void RimWellLogCurve::updateCurveName()
 {
     if (m_autoName)
     {
@@ -300,7 +300,7 @@ void RimWellLogPlotCurve::updateCurveName()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimWellLogPlotCurve::updateOptionSensitivity()
+void RimWellLogCurve::updateOptionSensitivity()
 {
     m_curveName.uiCapability()->setUiReadOnly(m_autoName);
 }
@@ -308,7 +308,7 @@ void RimWellLogPlotCurve::updateOptionSensitivity()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-const RigWellLogCurveData* RimWellLogPlotCurve::curveData() const
+const RigWellLogCurveData* RimWellLogCurve::curveData() const
 {
     return m_curveData.p();
 }

ApplicationCode/ProjectDataModel/RimWellLogPlotCurve.h

@@ -29,7 +29,7 @@
 
 class RigWellLogCurveData;
 class RiuWellLogTrack;
-class RiuWellLogPlotCurve;
+class RiuWellLogCurve;
 class QwtPlotCurve;
 class QString;
 
@@ -37,12 +37,12 @@ class QString;
 ///  
 ///  
 //==================================================================================================
-class RimWellLogPlotCurve : public caf::PdmObject
+class RimWellLogCurve : public caf::PdmObject
 {
     CAF_PDM_HEADER_INIT;
 public:
-    RimWellLogPlotCurve();
+    RimWellLogCurve();
-    virtual ~RimWellLogPlotCurve();
+    virtual ~RimWellLogCurve();
 
     void                            setColor(const cvf::Color3f& color);
 
@@ -82,7 +82,7 @@ protected:
 
 
     QPointer<RiuWellLogTrack>   m_ownerQwtTrack;
-    RiuWellLogPlotCurve*            m_qwtPlotCurve;
+    RiuWellLogCurve*            m_qwtPlotCurve;
     cvf::ref<RigWellLogCurveData>   m_curveData;
 
     caf::PdmField<bool>             m_showCurve;

ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp

@@ -120,7 +120,7 @@ caf::PdmFieldHandle* RimWellLogTrack::userDescriptionField()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimWellLogTrack::addCurve(RimWellLogPlotCurve* curve)
+void RimWellLogTrack::addCurve(RimWellLogCurve* curve)
 {
     curves.push_back(curve);
 
@@ -133,7 +133,7 @@ void RimWellLogTrack::addCurve(RimWellLogPlotCurve* curve)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimWellLogTrack::insertCurve(RimWellLogPlotCurve* curve, size_t index)
+void RimWellLogTrack::insertCurve(RimWellLogCurve* curve, size_t index)
 {
     curves.insert(index, curve);
     // Todo: Mark curve data to use either TVD or MD
@@ -147,7 +147,7 @@ void RimWellLogTrack::insertCurve(RimWellLogPlotCurve* curve, size_t index)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimWellLogTrack::removeCurve(RimWellLogPlotCurve* curve)
+void RimWellLogTrack::removeCurve(RimWellLogCurve* curve)
 {
     size_t index = curves.index(curve);
     if ( index < curves.size())
@@ -333,7 +333,7 @@ void RimWellLogTrack::zoomAllXAxis()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimWellLogPlotCurve* RimWellLogTrack::curveDefinitionFromCurve(const QwtPlotCurve* curve) const
+RimWellLogCurve* RimWellLogTrack::curveDefinitionFromCurve(const QwtPlotCurve* curve) const
 {
     for (size_t idx = 0; idx < curves.size(); idx++)
     {
@@ -361,7 +361,7 @@ void RimWellLogTrack::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-size_t RimWellLogTrack::curveIndex(RimWellLogPlotCurve* curve)
+size_t RimWellLogTrack::curveIndex(RimWellLogCurve* curve)
 {
     return curves.index(curve);
 }

ApplicationCode/ProjectDataModel/RimWellLogTrack.h

@@ -27,7 +27,7 @@
 
 #include <vector>
 
-class RimWellLogPlotCurve;
+class RimWellLogCurve;
 class RiuWellLogTrack;
 
 class QwtPlotCurve;
@@ -45,10 +45,10 @@ public:
 
     void setDescription(const QString& description);
     bool isVisible();
-    void addCurve(RimWellLogPlotCurve* curve);
+    void addCurve(RimWellLogCurve* curve);
-    void insertCurve(RimWellLogPlotCurve* curve, size_t index);
+    void insertCurve(RimWellLogCurve* curve, size_t index);
-    void removeCurve(RimWellLogPlotCurve* curve);
+    void removeCurve(RimWellLogCurve* curve);
-    size_t curveIndex(RimWellLogPlotCurve* curve);
+    size_t curveIndex(RimWellLogCurve* curve);
     size_t curveCount() { return curves.size(); }
 
     void recreateViewer();
@@ -63,7 +63,7 @@ public:
 
     RiuWellLogTrack* viewer();
     
-    RimWellLogPlotCurve* curveDefinitionFromCurve(const QwtPlotCurve* curve) const;
+    RimWellLogCurve* curveDefinitionFromCurve(const QwtPlotCurve* curve) const;
 
 protected:
 
@@ -77,7 +77,7 @@ private:
 private:
     caf::PdmField<bool> m_show;
     caf::PdmField<QString> m_userName;
-    caf::PdmChildArrayField<RimWellLogPlotCurve*> curves;
+    caf::PdmChildArrayField<RimWellLogCurve*> curves;
     caf::PdmField<double> m_visibleXRangeMin;
     caf::PdmField<double> m_visibleXRangeMax;
 

ApplicationCode/ReservoirDataModel/RigWellLogFile.cpp

@@ -245,7 +245,7 @@ QString RigWellLogFile::wellLogChannelUnit(const QString& wellLogChannelName) co
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-bool RigWellLogFile::exportToLasFile(const RimWellLogPlotCurve* curve, const QString& fileName)
+bool RigWellLogFile::exportToLasFile(const RimWellLogCurve* curve, const QString& fileName)
 {
     CVF_ASSERT(curve);
 

ApplicationCode/ReservoirDataModel/RigWellLogFile.h

@@ -30,7 +30,7 @@ namespace NRLib
     class Well;
 }
 
-class RimWellLogPlotCurve;
+class RimWellLogCurve;
 
 //==================================================================================================
 /// 
@@ -52,7 +52,7 @@ public:
     QString depthUnit() const;
     QString wellLogChannelUnit(const QString& wellLogChannelName) const;
 
-    static bool exportToLasFile(const RimWellLogPlotCurve* curve, const QString& fileName);
+    static bool exportToLasFile(const RimWellLogCurve* curve, const QString& fileName);
 
 private:
     void close();

ApplicationCode/UserInterface/RiuDragDrop.cpp

@@ -148,7 +148,7 @@ Qt::ItemFlags RiuDragDrop::flags(const QModelIndex &index) const
         caf::PdmUiItem* uiItem = uiTreeView->uiItemFromModelIndex(index);
 
         if (dynamic_cast<RimEclipseCase*>(uiItem) ||
-            dynamic_cast<RimWellLogPlotCurve*>(uiItem) ||
+            dynamic_cast<RimWellLogCurve*>(uiItem) ||
             dynamic_cast<RimWellLogFileChannel*>(uiItem) || 
             dynamic_cast<RimWellLogTrack*>(uiItem))
         {
@@ -174,7 +174,7 @@ Qt::ItemFlags RiuDragDrop::flags(const QModelIndex &index) const
             }
             else if (dynamic_cast<RimWellLogTrack*>(uiItem))
             {
-                if (RiuTypedPdmObjects<RimWellLogPlotCurve>::containsTypedObjects(m_dragItems))
+                if (RiuTypedPdmObjects<RimWellLogCurve>::containsTypedObjects(m_dragItems))
                 {
                     itemflags |= Qt::ItemIsDropEnabled;
                 }
@@ -183,9 +183,9 @@ Qt::ItemFlags RiuDragDrop::flags(const QModelIndex &index) const
                     itemflags |= Qt::ItemIsDropEnabled;
                 }
             }
-            else if (dynamic_cast<RimWellLogPlotCurve*>(uiItem))
+            else if (dynamic_cast<RimWellLogCurve*>(uiItem))
             {
-                if (RiuTypedPdmObjects<RimWellLogPlotCurve>::containsTypedObjects(m_dragItems))
+                if (RiuTypedPdmObjects<RimWellLogCurve>::containsTypedObjects(m_dragItems))
                 {
                     itemflags |= Qt::ItemIsDropEnabled;
                 }
@@ -200,7 +200,7 @@ Qt::ItemFlags RiuDragDrop::flags(const QModelIndex &index) const
                     itemflags |= Qt::ItemIsDropEnabled;
                 }
             }
-            else if (dynamic_cast<RimWellLogPlotCurve*>(uiItem))
+            else if (dynamic_cast<RimWellLogCurve*>(uiItem))
             {
                 if (RiuTypedPdmObjects<RimWellLogFileChannel>::containsTypedObjects(m_dragItems))
                 {
@@ -241,7 +241,7 @@ bool RiuDragDrop::dropMimeData(const QMimeData *data, Qt::DropAction action, int
             return handleGridCaseGroupDrop(action, draggedObjects, gridCaseGroup);
         }
 
-        RimWellLogPlotCurve* wellLogPlotCurve;
+        RimWellLogCurve* wellLogPlotCurve;
         dropTarget->firstAnchestorOrThisOfType(wellLogPlotCurve);
         if (wellLogPlotCurve)
         {
@@ -345,7 +345,7 @@ bool RiuDragDrop::handleWellLogPlotTrackDrop(Qt::DropAction action, caf::PdmObje
         }
     }
 
-    std::vector<RimWellLogPlotCurve*> wellLogPlotCurves = RiuTypedPdmObjects<RimWellLogPlotCurve>::typedObjectsFromGroup(draggedObjects);
+    std::vector<RimWellLogCurve*> wellLogPlotCurves = RiuTypedPdmObjects<RimWellLogCurve>::typedObjectsFromGroup(draggedObjects);
     if (wellLogPlotCurves.size() > 0)
     {
         if (action == Qt::MoveAction)
@@ -373,9 +373,9 @@ bool RiuDragDrop::handleWellLogPlotTrackDrop(Qt::DropAction action, caf::PdmObje
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-bool RiuDragDrop::handleWellLogPlotCurveDrop(Qt::DropAction action, caf::PdmObjectGroup& draggedObjects, RimWellLogPlotCurve* curveDropTarget)
+bool RiuDragDrop::handleWellLogPlotCurveDrop(Qt::DropAction action, caf::PdmObjectGroup& draggedObjects, RimWellLogCurve* curveDropTarget)
 {
-    std::vector<RimWellLogPlotCurve*> wellLogPlotCurves = RiuTypedPdmObjects<RimWellLogPlotCurve>::typedObjectsFromGroup(draggedObjects);
+    std::vector<RimWellLogCurve*> wellLogPlotCurves = RiuTypedPdmObjects<RimWellLogCurve>::typedObjectsFromGroup(draggedObjects);
     if (wellLogPlotCurves.size() > 0)
     {
         if (action == Qt::MoveAction)

ApplicationCode/UserInterface/RiuDragDrop.h

@@ -33,7 +33,7 @@ namespace caf
 class RimIdenticalGridCaseGroup;
 class RimWellLogPlot;
 class RimWellLogTrack;
-class RimWellLogPlotCurve;
+class RimWellLogCurve;
 
 //--------------------------------------------------------------------------------------------------
 /// 
@@ -59,7 +59,7 @@ private:
     bool handleGridCaseGroupDrop(Qt::DropAction action, caf::PdmObjectGroup& objectGroup, RimIdenticalGridCaseGroup* gridCaseGroup);
     bool handleWellLogPlotTrackDrop(Qt::DropAction action, caf::PdmObjectGroup& objectGroup, RimWellLogTrack* wellLogPlotTrack);
     bool handleWellLogPlotDrop(Qt::DropAction action, caf::PdmObjectGroup& objectGroup, RimWellLogPlot* wellLogPlot);
-    bool handleWellLogPlotCurveDrop(Qt::DropAction action, caf::PdmObjectGroup& objectGroup, RimWellLogPlotCurve* wellLogPlotCurve);
+    bool handleWellLogPlotCurveDrop(Qt::DropAction action, caf::PdmObjectGroup& objectGroup, RimWellLogCurve* wellLogPlotCurve);
 
     static void objectGroupFromModelIndexes(caf::PdmObjectGroup* objectGroup, const QModelIndexList &indexes);
     static std::vector<caf::PdmPointer<caf::PdmObjectHandle> > objectHandlesFromSelection();

ApplicationCode/UserInterface/RiuWellLogPlotCurve.cpp

@@ -25,21 +25,21 @@
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RiuWellLogPlotCurve::RiuWellLogPlotCurve()
+RiuWellLogCurve::RiuWellLogCurve()
 {
 }
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RiuWellLogPlotCurve::~RiuWellLogPlotCurve()
+RiuWellLogCurve::~RiuWellLogCurve()
 {
 }
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RiuWellLogPlotCurve::drawCurve(QPainter* p, int style,
+void RiuWellLogCurve::drawCurve(QPainter* p, int style,
     const QwtScaleMap& xMap, const QwtScaleMap& yMap,
     const QRectF& canvasRect, int from, int to) const
 {
@@ -57,7 +57,7 @@ void RiuWellLogPlotCurve::drawCurve(QPainter* p, int style,
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RiuWellLogPlotCurve::setCurveData(const RigWellLogCurveData* curveData)
+void RiuWellLogCurve::setCurveData(const RigWellLogCurveData* curveData)
 {
     CVF_ASSERT(curveData);
 

ApplicationCode/UserInterface/RiuWellLogPlotCurve.h

@@ -29,12 +29,12 @@ class RigWellLogCurveData;
 ///  
 ///  
 //==================================================================================================
-class RiuWellLogPlotCurve : public QwtPlotCurve
+class RiuWellLogCurve : public QwtPlotCurve
 {
 public:
 
-    RiuWellLogPlotCurve();
+    RiuWellLogCurve();
-    virtual ~RiuWellLogPlotCurve();
+    virtual ~RiuWellLogCurve();
 
     void setCurveData(const RigWellLogCurveData* curveData);
 

ApplicationCode/UserInterface/RiuWellLogTrack.cpp

@@ -253,7 +253,7 @@ void RiuWellLogTrack::selectClosestCurve(const QPoint& pos)
 
     if (closestCurve && distMin < 20)
     {
-        RimWellLogPlotCurve* selectedCurve = m_plotTrackDefinition->curveDefinitionFromCurve(closestCurve);
+        RimWellLogCurve* selectedCurve = m_plotTrackDefinition->curveDefinitionFromCurve(closestCurve);
         if (selectedCurve)
         {
             RiuMainWindow::instance()->projectTreeView()->selectAsCurrentItem(selectedCurve);