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

Create LGR : Use all well cells if no completions are defined (#7285)

Browse Source 
* #7274 Create LGR : Use all well cells if no completions are defined

* #7263  Create LGR : Not working in console mode 

Guard access to RiaApplication

* Add pytest for create_lgr_for_completion

* Add pytest for create_lgr_for_completion

* #7289 Script : Add execute of last used script

* #7291 Python : Guard access to RiaMainWindow
This commit is contained in:
Magne Sjaastad
2021-01-26 20:34:31 +01:00
committed by GitHub
parent f8aae6691d
commit 0ec612ae86
11 changed files with 101 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
ApplicationLibCode/Application/RiaCompletionTypeCalculationScheduler.cpp
View File

@@ -33,11 +33,11 @@
#include "RiuViewer.h"
#include "cafPdmUiTreeView.h"
#include "cafProgressState.h"
#include <QTimer>
#include <QTreeView>
#include "cafProgressState.h"
#include <set>
//--------------------------------------------------------------------------------------------------
@@ -112,8 +112,13 @@ void RiaCompletionTypeCalculationScheduler::slotRecalculateCompletionType()
std::set<RimEclipseCase*> uniqueCases( m_eclipseCasesToRecalculate.begin(), m_eclipseCasesToRecalculate.end() );
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
QModelIndex mi = RiuMainWindow::instance()->projectTreeView()->treeView()->currentIndex();
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
QModelIndex mi;
if ( RiuMainWindow::instance() )
{
mi = RiuMainWindow::instance()->projectTreeView()->treeView()->currentIndex();
}
for ( RimEclipseCase* eclipseCase : uniqueCases )
{
@@ -138,10 +143,13 @@ void RiaCompletionTypeCalculationScheduler::slotRecalculateCompletionType()
if ( activeView && activeView->viewer() )
{
RiaApplication::instance()->setActiveReservoirView( activeView );
RiuMainWindow::instance()->setActiveViewer( activeView->viewer()->layoutWidget() );
if ( RiuMainWindow::instance() )
{
RiuMainWindow::instance()->setActiveViewer( activeView->viewer()->layoutWidget() );
}
}
if ( mi.isValid() )
if ( mi.isValid() && RiuMainWindow::instance() )
{
RiuMainWindow::instance()->projectTreeView()->treeView()->setCurrentIndex( mi );
}
@@ -155,6 +163,14 @@ RiaCompletionTypeCalculationScheduler::~RiaCompletionTypeCalculationScheduler()
delete m_recalculateCompletionTypeTimer;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiaCompletionTypeCalculationScheduler::RiaCompletionTypeCalculationScheduler()
: m_recalculateCompletionTypeTimer( nullptr )
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

8
ApplicationLibCode/Application/RiaCompletionTypeCalculationScheduler.h
View File

@@ -27,6 +27,9 @@
class QTimer;
class RimEclipseCase;
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
class RiaCompletionTypeCalculationScheduler : public QObject
{
Q_OBJECT;
@@ -40,10 +43,7 @@ private slots:
void slotRecalculateCompletionType();
private:
RiaCompletionTypeCalculationScheduler()
: m_recalculateCompletionTypeTimer( nullptr )
{
}
RiaCompletionTypeCalculationScheduler();
~RiaCompletionTypeCalculationScheduler() override;
RiaCompletionTypeCalculationScheduler( const RiaCompletionTypeCalculationScheduler& o ) = delete;