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

(#540) Removed the Visible Cells Sync from Gui.

Browse Source 
Moved UpateOverrides from init afterRead to OpenProject
This commit is contained in:
Jacob Støren 2015-10-22 16:02:28 +02:00
parent 44d1aaa3f1
commit b15b23b856
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ApplicationCode/Application/RiaApplication.cpp
View File

@ -94,6 +94,8 @@
#ifdef WIN32
#include <fcntl.h>
#endif
#include "RimViewLinkerCollection.h"
#include "RimViewLinker.h"
namespace caf
{
@ -402,6 +404,11 @@ bool RiaApplication::loadProject(const QString& projectFileName, ProjectLoadActi
caseProgress.incrementProgress();
}
}
{
m_project->viewLinkerCollection()->viewLinker()->updateOverrides();
}
{
if (m_project->mainPlotCollection() && m_project->mainPlotCollection()->wellLogPlotCollection())
{

8
ApplicationCode/ProjectDataModel/RimViewController.cpp
View File

@ -71,7 +71,10 @@ RimViewController::RimViewController(void)
CAF_PDM_InitField(&m_syncCellResult, "SyncCellResult", false, "Cell Result", "", "", "");
CAF_PDM_InitField(&m_syncVisibleCells, "SyncVisibleCells", false, "Visible Cells", "", "", "");
//syncVisibleCells.uiCapability()->setUiHidden(true); // For now
/// We do not support this. Consider to remove sometime
m_syncVisibleCells.uiCapability()->setUiHidden(true);
m_syncVisibleCells.xmlCapability()->setIOWritable(false);
m_syncVisibleCells.xmlCapability()->setIOReadable(false);
CAF_PDM_InitField(&m_syncRangeFilters, "SyncRangeFilters", true, "Range Filters", "", "", "");
CAF_PDM_InitField(&m_syncPropertyFilters, "SyncPropertyFilters", true,"Property Filters", "", "", "");
@ -216,8 +219,9 @@ void RimViewController::fieldChangedByUi(const caf::PdmFieldHandle* changedField
void RimViewController::initAfterRead()
{
updateOptionSensitivity();
updateOverrides();
updateDisplayNameAndIcon();
// Update overrides is now done on load project in Application
}
//--------------------------------------------------------------------------------------------------

3
ApplicationCode/ProjectDataModel/RimViewLinker.h
View File

@ -59,6 +59,8 @@ public:
void updateDependentViews();
void removeViewController(RimViewController* viewController);
void updateOverrides();
void updateCamera(RimView* sourceView);
void updateTimeStep(RimView* sourceView, int timeStep);
void updateScaleZ(RimView* sourceView, double scaleZ);
@ -89,7 +91,6 @@ protected:
private:
void allViewsForCameraSync(RimView* source, std::vector<RimView*>& views);
void updateOverrides();
void removeOverrides();
static bool isBoundingBoxesOverlappingOrClose(const cvf::BoundingBox& sourceBB, const cvf::BoundingBox& destBB);