mirror of
https://github.com/OPM/ResInsight.git
synced 2026-09-03 20:53:13 -05:00
Adjustments related to user course
* #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:
@@ -369,6 +369,15 @@ void RicShowPlotDataFeature::getSelection( std::vector<RimPlotWindow*>& selectio
|
|||||||
|
|
||||||
if ( selection.empty() )
|
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 );
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1045,6 +1045,14 @@ bool RimGridCrossPlot::isDeletable() const
|
|||||||
return plotWindow == nullptr;
|
return plotWindow == nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
///
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
bool RimGridCrossPlot::isCurveHighlightSupported() const
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
/// Name Configuration
|
/// Name Configuration
|
||||||
///
|
///
|
||||||
|
|||||||
@@ -109,6 +109,7 @@ public:
|
|||||||
void onAxisSelected( RiuPlotAxis axis, bool toggle ) override;
|
void onAxisSelected( RiuPlotAxis axis, bool toggle ) override;
|
||||||
|
|
||||||
bool isDeletable() const override;
|
bool isDeletable() const override;
|
||||||
|
bool isCurveHighlightSupported() const override;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void deleteViewWidget() override;
|
void deleteViewWidget() override;
|
||||||
|
|||||||
@@ -158,3 +158,12 @@ void RimGridCrossPlotCurve::defineUiOrdering( QString uiConfigName, caf::PdmUiOr
|
|||||||
nameGroup->add( &m_showLegend );
|
nameGroup->add( &m_showLegend );
|
||||||
uiOrdering.skipRemainingFields( true );
|
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
|
||||||
|
}
|
||||||
|
|||||||
@@ -45,6 +45,7 @@ protected:
|
|||||||
QString createCurveAutoName() override;
|
QString createCurveAutoName() override;
|
||||||
void onLoadDataAndUpdate( bool updateParentPlot ) override;
|
void onLoadDataAndUpdate( bool updateParentPlot ) override;
|
||||||
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
|
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
|
||||||
|
void defineObjectEditorAttribute( QString uiConfigName, caf::PdmUiEditorAttribute* attribute ) override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
int m_dataSetIndex;
|
int m_dataSetIndex;
|
||||||
|
|||||||
@@ -1068,7 +1068,7 @@ QString RimWellLogTrack::asciiDataForPlotExport() const
|
|||||||
out += QString::number( curveDepth, 'f', 3 );
|
out += QString::number( curveDepth, 'f', 3 );
|
||||||
for ( std::vector<double> plotVector : curvesPlotXValues )
|
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";
|
out += "\n";
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user