mirror of
https://github.com/OPM/ResInsight.git
synced 2025-01-24 15:26:48 -06:00
#2089 Cross Plot : Add new cross plot curve feature
This commit is contained in:
parent
eb28f5a865
commit
b72ce60379
@ -32,6 +32,7 @@ ${CEE_CURRENT_LIST_DIR}RicEditSummaryCurveCalculationFeature.h
|
|||||||
${CEE_CURRENT_LIST_DIR}RicSummaryCurveCalculatorDialog.h
|
${CEE_CURRENT_LIST_DIR}RicSummaryCurveCalculatorDialog.h
|
||||||
${CEE_CURRENT_LIST_DIR}RicSummaryCurveCalculatorEditor.h
|
${CEE_CURRENT_LIST_DIR}RicSummaryCurveCalculatorEditor.h
|
||||||
${CEE_CURRENT_LIST_DIR}RicSummaryCurveCalculator.h
|
${CEE_CURRENT_LIST_DIR}RicSummaryCurveCalculator.h
|
||||||
|
${CEE_CURRENT_LIST_DIR}RicNewSummaryCrossPlotCurveFeature.h
|
||||||
)
|
)
|
||||||
|
|
||||||
set (SOURCE_GROUP_SOURCE_FILES
|
set (SOURCE_GROUP_SOURCE_FILES
|
||||||
@ -61,6 +62,7 @@ ${CEE_CURRENT_LIST_DIR}RicEditSummaryCurveCalculationFeature.cpp
|
|||||||
${CEE_CURRENT_LIST_DIR}RicSummaryCurveCalculatorDialog.cpp
|
${CEE_CURRENT_LIST_DIR}RicSummaryCurveCalculatorDialog.cpp
|
||||||
${CEE_CURRENT_LIST_DIR}RicSummaryCurveCalculatorEditor.cpp
|
${CEE_CURRENT_LIST_DIR}RicSummaryCurveCalculatorEditor.cpp
|
||||||
${CEE_CURRENT_LIST_DIR}RicSummaryCurveCalculator.cpp
|
${CEE_CURRENT_LIST_DIR}RicSummaryCurveCalculator.cpp
|
||||||
|
${CEE_CURRENT_LIST_DIR}RicNewSummaryCrossPlotCurveFeature.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
list(APPEND CODE_HEADER_FILES
|
list(APPEND CODE_HEADER_FILES
|
||||||
|
@ -0,0 +1,110 @@
|
|||||||
|
/////////////////////////////////////////////////////////////////////////////////
|
||||||
|
//
|
||||||
|
// 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 "RicNewSummaryCrossPlotCurveFeature.h"
|
||||||
|
|
||||||
|
#include "RiaApplication.h"
|
||||||
|
|
||||||
|
#include "RimMainPlotCollection.h"
|
||||||
|
#include "RimOilField.h"
|
||||||
|
#include "RimProject.h"
|
||||||
|
#include "RimSummaryCaseMainCollection.h"
|
||||||
|
#include "RimSummaryCrossPlotCollection.h"
|
||||||
|
#include "RimSummaryCurve.h"
|
||||||
|
#include "RimSummaryPlot.h"
|
||||||
|
#include "RimSummaryPlotCollection.h"
|
||||||
|
|
||||||
|
#include "RiuMainPlotWindow.h"
|
||||||
|
|
||||||
|
#include "WellLogCommands/RicWellLogPlotCurveFeatureImpl.h"
|
||||||
|
|
||||||
|
#include "cafSelectionManager.h"
|
||||||
|
|
||||||
|
#include <QAction>
|
||||||
|
|
||||||
|
|
||||||
|
CAF_CMD_SOURCE_INIT(RicNewSummaryCrossPlotCurveFeature, "RicNewSummaryCrossPlotCurveFeature");
|
||||||
|
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
///
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
bool RicNewSummaryCrossPlotCurveFeature::isCommandEnabled()
|
||||||
|
{
|
||||||
|
return (selectedSummaryPlot());
|
||||||
|
}
|
||||||
|
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
///
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
void RicNewSummaryCrossPlotCurveFeature::onActionTriggered(bool isChecked)
|
||||||
|
{
|
||||||
|
RimProject* project = RiaApplication::instance()->project();
|
||||||
|
|
||||||
|
RimSummaryPlot* plot = selectedSummaryPlot();
|
||||||
|
if (plot)
|
||||||
|
{
|
||||||
|
RimSummaryCurve* newCurve = new RimSummaryCurve();
|
||||||
|
cvf::Color3f curveColor = RicWellLogPlotCurveFeatureImpl::curveColorFromTable(plot->curveCount());
|
||||||
|
newCurve->setColor(curveColor);
|
||||||
|
newCurve->setAsCrossPlotCurve();
|
||||||
|
|
||||||
|
plot->addCurveAndUpdate(newCurve);
|
||||||
|
|
||||||
|
RimSummaryCase* defaultCase = nullptr;
|
||||||
|
if (project->activeOilField()->summaryCaseMainCollection()->summaryCaseCount() > 0)
|
||||||
|
{
|
||||||
|
defaultCase = project->activeOilField()->summaryCaseMainCollection()->summaryCase(0);
|
||||||
|
newCurve->setSummaryCase(defaultCase);
|
||||||
|
|
||||||
|
newCurve->loadDataAndUpdate(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
plot->updateConnectedEditors();
|
||||||
|
|
||||||
|
RiaApplication::instance()->getOrCreateAndShowMainPlotWindow()->selectAsCurrentItem(newCurve);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
///
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
void RicNewSummaryCrossPlotCurveFeature::setupActionLook(QAction* actionToSetup)
|
||||||
|
{
|
||||||
|
actionToSetup->setText("New Summary Cross Plot Curve");
|
||||||
|
actionToSetup->setIcon(QIcon(":/SummaryCurve16x16.png"));
|
||||||
|
}
|
||||||
|
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
///
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
RimSummaryPlot* RicNewSummaryCrossPlotCurveFeature::selectedSummaryPlot() const
|
||||||
|
{
|
||||||
|
RimSummaryPlot* sumPlot = nullptr;
|
||||||
|
|
||||||
|
caf::PdmObject* selObj = dynamic_cast<caf::PdmObject*>(caf::SelectionManager::instance()->selectedItem());
|
||||||
|
if (selObj)
|
||||||
|
{
|
||||||
|
selObj->firstAncestorOrThisOfType(sumPlot);
|
||||||
|
}
|
||||||
|
|
||||||
|
RimSummaryCrossPlotCollection* crossPlotColl = nullptr;
|
||||||
|
sumPlot->firstAncestorOrThisOfType(crossPlotColl);
|
||||||
|
if (!crossPlotColl) return nullptr;
|
||||||
|
|
||||||
|
return sumPlot;
|
||||||
|
}
|
@ -0,0 +1,40 @@
|
|||||||
|
/////////////////////////////////////////////////////////////////////////////////
|
||||||
|
//
|
||||||
|
// 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 "cafCmdFeature.h"
|
||||||
|
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
|
class RimSummaryPlot;
|
||||||
|
|
||||||
|
//==================================================================================================
|
||||||
|
///
|
||||||
|
//==================================================================================================
|
||||||
|
class RicNewSummaryCrossPlotCurveFeature : public caf::CmdFeature
|
||||||
|
{
|
||||||
|
CAF_CMD_HEADER_INIT;
|
||||||
|
protected:
|
||||||
|
virtual bool isCommandEnabled() override;
|
||||||
|
virtual void onActionTriggered( bool isChecked ) override;
|
||||||
|
virtual void setupActionLook( QAction* actionToSetup ) override;
|
||||||
|
|
||||||
|
private:
|
||||||
|
RimSummaryPlot* selectedSummaryPlot() const;
|
||||||
|
};
|
@ -336,6 +336,7 @@ QStringList RimContextCommandBuilder::commandsFromSelection()
|
|||||||
commandIds << "RicEditSummaryPlotFeature";
|
commandIds << "RicEditSummaryPlotFeature";
|
||||||
commandIds << "RicNewSummaryPlotFeature";
|
commandIds << "RicNewSummaryPlotFeature";
|
||||||
commandIds << "RicNewSummaryCurveFeature";
|
commandIds << "RicNewSummaryCurveFeature";
|
||||||
|
commandIds << "RicNewSummaryCrossPlotCurveFeature";
|
||||||
commandIds << "Separator";
|
commandIds << "Separator";
|
||||||
commandIds << "RicShowSummaryCurveCalculatorFeature";
|
commandIds << "RicShowSummaryCurveCalculatorFeature";
|
||||||
commandIds << "Separator";
|
commandIds << "Separator";
|
||||||
@ -350,6 +351,7 @@ QStringList RimContextCommandBuilder::commandsFromSelection()
|
|||||||
commandIds << "RicPasteSummaryCurveFeature";
|
commandIds << "RicPasteSummaryCurveFeature";
|
||||||
commandIds << "Separator";
|
commandIds << "Separator";
|
||||||
commandIds << "RicNewSummaryCurveFeature";
|
commandIds << "RicNewSummaryCurveFeature";
|
||||||
|
commandIds << "RicNewSummaryCrossPlotCurveFeature";
|
||||||
commandIds << "Separator";
|
commandIds << "Separator";
|
||||||
commandIds << "RicCopyReferencesToClipboardFeature";
|
commandIds << "RicCopyReferencesToClipboardFeature";
|
||||||
commandIds << "Separator";
|
commandIds << "Separator";
|
||||||
|
Loading…
Reference in New Issue
Block a user