#739 Moved the new RimPlotCurve class to a separate set of files

ApplicationCode/ProjectDataModel/CMakeLists_files.cmake

@@ -79,6 +79,7 @@ ${CEE_CURRENT_LIST_DIR}RimGridCollection.h
 ${CEE_CURRENT_LIST_DIR}RimSummaryPlotCollection.h
 ${CEE_CURRENT_LIST_DIR}RimSummaryPlot.h
 ${CEE_CURRENT_LIST_DIR}RimSummaryCurve.h
+${CEE_CURRENT_LIST_DIR}RimPlotCurve.h
 
 )
 
@@ -157,6 +158,8 @@ ${CEE_CURRENT_LIST_DIR}RimGridCollection.cpp
 ${CEE_CURRENT_LIST_DIR}RimSummaryPlotCollection.cpp
 ${CEE_CURRENT_LIST_DIR}RimSummaryPlot.cpp
 ${CEE_CURRENT_LIST_DIR}RimSummaryCurve.cpp
+${CEE_CURRENT_LIST_DIR}RimPlotCurve.cpp
+
 )
 
 list(APPEND CODE_HEADER_FILES

ApplicationCode/ProjectDataModel/RimPlotCurve.cpp

@@ -0,0 +1,371 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2016-     Statoil ASA
+// 
+//  ResInsight is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+// 
+//  ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
+//  WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//  FITNESS FOR A PARTICULAR PURPOSE.
+// 
+//  See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html> 
+//  for more details.
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+#include "RimPlotCurve.h"
+#include "RiuLineSegmentQwtPlotCurve.h"
+
+#include "cafPdmUiComboBoxEditor.h"
+
+#include "cvfAssert.h"
+
+#include "qwt_symbol.h"
+#include "qwt_plot.h"
+
+// NB! Special macro for pure virtual class
+CAF_PDM_XML_ABSTRACT_SOURCE_INIT(RimPlotCurve, "PlotCurve");
+
+namespace caf
+{
+template<>
+void caf::AppEnum< RimPlotCurve::LineStyleEnum >::setUp()
+{
+    addItem(RimPlotCurve::STYLE_NONE, "STYLE_NONE", "None");
+    addItem(RimPlotCurve::STYLE_SOLID, "STYLE_SOLID", "Solid");
+    addItem(RimPlotCurve::STYLE_DASH, "STYLE_DASH", "Dashes");
+    addItem(RimPlotCurve::STYLE_DOT, "STYLE_DOT", "Dots");
+    addItem(RimPlotCurve::STYLE_DASH_DOT, "STYLE_DASH_DOT", "Dashes and Dots");
+
+    setDefault(RimPlotCurve::STYLE_SOLID);
+}
+
+
+template<>
+void caf::AppEnum< RimPlotCurve::PointSymbolEnum >::setUp()
+{
+    addItem(RimPlotCurve::SYMBOL_NONE, "SYMBOL_NONE", "None");
+    addItem(RimPlotCurve::SYMBOL_ELLIPSE, "SYMBOL_ELLIPSE", "Ellipse");
+    addItem(RimPlotCurve::SYMBOL_RECT, "SYMBOL_RECT", "Rect");
+    addItem(RimPlotCurve::SYMBOL_DIAMOND, "SYMBOL_DIAMOND", "Diamond");
+    addItem(RimPlotCurve::SYMBOL_TRIANGLE, "SYMBOL_TRIANGLE", "Triangle");
+    addItem(RimPlotCurve::SYMBOL_CROSS, "SYMBOL_CROSS", "Cross");
+    addItem(RimPlotCurve::SYMBOL_XCROSS, "SYMBOL_XCROSS", "X Cross");
+
+    setDefault(RimPlotCurve::SYMBOL_NONE);
+}
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+RimPlotCurve::RimPlotCurve()
+{
+    CAF_PDM_InitObject("Curve", ":/WellLogCurve16x16.png", "", "");
+
+    CAF_PDM_InitField(&m_showCurve, "Show", true, "Show curve", "", "", "");
+    m_showCurve.uiCapability()->setUiHidden(true);
+
+    CAF_PDM_InitFieldNoDefault(&m_curveName, "CurveName", "Curve Name", "", "", "");
+    CAF_PDM_InitFieldNoDefault(&m_customCurveName, "CurveDescription", "Custom Name", "", "", "");
+    m_customCurveName.uiCapability()->setUiHidden(true);
+
+    CAF_PDM_InitField(&m_isUsingAutoName, "AutoName", true, "Auto Name", "", "", "");
+
+    CAF_PDM_InitField(&m_curveColor, "Color", cvf::Color3f(cvf::Color3::BLACK), "Color", "", "", "");
+
+    CAF_PDM_InitField(&m_curveThickness, "Thickness", 1.0f, "Thickness", "", "", "");
+    m_curveThickness.uiCapability()->setUiEditorTypeName(caf::PdmUiComboBoxEditor::uiEditorTypeName());
+
+    caf::AppEnum< RimPlotCurve::LineStyleEnum > lineStyle = STYLE_SOLID;
+    CAF_PDM_InitField(&m_lineStyle, "LineStyle", lineStyle, "Line style", "", "", "");
+
+    caf::AppEnum< RimPlotCurve::PointSymbolEnum > pointSymbol = SYMBOL_NONE;
+    CAF_PDM_InitField(&m_pointSymbol, "PointSymbol", pointSymbol, "Point style", "", "", "");
+
+    m_qwtPlotCurve = new RiuLineSegmentQwtPlotCurve;
+
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+RimPlotCurve::~RimPlotCurve()
+{
+    if (m_qwtPlotCurve)
+    {
+        m_qwtPlotCurve->detach();
+        delete m_qwtPlotCurve;
+    }
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RimPlotCurve::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
+{
+    if (changedField == &m_showCurve)
+    {
+        this->updateCurveVisibility();
+    }
+    else if (changedField == &m_curveName)
+    {
+        m_customCurveName = m_curveName;
+        updateCurveName();
+    }
+    else if (&m_curveColor == changedField
+             || &m_curveThickness == changedField
+             || &m_pointSymbol == changedField
+             || &m_lineStyle == changedField)
+    {
+        updateCurveAppearance();
+    }
+    else if (changedField == &m_isUsingAutoName)
+    {
+        if (!m_isUsingAutoName)
+        {
+            m_customCurveName = createCurveAutoName();
+        }
+
+        updateOptionSensitivity();
+        updateCurveName();
+    }
+
+    if (m_parentQwtPlot) m_parentQwtPlot->replot();
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+caf::PdmFieldHandle* RimPlotCurve::objectToggleField()
+{
+    return &m_showCurve;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RimPlotCurve::updateCurveVisibility()
+{
+    if (m_showCurve() && m_parentQwtPlot)
+    {
+        m_qwtPlotCurve->attach(m_parentQwtPlot);
+    }
+    else
+    {
+        m_qwtPlotCurve->detach();
+    }
+
+    zoomAllParentPlot();
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RimPlotCurve::updateCurvePresentation()
+{
+    this->updateCurveVisibility();
+    this->updateCurveName();
+
+    updateCurveAppearance();
+    // Todo: Rest of the curve setup controlled from this class
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RimPlotCurve::setParentQwtPlot(QwtPlot* plot)
+{
+    m_parentQwtPlot = plot;
+    if (m_showCurve)
+    {
+        m_qwtPlotCurve->attach(m_parentQwtPlot);
+        m_parentQwtPlot->replot();
+    }
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+caf::PdmFieldHandle* RimPlotCurve::userDescriptionField()
+{
+    return &m_curveName;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RimPlotCurve::setColor(const cvf::Color3f& color)
+{
+    m_curveColor = color;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RimPlotCurve::detachQwtCurve()
+{
+    m_qwtPlotCurve->detach();
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QwtPlotCurve* RimPlotCurve::qwtPlotCurve() const
+{
+    return m_qwtPlotCurve;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+bool RimPlotCurve::isCurveVisible() const
+{
+    return m_showCurve;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RimPlotCurve::initAfterRead()
+{
+    updateOptionSensitivity();
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RimPlotCurve::updateCurveName()
+{
+    if (m_isUsingAutoName)
+    {
+        m_curveName = this->createCurveAutoName();
+    }
+    else
+    {
+        m_curveName = m_customCurveName;
+    }
+
+    m_qwtPlotCurve->setTitle(m_curveName);
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RimPlotCurve::updateOptionSensitivity()
+{
+    m_curveName.uiCapability()->setUiReadOnly(m_isUsingAutoName);
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RimPlotCurve::updateCurveAppearance()
+{
+    CVF_ASSERT(m_qwtPlotCurve);
+
+    QColor curveColor(m_curveColor.value().rByte(), m_curveColor.value().gByte(), m_curveColor.value().bByte());
+
+    QwtSymbol* symbol = NULL;
+
+    if (m_pointSymbol() != SYMBOL_NONE)
+    {
+        QwtSymbol::Style style = QwtSymbol::NoSymbol;
+
+        switch (m_pointSymbol())
+        {
+            case SYMBOL_ELLIPSE:
+            style = QwtSymbol::Ellipse;
+            break;
+            case SYMBOL_RECT:
+            style = QwtSymbol::Rect;
+            break;
+            case SYMBOL_DIAMOND:
+            style = QwtSymbol::Diamond;
+            break;
+            case SYMBOL_TRIANGLE:
+            style = QwtSymbol::Triangle;
+            break;
+            case SYMBOL_CROSS:
+            style = QwtSymbol::Cross;
+            break;
+            case SYMBOL_XCROSS:
+            style = QwtSymbol::XCross;
+            break;
+
+            default:
+            break;
+        }
+
+        // QwtPlotCurve will take ownership of the symbol
+        symbol = new QwtSymbol(style);
+
+        symbol->setSize(6, 6);
+        symbol->setColor(curveColor);
+    }
+
+    QwtPlotCurve::CurveStyle curveStyle = QwtPlotCurve::NoCurve;
+    Qt::PenStyle penStyle = Qt::SolidLine;
+
+    if (m_lineStyle() != STYLE_NONE)
+    {
+        curveStyle = QwtPlotCurve::Lines;
+
+        switch (m_lineStyle())
+        {
+            case STYLE_SOLID:
+            penStyle = Qt::SolidLine;
+            break;
+            case STYLE_DASH:
+            penStyle = Qt::DashLine;
+            break;
+            case STYLE_DOT:
+            penStyle = Qt::DotLine;
+            break;
+            case STYLE_DASH_DOT:
+            penStyle = Qt::DashDotLine;
+            break;
+
+            default:
+            break;
+        }
+    }
+
+    m_qwtPlotCurve->setPen(curveColor, m_curveThickness, penStyle);
+    m_qwtPlotCurve->setStyle(curveStyle);
+    m_qwtPlotCurve->setSymbol(symbol);
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QList<caf::PdmOptionItemInfo> RimPlotCurve::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly)
+{
+    QList<caf::PdmOptionItemInfo> options;
+
+    if (fieldNeedingOptions == &m_curveThickness)
+    {
+        for (size_t i = 0; i < 10; i++)
+        {
+            options.push_back(caf::PdmOptionItemInfo(QString::number(i + 1), QVariant::fromValue(i + 1)));
+        }
+    }
+
+    return options;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RimPlotCurve::loadDataAndUpdate()
+{
+    this->onLoadDataAndUpdate();
+}
+
+
+

ApplicationCode/ProjectDataModel/RimPlotCurve.h

@@ -0,0 +1,110 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2016-     Statoil ASA
+// 
+//  ResInsight is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+// 
+//  ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
+//  WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//  FITNESS FOR A PARTICULAR PURPOSE.
+// 
+//  See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html> 
+//  for more details.
+//
+/////////////////////////////////////////////////////////////////////////////////
+#pragma once
+
+#include "cafPdmField.h"
+#include "cafPdmFieldCvfColor.h"    
+#include "cafPdmObject.h"
+
+#include <QPointer>
+
+class RiuLineSegmentQwtPlotCurve;
+
+class QwtPlot;
+class QwtPlotCurve;
+
+//==================================================================================================
+///  
+///  
+//==================================================================================================
+class RimPlotCurve : public caf::PdmObject
+{
+    CAF_PDM_HEADER_INIT;
+public:
+    enum LineStyleEnum
+    {
+        STYLE_NONE,
+        STYLE_SOLID,
+        STYLE_DASH,
+        STYLE_DOT,
+        STYLE_DASH_DOT
+    };
+
+    enum PointSymbolEnum
+    {
+        SYMBOL_NONE,
+        SYMBOL_ELLIPSE,
+        SYMBOL_RECT,
+        SYMBOL_DIAMOND,
+        SYMBOL_TRIANGLE,
+        SYMBOL_CROSS,
+        SYMBOL_XCROSS
+    };
+public:
+    RimPlotCurve();
+    virtual ~RimPlotCurve();
+
+    void                            loadDataAndUpdate();
+
+    void                            setParentQwtPlot(QwtPlot* plot);
+    void                            detachQwtCurve();
+    QwtPlotCurve*                   qwtPlotCurve() const;
+
+    void                            setColor(const cvf::Color3f& color);
+    bool                            isCurveVisible() const;
+    QString                         curveName() const { return m_curveName; }
+
+protected:
+
+    virtual QString                 createCurveAutoName() = 0;
+    virtual void                    zoomAllParentPlot() = 0;
+    virtual void                    onLoadDataAndUpdate() = 0;
+
+    void                            updateCurvePresentation();
+    void                            updateCurveName();
+    void                            updateCurveVisibility();
+    void                            updateCurveAppearance();
+
+    void                            updateOptionSensitivity();
+
+protected:
+
+    // Overridden PDM methods
+    virtual void                    fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
+    virtual caf::PdmFieldHandle*    objectToggleField();
+    virtual caf::PdmFieldHandle*    userDescriptionField();
+    virtual void                    initAfterRead();
+    virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly);
+
+protected:
+    QPointer<QwtPlot>               m_parentQwtPlot;
+    RiuLineSegmentQwtPlotCurve*     m_qwtPlotCurve;
+
+    caf::PdmField<bool>             m_showCurve;
+    caf::PdmField<QString>          m_curveName;
+    caf::PdmField<QString>          m_customCurveName;
+
+    caf::PdmField<bool>             m_isUsingAutoName;
+    caf::PdmField<cvf::Color3f>     m_curveColor;
+    caf::PdmField<float>            m_curveThickness;
+
+    caf::PdmField< caf::AppEnum< PointSymbolEnum > > m_pointSymbol;
+    caf::PdmField< caf::AppEnum< LineStyleEnum > >   m_lineStyle;
+};
+
+

ApplicationCode/ProjectDataModel/RimWellLogCurve.cpp

@@ -33,38 +33,8 @@
 #include "qwt_symbol.h"
 
 // NB! Special macro for pure virtual class
-CAF_PDM_XML_ABSTRACT_SOURCE_INIT(RimPlotCurve, "PlotCurve");
 CAF_PDM_XML_ABSTRACT_SOURCE_INIT(RimWellLogCurve, "WellLogPlotCurve");
 
-namespace caf
-{
-    template<>
-    void caf::AppEnum< RimPlotCurve::LineStyleEnum >::setUp()
-    {
-        addItem(RimPlotCurve::STYLE_NONE,    "STYLE_NONE",       "None");
-        addItem(RimPlotCurve::STYLE_SOLID,   "STYLE_SOLID",      "Solid");
-        addItem(RimPlotCurve::STYLE_DASH,    "STYLE_DASH",       "Dashes");
-        addItem(RimPlotCurve::STYLE_DOT,     "STYLE_DOT",        "Dots");
-        addItem(RimPlotCurve::STYLE_DASH_DOT,"STYLE_DASH_DOT",   "Dashes and Dots");
-
-        setDefault(RimPlotCurve::STYLE_SOLID);
-    }
-
-
-    template<>
-    void caf::AppEnum< RimPlotCurve::PointSymbolEnum >::setUp()
-    {
-        addItem(RimPlotCurve::SYMBOL_NONE,       "SYMBOL_NONE",      "None");
-        addItem(RimPlotCurve::SYMBOL_ELLIPSE,    "SYMBOL_ELLIPSE",   "Ellipse");
-        addItem(RimPlotCurve::SYMBOL_RECT,       "SYMBOL_RECT",      "Rect");
-        addItem(RimPlotCurve::SYMBOL_DIAMOND, "SYMBOL_DIAMOND", "Diamond");
-        addItem(RimPlotCurve::SYMBOL_TRIANGLE, "SYMBOL_TRIANGLE", "Triangle");
-        addItem(RimPlotCurve::SYMBOL_CROSS,      "SYMBOL_CROSS",     "Cross");
-        addItem(RimPlotCurve::SYMBOL_XCROSS,     "SYMBOL_XCROSS",    "X Cross");
-
-        setDefault(RimPlotCurve::SYMBOL_NONE);
-    }
-}
 
 //--------------------------------------------------------------------------------------------------
 /// 
@@ -94,141 +64,6 @@ RimWellLogCurve::~RimWellLogCurve()
     }
 }
 
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-RimPlotCurve::RimPlotCurve()
-{
-    CAF_PDM_InitObject("Curve", ":/WellLogCurve16x16.png", "", "");
-
-    CAF_PDM_InitField(&m_showCurve, "Show", true, "Show curve", "", "", "");
-    m_showCurve.uiCapability()->setUiHidden(true);
-
-    CAF_PDM_InitFieldNoDefault(&m_curveName, "CurveName", "Curve Name", "", "", "");
-    CAF_PDM_InitFieldNoDefault(&m_customCurveName, "CurveDescription", "Custom Name", "", "", "");
-    m_customCurveName.uiCapability()->setUiHidden(true);
-
-    CAF_PDM_InitField(&m_isUsingAutoName, "AutoName", true, "Auto Name", "", "", "");
-
-    CAF_PDM_InitField(&m_curveColor, "Color", cvf::Color3f(cvf::Color3::BLACK), "Color", "", "", "");
-
-    CAF_PDM_InitField(&m_curveThickness, "Thickness", 1.0f, "Thickness", "", "", "");
-    m_curveThickness.uiCapability()->setUiEditorTypeName(caf::PdmUiComboBoxEditor::uiEditorTypeName());
-
-    caf::AppEnum< RimWellLogCurve::LineStyleEnum > lineStyle = STYLE_SOLID;
-    CAF_PDM_InitField(&m_lineStyle, "LineStyle", lineStyle, "Line style", "", "", "");
-
-    caf::AppEnum< RimWellLogCurve::PointSymbolEnum > pointSymbol = SYMBOL_NONE;
-    CAF_PDM_InitField(&m_pointSymbol, "PointSymbol", pointSymbol, "Point style", "", "", "");
-
-    m_qwtPlotCurve = new RiuLineSegmentQwtPlotCurve;
-
-}
-
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-RimPlotCurve::~RimPlotCurve()
-{
-    if (m_qwtPlotCurve)
-    {
-        m_qwtPlotCurve->detach();
-        delete m_qwtPlotCurve;
-    }
-}
-
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-void RimPlotCurve::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
-{
-    if (changedField == &m_showCurve)
-    {
-       this->updateCurveVisibility();
-    }
-    else if (changedField == &m_curveName)
-    {
-        m_customCurveName = m_curveName;
-        updateCurveName();
-    }
-    else if (&m_curveColor == changedField
-            || &m_curveThickness == changedField
-            || &m_pointSymbol == changedField
-            || &m_lineStyle == changedField)
-    {
-        updateCurveAppearance();
-    }
-    else if (changedField == &m_isUsingAutoName)
-    {
-        if (!m_isUsingAutoName)
-        {
-            m_customCurveName = createCurveAutoName();
-        }
-
-        updateOptionSensitivity();
-        updateCurveName();
-    }
-
-    if (m_parentQwtPlot) m_parentQwtPlot->replot();
-}
-
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-caf::PdmFieldHandle* RimPlotCurve::objectToggleField()
-{
-    return &m_showCurve;
-}
-
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-void RimPlotCurve::updateCurveVisibility()
-{
-    if (m_showCurve() && m_parentQwtPlot)
-    {
-        m_qwtPlotCurve->attach(m_parentQwtPlot);
-    }
-    else
-    {
-        m_qwtPlotCurve->detach();
-    }
-
-    zoomAllParentPlot();
-}
-
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-void RimPlotCurve::updateCurvePresentation()
-{
-    this->updateCurveVisibility();
-    this->updateCurveName();
-
-    updateCurveAppearance();
-    // Todo: Rest of the curve setup controlled from this class
-}
-
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-void RimPlotCurve::setParentQwtPlot(QwtPlot* plot)
-{
-    m_parentQwtPlot = plot;
-    if (m_showCurve)
-    {
-        m_qwtPlotCurve->attach(m_parentQwtPlot);
-        m_parentQwtPlot->replot();
-    }
-}
-
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-caf::PdmFieldHandle* RimPlotCurve::userDescriptionField()
-{
-    return &m_curveName;
-}
 
 //--------------------------------------------------------------------------------------------------
 /// 
@@ -268,45 +103,6 @@ bool RimWellLogCurve::valueRange(double* minimumValue, double* maximumValue) con
     return true;
 }
 
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-void RimPlotCurve::setColor(const cvf::Color3f& color)
-{
-    m_curveColor = color;
-}
-
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-void RimPlotCurve::detachQwtCurve()
-{
-    m_qwtPlotCurve->detach();
-}
-
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-QwtPlotCurve* RimPlotCurve::qwtPlotCurve() const
-{
-    return m_qwtPlotCurve;
-}
-
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-bool RimPlotCurve::isCurveVisible() const
-{
-    return m_showCurve;
-}
-
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-void RimPlotCurve::initAfterRead()
-{
-    updateOptionSensitivity();
-}
 
 //--------------------------------------------------------------------------------------------------
 /// 
@@ -330,31 +126,6 @@ void RimWellLogCurve::zoomAllParentPlot()
 }
 
 
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-void RimPlotCurve::updateCurveName()
-{
-    if (m_isUsingAutoName)
-    {
-        m_curveName = this->createCurveAutoName();
-    }
-    else
-    {
-        m_curveName = m_customCurveName;
-    }
-
-    m_qwtPlotCurve->setTitle(m_curveName);
-}
-
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-void RimPlotCurve::updateOptionSensitivity()
-{
-    m_curveName.uiCapability()->setUiReadOnly(m_isUsingAutoName);
-}
-
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
@@ -362,109 +133,3 @@ const RigWellLogCurveData* RimWellLogCurve::curveData() const
 {
     return m_curveData.p();
 }
-
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-void RimPlotCurve::updateCurveAppearance()
-{
-    CVF_ASSERT(m_qwtPlotCurve);
-
-    QColor curveColor(m_curveColor.value().rByte(), m_curveColor.value().gByte(), m_curveColor.value().bByte());
-
-    QwtSymbol* symbol = NULL;
-
-    if (m_pointSymbol() != SYMBOL_NONE)
-    {
-        QwtSymbol::Style style = QwtSymbol::NoSymbol;
-    
-        switch (m_pointSymbol())
-        {
-            case SYMBOL_ELLIPSE :
-                style = QwtSymbol::Ellipse;
-                break;
-            case SYMBOL_RECT:
-                style = QwtSymbol::Rect;
-                break;
-            case SYMBOL_DIAMOND:
-                style = QwtSymbol::Diamond;
-                break;
-            case SYMBOL_TRIANGLE:
-                style = QwtSymbol::Triangle;
-                break;
-            case SYMBOL_CROSS:
-                style = QwtSymbol::Cross;
-                break;
-            case SYMBOL_XCROSS:
-                style = QwtSymbol::XCross;
-                break;
-
-            default:
-                break;
-        }
-
-        // QwtPlotCurve will take ownership of the symbol
-        symbol = new QwtSymbol(style);
-        
-        symbol->setSize(6, 6);
-        symbol->setColor(curveColor);
-    }
-
-    QwtPlotCurve::CurveStyle curveStyle = QwtPlotCurve::NoCurve;
-    Qt::PenStyle penStyle = Qt::SolidLine;
-
-    if (m_lineStyle() != STYLE_NONE)
-    {
-        curveStyle = QwtPlotCurve::Lines;
-
-        switch (m_lineStyle())
-        {
-        case STYLE_SOLID:
-            penStyle = Qt::SolidLine;
-            break;
-        case STYLE_DASH:
-            penStyle = Qt::DashLine;
-            break;
-        case STYLE_DOT:
-            penStyle = Qt::DotLine;
-            break;
-        case STYLE_DASH_DOT:
-            penStyle = Qt::DashDotLine;
-            break;
-
-        default:
-            break;
-        }
-    }
-
-    m_qwtPlotCurve->setPen(curveColor, m_curveThickness, penStyle);
-    m_qwtPlotCurve->setStyle(curveStyle);
-    m_qwtPlotCurve->setSymbol(symbol);
-}
-
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-QList<caf::PdmOptionItemInfo> RimPlotCurve::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly)
-{
-    QList<caf::PdmOptionItemInfo> options;
-
-    if (fieldNeedingOptions == &m_curveThickness)
-    {
-        for (size_t i = 0; i < 10; i++)
-        {
-            options.push_back(caf::PdmOptionItemInfo(QString::number(i + 1), QVariant::fromValue(i + 1)));
-        }
-    }
-
-    return options;
-}
-
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-void RimPlotCurve::loadDataAndUpdate()
-{
-    this->onLoadDataAndUpdate();
-}
-

ApplicationCode/ProjectDataModel/RimWellLogCurve.h

@@ -19,167 +19,10 @@
 
 #pragma once
 
-#include "cafPdmField.h"
+#include "RimPlotCurve.h"
-#include "cafPdmFieldCvfColor.h"    
-#include "cafPdmObject.h"
-
 #include "RigWellLogCurveData.h"
 
-#include <QPointer>
-
-#include <vector>
-
 class RigWellLogCurveData;
-class RiuWellLogTrack;
-class RiuLineSegmentQwtPlotCurve;
-
-class QwtPlot;
-class QwtPlotCurve;
-
-class QString;
-#if 0
-class RimPlotCurve : public caf::PdmObject
-{
-    CAF_PDM_HEADER_INIT;
-public:
-    enum LineStyleEnum
-    {
-        STYLE_NONE,
-        STYLE_SOLID,
-        STYLE_DASH,
-        STYLE_DOT,
-        STYLE_DASH_DOT
-    };
-
-    enum PointSymbolEnum
-    {
-        SYMBOL_NONE,
-        SYMBOL_ELLIPSE,
-        SYMBOL_RECT,
-        SYMBOL_DIAMOND,
-        SYMBOL_TRIANGLE,
-        SYMBOL_CROSS,
-        SYMBOL_XCROSS
-    };
-public:
-    RimPlotCurve();
-    virtual ~RimPlotCurve();
-
-    void                            setColor(const cvf::Color3f& color);
-    void                            detachQwtCurve();
-
-    bool                            isCurveVisible() const;
-
-    QwtPlotCurve*                   plotCurve() const;
-
-    QString                         name() const { return m_curveName; }
-    void                            updateCurveName();
-    void                            updatePlotTitle();
-
-protected:
-    void                            updatePlotConfiguration();
-    void                            updateCurveVisibility();
-    void                            updateOptionSensitivity();
-    void                            updateCurveAppearance();
-protected:
-
-    // Overridden PDM methods
-    virtual void                    fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
-    virtual caf::PdmFieldHandle*    objectToggleField();
-    virtual caf::PdmFieldHandle*    userDescriptionField();
-protected:
-    RiuLineSegmentQwtPlotCurve*     m_qwtPlotCurve;
-
-    caf::PdmField<bool>             m_showCurve;
-    caf::PdmField<QString>          m_curveName;
-    caf::PdmField<QString>          m_customCurveName;
-
-    caf::PdmField<bool>             m_autoName;
-    caf::PdmField<cvf::Color3f>     m_curveColor;
-    caf::PdmField<float>            m_curveThickness;
-
-    caf::PdmField< caf::AppEnum< PointSymbolEnum > > m_pointSymbol;
-    caf::PdmField< caf::AppEnum< LineStyleEnum > >   m_lineStyle;
-};
-#endif
-//==================================================================================================
-///  
-///  
-//==================================================================================================
-class RimPlotCurve : public caf::PdmObject
-{
-    CAF_PDM_HEADER_INIT;
-public:
-    enum LineStyleEnum
-    {
-        STYLE_NONE,
-        STYLE_SOLID,
-        STYLE_DASH,
-        STYLE_DOT,
-        STYLE_DASH_DOT
-    };
-
-    enum PointSymbolEnum
-    {
-        SYMBOL_NONE,
-        SYMBOL_ELLIPSE,
-        SYMBOL_RECT,
-        SYMBOL_DIAMOND,
-        SYMBOL_TRIANGLE,
-        SYMBOL_CROSS,
-        SYMBOL_XCROSS
-    };
-public:
-    RimPlotCurve();
-    virtual ~RimPlotCurve();
-
-    void                            loadDataAndUpdate();
-
-    void                            setParentQwtPlot(QwtPlot* plot);
-    void                            detachQwtCurve();
-    QwtPlotCurve*                   qwtPlotCurve() const;
-
-    void                            setColor(const cvf::Color3f& color);
-    bool                            isCurveVisible() const;
-    QString                         curveName() const { return m_curveName; }
-
-protected:
-
-    virtual QString                 createCurveAutoName() = 0;
-    virtual void                    zoomAllParentPlot() = 0;
-    virtual void                    onLoadDataAndUpdate() = 0;
-
-    void                            updateCurvePresentation();
-    void                            updateCurveName();
-    void                            updateCurveVisibility();
-    void                            updateCurveAppearance();
-
-    void                            updateOptionSensitivity();
-
-protected:
-
-    // Overridden PDM methods
-    virtual void                    fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
-    virtual caf::PdmFieldHandle*    objectToggleField();
-    virtual caf::PdmFieldHandle*    userDescriptionField();
-    virtual void                    initAfterRead();
-    virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly);
-
-protected:
-    QPointer<QwtPlot>               m_parentQwtPlot;
-    RiuLineSegmentQwtPlotCurve*     m_qwtPlotCurve;
-
-    caf::PdmField<bool>             m_showCurve;
-    caf::PdmField<QString>          m_curveName;
-    caf::PdmField<QString>          m_customCurveName;
-
-    caf::PdmField<bool>             m_isUsingAutoName;
-    caf::PdmField<cvf::Color3f>     m_curveColor;
-    caf::PdmField<float>            m_curveThickness;
-
-    caf::PdmField< caf::AppEnum< PointSymbolEnum > > m_pointSymbol;
-    caf::PdmField< caf::AppEnum< LineStyleEnum > >   m_lineStyle;
-};
 
 //==================================================================================================
 ///