#1321 Wip: First shot on bringing the flow characteristics curves up into the open.

ApplicationCode/UserInterface/CMakeLists_files.cmake

@@ -39,6 +39,7 @@ ${CEE_CURRENT_LIST_DIR}RiuGeoMechXfTensorResultAccessor.h
 ${CEE_CURRENT_LIST_DIR}RiuFemTimeHistoryResultAccessor.h
 ${CEE_CURRENT_LIST_DIR}RiuExportMultipleSnapshotsWidget.h
 ${CEE_CURRENT_LIST_DIR}RiuWellAllocationPlot.h
+${CEE_CURRENT_LIST_DIR}RiuFlowCharacteristicsPlot.h
 ${CEE_CURRENT_LIST_DIR}RiuNightchartsWidget.h
 ${CEE_CURRENT_LIST_DIR}RiuMessagePanel.h
 )
@@ -78,6 +79,7 @@ ${CEE_CURRENT_LIST_DIR}RiuGeoMechXfTensorResultAccessor.cpp
 ${CEE_CURRENT_LIST_DIR}RiuFemTimeHistoryResultAccessor.cpp
 ${CEE_CURRENT_LIST_DIR}RiuExportMultipleSnapshotsWidget.cpp
 ${CEE_CURRENT_LIST_DIR}RiuWellAllocationPlot.cpp
+${CEE_CURRENT_LIST_DIR}RiuFlowCharacteristicsPlot.cpp
 ${CEE_CURRENT_LIST_DIR}RiuNightchartsWidget.cpp
 ${CEE_CURRENT_LIST_DIR}RiuMessagePanel.cpp
 )
@@ -107,6 +109,7 @@ ${CEE_CURRENT_LIST_DIR}RiuSummaryQwtPlot.h
 ${CEE_CURRENT_LIST_DIR}RiuQwtScalePicker.h
 ${CEE_CURRENT_LIST_DIR}RiuExportMultipleSnapshotsWidget.h
 ${CEE_CURRENT_LIST_DIR}RiuWellAllocationPlot.h
+${CEE_CURRENT_LIST_DIR}RiuFlowCharacteristicsPlot.h
 ${CEE_CURRENT_LIST_DIR}RiuNightchartsWidget.h
 ${CEE_CURRENT_LIST_DIR}RiuMessagePanel.h
 )

ApplicationCode/UserInterface/RiuFlowCharacteristicsPlot.cpp

