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

#2378 Fractures: Hide "Fracture Colors" in Project tree when not in use

Browse Source
This commit is contained in:
Rebecca Cox 2018-01-18 15:04:04 +01:00
parent 28ea6f054c
commit 79539c1c99
4 changed files with 51 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ApplicationCode/Commands/RicDeleteItemExec.cpp
View File

@ -26,6 +26,7 @@
#include "RimCase.h" #include "RimCase.h"
#include "RimCellRangeFilterCollection.h" #include "RimCellRangeFilterCollection.h"
#include "RimEclipsePropertyFilterCollection.h" #include "RimEclipsePropertyFilterCollection.h"
#include "RimEclipseView.h"
#include "RimFormationNamesCollection.h" #include "RimFormationNamesCollection.h"
#include "RimGeoMechPropertyFilterCollection.h" #include "RimGeoMechPropertyFilterCollection.h"
#include "RimIntersectionCollection.h" #include "RimIntersectionCollection.h"
@ -150,6 +151,16 @@ void RicDeleteItemExec::redo()
{ {
proj->createDisplayModelAndRedrawAllViews(); proj->createDisplayModelAndRedrawAllViews();
} }
std::vector<RimView*> views;
proj->allVisibleViews(views);
for (RimView* view : views)
{
if (dynamic_cast<RimEclipseView*>(view))
{
view->updateConnectedEditors();
}
}
} }
#endif // USE_PROTOTYPE_FEATURE_FRACTURES #endif // USE_PROTOTYPE_FEATURE_FRACTURES

13
ApplicationCode/Commands/RicNewEllipseFractureTemplateFeature.cpp
View File

@ -21,6 +21,7 @@
#include "RiaApplication.h" #include "RiaApplication.h"
#include "RimOilField.h" #include "RimOilField.h"
#include "RimEclipseView.h"
#include "RimEllipseFractureTemplate.h" #include "RimEllipseFractureTemplate.h"
#include "RimFractureTemplateCollection.h" #include "RimFractureTemplateCollection.h"
#include "RimProject.h" #include "RimProject.h"
@ -58,6 +59,18 @@ void RicNewEllipseFractureTemplateFeature::onActionTriggered(bool isChecked)
fractureDef->setDefaultWellDiameterFromUnit(); fractureDef->setDefaultWellDiameterFromUnit();
fracDefColl->updateConnectedEditors(); fracDefColl->updateConnectedEditors();
std::vector<RimView*> views;
project->allVisibleViews(views);
for (RimView* view : views)
{
if (dynamic_cast<RimEclipseView*>(view))
{
view->updateConnectedEditors();
}
}
RiuMainWindow::instance()->selectAsCurrentItem(fractureDef); RiuMainWindow::instance()->selectAsCurrentItem(fractureDef);
} }
} }

15
ApplicationCode/Commands/RicNewStimPlanFractureTemplateFeature.cpp
View File

@ -21,6 +21,7 @@
#include "RiaApplication.h" #include "RiaApplication.h"
#include "RimOilField.h" #include "RimOilField.h"
#include "RimEclipseView.h"
#include "RimFractureTemplateCollection.h" #include "RimFractureTemplateCollection.h"
#include "RimProject.h" #include "RimProject.h"
#include "RimStimPlanFractureTemplate.h" #include "RimStimPlanFractureTemplate.h"
@ -44,7 +45,7 @@ void RicNewStimPlanFractureTemplateFeature::onActionTriggered(bool isChecked)
{ {
RiaApplication* app = RiaApplication::instance(); RiaApplication* app = RiaApplication::instance();
QString defaultDir = app->lastUsedDialogDirectory("BINARY_GRID"); QString defaultDir = app->lastUsedDialogDirectory("BINARY_GRID");
QString fileName = QFileDialog::getOpenFileName(NULL, "Open StimPlan XML File", defaultDir, "StimPlan XML File (*.xml);;All files(*.*)"); QString fileName = QFileDialog::getOpenFileName(nullptr, "Open StimPlan XML File", defaultDir, "StimPlan XML File (*.xml);;All files(*.*)");
if (fileName.isEmpty()) return; if (fileName.isEmpty()) return;
@ -67,6 +68,18 @@ void RicNewStimPlanFractureTemplateFeature::onActionTriggered(bool isChecked)
fractureDef->setDefaultWellDiameterFromUnit(); fractureDef->setDefaultWellDiameterFromUnit();
fracDefColl->updateConnectedEditors(); fracDefColl->updateConnectedEditors();
std::vector<RimView*> views;
project->allVisibleViews(views);
for (RimView* view : views)
{
if (dynamic_cast<RimEclipseView*>(view))
{
view->updateConnectedEditors();
}
}
RiuMainWindow::instance()->selectAsCurrentItem(fractureDef); RiuMainWindow::instance()->selectAsCurrentItem(fractureDef);
} }
} }

14
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
View File

@ -71,6 +71,7 @@
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES #ifdef USE_PROTOTYPE_FEATURE_FRACTURES
#include "RimFracture.h" #include "RimFracture.h"
#include "RimFractureTemplateCollection.h"
#include "RimSimWellFracture.h" #include "RimSimWellFracture.h"
#include "RivWellFracturePartMgr.h" #include "RivWellFracturePartMgr.h"
#endif // USE_PROTOTYPE_FEATURE_FRACTURES #endif // USE_PROTOTYPE_FEATURE_FRACTURES
@ -1469,7 +1470,18 @@ void RimEclipseView::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering
uiTreeOrdering.add(cellEdgeResult()); uiTreeOrdering.add(cellEdgeResult());
uiTreeOrdering.add(faultResultSettings()); uiTreeOrdering.add(faultResultSettings());
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES #ifdef USE_PROTOTYPE_FEATURE_FRACTURES
uiTreeOrdering.add(stimPlanColors());
RimProject* project = RiaApplication::instance()->project();
CVF_ASSERT(project);
RimOilField* oilfield = project->activeOilField();
if (oilfield && oilfield->fractureDefinitionCollection().notNull())
{
if (!oilfield->fractureDefinitionCollection()->fractureDefinitions.empty())
{
uiTreeOrdering.add(stimPlanColors());
}
}
#endif // USE_PROTOTYPE_FEATURE_FRACTURES #endif // USE_PROTOTYPE_FEATURE_FRACTURES
uiTreeOrdering.add(wellCollection()); uiTreeOrdering.add(wellCollection());