OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-09 23:16:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

#4145 #4146 Add Create Grid Cross plot command to view and rename filter view

Browse Source
This commit is contained in:
Gaute Lindkvist 2019-03-01 15:49:02 +01:00
parent 44c72a9396
commit 3d145464c1
5 changed files with 48 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
ApplicationCode/Commands/GridCrossPlotCommands/RicCreateGridCrossPlotFeature.cpp
View File

@ -19,8 +19,11 @@
#include "RiaApplication.h"
#include "RimEclipseView.h"
#include "RimGridCrossPlot.h"
#include "RimGridCrossPlotCollection.h"
#include "RimGridCrossPlotCurveSet.h"
#include "RimGridView.h"
#include "RimMainPlotCollection.h"
#include "RimProject.h"
@ -45,17 +48,30 @@ bool RicCreateGridCrossPlotFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
void RicCreateGridCrossPlotFeature::onActionTriggered(bool isChecked)
{
RimProject* project = RiaApplication::instance()->project();
RimGridCrossPlotCollection* collection = project->mainPlotCollection()->gridCrossPlotCollection();
RimGridCrossPlot* plot = collection->createGridCrossPlot();
RimProject* project = RiaApplication::instance()->project();
bool launchedFromPlotCollection = true;
RimGridCrossPlotCollection* collection =
caf::SelectionManager::instance()->selectedItemAncestorOfType<RimGridCrossPlotCollection>();
if (!collection)
{
collection = project->mainPlotCollection()->gridCrossPlotCollection();
launchedFromPlotCollection = false;
}
RimGridCrossPlot* plot = collection->createGridCrossPlot();
RimGridCrossPlotCurveSet* curveSet = plot->createCurveSet();
if (!launchedFromPlotCollection)
{
curveSet->setCellFilterView(RiaApplication::instance()->activeGridView());
}
plot->createCurveSet();
plot->loadDataAndUpdate();
plot->zoomAll();
plot->updateConnectedEditors();
RiaApplication::instance()->project()->updateConnectedEditors();
RiaApplication::instance()->getOrCreateMainPlotWindow();
RiaApplication::instance()->getOrCreateAndShowMainPlotWindow();
RiuPlotMainWindowTools::selectAsCurrentItem(plot);
}
@ -64,6 +80,15 @@ void RicCreateGridCrossPlotFeature::onActionTriggered(bool isChecked)
//--------------------------------------------------------------------------------------------------
void RicCreateGridCrossPlotFeature::setupActionLook(QAction* actionToSetup)
{
actionToSetup->setText("New Grid Cross Plot");
RimGridCrossPlotCollection* collection =
caf::SelectionManager::instance()->selectedItemAncestorOfType<RimGridCrossPlotCollection>();
if (!collection)
{
actionToSetup->setText("New Grid Cross Plot from 3d View");
}
else
{
actionToSetup->setText("New Grid Cross Plot");
}
actionToSetup->setIcon(QIcon(":/SummaryXPlotsLight16x16.png"));
}

10
ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotCurveSet.cpp
View File

@ -70,7 +70,7 @@ RimGridCrossPlotCurveSet::RimGridCrossPlotCurveSet()
CAF_PDM_InitField(&m_timeStep, "TimeStep", -1, "Time Step", "", "", "");
m_timeStep.uiCapability()->setUiEditorTypeName(caf::PdmUiComboBoxEditor::uiEditorTypeName());
CAF_PDM_InitFieldNoDefault(&m_cellFilterView, "VisibleCellView", "Limit to Cells Visible in View", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_cellFilterView, "VisibleCellView", "Filter by Cells Visible in 3d View", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_categorization, "Categorization", "Data Categorization", "", "", "");
@ -103,6 +103,14 @@ RimGridCrossPlotCurveSet::RimGridCrossPlotCurveSet()
setDefaults();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimGridCrossPlotCurveSet::setCellFilterView(RimGridView* cellFilterView)
{
m_cellFilterView = cellFilterView;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

1
ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotCurveSet.h
View File

@ -75,6 +75,7 @@ public:
RimGridCrossPlotCurveSet();
~RimGridCrossPlotCurveSet() = default;
void setCellFilterView(RimGridView* cellFilterView);
void loadDataAndUpdate(bool updateParentPlot);
void setParentQwtPlotNoReplot(QwtPlot* parent);
QString xAxisName() const;

2
ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
View File

@ -167,6 +167,7 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
menuBuilder << "Separator";
menuBuilder << "RicNewViewFeature";
menuBuilder << "RicNewContourMapViewFeature";
menuBuilder << "RicCreateGridCrossPlotFeature";
menuBuilder << "Separator";
menuBuilder << "RicCopyReferencesToClipboardFeature";
menuBuilder << "RicSaveEclipseInputVisibleCellsFeature";
@ -230,6 +231,7 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
{
menuBuilder << "RicSaveEclipseResultAsInputPropertyFeature";
menuBuilder << "RicSaveEclipseInputVisibleCellsFeature";
menuBuilder << "RicCreateGridCrossPlotFeature";
}
else if (dynamic_cast<RimEclipseInputPropertyCollection*>(uiItem))
{

5
ApplicationCode/UserInterface/RiuViewerCommands.cpp
View File

@ -490,6 +490,11 @@ void RiuViewerCommands::displayContextMenu(QMouseEvent* event)
menuBuilder.addSeparator();
menuBuilder << "RicNewGridTimeHistoryCurveFeature";
menuBuilder << "RicShowFlowCharacteristicsPlotFeature";
if (dynamic_cast<RimEclipseView*>(gridView))
{
menuBuilder << "RicCreateGridCrossPlotFeature";
}
menuBuilder.addSeparator();
menuBuilder << "RicSaveEclipseInputActiveVisibleCellsFeature";
menuBuilder << "RicShowGridStatisticsFeature";
menuBuilder << "RicSelectColorResult";