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 for RC2

Browse Source 
* Add dependency to Svg
* Renaming
* Remove special handling of bright colored curves
For some ensemble cases, the curve highlight does not work well. A prototype for ensemble curve highlight was introduced, but this was not working for a collection of standalone summary curves.
* Set version to RC_02
This commit is contained in:
Magne Sjaastad
2022-09-06 15:29:10 +02:00
parent 5014d7ddf7
commit e1dda4c6b3
8 changed files with 18 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveCollection.cpp
View File

@@ -502,7 +502,7 @@ void RimSummaryCurveCollection::defineEditorAttribute( const caf::PdmFieldHandle
//--------------------------------------------------------------------------------------------------
void RimSummaryCurveCollection::onCurvesReordered( const SignalEmitter* emitter )
{
refreshCurveOrdering();
updateCurveOrder();
curvesChanged.send();
}
@@ -545,7 +545,7 @@ void RimSummaryCurveCollection::defineObjectEditorAttribute( QString uiConfigNam
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryCurveCollection::refreshCurveOrdering()
void RimSummaryCurveCollection::updateCurveOrder()
{
detachPlotCurves();
reattachPlotCurves();

2
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveCollection.h
View File

@@ -61,7 +61,7 @@ public:
void loadDataAndUpdate( bool updateParentPlot );
void refreshCurveOrdering();
void updateCurveOrder();
private:
void setParentPlotAndReplot( RiuPlotWidget* plot );

6
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp
View File

@@ -2456,7 +2456,7 @@ RiuPlotWidget* RimSummaryPlot::doCreatePlotViewWidget( QWidget* mainWindowParent
m_summaryPlot = std::make_unique<RiuSummaryQwtPlot>( this, mainWindowParent );
#endif
QObject::connect( plotWidget(), SIGNAL( curveOrderNeedsUpdate() ), this, SLOT( updateCurveOrder() ) );
QObject::connect( plotWidget(), SIGNAL( curveOrderNeedsUpdate() ), this, SLOT( onUpdateCurveOrder() ) );
for ( const auto& axisProperties : m_axisProperties )
{
@@ -3021,7 +3021,7 @@ RimSummaryPlotSourceStepping* RimSummaryPlot::sourceStepper()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryPlot::updateCurveOrder()
void RimSummaryPlot::onUpdateCurveOrder()
{
m_summaryCurveCollection->refreshCurveOrdering();
m_summaryCurveCollection->updateCurveOrder();
}

2
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.h
View File

@@ -252,7 +252,7 @@ protected:
private slots:
void onPlotZoomed();
void updateCurveOrder();
void onUpdateCurveOrder();
private:
std::vector<RimSummaryCurve*> visibleSummaryCurvesForAxis( RiuPlotAxis plotAxis ) const;