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

Tool button to add well cells to range filter

Browse Source 
Issue #73
This commit is contained in:
Jacob Støren 2013-10-18 11:19:49 +02:00
parent c537d7179b
commit 5a745b7f3b
4 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ApplicationCode/Resources/ResInsight.qrc
View File

@ -40,6 +40,7 @@
<file>draw_style_faults_24x24.png</file> <file>draw_style_faults_24x24.png</file>
<file>Case48x48.png</file> <file>Case48x48.png</file>
<file>GridModels.png</file> <file>GridModels.png</file>
<file>draw_style_WellCellsToRangeFilter_24x24.png</file>
</qresource> </qresource>
<qresource prefix="/Shader/"> <qresource prefix="/Shader/">
<file>fs_CellFace.glsl</file> <file>fs_CellFace.glsl</file>

BIN
ApplicationCode/Resources/draw_style_WellCellsToRangeFilter_24x24.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

32
ApplicationCode/UserInterface/RiuMainWindow.cpp
View File

@ -298,10 +298,16 @@ void RiuMainWindow::createActions()
connect(m_dsActionGroup, SIGNAL(triggered(QAction*)), SLOT(slotDrawStyleChanged(QAction*))); connect(m_dsActionGroup, SIGNAL(triggered(QAction*)), SLOT(slotDrawStyleChanged(QAction*)));
m_drawStyleToggleFaultsAction = new QAction( QIcon(":/draw_style_faults_24x24.png"), "&Show Faults Only", this); m_drawStyleToggleFaultsAction = new QAction( QIcon(":/draw_style_faults_24x24.png"), "&Show Faults Only", this);
m_drawStyleToggleFaultsAction->setCheckable(true); m_drawStyleToggleFaultsAction->setCheckable(true);
connect(m_drawStyleToggleFaultsAction, SIGNAL(toggled(bool)), SLOT(slotToggleFaultsAction(bool))); connect(m_drawStyleToggleFaultsAction, SIGNAL(toggled(bool)), SLOT(slotToggleFaultsAction(bool)));
m_addWellCellsToRangeFilterAction = new QAction(QIcon(":/draw_style_WellCellsToRangeFilter_24x24.png"), "&Add Well Cells To Range Filter", this);
m_addWellCellsToRangeFilterAction->setCheckable(true);
m_addWellCellsToRangeFilterAction->setToolTip("Add Well Cells To Range Filter based on the individual settings");
connect(m_addWellCellsToRangeFilterAction, SIGNAL(toggled(bool)), SLOT(slotAddWellCellsToRangeFilterAction(bool)));
} }
@ -424,6 +430,7 @@ void RiuMainWindow::createToolBars()
m_viewToolBar->addAction(m_drawStyleLinesSolidAction); m_viewToolBar->addAction(m_drawStyleLinesSolidAction);
m_viewToolBar->addAction(m_drawStyleSurfOnlyAction); m_viewToolBar->addAction(m_drawStyleSurfOnlyAction);
m_viewToolBar->addAction(m_drawStyleToggleFaultsAction); m_viewToolBar->addAction(m_drawStyleToggleFaultsAction);
m_viewToolBar->addAction(m_addWellCellsToRangeFilterAction);
QLabel* scaleLabel = new QLabel(m_viewToolBar); QLabel* scaleLabel = new QLabel(m_viewToolBar);
scaleLabel->setText("Scale"); scaleLabel->setText("Scale");
@ -1491,12 +1498,19 @@ void RiuMainWindow::refreshDrawStyleActions()
m_drawStyleToggleFaultsAction->setEnabled(enable); m_drawStyleToggleFaultsAction->setEnabled(enable);
m_addWellCellsToRangeFilterAction->setEnabled(enable);
if (enable) if (enable)
{ {
RimReservoirView* riv = RiaApplication::instance()->activeReservoirView();
m_drawStyleToggleFaultsAction->blockSignals(true); m_drawStyleToggleFaultsAction->blockSignals(true);
m_drawStyleToggleFaultsAction->setChecked( RiaApplication::instance()->activeReservoirView()->meshMode == RimReservoirView::FAULTS_MESH m_drawStyleToggleFaultsAction->setChecked( riv->meshMode == RimReservoirView::FAULTS_MESH
|| RiaApplication::instance()->activeReservoirView()->surfaceMode == RimReservoirView::FAULTS); || riv->surfaceMode == RimReservoirView::FAULTS);
m_drawStyleToggleFaultsAction->blockSignals(false); m_drawStyleToggleFaultsAction->blockSignals(false);
m_addWellCellsToRangeFilterAction->blockSignals(true);
m_addWellCellsToRangeFilterAction->setChecked( riv->wellCollection()->wellCellsToRangeFilterMode() != RimWellCollection::RANGE_ADD_NONE);
m_addWellCellsToRangeFilterAction->blockSignals(false);
} }
} }
@ -1768,3 +1782,17 @@ void RiuMainWindow::setDefaultWindowSize()
{ {
resize(1000, 810); resize(1000, 810);
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuMainWindow::slotAddWellCellsToRangeFilterAction(bool doAdd)
{
RimReservoirView* riv = RiaApplication::instance()->activeReservoirView();
if (riv)
{
caf::AppEnum<RimWellCollection::WellCellsRangeFilterType> rangeAddType;
rangeAddType = doAdd ? RimWellCollection::RANGE_ADD_INDIVIDUAL : RimWellCollection::RANGE_ADD_NONE;
riv->wellCollection()->wellCellsToRangeFilterMode.setValueFromUi(rangeAddType.index());
}
}

3
ApplicationCode/UserInterface/RiuMainWindow.h
View File

@ -217,6 +217,7 @@ private slots:
void slotDrawStyleChanged(QAction* activatedAction); void slotDrawStyleChanged(QAction* activatedAction);
void slotToggleFaultsAction(bool); void slotToggleFaultsAction(bool);
void slotAddWellCellsToRangeFilterAction(bool doAdd);
// Debug slots // Debug slots
void slotRefreshDebugActions(); void slotRefreshDebugActions();
@ -269,6 +270,8 @@ private:
QAction* m_drawStyleLinesAction; QAction* m_drawStyleLinesAction;
QAction* m_drawStyleLinesSolidAction; QAction* m_drawStyleLinesSolidAction;
QAction* m_drawStyleSurfOnlyAction; QAction* m_drawStyleSurfOnlyAction;
QAction* m_addWellCellsToRangeFilterAction;
void refreshDrawStyleActions(); void refreshDrawStyleActions();
std::vector<QPointer<QDockWidget> > additionalProjectTrees; std::vector<QPointer<QDockWidget> > additionalProjectTrees;