OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-09 23:16:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

#3651 Make sure contour map is zoomed property after creation.

Browse Source 
* Always zoom all. It is doubtful the user wants to see the exact zoomed in spot from the 3d View if creating a map from the view.
This commit is contained in:
Gaute Lindkvist 2018-11-09 11:44:03 +01:00
parent c716529542
commit 71701cd79b
2 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ApplicationCode/Commands/RicNewContourMapViewFeature.cpp
View File

@ -56,11 +56,16 @@ bool RicNewContourMapViewFeature::isCommandEnabled()
void RicNewContourMapViewFeature::onActionTriggered(bool isChecked)
{
RimEclipseView* reservoirView = caf::SelectionManager::instance()->selectedItemOfType<RimEclipseView>();
RimContourMapView* existingContourMap = caf::SelectionManager::instance()->selectedItemOfType<RimContourMapView>();
RimEclipseCase* eclipseCase = caf::SelectionManager::instance()->selectedItemAncestorOfType<RimEclipseCase>();
RimContourMapView* contourMap = nullptr;
// Find case to insert into
if (reservoirView)
if (existingContourMap)
{
contourMap = create2dContourMapFromExistingContourMap(eclipseCase, existingContourMap);
}
else if (reservoirView)
{
contourMap = create2dContourMapFrom3dView(eclipseCase, reservoirView);
}
@ -79,6 +84,11 @@ void RicNewContourMapViewFeature::onActionTriggered(bool isChecked)
eclipseCase->updateConnectedEditors();
}
caf::SelectionManager::instance()->setSelectedItem(contourMap);
contourMap->createDisplayModelAndRedraw();
contourMap->zoomAll();
Riu3DMainWindowTools::setExpanded(contourMap);
}
}
@ -104,6 +114,31 @@ void RicNewContourMapViewFeature::setupActionLook(QAction* actionToSetup)
actionToSetup->setIcon(QIcon(":/2DMap16x16.png"));
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimContourMapView* RicNewContourMapViewFeature::create2dContourMapFromExistingContourMap(RimEclipseCase* eclipseCase, RimContourMapView* existingContourMap)
{
RimContourMapView* contourMap =
dynamic_cast<RimContourMapView*>(existingContourMap->xmlCapability()->copyByXmlSerialization(caf::PdmDefaultObjectFactory::instance()));
CVF_ASSERT(contourMap);
contourMap->setEclipseCase(eclipseCase);
contourMap->setBackgroundColor(cvf::Color3f(1.0f, 1.0f, 0.98f)); // Ignore original view background
caf::PdmDocument::updateUiIconStateRecursively(contourMap);
size_t i = eclipseCase->contourMapCollection()->views().size();
contourMap->setName(QString("Contour Map %1").arg(i + 1));
eclipseCase->contourMapCollection()->push_back(contourMap);
// Resolve references after contour map has been inserted into Rim structures
contourMap->resolveReferencesRecursively();
contourMap->initAfterReadRecursively();
return contourMap;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@ -149,7 +184,6 @@ RimContourMapView* RicNewContourMapViewFeature::create2dContourMap(RimEclipseCas
contourMap->hasUserRequestedAnimation = true;
contourMap->setBackgroundColor(cvf::Color3f(1.0f, 1.0f, 0.98f));
contourMap->initAfterReadRecursively();
contourMap->zoomAll();
}
caf::PdmDocument::updateUiIconStateRecursively(contourMap);

1
ApplicationCode/Commands/RicNewContourMapViewFeature.h
View File

@ -38,6 +38,7 @@ protected:
void onActionTriggered( bool isChecked ) override;
void setupActionLook( QAction* actionToSetup ) override;
static RimContourMapView* create2dContourMapFromExistingContourMap(RimEclipseCase* eclipseCase, RimContourMapView* existingContourMap);
static RimContourMapView* create2dContourMapFrom3dView(RimEclipseCase* eclipseCase, const RimEclipseView* reservoirView);
static RimContourMapView* create2dContourMap(RimEclipseCase* eclipseCase);