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

Adjustments related to user course

Browse Source 
* #10285 Grid Cross Plot: Fix group highlighting
* #9329 Make Show plot data more robust
* Do not show the curve color tag for grid cross plot curves
* #10310 Add tab to show plot data for well log curves
This commit is contained in:
Magne Sjaastad
2023-05-26 11:47:26 +02:00
committed by GitHub
parent b7420ebc70
commit cca852ef1f
6 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ApplicationLibCode/Commands/ApplicationCommands/RicShowPlotDataFeature.cpp
View File

@@ -369,6 +369,15 @@ void RicShowPlotDataFeature::getSelection( std::vector<RimPlotWindow*>& selectio
if ( selection.empty() )
{
caf::SelectionManager::instance()->objectsByType( &selection );
auto selectedObjects = caf::selectedObjectsByType<caf::PdmObject*>();
for ( auto obj : selectedObjects )
{
if ( !obj ) continue;
if ( auto plotWindow = obj->firstAncestorOrThisOfType<RimPlotWindow>() )
{
selection.push_back( plotWindow );
}
}
}
}

8
ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.cpp
View File

@@ -1045,6 +1045,14 @@ bool RimGridCrossPlot::isDeletable() const
return plotWindow == nullptr;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimGridCrossPlot::isCurveHighlightSupported() const
{
return true;
}
//--------------------------------------------------------------------------------------------------
/// Name Configuration
///

1
ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.h
View File

@@ -109,6 +109,7 @@ public:
void onAxisSelected( RiuPlotAxis axis, bool toggle ) override;
bool isDeletable() const override;
bool isCurveHighlightSupported() const override;
protected:
void deleteViewWidget() override;

9
ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotCurve.cpp
View File

@@ -158,3 +158,12 @@ void RimGridCrossPlotCurve::defineUiOrdering( QString uiConfigName, caf::PdmUiOr
nameGroup->add( &m_showLegend );
uiOrdering.skipRemainingFields( true );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimGridCrossPlotCurve::defineObjectEditorAttribute( QString uiConfigName, caf::PdmUiEditorAttribute* attribute )
{
// Implement an empty method to avoid the base class implementation in RimPlotCurve
// The color tag is not used for Grid Cross Plot Curves
}

1
ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotCurve.h
View File

@@ -45,6 +45,7 @@ protected:
QString createCurveAutoName() override;
void onLoadDataAndUpdate( bool updateParentPlot ) override;
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void defineObjectEditorAttribute( QString uiConfigName, caf::PdmUiEditorAttribute* attribute ) override;
private:
int m_dataSetIndex;

2
ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.cpp
View File

@@ -1068,7 +1068,7 @@ QString RimWellLogTrack::asciiDataForPlotExport() const
out += QString::number( curveDepth, 'f', 3 );
for ( std::vector<double> plotVector : curvesPlotXValues )
{
out += QString( " %1" ).arg( QString::number( plotVector[i], 'f', 3 ), 12 );
out += QString( " \t%1" ).arg( QString::number( plotVector[i], 'f', 3 ), 12 );
}
out += "\n";
}