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

#4320 Add create valve to 3d context menu when clicking on perforation

Browse Source
This commit is contained in:
Gaute Lindkvist
2019-04-12 15:42:25 +02:00
parent 1caed321b0
commit 0861a79dfa
7 changed files with 251 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ApplicationCode/Application/RiaApplication.cpp
View File

@@ -2091,8 +2091,6 @@ void RiaApplication::applyPreferences(const RiaPreferences* oldPreferences)
applySettingsToAllViews = (reply == QMessageBox::Ok);
}
std::set<caf::PdmUiItem*> uiEditorsToUpdate;
for (auto viewWindow : allViewWindows)
{
for (auto fontTypeSizePair : fontSizes)
@@ -2102,10 +2100,7 @@ void RiaApplication::applyPreferences(const RiaPreferences* oldPreferences)
{
int oldFontSize = RiaFontCache::pointSizeFromFontSizeEnum(oldFontSizeEnum);
int newFontSize = RiaFontCache::pointSizeFromFontSizeEnum(fontTypeSizePair.second);
if (viewWindow->applyFontSize(fontTypeSizePair.first, oldFontSize, newFontSize, applySettingsToAllViews))
{
uiEditorsToUpdate.insert(viewWindow);
}
viewWindow->applyFontSize(fontTypeSizePair.first, oldFontSize, newFontSize, applySettingsToAllViews);
}
}
@@ -2122,14 +2117,12 @@ void RiaApplication::applyPreferences(const RiaPreferences* oldPreferences)
{
rim3dView->setBackgroundColor(m_preferences->defaultViewerBackgroundColor());
rim3dView->applyBackgroundColorAndFontChanges();
uiEditorsToUpdate.insert(rim3dView);
}
if (oldPreferences && (applySettingsToAllViews || rim3dView->scaleZ == static_cast<double>(oldPreferences->defaultScaleFactorZ())))
{
rim3dView->scaleZ = static_cast<double>(m_preferences->defaultScaleFactorZ());
rim3dView->updateScaling();
uiEditorsToUpdate.insert(rim3dView);
if (rim3dView == activeViewWindow())
{
RiuMainWindow::instance()->updateScaleValue();
@@ -2142,7 +2135,6 @@ void RiaApplication::applyPreferences(const RiaPreferences* oldPreferences)
if (oldPreferences && (applySettingsToAllViews || eclipseView->wellCollection()->wellLabelColor() == oldPreferences->defaultWellLabelColor()))
{
eclipseView->wellCollection()->wellLabelColor = m_preferences->defaultWellLabelColor();
uiEditorsToUpdate.insert(eclipseView->wellCollection());
}
eclipseView->scheduleReservoirGridGeometryRegen();
}
@@ -2156,7 +2148,6 @@ void RiaApplication::applyPreferences(const RiaPreferences* oldPreferences)
if (applySettingsToAllViews || matchingColor)
{
wellPathCollection->wellPathLabelColor = oldPreferences->defaultWellLabelColor();
uiEditorsToUpdate.insert(wellPathCollection);
}
if (oldPreferences->defaultPlotFontSize() != m_preferences->defaultPlotFontSize())
@@ -2165,6 +2156,9 @@ void RiaApplication::applyPreferences(const RiaPreferences* oldPreferences)
}
}
std::vector<caf::PdmUiItem*> uiEditorsToUpdate;
caf::SelectionManager::instance()->selectedItems(uiEditorsToUpdate);
for (caf::PdmUiItem* uiItem : uiEditorsToUpdate)
{
uiItem->updateConnectedEditors();