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

Slightly improve menu text and distance threshold for correlation plot context entries

Browse Source
This commit is contained in:
Gaute Lindkvist 2020-08-25 16:11:21 +02:00
parent daf24c773b
commit 6f7534b2a9
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ApplicationCode/UserInterface/RiuSummaryQwtPlot.cpp
View File

@ -206,6 +206,8 @@ void RiuSummaryQwtPlot::contextMenuEvent( QContextMenuEvent* event )
RimEnsembleCurveSet* clickedEnsembleCurveSet = nullptr; RimEnsembleCurveSet* clickedEnsembleCurveSet = nullptr;
summaryCurve->firstAncestorOrThisOfType( clickedEnsembleCurveSet ); summaryCurve->firstAncestorOrThisOfType( clickedEnsembleCurveSet );
bool curveClicked = distanceFromClick < 50;
if ( clickedEnsembleCurveSet ) if ( clickedEnsembleCurveSet )
{ {
ensemble = clickedEnsembleCurveSet->summaryCaseCollection(); ensemble = clickedEnsembleCurveSet->summaryCaseCollection();
@ -215,7 +217,7 @@ void RiuSummaryQwtPlot::contextMenuEvent( QContextMenuEvent* event )
} }
} }
if ( distanceFromClick > 20 ) if ( !curveClicked )
{ {
RimSummaryPlot* summaryPlot = static_cast<RimSummaryPlot*>( plotDefinition() ); RimSummaryPlot* summaryPlot = static_cast<RimSummaryPlot*>( plotDefinition() );
std::vector<RimEnsembleCurveSet*> allCurveSetsInPlot; std::vector<RimEnsembleCurveSet*> allCurveSetsInPlot;
@ -239,10 +241,15 @@ void RiuSummaryQwtPlot::contextMenuEvent( QContextMenuEvent* event )
menuBuilder.addCmdFeatureWithUserData( "RicNewAnalysisPlotFeature", "New Analysis Plot", variant ); menuBuilder.addCmdFeatureWithUserData( "RicNewAnalysisPlotFeature", "New Analysis Plot", variant );
menuBuilder.subMenuStart( "Create Correlation Plot From Curve Point", QString subMenuName = "Create Correlation Plot";
*caf::IconProvider( ":/CorrelationPlots16x16.png" ).icon() ); if ( curveClicked )
{ {
if ( !clickedQuantityName.isEmpty() ) subMenuName = "Create Correlation Plot From Curve Point";
}
menuBuilder.subMenuStart( subMenuName, *caf::IconProvider( ":/CorrelationPlots16x16.png" ).icon() );
{
if ( curveClicked )
{ {
menuBuilder.addCmdFeatureWithUserData( "RicNewCorrelationPlotFeature", menuBuilder.addCmdFeatureWithUserData( "RicNewCorrelationPlotFeature",
"New Tornado Plot", "New Tornado Plot",
@ -254,7 +261,7 @@ void RiuSummaryQwtPlot::contextMenuEvent( QContextMenuEvent* event )
menuBuilder.addCmdFeatureWithUserData( "RicNewCorrelationReportPlotFeature", menuBuilder.addCmdFeatureWithUserData( "RicNewCorrelationReportPlotFeature",
"New Report Plot", "New Report Plot",
variant ); variant );
if ( !clickedQuantityName.isEmpty() ) if ( curveClicked )
{ {
menuBuilder.subMenuStart( "Cross Plots", menuBuilder.subMenuStart( "Cross Plots",
*caf::IconProvider( ":/CorrelationCrossPlot16x16.png" ).icon() ); *caf::IconProvider( ":/CorrelationCrossPlot16x16.png" ).icon() );