mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
parent
fdf4309d82
commit
b5d6421f22
@ -128,7 +128,6 @@ RimGridCrossPlotDataSet::RimGridCrossPlotDataSet()
|
|||||||
m_crossPlotCurves.uiCapability()->setUiTreeHidden( true );
|
m_crossPlotCurves.uiCapability()->setUiTreeHidden( true );
|
||||||
|
|
||||||
CAF_PDM_InitFieldNoDefault( &m_crossPlotRegressionCurves, "CrossPlotRegressionCurves", "Regression Curves" );
|
CAF_PDM_InitFieldNoDefault( &m_crossPlotRegressionCurves, "CrossPlotRegressionCurves", "Regression Curves" );
|
||||||
// m_crossPlotRegressionCurves.uiCapability()->setUiTreeHidden( true );
|
|
||||||
|
|
||||||
CAF_PDM_InitField( &m_useCustomColor, "UseCustomColor", false, "Use Custom Color" );
|
CAF_PDM_InitField( &m_useCustomColor, "UseCustomColor", false, "Use Custom Color" );
|
||||||
CAF_PDM_InitField( &m_customColor, "CustomColor", cvf::Color3f( cvf::Color3f::BLACK ), "Custom Color" );
|
CAF_PDM_InitField( &m_customColor, "CustomColor", cvf::Color3f( cvf::Color3f::BLACK ), "Custom Color" );
|
||||||
@ -469,6 +468,16 @@ void RimGridCrossPlotDataSet::initAfterRead()
|
|||||||
m_groupingProperty->setEclipseCase( eclipseCase );
|
m_groupingProperty->setEclipseCase( eclipseCase );
|
||||||
m_plotCellFilterCollection->setCase( eclipseCase );
|
m_plotCellFilterCollection->setCase( eclipseCase );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for ( auto curve : m_crossPlotCurves )
|
||||||
|
{
|
||||||
|
curve->appearanceChanged.connect( this, &RimGridCrossPlotDataSet::curveAppearanceChanged );
|
||||||
|
}
|
||||||
|
|
||||||
|
for ( auto curve : m_crossPlotRegressionCurves )
|
||||||
|
{
|
||||||
|
curve->appearanceChanged.connect( this, &RimGridCrossPlotDataSet::curveAppearanceChanged );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
@ -673,6 +682,7 @@ void RimGridCrossPlotDataSet::createCurves( const RigEclipseCrossPlotResult& res
|
|||||||
curve->setSamples( result.xValues, result.yValues );
|
curve->setSamples( result.xValues, result.yValues );
|
||||||
curve->setCurveAutoAppearance();
|
curve->setCurveAutoAppearance();
|
||||||
curve->updateUiIconFromPlotSymbol();
|
curve->updateUiIconFromPlotSymbol();
|
||||||
|
curve->appearanceChanged.connect( this, &RimGridCrossPlotDataSet::curveAppearanceChanged );
|
||||||
m_crossPlotCurves.push_back( curve );
|
m_crossPlotCurves.push_back( curve );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -697,6 +707,7 @@ void RimGridCrossPlotDataSet::createCurves( const RigEclipseCrossPlotResult& res
|
|||||||
curve->setLegendEntryText( createAutoName() );
|
curve->setLegendEntryText( createAutoName() );
|
||||||
curve->setCurveAutoAppearance();
|
curve->setCurveAutoAppearance();
|
||||||
curve->updateUiIconFromPlotSymbol();
|
curve->updateUiIconFromPlotSymbol();
|
||||||
|
curve->appearanceChanged.connect( this, &RimGridCrossPlotDataSet::curveAppearanceChanged );
|
||||||
m_crossPlotCurves.push_back( curve );
|
m_crossPlotCurves.push_back( curve );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -752,6 +763,7 @@ void RimGridCrossPlotDataSet::createRegressionCurves( const RigEclipseCrossPlotR
|
|||||||
curve->setSamples( result.xValues, result.yValues );
|
curve->setSamples( result.xValues, result.yValues );
|
||||||
curve->setCurveAutoAppearance();
|
curve->setCurveAutoAppearance();
|
||||||
curve->updateUiIconFromPlotSymbol();
|
curve->updateUiIconFromPlotSymbol();
|
||||||
|
curve->appearanceChanged.connect( this, &RimGridCrossPlotDataSet::curveAppearanceChanged );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -780,6 +792,7 @@ void RimGridCrossPlotDataSet::createRegressionCurves( const RigEclipseCrossPlotR
|
|||||||
curve->setLegendEntryText( createAutoName() );
|
curve->setLegendEntryText( createAutoName() );
|
||||||
curve->setCurveAutoAppearance();
|
curve->setCurveAutoAppearance();
|
||||||
curve->updateUiIconFromPlotSymbol();
|
curve->updateUiIconFromPlotSymbol();
|
||||||
|
curve->appearanceChanged.connect( this, &RimGridCrossPlotDataSet::curveAppearanceChanged );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -822,6 +835,10 @@ void RimGridCrossPlotDataSet::fillCurveDataInExistingRegressionCurves( const Rig
|
|||||||
void RimGridCrossPlotDataSet::destroyCurves()
|
void RimGridCrossPlotDataSet::destroyCurves()
|
||||||
{
|
{
|
||||||
detachAllCurves();
|
detachAllCurves();
|
||||||
|
|
||||||
|
for ( auto curve : m_crossPlotCurves )
|
||||||
|
curve->appearanceChanged.disconnect( this );
|
||||||
|
|
||||||
m_crossPlotCurves.deleteChildren();
|
m_crossPlotCurves.deleteChildren();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -831,6 +848,10 @@ void RimGridCrossPlotDataSet::destroyCurves()
|
|||||||
void RimGridCrossPlotDataSet::destroyRegressionCurves()
|
void RimGridCrossPlotDataSet::destroyRegressionCurves()
|
||||||
{
|
{
|
||||||
detachAllRegressionCurves();
|
detachAllRegressionCurves();
|
||||||
|
|
||||||
|
for ( auto curve : m_crossPlotRegressionCurves )
|
||||||
|
curve->appearanceChanged.disconnect( this );
|
||||||
|
|
||||||
m_crossPlotRegressionCurves.deleteChildren();
|
m_crossPlotRegressionCurves.deleteChildren();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1586,6 +1607,14 @@ void RimGridCrossPlotDataSet::filterInvalidCurveValues( RigEclipseCrossPlotResul
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
///
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
void RimGridCrossPlotDataSet::curveAppearanceChanged( const caf::SignalEmitter* emitter )
|
||||||
|
{
|
||||||
|
triggerPlotNameUpdateAndReplot();
|
||||||
|
}
|
||||||
|
|
||||||
CAF_PDM_SOURCE_INIT( RimGridCrossPlotDataSetNameConfig, "RimGridCrossPlotCurveSetNameConfig" );
|
CAF_PDM_SOURCE_INIT( RimGridCrossPlotDataSetNameConfig, "RimGridCrossPlotCurveSetNameConfig" );
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
@ -177,6 +177,8 @@ protected:
|
|||||||
cvf::Color3f createCurveColor( bool useCustomColor, int colorIndex ) const;
|
cvf::Color3f createCurveColor( bool useCustomColor, int colorIndex ) const;
|
||||||
cvf::Color3f createCurveColor( const std::vector<double>& tickValues, int groupIndex ) const;
|
cvf::Color3f createCurveColor( const std::vector<double>& tickValues, int groupIndex ) const;
|
||||||
|
|
||||||
|
void curveAppearanceChanged( const caf::SignalEmitter* emitter );
|
||||||
|
|
||||||
private:
|
private:
|
||||||
caf::PdmPtrField<RimCase*> m_case;
|
caf::PdmPtrField<RimCase*> m_case;
|
||||||
caf::PdmField<int> m_timeStep;
|
caf::PdmField<int> m_timeStep;
|
||||||
|
@ -231,6 +231,15 @@ void RimGridCrossPlotRegressionCurve::setCurveAutoAppearance()
|
|||||||
updateCurveAppearance();
|
updateCurveAppearance();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
///
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
void RimGridCrossPlotRegressionCurve::updateCurveAppearance()
|
||||||
|
{
|
||||||
|
RimPlotCurve::updateCurveAppearance();
|
||||||
|
updateRectAnnotation();
|
||||||
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
@ -44,6 +44,8 @@ public:
|
|||||||
void setSamples( const std::vector<double>& xValues, const std::vector<double>& yValues );
|
void setSamples( const std::vector<double>& xValues, const std::vector<double>& yValues );
|
||||||
void setRangeDefaults( const std::vector<double>& xValues, const std::vector<double>& yValues );
|
void setRangeDefaults( const std::vector<double>& xValues, const std::vector<double>& yValues );
|
||||||
|
|
||||||
|
void updateCurveAppearance() override;
|
||||||
|
|
||||||
void setCurveAutoAppearance();
|
void setCurveAutoAppearance();
|
||||||
int groupIndex() const;
|
int groupIndex() const;
|
||||||
size_t sampleCount() const;
|
size_t sampleCount() const;
|
||||||
|
@ -325,6 +325,7 @@ void RimRegularLegendConfig::fieldChangedByUi( const caf::PdmFieldHandle* change
|
|||||||
if ( changedField != &m_showLegend )
|
if ( changedField != &m_showLegend )
|
||||||
{
|
{
|
||||||
crossPlotCurveSet->destroyCurves();
|
crossPlotCurveSet->destroyCurves();
|
||||||
|
crossPlotCurveSet->destroyRegressionCurves();
|
||||||
}
|
}
|
||||||
|
|
||||||
crossPlotCurveSet->loadDataAndUpdate( true );
|
crossPlotCurveSet->loadDataAndUpdate( true );
|
||||||
|
Loading…
Reference in New Issue
Block a user