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 pull request #5181 from OPM/fix-plot-issues

Browse Source 
Fix some plot issues
This commit is contained in:
Magne Sjaastad 2019-12-04 13:39:54 +01:00 committed by GitHub
commit 1ddf1bf88d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 10 deletions
Show Stats 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 ) RicSummaryCurveCreatorDialog::RicSummaryCurveCreatorDialog( QWidget* parent )
: QDialog( parent, RiuTools::defaultDialogFlags() ) : QDialog( parent, RiuTools::defaultDialogFlags() )
{ {
m_curveCreatorSplitterUi.reset( new RicSummaryCurveCreatorSplitterUi( this ) ); m_curveCreatorSplitterUi = new RicSummaryCurveCreatorSplitterUi( this );
QWidget* propertyWidget = m_curveCreatorSplitterUi->getOrCreateWidget( this ); QWidget* propertyWidget = m_curveCreatorSplitterUi->getOrCreateWidget( this );
@ -46,7 +46,7 @@ RicSummaryCurveCreatorDialog::RicSummaryCurveCreatorDialog( QWidget* parent )
setWindowTitle( "Plot Editor" ); setWindowTitle( "Plot Editor" );
resize( 1200, 800 ); 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() ) ); connect( this, SIGNAL( finished( int ) ), this, SLOT( slotDialogFinished() ) );
} }

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

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

1
ApplicationCode/ProjectDataModel/RimMainPlotCollection.cpp
View File

@ -193,6 +193,7 @@ void RimMainPlotCollection::deleteAllContainedObjects()
m_summaryCrossPlotCollection()->deleteAllChildObjects(); m_summaryCrossPlotCollection()->deleteAllChildObjects();
m_gridCrossPlotCollection->deleteAllChildObjects(); m_gridCrossPlotCollection->deleteAllChildObjects();
m_flowPlotCollection()->closeDefaultPlotWindowAndDeletePlots(); m_flowPlotCollection()->closeDefaultPlotWindowAndDeletePlots();
m_saturationPressurePlotCollection()->deleteAllChildObjects();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

5
ApplicationCode/ProjectDataModel/RimPlotCurve.cpp
View File

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