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

Merge changes from release-2019.11

Browse Source
This commit is contained in:
Magne Sjaastad
2019-12-04 13:59:50 +01:00
parent 2e7d581c3e 1ddf1bf88d
commit e138e1f7e8
3 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreatorDialog.cpp
View File

@@ -36,7 +36,7 @@
RicSummaryCurveCreatorDialog::RicSummaryCurveCreatorDialog( QWidget* parent )
: QDialog( parent, RiuTools::defaultDialogFlags() )
{
m_curveCreatorSplitterUi.reset( new RicSummaryCurveCreatorSplitterUi( this ) );
m_curveCreatorSplitterUi = new RicSummaryCurveCreatorSplitterUi( this );
QWidget* propertyWidget = m_curveCreatorSplitterUi->getOrCreateWidget( this );
@@ -46,7 +46,7 @@ RicSummaryCurveCreatorDialog::RicSummaryCurveCreatorDialog( QWidget* parent )
setWindowTitle( "Plot Editor" );
resize( 1200, 800 );
connect( m_curveCreatorSplitterUi.get(), SIGNAL( signalCloseButtonPressed() ), this, SLOT( accept() ) );
connect( m_curveCreatorSplitterUi, SIGNAL( signalCloseButtonPressed() ), this, SLOT( accept() ) );
connect( this, SIGNAL( finished( int ) ), this, SLOT( slotDialogFinished() ) );
}

4
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreatorDialog.h
View File

@@ -20,8 +20,6 @@
#include <QDialog>
#include <memory>
namespace caf
{
class PdmObject;
@@ -49,5 +47,5 @@ private slots:
void slotDialogFinished();
private:
std::unique_ptr<RicSummaryCurveCreatorSplitterUi> m_curveCreatorSplitterUi;
RicSummaryCurveCreatorSplitterUi* m_curveCreatorSplitterUi;
};

5
ApplicationCode/ProjectDataModel/RimPlotCurve.cpp
View File

@@ -181,11 +181,6 @@ RimPlotCurve::~RimPlotCurve()
delete m_qwtCurveErrorBars;
m_qwtCurveErrorBars = nullptr;
}
if ( m_parentQwtPlot )
{
m_parentQwtPlot->replot();
}
}
//--------------------------------------------------------------------------------------------------