Make the refactored RFT and PLT plots work

This commit is contained in:
Gaute Lindkvist
2019-09-04 20:18:18 +02:00
parent b9d78152e1
commit 42f494be5f
10 changed files with 6 additions and 345 deletions

View File

@@ -57,8 +57,6 @@
#include "RimWellPathCollection.h"
#include "RimWellPlotTools.h"
#include "RiuWellPltPlot.h"
#include "cafPdmUiTreeOrdering.h"
#include "cafPdmUiTreeSelectionEditor.h"
#include "cafVecIjk.h"
@@ -1089,12 +1087,3 @@ void RimWellPltPlot::onLoadDataAndUpdate()
updateFormationsOnPlot();
syncCurvesFromUiSelection();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QWidget* RimWellPltPlot::createViewWidget(QWidget* mainWindowParent)
{
m_viewer = new RiuWellLogPlot(this, mainWindowParent);
return m_viewer;
}

View File

@@ -106,8 +106,6 @@ private:
// RimViewWindow overrides
QWidget* createViewWidget(QWidget* mainWindowParent) override;
void setPlotXAxisTitles(RimWellLogTrack* plotTrack);
void updateFormationsOnPlot() const;

View File

@@ -53,7 +53,6 @@
#include "RimWellPltPlot.h"
#include "RiuWellLogTrack.h"
#include "RiuWellRftPlot.h"
#include "cafPdmUiTreeOrdering.h"
#include "cafPdmUiTreeSelectionEditor.h"
@@ -89,6 +88,8 @@ RimWellRftPlot::RimWellRftPlot()
m_wellLogPlot_OBSOLETE->setDepthType(RimWellLogPlot::TRUE_VERTICAL_DEPTH);
m_wellLogPlot_OBSOLETE.xmlCapability()->setIOWritable(false);
m_depthType = RimWellLogPlot::TRUE_VERTICAL_DEPTH;
CAF_PDM_InitFieldNoDefault(&m_wellPathNameOrSimWellName, "WellName", "Well Name", "", "", "");
CAF_PDM_InitField(&m_branchIndex, "BranchIndex", 0, "Branch Index", "", "", "");
CAF_PDM_InitField(&m_branchDetection,
@@ -522,7 +523,7 @@ void RimWellRftPlot::updateCurvesInPlot(const std::set<RiaRftPltCurveDefinition>
assignWellPathToExtractionCurves();
}
loadDataAndUpdate();
RimWellLogPlot::onLoadDataAndUpdate();
if (plotTrack->curveCount())
{
zoomAll();
@@ -957,15 +958,6 @@ void RimWellRftPlot::assignWellPathToExtractionCurves()
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QWidget* RimWellRftPlot::createViewWidget(QWidget* mainWindowParent)
{
m_viewer = new RiuWellLogPlot(this, mainWindowParent);
return m_viewer;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

View File

@@ -114,8 +114,6 @@ private:
// RimViewWindow overrides
QWidget* createViewWidget(QWidget* mainWindowParent) override;
void applyCurveAppearance(RimWellLogCurve* newCurve);
void updateFormationsOnPlot() const;