@@ -0,0 +1,154 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2017     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 "RiuFlowCharacteristicsPlot.h"
+#include "RimFlowCharacteristicsPlot.h"
+#include "RiuResultQwtPlot.h"
+
+#include "qwt_plot.h"
+#include "cvfBase.h"
+#include "cvfColor3.h"
+
+#include <QBoxLayout>
+#include <QContextMenuEvent>
+#include <QLabel>
+#include <QMenu>
+#include "RiuLineSegmentQwtPlotCurve.h"
+#include <QDateTime>
+
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+RiuFlowCharacteristicsPlot::RiuFlowCharacteristicsPlot(RimFlowCharacteristicsPlot* plotDefinition, QWidget* parent) 
+    :   m_plotDefinition(plotDefinition),
+        QFrame(parent)
+{
+    Q_ASSERT(m_plotDefinition);
+    
+    QVBoxLayout* mainLayout = new QVBoxLayout();
+    this->setLayout(mainLayout);
+    this->layout()->setMargin(0);
+    this->layout()->setSpacing(2);
+
+    // White background
+    QPalette pal = this->palette();
+    pal.setColor(QPalette::Background, Qt::white);
+    this->setAutoFillBackground(true);
+    this->setPalette(pal);
+
+    m_lorenzPlot = new RiuResultQwtPlot(this);
+    m_flowCapVsStorageCapPlot = new RiuResultQwtPlot(this);
+    m_sweepEffPlot = new RiuResultQwtPlot(this);
+    mainLayout->addWidget(m_lorenzPlot);
+    mainLayout->addWidget(m_flowCapVsStorageCapPlot);
+    mainLayout->addWidget(m_sweepEffPlot);
+    
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+RiuFlowCharacteristicsPlot::~RiuFlowCharacteristicsPlot()
+{
+    if (m_plotDefinition)
+    {
+        m_plotDefinition->handleMdiWindowClosed();
+    }
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RiuFlowCharacteristicsPlot::setLorenzCurve(const std::vector<QDateTime>& dateTimes, const std::vector<double>& timeHistoryValues)
+{
+    m_lorenzPlot->deleteAllCurves();
+    m_lorenzPlot->addCurve("Lorenz Coefficient", cvf::Color3f::BLUE, dateTimes, timeHistoryValues);
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RiuFlowCharacteristicsPlot::addFlowCapStorageCapCurve(const QDateTime& dateTime, const std::vector<double>& xVals, const std::vector<double>& yVals)
+{
+    RiuLineSegmentQwtPlotCurve* plotCurve = new RiuLineSegmentQwtPlotCurve(dateTime.toString());
+    plotCurve->setSamplesFromTimeAndValues(xVals, yVals, false);
+    plotCurve->setTitle(dateTime.toString());
+
+    plotCurve->setPen(QPen(QColor(180, 0, 20)));
+
+    plotCurve->attach(m_flowCapVsStorageCapPlot);
+
+    m_flowCapVsStorageCapPlot->setAxisScale( QwtPlot::xBottom, 0.0, 1.0);
+
+    m_flowCapVsStorageCapPlot->replot();
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RiuFlowCharacteristicsPlot::addSweepEfficiencyCurve(const QDateTime& dateTime, const std::vector<double>& xVals, const std::vector<double>& yVals)
+{
+    RiuLineSegmentQwtPlotCurve* plotCurve = new RiuLineSegmentQwtPlotCurve(dateTime.toString());
+    plotCurve->setSamplesFromTimeAndValues(xVals, yVals, false);
+    plotCurve->setTitle(dateTime.toString());
+
+    plotCurve->setPen(QPen(QColor(180, 0, 20)));
+
+    plotCurve->attach(m_sweepEffPlot);
+
+    //m_sweepEffPlot->setAxisScale( QwtPlot::xBottom, 0.0, 1.0);
+
+    m_sweepEffPlot->replot();
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+RimFlowCharacteristicsPlot* RiuFlowCharacteristicsPlot::ownerPlotDefinition()
+{
+    return m_plotDefinition;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QSize RiuFlowCharacteristicsPlot::minimumSizeHint() const
+{
+    return QSize(0, 100);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QSize RiuFlowCharacteristicsPlot::sizeHint() const
+{
+    return QSize(0, 0);
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RiuFlowCharacteristicsPlot::setDefaults()
+{
+
+}
+

ApplicationCode/UserInterface/RiuFlowCharacteristicsPlot.h

@@ -0,0 +1,70 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2017     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 "qwt_plot.h"
+
+#include "cafPdmPointer.h"
+
+#include <QPointer>
+#include <QFrame>
+
+class RimFlowCharacteristicsPlot;
+class RiuNightchartsWidget;
+class RiuResultQwtPlot;
+
+class QLabel;
+
+namespace cvf {
+    class Color3f;
+}
+
+//==================================================================================================
+//
+//
+//
+//==================================================================================================
+class RiuFlowCharacteristicsPlot : public QFrame
+{
+    Q_OBJECT;
+public:
+    RiuFlowCharacteristicsPlot(RimFlowCharacteristicsPlot* plotDefinition, QWidget* parent = NULL);
+    virtual ~RiuFlowCharacteristicsPlot();
+
+    void setLorenzCurve(const std::vector<QDateTime>& dateTimes, const std::vector<double>& timeHistoryValues);
+    void addFlowCapStorageCapCurve(const QDateTime& dateTime, const std::vector<double>& xVals, const std::vector<double>& yVals);
+    void addSweepEfficiencyCurve(const QDateTime& dateTime, const std::vector<double>& xVals, const std::vector<double>& yVals);
+
+    RimFlowCharacteristicsPlot*     ownerPlotDefinition();
+
+protected:
+    virtual QSize                   sizeHint() const override;
+    virtual QSize                   minimumSizeHint() const override;
+
+private:
+    void                            setDefaults();
+
+private:
+    caf::PdmPointer<RimFlowCharacteristicsPlot> m_plotDefinition;
+    QPointer<RiuResultQwtPlot> m_lorenzPlot;
+    QPointer<RiuResultQwtPlot> m_flowCapVsStorageCapPlot;
+    QPointer<RiuResultQwtPlot> m_sweepEffPlot;
+
+};
+

ApplicationCode/UserInterface/RiuSummaryQwtPlot.h

@@ -63,7 +63,8 @@ protected:
 
     virtual QSize                   sizeHint() const override;
     virtual QSize                   minimumSizeHint() const override;
-    virtual void                    contextMenuEvent(QContextMenuEvent *) override;
+    virtual void                    contextMenuEvent(QContextMenuEvent *) override;
+
 private:
     friend class RiuQwtPlotPicker;
     QPointF                         closestCurvePoint(const QPoint& pos, QString* valueString, QString* timeString, int* yAxis) const;